From d6e4096d760ae23da3c26bd58697e45209d5d822 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Oct 2018 05:56: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" --- effects/showpaint/showpaint_config.desktop | 2 ++ packageplugins/effect/kwin-packagestructure-effect.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/effects/showpaint/showpaint_config.desktop b/effects/showpaint/showpaint_config.desktop index cd665c414f..7f20a8def1 100644 --- a/effects/showpaint/showpaint_config.desktop +++ b/effects/showpaint/showpaint_config.desktop @@ -48,8 +48,10 @@ Name[nl]=Intekening tonen Name[pa]=ਪੇਂਟ ਵੇਖੋ Name[pl]=Pokaż rysowane Name[pt]=Mostrar a Pintura +Name[pt_BR]=Mostrar pintura Name[ro]=Afișează desenele Name[ru]=Подсвечивать отрисовку +Name[se]=Čájet málema Name[si]=ඇඳීම් පෙන්වන්න Name[sk]=Zobraziť kresbu Name[sl]=Izrisovanje diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/packageplugins/effect/kwin-packagestructure-effect.desktop index 4f53bf2ec3..79e28b3ef5 100644 --- a/packageplugins/effect/kwin-packagestructure-effect.desktop +++ b/packageplugins/effect/kwin-packagestructure-effect.desktop @@ -6,6 +6,7 @@ Name[es]=Efecto de KWin Name[it]=Effetto di KWin Name[nl]=KWin-effect Name[pt]=Efeito do KWin +Name[pt_BR]=Efeito do KWin Name[sv]=Kwin-effekt Name[uk]=Ефект KWin Name[x-test]=xxKWin Effectxx