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"

menu/desktop/kf5-education.directory

@@ -12,6 +12,7 @@ Name[da]=Uddannelse
 Name[de]=Lernprogramme
 Name[el]=Εκπαίδευση
 Name[en_GB]=Education
+Name[eo]=Edukado
 Name[es]=Educación
 Name[et]=Haridus
 Name[fi]=Opetus