[Pkg-owncloud-commits] [owncloud-client] 20/26: Merge tag 'upstream/1.5.0_beta2+dfsg'

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 7bd98bb9cdeac2f8db4f4442b0962f43a4e84456
Merge: 0534973 61e5d2a
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sun Dec 8 22:08:18 2013 +0100

    Merge tag 'upstream/1.5.0_beta2+dfsg'
    
    Upstream version 1.5.0~beta2+dfsg
    
    # gpg: Unterschrift vom So 08 Dez 2013 22:08:17 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                 |   2 +-
 VERSION.cmake                        |   2 +-
 cmake/modules/NSIS.template.in       |   2 -
 doc/building.rst                     |   2 +-
 src/CMakeLists.txt                   |   4 +-
 src/main.cpp                         |   2 +-
 src/mirall/accountsettings.cpp       |   4 +-
 src/mirall/application.cpp           |  11 +-
 src/mirall/csyncthread.cpp           |  51 ++--
 src/mirall/folder.cpp                |  10 +
 src/mirall/folder.h                  |   3 +
 src/mirall/folderman.cpp             |   5 +-
 src/mirall/owncloudgui.cpp           |  16 +-
 src/mirall/owncloudgui.h             |   2 +
 src/mirall/owncloudpropagator.cpp    |  31 ++-
 src/mirall/owncloudsetuppage_ng.ui   | 478 -----------------------------------
 src/mirall/protocolwidget.cpp        |  57 ++++-
 src/mirall/protocolwidget.h          |  10 +-
 src/mirall/settingsdialog.cpp        |   7 +
 src/mirall/settingsdialog.h          |   1 +
 src/mirall/syncjournaldb.cpp         |  36 ++-
 src/mirall/syncjournaldb.h           |   3 +
 src/mirall/syncjournalfilerecord.cpp |  10 +-
 src/mirall/syncresult.cpp            |   2 +-
 src/mirall/theme.cpp                 |   2 +-
 src/mirall/updatedetector.cpp        |   2 +-
 src/mirall/utility.cpp               |   2 +-
 translations/mirall_ca.ts            | 118 +++++----
 translations/mirall_cs.ts            | 152 +++++------
 translations/mirall_de.ts            | 126 ++++-----
 translations/mirall_el.ts            | 118 +++++----
 translations/mirall_en.ts            | 116 +++++----
 translations/mirall_es.ts            | 174 +++++++------
 translations/mirall_es_AR.ts         | 118 +++++----
 translations/mirall_et.ts            | 136 +++++-----
 translations/mirall_eu.ts            | 118 +++++----
 translations/mirall_fa.ts            | 118 +++++----
 translations/mirall_fi.ts            | 190 +++++++-------
 translations/mirall_fr.ts            | 167 ++++++------
 translations/mirall_gl.ts            | 126 ++++-----
 translations/mirall_hu.ts            | 118 +++++----
 translations/mirall_it.ts            | 120 +++++----
 translations/mirall_ja.ts            | 202 ++++++++-------
 translations/mirall_nl.ts            | 185 +++++++-------
 translations/mirall_pl.ts            | 118 +++++----
 translations/mirall_pt.ts            | 118 +++++----
 translations/mirall_pt_BR.ts         | 126 ++++-----
 translations/mirall_ru.ts            | 164 ++++++------
 translations/mirall_sk.ts            | 211 ++++++++--------
 translations/mirall_sl.ts            | 223 ++++++++--------
 translations/mirall_sv.ts            | 118 +++++----
 translations/mirall_th.ts            | 116 +++++----
 translations/mirall_uk.ts            | 118 +++++----
 translations/mirall_zh_CN.ts         | 118 +++++----
 translations/mirall_zh_TW.ts         | 118 +++++----
 55 files changed, 2320 insertions(+), 2387 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git