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"

desktop/konsole.notifyrc

@@ -792,7 +792,7 @@ Name[uz]=Seans nolga teng boʻlmagan holat bilan tugadi
 Name[uz@cyrillic]=Сеанс нолга тенг бўлмаган ҳолат билан тугади
 Name[wa]=Session fineye avou on statut nén zero
 Name[x-test]=xxSession Finished With Non-Zero Statusxx
-Name[zh_CN]=非零状态完成的会话
+Name[zh_CN]=会话以非零状态完成
 Name[zh_TW]=工作階段以不正常狀態結束
 Comment=A session has exited with non-zero status
 Comment[af]='n Sessie het met 'n nie-zero status geëindig

desktop/konsolehere.desktop

@@ -99,7 +99,7 @@ Name[vi]=Mở cửa sổ dòng lệnh ở đây
 Name[wa]=Drovi on terminå chal
 Name[xh]=Vula Isiphelo Sendlela Apha
 Name[x-test]=xxOpen Terminal Herexx
-Name[zh_CN]=在此打开终端
+Name[zh_CN]=在此处打开终端
 Name[zh_TW]=在這裡開啟終端機
 
 Comment=Opens a terminal at the current folder