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

@@ -21,6 +21,7 @@ Name[es]=Decoración de ventanas Brisa
 Name[eu]=Breeze leihoen apaindura
 Name[fi]=Breeze-ikkunankehys
 Name[fr]=Décoration de fenêtre Brise
+Name[gl]=Decoración de xanela de Breeze
 Name[hu]=Breeze ablakdekoráció
 Name[ia]=Decoration de fenestra Breeze
 Name[it]=Decorazione delle finestre di Brezza

kstyle/config/breezestyleconfig.desktop

@@ -21,6 +21,7 @@ Name[es]=Estilo de elementos gráficos Brisa
 Name[eu]=Breeze trepeten estiloa
 Name[fi]=Breeze-elementtityyli
 Name[fr]=Style de composant graphique Brise
+Name[gl]=Estilo do trebello de Breeze
 Name[hu]=Breeze elemstílus
 Name[ia]=Stilo de Elemento Graphic de Fenestra (Widget) de Breeze
 Name[it]=Stile degli oggetti di Brezza