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 2019-10-31 05:34:18 +01:00
parent e144748c7a
commit cf2791803f
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
"Description[de]": "KWin-Compositor-Modul zum Rendern mit OpenGL",
"Description[en_GB]": "KWin Compositor plugin rendering through OpenGL",
"Description[es]": "Complemento compositor de KWin renderizando mediante OpenGL",
"Description[et]": "KWini komposiitori plugin renderdamiseks OpenGL abil",
"Description[eu]": "Kwin konposatzailearen plugina OpenGL bidez errendatzen",
"Description[fi]": "OpenGL:llä hahmontava KWin-koostajaliitännäinen",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec OpenGL",
@ -43,6 +44,7 @@
"Name[de]": "SceneOpenGL",
"Name[en_GB]": "SceneOpenGL",
"Name[es]": "SceneOpenGL",
"Name[et]": "SceneOpenGL",
"Name[eu]": "SceneOpenGL",
"Name[fi]": "SceneOpenGL",
"Name[fr]": "SceneOpenGL",

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

@ -9,6 +9,7 @@
"Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω QPainter",
"Description[en_GB]": "KWin Compositor plugin rendering through QPainter",
"Description[es]": "Complemento compositor de KWin renderizando mediante QPainter",
"Description[et]": "KWini komposiitori plugin renderdamiseks QPainteri abil",
"Description[eu]": "Kwin konposatzailearen plugina QPainter bidez errendatzen",
"Description[fi]": "QPainterillä hahmontava KWin-koostajaliitännäinen",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec QPainter",
@ -45,6 +46,7 @@
"Name[el]": "SceneQPainter",
"Name[en_GB]": "SceneQPainter",
"Name[es]": "SceneQPainter",
"Name[et]": "SceneQPainter",
"Name[eu]": "SceneQPainter",
"Name[fi]": "SceneQPainter",
"Name[fr]": "SceneQPainter",

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

@ -9,6 +9,7 @@
"Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω XRender",
"Description[en_GB]": "KWin Compositor plugin rendering through XRender",
"Description[es]": "Complemento compositor de KWin renderizando mediante XRender",
"Description[et]": "KWini komposiitori plugin renderdamiseks XRender'i abil",
"Description[eu]": "Kwin konposatzailearen plugina XRender bidez errendatzen",
"Description[fi]": "XRenderillä hahmontava KWin-koostajaliitännäinen",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec XRender",
@ -45,6 +46,7 @@
"Name[el]": "SceneXRender",
"Name[en_GB]": "SceneXRender",
"Name[es]": "SceneXRender",
"Name[et]": "SceneXRender",
"Name[eu]": "SceneXRender",
"Name[fi]": "SceneXRender",
"Name[fr]": "SceneXRender",