From 392d287b648fdfeef31ba236d136a5e4ecbc3c64 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 11 Aug 2019 04:47:22 +0200
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             |  3 +++
 daemon/org.kde.kdeconnect.daemon.desktop.cmake |  1 +
 indicator/org.kde.kdeconnect.nonplasma.desktop |  1 +
 kcm/kcm_kdeconnect.desktop                     |  3 +++
 kcm/org.kde.kdeconnect.kcm.desktop             |  1 +
 plasmoid/package/metadata.desktop              |  2 ++
 plugins/kdeconnect.notifyrc                    | 13 +++++++++++++
 plugins/kdeconnect_plugin.desktop              |  1 +
 sfos/kdeconnect-sfos.desktop                   |  1 +
 sfos/kdeconnectd.desktop.cmake                 |  1 +
 smsapp/org.kde.kdeconnect.sms.desktop          |  3 +++
 11 files changed, 30 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 8363f4ee0..656dae72b 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE Connect
 Name[ar]=كدي المتّصل
+Name[ast]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
 Name[ca]=KDE Connect
@@ -42,6 +43,7 @@ Name[zh_CN]=KDE Connect
 Name[zh_TW]=KDE 連線
 GenericName=Device Synchronization
 GenericName[ar]=مزامنة الأجهزة
+GenericName[ast]=Sincronización de preseos
 GenericName[ca]=Sincronització de dispositius
 GenericName[ca@valencia]=Sincronització de dispositius
 GenericName[cs]=Synchronizace zařízení
@@ -80,6 +82,7 @@ GenericName[zh_CN]=设备同步
 GenericName[zh_TW]=裝置同步
 Comment=Make all your devices one
 Comment[ar]=اجعل أجهزتك كلّها واحدًا
+Comment[ast]=Fai que tolos preseos seyan unu
 Comment[ca]=Fa que tots els vostres dispositius siguin un
 Comment[ca@valencia]=Fa que tots els vostres dispositius siguen un
 Comment[cs]=Sjednoťte svá zařízení
diff --git a/daemon/org.kde.kdeconnect.daemon.desktop.cmake b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
index cf619347a..22ecfb80f 100644
--- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake
+++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
@@ -10,6 +10,7 @@ Icon=kdeconnect
 
 Name=KDE Connect
 Name[ar]=كدي المتّصل
+Name[ast]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
 Name[ca]=KDE Connect
diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop
index a4b08cf7b..55b689a42 100644
--- a/indicator/org.kde.kdeconnect.nonplasma.desktop
+++ b/indicator/org.kde.kdeconnect.nonplasma.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=KDE Connect Indicator
+Name[ast]=Indicador de KDE Connnect
 Name[ca]=Indicador del KDE Connect
 Name[ca@valencia]=Indicador del KDE Connect
 Name[cs]=Indikátor KDE Connect
diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 9c113ad1a..d416c4e4b 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -12,6 +12,7 @@ X-KDE-System-Settings-Parent-Category=hardware
 
 Name=KDE Connect
 Name[ar]=كدي المتّصل
+Name[ast]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
 Name[ca]=KDE Connect
@@ -54,6 +55,7 @@ Name[zh_TW]=KDE 連線
 
 Comment=Connect and sync your devices
 Comment[ar]=اتّصل وزامن أجهزتك
+Comment[ast]=Coneuta y sincroniza preseos
 Comment[ca]=Connecta i sincronitza els vostres dispositius
 Comment[ca@valencia]=Connecta i sincronitza els vostres dispositius
 Comment[cs]=Připojte a synchronizujte svá zařízení
@@ -93,6 +95,7 @@ Comment[zh_TW]=連線並且同步您的裝置
 
 X-KDE-Keywords=Network,Android,Devices
 X-KDE-Keywords[ar]=شبكة,أندرويد,اندرويد,جهاز,أجهزة
+X-KDE-Keywords[ast]=Rede,Android,Preseos
 X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства
 X-KDE-Keywords[bs]=Mreža,Android,Uređaji
 X-KDE-Keywords[ca]=Xarxa,Android,Dispositius
diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
index 8548b9b85..724b2b605 100755
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@@ -5,6 +5,7 @@ Terminal=false
 Exec=kdeconnect-settings
 Name=KDE Connect Settings
 Name[ar]=إعدادات كدي المتّصل
