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-11-28 05:09:33 +01:00
parent 11e95d5de1
commit 66039108a3
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,8 @@
"Description": "KWin Compositor plugin rendering through QPainter",
"Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través del QPainter",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter",
"Description[da]": "KWin-compositorplugin som renderer igennem QPainter",
"Description[de]": "KWin-Compositor-Modul zum Rendern mit QPainter",
"Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω QPainter",
"Description[es]": "Complemento compositor de KWin renderizando mediante QPainter",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec QPainter",

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

@ -4,6 +4,8 @@
"Description": "KWin Compositor plugin rendering through XRender",
"Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través de l'XRender",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender",
"Description[da]": "KWin-compositorplugin som renderer igennem XRender",
"Description[de]": "KWin-Compositor-Modul zum Rendern mit XRender",
"Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω XRender",
"Description[es]": "Complemento compositor de KWin renderizando mediante XRender",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec XRender",