From 76d1de48a8123a7c6a526e7eccb00854c427b3d0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Aug 2021 01:17:35 +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/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop | 2 ++ src/kcmkwin/kwinvirtualkeyboard/package/metadata.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 ++ src/plugins/platforms/x11/standalone/x11.json | 2 +- 9 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/effects/overview/kcm/overvieweffectkcm.desktop b/src/effects/overview/kcm/overvieweffectkcm.desktop index 06618b7f99..48edd83391 100644 --- a/src/effects/overview/kcm/overvieweffectkcm.desktop +++ b/src/effects/overview/kcm/overvieweffectkcm.desktop @@ -14,7 +14,9 @@ Name[ca]=Vista general Name[cs]=přehled Name[es]=vista general Name[eu]=Ikuspegi orokorra +Name[lt]=apžvalga Name[nl]=overzicht +Name[sl]=pregled Name[sv]=översikt Name[uk]=огляд Name[x-test]=xxoverviewxx diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop index 73d499378d..058fb0cc66 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop @@ -28,6 +28,7 @@ Name[fr]=Clavier virtuel Name[ia]=Claviero virtual Name[it]=Tastiera virtuale Name[ko]=가상 키보드 +Name[lt]=Virtuali klaviatūra Name[nl]=Virtueel toetsenbord Name[pl]=Klawiatura ekranowa Name[pt]=Teclado Virtual @@ -52,6 +53,7 @@ Comment[fr]=Sélectionner quel clavier virtuel utiliser Comment[ia]=Selectiona qual claviero virtual usar Comment[it]=Seleziona quale tastiera virtuale utilizzare Comment[ko]=사용할 가상 키보드 선택 +Comment[lt]=Pasirinkti, kurią virtualią klaviatūrą naudoti Comment[nl]=Het te gebruiken virtuele toetsenbord selecteren Comment[pl]=Wybierz której klawiatury ekranowej użyć Comment[pt]=Seleccionar qual o teclado virtual a usar diff --git a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop index 9fda602983..dec55001c4 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Clavier virtuel Name[ia]=Claviero virtual Name[it]=Tastiera virtuale Name[ko]=가상 키보드 +Name[lt]=Virtuali klaviatūra Name[nl]=Virtueel toetsenbord Name[pl]=Klawiatura ekranowa Name[pt]=Teclado Virtual diff --git a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json index 163333c9eb..96dfa36ae5 100644 --- a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json +++ b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json @@ -14,6 +14,7 @@ "Name[fr]": "Demitrius Belai", "Name[it]": "Demitrius Belai", "Name[ko]": "Demitrius Belai", + "Name[lt]": "Demitrius Belai", "Name[nl]": "Demitrius Belai", "Name[pl]": "Demitrius Belai", "Name[sk]": "Demitrius Belai", @@ -35,6 +36,7 @@ "Name[fr]": "KWin Aurorae", "Name[it]": "KWin Aurorae", "Name[ko]": "KWin Aurorae", + "Name[lt]": "KWin Aurorae", "Name[nl]": "KWin Aurorae", "Name[pl]": "KWin Aurorae", "Name[sk]": "KWin Aurorae", diff --git a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json index ed737f5b75..9e6081574c 100644 --- a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json +++ b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json @@ -14,6 +14,7 @@ "Name[fr]": "Demitrius Belai", "Name[it]": "Demitrius Belai", "Name[ko]": "Demitrius Belai", + "Name[lt]": "Demitrius Belai", "Name[nl]": "Demitrius Belai", "Name[pl]": "Demitrius Belai", "Name[sk]": "Demitrius Belai", @@ -35,6 +36,7 @@ "Name[fr]": "Décorations pour KWin", "Name[it]": "Decorazione di KWin", "Name[ko]": "KWin 장식", + "Name[lt]": "KWin dekoracijos", "Name[nl]": "KWin-decoraties", "Name[pl]": "Wygląd KWin", "Name[sk]": "KWin Dekorácia", diff --git a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json index 9fc254ed8b..6fc809d569 100644 --- a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json +++ b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json @@ -14,6 +14,7 @@ "Name[fr]": "Vlad Zahorodnii", "Name[it]": "Vlad Zahorodnii", "Name[ko]": "Vlad Zahorodnii", + "Name[lt]": "Vlad Zahorodnii", "Name[nl]": "Vlad Zahorodnii", "Name[pl]": "Vlad Zahorodnii", "Name[pt]": "Vlad Zahorodnii", @@ -36,6 +37,7 @@ "Name[fr]": "Effet pour KWin", "Name[it]": "Effetto di KWin", "Name[ko]": "KWin 효과", + "Name[lt]": "KWin efektas", "Name[nl]": "KWin-effect", "Name[pl]": "Efekt KWin", "Name[sk]": "KWin Efekt", diff --git a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json index b53a910614..f9bdd76c3f 100644 --- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json +++ b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json @@ -14,6 +14,7 @@ "Name[fr]": "Marco Martin", "Name[it]": "Marco Martin", "Name[ko]": "Marco Martin", + "Name[lt]": "Marco Martin", "Name[nl]": "Marco Martin", "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", @@ -36,6 +37,7 @@ "Name[fr]": "Script pour KWin", "Name[it]": "Script di KWin", "Name[ko]": "KWin 스크립트", + "Name[lt]": "KWin scenarijus", "Name[nl]": "KWin-script", "Name[pl]": "Skrypt KWin", "Name[sk]": "KWin Skript", diff --git a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json index beadb35626..4c0d594f62 100644 --- a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json +++ b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json @@ -14,6 +14,7 @@ "Name[fr]": "Marco Martin", "Name[it]": "Marco Martin", "Name[ko]": "Marco Martin", + "Name[lt]": "Marco Martin", "Name[nl]": "Marco Martin", "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", @@ -36,6 +37,7 @@ "Name[fr]": "Sélecteur de fenêtres de KWin", "Name[it]": "Scambiafinestre di KWin", "Name[ko]": "KWin 창 전환기", + "Name[lt]": "KWin langų perjungiklis", "Name[nl]": "KWin-vensterwisselaar", "Name[pl]": "Przełącznik okien KWin", "Name[sk]": "KWin Prepínač okien", diff --git a/src/plugins/platforms/x11/standalone/x11.json b/src/plugins/platforms/x11/standalone/x11.json index 54517397b6..214ddf9f39 100644 --- a/src/plugins/platforms/x11/standalone/x11.json +++ b/src/plugins/platforms/x11/standalone/x11.json @@ -18,7 +18,7 @@ "Description[id]": "Plugin platform untuk standalone x11 dalam kwin_x11.", "Description[it]": "Estensione di piattaforma per x11 autonomo in kwin_x11.", "Description[ko]": "kwin_x11의 단독 X11 플러그인입니다.", - "Description[lt]": "Platformos priedas, skirtas kwin_x11 viduje esančiam, atskiram x11", + "Description[lt]": "Platformos priedas, skirtas kwin_x11 viduje esančiam, atskiram x11.", "Description[nl]": "Platform plug-in voor alleenstaande x11 in kwin_x11.", "Description[nn]": "Plattformtillegg for frittståande X11 i kwin_x11.", "Description[pl]": "Wtyczka platformy dla wolnostojącego x11 w kwin_x11.",