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"

gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop

@@ -9,6 +9,7 @@ Name[nn]=GMenuDBusMenuProxy
 Name[pt]=GMenuDBusMenuProxy
 Name[uk]=Проксі-меню GMenu D-Bus
 Name[x-test]=xxGMenuDBusMenuProxyxx
+Name[zh_CN]=GMenuDBusMenuProxy
 Type=Application
 X-KDE-StartupNotify=false
 OnlyShowIn=KDE;