From bd4dfb037af6dd61d9354d89f4244573f684d79e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 8 Feb 2021 06:52:38 +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        | 5 +++++
 org.kde.neochat.desktop | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 711a45956..a7a3ca92d 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -15,6 +15,7 @@ Name[it]=Neochat
 Name[nl]=Neochat
 Name[nn]=Neochat
 Name[pa]=ਨਿਓ-ਚੈਟ
+Name[pl]=Neochat
 Name[pt]=Neochat
 Name[pt_BR]=Neochat
 Name[sk]=Neochat
@@ -34,7 +35,9 @@ 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[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się
 Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações
+Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
 Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol
 Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
 Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
@@ -57,6 +60,7 @@ Name[it]=Nuovo messaggio
 Name[nl]=Nieuw bericht
 Name[nn]=Ny melding
 Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ
+Name[pl]=Nowa wiadomość
 Name[pt]=Nova mensagem
 Name[pt_BR]=Nova mensagem
 Name[sk]=Nová správa
@@ -79,6 +83,7 @@ Comment[it]=È presente un nuovo messaggio
 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
 Comment[sk]=Je nová správa
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index f8ed09783..163d9d841 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -14,6 +14,7 @@ Name[it]=Neochat
 Name[nl]=Neochat
 Name[nn]=Neochat
 Name[pa]=ਨਿਓ-ਚੈਟ
+Name[pl]=Neochat
 Name[pt]=Neochat
 Name[pt_BR]=Neochat
 Name[sk]=Neochat
@@ -36,6 +37,7 @@ GenericName[it]=Client 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
 GenericName[sk]=Matrix Client
@@ -58,6 +60,7 @@ Comment[it]=Client per il protocollo 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
 Comment[sk]=Klient protokolu Matrix