[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.1.0-1

Modestas Vainius modax at alioth.debian.org
Wed Mar 23 00:36:06 UTC 2011


The following commit has been merged in the master branch:
commit 66788faf5fbd731864edf86791751e529e209a0a
Merge: f099bf7d159d8d7d987d9b01ddd059ff723902f7 a7aae382632bb6ba12f8d7d576d5c3a0e391e729
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Mar 23 01:58:42 2011 +0200

    Merge commit 'upstream/4.1.0'

 ChangeLog                                          |    8 +
 Messages.sh                                        |    4 +-
 kio-magnet/Messages.sh                             |    1 +
 kio-magnet/dbushandler.cpp                         |    3 +-
 kio-magnet/kio_magnet.cpp                          |    2 +-
 ktorrent/core.cpp                                  |   38 +-
 ktorrent/core.h                                    |    7 +
 ktorrent/ktorrent.desktop                          |   16 +-
 ktorrent/ktorrent.notifyrc                         |   41 +-
 ktorrent/ktorrentplugin.desktop                    |    4 +-
 ktorrent/view/view.cpp                             |   24 +-
 ktorrent/view/viewdelegate.cpp                     |    4 +-
 ktorrent/view/viewmodel.cpp                        |    7 +-
 libktcore/ktversion.h                              |    6 +-
 plasma/applet/plasma-applet-ktorrent.desktop       |    9 +-
 .../dataengine/plasma-dataengine-ktorrent.desktop  |   15 +-
 plugins/bwscheduler/ktbwschedulerplugin.desktop    |    2 -
 .../downloadorder/ktdownloadorderplugin.desktop    |    4 +-
 plugins/infowidget/ktinfowidgetplugin.desktop      |    5 +-
 plugins/ipfilter/ktipfilterplugin.desktop          |    3 -
 plugins/logviewer/ktlogviewerplugin.desktop        |    3 +-
 .../ktmagnetgeneratorplugin.desktop                |   12 +-
 plugins/mediaplayer/ktmediaplayerplugin.desktop    |    5 +-
 plugins/mediaplayer/mediafile.cpp                  |    4 +-
 plugins/mediaplayer/mediafilestream.cpp            |   12 +-
 plugins/mediaplayer/mediafilestream.h              |    2 +-
 plugins/mediaplayer/mediaplayer.cpp                |   18 +-
 plugins/mediaplayer/mediaplayer.h                  |    5 +-
 plugins/mediaplayer/mediaplayeractivity.cpp        |   10 +-
 plugins/mediaplayer/mediaplayeractivity.h          |    2 +-
 plugins/mediaplayer/videowidget.cpp                |   41 +-
 plugins/mediaplayer/videowidget.h                  |    7 -
 plugins/scanfolder/ktscanfolderplugin.desktop      |    3 +-
 plugins/scripting/ktscriptingplugin.desktop        |    3 -
 .../scripts/auto_remove/auto_remove.desktop        |    9 +-
 .../scripts/auto_resume/auto_resume.desktop        |    6 +-
 .../email_notifications.desktop                    |    6 +-
 .../scripts/tracker_groups/tracker_groups.desktop  |    9 +-
 plugins/search/ktsearchplugin.desktop              |    3 +-
 plugins/search/webview.cpp                         |   22 +
 plugins/shutdown/ktshutdownplugin.desktop          |   12 +-
 plugins/stats/ktstatsplugin.desktop                |    3 +-
 plugins/syndication/ktsyndicationplugin.desktop    |    5 +-
 plugins/upnp/ktupnpplugin.desktop                  |    2 -
 plugins/webinterface/ktwebinterfaceplugin.desktop  |    6 +-
 plugins/zeroconf/ktzeroconfplugin.desktop          |    4 +-
 po/CMakeLists.txt                                  |    2 +-
 po/ar/ktorrent.po                                  | 5560 ++++++------
 po/ast/ktorrent.po                                 | 5527 ++++++------
 po/be/ktorrent.po                                  | 5226 ++++++------
 po/bg/ktorrent.po                                  | 5670 ++++++------
 po/ca/ktorrent.po                                  | 5339 ++++++------
 po/ca at valencia/ktorrent.po                         | 5656 ++++++------
 po/cs/ktorrent.po                                  | 5480 ++++++------
 po/da/ktorrent.po                                  | 5377 ++++++------
 po/de/ktorrent.po                                  | 5654 ++++++------
 po/el/ktorrent.po                                  | 6607 ++++++--------
 po/en_GB/ktorrent.po                               | 5713 ++++++------
 po/eo/ktorrent.po                                  | 5805 ++++++------
 po/es/ktorrent.po                                  | 5601 ++++++------
 po/et/ktorrent.po                                  | 5360 ++++++------
 po/eu/ktorrent.po                                  | 8041 ++++++-----------
 po/fi/ktorrent.po                                  | 5554 ++++++------
 po/fr/ktorrent.po                                  | 5640 ++++++------
 po/ga/ktorrent.po                                  | 5439 ++++++------
 po/gl/ktorrent.po                                  | 5630 ++++++------
 po/hi/ktorrent.po                                  | 5214 ++++++------
 po/hne/ktorrent.po                                 | 5139 +++++------
 po/hr/ktorrent.po                                  | 4905 +++++-----
 po/hu/ktorrent.po                                  | 5536 ++++++------
 po/is/ktorrent.po                                  | 6146 +++++++------
 po/it/ktorrent.po                                  | 5523 ++++++------
 po/ja/ktorrent.po                                  | 5282 ++++++------
 po/km/ktorrent.po                                  | 5733 ++++++------
 po/ku/CMakeLists.txt                               |    2 -
 po/ku/ktorrent.po                                  | 9643 --------------------
 po/lt/ktorrent.po                                  | 5235 ++++++------
 po/lv/ktorrent.po                                  | 5482 ++++++------
 po/mai/CMakeLists.txt                              |    2 +
 po/{si => mai}/ktorrent.po                         | 5549 ++++++------
 po/ms/ktorrent.po                                  | 5113 +++++------
 po/nb/ktorrent.po                                  | 4067 ++++-----
 po/nds/ktorrent.po                                 | 5400 ++++++------
 po/nl/ktorrent.po                                  | 5411 ++++++------
 po/nn/ktorrent.po                                  | 3900 ++++----
 po/oc/ktorrent.po                                  | 5192 ++++++------
 po/pl/ktorrent.po                                  | 5754 ++++++------
 po/pt/ktorrent.po                                  | 5370 ++++++------
 po/pt_BR/ktorrent.po                               | 5433 ++++++------
 po/ro/ktorrent.po                                  | 5674 ++++++------
 po/ru/ktorrent.po                                  | 5662 ++++++------
 po/se/ktorrent.po                                  | 3496 ++++----
 po/si/ktorrent.po                                  | 4903 +++++-----
 po/sk/ktorrent.po                                  | 5527 ++++++------
 po/sl/ktorrent.po                                  | 5513 ++++++------
 po/sr/ktorrent.po                                  | 5221 ++++++------
 po/sr at ijekavian/ktorrent.po                        | 5223 ++++++------
 po/sr at ijekavianlatin/ktorrent.po                   | 5223 ++++++------
 po/sr at latin/ktorrent.po                            | 5221 ++++++------
 po/sv/ktorrent.po                                  | 5322 ++++++------
 po/tr/ktorrent.po                                  | 5667 ++++++------
 po/uk/ktorrent.po                                  | 5381 ++++++------
 po/zh_CN/ktorrent.po                               | 6936 ++++++++-------
 po/zh_TW/ktorrent.po                               | 5272 ++++++------
 104 files changed, 144566 insertions(+), 160004 deletions(-)

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list