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"
7 years ago · fd99f8c325
parent 2d16bcd976
commit fd99f8c325
2 changed files with 2 additions and 0 deletions
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@ -49,6 +49,7 @@ Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
+Keywords[zh_CN]=shell
 Keywords[zh_TW]=shell
 Type=Service

--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@ -49,6 +49,7 @@ Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
+Keywords[zh_CN]=shell
 Keywords[zh_TW]=shell
 Type=Service