From dbc735e63bc416f6680755ea2a938530e9e9de18 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 13 Feb 2025 01:33:08 +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/purpose/purposeplugin.json | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index 8947b89ce..48d2e0917 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -303,6 +303,7 @@ Name[ta]=பகிர் Name[tr]=Paylaş Name[uk]=Оприлюднення Name[x-test]=xxSharexx +Name[zh_CN]=分享 Name[zh_TW]=分享 Comment=The result of sharing a piece of content Comment[ar]=نتيجة مشاركة محتوى @@ -336,5 +337,6 @@ Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவ Comment[tr]=Bir parça içerik paylaşımının sonucu Comment[uk]=Результат оприлюднення даних Comment[x-test]=xxThe result of sharing a piece of contentxx +Comment[zh_CN]=分享一个内容得到的结果 Comment[zh_TW]=分享一份內容之後的結果 Action=Popup diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index 1d95ff0a3..9e3882f79 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -35,6 +35,7 @@ "Name[tr]": "Tobias Fella", "Name[uk]": "Tobias Fella", "Name[x-test]": "xxTobias Fellaxx", + "Name[zh_CN]": "Tobias Fella", "Name[zh_TW]": "Tobias Fella" } ], @@ -70,6 +71,7 @@ "Description[tr]": "NeoChat ile Paylaş", "Description[uk]": "Оприлюднити за допомогою NeoChat", "Description[x-test]": "xxShare via NeoChatxx", + "Description[zh_CN]": "通过 NeoChat 分享", "Description[zh_TW]": "透過 NeoChat 分享", "Icon": "org.kde.neochat.tray", "License": "GPL", @@ -107,6 +109,7 @@ "Name[tr]": "NeoChat", "Name[uk]": "NeoChat", "Name[x-test]": "xxNeoChatxx", + "Name[zh_CN]": "NeoChat", "Name[zh_TW]": "NeoChat", "X-Purpose-ActionDisplay": "NeoChat" },