From 97be950a2dba2de4071d93769be7fe85d88589c9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Feb 2023 02:03:03 +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 de61885f1..8a864c012 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -4,6 +4,7 @@ "BugReportUrl": "https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_kdeconnect", "Description": "Connect and sync your devices", "Description[ar]": "اتّصل وزامن أجهزتك", + "Description[az]": "Cihazlarını qoş və eyniləşdir", "Description[bg]": "Свържете и синхронизирайте вашите устройства", "Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius", "Description[ca]": "Connecta i sincronitza els vostres dispositius", @@ -33,6 +34,7 @@ "Icon": "preferences-kde-connect", "Name": "KDE Connect", "Name[ar]": "كدي المتّصل", + "Name[az]": "KDE Connect", "Name[bg]": "KDE Connect", "Name[ca@valencia]": "KDE Connect", "Name[ca]": "KDE Connect", diff --git a/plugins/mmtelephony/kdeconnect_mmtelephony.json b/plugins/mmtelephony/kdeconnect_mmtelephony.json index 7c74629d3..25c6333c3 100644 --- a/plugins/mmtelephony/kdeconnect_mmtelephony.json +++ b/plugins/mmtelephony/kdeconnect_mmtelephony.json @@ -5,6 +5,7 @@ "Email": "bhyoram@protonmail.com", "Name": "Yoram Bar-Haim", "Name[ar]": "يورام بار-هايم", + "Name[az]": "Yoram Bar-Haim", "Name[bg]": "Yoram Bar-Haim", "Name[ca@valencia]": "Yoram Bar-Haim", "Name[ca]": "Yoram Bar-Haim", @@ -80,6 +81,7 @@ "License": "GPL", "Name": "ModemManager Telephony integration", "Name[ar]": "تكامل هاتف ModemManager", + "Name[az]": "ModemManager Telefoniya inteqrasiyası", "Name[bg]": "Интеграция с телефон на ModemManager", "Name[ca@valencia]": "Integració amb la telefonia de ModemManager", "Name[ca]": "Integració amb la telefonia del ModemManager",