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"

org.kde.neochat.desktop

@@ -18,6 +18,7 @@ Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
+Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 GenericName=Matrix Client
@@ -43,6 +44,7 @@ GenericName[pt_BR]=Cliente Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
+GenericName[ta]=Matrix வாங்கி
 GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
@@ -68,6 +70,7 @@ Comment[pt_BR]=Cliente para o protocolo Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix
+Comment[ta]=Matrix நெறிமுறைக்கான வாங்கி
 Comment[uk]=Клієнт протоколу Matrix
 Comment[x-test]=xxClient for the Matrix protocolxx
 Comment[zh_CN]=为 Matrix 协议打造的客户端