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

@@ -8,6 +8,7 @@ Name[de]=Flow
 Name[el]=Φλοιός
 Name[en_GB]=Shell
 Name[es]=Shell
+Name[et]=Merekarp
 Name[eu]=Oskola
 Name[fr]=Interpréteur
 Name[it]=Shell