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"

applets/clock/metadata.desktop

@@ -9,6 +9,7 @@ Name[de]=Uhr
 Name[el]=Ρολόι
 Name[en_GB]=Clock
 Name[es]=Reloj
+Name[fr]=Horloge
 Name[gl]=Reloxo
 Name[it]=Orologio
 Name[nl]=Klok

applets/quicksettings/package/metadata.desktop

@@ -8,6 +8,7 @@ Name[cs]=Rychlé nastavení
 Name[de]=Schnelleinstellungen
 Name[en_GB]=Quick Settings
 Name[es]=Ajustes rápidos
+Name[fr]=Paramètres rapides
 Name[gl]=Configuración rápida
 Name[it]=Impostazioni rapide
 Name[nl]=Snelle instellingen