[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=ec0ca39

The following commit has been merged in the master branch:
commit ec0ca3976d29037be6e02a22f9398f589a3efa19
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Sep 29 12:27:06 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"
---
 app/org.kde.kdeconnect.app.desktop                 | 12 ----
 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 ---
 org.kde.kdeconnect.nonplasma.desktop               |  8 ---
 plasmoid/package/metadata.desktop                  |  8 ---
 plugins/battery/kdeconnect_battery.json            |  8 +--
 plugins/clipboard/kdeconnect_clipboard.json        |  8 +--
 plugins/findmyphone/kdeconnect_findmyphone.json    | 10 +--
 plugins/kdeconnect.notifyrc                        | 74 +---------------------
 plugins/kdeconnect_plugin.desktop                  |  4 --
 plugins/lockdevice/kdeconnect_lockdevice.json      |  7 +-
 plugins/mousepad/kdeconnect_mousepad.json          |  9 +--
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json  |  8 +--
 plugins/mprisremote/kdeconnect_mprisremote.json    |  6 +-
 .../notifications/kdeconnect_notifications.json    | 10 +--
 plugins/pausemusic/kdeconnect_pausemusic.json      |  8 +--
 .../kdeconnect_pausemusic_config.desktop           |  4 --
 plugins/ping/kdeconnect_ping.json                  |  6 +-
 .../remotecommands/kdeconnect_remotecommands.json  | 25 +-------
 .../remotecontrol/kdeconnect_remotecontrol.json    |  7 +-
 plugins/runcommand/kdeconnect_runcommand.json      |  8 +--
 .../kdeconnect_runcommand_config.desktop           |  9 +--
 .../kdeconnect_screensaver_inhibit.json            |  8 +--
 .../kdeconnect_sendnotifications_config.desktop    |  7 +-
 plugins/sftp/kdeconnect_sftp.json                  | 12 +---
 plugins/share/kdeconnect_share.json                |  8 +--
 plugins/share/kdeconnect_share_config.desktop      |  4 --
 plugins/telephony/kdeconnect_telephony.json        |  5 +-
 31 files changed, 23 insertions(+), 300 deletions(-)

The diff has been stripped from this email because it exceeds 50KB


-- 
kdeconnect packaging