From ae2c5179401deaaf571c13fd1bcabe5728ebcfa5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 27 Mar 2021 09:18:53 +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"
---
 org.kde.neochat.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 113745080..c07afd09f 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -27,6 +27,7 @@ Name[zh_CN]=Neochat
 GenericName=Matrix Client
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
+GenericName[cs]=Klient protokolu Matrix
 GenericName[de]=Matrix-Programm
 GenericName[en_GB]=Matrix Client
 GenericName[es]=Cliente para Matrix