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

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:27:04 UTC 2016


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

The following commit has been merged in the master branch:
commit ddad10016e38c09118003fec9bbf196860f904bc
Merge: 2054288cac61059802304d6a6d8ee7ec21c33f5e 2d065ab8f8934031dc64666027f23824f7ed1bb5
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Oct 1 03:20:29 2013 +0200

    Merge branch 'filetransfer-debug'

 README                                             |  44 ++++++--
 kcm/kcm_kdeconnect.desktop                         |   3 -
 kded/CMakeLists.txt                                |  16 +--
 kded/{devicelinks => backends}/devicelink.cpp      |   5 +-
 kded/{devicelinks => backends}/devicelink.h        |  17 ++-
 kded/backends/lan/CMakeLists.txt                   |  11 ++
 .../lan/downloadjob.cpp}                           |  34 ++++--
 .../landevicelink.h => backends/lan/downloadjob.h} |  39 +++----
 .../lan}/landevicelink.cpp                         |  79 +++++++++++--
 kded/{devicelinks => backends/lan}/landevicelink.h |   9 +-
 .../lan}/lanlinkprovider.cpp                       |  20 ++--
 .../lan}/lanlinkprovider.h                         |   2 +-
 kded/{ => backends/lan}/netaddress.h               |   0
 kded/backends/lan/uploadjob.cpp                    |  86 ++++++++++++++
 .../landevicelink.h => backends/lan/uploadjob.h}   |  40 +++----
 kded/{linkproviders => backends}/linkprovider.cpp  |   3 +-
 kded/{linkproviders => backends}/linkprovider.h    |   0
 kded/backends/loopback/CMakeLists.txt              |   9 ++
 .../loopback}/loopbackdevicelink.cpp               |  42 ++++++-
 .../loopback}/loopbackdevicelink.h                 |   5 +-
 .../loopback}/loopbacklinkprovider.cpp             |  19 +++-
 .../loopback}/loopbacklinkprovider.h               |   5 +-
 kded/daemon.cpp                                    |  19 ++--
 kded/daemon.h                                      |   4 +-
 kded/device.cpp                                    |  77 ++++++-------
 kded/device.h                                      |   5 +-
 kded/filetransferjob.cpp                           | 115 +++++++++++++++++++
 .../battery/batteryplugin.h => filetransferjob.h}  |  40 ++++---
 kded/kdeconnect.desktop                            |   2 -
 kded/kdeconnect.notifyrc                           |  16 ---
 kded/networkpackage.cpp                            |  79 +++++++++----
 kded/networkpackage.h                              |  28 ++++-
 kded/networkpackagetypes.h                         |   1 +
 kded/plugins/CMakeLists.txt                        |   2 +-
 kded/plugins/battery/CMakeLists.txt                |   9 +-
 kded/plugins/battery/README                        |  17 +++
 kded/plugins/battery/kdeconnect_battery.desktop    |   2 -
 kded/plugins/clipboard/CMakeLists.txt              |   9 +-
 kded/plugins/clipboard/README                      |  10 ++
 .../plugins/clipboard/kdeconnect_clipboard.desktop |   2 -
 kded/plugins/filetransfer/CMakeLists.txt           |  32 ------
 kded/plugins/filetransfer/filetransferplugin.cpp   |  40 -------
 .../filetransfer/kdeconnect_filetransfer.desktop   |  29 -----
 kded/plugins/kdeconnect_plugin.desktop             |   1 -
 kded/plugins/kdeconnectplugin.cpp                  |   2 -
 kded/plugins/mpriscontrol/CMakeLists.txt           |   9 +-
 kded/plugins/mpriscontrol/README                   |  27 +++++
 .../mpriscontrol/kdeconnect_mpriscontrol.desktop   |   2 -
 kded/plugins/notifications/CMakeLists.txt          |   9 +-
 kded/plugins/notifications/README                  |  32 ++++++
 .../notifications/kdeconnect_notifications.desktop |   2 -
 kded/plugins/notifications/notification.cpp        |   3 +-
 kded/plugins/notifications/notification.h          |   6 +-
 .../notifications/notificationsdbusinterface.cpp   |  19 +++-
 .../notifications/notificationsdbusinterface.h     |   2 +
 kded/plugins/notifications/notificationsplugin.cpp |   2 +-
 kded/plugins/pausemusic/CMakeLists.txt             |   7 +-
 kded/plugins/pausemusic/README                     |   7 ++
 .../pausemusic/kdeconnect_pausemusic.desktop       |   2 -
 kded/plugins/pausemusic/pausemusicplugin.cpp       |   2 +-
 kded/plugins/ping/CMakeLists.txt                   |   7 +-
 kded/plugins/ping/README                           |   3 +
 kded/plugins/ping/kdeconnect_ping.desktop          |   2 -
 kded/plugins/ping/pingplugin.cpp                   |   2 +-
 kded/plugins/pluginloader.cpp                      |   3 +-
 kded/plugins/sharereceiver/CMakeLists.txt          |  36 ++++++
 kded/plugins/sharereceiver/README                  |  11 ++
 .../plugins/sharereceiver/autoclosingqfile.cpp     |  13 +--
 .../sharereceiver/autoclosingqfile.h}              |  28 +++--
 .../sharereceiver/kdeconnect_sharereceiver.desktop |  15 +++
 kded/plugins/sharereceiver/sharereceiverplugin.cpp | 124 +++++++++++++++++++++
 .../sharereceiverplugin.h}                         |  19 +++-
 kded/plugins/telephony/README                      |  15 +++
 .../plugins/telephony/kdeconnect_telephony.desktop |   2 -
 plasmoid/package/metadata.desktop                  |   2 -
 75 files changed, 1033 insertions(+), 409 deletions(-)

