From 52ae237eb7d801e8520e8fe7d8d98da8c2d673c3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Dec 2024 03:05:39 +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 0a149e9e4..d6779220c 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