From c9d03cb042fedae0ac407626ec10a5985b4be4db Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 27 Nov 2024 01:25:14 +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 5164e97eb..72a87b54b 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -108,6 +108,7 @@ Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவு
 Comment[tr]=Matrix Üzerinde Sohbet Et
 Comment[uk]=Спілкування у Matrix
 Comment[x-test]=xxChat on Matrixxx
+Comment[zh_TW]=在 Matrix 上聊天
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u
 Terminal=false