[Pkg-owncloud-commits] [owncloud-client] 19/484: Merge remote-tracking branch 'origin/2.0'

[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 39bff056a617b51b8e3c4fb175f3e6963d3946fe
Merge: 128d46e 14c5508
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Sat Sep 5 18:14:30 2015 +0200

    Merge remote-tracking branch 'origin/2.0'

 admin/win/nsi/l10n/Turkish.nsh              |   2 +-
 csync/src/std/c_path.c                      |  23 +-
 csync/tests/encoding_tests/check_encoding.c |  46 ++-
 doc/owncloudcmd.rst                         |   6 +-
 src/gui/accountmanager.cpp                  |   5 +-
 src/gui/application.cpp                     |   2 +-
 src/gui/folder.cpp                          |   4 +-
 src/gui/folderman.cpp                       |  28 +-
 src/gui/folderman.h                         |  18 +-
 src/gui/folderstatusmodel.cpp               |  43 ++-
 src/gui/folderstatusmodel.h                 |   3 +-
 src/gui/generalsettings.cpp                 |  17 +-
 src/gui/generalsettings.h                   |   1 +
 src/gui/owncloudgui.cpp                     |  54 +--
 src/gui/owncloudgui.h                       |   3 +-
 src/gui/sharedialog.cpp                     |  10 +-
 src/gui/sslerrordialog.cpp                  |   5 +-
 src/gui/sslerrordialog.ui                   |  16 +-
 src/libsync/propagatorjobs.cpp              |  56 ++-
 src/libsync/propagatorjobs.h                |   3 +
 translations/client_ca.ts                   | 365 +++++++++---------
 translations/client_cs.ts                   | 371 ++++++++++---------
 translations/client_de.ts                   | 365 +++++++++---------
 translations/client_el.ts                   | 365 +++++++++---------
 translations/client_en.ts                   | 364 +++++++++---------
 translations/client_es.ts                   | 483 ++++++++++++------------
 translations/client_es_AR.ts                | 365 +++++++++---------
 translations/client_et.ts                   | 365 +++++++++---------
 translations/client_eu.ts                   | 365 +++++++++---------
 translations/client_fa.ts                   | 365 +++++++++---------
 translations/client_fi.ts                   | 373 ++++++++++---------
 translations/client_fr.ts                   | 365 +++++++++---------
 translations/client_gl.ts                   | 365 +++++++++---------
 translations/client_hu.ts                   | 365 +++++++++---------
 translations/client_it.ts                   | 367 ++++++++++---------
 translations/client_ja.ts                   | 365 +++++++++---------
 translations/client_nb_NO.ts                | 365 +++++++++---------
 translations/client_nl.ts                   | 365 +++++++++---------
 translations/client_pl.ts                   | 475 ++++++++++++------------
 translations/client_pt.ts                   | 379 ++++++++++---------
 translations/client_pt_BR.ts                | 365 +++++++++---------
 translations/client_ru.ts                   | 365 +++++++++---------
 translations/client_sk.ts                   | 365 +++++++++---------
 translations/client_sl.ts                   | 365 +++++++++---------
 translations/client_sr.ts                   | 365 +++++++++---------
 translations/client_sv.ts                   | 365 +++++++++---------
 translations/client_th.ts                   | 365 +++++++++---------
 translations/client_tr.ts                   | 550 +++++++++++++++-------------
 translations/client_uk.ts                   | 365 +++++++++---------
 translations/client_zh_CN.ts                | 365 +++++++++---------
 translations/client_zh_TW.ts                | 365 +++++++++---------
 51 files changed, 6418 insertions(+), 5684 deletions(-)


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