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

@@ -13,6 +13,7 @@ Name[nn]=Trygg landing
 Name[pl]=Bezpieczne lądowanie
 Name[pt]=Aterragem Segura
 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ş