From e31f3c4abb4431169762e32575e5e9a486a02910 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Feb 2023 01:59:29 +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" --- kcm/kcm_kdeconnect.json | 2 ++ plugins/mmtelephony/kdeconnect_mmtelephony.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index 22a0246fb..61d9075bf 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -15,6 +15,7 @@ "Description[is]": "Tengja og samstilla tækin þín", "Description[it]": "Connetti e sincronizza i tuoi dispositivi", "Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია", + "Description[lt]": "Prijunkite ir sinchronizuokite savo įrenginius", "Description[nl]": "Uw apparaten verbinden en synchroniseren", "Description[nn]": "Kopla til og synkroniser einingar", "Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia", @@ -40,6 +41,7 @@ "Name[is]": "KDE Connect", "Name[it]": "KDE Connect", "Name[ka]": "KDE Connect", + "Name[lt]": "KDE Connect", "Name[nl]": "KDE Connect", "Name[nn]": "KDE Connect", "Name[pl]": "KDE Connect", diff --git a/plugins/mmtelephony/kdeconnect_mmtelephony.json b/plugins/mmtelephony/kdeconnect_mmtelephony.json index ad54f87c5..9bcae9e66 100644 --- a/plugins/mmtelephony/kdeconnect_mmtelephony.json +++ b/plugins/mmtelephony/kdeconnect_mmtelephony.json @@ -17,6 +17,7 @@ "Name[is]": "Yoram Bar-Haim", "Name[it]": "Yoram Bar-Haim", "Name[ka]": "Yoram Bar-Haim", + "Name[lt]": "Yoram Bar-Haim", "Name[nl]": "Yoram Bar-Haim", "Name[nn]": "Yoram Bar-Haim", "Name[pl]": "Yoram Bar-Haim", @@ -88,6 +89,7 @@ "Name[is]": "ModemManager samþætting símaaðgerða", "Name[it]": "Integrazione telefonica di ModemManager", "Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია", + "Name[lt]": "ModemManager telefonijos integracija", "Name[nl]": "Modembeheerder telefoonintegratie", "Name[nn]": "ModemManager-telefoniintegrering", "Name[pl]": "Integracja z telefonią zarządzania modemem",