From 5c20e5c049aa810cb93100ab949b1a98dae01b1b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 Sep 2017 04:33:17 +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 1e6bb25663..34e82afcc5 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -3,6 +3,7 @@ "KPlugin": { "Description": "KWin Compositor plugin rendering through QPainter", "Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter", + "Description[it]": "Estensione del compositore di KWin per la resa tramite QPainter", "Description[nl]": "KWin-compositor-plug-in rendering via QPainter", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez QPainter", "Description[pt]": "'Plugin' de Composição do KWin com desenho via QPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 61085760c6..e7a63371a5 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -3,6 +3,7 @@ "KPlugin": { "Description": "KWin Compositor plugin rendering through XRender", "Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender", + "Description[it]": "Estensione del compositore di KWin per la resa tramite XRender", "Description[nl]": "KWin-compositor-plug-in rendering via XRender", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez XRender", "Description[pt]": "'Plugin' de Composição do KWin com desenho via XRender",