From 70dba75d31f9dc8afd7b806634dbdb292b181da2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Mar 2021 12:07:25 +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        | 2 ++
 org.kde.neochat.desktop | 1 +
 2 files changed, 3 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 3226fb80b..6c3d6a9b8 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -3,6 +3,7 @@ IconName=org.kde.neochat
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[cs]=Neochat
 Name[da]=Neochat
 Name[de]=Neochat
 Name[en_GB]=Neochat
@@ -49,6 +50,7 @@ Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
 Name=New message
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
+Name[cs]=Nová zpráva
 Name[de]=Neue Nachricht
 Name[en_GB]=New message
 Name[es]=Nuevo mensaje
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index b1a332e7e..113745080 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -2,6 +2,7 @@
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[cs]=Neochat
 Name[da]=Neochat
 Name[de]=Neochat
 Name[en_GB]=Neochat