From 52e5ec50c6aa5e98614fc9774e9fb693bfa72fdf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Feb 2021 12:01:33 +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 2e5d5bb99..ced42af65 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -28,6 +28,7 @@ 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[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol 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