From f5837a208a07ee07be80aa19f1441ba3ed376916 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 5 Mar 2022 02:49:38 +0000 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 7fdd17f6d..8cc656043 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -32,6 +32,7 @@ Comment=A client for matrix, the decentralized communication protocol Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu 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[cs]=Klient pro decentralizovaný komunikační protokol matrix Comment[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll Comment[en_GB]=A client for matrix, the decentralised communication protocol Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado