From 66039108a3e81bedfced10d7414c86061e7231a0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 28 Nov 2017 05:09:33 +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/qpainter/qpainter.json | 2 ++ plugins/scenes/xrender/xrender.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index f9742afbe2..07b9251e83 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -4,6 +4,8 @@ "Description": "KWin Compositor plugin rendering through QPainter", "Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través del QPainter", "Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter", + "Description[da]": "KWin-compositorplugin som renderer igennem QPainter", + "Description[de]": "KWin-Compositor-Modul zum Rendern mit QPainter", "Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω QPainter", "Description[es]": "Complemento compositor de KWin renderizando mediante QPainter", "Description[fr]": "Module du compositeur KWin effectuant le rendu avec QPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 7c8e21ce0d..9d6c3ecbff 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -4,6 +4,8 @@ "Description": "KWin Compositor plugin rendering through XRender", "Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través de l'XRender", "Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender", + "Description[da]": "KWin-compositorplugin som renderer igennem XRender", + "Description[de]": "KWin-Compositor-Modul zum Rendern mit XRender", "Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω XRender", "Description[es]": "Complemento compositor de KWin renderizando mediante XRender", "Description[fr]": "Module du compositeur KWin effectuant le rendu avec XRender",