From 16f661f6aec04b12c85185e4d16b538cf9575ad3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Feb 2021 17:00:04 +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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/neochat.notifyrc b/neochat.notifyrc index c55510150..2e5d5bb99 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -25,6 +25,14 @@ Name[x-test]=xxNeochatxx Name[zh_CN]=Neochat DesktopEntry=org.kde.neochat Comment=A client for matrix, the decentralized communication protocol +Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat +Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado +Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications. +Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen. +Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado +Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet +Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними +Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx [Event/message]