From 880d0afcf1380fbd856f56a1f3e843a6bc675a56 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Nov 2017 06:13:10 +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 | 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 93c39e0d5e..4077aef7dd 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -11,6 +11,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[sk]": "Renderovací plugin kompozítora KWin cez QPainter", "Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз QPainter", "Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz QPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 81e221a38f..190a2b156f 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -11,6 +11,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[sk]": "Renderovací plugin kompozítora KWin cez XRender", "Description[sr@ijekavian]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер", "Description[sr@ijekavianlatin]": "KWinov priključak slagača za renderovanje kroz XRender",