From 8041040f43bdf360d4e7d3b84f4cf39251c65e13 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Sep 2017 05:12:58 +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 f755cc785b..55e8af10a9 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -10,6 +10,7 @@ "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", + "Description[pt_BR]": "Plugin do compositor KWin renderizando pelo QPainter", "Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз QPainter", "Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz QPainter", "Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz QPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 64569cdd1f..b2425760d1 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -10,6 +10,7 @@ "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", + "Description[pt_BR]": "Plugin do compositor KWin renderizando pelo XRender", "Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер", "Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz XRender", "Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz XRender",