[Pkg-owncloud-commits] [owncloud-client] 39/47: Merge tag 'upstream/1.5.1+dfsg'

[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 d5830e5743653e37cff9c570fdb9cf8fe3b34b2f
Merge: 1f631e6 cf600e0
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Feb 17 18:20:11 2014 +0100

    Merge tag 'upstream/1.5.1+dfsg'
    
    Upstream version 1.5.1+dfsg
    
    # gpg: Unterschrift vom Mo 17 Feb 2014 18:19:59 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                       |   2 +-
 ChangeLog                                  |  35 ++++
 OWNCLOUD.cmake                             |   2 +-
 VERSION.cmake                              |   2 +-
 cmake/modules/MacOSXBundleInfo.plist.in    |   4 +
 cmake/modules/NSIS.template.in             |  56 +++---
 config.h.in                                |   2 +
 csync/src/CMakeLists.txt                   |   1 -
 csync/src/csync.c                          |  47 +----
 csync/src/csync.h                          |   7 +-
 csync/src/csync_exclude.c                  |   5 -
 csync/src/csync_lock.c                     | 236 -------------------------
 csync/src/csync_lock.h                     |  66 -------
 csync/src/csync_reconcile.c                |  35 ++--
 csync/src/csync_update.c                   |   3 +-
 csync/tests/CMakeLists.txt                 |   4 -
 csync/tests/csync_tests/check_csync_lock.c |  94 ----------
 csync/tests/ownCloud/t3.pl                 |  12 ++
 doc/accountsetup.rst                       |  28 +--
 doc/architecture.rst                       |   2 +-
 doc/autoupdate.rst                         |  81 +++++++++
 doc/images/folderwizard_local.png          | Bin 0 -> 73614 bytes
 doc/images/folderwizard_remote.png         | Bin 0 -> 55791 bytes
 doc/images/icon.png                        | Bin 1290 -> 1301 bytes
 doc/images/ignored_files_editor.png        | Bin 49080 -> 107117 bytes
 doc/images/menu.png                        | Bin 18110 -> 40563 bytes
 doc/images/settings_activity.png           | Bin 0 -> 336801 bytes
 doc/images/settings_general.png            | Bin 50908 -> 97877 bytes
 doc/images/settings_network.png            | Bin 60526 -> 113591 bytes
 doc/images/sync_protocol.png               | Bin 171942 -> 0 bytes
 doc/images/wizard_targetfolder.png         | Bin 39694 -> 92661 bytes
 doc/images/wizard_url.png                  | Bin 40236 -> 74341 bytes
 doc/images/wizard_user.png                 | Bin 38342 -> 75305 bytes
 doc/index.rst                              |   1 +
 doc/introduction.rst                       |  25 ++-
 doc/options.rst                            |   8 +-
 doc/visualtour.rst                         | 175 +++++++++++--------
 src/CMakeLists.txt                         |   7 +
 src/creds/abstractcredentials.cpp          |  42 +++++
 src/creds/abstractcredentials.h            |   3 +-
 src/creds/dummycredentials.cpp             |   6 -
 src/creds/dummycredentials.h               |   1 -
 src/creds/httpcredentials.cpp              |  34 ----
 src/creds/httpcredentials.h                |   2 -
 src/creds/shibboleth/shibbolethwebview.cpp |   3 +-
 src/creds/shibboleth/shibbolethwebview.h   |   4 +-
 src/creds/shibbolethcredentials.cpp        |  80 +++++++--
 src/creds/shibbolethcredentials.h          |   9 +-
 src/mirall/account.cpp                     |  10 +-
 src/mirall/account.h                       |   2 +
 src/mirall/application.cpp                 |  10 +-
 src/mirall/folder.cpp                      |   5 -
 src/mirall/folder.h                        |   3 -
 src/mirall/mirallaccessmanager.cpp         |   7 +
 src/mirall/mirallconfigfile.cpp            |  58 ++++++-
 src/mirall/mirallconfigfile.h              |   2 +
 src/mirall/networkjobs.cpp                 |  35 +++-
 src/mirall/networkjobs.h                   |  14 ++
 src/mirall/owncloudpropagator.cpp          |  54 ++++--
 src/mirall/owncloudpropagator.h            |   6 +-
 src/mirall/sslbutton.cpp                   |   7 +-
 src/mirall/syncjournaldb.cpp               |  19 ++
 src/mirall/syncjournaldb.h                 |   1 +
 src/mirall/theme.cpp                       |   8 +-
 src/mirall/utility.cpp                     |   7 +-
 src/updater/ocupdater.cpp                  |  43 +----
 src/updater/ocupdater.h                    |   2 -
 src/updater/sparkleupdater_mac.mm          |  47 +++++
 src/updater/updater.cpp                    |  60 ++++++-
 src/updater/updater.h                      |   8 +-
 src/wizard/owncloudshibbolethcredspage.cpp |   6 +-
 src/wizard/owncloudshibbolethcredspage.h   |   3 +-
 translations/mirall_ca.ts                  | 208 +++++++++++-----------
 translations/mirall_cs.ts                  | 119 +++++++------
 translations/mirall_de.ts                  | 121 +++++++------
 translations/mirall_el.ts                  | 119 +++++++------
 translations/mirall_en.ts                  | 119 +++++++------
 translations/mirall_es.ts                  | 121 +++++++------
 translations/mirall_es_AR.ts               | 119 +++++++------
 translations/mirall_et.ts                  | 119 +++++++------
 translations/mirall_eu.ts                  | 119 +++++++------
 translations/mirall_fa.ts                  | 119 +++++++------
 translations/mirall_fi.ts                  | 119 +++++++------
 translations/mirall_fr.ts                  | 119 +++++++------
 translations/mirall_gl.ts                  | 121 +++++++------
 translations/mirall_hu.ts                  | 119 +++++++------
 translations/mirall_it.ts                  | 127 ++++++++------
 translations/mirall_ja.ts                  | 267 +++++++++++++++--------------
 translations/mirall_nl.ts                  | 119 +++++++------
 translations/mirall_pl.ts                  | 119 +++++++------
 translations/mirall_pt.ts                  | 119 +++++++------
 translations/mirall_pt_BR.ts               | 121 +++++++------
 translations/mirall_ru.ts                  | 119 +++++++------
 translations/mirall_sk.ts                  | 119 +++++++------
 translations/mirall_sl.ts                  | 119 +++++++------
 translations/mirall_sv.ts                  | 119 +++++++------
 translations/mirall_th.ts                  | 119 +++++++------
 translations/mirall_uk.ts                  | 119 +++++++------
 translations/mirall_zh_CN.ts               | 119 +++++++------
 translations/mirall_zh_TW.ts               | 119 +++++++------
 translations/pofiles/tr.po                 | 121 +++++++------
 101 files changed, 2821 insertions(+), 2426 deletions(-)

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