From 8c14f8d2eb5d4fbca29ae4d893c25bd084afa03e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Jul 2021 02:18:15 +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 86b4cffd6..7fdd17f6d 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -8,6 +8,7 @@ Name[cs]=NeoChat Name[de]=NeoChat Name[en_GB]=NeoChat Name[es]=NeoChat +Name[eu]=NeoChat Name[fi]=NeoChat Name[fr]=NeoChat Name[ia]=Neochat diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index 8e0ca9918..f936d11ee 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -7,6 +7,7 @@ Name[cs]=NeoChat Name[de]=NeoChat Name[en_GB]=NeoChat Name[es]=NeoChat +Name[eu]=NeoChat Name[fi]=NeoChat Name[fr]=NeoChat Name[ia]=Neochat