[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=08eaaf1

The following commit has been merged in the master branch:
commit 08eaaf11e185c4ed76cafb61624af1d111c94747
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Mar 25 09:09:47 2015 +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"
---
 daemon/kdeconnect.desktop                          |  2 +
 daemon/kdeconnectd.desktop.cmake                   |  4 +-
 fileitemactionplugin/kdeconnectsendfile.desktop    |  4 ++
 kcm/kcm_kdeconnect.desktop                         |  3 +
 kcm/kdeconnect.desktop                             |  3 +
 kdeconnect-non-plasma.desktop                      |  4 +-
 plasmoid/package/metadata.desktop                  |  2 +
 plugins/battery/kdeconnect_battery.json            | 79 +++++----------------
 plugins/clipboard/kdeconnect_clipboard.json        | 80 +++++-----------------
 plugins/kdeconnect.notifyrc                        | 55 +++++----------
 plugins/kdeconnect_plugin.desktop                  |  1 +
 plugins/mousepad/kdeconnect_mousepad.json          | 32 +++++----
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json  | 78 +++++----------------
 .../notifications/kdeconnect_notifications.json    | 79 +++++----------------
 plugins/pausemusic/kdeconnect_pausemusic.json      | 74 +++++---------------
 .../kdeconnect_pausemusic_config.desktop           |  1 +
 plugins/ping/kdeconnect_ping.json                  | 80 +++++-----------------
 .../kdeconnect_screensaver_inhibit.json            | 54 ++++-----------
 plugins/sftp/kdeconnect_sftp.json                  | 74 +++++---------------
 plugins/share/kdeconnect_share.json                | 75 +++++---------------
 plugins/share/kdeconnect_share_config.desktop      |  1 +
 plugins/telephony/kdeconnect_telephony.json        | 79 +++++----------------
 22 files changed, 234 insertions(+), 630 deletions(-)

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


-- 
kdeconnect packaging