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-10-02 05:07:43 +02:00
parent f988a5f654
commit e1e9f9cf72
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,17 @@
"CompositingType": 1,
"KPlugin": {
"Description": "KWin Compositor plugin rendering through 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",
"Description[pt]": "'Plugin' de Composição do KWin com desenho via OpenGL",
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via OpenGL",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням OpenGL",
"Description[x-test]": "xxKWin Compositor plugin rendering through OpenGLxx",
"Id": "KWinSceneOpenGL",
"Name": "SceneOpenGL"
"Name": "SceneOpenGL",
"Name[pl]": "OpenGL sceny",
"Name[sv]": "Scen OpenGL",
"Name[x-test]": "xxSceneOpenGLxx"
}
}