From e7563870bfbca98ea97746f361486e0244d2f3f5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 8 Feb 2025 03:05:46 +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 686c6e93c..198902c52 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -25,6 +25,7 @@ "Name[nl]": "Tobias Fella", "Name[nn]": "Tobias Fella", "Name[pl]": "Tobias Fella", + "Name[pt_BR]": "Tobias Fella", "Name[ru]": "Tobias Fella", "Name[sk]": "Tobias Fella", "Name[sl]": "Tobias Fella", @@ -59,6 +60,7 @@ "Description[nl]": "Delen via NeoChat", "Description[nn]": "Del via NeoChat", "Description[pl]": "Udostępnij przez NeoChat", + "Description[pt_BR]": "Compartilhar via NeoChat", "Description[ru]": "Опубликовать в NeoChat", "Description[sl]": "Deli prek NeoChat", "Description[sv]": "Dela via NeoChat", @@ -93,6 +95,7 @@ "Name[nl]": "NeoChat", "Name[nn]": "NeoChat", "Name[pl]": "NeoChat", + "Name[pt_BR]": "NeoChat", "Name[ru]": "NeoChat", "Name[sk]": "NeoChat", "Name[sl]": "NeoChat",