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

@@ -10,6 +10,7 @@ Name[it]=Shell
 Name[nl]=Shell
 Name[nn]=Skal
 Name[pt]=Consola
+Name[pt_BR]=Concha
 Name[ro]=Înveliș
 Name[sv]=Skal
 Name[uk]=Оболонка