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"

colors/BreezeHighContrast.colors

@@ -113,6 +113,7 @@ Name[gl]=Breeze de alto contraste
 Name[id]=Breeze High Contrast
 Name[it]=Brezza alto contrasto
 Name[nl]=Breeze met hoog contrast
+Name[nn]=Breeze høgkontrast
 Name[pt]=Brisa de Alto Contraste
 Name[pt_BR]=Breeze Alto Contraste
 Name[ru]=Breeze, высококонтрастный вариант

colors/BreezeLight.colors

@@ -114,6 +114,7 @@ Name[gl]=Breeze claro
 Name[id]=Breeze Light
 Name[it]=Brezza chiaro
 Name[nl]=Breeze Light
+Name[nn]=Breeze lys
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
 Name[ru]=Breeze

kstyle/config/breezestyleconfig.desktop

@@ -43,7 +43,7 @@ Name[sv]=Breeze stil för grafiska komponenter
 Name[tr]=Breeze Programcık Biçimi
 Name[uk]=Стиль віджетів Breeze
 Name[x-test]=xxBreeze Widget Stylexx
-Name[zh_CN]=微风小部件样式
+Name[zh_CN]=微风部件样式
 Name[zh_TW]=Breeze 元件樣式
 Comment=Modify the appearance of widgets
 Comment[ar]=عدّل مظهر الودجات

wallpapers/Next/metadata.desktop

@@ -42,7 +42,7 @@ Name[sv]=Next
 Name[tr]=Sonraki
 Name[uk]=Next
 Name[x-test]=xxNextxx
-Name[zh_CN]=未来
+Name[zh_CN]=下一个视图
 Name[zh_TW]=下一個
 
 X-KDE-PluginInfo-Name=Next