From e1e9f9cf72b57ed13cd02d5828b22c3a323fb53d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Oct 2017 05:07:43 +0200 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 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index c2d9a7e7cd..8daf23ec5c 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -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" } }