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"

kdecoration/breeze.json

@@ -1,9 +1,9 @@
 {
     "KPlugin": {
-        "Name": "Breeze",
-        "Description": "Window decoration using the Breeze visual style for the Plasma Desktop",
+        "Description": "Window decoration using the Breeze visual style for the Plasma Desktop", 
         "EnabledByDefault": true, 
         "Id": "org.kde.breeze", 
+        "Name": "Breeze", 
         "ServiceTypes": [
             "org.kde.kdecoration2"
         ]
@@ -12,4 +12,4 @@
         "blur": false, 
         "kcmodule": true
     }
-}
+}