From e227e93792912baebc3cee0d1062bc64b030cd7b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Aug 2021 01:15:54 +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 | 2 ++ src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json | 2 ++ .../kpackage/decoration/kwin-packagestructure-decoration.json | 2 ++ src/plugins/kpackage/effect/kwin-packagestructure-effect.json | 1 + src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json | 1 + .../windowswitcher/kwin-packagestructure-windowswitcher.json | 1 + 6 files changed, 9 insertions(+) diff --git a/src/effects/overview/kcm/overvieweffectkcm.desktop b/src/effects/overview/kcm/overvieweffectkcm.desktop index 6bd41dd320..2924491cb6 100644 --- a/src/effects/overview/kcm/overvieweffectkcm.desktop +++ b/src/effects/overview/kcm/overvieweffectkcm.desktop @@ -18,7 +18,9 @@ Name[fr]=aperçu Name[it]=panoramica Name[lt]=apžvalga Name[nl]=overzicht +Name[pt]=introdução Name[sl]=pregled Name[sv]=översikt Name[uk]=огляд +Name[vi]=tổng quan Name[x-test]=xxoverviewxx diff --git a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json index 96dfa36ae5..8a00b605fb 100644 --- a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json +++ b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json @@ -17,6 +17,7 @@ "Name[lt]": "Demitrius Belai", "Name[nl]": "Demitrius Belai", "Name[pl]": "Demitrius Belai", + "Name[pt]": "Demitrius Belai", "Name[sk]": "Demitrius Belai", "Name[sl]": "Demitrius Belai", "Name[sv]": "Demitrius Belai", @@ -39,6 +40,7 @@ "Name[lt]": "KWin Aurorae", "Name[nl]": "KWin Aurorae", "Name[pl]": "KWin Aurorae", + "Name[pt]": "KWin Aurora", "Name[sk]": "KWin Aurorae", "Name[sl]": "KWin Aurorae", "Name[sv]": "KWin Aurorae", diff --git a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json index 9e6081574c..79df545931 100644 --- a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json +++ b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json @@ -17,6 +17,7 @@ "Name[lt]": "Demitrius Belai", "Name[nl]": "Demitrius Belai", "Name[pl]": "Demitrius Belai", + "Name[pt]": "Demitrius Belai", "Name[sk]": "Demitrius Belai", "Name[sl]": "Demitrius Belai", "Name[sv]": "Demitrius Belai", @@ -39,6 +40,7 @@ "Name[lt]": "KWin dekoracijos", "Name[nl]": "KWin-decoraties", "Name[pl]": "Wygląd KWin", + "Name[pt]": "Decoração do KWin", "Name[sk]": "KWin Dekorácia", "Name[sl]": "KWin Decoration", "Name[sv]": "Kwin-dekoration", diff --git a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json index 6fc809d569..9cacca2aca 100644 --- a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json +++ b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json @@ -40,6 +40,7 @@ "Name[lt]": "KWin efektas", "Name[nl]": "KWin-effect", "Name[pl]": "Efekt KWin", + "Name[pt]": "Efeito do KWin", "Name[sk]": "KWin Efekt", "Name[sl]": "KWin Effect", "Name[sv]": "Kwin-effekt", diff --git a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json index f9bdd76c3f..0b30c26243 100644 --- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json +++ b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json @@ -40,6 +40,7 @@ "Name[lt]": "KWin scenarijus", "Name[nl]": "KWin-script", "Name[pl]": "Skrypt KWin", + "Name[pt]": "Programa do KWin", "Name[sk]": "KWin Skript", "Name[sl]": "KWin Script", "Name[sv]": "Kwin-skript", diff --git a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json index 4c0d594f62..2413f28543 100644 --- a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json +++ b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json @@ -40,6 +40,7 @@ "Name[lt]": "KWin langų perjungiklis", "Name[nl]": "KWin-vensterwisselaar", "Name[pl]": "Przełącznik okien KWin", + "Name[pt]": "Selector de Janelas do KWin", "Name[sk]": "KWin Prepínač okien", "Name[sl]": "KWin Window Switcher", "Name[sv]": "Kwin-fönsterbyte",