From cc373365fb6b0152e5c72a702f3e1680f1829121 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 14 Mar 2024 01:14:11 +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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index c992a32d4..416603368 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -8,6 +8,8 @@ "Name[es]": "Tobias Fella", "Name[hu]": "Tobias Fella", "Name[ia]": "Tobias Fella", + "Name[nl]": "Tobias Fella", + "Name[sl]": "Tobias Fella", "Name[tr]": "Tobias Fella", "Name[uk]": "Tobias Fella", "Name[x-test]": "xxTobias Fellaxx" @@ -20,6 +22,8 @@ "Description[es]": "Compartir mediante NeoChat", "Description[hu]": "Megosztás NeoChatben", "Description[ia]": "Comparti via NeoChat", + "Description[nl]": "Delen via NeoChat", + "Description[sl]": "Deli prek NeoChat", "Description[tr]": "NeoChat ile Paylaş", "Description[uk]": "Оприлюднити за допомогою NeoChat", "Description[x-test]": "xxShare via NeoChatxx", @@ -31,6 +35,8 @@ "Name[es]": "NeoChat", "Name[hu]": "NeoChat", "Name[ia]": "Neochat", + "Name[nl]": "NeoChat", + "Name[sl]": "NeoChat", "Name[tr]": "NeoChat", "Name[uk]": "NeoChat", "Name[x-test]": "xxNeoChatxx",