From e3cb592cd1d71d97a8bc62e5d2a6d4520f5a6dfc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 25 Feb 2025 03:09:09 +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 d7dab3c93..74a338c7c 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -104,6 +104,7 @@ Comment[hu]=Csevegés Matrixon Comment[ia]=Conversation en ditecto sur Matrix Comment[it]= su Matrix Comment[ka]=საუბარი Matrix-ზე +Comment[nl]=Chat op Matrix Comment[pl]=Rozmawiaj na Matriksie Comment[pt_BR]=Bate papo na Matrix Comment[sl]=Klepet na Matrixu