From 6b21289af3c127d31b1c9305d40353ce8a227b0e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 26 Apr 2021 01:20:23 +0000
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        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 21d070548..43a37e9f7 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -13,6 +13,7 @@ Name[ia]=Neochat
 Name[it]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sl]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 46949eb50..7b8f56818 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -12,6 +12,7 @@ Name[ia]=Neochat
 Name[it]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sl]=NeoChat