From c0b00ce14623078329cfdc2d1cc5637a14352854 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 4 Dec 2024 01:24:49 +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 2527b1a2a..258753510 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -101,6 +101,7 @@ Comment[hu]=Csevegés Matrixon Comment[ia]=Conversation en ditecto sur Matrix Comment[it]= su Matrix Comment[ka]=ჩატი Matrix-ზე +Comment[lv]=Tērzējiet „Matrix“ tīklā Comment[nl]=Chat op Matrix Comment[pl]=Rozmawiaj na Matriksie Comment[sl]=Klepet na Matrixu