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"

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", 

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", 

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", 

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",