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"

lookandfeel/metadata.desktop

@@ -3,6 +3,7 @@ Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
 Comment[ca@valencia]=Brisa pel VDG del KDE
 Comment[es]=Brisa por KDE VDG
+Comment[fr]=Breeze, par KDE VDG
 Comment[gl]=Breeze de KDE VDG
 Comment[id]=Breeze oleh KDE VDG
 Comment[it]=Brezza a cura del VDG di KDE
@@ -70,7 +71,7 @@ Name[es]=Brisa
 Name[et]=Breeze
 Name[eu]=Breeze
 Name[fi]=Breeze
-Name[fr]=Brise
+Name[fr]=Breeze
 Name[gl]=Breeze
 Name[hu]=Breeze
 Name[id]=Breeze

sddm-theme/metadata.desktop

@@ -13,7 +13,7 @@ Name[es]=Brisa
 Name[et]=Breeze
 Name[eu]=Breeze
 Name[fi]=Breeze
-Name[fr]=Brise
+Name[fr]=Breeze
 Name[gl]=Breeze
 Name[hu]=Breeze
 Name[id]=Breeze
@@ -47,6 +47,7 @@ Description=Breeze
 Description[ca]=Brisa
 Description[ca@valencia]=Brisa
 Description[es]=Brisa
+Description[fr]=Breeze
 Description[gl]=Breeze
 Description[id]=Breeze
 Description[it]=Brezza