[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha3-1-8-g4d544b3

Modestas Vainius modax-guest at alioth.debian.org
Sat Jul 4 07:43:39 UTC 2009


The following commit has been merged in the master branch:
commit 5a3af3df0b70510a46ab9e8cde71d0c5a7f2d703
Merge: aa695ba23d61540383fdb24407ca3a705bb6f4de cc79915edfe5a2d988dac71bef07c14b2cb07480
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Jul 4 09:35:14 2009 +0300

    Merge branch 'upstream'

 CMakeLists.txt                                     |    4 +
 ChangeLog                                          |  144 +
 README                                             |    2 +-
 TODO                                               |    2 +-
 config-konversation.h.cmake                        |    1 +
 data/images/nickicons/alternative/index.desktop    |    2 +
 data/images/nickicons/christmas/index.desktop      |    3 +
 data/images/nickicons/classic/index.desktop        |    3 +
 data/images/nickicons/default/index.desktop        |    5 +
 data/images/nickicons/simplistic/index.desktop     |    5 +
 data/images/nickicons/smiling/index.desktop        |    2 +
 data/images/nickicons/square/index.desktop         |    2 +
 data/konversation.desktop                          |    2 +-
 data/konversation.notifyrc                         |   60 +-
 data/scripts/bug                                   |    2 +-
 data/scripts/media                                 |   32 +-
 doc-translations/CMakeLists.txt                    |    2 +
 .../konversation/CMakeLists.txt                    |    2 +-
 .../sv_konversation/konversation/index.docbook     | 5966 +++++++++++++
 .../konversation/CMakeLists.txt                    |    2 +-
 .../uk_konversation/konversation/index.docbook     | 5935 +++++++++++++
 doc/index.docbook                                  |   13 +-
 po/CMakeLists.txt                                  |    3 +-
 po/ar/konversation.po                              | 3632 +++++----
 po/bg/konversation.po                              | 3472 ++++----
 po/ca/CMakeLists.txt                               |    2 +
 po/{he => ca}/konversation.po                      | 6534 ++++++++-------
 po/da/konversation.po                              | 3559 +++++----
 po/de/konversation.po                              | 3526 +++++----
 po/el/konversation.po                              | 3478 ++++----
 po/en_GB/konversation.po                           | 3461 ++++----
 po/es/konversation.po                              | 4423 +++++-----
 po/et/konversation.po                              | 3510 +++++----
 po/fr/konversation.po                              | 3478 ++++----
 po/gl/konversation.po                              | 5206 ++++++------
 po/he/konversation.po                              | 3433 ++++----
 po/hu/CMakeLists.txt                               |    2 -
 po/hu/konversation.po                              | 8751 --------------------
 po/it/konversation.po                              | 3469 ++++----
 po/ja/konversation.po                              | 5668 +++++++------
 po/ko/konversation.po                              | 3457 ++++----
 po/nds/CMakeLists.txt                              |    2 +
 po/{et => nds}/konversation.po                     | 6876 ++++++++--------
 po/nl/konversation.po                              | 3461 ++++----
 po/pt/konversation.po                              | 3459 ++++----
 po/pt_BR/konversation.po                           | 5265 +++++++------
 po/ru/konversation.po                              | 3455 ++++----
 po/sv/konversation.po                              | 3442 ++++----
 po/tr/konversation.po                              | 3463 ++++----
 po/uk/konversation.po                              | 3505 +++++----
 po/zh_CN/konversation.po                           | 3986 +++++-----
 po/zh_TW/konversation.po                           | 3457 ++++----
 src/CMakeLists.txt                                 |   43 +-
 src/application.cpp                                |  203 +-
 src/application.h                                  |   27 +-
 src/awaymanager.cpp                                |   41 +-
 src/awaymanager.h                                  |    6 +-
 src/blowfish/BlowfishCbc.cpp                       |  654 --
 src/blowfish/BlowfishCbc.h                         |  228 -
 src/blowfish/README                                |    3 -
 src/blowfish/b64stuff.cpp                          |  218 -
 src/blowfish/b64stuff.h                            |   53 -
 src/blowfish/blowfish.cpp                          |  132 -
 src/blowfish/blowfish.h                            |   30 -
 src/blowfish/mc_blowfish.cpp                       |   63 -
 src/blowfish/mc_blowfish.h                         |   34 -
 src/blowfish/newblowfish.cpp                       |  208 -
 src/blowfish/newblowfish.h                         |   32 -
 src/blowfish/oldblowfish.cpp                       |  425 -
 src/blowfish/oldblowfish1.h                        |  141 -
 src/blowfish/oldblowfish2.h                        |  295 -
 src/bookmarkhandler.cpp                            |   14 +-
 src/bookmarkhandler.h                              |    6 +-
 src/cipher.cpp                                     |  458 +
 src/cipher.h                                       |   53 +
 src/commit.h                                       |    2 +-
 src/common.cpp                                     |   19 +-
 src/config/alias_config.cpp                        |    9 -
 src/config/alias_config.h                          |    3 +-
 src/config/autoreplace_config.cpp                  |   15 +-
 src/config/autoreplace_configui.ui                 |    7 +-
 src/config/chatwindowappearance_config.ui          |    7 +-
 src/config/chatwindowbehaviour_config.ui           |    2 +-
 src/config/configdialog.cpp                        |   17 +-
 src/config/configdialog.h                          |    6 +-
 src/config/connectionbehavior_config.ui            |  195 +-
 src/config/dcc_config.cpp                          |   29 +-
 src/config/dcc_config.h                            |    3 +-
 src/config/dcc_configui.ui                         |  469 +-
 src/config/generalbehavior_config.ui               |    7 +-
 src/config/highlight_config.cpp                    |   21 +-
 src/config/ignore_config.cpp                       |   14 +-
 src/config/ignore_configui.ui                      |    7 +-
 src/config/konversation.kcfg                       |    8 +
 src/config/nicklistbehavior_config.cpp             |    4 -
 src/config/nicklistbehavior_config.h               |    4 +-
 src/config/osd_config.cpp                          |    4 +-
 src/config/osd_config.h                            |    4 +-
 src/config/preferences.cpp                         |  182 +-
 src/config/preferences.h                           |   25 +-
 src/config/quickbuttons_config.cpp                 |   11 +-
 src/config/quickbuttons_config.h                   |    2 +-
 src/config/settingsdialog.cpp                      |   14 +-
 src/config/settingsdialog.h                        |   37 +-
 src/config/tabs_config.cpp                         |    3 -
 src/config/tabs_configui.ui                        |    9 +-
 src/config/theme_config.cpp                        |   41 +-
 src/config/theme_config.h                          |    6 +-
 src/config/valuelistviewitem.cpp                   |   41 -
 src/config/valuelistviewitem.h                     |   33 -
 src/config/warnings_config.cpp                     |    5 +-
 src/config/warnings_config.h                       |    3 +-
 src/config/watchednicknames_config.cpp             |  176 +-
 src/config/watchednicknames_config.h               |   13 +-
 src/config/watchednicknames_configui.ui            |    7 +-
 src/connectionmanager.cpp                          |   30 +-
 src/connectionmanager.h                            |    2 +-
 src/connectionsettings.h                           |    2 +-
 src/dbus.cpp                                       |   47 +-
 src/dbus.h                                         |    2 +-
 src/dcc/chat.cpp                                   |  744 +-
 src/dcc/chat.h                                     |  111 +-
 src/dcc/dcccommon.cpp                              |  177 +-
 src/dcc/dcccommon.h                                |   44 +-
 src/dcc/recipientdialog.cpp                        |  181 +-
 src/dcc/recipientdialog.h                          |   46 +-
 src/dcc/resumedialog.cpp                           |  315 +-
 src/dcc/resumedialog.h                             |   61 +-
 src/dcc/transfer.cpp                               |  656 +-
 src/dcc/transfer.h                                 |  342 +-
 src/dcc/transferdetailedinfopanel.cpp              |  405 +-
 src/dcc/transferdetailedinfopanel.h                |   60 +-
 src/dcc/transfermanager.cpp                        |  420 +-
 src/dcc/transfermanager.h                          |  132 +-
 src/dcc/transferpanel.cpp                          |  815 +-
 src/dcc/transferpanel.h                            |  137 +-
 src/dcc/transferpanelitem.cpp                      |  679 +-
 src/dcc/transferpanelitem.h                        |  112 +-
 src/dcc/transferrecv.cpp                           | 1355 ++--
 src/dcc/transferrecv.h                             |  298 +-
 src/dcc/transfersend.cpp                           |  918 ++-
 src/dcc/transfersend.h                             |  145 +-
 src/decoder.h                                      |    2 +-
 src/identity.cpp                                   |    5 +-
 src/identity.h                                     |    2 +-
 src/identitydialog.cpp                             |   23 +-
 src/irc/channel.cpp                                |  156 +-
 src/irc/channel.h                                  |   20 +-
 src/irc/channeldialog.cpp                          |   92 -
 src/irc/channeldialog.h                            |   46 -
 src/irc/channeldialogui.ui                         |   67 +
 src/irc/channellistpanel.cpp                       |   35 +-
 src/irc/channellistpanel.h                         |    2 +-
 src/irc/channellistviewitem.h                      |    4 +-
 src/irc/channelnick.cpp                            |    2 -
 src/irc/channeloptionsdialog.cpp                   |  180 +-
 src/irc/channeloptionsdialog.h                     |   35 +-
 src/irc/channeloptionsui.ui                        |   88 +-
 src/irc/inputfilter.cpp                            |   82 +-
 src/irc/inputfilter.h                              |    4 +-
 src/irc/invitedialog.cpp                           |  178 +
 src/irc/invitedialog.h                             |   76 +
 src/irc/invitedialog.ui                            |   44 +
 src/irc/irccharsets.cpp                            |   12 +-
 src/irc/irccharsets.h                              |    2 +-
 src/irc/ircqueue.cpp                               |    6 +-
 src/irc/joinchanneldialog.cpp                      |    6 +-
 src/irc/modebutton.h                               |    2 +-
 src/irc/nick.cpp                                   |   13 +-
 src/irc/nick.h                                     |    6 +-
 src/irc/nickinfo.cpp                               |    6 +-
 src/irc/nickinfo.h                                 |    4 +-
 src/irc/nicklistview.cpp                           |   12 +-
 src/irc/nicklistview.h                             |    7 +-
 src/irc/nicksonline.cpp                            |   46 +-
 src/irc/nicksonline.h                              |    9 +-
 src/irc/nicksonlineitem.h                          |    4 +-
 src/irc/outputfilter.cpp                           |  202 +-
 src/irc/outputfilter.h                             |   14 +-
 src/irc/query.cpp                                  |   80 +-
 src/irc/query.h                                    |   17 +-
 src/irc/server.cpp                                 |  334 +-
 src/irc/server.h                                   |   38 +-
 src/irc/serverdialog.cpp                           |  116 -
 src/irc/serverdialog.h                             |   49 -
 src/irc/serverdialogui.ui                          |  107 +
 src/irc/servergroupdialog.cpp                      |  140 +-
 src/irc/servergroupdialog.h                        |   42 +-
 src/irc/servergroupdialogui.ui                     |    9 +
 src/irc/servergroupsettings.cpp                    |    2 +-
 src/irc/servergroupsettings.h                      |    4 +-
 src/irc/serverison.cpp                             |    9 +-
 src/irc/serverlistdialog.cpp                       |  195 +-
 src/irc/serverlistdialog.h                         |   35 +-
 src/irc/serverlistview.cpp                         |   11 +-
 src/irc/serversettings.h                           |    2 +-
 src/konsolepanel.cpp                               |    6 +-
 src/linkaddressbook/addressbook.cpp                |   10 +-
 src/linkaddressbook/addressbook.h                  |    4 +-
 src/linkaddressbook/addressbook_base.cpp           |   19 +-
 src/linkaddressbook/addressbook_base.h             |    4 +-
 src/linkaddressbook/addresseeitem.cpp              |    9 +-
 src/linkaddressbook/addresseeitem.h                |    9 +-
 src/linkaddressbook/kimiface.h                     |    9 +-
 src/linkaddressbook/linkaddressbookui.cpp          |   19 +-
 src/linkaddressbook/linkaddressbookui.h            |    2 -
 src/main.cpp                                       |   11 +-
 src/mainwindow.cpp                                 |  139 +-
 src/mainwindow.h                                   |   18 +-
 src/notificationhandler.cpp                        |   29 +-
 src/notificationhandler.h                          |   10 +-
 src/queuetuner.cpp                                 |   23 +-
 src/queuetuner.h                                   |    2 +-
 src/quickconnectdialog.cpp                         |   11 +-
 src/quickconnectdialog.h                           |    2 +-
 src/scriptlauncher.cpp                             |    8 +-
 src/scriptlauncher.h                               |    2 +-
 src/ssllabel.h                                     |    2 +-
 src/statusbar.cpp                                  |  362 +-
 src/statusbar.h                                    |   71 +-
 src/upnp/soap.cpp                                  |   49 +
 src/upnp/soap.h                                    |   58 +
 src/upnp/upnpdescriptionparser.cpp                 |  231 +
 src/upnp/upnpdescriptionparser.h                   |   56 +
 src/upnp/upnpmcastsocket.cpp                       |  241 +
 src/upnp/upnpmcastsocket.h                         |   84 +
 src/upnp/upnprouter.cpp                            |  395 +
 src/upnp/upnprouter.h                              |  200 +
 src/urlcatcher.cpp                                 |   35 +-
 src/version.h                                      |    2 +-
 src/viewer/chatwindow.cpp                          |   81 +-
 src/viewer/chatwindow.h                            |    4 +-
 src/viewer/editnotifydialog.cpp                    |   39 +-
 src/viewer/editnotifydialog.h                      |    4 +-
 src/viewer/highlight.h                             |    4 +-
 src/viewer/ignore.h                                |    2 +-
 src/viewer/ignorelistviewitem.cpp                  |    3 +-
 src/viewer/ignorelistviewitem.h                    |   10 +-
 src/viewer/images.cpp                              |    9 +-
 src/viewer/images.h                                |    6 +-
 src/viewer/insertchardialog.cpp                    |    8 +-
 src/viewer/irccolorchooser.cpp                     |    7 +-
 src/viewer/ircinput.cpp                            |   34 +-
 src/viewer/ircinput.h                              |    3 +-
 src/viewer/ircview.cpp                             |   87 +-
 src/viewer/ircview.h                               |   23 +-
 src/viewer/ircviewbox.cpp                          |   13 +-
 src/viewer/logfilereader.cpp                       |   28 +-
 src/viewer/logfilereader.h                         |    5 +-
 src/viewer/osd.cpp                                 |    9 +-
 src/viewer/quickbutton.h                           |    2 +-
 src/viewer/rawlog.cpp                              |    5 +-
 src/viewer/searchbar.cpp                           |   22 +-
 src/{ => viewer}/statuspanel.cpp                   |   31 +-
 src/{ => viewer}/statuspanel.h                     |    5 +-
 src/viewer/topiclabel.cpp                          |   37 +-
 src/viewer/trayicon.cpp                            |   10 +-
 src/viewer/trayicon.h                              |    2 +-
 src/viewer/viewcontainer.cpp                       |   35 +-
 src/viewer/viewcontainer.h                         |   20 +-
 src/viewer/viewtree.cpp                            |   21 +-
 src/viewer/viewtree.h                              |    3 +-
 src/viewer/viewtreeitem.cpp                        |   30 +-
 src/viewer/viewtreeitem.h                          |    9 +-
 264 files changed, 74035 insertions(+), 66085 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list