[Pkg-owncloud-commits] [owncloud-client] 02/06: Merge tag 'upstream/1.7.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 455aca94264a8fdcf02147aa3430ad8ffbc013c9
Merge: 11b6f81 679938e
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Dec 20 15:37:16 2014 +0100

    Merge tag 'upstream/1.7.1+dfsg'
    
    Upstream version 1.7.1+dfsg
    
    # gpg: Unterschrift vom Sa 20 Dez 2014 15:37:06 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                    |   2 +-
 CMakeLists.txt                          |   6 +
 ChangeLog                               |  30 +-
 OWNCLOUD.cmake                          |   4 +
 README.md                               |   2 +-
 VERSION.cmake                           |   2 +-
 cmake/modules/AddAppIconMacro.cmake     |   4 +-
 cmake/modules/NSIS.template.in          |  18 +-
 csync/src/csync_reconcile.c             |   4 +
 csync/src/httpbf/src/httpbf.c           |   2 +
 csync/tests/ownCloud/t8.pl              |   7 +-
 doc/autoupdate.rst                      |  36 ++-
 doc/images/icon-error.png               | Bin 0 -> 5027 bytes
 doc/images/icon-information.png         | Bin 0 -> 4220 bytes
 doc/images/icon-offline.png             | Bin 0 -> 3887 bytes
 doc/images/icon-paused.png              | Bin 0 -> 4852 bytes
 doc/images/icon-syncing.png             | Bin 0 -> 5004 bytes
 doc/images/icon.png                     | Bin 1301 -> 4645 bytes
 doc/navigating.rst                      | 242 ++++++++-------
 shell_integration/nautilus/syncstate.py |  69 +++--
 src/creds/shibbolethcredentials.cpp     |  14 +-
 src/creds/shibbolethcredentials.h       |   2 +-
 src/mirall/account.h                    |   2 +-
 src/mirall/accountsettings.cpp          |  21 +-
 src/mirall/application.cpp              |   9 +-
 src/mirall/cookiejar.cpp                |  16 -
 src/mirall/cookiejar.h                  |   8 +-
 src/mirall/folder.cpp                   |  45 ++-
 src/mirall/folder.h                     |   8 +-
 src/mirall/folderman.cpp                | 121 +++++++-
 src/mirall/folderman.h                  |  20 +-
 src/mirall/folderwatcher_win.cpp        | 132 +++++++--
 src/mirall/folderwatcher_win.h          |   2 +
 src/mirall/folderwizard.cpp             |  15 +-
 src/mirall/folderwizardtargetpage.ui    |   2 +-
 src/mirall/networkjobs.cpp              |  12 +-
 src/mirall/owncloudgui.cpp              |  47 +--
 src/mirall/owncloudpropagator.cpp       |  10 +
 src/mirall/owncloudpropagator.h         |  84 +++---
 src/mirall/owncloudsetupwizard.cpp      |  36 ++-
 src/mirall/ownsql.cpp                   |  81 +++++-
 src/mirall/ownsql.h                     |   6 +-
 src/mirall/progressdispatcher.h         |  12 +-
 src/mirall/propagator_qnam.cpp          |  18 +-
 src/mirall/protocolwidget.cpp           |   2 +-
 src/mirall/quotainfo.cpp                |   2 +-
 src/mirall/socketapi.cpp                |  16 +-
 src/mirall/syncengine.cpp               |  21 +-
 src/mirall/syncfileitem.h               |   8 +-
 src/mirall/syncjournaldb.cpp            |  12 +-
 src/mirall/syncjournaldb.h              |  10 +-
 src/mirall/syncjournalfilerecord.h      |   5 +-
 src/mirall/theme.cpp                    |  19 +-
 src/wizard/owncloudsetuppage.cpp        |   8 +-
 src/wizard/owncloudwizardresultpage.cpp |  13 +-
 test/CMakeLists.txt                     |   4 +-
 test/testfolderwatcher.h                |  93 ++++--
 test/testownsql.h                       |   2 +-
 translations/mirall_ca.ts               | 356 +++++++++++-----------
 translations/mirall_cs.ts               | 377 ++++++++++++------------
 translations/mirall_de.ts               | 376 ++++++++++++------------
 translations/mirall_el.ts               | 366 ++++++++++++-----------
 translations/mirall_en.ts               | 349 +++++++++++-----------
 translations/mirall_es.ts               | 368 ++++++++++++-----------
 translations/mirall_es_AR.ts            | 354 +++++++++++-----------
 translations/mirall_et.ts               | 365 ++++++++++++-----------
 translations/mirall_eu.ts               | 358 ++++++++++++-----------
 translations/mirall_fa.ts               | 350 +++++++++++-----------
 translations/mirall_fi.ts               | 378 ++++++++++++------------
 translations/mirall_fr.ts               | 413 +++++++++++++-------------
 translations/mirall_gl.ts               | 414 +++++++++++++-------------
 translations/mirall_hu.ts               | 352 +++++++++++-----------
 translations/mirall_it.ts               | 364 ++++++++++++-----------
 translations/mirall_ja.ts               | 367 ++++++++++++-----------
 translations/mirall_nl.ts               | 391 +++++++++++++------------
 translations/mirall_pl.ts               | 358 ++++++++++++-----------
 translations/mirall_pt.ts               | 502 +++++++++++++++++---------------
 translations/mirall_pt_BR.ts            | 363 ++++++++++++-----------
 translations/mirall_ru.ts               | 378 ++++++++++++------------
 translations/mirall_sk.ts               | 358 ++++++++++++-----------
 translations/mirall_sl.ts               | 378 ++++++++++++------------
 translations/mirall_sv.ts               | 356 +++++++++++-----------
 translations/mirall_th.ts               | 348 +++++++++++-----------
 translations/mirall_tr.ts               | 376 ++++++++++++------------
 translations/mirall_uk.ts               | 376 +++++++++++++-----------
 translations/mirall_zh_CN.ts            | 350 +++++++++++-----------
 translations/mirall_zh_TW.ts            | 350 +++++++++++-----------
 87 files changed, 6555 insertions(+), 5602 deletions(-)

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