From 9919dfa161a61f0b1ac1fabd87cb850560940d27 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Oct 2017 05:07:46 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index 8daf23ec5c..40bb44a1f6 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -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",