From a5570838ca0d3cc5ba71a2b6ad0df6e994b941dc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 1 Mar 2021 09:49:45 +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 ffcfb61cc..700f21025 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -26,6 +26,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[en_GB]=A client for matrix, the decentralised communication protocol Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma