From bd28a7f66de64c3016e4833f9164e77d4b2833b9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Apr 2024 03:40:01 +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 | 59 +--------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index 5688242fe..559133411 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -2,71 +2,14 @@ "KPlugin": { "Authors": [ { - "Name": "Tobias Fella", - "Name[ca@valencia]": "Tobias Fella", - "Name[ca]": "Tobias Fella", - "Name[cs]": "Tobias Fella", - "Name[de]": "Tobias Fella", - "Name[es]": "Tobias Fella", - "Name[eu]": "Tobias Fella", - "Name[fr]": "Tobias Fella", - "Name[hu]": "Tobias Fella", - "Name[ia]": "Tobias Fella", - "Name[it]": "Tobias Fella", - "Name[ka]": "Tobias Fella", - "Name[lv]": "Tobias Fella", - "Name[nl]": "Tobias Fella", - "Name[pl]": "Tobias Fella", - "Name[sl]": "Tobias Fella", - "Name[tr]": "Tobias Fella", - "Name[uk]": "Tobias Fella", - "Name[x-test]": "xxTobias Fellaxx", - "Name[zh_TW]": "Tobias Fella" + "Name": "Tobias Fella" } ], "Category": "Utilities", "Description": "Share via NeoChat", - "Description[ca@valencia]": "Compartix a través de NeoChat", - "Description[ca]": "Comparteix a través del NeoChat", - "Description[de]": "Über NeoChat teilen", - "Description[es]": "Compartir mediante NeoChat", - "Description[eu]": "Partekatu NeoChat bidez", - "Description[fr]": "Partager grâce à NeoChat", - "Description[hu]": "Megosztás NeoChatben", - "Description[ia]": "Comparti via NeoChat", - "Description[it]": "Condividi tramite NeoChat", - "Description[ka]": "გააზიარეთ NeoChat-ით", - "Description[lv]": "Kopīgot ar „NeoChat“", - "Description[nl]": "Delen via NeoChat", - "Description[pl]": "Udostępnij przez NeoChat", - "Description[sl]": "Deli prek NeoChat", - "Description[tr]": "NeoChat ile Paylaş", - "Description[uk]": "Оприлюднити за допомогою NeoChat", - "Description[x-test]": "xxShare via NeoChatxx", - "Description[zh_TW]": "透過 NeoChat 分享", "Icon": "org.kde.neochat", "License": "GPL", "Name": "NeoChat", - "Name[ast]": "NeoChat", - "Name[ca@valencia]": "NeoChat", - "Name[ca]": "NeoChat", - "Name[cs]": "NeoChat", - "Name[de]": "NeoChat", - "Name[es]": "NeoChat", - "Name[eu]": "NeoChat", - "Name[fr]": "NeoChat", - "Name[hu]": "NeoChat", - "Name[ia]": "Neochat", - "Name[it]": "NeoChat", - "Name[ka]": "NeoChat", - "Name[lv]": "NeoChat", - "Name[nl]": "NeoChat", - "Name[pl]": "NeoChat", - "Name[sl]": "NeoChat", - "Name[tr]": "NeoChat", - "Name[uk]": "NeoChat", - "Name[x-test]": "xxNeoChatxx", - "Name[zh_TW]": "NeoChat", "X-Purpose-ActionDisplay": "NeoChat" }, "X-Purpose-PluginTypes": [