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

Modestas Vainius modax at alioth.debian.org
Sun Nov 6 08:31:53 UTC 2011


The following commit has been merged in the master branch:
commit a9a00b2b32b956065a0528a95fd087aa07299c42
Merge: f35280bcad14fa082b4a5df6a99e463b48c19552 cbd931164dc10d44cc8392e8e2786829ebba02bf
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Nov 6 10:01:17 2011 +0200

    Merge commit 'upstream/1.4_beta1'

 .gitignore                                         |    4 -
 ChangeLog                                          |  818 +-
 data/images/nickicons/alternative/index.desktop    |   16 +-
 data/images/nickicons/christmas/index.desktop      |    4 +-
 data/images/nickicons/classic/index.desktop        |   10 +-
 data/images/nickicons/default/index.desktop        |    3 +-
 data/images/nickicons/simplistic/index.desktop     |    4 +-
 data/images/nickicons/smiling/index.desktop        |    4 +-
 data/images/nickicons/square/index.desktop         |    2 +-
 data/konversation.notifyrc                         |   50 +-
 data/scripts/sysinfo                               |   10 +-
 doc-translations/CMakeLists.txt                    |    8 +
 .../de_konversation/konversation/CMakeLists.txt    |    1 +
 .../de_konversation/konversation/index.docbook     | 6356 +++++++++++
 .../et_konversation/konversation/CMakeLists.txt    |    1 +
 .../et_konversation/konversation/index.docbook     | 6370 +++++++++++
 .../it_konversation/konversation/CMakeLists.txt    |    1 +
 .../it_konversation/konversation/index.docbook     | 6369 +++++++++++
 .../nl_konversation/konversation/CMakeLists.txt    |    1 +
 .../nl_konversation/konversation/index.docbook     | 6287 +++++++++++
 .../pt_BR_konversation/konversation/CMakeLists.txt |    1 +
 .../pt_BR_konversation/konversation/index.docbook  | 6365 +++++++++++
 .../pt_konversation/konversation/CMakeLists.txt    |    1 +
 .../pt_konversation/konversation/index.docbook     | 6347 +++++++++++
 .../sv_konversation/konversation/CMakeLists.txt    |    1 +
 .../sv_konversation/konversation/addchannel.png    |  Bin 0 -> 3985 bytes
 .../sv_konversation/konversation/addnetwork_co.png |  Bin 0 -> 11970 bytes
 .../sv_konversation/konversation/addserver_co.png  |  Bin 0 -> 5902 bytes
 .../konversation/channel_screen_tour_co.png        |  Bin 0 -> 27272 bytes
 .../konversation/channellist_screen_co.png         |  Bin 0 -> 28918 bytes
 .../konversation/checkidentities.png               |  Bin 0 -> 5653 bytes
 .../konversation/colorchooser_screen.png           |  Bin 0 -> 5193 bytes
 .../konversation/dccstatus_screen_co.png           |  Bin 0 -> 14110 bytes
 .../konversation/first_channel_co.png              |  Bin 0 -> 20622 bytes
 .../konversation/first_serverlist_co.png           |  Bin 0 -> 6883 bytes
 .../konversation/highlighting_screen_co.png        |  Bin 0 -> 25708 bytes
 .../konversation/identities_adv_co.png             |  Bin 0 -> 10427 bytes
 .../konversation/identities_away_co.png            |  Bin 0 -> 11281 bytes
 .../konversation/identities_gen_co.png             |  Bin 0 -> 11732 bytes
 .../sv_konversation/konversation/index.docbook     | 6359 +++++++++++
 .../konversation/kimproxy_create_screen2.png       |  Bin 0 -> 9386 bytes
 .../konversation/kimproxy_create_screen_co.png     |  Bin 0 -> 19640 bytes
 .../sv_konversation/konversation/logviewer_co.png  |  Bin 0 -> 18171 bytes
 .../konversation/nicksonline_co.png                |  Bin 0 -> 20765 bytes
 .../konversation/nickthemes_screen_co.png          |  Bin 0 -> 22363 bytes
 .../konversation/notification_screen_co.png        |  Bin 0 -> 19050 bytes
 .../konversation/notifylist_screen_co.png          |  Bin 0 -> 24738 bytes
 .../sv_konversation/konversation/osd_demo.png      |  Bin 0 -> 23487 bytes
 .../sv_konversation/konversation/osd_screen_co.png |  Bin 0 -> 26121 bytes
 .../konversation/quickbuttons_screen.png           |  Bin 0 -> 27271 bytes
 .../konversation/quickconnect_screen.png           |  Bin 0 -> 5646 bytes
 .../sv_konversation/konversation/serverlist_co.png |  Bin 0 -> 9386 bytes
 .../konversation/urlcatcher_screen_co.png          |  Bin 0 -> 12774 bytes
 .../konversation/webbrowser_screen_co.png          |  Bin 0 -> 28893 bytes
 .../uk_konversation/konversation/CMakeLists.txt    |    1 +
 .../uk_konversation/konversation/index.docbook     | 6322 +++++++++++
 po/CMakeLists.txt                                  |   82 +-
 po/ar/CMakeLists.txt                               |    2 -
 po/ar/konversation.po                              |10438 ------------------
 po/bg/konversation.po                              | 7247 +++++++------
 po/br/CMakeLists.txt                               |    2 -
 po/br/konversation.po                              | 9487 ----------------
 po/bs/konversation.po                              | 6927 ++++++------
 po/ca/konversation.po                              | 6908 ++++++------
 po/ca at valencia/konversation.po                     | 6963 ++++++------
 po/cs/konversation.po                              | 6378 ++++++------
 po/cy/CMakeLists.txt                               |    2 -
 po/cy/konversation.po                              | 9373 ----------------
 po/da/konversation.po                              | 6620 ++++++------
 po/de/konversation.po                              | 6908 ++++++------
 po/el/konversation.po                              | 6924 ++++++------
 po/en_GB/konversation.po                           | 6260 ++++++------
 po/eo/CMakeLists.txt                               |    2 -
 po/eo/konversation.po                              | 9089 ---------------
 po/es/konversation.po                              | 7058 ++++++------
 po/et/konversation.po                              | 6646 ++++++------
 po/fi/konversation.po                              | 6893 ++++++------
 po/fr/konversation.po                              | 6904 ++++++------
 po/ga/CMakeLists.txt                               |    2 -
 po/ga/konversation.po                              | 9622 ----------------
 po/gl/konversation.po                              | 7453 +++++++-------
 po/he/CMakeLists.txt                               |    2 -
 po/he/konversation.po                              | 9736 ----------------
 po/hi/CMakeLists.txt                               |    2 -
 po/hi/konversation.po                              | 9829 -----------------
 po/hr/CMakeLists.txt                               |    2 -
 po/hr/konversation.po                              | 8967 ---------------
 po/hu/konversation.po                              | 7585 +++++++-------
 po/is/CMakeLists.txt                               |    2 -
 po/is/konversation.po                              | 9281 ----------------
 po/it/konversation.po                              | 7021 ++++++------
 po/ja/konversation.po                              | 7442 +++++++-------
 po/ka/CMakeLists.txt                               |    2 -
 po/ka/konversation.po                              |10371 -----------------
 po/km/CMakeLists.txt                               |    2 -
 po/km/konversation.po                              |10069 -----------------
 po/ko/CMakeLists.txt                               |    2 -
 po/ko/konversation.po                              | 9497 ----------------
 po/lt/CMakeLists.txt                               |    2 -
 po/lt/konversation.po                              | 9389 ----------------
 po/ms/CMakeLists.txt                               |    2 -
 po/ms/konversation.po                              | 9647 ----------------
 po/mt/CMakeLists.txt                               |    2 -
 po/mt/konversation.po                              | 9391 ----------------
 po/nb/konversation.po                              | 8564 ++++++++-------
 po/nds/konversation.po                             | 6899 ++++++------
 po/nl/konversation.po                              | 6815 ++++++------
 po/pa/CMakeLists.txt                               |    2 -
 po/pa/konversation.po                              | 9303 ----------------
 po/pl/konversation.po                              | 6926 ++++++------
 po/pt/konversation.po                              | 6914 ++++++------
 po/pt_BR/konversation.po                           | 6939 ++++++------
 po/ro/CMakeLists.txt                               |    2 -
 po/ro/konversation.po                              | 8981 ---------------
 po/ru/konversation.po                              | 7268 +++++++------
 po/rw/CMakeLists.txt                               |    2 -
 po/rw/konversation.po                              |11592 --------------------
 po/si/CMakeLists.txt                               |    2 -
 po/si/konversation.po                              | 8884 ---------------
 po/sk/CMakeLists.txt                               |    2 -
 po/sk/konversation.po                              | 9397 ----------------
 po/sl/CMakeLists.txt                               |    2 -
 po/sl/konversation.po                              | 9926 -----------------
 po/sq/CMakeLists.txt                               |    2 -
 po/sq/konversation.po                              | 8890 ---------------
 po/sr/konversation.po                              | 9236 ++++++++--------
 po/sr at ijekavian/konversation.po                    | 9751 +++++++++--------
 po/sr at ijekavianlatin/konversation.po               | 9749 +++++++++--------
 po/sr at latin/konversation.po                        | 9739 +++++++++--------
 po/sv/konversation.po                              | 6624 ++++++------
 po/ta/CMakeLists.txt                               |    2 -
 po/ta/konversation.po                              | 9797 -----------------
 po/tr/konversation.po                              | 7386 +++++++------
 po/ug/CMakeLists.txt                               |    2 -
 po/ug/konversation.po                              | 8856 ---------------
 po/uk/konversation.po                              | 6865 ++++++------
 po/zh_CN/konversation.po                           | 6657 ++++++------
 po/zh_TW/konversation.po                           | 7020 ++++++------
 src/application.cpp                                |   20 +-
 src/commit.h                                       |    2 +-
 src/common.cpp                                     |    1 +
 src/common.h                                       |    2 +-
 src/config/configdialog.cpp                        |    2 +-
 src/config/konversation.kcfg                       |    2 +-
 src/config/watchednicknames_configui.ui            |   10 +-
 src/connectionmanager.cpp                          |   23 +-
 src/connectionmanager.h                            |    9 +-
 src/dbus.cpp                                       |   34 +-
 src/dbus.h                                         |    2 +-
 src/dcc/chat.cpp                                   |    4 +-
 src/dcc/transferlistmodel.cpp                      |   43 +-
 src/dcc/transferlistmodel.h                        |    6 +-
 src/dcc/transferview.cpp                           |    4 +-
 src/decoder.h                                      |    2 +-
 src/irc/inputfilter.cpp                            |    6 +-
 src/irc/irccharsets.cpp                            |    4 +-
 src/irc/irccharsets.h                              |    4 +-
 src/irc/nicksonline.h                              |    2 +-
 src/irc/outputfilter.cpp                           |   26 +-
 src/irc/outputfilter.h                             |    1 +
 src/irc/server.cpp                                 |  147 +-
 src/irc/server.h                                   |   23 +-
 src/main.cpp                                       |    8 +-
 src/mainwindow.cpp                                 |    2 +-
 src/notificationhandler.cpp                        |   32 +-
 src/version.h                                      |    2 +-
 src/viewer/irccontextmenus.cpp                     |    8 +
 src/viewer/irccontextmenus.h                       |    2 +-
 src/viewer/ircview.cpp                             |  391 +-
 src/viewer/ircview.h                               |   27 +-
 src/viewer/trayicon.cpp                            |    3 +-
 src/viewer/viewcontainer.cpp                       |    2 +-
 src/viewer/viewtreeitem.cpp                        |    9 +-
 173 files changed, 173723 insertions(+), 350289 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list