From b7da732a15745470c73c2156bd8079f1a363de76 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 15 Jan 2021 06:38:23 +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 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 21426601d..50462e2d1 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -24,6 +24,16 @@ Name[x-test]=xxNeochatxx
 Name[zh_CN]=Neochat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
+Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
+Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
+Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
+Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
+Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
+Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações
+Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol
+Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
+Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
+Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx
 
 
 [Event/message]