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

@@ -2,7 +2,9 @@
 Name=Milky Way
 Name[ca]=Via Làctia
 Name[es]=Vía Láctea
+Name[eu]=Esne-Bidea
 Name[nl]=Melkweg
+Name[pt]=Via Láctea
 Name[sv]=Vintergatan
 Name[uk]=Чумацький Шлях
 Name[x-test]=xxMilky Wayxx