From cec47b40cc3e20acfb489c03accf49cba997934e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Jan 2021 06:57:29 +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 face8785b..e4e59005e 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -28,6 +28,7 @@ Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitza 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[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 Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen. Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações