From 69d3f30fc7c9789f11fe349102d89eaf16fa6fde Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Jan 2024 02:50:26 +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" --- plugins/kdeconnect.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 54077b03e..354ae7082 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -906,6 +906,7 @@ Name[ia]=Texto Recipite Name[it]=Testo ricevuto Name[ka]=მიღებულია ტექსტი Name[ko]=텍스트 수신 +Name[lt]=Gautas tekstas Name[nl]=Tekst ontvangen Name[nn]=Tekst motteke Name[pl]=Otrzymano tekst @@ -942,6 +943,7 @@ Comment[ia]=Recipite alcun texto Comment[it]=Testo ricevuto Comment[ka]=მიღებულია რაღაც ტექსტი Comment[ko]=텍스트를 받음 +Comment[lt]=Gautas kažkoks tekstas Comment[nl]=Enige tekst ontvangen Comment[nn]=Fekk noko tekst Comment[pl]=Otrzymano jakiś tekst