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

@@ -16,6 +16,7 @@ Name[cs]=Dekorace oken Breeze
 Name[el]=Διακοσμήσεις παραθύρου Breeze
 Name[es]=Decoración de ventanas Brisa
 Name[eu]=Breeze leihoen apaindura
+Name[fr]=Décoration de fenêtre Brise
 Name[it]=Decorazione delle finestre di Brezza
 Name[nl]=Breeze vensterdecoratie
 Name[pl]=Wygląd okien Bryzy

kstyle/config/breezestyleconfig.desktop

@@ -16,6 +16,7 @@ Name[cs]=Styl widgetů Breeze
 Name[el]=Στιλ γραφικών συστατικών Breeze
 Name[es]=Estilo de elementos gráficos Brisa
 Name[eu]=Breeze trepeten estiloa
+Name[fr]=Style de composant graphique Brise
 Name[it]=Stile degli oggetti di Brezza
 Name[nl]=Breeze widgetstijl
 Name[pl]=Wygląd interfejsu Bryzy