[Pkg-owncloud-commits] [owncloud-client] 136/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 e135d4cccffc796ec05c0214a85555b0def11ee8
Merge: 67f7892 d142c55
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jun 10 13:42:02 2015 +0200

    Merge remote-tracking branch 'origin/1.8'

 ChangeLog                           |  35 ++++++-----
 admin/win/nsi/l10n/Thai.nsh         |  46 ++++++++++++++
 admin/win/nsi/l10n/languages.nsh    |   1 +
 csync/src/csync_update.c            |   7 ++-
 src/gui/accountstate.cpp            |   5 +-
 src/gui/owncloudsetupwizard.cpp     |   3 +-
 src/libsync/connectionvalidator.cpp |   2 +-
 src/libsync/networkjobs.cpp         |  24 +++++++
 src/libsync/networkjobs.h           |  11 ++++
 src/libsync/propagateupload.cpp     |   7 +--
 src/libsync/syncengine.cpp          |   2 +-
 translations/client_ca.ts           |  60 +++++++++---------
 translations/client_cs.ts           |  58 ++++++++---------
 translations/client_de.ts           |  58 ++++++++---------
 translations/client_el.ts           |  58 ++++++++---------
 translations/client_en.ts           |  58 ++++++++---------
 translations/client_es.ts           |  58 ++++++++---------
 translations/client_es_AR.ts        |  58 ++++++++---------
 translations/client_et.ts           |  58 ++++++++---------
 translations/client_eu.ts           |  58 ++++++++---------
 translations/client_fa.ts           |  58 ++++++++---------
 translations/client_fi.ts           |  58 ++++++++---------
 translations/client_fr.ts           |  62 +++++++++---------
 translations/client_gl.ts           |  58 ++++++++---------
 translations/client_hu.ts           |  58 ++++++++---------
 translations/client_it.ts           |  58 ++++++++---------
 translations/client_ja.ts           |  58 ++++++++---------
 translations/client_nb_NO.ts        |  58 ++++++++---------
 translations/client_nl.ts           |  58 ++++++++---------
 translations/client_pl.ts           |  58 ++++++++---------
 translations/client_pt.ts           |  58 ++++++++---------
 translations/client_pt_BR.ts        |  58 ++++++++---------
 translations/client_ru.ts           |  72 ++++++++++-----------
 translations/client_sk.ts           |  58 ++++++++---------
 translations/client_sl.ts           |  58 ++++++++---------
 translations/client_sr.ts           |  58 ++++++++---------
 translations/client_sv.ts           |  58 ++++++++---------
 translations/client_th.ts           |  88 +++++++++++++-------------
 translations/client_tr.ts           | 122 ++++++++++++++++++------------------
 translations/client_uk.ts           |  58 ++++++++---------
 translations/client_zh_CN.ts        |  58 ++++++++---------
 translations/client_zh_TW.ts        |  58 ++++++++---------
 42 files changed, 1074 insertions(+), 981 deletions(-)

diff --cc src/libsync/syncengine.cpp
index 208c381,ebeb734..7d84541
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@@ -74,8 -73,9 +74,8 @@@ SyncEngine::SyncEngine(AccountPtr accou
  {
      qRegisterMetaType<SyncFileItem>("SyncFileItem");
      qRegisterMetaType<SyncFileItem::Status>("SyncFileItem::Status");
 -    qRegisterMetaType<Progress::Info>("Progress::Info");
  
-     _thread.setObjectName("CSync_Neon_Thread");
+     _thread.setObjectName("SyncEngine_Thread");
      _thread.start();
  }
  

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