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"

kstyle/config/breezestyleconfig.desktop

@@ -51,7 +51,7 @@ Name[tg]=Услуби виҷети Насим
 Name[tr]=Breeze Programcık Biçimi
 Name[uk]=Стиль віджетів Breeze
 Name[x-test]=xxBreeze Widget Stylexx
-Name[zh_CN]=Breeze 微风部件样式
+Name[zh_CN]=Breeze 微风部件风格
 Name[zh_TW]=Breeze 元件樣式
 Comment=Modify the appearance of widgets
 Comment[ar]=عدّل مظهر الودجات
@@ -145,5 +145,5 @@ X-KDE-Keywords[tg]=насим,виҷет,услуб
 X-KDE-Keywords[tr]=esinti,gereç,biçem
 X-KDE-Keywords[uk]=breeze,widget,style,бриз,віджет,стиль,вигляд
 X-KDE-Keywords[x-test]=xxbreezexx,xxwidgetxx,xxstylexx
-X-KDE-Keywords[zh_CN]=breeze,微风,部件,样式
+X-KDE-Keywords[zh_CN]=breeze,微风,部件,样式,风格
 X-KDE-Keywords[zh_TW]=breeze,widget,style

wallpapers/Next/metadata.desktop

@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Patak
+Name[az]=Patak
 Name[ca]=Patak
 Name[cs]=Patak
 Name[el]=Patak