From bd80f651633305590643668c515bc370b6f28124 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Nov 2024 03:04:07 +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 68b657a47..2b4f4d09a 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -99,6 +99,7 @@ Comment[gl]=Charle en Matrix Comment[hu]=Csevegés Matrixon Comment[ia]=Conversation en ditecto sur Matrix Comment[it]= su Matrix +Comment[ka]=საუბარი Matrix-ზე Comment[pl]=Rozmawiaj na Matriksie Comment[sl]=Klepet na Matrixu Comment[sv]=Chatta på Matrix