From 80b6d80c7d6735dff9526933785729e603184f2d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Jan 2021 06:40:44 +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 e4e59005e..306cf7108 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -33,6 +33,7 @@ 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 Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol +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