From 07eabb2dc12a6dcfeee69b8398452f0f243db315 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Mar 2024 01:13:52 +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 d7659733a..bdda8dfe5 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -7,6 +7,7 @@ "Name[ca]": "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", @@ -28,6 +29,7 @@ "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", @@ -48,6 +50,7 @@ "Name[ca]": "NeoChat", "Name[de]": "NeoChat", "Name[es]": "NeoChat", + "Name[eu]": "NeoChat", "Name[fr]": "NeoChat", "Name[hu]": "NeoChat", "Name[ia]": "Neochat",