From c27e4df3750aeed10f7b89e07215c20bf0846459 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 22 Sep 2021 01:19:05 +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 c02051e4be..794d20cd40 100644 --- a/src/effects/overview/kcm/overvieweffectkcm.desktop +++ b/src/effects/overview/kcm/overvieweffectkcm.desktop @@ -10,6 +10,7 @@ X-KDE-Library=kwin_overview_config X-KDE-ParentComponents=overview Name=overview +Name[az]=ümumi baxış Name[ca]=Vista general Name[cs]=přehled Name[en_GB]=overview