[Pkg-owncloud-commits] [owncloud-client] 78/498: Merge remote-tracking branch 'origin/1.8' into 1.9

[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 a36df4aa4b1e18c83bb4a8f96a51ff4ed219845e
Merge: f2004da af5a706
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Tue May 12 09:57:22 2015 +0200

    Merge remote-tracking branch 'origin/1.8' into 1.9

 binary                                             |   2 +-
 csync/src/csync_exclude.c                          |   1 +
 csync/src/csync_log.h                              |   2 +-
 csync/src/httpbf/src/httpbf.c                      |   2 +-
 csync/tests/csync_tests/check_csync_log.c          |   2 +-
 .../MacOSX/OwnCloudFinder/ContentManager.h         |   4 +-
 .../MacOSX/OwnCloudFinder/ContentManager.m         |  85 +++-----
 .../MacOSX/OwnCloudFinder/RequestManager.h         |   3 +-
 .../MacOSX/OwnCloudFinder/RequestManager.m         |  22 ++-
 shell_integration/MacOSX/deploy.sh                 |   7 +-
 .../windows/OCUtil/RemotePathChecker.cpp           |  44 +++--
 .../windows/OCUtil/RemotePathChecker.h             |   1 +
 src/gui/accountsettings.cpp                        |   6 +-
 src/gui/accountstate.cpp                           |  12 +-
 src/gui/accountstate.h                             |   8 +-
 src/gui/application.cpp                            |  11 +-
 src/gui/owncloudgui.cpp                            |   2 +-
 src/gui/owncloudsetupwizard.cpp                    |   4 +
 src/gui/protocolwidget.cpp                         |   2 +-
 src/gui/sharedialog.cpp                            | 107 +++++-----
 src/gui/sharedialog.h                              |  15 +-
 src/gui/updater/sparkleupdater_mac.mm              |  22 ++-
 src/gui/wizard/owncloudsetuppage.cpp               |   3 +-
 src/libsync/account.cpp                            |   5 +
 src/libsync/account.h                              |   5 +
 src/libsync/bandwidthmanager.cpp                   |  58 +++---
 src/libsync/connectionvalidator.cpp                |  13 +-
 src/libsync/connectionvalidator.h                  |   2 +-
 src/libsync/filesystem.cpp                         |  46 ++++-
 src/libsync/filesystem.h                           |  37 +++-
 src/libsync/networkjobs.cpp                        |  14 +-
 src/libsync/networkjobs.h                          |   2 +-
 src/libsync/propagatedownload.cpp                  |  64 ++++--
 src/libsync/propagateupload.cpp                    |  46 ++++-
 src/libsync/propagateupload.h                      |  15 ++
 src/libsync/propagator_legacy.cpp                  |   6 +-
 test/testowncloudpropagator.h                      |  44 +++++
 test/testxmlparse.h                                | 210 +++++++++++++++++++-
 translations/client_ca.ts                          | 174 +++++++++--------
 translations/client_cs.ts                          | 174 +++++++++--------
 translations/client_de.ts                          | 184 ++++++++++--------
 translations/client_el.ts                          | 174 +++++++++--------
 translations/client_en.ts                          | 174 +++++++++--------
 translations/client_es.ts                          | 174 +++++++++--------
 translations/client_es_AR.ts                       | 174 +++++++++--------
 translations/client_et.ts                          | 174 +++++++++--------
 translations/client_eu.ts                          | 174 +++++++++--------
 translations/client_fa.ts                          | 174 +++++++++--------
 translations/client_fi.ts                          | 216 +++++++++++----------
 translations/client_fr.ts                          | 174 +++++++++--------
 translations/client_gl.ts                          | 174 +++++++++--------
 translations/client_hu.ts                          | 174 +++++++++--------
 translations/client_it.ts                          | 174 +++++++++--------
 translations/client_ja.ts                          | 174 +++++++++--------
 translations/client_nl.ts                          | 174 +++++++++--------
 translations/client_pl.ts                          | 174 +++++++++--------
 translations/client_pt.ts                          | 174 +++++++++--------
 translations/client_pt_BR.ts                       | 174 +++++++++--------
 translations/client_ru.ts                          | 174 +++++++++--------
 translations/client_sk.ts                          | 174 +++++++++--------
 translations/client_sl.ts                          | 174 +++++++++--------
 translations/client_sr.ts                          | 174 +++++++++--------
 translations/client_sv.ts                          | 174 +++++++++--------
 translations/client_th.ts                          | 174 +++++++++--------
 translations/client_tr.ts                          | 174 +++++++++--------
 translations/client_uk.ts                          | 174 +++++++++--------
 translations/client_zh_CN.ts                       | 174 +++++++++--------
 translations/client_zh_TW.ts                       | 174 +++++++++--------
 68 files changed, 3597 insertions(+), 2609 deletions(-)


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