From 80ac9e1ba7e8efe210c0bc444cd72cc57f3e9758 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Nov 2024 03:11:52 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index 39bb0b80d..4dff77adc 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -26,6 +26,7 @@ "Name[nn]": "Tobias Fella", "Name[pl]": "Tobias Fella", "Name[ru]": "Tobias Fella", + "Name[sk]": "Tobias Fella", "Name[sl]": "Tobias Fella", "Name[sv]": "Tobias Fella", "Name[ta]": "டோபியாஸ் ஃபெல்லா", @@ -93,6 +94,7 @@ "Name[nn]": "NeoChat", "Name[pl]": "NeoChat", "Name[ru]": "NeoChat", + "Name[sk]": "NeoChat", "Name[sl]": "NeoChat", "Name[sv]": "NeoChat", "Name[ta]": "நியோச்சாட்",