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"

runners/locations/plasma-runner-locations.desktop

@@ -73,7 +73,7 @@ Name[uk]=Адреси
 Name[vi]=Vị trí
 Name[wa]=Eplaeçmints
 Name[x-test]=xxLocationsxx
-Name[zh_CN]=地点
+Name[zh_CN]=位置
 Name[zh_TW]=位置
 Comment=File and URL opener
 Comment[ar]=فاتح ملفات ووصلات