From 17b161213c78d66f4de3ddfde6692d9b4a77dfa8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 21 Aug 2021 01:16:14 +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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/effects/overview/kcm/overvieweffectkcm.desktop b/src/effects/overview/kcm/overvieweffectkcm.desktop index 862ff538e0..06618b7f99 100644 --- a/src/effects/overview/kcm/overvieweffectkcm.desktop +++ b/src/effects/overview/kcm/overvieweffectkcm.desktop @@ -10,3 +10,11 @@ X-KDE-Library=kwin_overview_config X-KDE-ParentComponents=overview Name=overview +Name[ca]=Vista general +Name[cs]=přehled +Name[es]=vista general +Name[eu]=Ikuspegi orokorra +Name[nl]=overzicht +Name[sv]=översikt +Name[uk]=огляд +Name[x-test]=xxoverviewxx