From 1e1e54d4bd15afbb6eddd32c098ec39a00638f1d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 31 Dec 2023 02:27: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" --- src/neochat.notifyrc | 2 ++ src/plasma-runner-neochat.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index 7a391cdd8..2f48cf305 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -200,6 +200,7 @@ Name[ta]=புதிய அழைப்பிதழ் Name[tr]=Yeni Davet Name[uk]=Нове запрошення Name[x-test]=xxNew Invitationxx +Name[zh_CN]=新邀请 Name[zh_TW]=新邀請 Comment=There is a new invitation to a room Comment[ar]=توجد دعوة جديدة @@ -235,5 +236,6 @@ 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_CN]=有新的聊天室邀请 Comment[zh_TW]=有新的加入聊天室邀請 Action=Popup diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index e85ae70f8..47ade6d4c 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -74,6 +74,7 @@ Comment[ta]=நியோச்சாட்டில் அரங்குகள Comment[tr]=NeoChat'te odalar bulun Comment[uk]=Пошук кімнат у NeoChat Comment[x-test]=xxFind rooms in NeoChatxx +Comment[zh_CN]=在 NeoChat 查找聊天室 Comment[zh_TW]=在 NeoChat 尋找聊天室 X-KDE-ServiceTypes=Plasma/Runner Type=Service