[SCM] Konversation packaging for Debian branch, master, updated. debian/1.2.1-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 94c0062829e8805a7dc96b33508673151d74c8f8
Merge: d5bed959969d0e75b2888ffa92f66946cda51619 1ebf1d7a970a3459e686e7e098f1f69304b54f1a
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Nov 12 18:18:08 2009 +0200

    Merge branch 'upstream'

 ChangeLog                                      |   57 +
 data/images/nickicons/christmas/index.desktop  |    2 +
 data/images/nickicons/classic/index.desktop    |    2 +
 data/images/nickicons/default/index.desktop    |    2 +
 data/images/nickicons/simplistic/index.desktop |    1 +
 data/konversation.desktop                      |    2 +
 data/konversation.notifyrc                     |   14 +
 po/CMakeLists.txt                              |    1 +
 po/ar/konversation.po                          |  645 +++--
 po/bg/konversation.po                          |  646 +++--
 po/ca/konversation.po                          |  662 +++--
 po/cs/konversation.po                          |  698 +++---
 po/da/konversation.po                          |  638 +++--
 po/de/konversation.po                          |  642 +++--
 po/el/konversation.po                          |  646 +++--
 po/en_GB/konversation.po                       |  994 +++----
 po/es/konversation.po                          |  662 +++--
 po/et/konversation.po                          |  638 +++--
 po/fr/konversation.po                          |  646 +++--
 po/gl/konversation.po                          |  701 +++---
 po/he/konversation.po                          |  645 +++--
 po/hu/konversation.po                          |  662 +++--
 po/it/konversation.po                          |  638 +++--
 po/ja/konversation.po                          |  646 +++--
 po/nds/konversation.po                         |  662 +++--
 po/nl/konversation.po                          |  682 +++--
 po/pa/konversation.po                          |  643 +++--
 po/pl/CMakeLists.txt                           |    2 +
 po/{cs => pl}/konversation.po                  | 3671 +++++++++++++-----------
 po/pt/konversation.po                          |  632 +++--
 po/pt_BR/konversation.po                       |  646 +++--
 po/ru/konversation.po                          |  646 +++--
 po/sv/konversation.po                          |  638 +++--
 po/tr/konversation.po                          |  646 +++--
 po/uk/konversation.po                          |  646 +++--
 po/zh_CN/konversation.po                       |  646 +++--
 po/zh_TW/konversation.po                       |  646 +++--
 src/CMakeLists.txt                             |    2 +-
 src/application.cpp                            |    4 +
 src/bookmarkhandler.cpp                        |   23 +-
 src/bookmarkhandler.h                          |    3 +
 src/commit.h                                   |    2 +-
 src/common.cpp                                 |  234 +-
 src/common.h                                   |   43 +-
 src/config/connectionbehavior_config.ui        |    6 +-
 src/config/highlight_configui.ui               |   20 +-
 src/config/konversation.kcfg                   |    2 +-
 src/config/osd_configui.ui                     |    2 +-
 src/connectionmanager.cpp                      |   95 +-
 src/connectionmanager.h                        |    9 +-
 src/connectionsettings.cpp                     |    6 +
 src/connectionsettings.h                       |    8 +-
 src/dcc/transferpanel.cpp                      |   22 +-
 src/dcc/transferrecv.cpp                       |   29 +-
 src/irc/channel.cpp                            |   30 +-
 src/irc/channellistpanel.cpp                   |    4 +-
 src/irc/channeloptionsdialog.cpp               |   19 +-
 src/irc/channeloptionsdialog.h                 |    2 +-
 src/irc/inputfilter.cpp                        |   10 +-
 src/irc/nick.cpp                               |    4 +-
 src/irc/nick.h                                 |    4 +-
 src/irc/nicksonline.cpp                        |    6 +-
 src/irc/outputfilter.cpp                       |    2 +-
 src/irc/replycodes.h                           |    1 +
 src/irc/server.cpp                             |  107 +-
 src/irc/server.h                               |   14 +-
 src/mainwindow.cpp                             |   10 -
 src/mainwindow.h                               |    3 -
 src/version.h                                  |    2 +-
 src/viewer/chatwindow.cpp                      |   44 +
 src/viewer/chatwindow.h                        |    2 +
 src/viewer/viewcontainer.cpp                   |   49 +-
 src/viewer/viewcontainer.h                     |    4 +-
 src/viewer/viewtree.cpp                        |    2 +
 74 files changed, 11998 insertions(+), 10527 deletions(-)

-- 
Konversation packaging for Debian