From c9e034b5b3936be8b2968c0c93eec0a7ed9beb64 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 9 Feb 2025 01:27: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" --- org.kde.neochat.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index fd6420c7f..3fa915454 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -112,6 +112,7 @@ Comment[ka]=ჩატი Matrix-ზე Comment[lv]=Tērzējiet „Matrix“ tīklā Comment[nl]=Chat op Matrix Comment[pl]=Rozmawiaj na Matriksie +Comment[pt_BR]=Bate papo na Matrix Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु Comment[sl]=Klepet na Matrixu Comment[sv]=Chatta på Matrix