From 7b751a4e6e94ce5bfe9cc9c89911a6c985dd25a7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 14 May 2024 02:57:25 +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 b507e7981..4a0031fc1 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -10,6 +10,7 @@ "Name[es]": "Tobias Fella", "Name[eu]": "Tobias Fella", "Name[fr]": "Tobias Fella", + "Name[gl]": "Tobias Fella", "Name[hu]": "Tobias Fella", "Name[ia]": "Tobias Fella", "Name[it]": "Tobias Fella", @@ -33,6 +34,7 @@ "Description[es]": "Compartir mediante NeoChat", "Description[eu]": "Partekatu NeoChat bidez", "Description[fr]": "Partager grâce à NeoChat", + "Description[gl]": "Compartir por NeoChat", "Description[hu]": "Megosztás NeoChatben", "Description[ia]": "Comparti via NeoChat", "Description[it]": "Condividi tramite NeoChat", @@ -57,6 +59,7 @@ "Name[es]": "NeoChat", "Name[eu]": "NeoChat", "Name[fr]": "NeoChat", + "Name[gl]": "NeoChat", "Name[hu]": "NeoChat", "Name[ia]": "Neochat", "Name[it]": "NeoChat",