From ea0f2e2d7c8f09f5795c1a61b35d1306ef453dd6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Oct 2018 06:38:09 +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 51f0b9f6d5..937d241125 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[de]=KWin-Effekt Name[es]=Efecto de KWin +Name[fr]=Effet KWin Name[id]=KWin Effect Name[it]=Effetto di KWin Name[nl]=KWin-effect