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"

src/plasma/applets/worldclock/package/metadata.desktop

@@ -94,6 +94,7 @@ Comment[tr]=Dünyanın değişik bölgelerindeki saati gösterir
 Comment[ug]=دۇنيادىكى ئوخشىمىغان جايلارنىڭ ۋاقتىنى كۆرسىتىدۇ
 Comment[uk]=Показує вам час у різних частинах світу
 Comment[x-test]=xxShows the time in different parts of the worldxx
+Comment[zh_CN]=显示世界各地时间
 Comment[zh_TW]=顯示世界上不同地區的時間
 
 Icon=marble