From bd0a01b23571c6726df93d65bf23b612a48b0407 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 5 Nov 2020 06:31:55 +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        | 8 ++++++++
 org.kde.neochat.desktop | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 4b49c434f..41c654d0d 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -4,6 +4,8 @@ Name=Neochat
 Name[ca]=Neochat
 Name[es]=Neochat
 Name[nl]=Neochat
+Name[nn]=Neochat
+Name[pt]=Neochat
 Name[sv]=Neochat
 Name[uk]=Neochat
 Name[x-test]=xxNeochatxx
@@ -26,6 +28,9 @@ Name=New message
 Name[ca]=Missatge nou
 Name[es]=Nuevo mensaje
 Name[nl]=Nieuw bericht
+Name[nn]=Ny melding
+Name[pt]=Nova mensagem
+Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
@@ -33,6 +38,9 @@ Comment=There is a new message
 Comment[ca]=Hi ha un missatge nou
 Comment[es]=Hay un mensaje nuevo
 Comment[nl]=Er is een nieuw bericht
+Comment[nn]=Du har ei ny melding
+Comment[pt]=Tem uma mensagem nova
+Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
 Comment[uk]=Надійшло нове повідомлення
 Comment[x-test]=xxThere is a new messagexx
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 5f0f789f9..0e18e7cff 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -3,6 +3,8 @@ Name=Neochat
 Name[ca]=Neochat
 Name[es]=Neochat
 Name[nl]=Neochat
+Name[nn]=Neochat
+Name[pt]=Neochat
 Name[sv]=Neochat
 Name[uk]=Neochat
 Name[x-test]=xxNeochatxx
@@ -22,6 +24,9 @@ Comment=Client for the Matrix protocol
 Comment[ca]=Client per al protocol Matrix
 Comment[es]=Cliente para el protocolo Matrix
 Comment[nl]=Client voor het Matrix-protocol
+Comment[nn]=Lynmeldings­klient for Matrix-protokollen
+Comment[pt]=Cliente para o protocolo Matrix
+Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix
 Comment[uk]=Клієнт протоколу Matrix
 Comment[x-test]=xxClient for the Matrix protocolxx