From 9f51b1e7ab33396b1af7c25eedbc3bfa442ca8fc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 9 Sep 2025 02:04:03 +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 deletions(-) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index 82f4a0466..31f3f03b9 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -36,7 +36,6 @@ "Name[ta]": "டோபியாஸ் ஃபெல்லா", "Name[tr]": "Tobias Fella", "Name[uk]": "Tobias Fella", - "Name[x-test]": "xxTobias Fellaxx", "Name[zh_CN]": "Tobias Fella", "Name[zh_TW]": "Tobias Fella" } @@ -74,7 +73,6 @@ "Description[ta]": "நியோச்சாட் மூலம் பகிர்", "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", @@ -114,7 +112,6 @@ "Name[ta]": "நியோச்சாட்", "Name[tr]": "NeoChat", "Name[uk]": "NeoChat", - "Name[x-test]": "xxNeoChatxx", "Name[zh_CN]": "NeoChat", "Name[zh_TW]": "NeoChat", "X-Purpose-ActionDisplay": "NeoChat"