From aa645e9401b1c7c636f03e9ccf863f13c48faf76 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Sep 2017 05:08:51 +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 55e8af10a9..3ef9e6a5ca 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -6,6 +6,7 @@ "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", + "Description[fr]": "Module du compositeur KWin effectuant le rendu avec 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", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index b2425760d1..44a08c188a 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -6,6 +6,7 @@ "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", + "Description[fr]": "Module du compositeur KWin effectuant le rendu avec 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",