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

@@ -27,6 +27,7 @@ Name[ia]=Decoration de fenestra Breeze
 Name[it]=Decorazione delle finestre di Brezza
 Name[ko]=Breeze 창 장식
 Name[nl]=Breeze vensterdecoratie
+Name[nn]=Breeze-vindaugsdekorasjon
 Name[pl]=Wygląd okien Bryzy
 Name[pt]=Decoração de Janelas Brisa
 Name[pt_BR]=Decorações da janela Breeze

kstyle/config/breezestyleconfig.desktop

@@ -27,6 +27,7 @@ Name[ia]=Stilo de Elemento Graphic de Fenestra (Widget) de Breeze
 Name[it]=Stile degli oggetti di Brezza
 Name[ko]=Breeze 위젯 스타일
 Name[nl]=Breeze widgetstijl
+Name[nn]=Breeze-elementstil
 Name[pl]=Wygląd interfejsu Bryzy
 Name[pt]=Estilo Gráfico Brisa
 Name[pt_BR]=Estilo dos widgets Breeze
@@ -41,7 +42,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]=عدّل مظهر الودجات