From af83db6503e648d102aee6c3e1c900b26a2b621f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 9 Jun 2024 02:59:12 +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 4aac2e631..2f7dca422 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -12,6 +12,7 @@ "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", @@ -39,6 +40,7 @@ "Description[eo]": "Kundividi per NeoChat", "Description[es]": "Compartir mediante NeoChat", "Description[eu]": "Partekatu NeoChat bidez", + "Description[fi]": "Jaa NeoChatillä", "Description[fr]": "Partager grâce à NeoChat", "Description[gl]": "Compartir por NeoChat", "Description[hu]": "Megosztás NeoChatben", @@ -67,6 +69,7 @@ "Name[eo]": "NeoChat", "Name[es]": "NeoChat", "Name[eu]": "NeoChat", + "Name[fi]": "NeoChat", "Name[fr]": "NeoChat", "Name[gl]": "NeoChat", "Name[hu]": "NeoChat",