From 732b7d82a4232085d4adfa6d24a0671fedca205a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 29 Sep 2016 09:53:12 +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" --- .../packagestructure/containmentactions-packagestructure.json | 1 + src/plasma/packagestructure/dataengine-packagestructure.json | 1 + src/plasma/packagestructure/plasmatheme-packagestructure.json | 1 + src/plasma/packagestructure/plasmoid-packagestructure.json | 1 + 4 files changed, 4 insertions(+) diff --git a/src/plasma/packagestructure/containmentactions-packagestructure.json b/src/plasma/packagestructure/containmentactions-packagestructure.json index 7a54c39ab..36206b5b2 100644 --- a/src/plasma/packagestructure/containmentactions-packagestructure.json +++ b/src/plasma/packagestructure/containmentactions-packagestructure.json @@ -17,6 +17,7 @@ "Name[ca]": "Accions del contenidor", "Name[da]": "Beholder-handlinger", "Name[de]": "Containment-Aktionen", + "Name[el]": "Ενέργειες υποδοχέα", "Name[es]": "Acciones del contenedor", "Name[et]": "Konteineritoimingud", "Name[it]": "Azioni dei contenitori", diff --git a/src/plasma/packagestructure/dataengine-packagestructure.json b/src/plasma/packagestructure/dataengine-packagestructure.json index 5a993de86..377624b8a 100644 --- a/src/plasma/packagestructure/dataengine-packagestructure.json +++ b/src/plasma/packagestructure/dataengine-packagestructure.json @@ -18,6 +18,7 @@ "Name[cs]": "Datový nástroj", "Name[da]": "Datamotor", "Name[de]": "Datenmodul", + "Name[el]": "Μηχανή δεδομένων", "Name[es]": "Motor de datos", "Name[et]": "Andmemootor", "Name[it]": "Motore dati", diff --git a/src/plasma/packagestructure/plasmatheme-packagestructure.json b/src/plasma/packagestructure/plasmatheme-packagestructure.json index b5f4f4a97..70807a227 100644 --- a/src/plasma/packagestructure/plasmatheme-packagestructure.json +++ b/src/plasma/packagestructure/plasmatheme-packagestructure.json @@ -18,6 +18,7 @@ "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[it]": "Tema di Plasma", diff --git a/src/plasma/packagestructure/plasmoid-packagestructure.json b/src/plasma/packagestructure/plasmoid-packagestructure.json index f1ca0d343..338dfce4c 100644 --- a/src/plasma/packagestructure/plasmoid-packagestructure.json +++ b/src/plasma/packagestructure/plasmoid-packagestructure.json @@ -15,6 +15,7 @@ "Name": "Plasmoid", "Name[ca@valencia]": "Plasmoide", "Name[ca]": "Plasmoide", + "Name[el]": "Πλασμοειδές", "Name[es]": "Plasmoide", "Name[it]": "Plasmoide", "Name[pl]": "Plazmoid",