diff --cc kcm/kcm_kdeconnect.desktop
index 68dece4,771c27a..595063a
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@@ -12,9 -12,7 +12,8 @@@ X-KDE-ParentApp=kcontro
  X-KDE-System-Settings-Parent-Category=hardware
  
  Name=Devices
 +Name[cs]=Zařízení
  Name[de]=Geräte
- Name[es]=Dispositivos
  Name[nl]=Apparaten
  Name[pt]=Dispositivos
  Name[pt_BR]=Dispositivos
diff --cc kded/kdeconnect.notifyrc
index 7af5686,b2f6c45..5fba429
--- a/kded/kdeconnect.notifyrc
+++ b/kded/kdeconnect.notifyrc
@@@ -22,9 -20,7 +20,8 @@@ Comment[x-test]=xxNotifications from yo
  
  [Event/callReceived]
  Name=Calling
 +Name[cs]=Volám
  Name[de]=Anruf
- Name[es]=Llamando
  Name[nl]=Oproep
  Name[pt]=A Chamar
  Name[pt_BR]=Chamando
@@@ -46,9 -41,7 +42,8 @@@ Action=Popu
  
  [Event/missedCall]
  Name=Missed
 +Name[cs]=Zmeškané
  Name[de]=Verpasst
- Name[es]=Perdida
  Name[nl]=Gemist
  Name[pt]=Não Atendida
  Name[pt_BR]=Não atendidas
@@@ -57,9 -50,7 +52,8 @@@ Name[sv]=Missa
  Name[uk]=Пропущено
  Name[x-test]=xxMissedxx
  Comment=You have a missed call
 +Comment[cs]=Máte zmeškaný hovor
  Comment[de]=Sie haben einen Anruf verpasst
- Comment[es]=Tiene una llamada perdida
  Comment[nl]=U hebt een gemiste oproep
  Comment[pt]=Tem uma chamada não atendida
  Comment[pt_BR]=Você tem uma chamada não atendida
@@@ -71,9 -62,7 +65,8 @@@ Action=Popu
  
  [Event/smsReceived]
  Name=SMS
 +Name[cs]=SMS
  Name[de]=SMS
- Name[es]=SMS
  Name[nl]=SMS
  Name[pt]=SMS
  Name[pt_BR]=SMS
@@@ -94,9 -82,7 +86,8 @@@ Action=Popu
  
  [Event/batteryLow]
  Name=Battery
 +Name[cs]=Baterie
  Name[de]=Akku
- Name[es]=Batería
  Name[nl]=Batterij
  Name[pt]=Bateria
  Name[pt_BR]=Bateria
