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

@@ -11,6 +11,7 @@ X-KDE-Weight=60
 
 Name=Breeze Window Decoration
 Name[ca]=Decoració de les finestres Brisa
+Name[ca@valencia]=Decoració de les finestres Brisa
 Name[el]=Διακοσμήσεις παραθύρου Breeze
 Name[es]=Decoración de ventanas Brisa
 Name[eu]=Breeze leihoen apaindura

kstyle/config/breezestyleconfig.desktop

@@ -11,6 +11,7 @@ X-KDE-Weight=50
 
 Name=Breeze Widget Style
 Name[ca]=Estil dels estris Brisa
+Name[ca@valencia]=Estil dels estris Brisa
 Name[el]=Στιλ γραφικών συστατικών Breeze
 Name[es]=Estilo de elementos gráficos Brisa
 Name[eu]=Breeze trepeten estiloa