[SCM] Konversation packaging for Debian branch, debian/debian_channel, updated. upstream/1.2.3-11-gb9df055

Modestas Vainius modax at alioth.debian.org
Fri Feb 12 09:44:09 UTC 2010


The following commit has been merged in the debian/debian_channel branch:
commit b9df05563a5a284a479b7f3789471ea33dd3a3bd
Merge: ab16b93c9d26d343fec37e2adf6c8c0a1c8b779e 704a89b009b62b4f2a4bbbe5547432e15faa2791
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Feb 12 10:59:39 2010 +0200

    Merge commit 'refs/top-bases/debian/debian_channel' into debian/debian_channel

 CMakeLists.txt                                     |    6 +-
 ChangeLog                                          |  138 +
 README                                             |    2 +-
 config-konversation.h.cmake                        |    3 +-
 data/images/nickicons/alternative/index.desktop    |    8 +-
 data/images/nickicons/christmas/index.desktop      |    8 +-
 data/images/nickicons/classic/index.desktop        |    8 +-
 data/images/nickicons/default/index.desktop        |    7 +
 data/images/nickicons/simplistic/index.desktop     |   10 +-
 data/images/nickicons/smiling/index.desktop        |   10 +-
 data/images/nickicons/square/index.desktop         |   10 +-
 data/konversation.desktop                          |    8 +
 data/konversation.notifyrc                         |  119 +-
 doc-translations/CMakeLists.txt                    |    1 +
 .../konversation/CMakeLists.txt                    |    2 +-
 .../pt_BR_konversation/konversation/index.docbook  | 6321 ++++++++++++++
 .../uk_konversation/konversation/index.docbook     |    4 +-
 po/CMakeLists.txt                                  |    5 +-
 po/ar/CMakeLists.txt                               |    2 -
 po/ar/konversation.po                              | 9138 --------------------
 po/bg/CMakeLists.txt                               |    1 +
 po/bg/konversation.po                              | 3918 +++++----
 po/ca/CMakeLists.txt                               |    1 +
 po/ca/konversation.po                              | 3982 +++++----
 po/cs/CMakeLists.txt                               |    1 +
 po/cs/konversation.po                              | 3855 +++++----
 po/da/CMakeLists.txt                               |    1 +
 po/da/konversation.po                              | 3849 +++++----
 po/de/CMakeLists.txt                               |    1 +
 po/de/konversation.po                              | 3856 +++++----
 po/el/CMakeLists.txt                               |    1 +
 po/el/konversation.po                              | 3948 +++++----
 po/en_GB/CMakeLists.txt                            |    1 +
 po/en_GB/konversation.po                           | 3796 +++++----
 po/es/CMakeLists.txt                               |    1 +
 po/es/konversation.po                              | 3787 +++++----
 po/et/CMakeLists.txt                               |    1 +
 po/et/konversation.po                              | 3784 +++++----
 po/fi/CMakeLists.txt                               |    3 +
 po/{gl => fi}/konversation.po                      | 7516 ++++++++--------
 po/fr/CMakeLists.txt                               |    1 +
 po/fr/konversation.po                              | 4218 +++++-----
 po/gl/CMakeLists.txt                               |    1 +
 po/gl/konversation.po                              | 3916 +++++----
 po/he/CMakeLists.txt                               |    1 +
 po/he/konversation.po                              | 3832 +++++----
 po/hu/CMakeLists.txt                               |    1 +
 po/hu/konversation.po                              | 3906 +++++----
 po/it/CMakeLists.txt                               |    1 +
 po/it/konversation.po                              | 3843 +++++----
 po/ja/CMakeLists.txt                               |    1 +
 po/ja/konversation.po                              | 3936 +++++----
 po/nb/CMakeLists.txt                               |    3 +
 po/{et => nb}/konversation.po                      | 6970 ++++++++--------
 po/nds/CMakeLists.txt                              |    1 +
 po/nds/konversation.po                             | 3934 +++++----
 po/nl/CMakeLists.txt                               |    1 +
 po/nl/konversation.po                              | 3834 +++++----
 po/pa/CMakeLists.txt                               |    2 -
 po/pl/CMakeLists.txt                               |    1 +
 po/pl/konversation.po                              | 3856 +++++----
 po/pt/CMakeLists.txt                               |    1 +
 po/pt/konversation.po                              | 3662 ++++----
 po/pt_BR/CMakeLists.txt                            |    1 +
 po/pt_BR/konversation.po                           | 3814 +++++----
 po/ru/CMakeLists.txt                               |    1 +
 po/ru/konversation.po                              | 3934 +++++----
 po/sk/CMakeLists.txt                               |    3 +
 po/{pa => sk}/konversation.po                      | 6384 +++++++-------
 po/sv/CMakeLists.txt                               |    1 +
 po/sv/konversation.po                              | 3863 +++++----
 po/tr/CMakeLists.txt                               |    1 +
 po/tr/konversation.po                              | 3951 +++++----
 po/uk/CMakeLists.txt                               |    1 +
 po/uk/konversation.po                              | 3878 +++++----
 po/zh_CN/CMakeLists.txt                            |    1 +
 po/zh_CN/konversation.po                           | 3893 +++++----
 po/zh_TW/CMakeLists.txt                            |    1 +
 po/zh_TW/konversation.po                           | 3911 +++++----
 src/CMakeLists.txt                                 |   19 +-
 src/application.cpp                                |   42 +-
 src/application.h                                  |    6 +-
 src/cipher.cpp                                     |   10 +-
 src/commit.h                                       |    2 +-
 src/common.cpp                                     |   59 +-
 src/common.h                                       |    5 +
 src/config/chatwindowbehaviour_config.ui           |  225 +-
 src/config/configdialog.cpp                        |   11 +-
 src/config/configdialog.h                          |    4 +-
 src/config/dcc_configui.ui                         |   91 +-
 ...avior_config.ui => generalbehavior_configui.ui} |    6 +-
 src/config/konversation.kcfg                       |    5 +
 src/config/nicklistbehavior_configui.ui            |    1 +
 src/config/preferences.cpp                         |   30 +
 src/config/preferences.h                           |    5 +
 src/config/settingsdialog.cpp                      |   15 +-
 src/config/warnings_config.cpp                     |   29 +-
 src/config/watchednicknames_configui.ui            |    4 +-
 src/connectionmanager.cpp                          |   17 +-
 src/connectionmanager.h                            |    2 +
 src/dbus.cpp                                       |   99 +-
 src/dcc/chat.cpp                                   |  685 +-
 src/dcc/chat.h                                     |  135 +-
 src/dcc/chatcontainer.cpp                          |  365 +
 src/dcc/chatcontainer.h                            |   83 +
 src/dcc/dcccommon.cpp                              |   40 +
 src/dcc/dcccommon.h                                |    2 +
 src/dcc/resumedialog.cpp                           |    2 +-
 src/dcc/transfer.h                                 |    4 +-
 src/dcc/transferdetailedinfopanel.cpp              |   25 +-
 src/dcc/transferdetailedinfopanelui.ui             |   36 +-
 src/dcc/transferlistmodel.cpp                      |   68 +-
 src/dcc/transferlistmodel.h                        |   20 +-
 src/dcc/transfermanager.cpp                        |  135 +-
 src/dcc/transfermanager.h                          |   34 +-
 src/dcc/transfersend.cpp                           |   36 +-
 src/dcc/transferview.cpp                           |   63 +-
 src/dcc/transferview.h                             |    1 +
 src/identitydialog.h                               |    2 +-
 src/identitydialog.ui                              |   32 +-
 src/irc/channel.cpp                                |   16 +-
 src/irc/channeldialogui.ui                         |   27 +-
 src/irc/channellistpanel.cpp                       |   41 +-
 src/irc/channellistpanel.h                         |   12 +-
 src/irc/channellistpanelui.ui                      |   38 +-
 src/irc/channeloptionsdialog.cpp                   |  289 +-
 src/irc/channeloptionsdialog.h                     |   39 +-
 src/irc/channeloptionsui.ui                        |  282 +-
 src/irc/inputfilter.cpp                            |   45 +-
 src/irc/inputfilter.h                              |    6 +-
 src/irc/invitedialog.cpp                           |   25 +-
 src/irc/invitedialog.ui                            |   54 +-
 src/irc/joinchanneldialog.cpp                      |  174 +-
 src/irc/joinchanneldialog.h                        |    7 +-
 src/irc/joinchannelui.ui                           |  117 +-
 src/irc/nicksonline.cpp                            |  621 +-
 src/irc/nicksonline.h                              |   86 +-
 src/irc/nicksonlineitem.cpp                        |   45 +-
 src/irc/nicksonlineitem.h                          |   24 +-
 src/irc/outputfilter.cpp                           |  114 +-
 src/irc/outputfilter.h                             |   19 +-
 src/irc/query.cpp                                  |    8 +-
 src/irc/server.cpp                                 |  440 +-
 src/irc/server.h                                   |   34 +-
 src/irc/serverdialogui.ui                          |    6 +
 src/irc/servergroupdialogui.ui                     |   27 +-
 src/irc/servergroupsettings.cpp                    |    5 +
 src/irc/servergroupsettings.h                      |    1 +
 src/linkaddressbook/addresseeitem.cpp              |    8 +-
 src/linkaddressbook/addresseeitem.h                |    6 +-
 src/linkaddressbook/linkaddressbookui.cpp          |   22 +-
 src/linkaddressbook/linkaddressbookui.h            |    2 +-
 src/linkaddressbook/linkaddressbookui_base.ui      |  134 +-
 src/main.cpp                                       |    4 +-
 src/mainwindow.cpp                                 |   49 +-
 src/notificationhandler.cpp                        |   18 +-
 src/quickconnectdialog.cpp                         |    4 +
 src/statusbar.cpp                                  |   16 +-
 src/unicode.cpp                                    |    3 +
 src/urlcatcher.cpp                                 |  129 +-
 src/urlcatcher.h                                   |   12 +-
 src/urlcatcherui.ui                                |   73 +-
 src/version.h                                      |    2 +-
 src/viewer/chatwindow.cpp                          |   22 +-
 src/viewer/chatwindow.h                            |    3 +-
 src/viewer/editnotifydialog.cpp                    |   35 +-
 src/viewer/irccolorchooserui.ui                    |  131 +-
 src/viewer/ircinput.cpp                            |    7 +
 src/viewer/ircview.cpp                             |   87 +-
 src/viewer/ircview.h                               |    3 +-
 src/viewer/ircviewbox.cpp                          |   17 -
 src/viewer/rawlog.cpp                              |    2 +
 src/viewer/rawlog.h                                |    2 +-
 src/viewer/searchbar.cpp                           |   54 +-
 src/viewer/searchbar.h                             |    4 +-
 src/viewer/searchbarbase.ui                        |  200 +-
 src/viewer/statuspanel.cpp                         |    5 +-
 src/viewer/trayicon.cpp                            |   95 -
 src/viewer/trayicon.h                              |   27 +-
 src/viewer/trayiconkstatusnotifieritem.cpp         |   56 +
 .../{trayicon.cpp => trayiconksystemtray.cpp}      |    7 +-
 src/viewer/viewcontainer.cpp                       |   38 +-
 src/viewer/viewcontainer.h                         |    3 +-
 183 files changed, 75120 insertions(+), 68890 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list