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/drm/drm.json

@@ -44,4 +44,4 @@
         "Name[x-test]": "xxdrmxx"
     }, 
     "input": false
-}
+}

plugins/platforms/fbdev/fbdev.json

@@ -48,4 +48,4 @@
         "Name[x-test]": "xxframebufferxx"
     }, 
     "input": false
-}
+}

plugins/platforms/hwcomposer/hwcomposer.json

@@ -40,4 +40,4 @@
         "Name[x-test]": "xxhwcomposerxx"
     }, 
     "input": false
-}
+}

plugins/platforms/virtual/virtual.json

@@ -50,4 +50,4 @@
         "Name[zh_TW]": "虛擬"
     }, 
     "input": true
-}
+}

plugins/platforms/wayland/wayland.json

@@ -42,4 +42,4 @@
         "Name[x-test]": "xxwaylandxx"
     }, 
     "input": true
-}
+}

plugins/platforms/x11/standalone/x11.json

@@ -50,4 +50,4 @@
         "Name[x-test]": "xxx11-standalonexx"
     }, 
     "input": true
-}
+}

plugins/platforms/x11/windowed/x11.json

@@ -44,4 +44,4 @@
         "Name[x-test]": "xxx11xx"
     }, 
     "input": true
-}
+}