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

@@ -7,6 +7,7 @@ Name[ca]=Aterratge segur
 Name[ca@valencia]=Aterratge segur
 Name[cs]=Bezpečné přistání
 Name[de]=Sichere Landung
+Name[en_GB]=Safe Landing
 Name[es]=Aterrizaje seguro
 Name[eu]=Lurreratze segurua
 Name[fi]=Turvallinen laskeutuminen