From 1234132a0535f893e213128a8e23ac522da4b911 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Feb 2021 10:25:39 +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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neochat.notifyrc b/neochat.notifyrc index ced42af65..ffcfb61cc 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -26,10 +26,14 @@ 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[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 Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications. +Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen. +Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними