From e39760ccfb07aa6c4a817b2fbb00fd5d7c149c33 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Mar 2024 01:15:17 +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 106fbfd5d..8c749cc0e 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -9,6 +9,8 @@ "Name[fr]": "Tobias Fella", "Name[hu]": "Tobias Fella", "Name[ia]": "Tobias Fella", + "Name[it]": "Tobias Fella", + "Name[ka]": "Tobias Fella", "Name[nl]": "Tobias Fella", "Name[sl]": "Tobias Fella", "Name[tr]": "Tobias Fella", @@ -24,6 +26,8 @@ "Description[fr]": "Partager grâce à NeoChat", "Description[hu]": "Megosztás NeoChatben", "Description[ia]": "Comparti via NeoChat", + "Description[it]": "Condividi tramite NeoChat", + "Description[ka]": "გააზიარეთ NeoChat-ით", "Description[nl]": "Delen via NeoChat", "Description[sl]": "Deli prek NeoChat", "Description[tr]": "NeoChat ile Paylaş", @@ -38,6 +42,8 @@ "Name[fr]": "NeoChat", "Name[hu]": "NeoChat", "Name[ia]": "Neochat", + "Name[it]": "NeoChat", + "Name[ka]": "NeoChat", "Name[nl]": "NeoChat", "Name[sl]": "NeoChat", "Name[tr]": "NeoChat",