From 40b2b9554b247dc1559ac072217c0c40eaf3fd6e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Mar 2024 01:13:51 +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 8c749cc0e..1fa01b0c7 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -12,6 +12,7 @@ "Name[it]": "Tobias Fella", "Name[ka]": "Tobias Fella", "Name[nl]": "Tobias Fella", + "Name[pl]": "Tobias Fella", "Name[sl]": "Tobias Fella", "Name[tr]": "Tobias Fella", "Name[uk]": "Tobias Fella", @@ -29,6 +30,7 @@ "Description[it]": "Condividi tramite NeoChat", "Description[ka]": "გააზიარეთ NeoChat-ით", "Description[nl]": "Delen via NeoChat", + "Description[pl]": "Udostępnij przez NeoChat", "Description[sl]": "Deli prek NeoChat", "Description[tr]": "NeoChat ile Paylaş", "Description[uk]": "Оприлюднити за допомогою NeoChat", @@ -45,6 +47,7 @@ "Name[it]": "NeoChat", "Name[ka]": "NeoChat", "Name[nl]": "NeoChat", + "Name[pl]": "NeoChat", "Name[sl]": "NeoChat", "Name[tr]": "NeoChat", "Name[uk]": "NeoChat",