[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=73c6e1a

The following commit has been merged in the master branch:
commit 73c6e1a3067737bec0b30eb74e558deae927f7c9
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Nov 24 05:29:38 2016 +0100

    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            |  6 --
 plugins/clipboard/kdeconnect_clipboard.json        |  6 --
 plugins/findmyphone/kdeconnect_findmyphone.json    |  7 ---
 plugins/kdeconnect.notifyrc                        | 72 ----------------------
 plugins/kdeconnect_plugin.desktop                  |  4 --
 plugins/lockdevice/kdeconnect_lockdevice.json      |  5 --
 plugins/mousepad/kdeconnect_mousepad.json          |  7 ---
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json  |  6 --
 plugins/mprisremote/kdeconnect_mprisremote.json    |  4 --
 .../notifications/kdeconnect_notifications.json    |  6 --
 plugins/pausemusic/kdeconnect_pausemusic.json      |  6 --
 .../kdeconnect_pausemusic_config.desktop           |  4 --
 plugins/ping/kdeconnect_ping.json                  |  4 --
 .../remotecommands/kdeconnect_remotecommands.json  | 12 ++--
 .../remotecontrol/kdeconnect_remotecontrol.json    |  5 --
 plugins/runcommand/kdeconnect_runcommand.json      |  6 --
 .../kdeconnect_runcommand_config.desktop           |  6 --
 .../kdeconnect_screensaver_inhibit.json            |  6 --
 .../kdeconnect_sendnotifications_config.desktop    |  7 +--
 plugins/sftp/kdeconnect_sftp.json                  | 10 +--
 plugins/share/kdeconnect_share.json                |  6 --
 plugins/share/kdeconnect_share_config.desktop      |  4 --
 plugins/telephony/kdeconnect_telephony.json        |  6 +-
 31 files changed, 8 insertions(+), 265 deletions(-)

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


-- 
kdeconnect packaging