From cf2791803f6b9ae300f858f840e5ff3dcf50342c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 31 Oct 2019 05:34:18 +0100 Subject: [PATCH] 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" --- plugins/scenes/opengl/opengl.json | 2 ++ plugins/scenes/qpainter/qpainter.json | 2 ++ plugins/scenes/xrender/xrender.json | 2 ++ 3 files changed, 6 insertions(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index caf428df16..4dbb597f02 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -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", diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 1a8f0c45ea..2a4d07f1dd 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -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", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index cf397a69b5..be6489c66a 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -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",