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"

shell/metadata.desktop.cmake

@@ -98,7 +98,7 @@ Keywords[sl]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
-Keywords[zh_CN]=shell
+Keywords[zh_CN]=shell;外壳程序;waikechengxu;壳;ke;
 Keywords[zh_TW]=shell
 Type=Service
 

shell/package/metadata.desktop

@@ -98,7 +98,7 @@ Keywords[sl]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
-Keywords[zh_CN]=shell
+Keywords[zh_CN]=shell;外壳程序;waikechengxu;壳;ke;
 Keywords[zh_TW]=shell
 Type=Service