[SCM] Konversation packaging for Debian branch, master, updated. debian/1.4-beta1-1-5-g90bf226
Modestas Vainius
modax at alioth.debian.org
Sun Dec 4 16:19:19 UTC 2011
The following commit has been merged in the master branch:
commit 2e160fb7a61f0634e856111887730ab1b4b807e5
Merge: c24760edefd8ba60b87e764040bcdd7a027bb202 4838cb32d6f6b0e7d8ebc1b148002304cc5b80d5
Author: Modestas Vainius <modax at debian.org>
Date: Sun Dec 4 18:06:03 2011 +0200
Merge commit 'upstream/1.4'
ChangeLog | 58 +-
data/images/nickicons/default/index.desktop | 1 +
data/konversation.desktop | 1 +
data/konversation.notifyrc | 1 +
data/scripting_support/python/konversation/dbus.py | 8 +-
data/scripts/cmd | 2 +-
data/scripts/media | 2 +-
doc-translations/CMakeLists.txt | 2 -
.../de_konversation/konversation/index.docbook | 18 +-
.../et_konversation/konversation/index.docbook | 6 +-
.../it_konversation/konversation/CMakeLists.txt | 1 -
.../it_konversation/konversation/index.docbook | 6369 ----------
.../nl_konversation/konversation/index.docbook | 588 +-
.../pt_BR_konversation/konversation/index.docbook | 33 +-
.../pt_konversation/konversation/CMakeLists.txt | 1 -
.../pt_konversation/konversation/index.docbook | 6347 ----------
.../sv_konversation/konversation/addchannel.png | Bin 3985 -> 0 bytes
.../sv_konversation/konversation/addnetwork_co.png | Bin 11970 -> 0 bytes
.../sv_konversation/konversation/addserver_co.png | Bin 5902 -> 0 bytes
.../konversation/channel_screen_tour_co.png | Bin 27272 -> 0 bytes
.../konversation/channellist_screen_co.png | Bin 28918 -> 0 bytes
.../konversation/checkidentities.png | Bin 5653 -> 0 bytes
.../konversation/colorchooser_screen.png | Bin 5193 -> 0 bytes
.../konversation/dccstatus_screen_co.png | Bin 14110 -> 0 bytes
.../konversation/first_channel_co.png | Bin 20622 -> 0 bytes
.../konversation/first_serverlist_co.png | Bin 6883 -> 0 bytes
.../konversation/highlighting_screen_co.png | Bin 25708 -> 0 bytes
.../konversation/identities_adv_co.png | Bin 10427 -> 0 bytes
.../konversation/identities_away_co.png | Bin 11281 -> 0 bytes
.../konversation/identities_gen_co.png | Bin 11732 -> 0 bytes
.../sv_konversation/konversation/index.docbook | 2 +-
.../konversation/kimproxy_create_screen2.png | Bin 9386 -> 0 bytes
.../konversation/kimproxy_create_screen_co.png | Bin 19640 -> 0 bytes
.../sv_konversation/konversation/logviewer_co.png | Bin 18171 -> 0 bytes
.../konversation/nicksonline_co.png | Bin 20765 -> 0 bytes
.../konversation/nickthemes_screen_co.png | Bin 22363 -> 0 bytes
.../konversation/notification_screen_co.png | Bin 19050 -> 0 bytes
.../konversation/notifylist_screen_co.png | Bin 24738 -> 0 bytes
.../sv_konversation/konversation/osd_demo.png | Bin 23487 -> 0 bytes
.../sv_konversation/konversation/osd_screen_co.png | Bin 26121 -> 0 bytes
.../konversation/quickbuttons_screen.png | Bin 27271 -> 0 bytes
.../konversation/quickconnect_screen.png | Bin 5646 -> 0 bytes
.../sv_konversation/konversation/serverlist_co.png | Bin 9386 -> 0 bytes
.../konversation/urlcatcher_screen_co.png | Bin 12774 -> 0 bytes
.../konversation/webbrowser_screen_co.png | Bin 28893 -> 0 bytes
.../uk_konversation/konversation/index.docbook | 2 +-
doc/index.docbook | 2 +-
po/CMakeLists.txt | 1 +
po/bg/konversation.po |12195 ++++++++++----------
po/bs/konversation.po |11171 +++++++++---------
po/ca/konversation.po |11412 +++++++++---------
po/ca at valencia/konversation.po |11443 +++++++++---------
po/cs/konversation.po | 9831 ++++++++--------
po/da/konversation.po |11794 +++++++++----------
po/de/konversation.po |11653 +++++++++---------
po/el/konversation.po |11681 +++++++++---------
po/en_GB/konversation.po |10913 +++++++++---------
po/es/konversation.po |11589 +++++++++---------
po/et/konversation.po |12105 ++++++++++----------
po/fi/konversation.po |11541 +++++++++---------
po/fr/konversation.po |11601 +++++++++---------
po/gl/konversation.po |11909 ++++++++++----------
po/hu/konversation.po |12119 ++++++++++----------
po/it/konversation.po |11593 +++++++++---------
po/ja/konversation.po |12433 ++++++++++----------
po/nb/konversation.po |11034 +++++++++---------
po/nds/konversation.po |11816 +++++++++----------
po/nl/konversation.po |11833 ++++++++++----------
po/pl/konversation.po |11656 +++++++++---------
po/pt/konversation.po |11583 +++++++++---------
po/pt_BR/konversation.po |11181 +++++++++---------
po/ru/konversation.po |11835 ++++++++++----------
po/si/CMakeLists.txt | 2 +
po/{cs => si}/konversation.po |10781 +++++++++---------
po/sr/konversation.po |10143 ++++++++--------
po/sr at ijekavian/konversation.po |10147 ++++++++--------
po/sr at ijekavianlatin/konversation.po |10143 ++++++++--------
po/sr at latin/konversation.po |10143 ++++++++--------
po/sv/konversation.po |11297 +++++++++---------
po/tr/konversation.po |11891 ++++++++++----------
po/uk/konversation.po |11181 +++++++++---------
po/zh_CN/konversation.po |11231 +++++++++---------
po/zh_TW/konversation.po |11460 +++++++++----------
src/application.cpp | 6 +-
src/commit.h | 2 +-
src/common.cpp | 3 +-
src/dbus.cpp | 2 +
src/irc/channel.cpp | 393 +-
src/irc/outputfilter.cpp | 4 +-
src/irc/server.cpp | 6 +-
src/version.h | 2 +-
src/viewer/ircinput.cpp | 14 -
src/viewer/ircinput.h | 1 -
src/viewer/ircview.cpp | 94 +-
src/viewer/pasteeditor.cpp | 1 +
95 files changed, 193341 insertions(+), 206972 deletions(-)
--
Konversation packaging for Debian
More information about the pkg-kde-commits
mailing list