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"

dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop

@@ -14,6 +14,7 @@ Name[pt_BR]=BBC Weather
 Name[sv]=BBC Weather
 Name[uk]=Погода BBC
 Name[x-test]=xxBBC Weatherxx
+Name[zh_CN]=BBC 天气
 Name[zh_TW]=BBC 天氣
 Comment=XML Data from the British Broadcasting Corporation
 Comment[ca]=Dades XML de la British Broadcasting Corporation
@@ -30,6 +31,7 @@ Comment[pt_BR]=Dados em XML da BBC (British Broadcasting Corporation)
 Comment[sv]=XML-data från British Broadcasting Corporation
 Comment[uk]=Дані XML від BBC
 Comment[x-test]=xxXML Data from the British Broadcasting Corporationxx
+Comment[zh_CN]=来自英国广播公司的 XML 数据
 Comment[zh_TW]=來自英國廣播公司的 XML 資料
 X-KDE-ServiceTypes=Plasma/DataEngine
 X-KDE-ParentApp=weatherengine

lookandfeel/metadata.desktop

@@ -4,11 +4,13 @@ Comment[ca]=Brisa pel VDG del KDE
 Comment[es]=Brisa por KDE VDG
 Comment[gl]=Breeze de KDE VDG
 Comment[nl]=Breeze door de KDE VDG
+Comment[nn]=Breeze frå KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 Comment[pt_BR]=Breeze pelo KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
 Comment[uk]=Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze by the KDE VDGxx
+Comment[zh_CN]=微风，由 KDE VDG 创作
 Comment[zh_TW]=由 KDE VDG 設計的 Breeze
 Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
 Keywords[ca]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;

sddm-theme/metadata.desktop

@@ -48,11 +48,13 @@ Description[ca]=Brisa
 Description[es]=Brisa
 Description[gl]=Breeze
 Description[nl]=Breeze
+Description[nn]=Breeze
 Description[pt]=Brisa
 Description[pt_BR]=Breeze
 Description[sv]=Breeze
 Description[uk]=Breeze
 Description[x-test]=xxBreezexx
+Description[zh_CN]=微风
 Description[zh_TW]=Breeze
 Author=KDE Visual Design Group
 Copyright=(c) 2014, David Edmundson