From b9f5aa3cf6bdee525b16dc258093a14eef746721 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Nov 2017 04:44:27 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index ff4183fe7a..f4472d68b7 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -5,6 +5,7 @@ "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[es]": "Complemento compositor de KWin renderizando mediante OpenGL", + "Description[fr]": "Module du compositeur KWin effectuant le rendu avec OpenGL", "Description[it]": "Estensione del compositore di KWin per la resa tramite OpenGL", "Description[nl]": "KWin-compositor-plug-in rendering via OpenGL", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez OpenGL",