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"

kdecoration/config/breezedecorationconfig.desktop

@@ -25,6 +25,7 @@ Name[sr@latin]=Povetarčeva dekoracija prozora
 Name[sv]=Breeze fönsterdekoration
 Name[uk]=Декорації вікон Breeze
 Name[x-test]=xxBreeze Window Decorationxx
+Name[zh_CN]=微风窗口装饰
 Comment=Modify the appearance of window decorations
 Comment[ar]=عدّل مظهر زخرفات النّوافذ
 Comment[ca]=Modifica l'aparença de les decoracions de les finestres

kstyle/config/breezestyleconfig.desktop

@@ -25,6 +25,7 @@ Name[sr@latin]=Povetarčev stil vidžetâ̂
 Name[sv]=Breeze stil för grafiska komponenter
 Name[uk]=Стиль віджетів Breeze
 Name[x-test]=xxBreeze Widget Stylexx
+Name[zh_CN]=微风小部件样式
 Comment=Modify the appearance of widgets
 Comment[ar]=عدّل مظهر الودجات
 Comment[ca]=Modifica l'aparença dels estris