From 84426e80820857d90532e723c430b5adf625fdd3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 10 Sep 2021 01:18:40 +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 + src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json | 2 ++ .../kpackage/decoration/kwin-packagestructure-decoration.json | 2 ++ src/plugins/kpackage/effect/kwin-packagestructure-effect.json | 2 ++ src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json | 2 ++ .../windowswitcher/kwin-packagestructure-windowswitcher.json | 2 ++ 6 files changed, 11 insertions(+) diff --git a/src/effects/overview/kcm/overvieweffectkcm.desktop b/src/effects/overview/kcm/overvieweffectkcm.desktop index f410037004..ebf533a95c 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[fi]=yleiskuva Name[fr]=aperçu Name[it]=panoramica Name[lt]=apžvalga diff --git a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json index cbf9f08375..e9b6c9cecf 100644 --- a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json +++ b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json @@ -12,6 +12,7 @@ "Name[en_GB]": "Demitrius Belai", "Name[es]": "Demitrius Belai", "Name[eu]": "Demitrius Belai", + "Name[fi]": "Demitrius Belai", "Name[fr]": "Demitrius Belai", "Name[it]": "Demitrius Belai", "Name[ko]": "Demitrius Belai", @@ -36,6 +37,7 @@ "Name[en_GB]": "KWin Aurorae", "Name[es]": "KWin Aurorae", "Name[eu]": "KWin Aurorae", + "Name[fi]": "KWin Aurorae", "Name[fr]": "KWin Aurorae", "Name[it]": "KWin Aurorae", "Name[ko]": "KWin Aurorae", diff --git a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json index 77c974b6a5..4f88985511 100644 --- a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json +++ b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json @@ -12,6 +12,7 @@ "Name[en_GB]": "Demitrius Belai", "Name[es]": "Demitrius Belai", "Name[eu]": "Demitrius Belai", + "Name[fi]": "Demitrius Belai", "Name[fr]": "Demitrius Belai", "Name[it]": "Demitrius Belai", "Name[ko]": "Demitrius Belai", @@ -36,6 +37,7 @@ "Name[en_GB]": "KWin Decoration", "Name[es]": "Decoración de KWin", "Name[eu]": "KWin apainketa", + "Name[fi]": "KWin-koristelu", "Name[fr]": "Décorations pour KWin", "Name[it]": "Decorazione di KWin", "Name[ko]": "KWin 장식", diff --git a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json index 4d8631b641..eac0103fa4 100644 --- a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json +++ b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json @@ -12,6 +12,7 @@ "Name[en_GB]": "Vlad Zahorodnii", "Name[es]": "Vlad Zahorodnii", "Name[eu]": "Vlad Zahorodnii", + "Name[fi]": "Vlad Zahorodnii", "Name[fr]": "Vlad Zahorodnii", "Name[it]": "Vlad Zahorodnii", "Name[ko]": "Vlad Zahorodnii", @@ -36,6 +37,7 @@ "Name[en_GB]": "KWin Effect", "Name[es]": "Efecto de KWin", "Name[eu]": "KWin efektua", + "Name[fi]": "KWin-tehoste", "Name[fr]": "Effet pour KWin", "Name[it]": "Effetto di KWin", "Name[ko]": "KWin 효과", diff --git a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json index 30f7b49c9d..78e2ede664 100644 --- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json +++ b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json @@ -12,6 +12,7 @@ "Name[en_GB]": "Marco Martin", "Name[es]": "Marco Martin", "Name[eu]": "Marco Martin", + "Name[fi]": "Marco Martin", "Name[fr]": "Marco Martin", "Name[it]": "Marco Martin", "Name[ko]": "Marco Martin", @@ -36,6 +37,7 @@ "Name[en_GB]": "KWin Script", "Name[es]": "Guion de KWin", "Name[eu]": "KWin gidoia", + "Name[fi]": "KWin-skripti", "Name[fr]": "Script pour KWin", "Name[it]": "Script di KWin", "Name[ko]": "KWin 스크립트", diff --git a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json index 5a1f736fe9..c1131ae6d9 100644 --- a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json +++ b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json @@ -12,6 +12,7 @@ "Name[en_GB]": "Marco Martin", "Name[es]": "Marco Martin", "Name[eu]": "Marco Martin", + "Name[fi]": "Marco Martin", "Name[fr]": "Marco Martin", "Name[it]": "Marco Martin", "Name[ko]": "Marco Martin", @@ -36,6 +37,7 @@ "Name[en_GB]": "KWin Window Switcher", "Name[es]": "Selector de ventanas de KWin", "Name[eu]": "KWin leiho-aldatzailea", + "Name[fi]": "KWin-ikkunavaihto", "Name[fr]": "Sélecteur de fenêtres de KWin", "Name[it]": "Scambiafinestre di KWin", "Name[ko]": "KWin 창 전환기",