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

Modestas Vainius modax at alioth.debian.org
Fri Jul 2 01:03:57 UTC 2010


The following commit has been merged in the master branch:
commit 7021b248ec04f502f14043e057998b6fc58732a4
Merge: fd16f58f26f163f8223b71a0935bce4515010560 13de7c2b44d4c5ec00562f81fdf19b45842dcef6
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Jul 2 02:06:10 2010 +0300

    Merge branch 'upstream'

 ChangeLog                                          |   59 +
 data/images/nickicons/simplistic/index.desktop     |    1 +
 data/konversation.notifyrc                         |    2 +
 data/konversationui.rc                             |    2 +-
 .../pt_BR_konversation/konversation/index.docbook  |    4 +-
 po/CMakeLists.txt                                  |    2 +-
 po/bg/konversation.po                              | 7874 +++++++++---------
 po/ca/konversation.po                              | 7515 +++++++++---------
 po/ca at valencia/konversation.po                     | 7509 +++++++++---------
 po/cs/CMakeLists.txt                               |    2 -
 po/da/konversation.po                              | 7347 ++++++++--------
 po/de/konversation.po                              | 7433 ++++++++--------
 po/el/konversation.po                              | 7930 +++++++++---------
 po/en_GB/konversation.po                           | 7342 ++++++++--------
 po/es/konversation.po                              | 7402 ++++++++--------
 po/et/konversation.po                              | 7337 ++++++++--------
 po/fi/konversation.po                              | 7491 +++++++++--------
 po/fr/konversation.po                              | 7661 ++++++++---------
 po/gl/konversation.po                              | 7611 +++++++++---------
 po/hu/konversation.po                              | 7567 +++++++++---------
 po/it/konversation.po                              | 7394 ++++++++--------
 po/ja/konversation.po                              | 7866 +++++++++---------
 po/lt/CMakeLists.txt                               |    2 +
 po/{cs => lt}/konversation.po                      | 8874 ++++++++++----------
 po/nb/konversation.po                              | 3023 ++++----
 po/nds/konversation.po                             | 7447 +++++++++--------
 po/nl/konversation.po                              | 7557 +++++++++---------
 po/pa/konversation.po                              | 6953 ++++++++--------
 po/pl/konversation.po                              | 7467 +++++++++--------
 po/pt/konversation.po                              | 7382 ++++++++--------
 po/pt_BR/konversation.po                           | 7367 ++++++++--------
 po/ru/konversation.po                              | 7511 +++++++++---------
 po/sk/konversation.po                              | 7396 ++++++++--------
 po/sr/konversation.po                              | 7431 ++++++++--------
 po/sr at ijekavian/konversation.po                    | 7435 ++++++++--------
 po/sr at ijekavianlatin/konversation.po               | 7423 ++++++++--------
 po/sr at latin/konversation.po                        | 7423 ++++++++--------
 po/sv/konversation.po                              | 7350 ++++++++--------
 po/tr/konversation.po                              | 7603 +++++++++---------
 po/uk/konversation.po                              | 7505 +++++++++--------
 po/zh_CN/konversation.po                           | 7199 ++++++++--------
 po/zh_TW/konversation.po                           | 7690 +++++++++---------
 src/application.cpp                                |    2 +-
 src/commit.h                                       |    2 +-
 src/common.h                                       |    1 +
 src/config/chatwindowbehaviour_config.ui           |   36 +-
 src/config/connectionbehavior_config.cpp           |    2 +
 src/config/connectionbehavior_config.ui            |    3 -
 src/config/quickbuttons_config.cpp                 |   44 +-
 src/config/settingsdialog.cpp                      |    3 +
 src/config/watchednicknames_config.cpp             |    2 +
 src/config/watchednicknames_configui.ui            |   28 +-
 src/dcc/chatcontainer.cpp                          |   32 +-
 src/dcc/chatcontainer.h                            |    1 -
 src/identitydialog.ui                              |    3 +
 src/irc/channel.cpp                                |   41 +-
 src/irc/channel.h                                  |    1 -
 src/irc/channellistpanelui.ui                      |   36 +-
 src/irc/channeloptionsdialog.cpp                   |    4 +-
 src/irc/inputfilter.cpp                            |   33 +-
 src/irc/nick.cpp                                   |    4 +-
 src/irc/nicksonline.cpp                            |   18 +-
 src/irc/nicksonline.h                              |    2 +-
 src/irc/outputfilter.cpp                           |   41 +-
 src/irc/outputfilter.h                             |   11 +-
 src/irc/query.cpp                                  |   31 -
 src/irc/query.h                                    |    1 -
 src/irc/server.cpp                                 |  164 +-
 src/irc/server.h                                   |   16 +-
 src/irc/servergroupdialog.cpp                      |    4 +-
 src/main.cpp                                       |    6 +
 src/urlcatcher.cpp                                 |   18 +-
 src/urlcatcher.h                                   |    6 +-
 src/urlcatcherui.ui                                |   31 +-
 src/version.h                                      |    2 +-
 src/viewer/editnotifydialog.cpp                    |    2 +-
 src/viewer/irccolorchooser.cpp                     |    4 +-
 src/viewer/ircinput.cpp                            |   15 +
 src/viewer/statuspanel.cpp                         |   47 +-
 src/viewer/statuspanel.h                           |    1 -
 src/viewer/viewcontainer.cpp                       |    8 +-
 src/viewer/viewtree.cpp                            |   18 +-
 src/viewer/viewtreeitem.cpp                        |   20 +-
 src/viewer/viewtreeitem.h                          |    1 -
 84 files changed, 126435 insertions(+), 125699 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list