From 9212cf3f45271a1a0522d891d03ded43dc5e8243 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 14 Feb 2025 03:21:19 +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/purpose/purposeplugin.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index 198902c52..183958433 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -34,6 +34,7 @@ "Name[tr]": "Tobias Fella", "Name[uk]": "Tobias Fella", "Name[x-test]": "xxTobias Fellaxx", + "Name[zh_CN]": "Tobias Fella", "Name[zh_TW]": "Tobias Fella" } ], @@ -68,6 +69,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", @@ -104,6 +106,7 @@ "Name[tr]": "NeoChat", "Name[uk]": "NeoChat", "Name[x-test]": "xxNeoChatxx", + "Name[zh_CN]": "NeoChat", "Name[zh_TW]": "NeoChat", "X-Purpose-ActionDisplay": "NeoChat" },