From 49e1bf9ab16bbaf4e9ffcb319c3531086b8cb722 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 26 Nov 2024 03:05:24 +0000
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 7c6a8732a..7432eac08 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -90,6 +90,7 @@ GenericName[zh_TW]=Matrix 用戶端
 Comment=Chat on Matrix
 Comment[ca]=Xat a Matrix
 Comment[ca@valencia]=Xat a Matrix
+Comment[de]=Über Matrix unterhalten
 Comment[en_GB]=Chat on Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en