From 5246408660b17302794610348edca4ff803c5462 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Aug 2021 01:27:10 +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 48edd83391..ecd08e20ef 100644 --- a/src/effects/overview/kcm/overvieweffectkcm.desktop +++ b/src/effects/overview/kcm/overvieweffectkcm.desktop @@ -14,6 +14,7 @@ Name[ca]=Vista general Name[cs]=přehled Name[es]=vista general Name[eu]=Ikuspegi orokorra +Name[fr]=aperçu Name[lt]=apžvalga Name[nl]=overzicht Name[sl]=pregled