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"

plugins/platforms/x11/standalone/x11.json

@@ -1,8 +1,8 @@
 {
     "KPlugin": {
-        "Description": "Platform plugin for standalone x11 in kwin_x11.",
-        "Id": "KWinX11Platform",
+        "Description": "Platform plugin for standalone x11 in kwin_x11.", 
+        "Id": "KWinX11Platform", 
         "Name": "x11-standalone"
-    },
+    }, 
     "input": true
-}
+}