[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c2ff5c5

The following commit has been merged in the master branch:
commit c2ff5c5101e6b9e062b8dd7ac6679846c4acb595
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Mar 3 09:54:08 2016 +0000

    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"
---
 fileitemactionplugin/kdeconnectsendfile.desktop               | 1 +
 plugins/kdeconnect.notifyrc                                   | 1 +
 plugins/notifications/kdeconnect_notifications_config.desktop | 1 +
 3 files changed, 3 insertions(+)

diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop
index d678fd4..34d6fbb 100644
--- a/fileitemactionplugin/kdeconnectsendfile.desktop
+++ b/fileitemactionplugin/kdeconnectsendfile.desktop
@@ -34,6 +34,7 @@ Name[zh_CN]=通过 KDE Connect 服务发送文件
 X-KDE-Library=kdeconnectfiletiemaction
 X-KDE-Submenu=Connect
 X-KDE-Submenu[ar]=اتّصل,اتصل
+X-KDE-Submenu[ast]=Coneutar
 X-KDE-Submenu[bg]=Свързване
 X-KDE-Submenu[bs]=Uspostavi vezu
 X-KDE-Submenu[ca]=Connecta
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 1ca7f06..2ec8dc6 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -99,6 +99,7 @@ Name[x-test]=xxPairing Requestxx
 Name[zh_CN]=配对请求
 Comment=Pairing request received from a device
 Comment[ar]=استُلم طلب اقتران من جهاز
+Comment[ast]=Solicitú d'empareyamientu recibida d'un preséu
 Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[ca at valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[de]=Verbindungsanfrage von einem Gerät erhalten
diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index 80e8f4d..b582e1f 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -7,6 +7,7 @@ X-KDE-ParentComponents=kdeconnect_notifications
 
 Name=Notification synchronization plugin settings
 Name[ar]=إعدادات ملحقة مزامنة الإخطارات
+Name[ast]=Axustes del complementu de sincronización d'avisos
 Name[ca]=Ajustament del connector Sincronitza les notificacions
 Name[ca at valencia]=Ajustament del connector Sincronitza les notificacions
 Name[cs]=Nastavení modulu synchronizace upozornění

-- 
kdeconnect packaging