From 4d72ace3378d88b81147269e18cdc841a22a690d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Mar 2024 02:56:34 +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" --- src/neochat.notifyrc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index fd9ce2e86..71cd5ca1e 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -76,6 +76,7 @@ Comment[ru]=Клиент для Matrix — децентрализованног Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet +Comment[ta]=மையமில்லா தகவல் பரிமாற்ற நெறிமுறையான மேட்ரிக்ஸுக்கான செயலி Comment[tr]=Merkezi olmayan iletişim protokolü Matrix için bir istemci Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx