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

@@ -5,6 +5,7 @@ Name[az]=Bal dalğası
 Name[ca]=Honeywave
 Name[cs]=Vlna medu
 Name[da]=Honeywave
+Name[de]=Honeywave
 Name[en_GB]=Honeywave
 Name[es]=Onda de miel
 Name[eu]=Honeywave
@@ -14,6 +15,7 @@ Name[hi]=हनीवेव
 Name[hu]=Honeywave
 Name[ia]=Honeywave
 Name[it]=Honeywave
+Name[ko]=허니웨이브
 Name[nl]=Honeywave
 Name[pl]=Fala miodu
 Name[pt_BR]=Onda de mel