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-07 04:44:27 +01:00
parent 4bfeeb3084
commit b9f5aa3cf6
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@
"Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través de l'OpenGL",
"Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'OpenGL",
"Description[es]": "Complemento compositor de KWin renderizando mediante OpenGL",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec OpenGL",
"Description[it]": "Estensione del compositore di KWin per la resa tramite OpenGL",
"Description[nl]": "KWin-compositor-plug-in rendering via OpenGL",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez OpenGL",