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 contención", 
         "Name[ca@valencia]": "Accions del contenidor", 
         "Name[ca]": "Accions del contenidor", 
         "Name[da]": "Beholder-handlinger", 

src/plasma/packagestructure/plasmageneric-packagestructure.json

@@ -13,6 +13,7 @@
         ], 
         "Id": "Plasma/Generic", 
         "Name": "Generic", 
+        "Name[ast]": "Xenérico", 
         "Name[ca@valencia]": "Genèric", 
         "Name[ca]": "Genèric", 
         "Name[cs]": "Obecné",