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

@@ -7,6 +7,7 @@ Name[el]=Ο Γαλαξίας μας
 Name[en_GB]=Milky Way
 Name[es]=Vía Láctea
 Name[eu]=Esne-Bidea
+Name[fi]=Linnunrata
 Name[fr]=Voie lactée
 Name[hu]=Tejút
 Name[ia]=Milky Way (Via Lactee)