From 8e66f635fd4b9b38deaf4d9c566a1f1ac71d16e1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 9 Apr 2025 03:08:06 +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 9e3882f79..96205ca20 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -22,6 +22,7 @@ "Name[ia]": "Tobias Fella", "Name[it]": "Tobias Fella", "Name[ka]": "Tobias Fella", + "Name[ko]": "Tobias Fella", "Name[lv]": "Tobias Fella", "Name[nl]": "Tobias Fella", "Name[nn]": "Tobias Fella", @@ -59,6 +60,7 @@ "Description[ia]": "Comparti via NeoChat", "Description[it]": "Condividi tramite NeoChat", "Description[ka]": "გააზიარეთ NeoChat-ით", + "Description[ko]": "NeoChat으로 공유", "Description[lv]": "Kopīgot ar „NeoChat“", "Description[nl]": "Delen via NeoChat", "Description[nn]": "Del via NeoChat", @@ -96,6 +98,7 @@ "Name[ia]": "Neochat", "Name[it]": "NeoChat", "Name[ka]": "NeoChat", + "Name[ko]": "NeoChat", "Name[lv]": "NeoChat", "Name[nl]": "NeoChat", "Name[nn]": "NeoChat",