+Name[ast]=Axustes de KDE Connect
 Name[ca]=Arranjament del KDE Connect
 Name[ca@valencia]=Arranjament del KDE Connect
 Name[cs]=Nastavení KDE Connect
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 875487a38..89c593351 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE Connect
 Name[ar]=كدي المتّصل
+Name[ast]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
 Name[ca]=KDE Connect
@@ -42,6 +43,7 @@ Name[zh_CN]=KDE Connect
 Name[zh_TW]=KDE 連線
 Comment=Show notifications from your devices using KDE Connect
 Comment[ar]=أظهر الإخطارات من أجهزتك باستخدام «كدي المتّصل»
+Comment[ast]=Amuesa los avisos de preseos que tean usando KDE Connect
 Comment[bg]=Показване на уведомления от вашите устройства чрез KDE Connect
 Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju
 Comment[ca]=Mostra les notificacions dels vostres dispositius emprant el KDE Connect
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index e96fd5cbf..8111d3572 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -2,6 +2,7 @@
 IconName=kdeconnect
 Name=KDE Connect
 Name[ar]=كدي المتّصل
+Name[ast]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
 Name[ca]=KDE Connect
@@ -86,6 +87,7 @@ Comment[zh_TW]=從您的裝置接收到通知
 [Event/pairingRequest]
 Name=Pairing Request
 Name[ar]=طلب اقتران
+Name[ast]=Solicitú d'empareyamientu
 Name[bg]=Заявка за сдвояване
 Name[bs]=Zahtjev za uparivanje
 Name[ca]=Sol·licitud d'aparellament
@@ -126,6 +128,7 @@ Name[zh_CN]=配对请求
 Name[zh_TW]=配對請求
 Comment=Pairing request received from a device
 Comment[ar]=استُلم طلب اقتران من جهاز
