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

@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Honeywave
 Name[ca]=Honeywave
+Name[fr]=Onde de miel
 Name[ia]=Honeywave
 Name[nl]=Honeywave
+Name[pl]=Fala miodu
 Name[sv]=Honungsvåg
 Name[uk]=Медова хвиля
 Name[x-test]=xxHoneywavexx