[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha6-1-9-g697fd2e

Modestas Vainius modax-guest at alioth.debian.org
Mon Sep 21 16:36:55 UTC 2009


The following commit has been merged in the master branch:
commit 3dbda58261eb5d4f43fcb99bc043c37733d6e8ff
Merge: 5782c35eb6fd71794055d3707c8426a473f95a92 02e5a8fdf2964d27ad9a79d7e1153910b636f62c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Sep 21 17:37:20 2009 +0300

    Merge branch 'upstream'

 ChangeLog                                          |   84 +
 data/images/nickicons/alternative/index.desktop    |   15 +
 data/images/nickicons/christmas/index.desktop      |    6 +
 data/images/nickicons/classic/index.desktop        |    5 +
 data/images/nickicons/default/index.desktop        |    5 +
 data/images/nickicons/simplistic/index.desktop     |    4 +
 data/images/nickicons/smiling/index.desktop        |    5 +
 data/images/nickicons/square/index.desktop         |    5 +
 data/konversation.desktop                          |   30 +
 data/konversation.notifyrc                         |   90 +
 doc-translations/CMakeLists.txt                    |    1 +
 .../konversation/CMakeLists.txt                    |    2 +-
 .../it_konversation/konversation/index.docbook     | 6299 ++++++++++++++
 .../sv_konversation/konversation/index.docbook     |  381 +-
 .../uk_konversation/konversation/index.docbook     |  387 +-
 doc/index.docbook                                  |  166 +-
 po/CMakeLists.txt                                  |    4 +-
 po/ar/konversation.po                              | 2499 +++---
 po/bg/konversation.po                              | 2506 +++---
 po/ca/konversation.po                              | 2612 +++---
 po/cs/CMakeLists.txt                               |    2 +
 po/{he => cs}/konversation.po                      | 5378 ++++++------
 po/da/konversation.po                              | 3015 ++++----
 po/de/konversation.po                              | 2632 +++---
 po/el/konversation.po                              | 2510 +++---
 po/en_GB/konversation.po                           | 2502 +++---
 po/es/konversation.po                              | 2619 +++---
 po/et/konversation.po                              | 2741 +++---
 po/fr/konversation.po                              | 2502 +++---
 po/gl/konversation.po                              | 3701 +++++----
 po/he/CMakeLists.txt                               |    2 -
 po/hu/konversation.po                              | 2799 ++++---
 po/it/konversation.po                              | 2513 +++---
 po/ja/konversation.po                              | 2514 +++---
 po/ko/CMakeLists.txt                               |    2 -
 po/ko/konversation.po                              | 9087 --------------------
 po/nds/konversation.po                             | 2647 +++---
 po/nl/konversation.po                              | 3316 ++++----
 po/pa/CMakeLists.txt                               |    2 +
 po/{he => pa}/konversation.po                      | 5339 ++++++------
 po/pt/konversation.po                              | 2471 +++---
 po/pt_BR/konversation.po                           | 2867 +++----
 po/ru/konversation.po                              | 2490 +++---
 po/sv/konversation.po                              | 2477 +++---
 po/tr/konversation.po                              | 2502 +++---
 po/uk/konversation.po                              | 2503 +++---
 po/zh_CN/konversation.po                           | 2498 +++---
 po/zh_TW/konversation.po                           | 2503 +++---
 src/CMakeLists.txt                                 |    2 +
 src/application.cpp                                |  157 +-
 src/application.h                                  |   22 +
 src/awaymanager.cpp                                |    2 -
 src/awaymanager.h                                  |    6 +-
 src/bookmarkhandler.cpp                            |    1 -
 src/commit.h                                       |    2 +-
 src/common.cpp                                     |    7 +-
 src/common.h                                       |    5 +-
 src/config/configdialog.cpp                        |    3 -
 src/config/connectionbehavior_config.cpp           |   96 +
 src/config/connectionbehavior_config.h             |   48 +
 src/config/connectionbehavior_config.ui            |  137 +-
 src/config/highlight_config.cpp                    |    8 +-
 src/config/konversation.kcfg                       |   35 +-
 src/config/preferences.cpp                         |    3 -
 src/config/quickbuttons_config.cpp                 |    1 -
 src/config/quickbuttons_configui.ui                |    3 +
 src/config/settingsdialog.cpp                      |   16 +-
 src/config/theme_config.cpp                        |    5 -
 src/connectionmanager.cpp                          |   18 +-
 src/dcc/chat.cpp                                   |   32 +-
 src/dcc/chat.h                                     |    5 +-
 src/dcc/resumedialog.cpp                           |    4 +-
 src/dcc/transfer.cpp                               |    1 -
 src/dcc/transferdetailedinfopanel.cpp              |  116 +-
 src/dcc/transferdetailedinfopanel.h                |    9 +-
 src/dcc/transferdetailedinfopanelui.ui             |  566 +-
 src/dcc/transferdetailedtimeinfopanelui.ui         |  248 +
 src/dcc/transferlistmodel.cpp                      |  142 +-
 src/dcc/transferlistmodel.h                        |    7 +-
 src/dcc/transfermanager.cpp                        |    9 +
 src/dcc/transferpanel.cpp                          |  243 +-
 src/dcc/transferpanel.h                            |   14 +-
 src/dcc/transferrecv.cpp                           |   32 +-
 src/dcc/transfersend.cpp                           |   44 +-
 src/dcc/transferview.cpp                           |   33 +-
 src/dcc/transferview.h                             |    3 +
 src/identitydialog.cpp                             |    2 +-
 src/irc/channel.cpp                                |    7 +-
 src/irc/channellistpanel.cpp                       |    9 +-
 src/irc/channeloptionsdialog.cpp                   |   13 +-
 src/irc/channeloptionsdialog.h                     |    2 +-
 src/irc/inputfilter.cpp                            |    2 -
 src/irc/invitedialog.cpp                           |    2 -
 src/irc/irccharsets.cpp                            |    2 +
 src/irc/ircqueue.cpp                               |   13 +-
 src/irc/ircqueue.h                                 |   12 +-
 src/irc/joinchanneldialog.cpp                      |    1 -
 src/irc/nickinfo.h                                 |    1 -
 src/irc/nicklistview.cpp                           |    2 +-
 src/irc/nicksonline.cpp                            |    3 -
 src/irc/nicksonline.h                              |    1 -
 src/irc/outputfilter.cpp                           | 1089 ++-
 src/irc/outputfilter.h                             |  149 +-
 src/irc/server.cpp                                 |   86 +-
 src/irc/server.h                                   |    7 +-
 src/irc/servergroupdialog.cpp                      |    6 -
 src/irc/servergroupsettings.h                      |    1 -
 src/konsolepanel.cpp                               |   33 +-
 src/konsolepanel.h                                 |    7 +
 src/linkaddressbook/addressbook.cpp                |    1 -
 src/linkaddressbook/addressbook.h                  |    2 -
 src/linkaddressbook/addressbook_base.h             |    1 -
 src/linkaddressbook/addresseeitem.cpp              |    1 -
 src/linkaddressbook/addresseeitem.h                |    2 -
 src/mainwindow.cpp                                 |    5 +-
 src/notificationhandler.cpp                        |    4 +-
 src/queuetuner.cpp                                 |    4 +-
 src/quickconnectdialog.cpp                         |    1 -
 src/statusbar.cpp                                  |    3 +-
 src/upnp/upnpmcastsocket.cpp                       |    2 -
 src/upnp/upnpmcastsocket.h                         |    2 +-
 src/upnp/upnprouter.cpp                            |  114 +-
 src/upnp/upnprouter.h                              |   30 +-
 src/version.h                                      |    2 +-
 src/viewer/chatwindow.cpp                          |   26 +-
 src/viewer/editnotifydialog.cpp                    |    1 -
 src/viewer/irccolorchooser.cpp                     |    1 -
 src/viewer/ircinput.cpp                            |   20 +-
 src/viewer/ircview.cpp                             |  558 +-
 src/viewer/ircview.h                               |  109 +-
 src/viewer/ircviewbox.cpp                          |    1 -
 src/viewer/logfilereader.cpp                       |    4 +-
 src/viewer/osd.cpp                                 |    2 +-
 src/viewer/pasteeditor.cpp                         |    2 -
 src/viewer/statuspanel.cpp                         |    3 -
 src/viewer/topiclabel.cpp                          |    8 +-
 src/viewer/trayicon.cpp                            |    2 -
 src/viewer/trayicon.h                              |    1 -
 src/viewer/viewcontainer.cpp                       |   28 +-
 src/viewer/viewcontainer.h                         |   22 +-
 src/viewer/viewtree.cpp                            |    5 +-
 src/viewer/viewtreeitem.cpp                        |   15 +-
 src/viewer/viewtreeitem.h                          |    1 -
 143 files changed, 48284 insertions(+), 47474 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list