From 9ee562cac3c840d7b10489829d76f5793dce2d58 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 5 Mar 2023 01:58:22 +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"
---
 app/org.kde.kdeconnect.app.desktop             | 2 +-
 daemon/org.kde.kdeconnect.daemon.desktop.cmake | 2 +-
 data/kdeconnect-dde.desktop                    | 2 +-
 data/kdeconnect-thunar.desktop                 | 2 +-
 data/org.kde.kdeconnect_open.desktop           | 6 +++---
 fileitemactionplugin/kdeconnectsendfile.json   | 4 ++--
 indicator/org.kde.kdeconnect.nonplasma.desktop | 2 +-
 kcm/kcm_kdeconnect.json                        | 2 +-
 plasmoid/package/metadata.desktop              | 4 ++--
 plugins/kdeconnect.notifyrc                    | 2 +-
 settings/org.kde.kdeconnect-settings.desktop   | 2 +-
 smsapp/org.kde.kdeconnect.sms.desktop          | 2 +-
 urlhandler/org.kde.kdeconnect.handler.desktop  | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index d6e771d20..ee34f3e96 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=KDE Connect
-Name[ar]=كدي المتّصل
+Name[ar]=كِيدِي المتّصل
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
diff --git a/daemon/org.kde.kdeconnect.daemon.desktop.cmake b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
index 6309573a2..c652a9a58 100644
--- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake
+++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
@@ -8,7 +8,7 @@ NoDisplay=true
 Icon=kdeconnect
 
 Name=KDE Connect
-Name[ar]=كدي المتّصل
+Name[ar]=كِيدِي المتّصل
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
diff --git a/data/kdeconnect-dde.desktop b/data/kdeconnect-dde.desktop
index b8029fd4e..66c0d5c9d 100644
--- a/data/kdeconnect-dde.desktop
+++ b/data/kdeconnect-dde.desktop
@@ -5,7 +5,7 @@ Encoding=UTF-8
 Exec=kdeconnect-handler %F
 Icon=kdeconnect
 Name=Send via KDE Connect
-Name[ar]=أرسل عبر خدمة «كدي المتّصل»
+Name[ar]=أرسل عبر خدمة «كِيدِي المتّصل»
 Name[az]=KDE Connect ilə göndərin
 Name[bg]=Изпратете чрез KDE Connect
 Name[ca]=Envia a través del KDE Connect
diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop
index bfd00c2d0..72325df35 100644
--- a/data/kdeconnect-thunar.desktop
+++ b/data/kdeconnect-thunar.desktop
@@ -5,7 +5,7 @@ Encoding=UTF-8
 Exec=kdeconnect-handler %F
 Icon=kdeconnect
 Name=Send via KDE Connect
-Name[ar]=أرسل عبر خدمة «كدي المتّصل»
+Name[ar]=أرسل عبر خدمة «كِيدِي المتّصل»
 Name[az]=KDE Connect ilə göndərin
 Name[bg]=Изпратете чрез KDE Connect
 Name[ca]=Envia a través del KDE Connect
diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop
index c010f6018..03de93ef6 100644
--- a/data/org.kde.kdeconnect_open.desktop
+++ b/data/org.kde.kdeconnect_open.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 GenericName=Open on connected device via KDE Connect
-GenericName[ar]=افتح في الجهاز المتصل عبر «كدي المتّصل»
+GenericName[ar]=افتح في الجهاز المتصل عبر «كِيدِي المتّصل»
 GenericName[az]=Connectd cihazında KDE Connect ilə açın
 GenericName[bg]=Отваряне на свързано устройство чрез KDE Connect
 GenericName[ca]=Obre al dispositiu connectat a través del KDE Connect
@@ -42,7 +42,7 @@ GenericName[x-test]=xxOpen on connected device via KDE Connectxx
 GenericName[zh_CN]=通过 KDE Connect 在已连接的设备上打开
 GenericName[zh_TW]=使用 KDE 連線於連線裝置中開啟
 Name=Open on connected device via KDE Connect
-Name[ar]=افتح في الجهاز المتصل عبر «كدي المتّصل»
+Name[ar]=افتح في الجهاز المتصل عبر «كِيدِي المتّصل»
 Name[az]=Connectd cihazında KDE Connect ilə açın
 Name[bg]=Отваряне на свързано устройство чрез KDE Connect
 Name[ca]=Obre al dispositiu connectat a través del KDE Connect
@@ -84,7 +84,7 @@ Name[x-test]=xxOpen on connected device via KDE Connectxx
 Name[zh_CN]=通过 KDE Connect在已连接的设备上打开
 Name[zh_TW]=使用 KDE 連線於連線裝置中開啟
 Comment=Open on a connected device using KDE Connect
-Comment[ar]=افتح في الجهاز المتصل باستخدام «كدي المتّصل»
+Comment[ar]=افتح في الجهاز المتصل باستخدام «كِيدِي المتّصل»
 Comment[az]=Connectd cihazında KDE Connect istifadə edərək açmaq
 Comment[bg]=Отваряне на свързано устройство с помощта на KDE Connect
 Comment[ca]=Obre a un dispositiu connectat usant el KDE Connect
diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json
index a6d85132d..2796efd2c 100644
--- a/fileitemactionplugin/kdeconnectsendfile.json
+++ b/fileitemactionplugin/kdeconnectsendfile.json
@@ -2,7 +2,7 @@
     "KPlugin": {
         "Category": "Utilities",
         "Description": "Send file to other device using KDE Connect",
-        "Description[ar]": "أرسل ملف إلى جهاز أخر باستعمال كدي المتصل",
+        "Description[ar]": "أرسل ملف إلى جهاز أخر باستعمال كِيدِي المتصل",
         "Description[az]": "Digər cihazlara KDE Connect ilə fayl göndərin",
         "Description[bg]": "Изпращане на файл до друго устройство чрез KDE Connect",
         "Description[ca@valencia]": "Envia fitxers a un altre dispositiu mitjançant KDE Connect",
@@ -47,7 +47,7 @@
             "application/octet-stream"
         ],
         "Name": "Send file via KDE Connect",
-        "Name[ar]": "أرسل ملف عبر كدي المتصل",
+        "Name[ar]": "أرسل ملف عبر كِيدِي المتصل",
         "Name[az]": "Faylı KDE Connect ilə göndərin",
         "Name[bg]": "Изпращане на SMS чрез KDE Connect...",
         "Name[ca@valencia]": "Envia el fitxer a través de KDE Connect",
diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop
index 524d64985..72528335f 100644
--- a/indicator/org.kde.kdeconnect.nonplasma.desktop
+++ b/indicator/org.kde.kdeconnect.nonplasma.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=KDE Connect Indicator
-Name[ar]=مؤشر «كدي المتّصل»
+Name[ar]=مؤشر «كِيدِي المتّصل»
 Name[az]=KDE Connect göstəricisi
 Name[bg]=Индикатор за свързване на KDE
 Name[ca]=Indicador del KDE Connect
diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json
index 7b48435d6..fab531c9c 100644
--- a/kcm/kcm_kdeconnect.json
+++ b/kcm/kcm_kdeconnect.json
@@ -34,7 +34,7 @@
         "Description[zh_TW]": "與您的裝置連線並同步",
         "Icon": "preferences-kde-connect",
         "Name": "KDE Connect",
-        "Name[ar]": "كدي المتّصل",
+        "Name[ar]": "كِيدِي المتّصل",
         "Name[az]": "KDE Connect",
         "Name[bg]": "KDE Connect",
         "Name[ca@valencia]": "KDE Connect",
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index c3c703c5e..1ca8eecad 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=KDE Connect
-Name[ar]=كدي المتّصل
+Name[ar]=كِيدِي المتّصل
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
@@ -50,7 +50,7 @@ Name[x-test]=xxKDE Connectxx
 Name[zh_CN]=KDE Connect
 Name[zh_TW]=KDE 連線
 Comment=Show notifications from your devices using KDE Connect
-Comment[ar]=أظهر الإخطارات من أجهزتك باستخدام «كدي المتّصل»
+Comment[ar]=أظهر الإخطارات من أجهزتك باستخدام «كِيدِي المتّصل»
 Comment[az]=KDE Connect istifadə edərək cihazlarınızdan bildirişləri göstərmək
 Comment[bg]=Показване на уведомления от вашите устройства чрез KDE Connect
 Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 425121629..97b0f92af 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -1,7 +1,7 @@
 [Global]
 IconName=kdeconnect
 Name=KDE Connect
-Name[ar]=كدي المتّصل
+Name[ar]=كِيدِي المتّصل
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
diff --git a/settings/org.kde.kdeconnect-settings.desktop b/settings/org.kde.kdeconnect-settings.desktop
index 06b99056c..8418ab863 100755
--- a/settings/org.kde.kdeconnect-settings.desktop
+++ b/settings/org.kde.kdeconnect-settings.desktop
@@ -4,7 +4,7 @@ Icon=kdeconnect
 Terminal=false
 Exec=kdeconnect-settings
 Name=KDE Connect Settings
-Name[ar]=إعدادات كدي المتّصل
+Name[ar]=إعدادات كِيدِي المتّصل
 Name[az]=KDE Connect Ayarları
 Name[bg]=Настройки на KDE Connect
 Name[ca]=Arranjament del KDE Connect
diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop
index addc2ac87..2d38f0b11 100644
--- a/smsapp/org.kde.kdeconnect.sms.desktop
+++ b/smsapp/org.kde.kdeconnect.sms.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=KDE Connect SMS
-Name[ar]=رسائل نصية لكدي المتّصل
+Name[ar]=رسائل نصية لكِيدِي المتّصل
 Name[az]=KDE Connect SMS
 Name[bg]=KDE Connect SMS
 Name[ca]=SMS del KDE Connect
diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop
index 0bcc215cf..4f49f0cef 100644
--- a/urlhandler/org.kde.kdeconnect.handler.desktop
+++ b/urlhandler/org.kde.kdeconnect.handler.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=KDE Connect
-Name[ar]=كدي المتّصل
+Name[ar]=كِيدِي المتّصل
 Name[az]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE