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

@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Safe Landing
 Name[ar]=هبوط آمن
+Name[az]=Yumşaq eniş
 Name[ca]=Aterratge segur
 Name[ca@valencia]=Aterratge segur
+Name[de]=Sichere Landung
 Name[es]=Aterrizaje seguro
 Name[fr]=Atterrissage en douceur
 Name[it]=Atterraggio sicuro