yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2017-09-05 04:33:17 +02:00
parent 62c6e1399b
commit 5c20e5c049
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/scenes/qpainter/qpainter.json
View file

@ -3,6 +3,7 @@
"KPlugin": {
"Description": "KWin Compositor plugin rendering through QPainter",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter",
"Description[it]": "Estensione del compositore di KWin per la resa tramite QPainter",
"Description[nl]": "KWin-compositor-plug-in rendering via QPainter",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez QPainter",
"Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter",

1
plugins/scenes/xrender/xrender.json
View file

@ -3,6 +3,7 @@
"KPlugin": {
"Description": "KWin Compositor plugin rendering through XRender",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender",
"Description[it]": "Estensione del compositore di KWin per la resa tramite XRender",
"Description[nl]": "KWin-compositor-plug-in rendering via XRender",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez XRender",
"Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender",