From 216233c2ec5d8c1c60a851b3705879ca94b7c8d8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Aug 2021 01:20:37 +0000 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" --- src/effects/overview/kcm/overvieweffectkcm.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/effects/overview/kcm/overvieweffectkcm.desktop b/src/effects/overview/kcm/overvieweffectkcm.desktop index 2924491cb6..4940be71c2 100644 --- a/src/effects/overview/kcm/overvieweffectkcm.desktop +++ b/src/effects/overview/kcm/overvieweffectkcm.desktop @@ -18,6 +18,7 @@ Name[fr]=aperçu Name[it]=panoramica Name[lt]=apžvalga Name[nl]=overzicht +Name[pl]=przegląd Name[pt]=introdução Name[sl]=pregled Name[sv]=översikt