From bef06120298f85e49b316b160c3b1e9b57068e9e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 9 Apr 2017 04:01:12 +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 | 78 ++++++++--------- .../dataengine-packagestructure.json | 84 +++++++++---------- .../plasmageneric-packagestructure.json | 80 +++++++++--------- .../plasmatheme-packagestructure.json | 84 +++++++++---------- .../plasmoid-packagestructure.json | 64 +++++++------- 5 files changed, 195 insertions(+), 195 deletions(-) diff --git a/src/plasma/packagestructure/containmentactions-packagestructure.json b/src/plasma/packagestructure/containmentactions-packagestructure.json index 61d93e81a..05ab63ac2 100644 --- a/src/plasma/packagestructure/containmentactions-packagestructure.json +++ b/src/plasma/packagestructure/containmentactions-packagestructure.json @@ -2,49 +2,49 @@ "KPlugin": { "Authors": [ { - "Email": "aseigo@kde.org", - "Name": "Aaron Seigo", - "Name[sr@ijekavian]": "Арон Џ. Сајго", - "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", - "Name[sr@latin]": "Aron Dž. Sajgo", - "Name[sr]": "Арон Џ. Сајго", + "Email": "aseigo@kde.org", + "Name": "Aaron Seigo", + "Name[sr@ijekavian]": "Арон Џ. Сајго", + "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", + "Name[sr@latin]": "Aron Dž. Sajgo", + "Name[sr]": "Арон Џ. Сајго", "Name[x-test]": "xxAaron Seigoxx" } - ], - "Id": "Plasma/ContainmentActions", - "Name": "Containment Actions", - "Name[ast]": "Aiciones de conteición", - "Name[ca@valencia]": "Accions del contenidor", - "Name[ca]": "Accions del contenidor", - "Name[da]": "Beholder-handlinger", - "Name[de]": "Containment-Aktionen", - "Name[el]": "Ενέργειες υποδοχέα", - "Name[es]": "Acciones del contenedor", - "Name[et]": "Konteineritoimingud", - "Name[fi]": "Sovelmasäiliön toiminnot", - "Name[ia]": "Actiones de continer", - "Name[it]": "Azioni dei contenitori", - "Name[ko]": "컨테이너 동작", - "Name[nl]": "Containeracties", - "Name[nn]": "Behaldarhandlingar", - "Name[pl]": "Działania pojemnika", - "Name[pt]": "Acções do Contentor", - "Name[ru]": "Действия для контейнера Plasma", - "Name[sk]": "Akcie obsahu", - "Name[sl]": "Dejanja vsebnikov", - "Name[sr@ijekavian]": "Радње садржаоца", - "Name[sr@ijekavianlatin]": "Radnje sadržaoca", - "Name[sr@latin]": "Radnje sadržaoca", - "Name[sr]": "Радње садржаоца", - "Name[sv]": "Omgivningsåtgärder", - "Name[uk]": "Дії з контейнерами", - "Name[x-test]": "xxContainment Actionsxx", - "Name[zh_CN]": "容器动作", - "Name[zh_TW]": "遏止動作", + ], + "Id": "Plasma/ContainmentActions", + "Name": "Containment Actions", + "Name[ast]": "Aiciones de conteición", + "Name[ca@valencia]": "Accions del contenidor", + "Name[ca]": "Accions del contenidor", + "Name[da]": "Beholder-handlinger", + "Name[de]": "Containment-Aktionen", + "Name[el]": "Ενέργειες υποδοχέα", + "Name[es]": "Acciones del contenedor", + "Name[et]": "Konteineritoimingud", + "Name[fi]": "Sovelmasäiliön toiminnot", + "Name[ia]": "Actiones de continer", + "Name[it]": "Azioni dei contenitori", + "Name[ko]": "컨테이너 동작", + "Name[nl]": "Containeracties", + "Name[nn]": "Behaldarhandlingar", + "Name[pl]": "Działania pojemnika", + "Name[pt]": "Acções do Contentor", + "Name[ru]": "Действия для контейнера Plasma", + "Name[sk]": "Akcie obsahu", + "Name[sl]": "Dejanja vsebnikov", + "Name[sr@ijekavian]": "Радње садржаоца", + "Name[sr@ijekavianlatin]": "Radnje sadržaoca", + "Name[sr@latin]": "Radnje sadržaoca", + "Name[sr]": "Радње садржаоца", + "Name[sv]": "Omgivningsåtgärder", + "Name[uk]": "Дії з контейнерами", + "Name[x-test]": "xxContainment Actionsxx", + "Name[zh_CN]": "容器动作", + "Name[zh_TW]": "遏止動作", "ServiceTypes": [ "KPackage/PackageStructure" - ], + ], "Version": "1" - }, + }, "X-KDE-ParentApp": "org.kde.plasmashell" } diff --git a/src/plasma/packagestructure/dataengine-packagestructure.json b/src/plasma/packagestructure/dataengine-packagestructure.json index de0096e7b..b83aeef21 100644 --- a/src/plasma/packagestructure/dataengine-packagestructure.json +++ b/src/plasma/packagestructure/dataengine-packagestructure.json @@ -2,52 +2,52 @@ "KPlugin": { "Authors": [ { - "Email": "aseigo@kde.org", - "Name": "Aaron Seigo", - "Name[sr@ijekavian]": "Арон Џ. Сајго", - "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", - "Name[sr@latin]": "Aron Dž. Sajgo", - "Name[sr]": "Арон Џ. Сајго", + "Email": "aseigo@kde.org", + "Name": "Aaron Seigo", + "Name[sr@ijekavian]": "Арон Џ. Сајго", + "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", + "Name[sr@latin]": "Aron Dž. Sajgo", + "Name[sr]": "Арон Џ. Сајго", "Name[x-test]": "xxAaron Seigoxx" } - ], - "Id": "Plasma/DataEngine", - "Name": "Data Engine", - "Name[ar]": "محرّك بيانات", - "Name[ast]": "Motor de datos", - "Name[ca@valencia]": "Motor de dades", - "Name[ca]": "Motor de dades", - "Name[cs]": "Datový nástroj", - "Name[da]": "Datamotor", - "Name[de]": "Datenmodul", - "Name[el]": "Μηχανή δεδομένων", - "Name[es]": "Motor de datos", - "Name[et]": "Andmemootor", - "Name[fi]": "Tietomoottori", - "Name[fr]": "Moteur de données", - "Name[ia]": "Motor de datos", - "Name[it]": "Motore dati", - "Name[ko]": "데이터 엔진", - "Name[nl]": "Gegevensengine", - "Name[nn]": "Datamotor", - "Name[pl]": "Silnik danych", - "Name[pt]": "Motor de Dados", - "Name[ru]": "Источник данных Plasma", - "Name[sk]": "Dátový nástroj", - "Name[sl]": "Podatkovni pogon", - "Name[sr@ijekavian]": "Датомотор", - "Name[sr@ijekavianlatin]": "Datomotor", - "Name[sr@latin]": "Datomotor", - "Name[sr]": "Датомотор", - "Name[sv]": "Datagränssnitt", - "Name[uk]": "Рушій даних", - "Name[x-test]": "xxData Enginexx", - "Name[zh_CN]": "数据引擎", - "Name[zh_TW]": "資料引擎", + ], + "Id": "Plasma/DataEngine", + "Name": "Data Engine", + "Name[ar]": "محرّك بيانات", + "Name[ast]": "Motor de datos", + "Name[ca@valencia]": "Motor de dades", + "Name[ca]": "Motor de dades", + "Name[cs]": "Datový nástroj", + "Name[da]": "Datamotor", + "Name[de]": "Datenmodul", + "Name[el]": "Μηχανή δεδομένων", + "Name[es]": "Motor de datos", + "Name[et]": "Andmemootor", + "Name[fi]": "Tietomoottori", + "Name[fr]": "Moteur de données", + "Name[ia]": "Motor de datos", + "Name[it]": "Motore dati", + "Name[ko]": "데이터 엔진", + "Name[nl]": "Gegevensengine", + "Name[nn]": "Datamotor", + "Name[pl]": "Silnik danych", + "Name[pt]": "Motor de Dados", + "Name[ru]": "Источник данных Plasma", + "Name[sk]": "Dátový nástroj", + "Name[sl]": "Podatkovni pogon", + "Name[sr@ijekavian]": "Датомотор", + "Name[sr@ijekavianlatin]": "Datomotor", + "Name[sr@latin]": "Datomotor", + "Name[sr]": "Датомотор", + "Name[sv]": "Datagränssnitt", + "Name[uk]": "Рушій даних", + "Name[x-test]": "xxData Enginexx", + "Name[zh_CN]": "数据引擎", + "Name[zh_TW]": "資料引擎", "ServiceTypes": [ "KPackage/PackageStructure" - ], + ], "Version": "1" - }, + }, "X-KDE-ParentApp": "org.kde.plasmashell" } diff --git a/src/plasma/packagestructure/plasmageneric-packagestructure.json b/src/plasma/packagestructure/plasmageneric-packagestructure.json index 27370a978..e0245b760 100644 --- a/src/plasma/packagestructure/plasmageneric-packagestructure.json +++ b/src/plasma/packagestructure/plasmageneric-packagestructure.json @@ -2,50 +2,50 @@ "KPlugin": { "Authors": [ { - "Email": "aseigo@kde.org", - "Name": "Aaron Seigo", - "Name[sr@ijekavian]": "Арон Џ. Сајго", - "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", - "Name[sr@latin]": "Aron Dž. Sajgo", - "Name[sr]": "Арон Џ. Сајго", + "Email": "aseigo@kde.org", + "Name": "Aaron Seigo", + "Name[sr@ijekavian]": "Арон Џ. Сајго", + "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", + "Name[sr@latin]": "Aron Dž. Sajgo", + "Name[sr]": "Арон Џ. Сајго", "Name[x-test]": "xxAaron Seigoxx" } - ], - "Id": "Plasma/Generic", - "Name": "Generic", - "Name[ar]": "عامّة", - "Name[ca@valencia]": "Genèric", - "Name[ca]": "Genèric", - "Name[cs]": "Obecné", - "Name[da]": "Generisk", - "Name[de]": "Generisch", - "Name[es]": "General", - "Name[et]": "Üldine", - "Name[fi]": "Yleinen", - "Name[fr]": "Générique", - "Name[it]": "Generico", - "Name[ko]": "일반", - "Name[nl]": "Algemeen", - "Name[nn]": "Generisk", - "Name[pl]": "Ogólne", - "Name[pt]": "Genérico", - "Name[pt_BR]": "Genérico", - "Name[ru]": "Пакет Plasma общего назначения", - "Name[sk]": "Všeobecné", - "Name[sl]": "Splošno", - "Name[sr@ijekavian]": "Генерички", - "Name[sr@ijekavianlatin]": "Generički", - "Name[sr@latin]": "Generički", - "Name[sr]": "Генерички", - "Name[sv]": "Generella", - "Name[uk]": "Загальний", - "Name[x-test]": "xxGenericxx", - "Name[zh_CN]": "常规", - "Name[zh_TW]": "一般", + ], + "Id": "Plasma/Generic", + "Name": "Generic", + "Name[ar]": "عامّة", + "Name[ca@valencia]": "Genèric", + "Name[ca]": "Genèric", + "Name[cs]": "Obecné", + "Name[da]": "Generisk", + "Name[de]": "Generisch", + "Name[es]": "General", + "Name[et]": "Üldine", + "Name[fi]": "Yleinen", + "Name[fr]": "Générique", + "Name[it]": "Generico", + "Name[ko]": "일반", + "Name[nl]": "Algemeen", + "Name[nn]": "Generisk", + "Name[pl]": "Ogólne", + "Name[pt]": "Genérico", + "Name[pt_BR]": "Genérico", + "Name[ru]": "Пакет Plasma общего назначения", + "Name[sk]": "Všeobecné", + "Name[sl]": "Splošno", + "Name[sr@ijekavian]": "Генерички", + "Name[sr@ijekavianlatin]": "Generički", + "Name[sr@latin]": "Generički", + "Name[sr]": "Генерички", + "Name[sv]": "Generella", + "Name[uk]": "Загальний", + "Name[x-test]": "xxGenericxx", + "Name[zh_CN]": "常规", + "Name[zh_TW]": "一般", "ServiceTypes": [ "KPackage/PackageStructure" - ], + ], "Version": "1" - }, + }, "X-KDE-ParentApp": "org.kde.plasmashell" } diff --git a/src/plasma/packagestructure/plasmatheme-packagestructure.json b/src/plasma/packagestructure/plasmatheme-packagestructure.json index dd9b221e3..8240d7e7b 100644 --- a/src/plasma/packagestructure/plasmatheme-packagestructure.json +++ b/src/plasma/packagestructure/plasmatheme-packagestructure.json @@ -2,52 +2,52 @@ "KPlugin": { "Authors": [ { - "Email": "aseigo@kde.org", - "Name": "Aaron Seigo", - "Name[sr@ijekavian]": "Арон Џ. Сајго", - "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", - "Name[sr@latin]": "Aron Dž. Sajgo", - "Name[sr]": "Арон Џ. Сајго", + "Email": "aseigo@kde.org", + "Name": "Aaron Seigo", + "Name[sr@ijekavian]": "Арон Џ. Сајго", + "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", + "Name[sr@latin]": "Aron Dž. Sajgo", + "Name[sr]": "Арон Џ. Сајго", "Name[x-test]": "xxAaron Seigoxx" } - ], - "Id": "Plasma/Theme", - "Name": "Plasma Theme", - "Name[ar]": "سمة بلازما", - "Name[ast]": "Tema Plasma", - "Name[ca@valencia]": "Tema del Plasma", - "Name[ca]": "Tema del Plasma", - "Name[cs]": "Motiv Plasma", - "Name[da]": "Plasma-tema", - "Name[de]": "Plasma-Design", - "Name[el]": "Θέμα Plasma", - "Name[es]": "Tema de Plasma", - "Name[et]": "Plasma teema", - "Name[fi]": "Plasma-teema", - "Name[fr]": "Thème Plasma pour les thèmes foncés", - "Name[ia]": "Thema de Plasma", - "Name[it]": "Tema di Plasma", - "Name[ko]": "Plasma 테마", - "Name[nl]": "Plasma-thema", - "Name[nn]": "Plasma-tema", - "Name[pl]": "Wystrój Plazmy", - "Name[pt]": "Tema do Plasma", - "Name[ru]": "Тема оформления Plasma", - "Name[sk]": "Téma Plasmy", - "Name[sl]": "Tema za Plasmo", - "Name[sr@ijekavian]": "Плазма тема", - "Name[sr@ijekavianlatin]": "Plasma tema", - "Name[sr@latin]": "Plasma tema", - "Name[sr]": "Плазма тема", - "Name[sv]": "Plasmatema", - "Name[uk]": "Тема Плазми", - "Name[x-test]": "xxPlasma Themexx", - "Name[zh_CN]": "Plasma 主题", - "Name[zh_TW]": "Plasma 主題", + ], + "Id": "Plasma/Theme", + "Name": "Plasma Theme", + "Name[ar]": "سمة بلازما", + "Name[ast]": "Tema Plasma", + "Name[ca@valencia]": "Tema del Plasma", + "Name[ca]": "Tema del Plasma", + "Name[cs]": "Motiv Plasma", + "Name[da]": "Plasma-tema", + "Name[de]": "Plasma-Design", + "Name[el]": "Θέμα Plasma", + "Name[es]": "Tema de Plasma", + "Name[et]": "Plasma teema", + "Name[fi]": "Plasma-teema", + "Name[fr]": "Thème Plasma pour les thèmes foncés", + "Name[ia]": "Thema de Plasma", + "Name[it]": "Tema di Plasma", + "Name[ko]": "Plasma 테마", + "Name[nl]": "Plasma-thema", + "Name[nn]": "Plasma-tema", + "Name[pl]": "Wystrój Plazmy", + "Name[pt]": "Tema do Plasma", + "Name[ru]": "Тема оформления Plasma", + "Name[sk]": "Téma Plasmy", + "Name[sl]": "Tema za Plasmo", + "Name[sr@ijekavian]": "Плазма тема", + "Name[sr@ijekavianlatin]": "Plasma tema", + "Name[sr@latin]": "Plasma tema", + "Name[sr]": "Плазма тема", + "Name[sv]": "Plasmatema", + "Name[uk]": "Тема Плазми", + "Name[x-test]": "xxPlasma Themexx", + "Name[zh_CN]": "Plasma 主题", + "Name[zh_TW]": "Plasma 主題", "ServiceTypes": [ "KPackage/PackageStructure" - ], + ], "Version": "1" - }, + }, "X-KDE-ParentApp": "org.kde.plasmashell" } diff --git a/src/plasma/packagestructure/plasmoid-packagestructure.json b/src/plasma/packagestructure/plasmoid-packagestructure.json index 4f7b7b1bb..d4fdc6b35 100644 --- a/src/plasma/packagestructure/plasmoid-packagestructure.json +++ b/src/plasma/packagestructure/plasmoid-packagestructure.json @@ -2,42 +2,42 @@ "KPlugin": { "Authors": [ { - "Email": "aseigo@kde.org", - "Name": "Aaron Seigo", - "Name[sr@ijekavian]": "Арон Џ. Сајго", - "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", - "Name[sr@latin]": "Aron Dž. Sajgo", - "Name[sr]": "Арон Џ. Сајго", + "Email": "aseigo@kde.org", + "Name": "Aaron Seigo", + "Name[sr@ijekavian]": "Арон Џ. Сајго", + "Name[sr@ijekavianlatin]": "Aron Dž. Sajgo", + "Name[sr@latin]": "Aron Dž. Sajgo", + "Name[sr]": "Арон Џ. Сајго", "Name[x-test]": "xxAaron Seigoxx" } - ], - "Id": "Plasma/Applet", - "Name": "Plasmoid", - "Name[ar]": "بلازمويد", - "Name[ast]": "Plasmoide", - "Name[ca@valencia]": "Plasmoide", - "Name[ca]": "Plasmoide", - "Name[el]": "Πλασμοειδές", - "Name[es]": "Plasmoide", - "Name[fi]": "Plasmoidi", - "Name[fr]": "Plasmoïde", - "Name[it]": "Plasmoide", - "Name[nn]": "Plasmoide", - "Name[pl]": "Plazmoid", - "Name[pt]": "Plasmóide", - "Name[ru]": "Виджет Plasma", - "Name[sr@ijekavian]": "Плазмоид", - "Name[sr@ijekavianlatin]": "Plazmoid", - "Name[sr@latin]": "Plazmoid", - "Name[sr]": "Плазмоид", - "Name[uk]": "Плазмоїд", - "Name[x-test]": "xxPlasmoidxx", - "Name[zh_CN]": "小部件", - "Name[zh_TW]": "元件", + ], + "Id": "Plasma/Applet", + "Name": "Plasmoid", + "Name[ar]": "بلازمويد", + "Name[ast]": "Plasmoide", + "Name[ca@valencia]": "Plasmoide", + "Name[ca]": "Plasmoide", + "Name[el]": "Πλασμοειδές", + "Name[es]": "Plasmoide", + "Name[fi]": "Plasmoidi", + "Name[fr]": "Plasmoïde", + "Name[it]": "Plasmoide", + "Name[nn]": "Plasmoide", + "Name[pl]": "Plazmoid", + "Name[pt]": "Plasmóide", + "Name[ru]": "Виджет Plasma", + "Name[sr@ijekavian]": "Плазмоид", + "Name[sr@ijekavianlatin]": "Plazmoid", + "Name[sr@latin]": "Plazmoid", + "Name[sr]": "Плазмоид", + "Name[uk]": "Плазмоїд", + "Name[x-test]": "xxPlasmoidxx", + "Name[zh_CN]": "小部件", + "Name[zh_TW]": "元件", "ServiceTypes": [ "KPackage/PackageStructure" - ], + ], "Version": "1" - }, + }, "X-KDE-ParentApp": "org.kde.plasmashell" }