From 038441b854a19b11df9fed6a82f101245ca8dbaf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Jan 2021 06:41:58 +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 50462e2d1..face8785b 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -25,6 +25,7 @@ Name[zh_CN]=Neochat 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[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol