From 23eaed2f83c2f7b5e9d3c8270316e0b9bae2bbc2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Sep 2017 04:56:04 +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/qpainter/qpainter.json | 1 + plugins/scenes/xrender/xrender.json | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 8bc7201624..f755cc785b 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -2,6 +2,7 @@ "CompositingType": 4, "KPlugin": { "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[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω QPainter", "Description[es]": "Complemento compositor de KWin renderizando mediante QPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 137b1aea6d..64569cdd1f 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -2,6 +2,7 @@ "CompositingType": 2, "KPlugin": { "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[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω XRender", "Description[es]": "Complemento compositor de KWin renderizando mediante XRender",