From 407b071e0415b38e3d9b3ad4c0aa1130f44386c9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 15 May 2021 01:17:21 +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" --- neochat.notifyrc | 1 + org.kde.neochat.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/neochat.notifyrc b/neochat.notifyrc index b7f8c5331..4cbe7bc31 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -15,6 +15,7 @@ Name[it]=NeoChat Name[nl]=NeoChat Name[nn]=NeoChat Name[pa]=ਨਿਓ-ਚੈਟ +Name[pl]=NeoChat Name[pt]=NeoChat Name[pt_BR]=NeoChat Name[sl]=NeoChat diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index a92b9c2d8..fb5fa0e18 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -14,6 +14,7 @@ Name[it]=NeoChat Name[nl]=NeoChat Name[nn]=NeoChat Name[pa]=ਨਿਓ-ਚੈਟ +Name[pl]=NeoChat Name[pt]=NeoChat Name[pt_BR]=NeoChat Name[sl]=NeoChat