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,6 +4,7 @@ Name[ca]=Aterratge segur
 Name[es]=Aterrizaje seguro
 Name[nl]=Veilige landing
 Name[ro]=Aterizare ușoară
+Name[sl]=Varen pristanek
 Name[sv]=Säker landning
 Name[tr]=Sakın İniş
 Name[uk]=Безпечне приземлення