[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha2-1-3-gaa695ba

[Modestas Vainius]

The following commit has been merged in the master branch:
commit aaa0b56a703d335ea93a2024764dfb3179bfc257
Merge: e153e1671f3b5ba76a944b33da96cf847ece7030 174baf058aff696a0f32f0e316f9fb32808ab11f
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Jun 2 21:50:20 2009 +0300

    Merge branch 'upstream'

 ChangeLog                                      |   48 +
 data/images/nickicons/christmas/index.desktop  |    1 +
 data/images/nickicons/classic/index.desktop    |    1 +
 data/images/nickicons/default/index.desktop    |    5 +
 data/images/nickicons/simplistic/index.desktop |    5 +
 data/images/nickicons/smiling/index.desktop    |    1 +
 data/images/nickicons/square/index.desktop     |    1 +
 data/konversation.notifyrc                     |   28 +
 data/scripts/CMakeLists.txt                    |    2 +-
 data/scripts/bug                               |    2 +-
 data/scripts/media                             |   18 +-
 po/ar/konversation.po                          | 3149 +++++++-------
 po/bg/konversation.po                          | 3215 ++++++++--------
 po/da/konversation.po                          | 3582 ++++++++--------
 po/de/konversation.po                          | 3205 ++++++++--------
 po/el/konversation.po                          | 3241 ++++++++--------
 po/en_GB/konversation.po                       | 3153 +++++++-------
 po/es/konversation.po                          | 3237 ++++++++--------
 po/et/konversation.po                          | 3182 ++++++++--------
 po/fr/konversation.po                          | 3239 ++++++++--------
 po/gl/konversation.po                          | 3211 ++++++++--------
 po/he/konversation.po                          | 3109 +++++++-------
 po/hu/konversation.po                          | 3241 ++++++++--------
 po/it/konversation.po                          | 3237 ++++++++--------
 po/ko/konversation.po                          | 3219 ++++++++--------
 po/nl/konversation.po                          | 3251 ++++++++--------
 po/pt/konversation.po                          | 3179 ++++++++--------
 po/pt_BR/konversation.po                       | 5204 +++++++++++-------------
 po/ru/konversation.po                          | 3159 +++++++-------
 po/sv/konversation.po                          | 3232 ++++++++--------
 po/tr/konversation.po                          | 3436 ++++++++--------
 po/uk/konversation.po                          | 3207 ++++++++--------
 po/zh_CN/konversation.po                       | 3676 ++++++++---------
 po/zh_TW/konversation.po                       | 3173 ++++++++--------
 src/application.cpp                            |   30 +-
 src/application.h                              |    4 +-
 src/commit.h                                   |    2 +-
 src/config/konversation.kcfg                   |    2 +-
 src/dcc/transfer.cpp                           |    9 +-
 src/dcc/transferrecv.cpp                       |   13 +-
 src/dcc/transfersend.cpp                       |   19 +-
 src/irc/channel.cpp                            |   28 +-
 src/irc/server.cpp                             |    8 +-
 src/mainwindow.cpp                             |    6 +-
 src/version.h                                  |    2 +-
 src/viewer/ircview.cpp                         |   15 +-
 src/viewer/osd.cpp                             |    7 +-
 src/viewer/osd.h                               |    4 -
 src/viewer/trayicon.cpp                        |    1 +
 src/viewer/viewcontainer.cpp                   |   10 +
 50 files changed, 38100 insertions(+), 38909 deletions(-)

-- 
Konversation packaging for Debian