From c5ef8c3fec0bf3546cf8611e8cc39dcf500eeb05 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 May 2024 01:17:33 +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 9faf7fc86..18e409252 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -7,6 +7,7 @@ "Name[ca]": "Tobias Fella", "Name[cs]": "Tobias Fella", "Name[de]": "Tobias Fella", + "Name[eo]": "Tobias Fella", "Name[es]": "Tobias Fella", "Name[eu]": "Tobias Fella", "Name[fr]": "Tobias Fella", @@ -32,6 +33,7 @@ "Description[ca@valencia]": "Compartix a través de NeoChat", "Description[ca]": "Comparteix a través del NeoChat", "Description[de]": "Über NeoChat teilen", + "Description[eo]": "Kundividi per NeoChat", "Description[es]": "Compartir mediante NeoChat", "Description[eu]": "Partekatu NeoChat bidez", "Description[fr]": "Partager grâce à NeoChat", @@ -58,6 +60,7 @@ "Name[ca]": "NeoChat", "Name[cs]": "NeoChat", "Name[de]": "NeoChat", + "Name[eo]": "NeoChat", "Name[es]": "NeoChat", "Name[eu]": "NeoChat", "Name[fr]": "NeoChat",