From 571ee638bdec668d5117c24b6339ca2bd45c8db6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Mar 2021 08:06:34 +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 0bbd6c693..4f33ed3e5 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -4,6 +4,7 @@ Name=Neochat
 Name[az]=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[cs]=Neochat
 Name[da]=Neochat
 Name[de]=Neochat
 Name[en_GB]=Neochat
@@ -56,6 +57,7 @@ Name=New message
 Name[az]=Yeni ismarıc
 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 59c80d4b0..74fb2b6be 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -3,6 +3,7 @@ Name=Neochat
 Name[az]=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[cs]=Neochat
 Name[da]=Neochat
 Name[de]=Neochat
 Name[en_GB]=Neochat