From d9cf7ce552570cdb7052dcb18bc04a151a23de51 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Jan 2021 08:48:35 +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 306cf7108..f2f0f7a3f 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -27,6 +27,7 @@ Comment=A client for matrix, the decentralized communication protocol Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado +Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol