[Pkg-owncloud-commits] [owncloud-client] 10/13: Merge tag 'upstream/2.2.0_rc1+dfsg' into experimental

[Sandro Knauß]

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

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

commit f1dbfa9b18230e84b27e8ea5bb1675d1d3fbc9e0
Merge: d181fcb a2a6b57
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue May 10 22:10:47 2016 +0200

    Merge tag 'upstream/2.2.0_rc1+dfsg' into experimental
    
    Upstream version 2.2.0~rc1+dfsg

 .tag                                     |   2 +-
 ChangeLog                                |  23 ++++
 VERSION.cmake                            |   2 +-
 cmake/modules/NSIS.template.in           |   1 -
 shell_integration/dolphin/CMakeLists.txt |   2 +-
 shell_integration/nautilus/syncstate.py  |  14 +-
 src/gui/accountstate.cpp                 |   8 +-
 src/gui/accountstate.h                   |   4 +-
 src/gui/folder.cpp                       |   7 +-
 src/gui/folder.h                         |   3 +-
 src/gui/folderman.cpp                    |  17 ++-
 src/gui/folderman.h                      |   1 +
 src/gui/socketapi.cpp                    |  53 +++++---
 src/gui/socketapi.h                      |   1 +
 src/libsync/owncloudpropagator.h         |   5 +
 src/libsync/syncengine.cpp               |   2 +-
 src/libsync/syncfilestatustracker.cpp    | 135 ++++++++-----------
 src/libsync/syncfilestatustracker.h      |   9 +-
 test/testexcludedfiles.cpp               |  21 +--
 test/testutility.cpp                     |   4 +-
 translations/client_ca.ts                | 196 ++++++++++++++--------------
 translations/client_cs.ts                | 144 ++++++++++-----------
 translations/client_de.ts                | 144 ++++++++++-----------
 translations/client_el.ts                | 144 ++++++++++-----------
 translations/client_en.ts                | 144 ++++++++++-----------
 translations/client_es.ts                | 156 +++++++++++-----------
 translations/client_es_AR.ts             | 144 ++++++++++-----------
 translations/client_et.ts                | 144 ++++++++++-----------
 translations/client_eu.ts                | 144 ++++++++++-----------
 translations/client_fa.ts                | 144 ++++++++++-----------
 translations/client_fi.ts                | 144 ++++++++++-----------
 translations/client_fr.ts                | 174 ++++++++++++-------------
 translations/client_gl.ts                | 144 ++++++++++-----------
 translations/client_hu.ts                | 144 ++++++++++-----------
 translations/client_it.ts                | 144 ++++++++++-----------
 translations/client_ja.ts                | 214 +++++++++++++++----------------
 translations/client_nb_NO.ts             | 144 ++++++++++-----------
 translations/client_nl.ts                | 166 ++++++++++++------------
 translations/client_pl.ts                | 168 ++++++++++++------------
 translations/client_pt.ts                | 144 ++++++++++-----------
 translations/client_pt_BR.ts             | 144 ++++++++++-----------
 translations/client_ru.ts                | 144 ++++++++++-----------
 translations/client_sk.ts                | 144 ++++++++++-----------
 translations/client_sl.ts                | 144 ++++++++++-----------
 translations/client_sr.ts                | 144 ++++++++++-----------
 translations/client_sv.ts                | 144 ++++++++++-----------
 translations/client_th.ts                | 146 ++++++++++-----------
 translations/client_tr.ts                | 144 ++++++++++-----------
 translations/client_uk.ts                | 144 ++++++++++-----------
 translations/client_zh_CN.ts             | 144 ++++++++++-----------
 translations/client_zh_TW.ts             | 144 ++++++++++-----------
 51 files changed, 2512 insertions(+), 2478 deletions(-)

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