@@@ -117,9 -102,7 +107,8 @@@ Action=Popu
  
  [Event/pingReceived]
  Name=Ping
 +Name[cs]=Ping
  Name[de]=Ping
- Name[es]=Ping
  Name[nl]=Ping
  Name[pt]=Pedido de Rede
  Name[pt_BR]=Ping
@@@ -140,9 -122,7 +128,8 @@@ Action=Popu
  
  [Event/notification]
  Name=Notification
 +Name[cs]=Upozornění
  Name[de]=Benachrichtigung
- Name[es]=Notificación
  Name[nl]=Melding
  Name[pt]=Notificação
  Name[pt_BR]=Notificação
@@@ -163,9 -142,7 +149,8 @@@ Action=Popu
  
  [Event/unknownEvent]
  Name=Unknown
 +Name[cs]=Neznámý
  Name[de]=Unbekannt
- Name[es]=Desconocido
  Name[nl]=Onbekend
  Name[pt]=Desconhecido
  Name[pt_BR]=Desconhecido
diff --cc kded/plugins/battery/kdeconnect_battery.desktop
index 6f6463a,fe98c9f..b7f37a5
--- a/kded/plugins/battery/kdeconnect_battery.desktop
+++ b/kded/plugins/battery/kdeconnect_battery.desktop
@@@ -12,9 -12,7 +12,8 @@@ X-KDE-PluginInfo-License=GP
  X-KDE-PluginInfo-EnabledByDefault=true
  Icon=battery-100
  Name=Battery monitor
 +Name[cs]=Monitor baterie
  Name[de]=Akkuüberwachung
- Name[es]=Monitor de la batería
  Name[nl]=Batterijmonitor
  Name[pt]=Monitor da bateria
  Name[pt_BR]=Monitor de bateria
diff --cc kded/plugins/clipboard/kdeconnect_clipboard.desktop
index 59aa40b,0abfc11..2de1b74
--- a/kded/plugins/clipboard/kdeconnect_clipboard.desktop
+++ b/kded/plugins/clipboard/kdeconnect_clipboard.desktop
@@@ -12,9 -12,7 +12,8 @@@ X-KDE-PluginInfo-License=GP
  X-KDE-PluginInfo-EnabledByDefault=true
  Icon=edit-paste
  Name=Clipboard
 +Name[cs]=Schránka
  Name[de]=Zwischenablage
- Name[es]=Portapapeles
  Name[nl]=Klembord
  Name[pt]=Área de Transferência
  Name[pt_BR]=Área de transferência
diff --cc kded/plugins/ping/kdeconnect_ping.desktop
index 416017e,267c4ca..7dcbe62
--- a/kded/plugins/ping/kdeconnect_ping.desktop
+++ b/kded/plugins/ping/kdeconnect_ping.desktop
@@@ -12,9 -12,7 +12,8 @@@ X-KDE-PluginInfo-License=GP
  X-KDE-PluginInfo-EnabledByDefault=true
  Icon=dialog-ok
  Name=Ping
 +Name[cs]=Ping
  Name[de]=Ping
- Name[es]=Ping
  Name[nl]=Ping
  Name[pt]=Pedido de Rede
  Name[pt_BR]=Ping
@@@ -23,9 -21,7 +22,8 @@@ Name[sv]=Pin
  Name[uk]=Луна
  Name[x-test]=xxPingxx
  Comment=Send and receive pings
 +Comment[cs]=Posílat a přijímat ping
  Comment[de]=Senden und Empfangen von Pings
- Comment[es]=Enviar y recibir pings
  Comment[nl]=Pings verzenden en ontvangen
  Comment[pt]=Enviar e receber pedidos de rede
  Comment[pt_BR]=Envia e recebe pings
diff --cc plasmoid/package/metadata.desktop
index f7927e7,c6f76f2..66425ae
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@@ -1,8 -1,6 +1,7 @@@
  [Desktop Entry]
  Name=KdeConnect
 +Name[cs]=KdeConnect
  Name[de]=KdeConnect
- Name[es]=KdeConnect
  Name[nl]=KdeConnect
  Name[pt]=KDEConnect
  Name[pt_BR]=KdeConnect

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list