From 16d473a326ea780e0f72770367f9b7443f48f954 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Nov 2021 01:30:44 +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 3319f7b180..8c0401b041 100644 --- a/src/effects/overview/kcm/overvieweffectkcm.desktop +++ b/src/effects/overview/kcm/overvieweffectkcm.desktop @@ -27,6 +27,7 @@ Name[nl]=overzicht Name[pl]=przegląd Name[pt]=introdução Name[pt_BR]=visão geral +Name[sk]=Prehľad Name[sl]=pregled Name[sv]=översikt Name[uk]=огляд