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

@@ -24,7 +24,7 @@ Name[ro]=Aterizare ușoară
 Name[sk]=Bezpečné pristátie
 Name[sl]=Varen pristanek
 Name[sv]=Säker landning
-Name[tr]=Sakın İniş
+Name[tr]=Güvenli İniş
 Name[uk]=Безпечне приземлення
 Name[x-test]=xxSafe Landingxx
 Name[zh_CN]=Safe Landing 着陆