From ed92c41245ed477cd256d89d73545fbd55d14216 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 8 Jan 2023 01:59:58 +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 ++ plugins/remotecommands/kdeconnect_remotecommands.json | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index 550fd1cd5..634c72d7e 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -3,6 +3,7 @@ "KPlugin": { "Description": "Connect and sync your devices", "Description[ar]": "اتّصل وزامن أجهزتك", + "Description[bg]": "Свържете и синхронизирайте вашите устройства", "Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius", "Description[ca]": "Connecta i sincronitza els vostres dispositius", "Description[cs]": "Připojte a synchronizujte svá zařízení", @@ -21,6 +22,7 @@ "Icon": "preferences-kde-connect", "Name": "KDE Connect", "Name[ar]": "كدي المتّصل", + "Name[bg]": "KDE Connect", "Name[ca@valencia]": "KDE Connect", "Name[ca]": "KDE Connect", "Name[cs]": "KDE Connect", diff --git a/plugins/mmtelephony/kdeconnect_mmtelephony.json b/plugins/mmtelephony/kdeconnect_mmtelephony.json index dc325096c..1238756a2 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[bg]": "Yoram Bar-Haim", "Name[ca@valencia]": "Yoram Bar-Haim", "Name[ca]": "Yoram Bar-Haim", "Name[cs]": "Yoram Bar-Haim", @@ -69,6 +70,7 @@ "License": "GPL", "Name": "ModemManager Telephony integration", "Name[ar]": "تكامل هاتف ModemManager", + "Name[bg]": "Интеграция с телефон на ModemManager", "Name[ca@valencia]": "Integració amb la telefonia de ModemManager", "Name[ca]": "Integració amb la telefonia del ModemManager", "Name[cs]": "Integrace telefonu pro ModemManager", diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 5284c73a8..3bb0eb975 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -101,7 +101,7 @@ "Name": "Host remote commands", "Name[ar]": "استضف الأوامر البعيدة", "Name[az]": "Hostun uzaq əmrləri", - "Name[bg]": "за", + "Name[bg]": "Команди на отдалечения хост", "Name[ca@valencia]": "Allotja ordres remotes", "Name[ca]": "Allotja ordres remotes", "Name[cs]": "Přijímat vzdálené příkazy",