From 21c5b95529bf2b640ff53dd89086e2c932cafa0e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Oct 2018 06:13:05 +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" --- packageplugins/effect/kwin-packagestructure-effect.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/packageplugins/effect/kwin-packagestructure-effect.desktop index 07706baeb8..4f53bf2ec3 100644 --- a/packageplugins/effect/kwin-packagestructure-effect.desktop +++ b/packageplugins/effect/kwin-packagestructure-effect.desktop @@ -3,6 +3,7 @@ Name=KWin Effect Name[ca]=Efecte del KWin Name[ca@valencia]=Efecte del KWin Name[es]=Efecto de KWin +Name[it]=Effetto di KWin Name[nl]=KWin-effect Name[pt]=Efeito do KWin Name[sv]=Kwin-effekt