From 828585a260588db1f0f040f4f9584ca8bc7702dd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Dec 2024 01:25:13 +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 258753510..3cd5903c9 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -97,6 +97,7 @@ Comment[es]=Chat en Matrix Comment[eu]=Berriketa Matrix-en Comment[fr]=Clavarder sur Matrix Comment[gl]=Charle en Matrix +Comment[he]=התכתבות דרך Matrix Comment[hu]=Csevegés Matrixon Comment[ia]=Conversation en ditecto sur Matrix Comment[it]= su Matrix