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

@@ -6,8 +6,10 @@ Name[el]=Patak
 Name[es]=Patak
 Name[eu]=Patak
 Name[fr]=Patak
+Name[hu]=Patak
 Name[it]=Patak
 Name[nl]=Patak
+Name[pt_BR]=Patak
 Name[sl]=Patak
 Name[sv]=Patak
 Name[uk]=Патак