[Pkg-owncloud-commits] [owncloud-client] 10/470: Merge remote-tracking branch 'origin/2.1'

[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 ae806e821486ace5d7032bbae99ab19c580838a4
Merge: e67bb1c 8b5474f
Author: Christian Kamm <mail at ckamm.de>
Date:   Thu Dec 10 11:07:20 2015 +0100

    Merge remote-tracking branch 'origin/2.1'

 ChangeLog                                          |  71 ++-
 admin/win/nsi/l10n/German.nsh                      |   2 +-
 cmake/modules/DefineInstallationPaths.cmake        |   5 -
 csync/ConfigureChecks.cmake                        |   1 -
 csync/config_csync.h.cmake                         |   1 -
 doc/advancedusage.rst                              |   8 +-
 doc/autoupdate.rst                                 |  20 +-
 doc/images/client-7.png                            | Bin 5629 -> 4439 bytes
 doc/images/client-8.png                            | Bin 0 -> 83622 bytes
 doc/images/client-9.png                            | Bin 0 -> 53065 bytes
 doc/images/client6.png                             | Bin 53600 -> 50517 bytes
 doc/images/mac-share.png                           | Bin 0 -> 59496 bytes
 doc/images/menu.png                                | Bin 4969 -> 101298 bytes
 doc/images/share-1.png                             | Bin 0 -> 18267 bytes
 doc/images/share-2.png                             | Bin 0 -> 24573 bytes
 doc/introduction.rst                               |  36 +-
 doc/navigating.rst                                 | 177 ++++----
 doc/ocdoc                                          |   2 +-
 shell_integration/CMakeLists.txt                   |   4 +-
 .../dolphin/ownclouddolphinactionplugin.cpp        |   1 -
 .../dolphin/ownclouddolphinoverlayplugin.cpp       |   2 +-
 src/gui/accountsettings.cpp                        |  48 +-
 src/gui/accountstate.cpp                           |  12 +-
 src/gui/accountstate.h                             |   8 +-
 src/gui/activitywidget.cpp                         |  20 +-
 src/gui/application.cpp                            |  46 +-
 src/gui/creds/shibbolethcredentials.cpp            |   5 +
 src/gui/creds/shibbolethcredentials.h              |   1 +
 src/gui/folder.cpp                                 |  27 +-
 src/gui/folder.h                                   |   6 +-
 src/gui/folderman.cpp                              |   6 +-
 src/gui/folderman.h                                |   2 +-
 src/gui/folderstatusmodel.cpp                      |  13 +
 src/gui/owncloudgui.cpp                            |  16 +-
 src/gui/protocolwidget.cpp                         |  30 +-
 src/gui/settingsdialog.cpp                         |  18 +-
 src/gui/settingsdialog.h                           |   1 -
 src/gui/share.cpp                                  |   5 +
 src/gui/share.h                                    |   5 +
 src/gui/sharee.cpp                                 |  20 +-
 src/gui/sharelinkwidget.cpp                        |  33 +-
 src/gui/sharelinkwidget.h                          |   1 +
 src/gui/sharelinkwidget.ui                         |  60 ++-
 src/gui/shareusergroupwidget.cpp                   |  19 +-
 src/gui/shareusergroupwidget.ui                    |   2 +-
 src/gui/socketapi.cpp                              |  32 +-
 src/gui/wizard/owncloudhttpcredspage.cpp           |   7 +
 src/libsync/capabilities.cpp                       |   8 +-
 src/libsync/checksums.cpp                          |  54 +++
 src/libsync/creds/abstractcredentials.h            |  17 +-
 src/libsync/creds/dummycredentials.h               |   1 +
 src/libsync/creds/httpcredentials.cpp              |   6 +
 src/libsync/creds/httpcredentials.h                |   1 +
 src/libsync/creds/tokencredentials.cpp             |   5 +
 src/libsync/creds/tokencredentials.h               |   1 +
 src/libsync/syncfileitem.h                         |   7 +
 src/libsync/utility.cpp                            |   1 +
 translations/client_ca.ts                          | 278 ++++++------
 translations/client_cs.ts                          | 278 ++++++------
 translations/client_de.ts                          | 294 ++++++-------
 translations/client_el.ts                          | 286 ++++++------
 translations/client_en.ts                          | 276 ++++++------
 translations/client_es.ts                          | 338 +++++++-------
 translations/client_es_AR.ts                       | 278 ++++++------
 translations/client_et.ts                          | 278 ++++++------
 translations/client_eu.ts                          | 278 ++++++------
 translations/client_fa.ts                          | 278 ++++++------
 translations/client_fi.ts                          | 278 ++++++------
 translations/client_fr.ts                          | 278 ++++++------
 translations/client_gl.ts                          | 278 ++++++------
 translations/client_hu.ts                          | 278 ++++++------
 translations/client_it.ts                          | 282 ++++++------
 translations/client_ja.ts                          | 286 ++++++------
 translations/client_nb_NO.ts                       | 278 ++++++------
 translations/client_nl.ts                          | 350 +++++++--------
 translations/client_pl.ts                          | 278 ++++++------
 translations/client_pt.ts                          | 278 ++++++------
 translations/client_pt_BR.ts                       | 284 ++++++------
 translations/client_ru.ts                          | 348 +++++++--------
 translations/client_sk.ts                          | 278 ++++++------
 translations/client_sl.ts                          | 284 ++++++------
 translations/client_sr.ts                          | 278 ++++++------
 translations/client_sv.ts                          | 489 +++++++++++----------
 translations/client_th.ts                          | 298 ++++++-------
 translations/client_tr.ts                          | 288 ++++++------
 translations/client_uk.ts                          | 278 ++++++------
 translations/client_zh_CN.ts                       | 284 ++++++------
 translations/client_zh_TW.ts                       | 278 ++++++------
 88 files changed, 5134 insertions(+), 4853 deletions(-)


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