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

@@ -50,6 +50,7 @@
         ],
         "Id": "Plasma/ContainmentActions",
         "Name": "Containment Actions",
+        "Name[ar]": "إجراءات الاحتواء",
         "Name[az]": "Plasma konteyneri əməlləri",
         "Name[ca@valencia]": "Accions del contenidor",
         "Name[ca]": "Accions del contenidor",