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"

framebuffers/x11/krfb_framebuffer_x11.json

@@ -42,6 +42,7 @@
         "Name[sv]": "X11-rambuffert för Krfb", 
         "Name[uk]": "Буфер кадрів X11 для KRfb", 
         "Name[x-test]": "xxX11 Framebuffer for KRfbxx", 
+        "Name[zh_CN]": "XRfb 的 X11 帧缓冲", 
         "ServiceTypes": [
             "krfb/framebuffer"
         ],