+Comment[ast]=Recibióse una solicitú d'empareyamientu d'un preséu
 Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[ca@valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[cs]=Požadavek na párování přijat ze zařízení
@@ -166,6 +169,7 @@ Action=Popup
 [Event/callReceived]
 Name=Incoming Call
 Name[ar]=مكالمة واردة
+Name[ast]=Llamada entrante
 Name[bg]=Входящо обаждане
 Name[ca]=Trucada entrant
 Name[ca@valencia]=Trucada entrant
@@ -206,6 +210,7 @@ Name[zh_CN]=收到呼叫
 Name[zh_TW]=電話來電
 Comment=Someone is calling you
 Comment[ar]=ثمّة من يتّصل بك
+Comment[ast]=Daquién ta llamándote
 Comment[bg]=Някой ви се обажда
 Comment[bs]=Neko Vas zove
 Comment[ca]=Algú us està trucant
@@ -250,6 +255,7 @@ Action=Popup
 [Event/missedCall]
 Name=Missed Call
 Name[ar]=مكالمة فائتة
+Name[ast]=Llamada perdida
 Name[bg]=Пропуснато обаждане
 Name[ca]=Trucada perduda
 Name[ca@valencia]=Trucada perduda
@@ -289,6 +295,7 @@ Name[zh_CN]=错过的呼叫
 Name[zh_TW]=未接來電
 Comment=You have a missed call
 Comment[ar]=لقد فاتتك مكالمة
+Comment[ast]=Tienes una llamada perdida
 Comment[bg]=Имате неприето обаждане
 Comment[bs]=Imate propušten poziv
 Comment[ca]=Teniu una trucada perduda
@@ -333,6 +340,7 @@ Action=Popup
 [Event/smsReceived]
 Name=SMS Received
 Name[ar]=استُلمت رسالة
+Name[ast]=SMS recibíu
 Name[bg]=Получен SMS
 Name[ca]=S'ha rebut un SMS
 Name[ca@valencia]=S'ha rebut un SMS
@@ -372,6 +380,7 @@ Name[zh_CN]=收到短信
 Name[zh_TW]=您有收到短訊
 Comment=Someone sent you an SMS
 Comment[ar]=ثمّة من أرسل رسالة إليك
+Comment[ast]=Daquién unvióte un SMS
 Comment[bg]=Някой ви изпрати текстово съобщение
 Comment[bs]=Neko Vam je poslao SMS poruku
 Comment[ca]=Algú us ha enviat un SMS
@@ -499,6 +508,7 @@ Action=Popup
 [Event/pingReceived]
 Name=Ping Received
 Name[ar]=استُلمت وكزة
+Name[ast]=Ping recibíu
 Name[bg]=Пингът е приет
 Name[ca]=S'ha rebut un ping
 Name[ca@valencia]=S'ha rebut un ping
@@ -538,6 +548,7 @@ Name[zh_CN]=收到 Ping
 Name[zh_TW]=收到 Ping 回應
 Comment=Ping received
 Comment[ar]=استُلمت وكزة
+Comment[ast]=Recibióse un ping
 Comment[bg]=Пингът е приет
 Comment[bs]=Primili ste ping
 Comment[ca]=S'ha rebut un ping
@@ -582,6 +593,7 @@ Action=Popup
 [Event/notification]
 Name=Generic Notification
 Name[ar]=إخطار عموميّ
+Name[ast]=Avisu xenéricu
 Name[bg]=Общо уведомление
 Name[ca]=Notificació genèrica
 Name[ca@valencia]=Notificació genèrica
@@ -705,6 +717,7 @@ Name[zh_CN]=文件传送
 Name[zh_TW]=檔案傳輸
 Comment=Incoming file
 Comment[ar]=ملفّ قادم
+Comment[ast]=Ficheru entrante
 Comment[bg]=Входящ файл
 Comment[ca]=Fitxer entrant
 Comment[ca@valencia]=Fitxer entrant
diff --git a/plugins/kdeconnect_plugin.desktop b/plugins/kdeconnect_plugin.desktop
index a5d54c035..7b74047e6 100644
--- a/plugins/kdeconnect_plugin.desktop
+++ b/plugins/kdeconnect_plugin.desktop
@@ -4,6 +4,7 @@ X-KDE-ServiceType=KdeConnect/Plugin
 X-KDE-Derived=KPluginInfo
 Name=KDEConnect Plugin
 Name[ar]=ملحقة KDEConnect
+Name[ast]=Plugin KDEConnect
 Name[bg]=Приставка на KDEConnect
 Name[bs]=Priključak za KDE konekciju
 Name[ca]=Connector del KDE Connect
diff --git a/sfos/kdeconnect-sfos.desktop b/sfos/kdeconnect-sfos.desktop
index e3d27a676..41065dd87 100644
--- a/sfos/kdeconnect-sfos.desktop
+++ b/sfos/kdeconnect-sfos.desktop
@@ -5,6 +5,7 @@ Icon=kdeconnect
 Exec=kdeconnect-sfos
 Name=KDE Connect
 Name[ar]=كدي المتّصل
+Name[ast]=KDE Connect
 Name[bg]=KDE Connect
 Name[bs]=Konekcija KDE
 Name[ca]=KDE Connect
diff --git a/sfos/kdeconnectd.desktop.cmake b/sfos/kdeconnectd.desktop.cmake
index 684ccf303..056f5f091 100644
--- a/sfos/kdeconnectd.desktop.cmake
+++ b/sfos/kdeconnectd.desktop.cmake
@@ -9,6 +9,7 @@ NoDisplay=true
 
 Name=KDEConnect daemon
 Name[ar]=عفريت KDEConnect
+Name[ast]=Degorriu KDEConnect
 Name[bg]=Услуга KDE Connect
 Name[ca]=Dimoni del KDEConnect
 Name[ca@valencia]=Dimoni del KDEConnect
diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop
index 1f4db7ce0..53595975a 100644
--- a/smsapp/org.kde.kdeconnect.sms.desktop
+++ b/smsapp/org.kde.kdeconnect.sms.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=KDE Connect SMS
+Name[ast]=SMS de KDE Connect
 Name[ca]=SMS del KDE Connect
 Name[ca@valencia]=SMS del KDE Connect
 Name[cs]=KDE Connect SMS
@@ -27,6 +28,7 @@ Name[x-test]=xxKDE Connect SMSxx
 Name[zh_CN]=KDE Connect 短信
 Name[zh_TW]=KDE 連線簡訊
 GenericName=SMS
+GenericName[ast]=SMS
 GenericName[ca]=SMS
 GenericName[ca@valencia]=SMS
 GenericName[cs]=SMS
@@ -54,6 +56,7 @@ GenericName[x-test]=xxSMSxx
 GenericName[zh_CN]=SMS
 GenericName[zh_TW]=簡訊
 Comment=Text Messaging
+Comment[ast]=Mensaxería de testu
 Comment[ca]=Missatgeria de text
 Comment[ca@valencia]=Missatgeria de text
 Comment[cs]=Zprávy