From b504c990f801c9dcf67560e4dab5846964bd8d8b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Mar 2024 01:13:26 +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 4c9ec8b19..632af5a5d 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -5,6 +5,7 @@ "Name": "Tobias Fella", "Name[ca@valencia]": "Tobias Fella", "Name[ca]": "Tobias Fella", + "Name[de]": "Tobias Fella", "Name[es]": "Tobias Fella", "Name[fr]": "Tobias Fella", "Name[hu]": "Tobias Fella", @@ -24,6 +25,7 @@ "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[fr]": "Partager grâce à NeoChat", "Description[hu]": "Megosztás NeoChatben", @@ -42,6 +44,7 @@ "Name": "NeoChat", "Name[ca@valencia]": "NeoChat", "Name[ca]": "NeoChat", + "Name[de]": "NeoChat", "Name[es]": "NeoChat", "Name[fr]": "NeoChat", "Name[hu]": "NeoChat",