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"

neochat.notifyrc

@@ -1,8 +1,10 @@
 [Global]
 IconName=org.kde.neochat
 Name=NeoChat
+Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
+Name[cs]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
 Name[ia]=Neochat
@@ -10,12 +12,15 @@ Name[it]=NeoChat
 Name[ko]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[sv]=NeoChat
+Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
+Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu
 Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
 Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
 Comment[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll
@@ -29,6 +34,7 @@ Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
 Comment[ko]=Matrix, 분산 대화 프로토콜 클라이언트
 Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
 Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
+Comment[pa]=ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ
 Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się
 Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
 Comment[ro]=Client pentru Matrix, protocolul de comunicare descentralizată
@@ -41,6 +47,7 @@ Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
 
 [Event/message]
 Name=New message
+Name[az]=Yeni ismarıc
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
 Name[cs]=Nová zpráva
@@ -56,6 +63,7 @@ Name[it]=Nuovo messaggio
 Name[ko]=새 메시지
 Name[nl]=Nieuw bericht
 Name[nn]=Ny melding
+Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ
 Name[pl]=Nowa wiadomość
 Name[pt]=Nova mensagem
 Name[pt_BR]=Nova mensagem
@@ -63,10 +71,12 @@ Name[ro]=Mesaj nou
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
+Name[ta]=புதிய செய்தி
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息
 Comment=There is a new message
+Comment[az]=Yeni ismarıc var
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
 Comment[de]=Es ist eine neue Nachricht vorhanden
@@ -81,6 +91,7 @@ Comment[it]=È presente un nuovo messaggio
 Comment[ko]=새 메시지가 있음
 Comment[nl]=Er is een nieuw bericht
 Comment[nn]=Du har ei ny melding
+Comment[pa]=ਨਵਾਂ ਸੁਨੇਹਾ ਹੈ
 Comment[pl]=Dostępna jest nowa wiadomość
 Comment[pt]=Tem uma mensagem nova
 Comment[pt_BR]=Existe uma nova mensagem
@@ -88,6 +99,7 @@ Comment[ro]=Este un mesaj nou
 Comment[sk]=Je nová správa
 Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
+Comment[ta]=ஒரு புதிய செய்தி உள்ளது
 Comment[uk]=Надійшло нове повідомлення
 Comment[x-test]=xxThere is a new messagexx
 Comment[zh_CN]=有新消息

org.kde.neochat.desktop

@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name=NeoChat
+Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
+Name[cs]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
 Name[ia]=Neochat
@@ -9,11 +11,14 @@ Name[it]=NeoChat
 Name[ko]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[sv]=NeoChat
+Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 GenericName=Matrix Client
+GenericName[az]=Matrix Müştərisi
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
 GenericName[cs]=Klient protokolu Matrix
@@ -29,6 +34,7 @@ GenericName[it]=Client Matrix
 GenericName[ko]=Matrix 클라이언트
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
+GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
 GenericName[pl]=Program Matriksa
 GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
@@ -36,10 +42,12 @@ GenericName[ro]=Client 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 客户端
 Comment=Client for the Matrix protocol
+Comment[az]=Matrix protokolu üçün müştəri
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
 Comment[de]=Programm für das Matrix-Protokoll
@@ -54,6 +62,7 @@ Comment[it]=Client per il protocollo Matrix
 Comment[ko]=Matrix 프로토콜용 클라이언트
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
+Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ
 Comment[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[pt_BR]=Cliente para o protocolo Matrix
@@ -61,6 +70,7 @@ Comment[ro]=Client pentru protocolul 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 协议打造的客户端