From dc2cf21cb8872ab79e7cd434bbc9aeb0e59eb945 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Mar 2024 01:18:33 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index bdda8dfe5..13ef0c276 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -46,6 +46,7 @@ "Icon": "org.kde.neochat", "License": "GPL", "Name": "NeoChat", + "Name[ast]": "NeoChat", "Name[ca@valencia]": "NeoChat", "Name[ca]": "NeoChat", "Name[de]": "NeoChat",