From 56aa6dee3ab4dbaffa074ec0eb45109f4d0ee0b0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 17 Aug 2019 05:07:40 +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" --- .../packagestructure/containmentactions-packagestructure.json | 2 ++ src/plasma/packagestructure/dataengine-packagestructure.json | 2 ++ src/plasma/packagestructure/plasmageneric-packagestructure.json | 2 ++ src/plasma/packagestructure/plasmatheme-packagestructure.json | 2 ++ src/plasma/packagestructure/plasmoid-packagestructure.json | 2 ++ 5 files changed, 10 insertions(+) diff --git a/src/plasma/packagestructure/containmentactions-packagestructure.json b/src/plasma/packagestructure/containmentactions-packagestructure.json index 0cfb96ace..63c5a66ce 100644 --- a/src/plasma/packagestructure/containmentactions-packagestructure.json +++ b/src/plasma/packagestructure/containmentactions-packagestructure.json @@ -36,6 +36,7 @@ "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", "Name[sv]": "Aaron Seigo", + "Name[tg]": "Аарон Сейго (Aaron Seigo)", "Name[tr]": "Aaron Seigo", "Name[uk]": "Aaron Seigo", "Name[x-test]": "xxAaron Seigoxx", @@ -75,6 +76,7 @@ "Name[sr@latin]": "Radnje sadržaoca", "Name[sr]": "Радње садржаоца", "Name[sv]": "Omgivningsåtgärder", + "Name[tg]": "Амалҳои дарбаргиранда", "Name[tr]": "Sınırlama Eylemleri", "Name[uk]": "Дії з контейнерами", "Name[x-test]": "xxContainment Actionsxx", diff --git a/src/plasma/packagestructure/dataengine-packagestructure.json b/src/plasma/packagestructure/dataengine-packagestructure.json index 037a52965..d6d5de674 100644 --- a/src/plasma/packagestructure/dataengine-packagestructure.json +++ b/src/plasma/packagestructure/dataengine-packagestructure.json @@ -36,6 +36,7 @@ "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", "Name[sv]": "Aaron Seigo", + "Name[tg]": "Аарон Сейго (Aaron Seigo)", "Name[tr]": "Aaron Seigo", "Name[uk]": "Aaron Seigo", "Name[x-test]": "xxAaron Seigoxx", @@ -77,6 +78,7 @@ "Name[sr@latin]": "Datomotor", "Name[sr]": "Датомотор", "Name[sv]": "Datagränssnitt", + "Name[tg]": "Низоми иттилоотӣ", "Name[tr]": "Veri Motoru", "Name[uk]": "Рушій даних", "Name[x-test]": "xxData Enginexx", diff --git a/src/plasma/packagestructure/plasmageneric-packagestructure.json b/src/plasma/packagestructure/plasmageneric-packagestructure.json index 29b9db6c9..6b954d380 100644 --- a/src/plasma/packagestructure/plasmageneric-packagestructure.json +++ b/src/plasma/packagestructure/plasmageneric-packagestructure.json @@ -36,6 +36,7 @@ "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", "Name[sv]": "Aaron Seigo", + "Name[tg]": "Аарон Сейго (Aaron Seigo)", "Name[tr]": "Aaron Seigo", "Name[uk]": "Aaron Seigo", "Name[x-test]": "xxAaron Seigoxx", @@ -76,6 +77,7 @@ "Name[sr@latin]": "Generički", "Name[sr]": "Генерички", "Name[sv]": "Generella", + "Name[tg]": "Умумӣ", "Name[tr]": "Genel", "Name[uk]": "Загальний", "Name[x-test]": "xxGenericxx", diff --git a/src/plasma/packagestructure/plasmatheme-packagestructure.json b/src/plasma/packagestructure/plasmatheme-packagestructure.json index 6bec6bfa0..f43bb6380 100644 --- a/src/plasma/packagestructure/plasmatheme-packagestructure.json +++ b/src/plasma/packagestructure/plasmatheme-packagestructure.json @@ -36,6 +36,7 @@ "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", "Name[sv]": "Aaron Seigo", + "Name[tg]": "Аарон Сейго (Aaron Seigo)", "Name[tr]": "Aaron Seigo", "Name[uk]": "Aaron Seigo", "Name[x-test]": "xxAaron Seigoxx", @@ -77,6 +78,7 @@ "Name[sr@latin]": "Plasma tema", "Name[sr]": "Плазма тема", "Name[sv]": "Plasmatema", + "Name[tg]": "Мавзӯи Plasma", "Name[tr]": "Plasma Teması", "Name[uk]": "Тема Плазми", "Name[x-test]": "xxPlasma Themexx", diff --git a/src/plasma/packagestructure/plasmoid-packagestructure.json b/src/plasma/packagestructure/plasmoid-packagestructure.json index d6cdca08c..cc9204e8b 100644 --- a/src/plasma/packagestructure/plasmoid-packagestructure.json +++ b/src/plasma/packagestructure/plasmoid-packagestructure.json @@ -36,6 +36,7 @@ "Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr]": "Арон Џ. Сајго", "Name[sv]": "Aaron Seigo", + "Name[tg]": "Аарон Сейго (Aaron Seigo)", "Name[tr]": "Aaron Seigo", "Name[uk]": "Aaron Seigo", "Name[x-test]": "xxAaron Seigoxx", @@ -77,6 +78,7 @@ "Name[sr@latin]": "Plazmoid", "Name[sr]": "Плазмоид", "Name[sv]": "Plasmoid", + "Name[tg]": "Plasmoid", "Name[tr]": "Plasmoid", "Name[uk]": "Плазмоїд", "Name[x-test]": "xxPlasmoidxx",