[Pkg-owncloud-commits] [owncloud-client] 119/121: Merge tag 'upstream/2.2.3_beta1+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 6f0f848ae2679e6be18d32f0760c2d6ca4f31a6e
Merge: 4069c6a edaf282
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu Jul 28 17:18:50 2016 +0200

    Merge tag 'upstream/2.2.3_beta1+dfsg'
    
    Upstream version 2.2.3~beta1+dfsg

 .tag                                           |   2 +-
 ChangeLog                                      |  28 +-
 README.md                                      |   2 +-
 VERSION.cmake                                  |   4 +-
 cmake/modules/DefineCMakeDefaults.cmake        |   2 +-
 cmake/modules/DefineCompilerFlags.cmake        |   2 +-
 cmake/modules/DefineInstallationPaths.cmake    |   2 +-
 cmake/modules/DefinePlatformDefaults.cmake     |   2 +-
 cmake/modules/FindINotify.cmake                |   2 +-
 cmake/modules/FindPackageVersionCheck.cmake    |   2 +-
 cmake/modules/FindPdfLatex.cmake               |   2 +-
 cmake/modules/FindQt5Keychain.cmake            |   2 +-
 cmake/modules/FindQtKeychain.cmake             |   2 +-
 cmake/modules/FindSphinx.cmake                 |   2 +-
 cmake/modules/MacroCopyFile.cmake              |   2 +-
 cmake/modules/QtVersionAbstraction.cmake       |   2 +-
 cmake/modules/UseDoxygen.cmake                 |   2 +-
 cmake/modules/Warnings.cmake                   |   2 +-
 csync/src/csync_statedb.c                      |   4 +-
 csync/src/csync_update.c                       |  18 +-
 csync/src/vio/csync_vio_file_stat.c            |   1 +
 csync/src/vio/csync_vio_local_unix.c           |   2 +-
 csync/src/vio/csync_vio_local_win.c            |  23 +-
 doc/building.rst                               |   8 +-
 mirall.desktop.in                              | 240 +++++++++++-
 src/cmd/cmd.cpp                                |  17 +-
 src/gui/accountmanager.cpp                     |  12 +-
 src/gui/accountsettings.cpp                    |   8 +-
 src/gui/application.cpp                        |  12 +
 src/gui/creds/shibboleth/shibbolethwebview.cpp |  15 +-
 src/gui/folder.cpp                             |  40 +-
 src/gui/folderman.cpp                          |   3 +-
 src/gui/folderwatcher_mac.cpp                  |  16 +-
 src/gui/generalsettings.cpp                    |   8 -
 src/gui/generalsettings.h                      |   1 -
 src/gui/main.cpp                               |   2 +
 src/gui/ocsjob.cpp                             |  23 +-
 src/gui/owncloudgui.cpp                        |  20 +-
 src/gui/protocolwidget.cpp                     |  16 +-
 src/gui/shareusergroupwidget.cpp               |  12 +-
 src/gui/socketapi.cpp                          |   2 +-
 src/libsync/account.cpp                        |  53 +--
 src/libsync/account.h                          |   4 +-
 src/libsync/capabilities.cpp                   |   3 +-
 src/libsync/discoveryphase.cpp                 |   2 +-
 src/libsync/filesystem.cpp                     |  16 +-
 src/libsync/filesystem.h                       |   6 +-
 src/libsync/propagateupload.cpp                |  10 +-
 src/libsync/syncengine.cpp                     |   8 +-
 src/libsync/syncfilestatustracker.cpp          |  17 +-
 src/libsync/syncfilestatustracker.h            |   1 -
 src/libsync/utility.h                          |   4 +-
 translations/client_ca.ts                      | 342 +++++++++---------
 translations/client_cs.ts                      | 260 ++++++-------
 translations/client_de.ts                      | 260 ++++++-------
 translations/client_el.ts                      | 260 ++++++-------
 translations/client_en.ts                      | 260 ++++++-------
 translations/client_es.ts                      | 262 +++++++-------
 translations/client_es_AR.ts                   | 260 ++++++-------
 translations/client_et.ts                      | 260 ++++++-------
 translations/client_eu.ts                      | 260 ++++++-------
 translations/client_fa.ts                      | 260 ++++++-------
 translations/client_fi.ts                      | 260 ++++++-------
 translations/client_fr.ts                      | 260 ++++++-------
 translations/client_gl.ts                      | 260 ++++++-------
 translations/client_hu.ts                      | 260 ++++++-------
 translations/client_it.ts                      | 260 ++++++-------
 translations/client_ja.ts                      | 280 +++++++-------
 translations/client_nb_NO.ts                   | 350 +++++++++---------
 translations/client_nl.ts                      | 272 +++++++-------
 translations/client_pl.ts                      | 300 +++++++--------
 translations/client_pt.ts                      | 482 +++++++++++++------------
 translations/client_pt_BR.ts                   | 263 +++++++-------
 translations/client_ru.ts                      | 262 +++++++-------
 translations/client_sk.ts                      | 260 ++++++-------
 translations/client_sl.ts                      | 344 +++++++++---------
 translations/client_sr.ts                      | 260 ++++++-------
 translations/client_sv.ts                      | 334 ++++++++---------
 translations/client_th.ts                      | 360 +++++++++---------
 translations/client_tr.ts                      | 304 ++++++++--------
 translations/client_uk.ts                      | 266 +++++++-------
 translations/client_zh_CN.ts                   | 280 +++++++-------
 translations/client_zh_TW.ts                   | 260 ++++++-------
 83 files changed, 5033 insertions(+), 4519 deletions(-)

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