From 4bcd8096647c518eddb0c7be2e49801ace40f389 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 Oct 2018 05:58: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" --- effects/showpaint/showpaint_config.desktop | 1 + packageplugins/effect/kwin-packagestructure-effect.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/effects/showpaint/showpaint_config.desktop b/effects/showpaint/showpaint_config.desktop index dbe0fc0fdb..cd665c414f 100644 --- a/effects/showpaint/showpaint_config.desktop +++ b/effects/showpaint/showpaint_config.desktop @@ -47,6 +47,7 @@ Name[ne]=रङ देखाउनुहोस् Name[nl]=Intekening tonen Name[pa]=ਪੇਂਟ ਵੇਖੋ Name[pl]=Pokaż rysowane +Name[pt]=Mostrar a Pintura Name[ro]=Afișează desenele Name[ru]=Подсвечивать отрисовку Name[si]=ඇඳීම් පෙන්වන්න diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/packageplugins/effect/kwin-packagestructure-effect.desktop index b7e2f7b49f..07706baeb8 100644 --- a/packageplugins/effect/kwin-packagestructure-effect.desktop +++ b/packageplugins/effect/kwin-packagestructure-effect.desktop @@ -4,6 +4,7 @@ Name[ca]=Efecte del KWin Name[ca@valencia]=Efecte del KWin Name[es]=Efecto de KWin Name[nl]=KWin-effect +Name[pt]=Efeito do KWin Name[sv]=Kwin-effekt Name[uk]=Ефект KWin Name[x-test]=xxKWin Effectxx