[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5ad007a98162b4621264e30eafe33853addc0da8
Merge: 2fd42a8408ec11abb5e115b663176eb42ac7bee4 a759cdf678c80837a3737dac7a0c0cfb42329720
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Aug 29 20:46:48 2016 +0200

    Merge branch '1.x'

 app/org.kde.kdeconnect.app.desktop                 | 12 ----
 core/backends/lan/lanpairinghandler.cpp            |  4 --
 core/device.cpp                                    | 19 +++---
 core/kdeconnectconfig.cpp                          |  2 +-
 core/pluginloader.cpp                              | 14 +++-
 daemon/kdeconnect.desktop                          |  8 ---
 daemon/kdeconnectd.desktop.cmake                   |  4 --
 fileitemactionplugin/kdeconnectsendfile.desktop    |  8 ---
 kcm/kcm_kdeconnect.desktop                         | 12 ----
 kcm/org.kde.kdeconnect.kcm.desktop                 |  8 ---
 kdeconnect.appdata.xml                             | 18 +-----
 org.kde.kdeconnect.nonplasma.desktop               |  8 ---
 plasmoid/package/metadata.desktop                  |  8 ---
 plugins/kdeconnect.notifyrc                        | 75 +---------------------
 plugins/kdeconnect_plugin.desktop                  |  4 --
 .../kdeconnect_pausemusic_config.desktop           |  4 --
 .../kdeconnect_runcommand_config.desktop           |  9 ---
 .../kdeconnect_sendnotifications_config.desktop    |  8 +--
 plugins/share/kdeconnect_share_config.desktop      |  4 --
 19 files changed, 27 insertions(+), 202 deletions(-)

diff --cc plugins/kdeconnect.notifyrc
index de59ea4,12196be..87bf468
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@@ -112,17 -98,10 +98,13 @@@ Comment[cs]=Požadavek na párování p
  Comment[en_GB]=Pairing request received from a device
  Comment[es]=Petición de vinculación recibida desde un dispositivo
  Comment[et]=Seadmelt saadi paardumissoov
 +Comment[fi]=Saatiin paripyyntö laitteelta
 +Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo.
 +Comment[he]=התקבלה בקשת התאמה מהתקן
  Comment[it]=Richiesta di associazione ricevuta da un dispositivo
- Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten
+ Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
  Comment[pl]=Otrzymano żądanie parowania z urządzenia
  Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
- Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo
  Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia
  Comment[sv]=Begäran om ihopparning mottagen från en apparat
  Comment[uk]=Від пристрою отримано запит щодо пов’язування
diff --cc plugins/runcommand/kdeconnect_runcommand_config.desktop
index 604e816,2e026a5..86031b4
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@@ -9,19 -9,11 +9,11 @@@ Name=Run Command plugin setting
  Name[ca]=Ajustaments del connector Executa ordres
  Name[ca at valencia]=Ajustaments del connector Executa ordes
  Name[cs]=Nastavení modulu Spustit příkaz
- Name[da]=Indstilling af kør kommando-plugin
- Name[de]=Modul-Einstellungen für Befehlsausführung
- Name[el]=Ρυθμίσεις προσθέτου εκτέλεσης εντολής
  Name[en_GB]=Run Command plugin settings
 -Name[es]=Ejecutar preferencias del complemento Orden
 +Name[es]=Ajustes del complemento de ejecución de órdenes
  Name[et]=Käsu käivitamise plugina seadistused
  Name[fi]=Suorita komento -liitännäisen asetukset
- Name[gl]=Configuración do complemento de orde de executar
- Name[he]=הגדרת התוסף הרץ פקודה
  Name[it]=Impostazioni estensione Esegui comando
- Name[ko]=명령 실행 플러그인 설정
  Name[nl]=Plug-in-instellingen van commando Uitvoeren
  Name[pl]=Ustawienia wtyczki wykonywania polecenia
  Name[pt]=Configuração do 'plugin' de execução de comandos
diff --cc plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 7d7b63c,77bed1f..fdd505b
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@@ -14,17 -12,10 +12,13 @@@ Name[cs]=Nastavení modulu synchronizac
  Name[en_GB]=Notification synchronisation plugin settings
  Name[es]=Preferencias del complemento de sincronización de notificaciones
  Name[et]=Märguande sünkroonimise plugina seaditused
 +Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset
 +Name[gl]=Configuración do complemento de sincronización de notificacións
 +Name[he]=הגדרת התוסף סנכרון התראות
  Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
- Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen
+ Name[nl]=Instellingen voor meldingen van synchronisatie plug-in
  Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia
  Name[pt]=Configuração do 'plugin' de sincronização das notificações
- Name[pt_BR]=Configuração do plugin de sincronização das notificações
  Name[sk]=Nastavenia pluginu notifikácií synchronizácie
  Name[sv]=Inställningar av insticksprogram för underrättelsesynkronisering
  Name[uk]=Параметри додатка синхронізації сповіщень

-- 
kdeconnect packaging