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

@@ -13,6 +13,7 @@
         ], 
         "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", 

src/plasma/packagestructure/dataengine-packagestructure.json

@@ -13,6 +13,7 @@
         ], 
         "Id": "Plasma/DataEngine", 
         "Name": "Data Engine", 
+        "Name[ast]": "Motor de datos", 
         "Name[ca@valencia]": "Motor de dades", 
         "Name[ca]": "Motor de dades", 
         "Name[cs]": "Datový nástroj", 

src/plasma/packagestructure/plasmatheme-packagestructure.json

@@ -13,6 +13,7 @@
         ], 
         "Id": "Plasma/Theme", 
         "Name": "Plasma Theme", 
+        "Name[ast]": "Tema Plasma", 
         "Name[ca@valencia]": "Tema del Plasma", 
         "Name[ca]": "Tema del Plasma", 
         "Name[cs]": "Motiv Plasma", 

src/plasma/packagestructure/plasmoid-packagestructure.json

@@ -13,6 +13,7 @@
         ], 
         "Id": "Plasma/Applet", 
         "Name": "Plasmoid", 
+        "Name[ast]": "Plasmoide", 
         "Name[ca@valencia]": "Plasmoide", 
         "Name[ca]": "Plasmoide", 
         "Name[el]": "Πλασμοειδές",