[Pkg-owncloud-commits] [owncloud-client] 78/83: Merge tag 'upstream/1.6.0+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 d2bdfa83affd78a518fb5985525ccd3b851a145a
Merge: 0140794 1b83fb0
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat May 31 12:22:04 2014 +0200

    Merge tag 'upstream/1.6.0+dfsg'
    
    Upstream version 1.6.0+dfsg
    
    # gpg: Unterschrift vom Sa 31 Mai 2014 12:21:57 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                               |   2 +-
 ChangeLog                                          |   3 +-
 VERSION.cmake                                      |   2 +-
 csync/src/csync.c                                  |   2 +-
 csync/src/csync_owncloud.c                         |  54 ++--
 csync/src/csync_owncloud.h                         |   2 +-
 csync/src/csync_update.c                           |   3 +-
 src/3rdparty/qtlockedfile/README.txt               |   2 +-
 src/3rdparty/qtlockedfile/qtlockedfile.cpp         |  41 ++-
 src/3rdparty/qtlockedfile/qtlockedfile.h           |  41 ++-
 src/3rdparty/qtlockedfile/qtlockedfile.pri         |  11 +
 src/3rdparty/qtlockedfile/qtlockedfile_unix.cpp    |  42 +--
 src/3rdparty/qtlockedfile/qtlockedfile_win.cpp     |  44 +--
 src/3rdparty/qtsingleapplication/README.txt        |   2 +-
 src/3rdparty/qtsingleapplication/qtlocalpeer.cpp   |  82 +++---
 src/3rdparty/qtsingleapplication/qtlocalpeer.h     |  53 ++--
 .../qtsingleapplication/qtsingleapplication.cpp    | 202 +++++++------
 .../qtsingleapplication/qtsingleapplication.h      |  80 +++--
 .../qtsingleapplication/qtsingleapplication.pri    |  15 +
 .../qtsinglecoreapplication.cpp                    |  49 +--
 .../qtsingleapplication/qtsinglecoreapplication.h  |  45 +--
 .../qtsinglecoreapplication.pri                    |  14 +
 src/creds/shibboleth/shibbolethwebview.cpp         |   9 +-
 src/creds/shibboleth/shibbolethwebview.h           |   1 -
 src/creds/shibbolethcredentials.cpp                |  25 +-
 src/creds/shibbolethcredentials.h                  |   3 +-
 src/mirall/account.cpp                             |   1 +
 src/mirall/accountsettings.cpp                     |  19 +-
 src/mirall/application.cpp                         |  12 +-
 src/mirall/application.h                           |   6 +-
 src/mirall/cookiejar.cpp                           |  10 +-
 src/mirall/cookiejar.h                             |   5 +-
 src/mirall/folder.cpp                              |  23 ++
 src/mirall/folder.h                                |   2 +
 src/mirall/folderman.cpp                           |  22 +-
 src/mirall/folderman.h                             |   9 +-
 src/mirall/folderwizard.cpp                        |   2 +-
 src/mirall/logger.cpp                              |  33 +--
 src/mirall/logger.h                                |   8 +-
 src/mirall/mirallconfigfile.cpp                    |   7 +
 src/mirall/mirallconfigfile.h                      |   2 +
 src/mirall/networkjobs.h                           |   2 +-
 src/mirall/owncloudpropagator.cpp                  |  80 ++++-
 src/mirall/owncloudpropagator.h                    |  14 +-
 src/mirall/propagator_legacy.cpp                   |   7 +
 src/mirall/propagator_qnam.cpp                     |  12 +-
 src/mirall/propagatorjobs.cpp                      |  42 ++-
 src/mirall/propagatorjobs.h                        |   1 +
 src/mirall/settingsdialogmac.cpp                   |   4 -
 src/mirall/sslbutton.cpp                           |   2 +-
 src/mirall/syncengine.cpp                          |  43 +--
 src/mirall/syncengine.h                            |   5 +-
 src/mirall/syncjournaldb.cpp                       |  10 +-
 src/mirall/utility.cpp                             |  26 +-
 src/mirall/utility.h                               |   6 +
 src/mirall/utility_unix.cpp                        |   2 +-
 src/owncloudcmd/owncloudcmd.cpp                    |   1 -
 src/wizard/owncloudshibbolethcredspage.cpp         |  14 +-
 translations/mirall_ca.ts                          | 205 +++++++------
 translations/mirall_cs.ts                          | 205 +++++++------
 translations/mirall_de.ts                          | 209 +++++++------
 translations/mirall_el.ts                          | 205 +++++++------
 translations/mirall_en.ts                          | 201 ++++++++-----
 translations/mirall_es.ts                          | 203 ++++++++-----
 translations/mirall_es_AR.ts                       | 203 ++++++++-----
 translations/mirall_et.ts                          | 205 +++++++------
 translations/mirall_eu.ts                          | 201 ++++++++-----
 translations/mirall_fa.ts                          | 201 ++++++++-----
 translations/mirall_fi.ts                          | 205 +++++++------
 translations/mirall_fr.ts                          | 207 +++++++------
 translations/mirall_gl.ts                          | 203 ++++++++-----
 translations/mirall_hu.ts                          | 201 ++++++++-----
 translations/mirall_it.ts                          | 203 ++++++++-----
 translations/mirall_ja.ts                          | 205 +++++++------
 translations/mirall_nl.ts                          | 201 ++++++++-----
 translations/mirall_pl.ts                          | 203 ++++++++-----
 translations/mirall_pt.ts                          | 203 ++++++++-----
 translations/mirall_pt_BR.ts                       | 203 ++++++++-----
 translations/mirall_ru.ts                          | 203 ++++++++-----
 translations/mirall_sk.ts                          | 205 +++++++------
 translations/mirall_sl.ts                          | 205 +++++++------
 translations/mirall_sv.ts                          | 211 +++++++------
 translations/mirall_th.ts                          | 201 ++++++++-----
 translations/mirall_tr.ts                          | 328 ++++++++++++---------
 translations/mirall_uk.ts                          | 201 ++++++++-----
 translations/mirall_zh_CN.ts                       | 201 ++++++++-----
 translations/mirall_zh_TW.ts                       | 201 ++++++++-----
 87 files changed, 4352 insertions(+), 2937 deletions(-)

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