From e7bada4cdee3fab05c4dec5fea8d6c8d0ef14f34 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 7 Feb 2021 06:47:50 +0100
Subject: [PATCH] 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        | 4 ++++
 org.kde.neochat.desktop | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index f2f0f7a3f..711a45956 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -14,6 +14,7 @@ Name[hu]=Neochat
 Name[it]=Neochat
 Name[nl]=Neochat
 Name[nn]=Neochat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pt]=Neochat
 Name[pt_BR]=Neochat
 Name[sk]=Neochat
@@ -32,6 +33,7 @@ Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
 Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
 Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
 Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
+Comment[pa]=ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ
 Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações
 Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol
 Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
@@ -54,6 +56,7 @@ Name[hu]=Új üzenet
 Name[it]=Nuovo messaggio
 Name[nl]=Nieuw bericht
 Name[nn]=Ny melding
+Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ
 Name[pt]=Nova mensagem
 Name[pt_BR]=Nova mensagem
 Name[sk]=Nová správa
@@ -75,6 +78,7 @@ Comment[hu]=Új üzenet érkezett
 Comment[it]=È presente un nuovo messaggio
 Comment[nl]=Er is een nieuw bericht
 Comment[nn]=Du har ei ny melding
+Comment[pa]=ਨਵਾਂ ਸੁਨੇਹਾ ਹੈ
 Comment[pt]=Tem uma mensagem nova
 Comment[pt_BR]=Existe uma nova mensagem
 Comment[sk]=Je nová správa
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 62b5cdc97..f8ed09783 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -13,6 +13,7 @@ Name[hu]=Neochat
 Name[it]=Neochat
 Name[nl]=Neochat
 Name[nn]=Neochat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pt]=Neochat
 Name[pt_BR]=Neochat
 Name[sk]=Neochat
@@ -34,6 +35,7 @@ GenericName[hu]=Matrix kliens
 GenericName[it]=Client Matrix
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
+GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
 GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
 GenericName[sk]=Matrix Client
@@ -55,6 +57,7 @@ Comment[hu]=Kliens a Matrix protokollhoz
 Comment[it]=Client per il protocollo Matrix
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
+Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[pt_BR]=Cliente para o protocolo Matrix
 Comment[sk]=Klient protokolu Matrix