vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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"
icc-effect-5.14.5
l10n daemon script 2017-10-06 05:07:46 +02:00
parent e85c3f386f
commit 9919dfa161
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

@ -2,6 +2,7 @@
"CompositingType": 1,
"KPlugin": {
"Description": "KWin Compositor plugin rendering through OpenGL",
"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[nl]": "KWin-compositor-plug-in rendering via OpenGL",
"Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez OpenGL",