From 60e9587aa7b97affb8eb3241222cfc1e2b25740a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 30 Mar 2021 02:15:43 +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 a7cfae84e..0f71fbf4e 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -29,6 +29,7 @@ DesktopEntry=org.kde.neochat 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[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 Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat