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"

linux/applications/org.kde.falkon.desktop

@@ -34,7 +34,7 @@ Name[sv]=Falkon
 Name[tr]=Falkon
 Name[uk]=Falkon
 Name[x-test]=xxFalkonxx
-Name[zh_CN]=Falkon
+Name[zh_CN]=Falkon 浏览器
 Name[zh_TW]=Falkon
 Type=Application
 Icon=falkon