From e9d7cd5be09927990d8299551bc39dea3aebf9d7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Mar 2021 07:47:06 +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 + 1 file changed, 1 insertion(+) diff --git a/neochat.notifyrc b/neochat.notifyrc index 2544b1132..0bbd6c693 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -48,6 +48,7 @@ Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx +Comment[zh_CN]=分布式通讯协议 Matrix 的客户端 [Event/message]