From 3e4dbde6b009d80f6e8b7b6925cb82bb9cc5c57b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 24 Oct 2018 05:58:03 +0200 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" --- .../containmentactions-packagestructure.json | 36 +++++++++++++- .../dataengine-packagestructure.json | 35 +++++++++++++- .../plasmageneric-packagestructure.json | 36 +++++++++++++- .../plasmatheme-packagestructure.json | 35 +++++++++++++- .../plasmoid-packagestructure.json | 48 ++++++++++++++++++- 5 files changed, 185 insertions(+), 5 deletions(-) diff --git a/src/plasma/packagestructure/containmentactions-packagestructure.json b/src/plasma/packagestructure/containmentactions-packagestructure.json index 7c65d7cc5..0cfb96ace 100644 --- a/src/plasma/packagestructure/containmentactions-packagestructure.json +++ b/src/plasma/packagestructure/containmentactions-packagestructure.json @@ -4,11 +4,43 @@ { "Email": "aseigo@kde.org", "Name": "Aaron Seigo", + "Name[ar]": "Aaron Seigo", + "Name[ca@valencia]": "Aaron Seigo", + "Name[ca]": "Aaron Seigo", + "Name[cs]": "Aaron Seigo", + "Name[da]": "Aaron Seigo", + "Name[de]": "Aaron Seigo", + "Name[el]": "Aaron Seigo", + "Name[en_GB]": "Aaron Seigo", + "Name[es]": "Aaron Seigo", + "Name[et]": "Aaron Seigo", + "Name[eu]": "Aaron Seigo", + "Name[fi]": "Aaron Seigo", + "Name[fr]": "Aaron Seigo", + "Name[gl]": "Aaron Seigo", + "Name[hu]": "Aaron Seigo", + "Name[ia]": "Aaron Seigo", + "Name[id]": "Aaron Seigo", + "Name[it]": "Aaron Seigo", + "Name[ko]": "Aaron Seigo", + "Name[nl]": "Aaron Seigo", + "Name[nn]": "Aaron Seigo", + "Name[pl]": "Aaron Seigo", + "Name[pt]": "Aaron Seigo", + "Name[pt_BR]": "Aaron Seigo", + "Name[ru]": "Aaron Seigo", + "Name[sk]": "Aaron Seigo", + "Name[sl]": "Aaron Seigo", "Name[sr@ijekavian]": "Арон Џ. Сајго", "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", - "Name[x-test]": "xxAaron Seigoxx" + "Name[sv]": "Aaron Seigo", + "Name[tr]": "Aaron Seigo", + "Name[uk]": "Aaron Seigo", + "Name[x-test]": "xxAaron Seigoxx", + "Name[zh_CN]": "Aaron Seigo", + "Name[zh_TW]": "Aaron Seigo" } ], "Id": "Plasma/ContainmentActions", @@ -18,6 +50,7 @@ "Name[da]": "Beholder-handlinger", "Name[de]": "Containment-Aktionen", "Name[el]": "Ενέργειες υποδοχέα", + "Name[en_GB]": "Containment Actions", "Name[es]": "Acciones del contenedor", "Name[et]": "Konteineritoimingud", "Name[eu]": "Konfinamenduen ekintzak", @@ -26,6 +59,7 @@ "Name[gl]": "Accións de contención", "Name[hu]": "Tartalomműveletek", "Name[ia]": "Actiones de continer", + "Name[id]": "Containment Actions", "Name[it]": "Azioni dei contenitori", "Name[ko]": "컨테이너 동작", "Name[nl]": "Containeracties", diff --git a/src/plasma/packagestructure/dataengine-packagestructure.json b/src/plasma/packagestructure/dataengine-packagestructure.json index 373b2907d..037a52965 100644 --- a/src/plasma/packagestructure/dataengine-packagestructure.json +++ b/src/plasma/packagestructure/dataengine-packagestructure.json @@ -4,11 +4,43 @@ { "Email": "aseigo@kde.org", "Name": "Aaron Seigo", + "Name[ar]": "Aaron Seigo", + "Name[ca@valencia]": "Aaron Seigo", + "Name[ca]": "Aaron Seigo", + "Name[cs]": "Aaron Seigo", + "Name[da]": "Aaron Seigo", + "Name[de]": "Aaron Seigo", + "Name[el]": "Aaron Seigo", + "Name[en_GB]": "Aaron Seigo", + "Name[es]": "Aaron Seigo", + "Name[et]": "Aaron Seigo", + "Name[eu]": "Aaron Seigo", + "Name[fi]": "Aaron Seigo", + "Name[fr]": "Aaron Seigo", + "Name[gl]": "Aaron Seigo", + "Name[hu]": "Aaron Seigo", + "Name[ia]": "Aaron Seigo", + "Name[id]": "Aaron Seigo", + "Name[it]": "Aaron Seigo", + "Name[ko]": "Aaron Seigo", + "Name[nl]": "Aaron Seigo", + "Name[nn]": "Aaron Seigo", + "Name[pl]": "Aaron Seigo", + "Name[pt]": "Aaron Seigo", + "Name[pt_BR]": "Aaron Seigo", + "Name[ru]": "Aaron Seigo", + "Name[sk]": "Aaron Seigo", + "Name[sl]": "Aaron Seigo", "Name[sr@ijekavian]": "Арон Џ. Сајго", "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", - "Name[x-test]": "xxAaron Seigoxx" + "Name[sv]": "Aaron Seigo", + "Name[tr]": "Aaron Seigo", + "Name[uk]": "Aaron Seigo", + "Name[x-test]": "xxAaron Seigoxx", + "Name[zh_CN]": "Aaron Seigo", + "Name[zh_TW]": "Aaron Seigo" } ], "Id": "Plasma/DataEngine", @@ -20,6 +52,7 @@ "Name[da]": "Datamotor", "Name[de]": "Datenmodul", "Name[el]": "Μηχανή δεδομένων", + "Name[en_GB]": "Data Engine", "Name[es]": "Motor de datos", "Name[et]": "Andmemootor", "Name[eu]": "Datu-motorea", diff --git a/src/plasma/packagestructure/plasmageneric-packagestructure.json b/src/plasma/packagestructure/plasmageneric-packagestructure.json index 450c90e03..59447b54c 100644 --- a/src/plasma/packagestructure/plasmageneric-packagestructure.json +++ b/src/plasma/packagestructure/plasmageneric-packagestructure.json @@ -4,11 +4,43 @@ { "Email": "aseigo@kde.org", "Name": "Aaron Seigo", + "Name[ar]": "Aaron Seigo", + "Name[ca@valencia]": "Aaron Seigo", + "Name[ca]": "Aaron Seigo", + "Name[cs]": "Aaron Seigo", + "Name[da]": "Aaron Seigo", + "Name[de]": "Aaron Seigo", + "Name[el]": "Aaron Seigo", + "Name[en_GB]": "Aaron Seigo", + "Name[es]": "Aaron Seigo", + "Name[et]": "Aaron Seigo", + "Name[eu]": "Aaron Seigo", + "Name[fi]": "Aaron Seigo", + "Name[fr]": "Aaron Seigo", + "Name[gl]": "Aaron Seigo", + "Name[hu]": "Aaron Seigo", + "Name[ia]": "Aaron Seigo", + "Name[id]": "Aaron Seigo", + "Name[it]": "Aaron Seigo", + "Name[ko]": "Aaron Seigo", + "Name[nl]": "Aaron Seigo", + "Name[nn]": "Aaron Seigo", + "Name[pl]": "Aaron Seigo", + "Name[pt]": "Aaron Seigo", + "Name[pt_BR]": "Aaron Seigo", + "Name[ru]": "Aaron Seigo", + "Name[sk]": "Aaron Seigo", + "Name[sl]": "Aaron Seigo", "Name[sr@ijekavian]": "Арон Џ. Сајго", "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", - "Name[x-test]": "xxAaron Seigoxx" + "Name[sv]": "Aaron Seigo", + "Name[tr]": "Aaron Seigo", + "Name[uk]": "Aaron Seigo", + "Name[x-test]": "xxAaron Seigoxx", + "Name[zh_CN]": "Aaron Seigo", + "Name[zh_TW]": "Aaron Seigo" } ], "Id": "Plasma/Generic", @@ -19,6 +51,7 @@ "Name[cs]": "Obecné", "Name[da]": "Generisk", "Name[de]": "Generisch", + "Name[en_GB]": "Generic", "Name[es]": "General", "Name[et]": "Üldine", "Name[eu]": "Orokorra", @@ -26,6 +59,7 @@ "Name[fr]": "Générique", "Name[gl]": "Xenérico", "Name[hu]": "Általános", + "Name[ia]": "Generic", "Name[id]": "Generik", "Name[it]": "Generico", "Name[ko]": "일반", diff --git a/src/plasma/packagestructure/plasmatheme-packagestructure.json b/src/plasma/packagestructure/plasmatheme-packagestructure.json index 20cfdf2ca..6bec6bfa0 100644 --- a/src/plasma/packagestructure/plasmatheme-packagestructure.json +++ b/src/plasma/packagestructure/plasmatheme-packagestructure.json @@ -4,11 +4,43 @@ { "Email": "aseigo@kde.org", "Name": "Aaron Seigo", + "Name[ar]": "Aaron Seigo", + "Name[ca@valencia]": "Aaron Seigo", + "Name[ca]": "Aaron Seigo", + "Name[cs]": "Aaron Seigo", + "Name[da]": "Aaron Seigo", + "Name[de]": "Aaron Seigo", + "Name[el]": "Aaron Seigo", + "Name[en_GB]": "Aaron Seigo", + "Name[es]": "Aaron Seigo", + "Name[et]": "Aaron Seigo", + "Name[eu]": "Aaron Seigo", + "Name[fi]": "Aaron Seigo", + "Name[fr]": "Aaron Seigo", + "Name[gl]": "Aaron Seigo", + "Name[hu]": "Aaron Seigo", + "Name[ia]": "Aaron Seigo", + "Name[id]": "Aaron Seigo", + "Name[it]": "Aaron Seigo", + "Name[ko]": "Aaron Seigo", + "Name[nl]": "Aaron Seigo", + "Name[nn]": "Aaron Seigo", + "Name[pl]": "Aaron Seigo", + "Name[pt]": "Aaron Seigo", + "Name[pt_BR]": "Aaron Seigo", + "Name[ru]": "Aaron Seigo", + "Name[sk]": "Aaron Seigo", + "Name[sl]": "Aaron Seigo", "Name[sr@ijekavian]": "Арон Џ. Сајго", "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", - "Name[x-test]": "xxAaron Seigoxx" + "Name[sv]": "Aaron Seigo", + "Name[tr]": "Aaron Seigo", + "Name[uk]": "Aaron Seigo", + "Name[x-test]": "xxAaron Seigoxx", + "Name[zh_CN]": "Aaron Seigo", + "Name[zh_TW]": "Aaron Seigo" } ], "Id": "Plasma/Theme", @@ -20,6 +52,7 @@ "Name[da]": "Plasma-tema", "Name[de]": "Plasma-Design", "Name[el]": "Θέμα Plasma", + "Name[en_GB]": "Plasma Theme", "Name[es]": "Tema de Plasma", "Name[et]": "Plasma teema", "Name[eu]": "Plasmaren gaia", diff --git a/src/plasma/packagestructure/plasmoid-packagestructure.json b/src/plasma/packagestructure/plasmoid-packagestructure.json index 6fb39c87e..d6cdca08c 100644 --- a/src/plasma/packagestructure/plasmoid-packagestructure.json +++ b/src/plasma/packagestructure/plasmoid-packagestructure.json @@ -4,11 +4,43 @@ { "Email": "aseigo@kde.org", "Name": "Aaron Seigo", + "Name[ar]": "Aaron Seigo", + "Name[ca@valencia]": "Aaron Seigo", + "Name[ca]": "Aaron Seigo", + "Name[cs]": "Aaron Seigo", + "Name[da]": "Aaron Seigo", + "Name[de]": "Aaron Seigo", + "Name[el]": "Aaron Seigo", + "Name[en_GB]": "Aaron Seigo", + "Name[es]": "Aaron Seigo", + "Name[et]": "Aaron Seigo", + "Name[eu]": "Aaron Seigo", + "Name[fi]": "Aaron Seigo", + "Name[fr]": "Aaron Seigo", + "Name[gl]": "Aaron Seigo", + "Name[hu]": "Aaron Seigo", + "Name[ia]": "Aaron Seigo", + "Name[id]": "Aaron Seigo", + "Name[it]": "Aaron Seigo", + "Name[ko]": "Aaron Seigo", + "Name[nl]": "Aaron Seigo", + "Name[nn]": "Aaron Seigo", + "Name[pl]": "Aaron Seigo", + "Name[pt]": "Aaron Seigo", + "Name[pt_BR]": "Aaron Seigo", + "Name[ru]": "Aaron Seigo", + "Name[sk]": "Aaron Seigo", + "Name[sl]": "Aaron Seigo", "Name[sr@ijekavian]": "Арон Џ. Сајго", "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", - "Name[x-test]": "xxAaron Seigoxx" + "Name[sv]": "Aaron Seigo", + "Name[tr]": "Aaron Seigo", + "Name[uk]": "Aaron Seigo", + "Name[x-test]": "xxAaron Seigoxx", + "Name[zh_CN]": "Aaron Seigo", + "Name[zh_TW]": "Aaron Seigo" } ], "Id": "Plasma/Applet", @@ -16,22 +48,36 @@ "Name[ar]": "بلازمويد", "Name[ca@valencia]": "Plasmoide", "Name[ca]": "Plasmoide", + "Name[cs]": "Plasmoid", + "Name[da]": "Plasmoid", + "Name[de]": "Plasmoid", "Name[el]": "Πλασμοειδές", + "Name[en_GB]": "Plasmoid", "Name[es]": "Plasmoide", + "Name[et]": "Plasmoid", "Name[eu]": "Plasmoidea", "Name[fi]": "Plasmoidi", "Name[fr]": "Plasmoïde", "Name[gl]": "Plasmoide", + "Name[hu]": "Plasmoid", + "Name[ia]": "Plasmoid", + "Name[id]": "Plasmoid", "Name[it]": "Plasmoide", + "Name[ko]": "Plasmoid", + "Name[nl]": "Plasmoid", "Name[nn]": "Plasmoide", "Name[pl]": "Plazmoid", "Name[pt]": "Plasmóide", "Name[pt_BR]": "Plasmoide", "Name[ru]": "Виджет Plasma", + "Name[sk]": "Plasmoid", + "Name[sl]": "Plasmoid", "Name[sr@ijekavian]": "Плазмоид", "Name[sr@ijekavianlatin]": "Plazmoid", "Name[sr@latin]": "Plazmoid", "Name[sr]": "Плазмоид", + "Name[sv]": "Plasmoid", + "Name[tr]": "Plasmoid", "Name[uk]": "Плазмоїд", "Name[x-test]": "xxPlasmoidxx", "Name[zh_CN]": "小部件",