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"
2021-08-31 01:29:11 +00:00 · 2021-08-31 01:29:11 +00:00 · 96c6f964e6
commit 96c6f964e6
parent 85a6dc3cad
1 changed files with 1 additions and 0 deletions
--- a/src/effects/overview/kcm/overvieweffectkcm.desktop
+++ b/src/effects/overview/kcm/overvieweffectkcm.desktop
@ -25,3 +25,4 @@ Name[sv]=översikt
 Name[uk]=огляд
 Name[vi]=tổng quan
 Name[x-test]=xxoverviewxx
+Name[zh_CN]=桌面总览图