[SCM] skanlite packaging branch, master, updated. debian/0.7-1-19-g1643b26

Kai Wasserbäch curan at alioth.debian.org
Fri Jan 6 17:04:43 UTC 2012


The following commit has been merged in the master branch:
commit 6e105edb769df98cf6dcd1469bd039c53aea460d
Merge: 4e6a11d6f2544b32cddb0761f21e0d2ff6a449e5 430fe7d36b99e754f48fa87515f5f2bd5842dc03
Author: Kai Wasserbäch <curan at debian.org>
Date:   Fri Jan 6 15:11:57 2012 +0100

    Merge commit 'upstream/0.8'

 CMakeLists.txt                                     |   15 +-
 doc-translations/CMakeLists.txt                    |    1 +
 .../de_skanlite/skanlite/index.docbook             |  146 ++++-
 .../et_skanlite/skanlite/index.docbook             |   20 +-
 .../fr_skanlite/skanlite/index.docbook             |   28 +-
 .../it_skanlite/skanlite/index.docbook             |  126 ++++-
 .../skanlite/CMakeLists.txt                        |    2 +-
 .../nl_skanlite/skanlite/index.docbook             |  589 ++++++++++++++++++++
 .../pt_BR_skanlite/skanlite/index.docbook          |  158 ++++--
 .../pt_skanlite/skanlite/index.docbook             |   52 +-
 .../sv_skanlite/skanlite/index.docbook             |  142 ++++-
 .../uk_skanlite/skanlite/buttons-main.png          |  Bin 0 -> 4431 bytes
 .../uk_skanlite/skanlite/choose-scanner.png        |  Bin 0 -> 12633 bytes
 .../uk_skanlite/skanlite/final-button.png          |  Bin 0 -> 8640 bytes
 .../uk_skanlite/skanlite/index.docbook             |  146 ++++-
 .../uk_skanlite/skanlite/main-window.png           |  Bin 0 -> 52228 bytes
 .../uk_skanlite/skanlite/multiple-selections.png   |  Bin 0 -> 309512 bytes
 .../uk_skanlite/skanlite/no-scanner-found.png      |  Bin 0 -> 27587 bytes
 .../uk_skanlite/skanlite/other-options.png         |  Bin 0 -> 53163 bytes
 .../uk_skanlite/skanlite/preview-button.png        |  Bin 0 -> 8581 bytes
 doc-translations/uk_skanlite/skanlite/preview.png  |  Bin 0 -> 273375 bytes
 doc-translations/uk_skanlite/skanlite/scanning.png |  Bin 0 -> 8339 bytes
 doc-translations/uk_skanlite/skanlite/settings.png |  Bin 0 -> 35531 bytes
 doc-translations/uk_skanlite/skanlite/zoom-in.png  |  Bin 0 -> 303420 bytes
 doc/buttons-main.png                               |  Bin 4912 -> 5097 bytes
 doc/choose-scanner.png                             |  Bin 21916 -> 23494 bytes
 doc/final-button.png                               |  Bin 10929 -> 11308 bytes
 doc/index.docbook                                  |  134 ++++-
 doc/main-window.png                                |  Bin 46327 -> 52215 bytes
 doc/multiple-selections.png                        |  Bin 0 -> 384134 bytes
 doc/no-scanner-found.png                           |  Bin 0 -> 17266 bytes
 doc/other-options.png                              |  Bin 44758 -> 65026 bytes
 doc/preview-button.png                             |  Bin 10402 -> 10745 bytes
 doc/preview.png                                    |  Bin 477924 -> 490285 bytes
 doc/scanning.png                                   |  Bin 8330 -> 8796 bytes
 doc/settings.png                                   |  Bin 34039 -> 37836 bytes
 doc/zoom-in.png                                    |  Bin 329526 -> 332802 bytes
 doc/zoom-to-fit.png                                |  Bin 10701 -> 11091 bytes
 po/CMakeLists.txt                                  |    3 +
 po/be/skanlite.po                                  |  210 ++++----
 po/bs/CMakeLists.txt                               |    2 +
 po/{ca at valencia => bs}/skanlite.po                 |  310 ++++++-----
 po/ca/skanlite.po                                  |  227 +++++----
 po/ca at valencia/skanlite.po                         |  239 +++++----
 po/cs/skanlite.po                                  |  232 +++++----
 po/da/skanlite.po                                  |  224 ++++----
 po/de/skanlite.po                                  |  234 +++++----
 po/el/skanlite.po                                  |  262 +++++----
 po/en_GB/skanlite.po                               |  217 ++++----
 po/eo/skanlite.po                                  |  206 ++++----
 po/es/skanlite.po                                  |  219 ++++----
 po/et/skanlite.po                                  |  228 +++++----
 po/eu/skanlite.po                                  |  220 ++++----
 po/fr/skanlite.po                                  |  232 +++++----
 po/ga/skanlite.po                                  |  212 ++++----
 po/gl/skanlite.po                                  |  227 ++++----
 po/hr/skanlite.po                                  |  184 ++++---
 po/hu/skanlite.po                                  |  220 ++++----
 po/is/skanlite.po                                  |  226 +++++----
 po/it/skanlite.po                                  |  226 ++++----
 po/ja/skanlite.po                                  |  212 ++++----
 po/km/skanlite.po                                  |  231 +++++----
 po/ko/skanlite.po                                  |  217 ++++----
 po/lt/skanlite.po                                  |  234 +++++----
 po/lv/skanlite.po                                  |  212 ++++----
 po/mai/skanlite.po                                 |  206 ++++----
 po/nb/skanlite.po                                  |  217 ++++----
 po/nds/skanlite.po                                 |  233 +++++----
 po/nl/skanlite.po                                  |  226 ++++----
 po/nn/skanlite.po                                  |  205 ++++----
 po/pa/skanlite.po                                  |  212 ++++----
 po/pl/skanlite.po                                  |  342 ++++++------
 po/pt/skanlite.po                                  |  213 ++++----
 po/pt_BR/skanlite.po                               |  231 +++++----
 po/ro/skanlite.po                                  |  271 +++++----
 po/ru/skanlite.po                                  |  239 +++++----
 po/sk/skanlite.po                                  |  204 ++++----
 po/sq/CMakeLists.txt                               |    2 +
 po/{eo => sq}/skanlite.po                          |  289 +++++-----
 po/sv/skanlite.po                                  |  226 ++++----
 po/tr/skanlite.po                                  |  235 +++++----
 po/ug/CMakeLists.txt                               |    2 +
 po/{mai => ug}/skanlite.po                         |  258 +++++----
 po/uk/skanlite.po                                  |  230 +++++----
 po/wa/skanlite.po                                  |  219 ++++----
 po/zh_CN/skanlite.po                               |  227 +++++----
 po/zh_TW/skanlite.po                               |  225 ++++----
 src/CMakeLists.txt                                 |   11 +
 COPYING => src/COPYING                             |    0
 ImageViewer.cpp => src/ImageViewer.cpp             |    0
 ImageViewer.h => src/ImageViewer.h                 |    0
 KSaneImageSaver.cpp => src/KSaneImageSaver.cpp     |    3 +-
 KSaneImageSaver.h => src/KSaneImageSaver.h         |    0
 Messages.sh => src/Messages.sh                     |    0
 SaveLocation.cpp => src/SaveLocation.cpp           |    0
 SaveLocation.h => src/SaveLocation.h               |    2 +-
 SaveLocation.ui => src/SaveLocation.ui             |    0
 TODO => src/TODO                                   |    0
 main.cpp => src/main.cpp                           |    0
 settings.ui => src/settings.ui                     |   61 ++-
 skanlite.cpp => src/skanlite.cpp                   |  115 ++++-
 skanlite.desktop => src/skanlite.desktop           |   11 +-
 skanlite.h => src/skanlite.h                       |   23 +-
 103 files changed, 7206 insertions(+), 4957 deletions(-)

-- 
skanlite packaging



More information about the pkg-kde-commits mailing list