From 79acceb29a9e8f21a033352fb2bbe38171836c00 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 30 Dec 2025 01:34:45 +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 + src/app/neochat.notifyrc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index 14d00f18c..e92af1e84 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -108,6 +108,7 @@ Comment[ia]=Conversation en ditecto sur Matrix Comment[it]= su Matrix Comment[ka]=ჩატი Matrix-ზე Comment[ko]=Matrix에서 대화하기 +Comment[lt]=Pokalbiai per Matrix Comment[lv]=Tērzējiet „Matrix“ tīklā Comment[nl]=Chat op Matrix Comment[pl]=Rozmawiaj na Matriksie diff --git a/src/app/neochat.notifyrc b/src/app/neochat.notifyrc index 5211535e9..775bc964d 100644 --- a/src/app/neochat.notifyrc +++ b/src/app/neochat.notifyrc @@ -287,6 +287,7 @@ Name[ia]=Comparti Name[it]=Condivisione Name[ka]=გაზიარება Name[ko]=공유 +Name[lt]=Bendrinti Name[lv]=Kopīgot Name[nl]=Gedeelde Name[nn]=Del @@ -322,6 +323,7 @@ Comment[ia]=Le exito de compartir un pecietta de contento Comment[it]=Il risultato della condivisione di un contenuto Comment[ka]=შემცველობის ნაწილის გაზიარების შედეგი Comment[ko]=콘텐츠 공유 결과 +Comment[lt]=Turinio dalies bendrinimo rezultatas Comment[lv]=Satura kopīgošanas rezultāts Comment[nl]=Het resultaat van het delen van een stukje inhoud Comment[nn]=Resultatet av deling av innhald