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"

src/plasma-runner-neochat.desktop

@@ -10,6 +10,7 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[el]=NeoChat
 Name[en_GB]=NeoChat
+Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
@@ -47,6 +48,7 @@ Comment[ca@valencia]=Busca sales en NeoChat
 Comment[de]=Räume in NeoChat finden
 Comment[el]=Εύρεση αιθουσών στο NeoChat
 Comment[en_GB]=Find rooms in NeoChat
+Comment[eo]=Trovi ĉambrojn en NeoChat
 Comment[es]=Buscar salas en NeoChat
 Comment[eu]=Bilatu gelak NeoChat-en
 Comment[fi]=Etsi huoneita NeoChatissä