From d631731fcfcf484ed1b65591229225c257d3d6f6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 27 Mar 2021 06:02:53 +0100 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 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/neochat.notifyrc b/neochat.notifyrc index 223bb1e25..2786eef68 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -4,6 +4,7 @@ Name=NeoChat Name[az]=NeoChat Name[ca]=NeoChat Name[ca@valencia]=NeoChat +Name[cs]=NeoChat Name[es]=NeoChat Name[fr]=NeoChat Name[ia]=Neochat diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index ef54b6135..bae49f9ff 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -3,6 +3,7 @@ Name=NeoChat Name[az]=NeoChat Name[ca]=NeoChat Name[ca@valencia]=NeoChat +Name[cs]=NeoChat Name[es]=NeoChat Name[fr]=NeoChat Name[ia]=Neochat @@ -18,6 +19,7 @@ GenericName=Matrix Client GenericName[az]=Matrix Müştərisi GenericName[ca]=Client del Matrix GenericName[ca@valencia]=Client del Matrix +GenericName[cs]=Klient protokolu Matrix GenericName[de]=Matrix-Programm GenericName[en_GB]=Matrix Client GenericName[es]=Cliente para Matrix