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

[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 ddfb7f3b7a8d92d78a4045579613a4a25fbbe127
Merge: 68bf22f 520e2eb
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Apr 27 12:20:11 2015 +0200

    Merge remote-tracking branch 'origin/1.8'

 ChangeLog                         |  46 ++++++-
 admin/osx/create_mac_pkg.sh.cmake |   2 +-
 admin/win/nsi/l10n/Galician.nsh   |   4 +-
 doc/advancedusage.rst             |   1 +
 doc/autoupdate.rst                |  10 +-
 doc/installing.rst                |   3 +
 doc/introduction.rst              |   3 +
 doc/options.rst                   |  21 ++--
 doc/owncloudcmd.rst               |  66 ++++------
 src/gui/folder.cpp                |   1 +
 src/gui/owncloudsetupwizard.cpp   |  59 ++++-----
 src/gui/owncloudsetupwizard.h     |   1 -
 src/gui/sharedialog.h             |   1 -
 src/libsync/discoveryphase.cpp    |  16 +--
 src/libsync/propagatedownload.cpp |   2 +-
 translations/client_ca.ts         | 107 ++++++++--------
 translations/client_cs.ts         | 137 ++++++++++-----------
 translations/client_de.ts         |  78 ++++++------
 translations/client_el.ts         |  62 +++++-----
 translations/client_en.ts         |  62 +++++-----
 translations/client_es.ts         |  68 +++++------
 translations/client_es_AR.ts      |  62 +++++-----
 translations/client_et.ts         |  62 +++++-----
 translations/client_eu.ts         |  62 +++++-----
 translations/client_fa.ts         |  62 +++++-----
 translations/client_fi.ts         |  62 +++++-----
 translations/client_fr.ts         | 112 ++++++++---------
 translations/client_gl.ts         |  64 +++++-----
 translations/client_hu.ts         |  62 +++++-----
 translations/client_it.ts         |  62 +++++-----
 translations/client_ja.ts         |  62 +++++-----
 translations/client_nl.ts         |  62 +++++-----
 translations/client_pl.ts         |  62 +++++-----
 translations/client_pt.ts         |  62 +++++-----
 translations/client_pt_BR.ts      |  62 +++++-----
 translations/client_ru.ts         |  72 +++++------
 translations/client_sk.ts         |  62 +++++-----
 translations/client_sl.ts         |  62 +++++-----
 translations/client_sr.ts         | 250 +++++++++++++++++++-------------------
 translations/client_sv.ts         |  62 +++++-----
 translations/client_th.ts         |  62 +++++-----
 translations/client_tr.ts         |  62 +++++-----
 translations/client_uk.ts         |  64 +++++-----
 translations/client_zh_CN.ts      | 130 ++++++++++----------
 translations/client_zh_TW.ts      |  62 +++++-----
 45 files changed, 1297 insertions(+), 1261 deletions(-)

diff --cc src/libsync/propagatedownload.cpp
index f251da3,6aa94ee..bd82f0e
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@@ -337,8 -337,9 +337,9 @@@ void PropagateDownloadFileQNAM::start(
  
      quint64 startSize = _tmpFile.size();
      if (startSize > 0) {
 -        if (startSize == _item._size) {
 +        if (startSize == _item->_size) {
              qDebug() << "File is already complete, no need to download";
+             _tmpFile.close();
              downloadFinished();
              return;
          }
@@@ -489,8 -490,7 +490,7 @@@ QString makeConflictFileName(const QStr
  
  void PropagateDownloadFileQNAM::downloadFinished()
  {
- 
 -    QString fn = _propagator->getFilePath(_item._file);
 +    QString fn = _propagator->getFilePath(_item->_file);
  
      // In case of file name clash, report an error
      // This can happen if another parallel download saved a clashing file.

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