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"

applets/appmenu/package/metadata.desktop

@@ -10,6 +10,7 @@ Name[el]=Καθολικό μενού
 Name[en_GB]=Global Menu
 Name[es]=Menú global
 Name[eu]=Menu orokorra
+Name[fi]=Yleisvalikko
 Name[hu]=Globális menü
 Name[it]=Menu globale
 Name[nl]=Globaal menu