From f29781349c78eb82d1f43ff9afec2bc42652d3ee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Apr 2024 01:14:45 +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 13ef0c276..5688242fe 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -5,6 +5,7 @@ "Name": "Tobias Fella", "Name[ca@valencia]": "Tobias Fella", "Name[ca]": "Tobias Fella", + "Name[cs]": "Tobias Fella", "Name[de]": "Tobias Fella", "Name[es]": "Tobias Fella", "Name[eu]": "Tobias Fella", @@ -49,6 +50,7 @@ "Name[ast]": "NeoChat", "Name[ca@valencia]": "NeoChat", "Name[ca]": "NeoChat", + "Name[cs]": "NeoChat", "Name[de]": "NeoChat", "Name[es]": "NeoChat", "Name[eu]": "NeoChat",