From 43288db00092069310c592ec004b63c71b2ceaea Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 2 Jan 2021 10:22:39 +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 38e18d669..585bcf377 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -14,6 +14,7 @@ Name[hu]=Neochat
 Name[it]=Neochat
 Name[nl]=Neochat
 Name[nn]=Neochat
+Name[pl]=Neochat
 Name[pt]=Neochat
 Name[sk]=Neochat
 Name[sl]=Neochat
@@ -34,6 +35,7 @@ Comment[hu]=Azonnali üzenetküldő kliens a Matrix protokollhoz
 Comment[it]=Client di messaggistica istantanea per il protocollo Matrix
 Comment[nl]=IM-client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
+Comment[pl]=Komunikator internetowy dla protokołu Matrix
 Comment[pt]=Cliente de MI para o protocolo Matrix
 Comment[sk]=IM klient pre protokol Matrix
 Comment[sl]=Odjemalec neposrednega sporočanja po protokolu Matrix
@@ -55,6 +57,7 @@ Name[hu]=Új üzenet
 Name[it]=Nuovo messaggio
 Name[nl]=Nieuw bericht
 Name[nn]=Ny melding
+Name[pl]=Nowa wiadomość
 Name[pt]=Nova mensagem
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
@@ -74,6 +77,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[pl]=Dostępna jest nowa wiadomość
 Comment[pt]=Tem uma mensagem nova
 Comment[sk]=Je nová správa
 Comment[sl]=Prišlo je novo sporočilo
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 59d4def11..b045ac318 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[pl]=Neochat
 Name[pt]=Neochat
 Name[sk]=Neochat
 Name[sl]=Neochat
@@ -32,6 +33,7 @@ GenericName[hu]=Matrix kliens
 GenericName[it]=Client Matrix
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
+GenericName[pl]=Program Matriksa
 GenericName[pt]=Cliente de Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
@@ -51,6 +53,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[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix