[SCM] Konversation packaging for Debian branch, master, updated. debian/1.3-beta1-1
Modestas Vainius
modax at alioth.debian.org
Sat May 22 21:38:10 UTC 2010
The following commit has been merged in the master branch:
commit bc58284693f9f0c679c544df4d0ca3eaec322bbe
Merge: 4f29a27dea5ae5345388074db059165ec57ce87d 82b5f14b270dbe1e9a3f35905aca4ab3364fbfdc
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sun May 9 21:55:14 2010 +0300
Merge branch 'upstream' into experimental
.gitignore | 1 +
CMakeLists.txt | 53 +-
ChangeLog | 107 +
config-konversation.h.cmake | 6 +-
data/images/nickicons/alternative/index.desktop | 10 +
data/images/nickicons/christmas/index.desktop | 10 +
data/images/nickicons/classic/index.desktop | 10 +
data/images/nickicons/default/index.desktop | 11 +
data/images/nickicons/simplistic/index.desktop | 12 +
data/images/nickicons/smiling/index.desktop | 10 +
data/images/nickicons/square/index.desktop | 10 +
data/konversation.desktop | 10 +
data/konversation.notifyrc | 178 +
data/scripts/media | 6 +-
po/CMakeLists.txt | 75 +-
po/ar/CMakeLists.txt | 2 +
po/{ja => ar}/konversation.po |12399 ++++++++++----------
po/bg/CMakeLists.txt | 1 -
po/bg/konversation.po |10557 +++++++++--------
po/br/CMakeLists.txt | 2 +
po/{cs => br}/konversation.po |10799 +++++++++--------
po/ca/CMakeLists.txt | 1 -
po/ca/konversation.po |10322 +++++++++--------
po/ca at valencia/CMakeLists.txt | 2 +
po/{ca => ca at valencia}/konversation.po |10592 +++++++++--------
po/cs/CMakeLists.txt | 1 -
po/cs/konversation.po | 9636 ++++++++--------
po/cy/CMakeLists.txt | 2 +
po/{cs => cy}/konversation.po |10673 +++++++++--------
po/da/CMakeLists.txt | 1 -
po/da/konversation.po |10221 +++++++++--------
po/de/CMakeLists.txt | 1 -
po/de/konversation.po |10328 +++++++++--------
po/el/CMakeLists.txt | 1 -
po/el/konversation.po |10713 +++++++++---------
po/en_GB/CMakeLists.txt | 1 -
po/en_GB/konversation.po |10105 +++++++++--------
po/eo/CMakeLists.txt | 2 +
po/{cs => eo}/konversation.po |10370 +++++++++--------
po/es/CMakeLists.txt | 1 -
po/es/konversation.po |10166 +++++++++--------
po/et/CMakeLists.txt | 1 -
po/et/konversation.po |10122 +++++++++--------
po/fi/CMakeLists.txt | 1 -
po/fi/konversation.po |10345 +++++++++--------
po/fr/CMakeLists.txt | 1 -
po/fr/konversation.po |10289 +++++++++--------
po/ga/CMakeLists.txt | 2 +
po/{cs => ga}/konversation.po |10849 +++++++++--------
po/gl/CMakeLists.txt | 1 -
po/gl/konversation.po |10372 +++++++++--------
po/he/CMakeLists.txt | 1 -
po/he/konversation.po | 9938 +++++++++--------
po/hi/CMakeLists.txt | 2 +
po/{zh_TW => hi}/konversation.po |12279 ++++++++++----------
po/hr/CMakeLists.txt | 2 +
po/{cs => hr}/konversation.po |10287 +++++++++--------
po/hu/CMakeLists.txt | 1 -
po/hu/konversation.po |10340 +++++++++--------
po/is/CMakeLists.txt | 2 +
po/{cs => is}/konversation.po |10573 +++++++++--------
po/it/CMakeLists.txt | 1 -
po/it/konversation.po |10209 +++++++++--------
po/ja/CMakeLists.txt | 1 -
po/ja/konversation.po |10856 +++++++++---------
po/ka/CMakeLists.txt | 2 +
po/{el => ka}/konversation.po |12464 ++++++++++----------
po/km/CMakeLists.txt | 2 +
po/km/konversation.po | 9650 ++++++++++++++++
po/ko/CMakeLists.txt | 2 +
po/{zh_TW => ko}/konversation.po |12301 ++++++++++----------
po/lt/CMakeLists.txt | 2 +
po/{he => lt}/konversation.po |11517 ++++++++++---------
po/ms/CMakeLists.txt | 2 +
po/{cs => ms}/konversation.po |11050 ++++++++++--------
po/mt/CMakeLists.txt | 2 +
po/{cs => mt}/konversation.po |10774 +++++++++--------
po/nb/CMakeLists.txt | 1 -
po/nb/konversation.po |11084 +++++++++---------
po/nds/CMakeLists.txt | 1 -
po/nds/konversation.po |10219 +++++++++--------
po/nl/CMakeLists.txt | 1 -
po/nl/konversation.po |10313 +++++++++--------
po/pa/CMakeLists.txt | 2 +
po/{he => pa}/konversation.po |11011 +++++++++---------
po/pl/CMakeLists.txt | 1 -
po/pl/konversation.po |10081 +++++++++--------
po/pt/CMakeLists.txt | 1 -
po/pt/konversation.po |10131 +++++++++--------
po/pt_BR/CMakeLists.txt | 1 -
po/pt_BR/konversation.po |10160 +++++++++--------
po/ro/CMakeLists.txt | 2 +
po/{cs => ro}/konversation.po |10334 +++++++++--------
po/ru/CMakeLists.txt | 1 -
po/ru/konversation.po |10259 +++++++++--------
po/rw/CMakeLists.txt | 2 +
po/{zh_TW => rw}/konversation.po |14140 +++++++++++++----------
po/si/CMakeLists.txt | 2 +
po/{cs => si}/konversation.po |10250 +++++++++--------
po/sk/CMakeLists.txt | 1 -
po/sk/konversation.po | 9850 +++++++++--------
po/sl/CMakeLists.txt | 2 +
po/{cs => sl}/konversation.po |11647 ++++++++++---------
po/sr/CMakeLists.txt | 2 +
po/{fr => sr}/konversation.po |12706 ++++++++++----------
po/sr at ijekavian/CMakeLists.txt | 2 +
po/{fr => sr at ijekavian}/konversation.po |12710 ++++++++++----------
po/sr at ijekavianlatin/CMakeLists.txt | 2 +
po/{da => sr at ijekavianlatin}/konversation.po |12759 ++++++++++----------
po/sr at latin/CMakeLists.txt | 2 +
po/{sv => sr at latin}/konversation.po |12477 ++++++++++----------
po/sv/CMakeLists.txt | 1 -
po/sv/konversation.po |10139 +++++++++--------
po/ta/CMakeLists.txt | 2 +
po/{zh_TW => ta}/konversation.po |12211 ++++++++++----------
po/tr/CMakeLists.txt | 1 -
po/tr/konversation.po |10342 +++++++++--------
po/uk/CMakeLists.txt | 1 -
po/uk/konversation.po |10261 +++++++++--------
po/zh_CN/CMakeLists.txt | 1 -
po/zh_CN/konversation.po |10154 +++++++++--------
po/zh_TW/CMakeLists.txt | 1 -
po/zh_TW/konversation.po |10411 +++++++++--------
src/CMakeLists.txt | 29 +-
src/abstractawaymanager.cpp | 197 +
src/abstractawaymanager.h | 114 +
src/application.cpp | 9 +-
src/application.h | 8 +-
src/awaymanager.cpp | 230 +-
src/awaymanager.h | 85 +-
src/awaymanagerkidletime.cpp | 183 +
src/awaymanagerkidletime.h | 124 +
src/commit.h | 2 +-
src/common.cpp | 13 +-
src/common.h | 7 +-
src/config/generalbehavior_configui.ui | 2 +-
src/config/osd_config.cpp | 4 +-
src/connectionmanager.cpp | 22 +-
src/connectionmanager.h | 2 -
src/dbus.cpp | 12 +-
src/dbus.h | 1 +
src/dcc/chat.cpp | 143 +-
src/dcc/chat.h | 17 +
src/dcc/chatcontainer.cpp | 54 +-
src/dcc/chatcontainer.h | 3 +
src/dcc/dcccommon.cpp | 4 +-
src/dcc/recipientdialog.h | 2 +-
src/dcc/resumedialog.h | 2 +-
src/dcc/transfer.cpp | 141 +-
src/dcc/transfer.h | 38 +-
src/dcc/transferdetailedinfopanel.cpp | 16 +-
src/dcc/transferlistmodel.cpp | 42 +-
src/dcc/transferlistmodel.h | 6 -
src/dcc/transferpanel.cpp | 74 +-
src/dcc/transferpanel.h | 6 +-
src/dcc/transferrecv.cpp | 464 +-
src/dcc/transferrecv.h | 58 +-
src/dcc/transfersend.cpp | 268 +-
src/dcc/transfersend.h | 24 +-
src/dcc/transferview.cpp | 80 +-
src/dcc/transferview.h | 7 +-
src/dcc/whiteboard.cpp | 596 +
src/dcc/whiteboard.h | 85 +
src/dcc/whiteboardcolorchooser.cpp | 238 +
src/dcc/whiteboardcolorchooser.h | 78 +
src/dcc/whiteboardfontchooser.cpp | 148 +
src/dcc/whiteboardfontchooser.h | 60 +
src/dcc/whiteboardfontchooserui.ui | 219 +
src/dcc/whiteboardglobals.cpp | 21 +
src/dcc/whiteboardglobals.h | 115 +
src/dcc/whiteboardpaintarea.cpp | 893 ++
src/dcc/whiteboardpaintarea.h | 137 +
src/dcc/whiteboardtoolbar.cpp | 493 +
src/dcc/whiteboardtoolbar.h | 127 +
src/dcc/whiteboardtoolbarui.ui | 327 +
src/identitydialog.cpp | 8 +-
src/irc/channel.cpp | 12 +-
src/irc/channellistpanel.cpp | 10 +-
src/irc/channeloptionsdialog.cpp | 20 +-
src/irc/inputfilter.cpp | 32 +-
src/irc/nick.cpp | 18 -
src/irc/nick.h | 7 -
src/irc/nicklistview.cpp | 11 +-
src/irc/nicklistview.h | 1 +
src/irc/nicksonline.h | 1 -
src/irc/outputfilter.cpp | 71 +-
src/irc/outputfilter.h | 10 +-
src/irc/query.cpp | 6 +-
src/irc/query.h | 2 +-
src/irc/server.cpp | 291 +-
src/irc/server.h | 38 +-
src/main.cpp | 8 +-
src/mainwindow.cpp | 8 +-
src/notificationhandler.cpp | 50 +-
src/notificationhandler.h | 1 -
src/urlcatcher.cpp | 16 +-
src/urlcatcher.h | 2 +-
src/version.h | 2 +-
src/viewer/insertchardialog.cpp | 5 +-
src/viewer/ircinput.cpp | 2 -
src/viewer/ircview.cpp | 91 +-
src/viewer/ircview.h | 11 +-
src/viewer/osd.cpp | 1 -
src/viewer/pasteeditor.cpp | 4 +-
src/viewer/topiclabel.cpp | 4 -
src/viewer/viewcontainer.cpp | 18 +-
src/viewer/viewtreeitem.cpp | 60 +-
207 files changed, 313336 insertions(+), 278848 deletions(-)
--
Konversation packaging for Debian
More information about the pkg-kde-commits
mailing list