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

@@ -2,11 +2,14 @@
 Name=Honeywave
 Name[az]=Bal dalğası
 Name[ca]=Honeywave
+Name[cs]=Vlna medu
 Name[es]=Onda de miel
 Name[fr]=Onde de miel
 Name[ia]=Honeywave
+Name[it]=Honeywave
 Name[nl]=Honeywave
 Name[pl]=Fala miodu
+Name[pt_BR]=Onda de mel
 Name[sl]=Medeni pljusk
 Name[sv]=Honungsvåg
 Name[uk]=Медова хвиля