From ff71c0aa3b0ea65cdf480f75aa172347c1f15451 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 10 Jan 2023 01:58:48 +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 634c72d7e..916f552d8 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -11,6 +11,7 @@ "Description[es]": "Conecta y sincroniza sus dispositivos", "Description[eu]": "Zure gailuak konektatu eta sinkronizatzea", "Description[fr]": "Vous connecter à vos périphériques et se synchroniser avec eux", + "Description[ia]": "Connecte e synchronisa tu dispositivos", "Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია", "Description[nl]": "Uw apparaten verbinden en synchroniseren", "Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia", @@ -30,6 +31,7 @@ "Name[es]": "KDE Connect", "Name[eu]": "KDE Connect", "Name[fr]": "KDE Connect", + "Name[ia]": "KDE Connect", "Name[ka]": "KDE Connect", "Name[nl]": "KDE Connect", "Name[pl]": "KDE Connect", diff --git a/plugins/mmtelephony/kdeconnect_mmtelephony.json b/plugins/mmtelephony/kdeconnect_mmtelephony.json index 1238756a2..fd3e60fda 100644 --- a/plugins/mmtelephony/kdeconnect_mmtelephony.json +++ b/plugins/mmtelephony/kdeconnect_mmtelephony.json @@ -13,6 +13,7 @@ "Name[es]": "Yoram Bar-Haim", "Name[eu]": "Yoram Bar-Haim", "Name[fr]": "Yoram Bar-Haim", + "Name[ia]": "Yoram Bar-Haim", "Name[ka]": "Yoram Bar-Haim", "Name[nl]": "Yoram Bar-Haim", "Name[pl]": "Yoram Bar-Haim", @@ -78,6 +79,7 @@ "Name[es]": "Integración con el teléfono ModemManager", "Name[eu]": "«ModemManager» telefonia bateratzea", "Name[fr]": "Intégration de la téléphonie avec ModemManager ", + "Name[ia]": "Integration de telephonia Modem Manager (Gerente de Modem)", "Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია", "Name[nl]": "Modembeheerder telefoonintegratie", "Name[pl]": "Integracja z telefonią zarządzania modemem",