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"

backends/hwcomposer/hwcomposer.json

@@ -32,4 +32,4 @@
         "Name[zh_CN]": "hwcomposer"
     }, 
     "input": false
-}
+}