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"

src/effects/overview/kcm/overvieweffectkcm.desktop

@@ -14,6 +14,7 @@ Name[ca]=Vista general
 Name[cs]=přehled
 Name[es]=vista general
 Name[eu]=Ikuspegi orokorra
+Name[fr]=aperçu
 Name[lt]=apžvalga
 Name[nl]=overzicht
 Name[sl]=pregled