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"

wallpapers/Next/metadata.desktop

@@ -4,10 +4,12 @@ Name[ca]=Flow
 Name[es]=Fujo
 Name[et]=Flow
 Name[eu]=Flow
+Name[fr]=Flux
 Name[nl]=Flow
 Name[nn]=Flyt
 Name[pt]=Fluxo
 Name[pt_BR]=Flow
+Name[ru]=Поток
 Name[sk]=Prúd
 Name[sv]=Flow
 Name[uk]=Потік