From 67826c1a68aaa3853568e8034199e054d61ae8c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 13 Jul 2018 07:09:05 +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 f6f8a335e5..82a425e748 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -4,6 +4,7 @@ "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[da]": "KWin-compositorplugin som renderer via OpenGL", "Description[de]": "KWin-Compositor-Modul zum Rendern mit OpenGL", "Description[es]": "Complemento compositor de KWin renderizando mediante OpenGL", "Description[eu]": "Kwin konposatzailearen plugina OpenGL bidez errendatzen",