From be24122eb830d3f6ae3d9e45f7157f8704af86bb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 12 Dec 2023 03:06: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           | 3 +++
 src/neochat.notifyrc              | 6 ++++++
 src/plasma-runner-neochat.desktop | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 9375e8725..bdf1b88b1 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -41,6 +41,7 @@ Name[tr]=NeoChat
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
+Name[zh_TW]=NeoChat
 GenericName=Matrix Client
 GenericName[ar]=عميل ماتركس
 GenericName[az]=Matrix Müştərisi
@@ -80,6 +81,7 @@ GenericName[tr]=Matrix İstemcisi
 GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
+GenericName[zh_TW]=Matrix 用戶端
 Comment=Client for the Matrix protocol
 Comment[ar]=عميل لميفاق ماتركس
 Comment[az]=Matrix protokolu üçün müştəri
@@ -118,6 +120,7 @@ Comment[tr]=Matrix protokolü için istemci
 Comment[uk]=Клієнт протоколу Matrix
 Comment[x-test]=xxClient for the Matrix protocolxx
 Comment[zh_CN]=为 Matrix 协议打造的客户端
+Comment[zh_TW]=Matrix 通訊協定的用戶端
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u
 Terminal=false
diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index e505a526f..592a3df50 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -39,6 +39,7 @@ Name[tr]=NeoChat
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
+Name[zh_TW]=NeoChat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
 Comment[ar]=عميل لماتركس، ميفاق الاتصال اللامركزي
@@ -78,6 +79,7 @@ Comment[tr]=Merkezi olmayan iletişim protokolü Matrix için bir istemci
 Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
 Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx
 Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
+Comment[zh_TW]=去中心化通訊協定 Matrix 的用戶端
 
 
 [Event/message]
@@ -120,6 +122,7 @@ Name[tr]=Yeni İleti
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息
+Name[zh_TW]=新訊息
 Comment=There is a new message
 Comment[ar]=توجد رسالة جديدة
 Comment[az]=Yeni ismarıc var
@@ -158,6 +161,7 @@ Comment[tr]=Yeni bir ileti var
 Comment[uk]=Надійшло нове повідомлення
 Comment[x-test]=xxThere is a new messagexx
 Comment[zh_CN]=有新消息
+Comment[zh_TW]=有新的訊息
 Action=Popup
 
 [Event/invite]
@@ -195,6 +199,7 @@ Name[ta]=புதிய அழைப்பிதழ்
 Name[tr]=Yeni Davet
 Name[uk]=Нове запрошення
 Name[x-test]=xxNew Invitationxx
+Name[zh_TW]=新邀請
 Comment=There is a new invitation to a room
 Comment[ar]=توجد دعوة جديدة
 Comment[az]=Otağa bir yeni dəvət var
@@ -229,4 +234,5 @@ Comment[ta]=ஓர் அரங்கிற்கான புதிய அழ
 Comment[tr]=Bir odaya yeni bir davetiye var
 Comment[uk]=У кімнаті нове запрошення
 Comment[x-test]=xxThere is a new invitation to a roomxx
+Comment[zh_TW]=有新的加入聊天室邀請
 Action=Popup
diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop
index bb8d1be85..dcca62264 100644
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -40,6 +40,7 @@ Name[tr]=NeoChat
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
+Name[zh_TW]=NeoChat
 Comment=Find rooms in NeoChat
 Comment[ar]=اعثر على غرف في نيوتشات
 Comment[az]=NeoChat-da otaqları tapın
@@ -72,6 +73,7 @@ Comment[ta]=நியோச்சாட்டில் அரங்குகள
 Comment[tr]=NeoChat'te odalar bulun
 Comment[uk]=Пошук кімнат у NeoChat
 Comment[x-test]=xxFind rooms in NeoChatxx
+Comment[zh_TW]=在 NeoChat 尋找聊天室
 X-KDE-ServiceTypes=Plasma/Runner
 Type=Service
 Icon=org.kde.neochat