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-16 05:08:51 +02:00
parent 8041040f43
commit aa645e9401
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

@ -6,6 +6,7 @@
"Description[ca]": "Connector del Compositor del KWin que renderitza a través del 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",
"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",

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

@ -6,6 +6,7 @@
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'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",
"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",