From 913f8ae91a09580405ab1513529faee4ec17d878 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Jun 2024 03:14:58 +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 | 49 +--------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index 3fa7c5160..f26ddd558 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -4,31 +4,8 @@ { "Name": "Tobias Fella", "Name[ar]": "توبياس فلة", - "Name[ca@valencia]": "Tobias Fella", - "Name[ca]": "Tobias Fella", - "Name[cs]": "Tobias Fella", - "Name[de]": "Tobias Fella", - "Name[en_GB]": "Tobias Fella", - "Name[eo]": "Tobias Fella", - "Name[es]": "Tobias Fella", - "Name[eu]": "Tobias Fella", - "Name[fi]": "Tobias Fella", - "Name[fr]": "Tobias Fella", - "Name[gl]": "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[sv]": "Tobias Fella", "Name[ta]": "டோபியாஸ் ஃபெல்லா", - "Name[tr]": "Tobias Fella", - "Name[uk]": "Tobias Fella", - "Name[x-test]": "xxTobias Fellaxx", - "Name[zh_TW]": "Tobias Fella" + "Name[x-test]": "xxTobias Fellaxx" } ], "Category": "Utilities", @@ -37,7 +14,6 @@ "Description[ca@valencia]": "Compartix a través de NeoChat", "Description[ca]": "Comparteix a través del NeoChat", "Description[de]": "Über NeoChat teilen", - "Description[en_GB]": "Share via NeoChat", "Description[eo]": "Kundividi per NeoChat", "Description[es]": "Compartir mediante NeoChat", "Description[eu]": "Partekatu NeoChat bidez", @@ -62,32 +38,9 @@ "License": "GPL", "Name": "NeoChat", "Name[ar]": "نيوتشات", - "Name[ast]": "NeoChat", - "Name[ca@valencia]": "NeoChat", - "Name[ca]": "NeoChat", - "Name[cs]": "NeoChat", - "Name[de]": "NeoChat", - "Name[en_GB]": "NeoChat", - "Name[eo]": "NeoChat", - "Name[es]": "NeoChat", - "Name[eu]": "NeoChat", - "Name[fi]": "NeoChat", - "Name[fr]": "NeoChat", - "Name[gl]": "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[sv]": "NeoChat", "Name[ta]": "நியோச்சாட்", - "Name[tr]": "NeoChat", - "Name[uk]": "NeoChat", "Name[x-test]": "xxNeoChatxx", - "Name[zh_TW]": "NeoChat", "X-Purpose-ActionDisplay": "NeoChat" }, "X-Purpose-PluginTypes": [