From eedd89fd51253c2bfc3b8d550b022207eb6dadeb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Oct 2017 05:33:32 +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 540b4aa6f2..294d2a2134 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[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", "Description[pt]": "'Plugin' de Composição do KWin com desenho via OpenGL",