From 141f6274139edaf29dc8a1cde9ca85ebb9a9b3eb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Jul 2021 01:11:30 +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" --- .../aurorae/kwin-packagestructure-aurorae.json | 18 +++++++++++++++++- .../kwin-packagestructure-decoration.json | 18 +++++++++++++++++- .../effect/kwin-packagestructure-effect.json | 18 +++++++++++++++++- .../scripts/kwin-packagestructure-scripts.json | 18 +++++++++++++++++- .../kwin-packagestructure-windowswitcher.json | 18 +++++++++++++++++- 5 files changed, 85 insertions(+), 5 deletions(-) diff --git a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json index 56de454437..4579dc6545 100644 --- a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json +++ b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json @@ -3,11 +3,27 @@ "Authors": [ { "Email": "demitriusbelai@gmail.com", - "Name": "Demitrius Belai" + "Name": "Demitrius Belai", + "Name[az]": "Demitrius Belai", + "Name[ca]": "Demitrius Belai", + "Name[cs]": "Demitrius Belai", + "Name[es]": "Demitrius Belai", + "Name[nl]": "Demitrius Belai", + "Name[sv]": "Demitrius Belai", + "Name[uk]": "Demitrius Belai", + "Name[x-test]": "xxDemitrius Belaixx" } ], "Id": "KWin/Aurorae", "Name": "KWin Aurorae", + "Name[az]": "KWin Aurorae", + "Name[ca]": "Aurorae del KWin", + "Name[cs]": "KWin Aurorae", + "Name[es]": "KWin Aurorae", + "Name[nl]": "KWin Aurorae", + "Name[sv]": "KWin Aurorae", + "Name[uk]": "KWin Aurorae", + "Name[x-test]": "xxKWin Auroraexx", "ServiceTypes": [ "KPackage/PackageStructure" ], diff --git a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json index dfae161232..26271bb4f4 100644 --- a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json +++ b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json @@ -3,11 +3,27 @@ "Authors": [ { "Email": "demitriusbelai@gmail.com", - "Name": "Demitrius Belai" + "Name": "Demitrius Belai", + "Name[az]": "Demitrius Belai", + "Name[ca]": "Demitrius Belai", + "Name[cs]": "Demitrius Belai", + "Name[es]": "Demitrius Belai", + "Name[nl]": "Demitrius Belai", + "Name[sv]": "Demitrius Belai", + "Name[uk]": "Demitrius Belai", + "Name[x-test]": "xxDemitrius Belaixx" } ], "Id": "KWin/Decoration", "Name": "KWin Decoration", + "Name[az]": "KWin Dekorasiyası", + "Name[ca]": "Decoració del KWin", + "Name[cs]": "Dekorace KWin", + "Name[es]": "Decoración de KWin", + "Name[nl]": "KWin-decoraties", + "Name[sv]": "Kwin-dekoration", + "Name[uk]": "Обрамлення вікон KWin", + "Name[x-test]": "xxKWin Decorationxx", "ServiceTypes": [ "KPackage/PackageStructure" ], diff --git a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json index 08f4012e87..0061c368cd 100644 --- a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json +++ b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json @@ -3,11 +3,27 @@ "Authors": [ { "Email": "vlad.zahorodnii@kde.org", - "Name": "Vlad Zahorodnii" + "Name": "Vlad Zahorodnii", + "Name[az]": "Vlad Zahorodnii", + "Name[ca]": "Vlad Zahorodnii", + "Name[cs]": "Vlad Zahorodnii", + "Name[es]": "Vlad Zahorodnii", + "Name[nl]": "Vlad Zahorodnii", + "Name[sv]": "Vlad Zahorodnii", + "Name[uk]": "Влад Загородній", + "Name[x-test]": "xxVlad Zahorodniixx" } ], "Id": "KWin/Effect", "Name": "KWin Effect", + "Name[az]": "KWin effekti", + "Name[ca]": "Efecte del KWin", + "Name[cs]": "Efekt KWinu", + "Name[es]": "Efecto de KWin", + "Name[nl]": "KWin-effect", + "Name[sv]": "Kwin-effekt", + "Name[uk]": "Ефект KWin", + "Name[x-test]": "xxKWin Effectxx", "ServiceTypes": [ "KPackage/PackageStructure" ], diff --git a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json index ff2ac63b59..f863c79a98 100644 --- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json +++ b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json @@ -3,11 +3,27 @@ "Authors": [ { "Email": "notmart@gmail.com", - "Name": "Marco Martin" + "Name": "Marco Martin", + "Name[az]": "Marco Martin", + "Name[ca]": "Marco Martin", + "Name[cs]": "Marco Martin", + "Name[es]": "Marco Martin", + "Name[nl]": "Marco Martin", + "Name[sv]": "Marco Martin", + "Name[uk]": "Marco Martin", + "Name[x-test]": "xxMarco Martinxx" } ], "Id": "KWin/Script", "Name": "KWin Script", + "Name[az]": "Kwin skripti", + "Name[ca]": "Script del KWin", + "Name[cs]": "Skript KWinu", + "Name[es]": "Guion de KWin", + "Name[nl]": "KWin-script", + "Name[sv]": "Kwin-skript", + "Name[uk]": "Скрипт KWin", + "Name[x-test]": "xxKWin Scriptxx", "ServiceTypes": [ "KPackage/PackageStructure" ], diff --git a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json index 3aaa44dfb9..2dd81b2f16 100644 --- a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json +++ b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json @@ -3,11 +3,27 @@ "Authors": [ { "Email": "notmart@gmail.com", - "Name": "Marco Martin" + "Name": "Marco Martin", + "Name[az]": "Marco Martin", + "Name[ca]": "Marco Martin", + "Name[cs]": "Marco Martin", + "Name[es]": "Marco Martin", + "Name[nl]": "Marco Martin", + "Name[sv]": "Marco Martin", + "Name[uk]": "Marco Martin", + "Name[x-test]": "xxMarco Martinxx" } ], "Id": "KWin/WindowSwitcher", "Name": "KWin Window Switcher", + "Name[az]": "KWin pəncərə dəyişdiricisi", + "Name[ca]": "Commutador de finestres del KWin", + "Name[cs]": "Přepínač oken KWin", + "Name[es]": "Selector de ventanas de KWin", + "Name[nl]": "KWin-vensterwisselaar", + "Name[sv]": "Kwin-fönsterbyte", + "Name[uk]": "Перемикач вікон KWin", + "Name[x-test]": "xxKWin Window Switcherxx", "ServiceTypes": [ "KPackage/PackageStructure" ],