[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:44 UTC 2010


The following commit has been merged in the master branch:
commit fbb9ce33612d0728337f87b552c4ef62666f46c8
Merge: 2f1b1f9a3b9c73fac773cd19a4d65a82e6be0563 89e9aaf99ab3a980e4dd8a9942cbf5befb50f2d1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat May 22 22:45:20 2010 +0300

    Merge branch 'upstream'

 .gitignore                           |    1 -
 CMakeLists.txt                       |   28 +-
 ChangeLog                            |   39 +-
 po/CMakeLists.txt                    |   80 +-
 po/ar/CMakeLists.txt                 |    2 -
 po/ar/konversation.po                | 9835 ------------------------------
 po/bg/konversation.po                | 1578 +++---
 po/br/CMakeLists.txt                 |    2 -
 po/br/konversation.po                | 9058 ---------------------------
 po/ca/konversation.po                | 1582 +++---
 po/ca at valencia/konversation.po       | 1582 +++---
 po/cs/konversation.po                | 1532 +++---
 po/cy/CMakeLists.txt                 |    2 -
 po/cy/konversation.po                | 8992 ---------------------------
 po/da/konversation.po                | 1570 +++---
 po/de/konversation.po                | 1572 +++---
 po/el/konversation.po                | 1574 +++---
 po/en_GB/konversation.po             | 1568 +++---
 po/eo/CMakeLists.txt                 |    2 -
 po/eo/konversation.po                | 8713 --------------------------
 po/es/konversation.po                | 1584 +++---
 po/et/konversation.po                | 1626 +++---
 po/fi/konversation.po                | 1582 +++---
 po/fr/konversation.po                | 1615 +++---
 po/ga/CMakeLists.txt                 |    2 -
 po/ga/konversation.po                | 9136 ----------------------------
 po/gl/konversation.po                | 1594 +++---
 po/he/CMakeLists.txt                 |    2 -
 po/he/konversation.po                | 9207 ----------------------------
 po/hi/CMakeLists.txt                 |    2 -
 po/hi/konversation.po                | 9342 ----------------------------
 po/hr/CMakeLists.txt                 |    2 -
 po/hr/konversation.po                | 8610 --------------------------
 po/hu/konversation.po                | 1606 +++---
 po/is/CMakeLists.txt                 |    2 -
 po/is/konversation.po                | 8928 ---------------------------
 po/it/konversation.po                | 1605 +++---
 po/ja/konversation.po                | 1580 +++---
 po/ka/CMakeLists.txt                 |    2 -
 po/ka/konversation.po                | 9835 ------------------------------
 po/km/CMakeLists.txt                 |    2 -
 po/km/konversation.po                | 9650 -----------------------------
 po/ko/CMakeLists.txt                 |    2 -
 po/ko/konversation.po                | 9930 ------------------------------
 po/lt/CMakeLists.txt                 |    2 -
 po/lt/konversation.po                | 9230 ----------------------------
 po/ms/CMakeLists.txt                 |    2 -
 po/ms/konversation.po                | 9255 ----------------------------
 po/mt/CMakeLists.txt                 |    2 -
 po/mt/konversation.po                | 9073 ---------------------------
 po/nds/konversation.po               | 1568 +++---
 po/nl/konversation.po                | 1580 +++---
 po/pa/konversation.po                | 1511 +++---
 po/pl/konversation.po                | 1566 +++---
 po/pt/konversation.po                | 1582 +++---
 po/pt_BR/konversation.po             | 1572 +++---
 po/ro/CMakeLists.txt                 |    2 -
 po/ro/konversation.po                | 8643 --------------------------
 po/ru/konversation.po                | 1558 +++---
 po/rw/CMakeLists.txt                 |    2 -
 po/rw/konversation.po                |11143 ----------------------------------
 po/si/CMakeLists.txt                 |    2 -
 po/si/konversation.po                | 8561 --------------------------
 po/sk/konversation.po                | 1566 +++---
 po/sl/CMakeLists.txt                 |    2 -
 po/sl/konversation.po                | 9480 -----------------------------
 po/sr/konversation.po                | 5190 ++++++++--------
 po/sr at ijekavian/konversation.po      | 5192 ++++++++--------
 po/sr at ijekavianlatin/konversation.po | 5198 ++++++++--------
 po/sr at latin/konversation.po          | 5194 ++++++++--------
 po/sv/konversation.po                | 1568 +++---
 po/ta/CMakeLists.txt                 |    2 -
 po/ta/konversation.po                | 9306 ----------------------------
 po/tr/konversation.po                | 1550 +++---
 po/uk/konversation.po                | 1588 +++---
 po/zh_CN/konversation.po             | 1538 +++---
 po/zh_TW/konversation.po             | 1556 +++---
 src/application.cpp                  |   21 +-
 src/commit.h                         |    2 +-
 src/irc/channeloptionsui.ui          |    3 -
 src/irc/inputfilter.cpp              |    6 +-
 src/irc/outputfilter.cpp             |   14 +-
 src/irc/server.h                     |    2 +-
 src/irc/serverlistdialog.cpp         |    3 +
 src/main.cpp                         |    6 +-
 src/mainwindow.cpp                   |    9 +-
 src/notificationhandler.cpp          |   10 +-
 src/version.h                        |    2 +-
 src/viewer/viewcontainer.cpp         |   71 +-
 src/viewer/viewcontainer.h           |   16 +-
 90 files changed, 33425 insertions(+), 219282 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list