[Pkg-owncloud-commits] [owncloud-client] 64/69: Merge tag 'upstream/1.7.0+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 5ec1b7a6f6613ed996e066a9f12e4758f5c119bf
Merge: 8bf4912 61f5669
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Nov 7 20:01:43 2014 +0100

    Merge tag 'upstream/1.7.0+dfsg'
    
    Upstream version 1.7.0+dfsg
    
    # gpg: Unterschrift vom Fr 07 Nov 2014 20:01:31 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                          |   2 +-
 CMakeLists.txt                                |   1 +
 ChangeLog                                     |  18 +-
 VERSION.cmake                                 |   2 +-
 csync/src/csync_update.c                      |  11 ++
 csync/src/httpbf/src/httpbf.c                 |   5 +-
 csync/src/httpbf/src/httpbf.h                 |   1 +
 csync/tests/ownCloud/ownCloud/Test.pm         |   4 +-
 csync/tests/ownCloud/t5.pl                    |   6 +-
 csync/tests/ownCloud/t8.pl                    |  22 ++-
 doc/autoupdate.rst                            |   5 +-
 doc/building.rst                              |  86 ++++----
 shell_integration/nautilus/syncstate.py       |   3 +-
 shell_integration/testclient/main.cpp         |  13 ++
 shell_integration/testclient/socketclient.cpp |  12 ++
 shell_integration/testclient/socketclient.h   |  13 ++
 shell_integration/testclient/window.cpp       |  13 ++
 shell_integration/testclient/window.h         |  13 ++
 src/creds/abstractcredentials.cpp             |   2 +-
 src/mirall/application.cpp                    |   4 +
 src/mirall/clientproxy.cpp                    |   4 +
 src/mirall/filesystem.cpp                     |  10 +-
 src/mirall/filesystem.h                       |   2 +-
 src/mirall/folder.cpp                         |  36 +++-
 src/mirall/folder.h                           |   2 +
 src/mirall/folderwatcher.cpp                  |  12 +-
 src/mirall/networkjobs.cpp                    |  13 +-
 src/mirall/owncloudsetupwizard.cpp            |   1 +
 src/mirall/ownsql.cpp                         |   7 +-
 src/mirall/propagator_legacy.cpp              |  12 +-
 src/mirall/propagator_qnam.cpp                |  25 ++-
 src/mirall/propagatorjobs.cpp                 |  32 ++-
 src/mirall/protocolwidget.cpp                 |  34 ++--
 src/mirall/protocolwidget.h                   |   4 +-
 src/mirall/selectivesyncdialog.cpp            |   4 +-
 src/mirall/settingsdialogmac.cpp              |  13 ++
 src/mirall/settingsdialogmac.h                |  14 ++
 src/mirall/syncengine.cpp                     |  20 +-
 src/mirall/syncjournaldb.cpp                  |  18 ++
 src/mirall/syncjournaldb.h                    |   1 +
 src/owncloudcmd/owncloudcmd.cpp               |   2 +-
 src/wizard/owncloudadvancedsetuppage.cpp      |   5 +-
 test/testcsyncsqlite.h                        |  32 +--
 translations/mirall_ca.ts                     | 221 +++++++++++----------
 translations/mirall_cs.ts                     | 223 +++++++++++----------
 translations/mirall_de.ts                     | 229 +++++++++++----------
 translations/mirall_el.ts                     | 223 +++++++++++----------
 translations/mirall_en.ts                     | 217 ++++++++++----------
 translations/mirall_es.ts                     | 223 +++++++++++----------
 translations/mirall_es_AR.ts                  | 217 ++++++++++----------
 translations/mirall_et.ts                     | 227 +++++++++++----------
 translations/mirall_eu.ts                     | 256 +++++++++++++-----------
 translations/mirall_fa.ts                     | 217 ++++++++++----------
 translations/mirall_fi.ts                     | 221 +++++++++++----------
 translations/mirall_fr.ts                     | 239 +++++++++++-----------
 translations/mirall_gl.ts                     | 221 +++++++++++----------
 translations/mirall_hu.ts                     | 217 ++++++++++----------
 translations/mirall_it.ts                     | 227 +++++++++++----------
 translations/mirall_ja.ts                     | 238 +++++++++++-----------
 translations/mirall_nl.ts                     | 227 +++++++++++----------
 translations/mirall_pl.ts                     | 221 +++++++++++----------
 translations/mirall_pt.ts                     | 223 +++++++++++----------
 translations/mirall_pt_BR.ts                  | 223 +++++++++++----------
 translations/mirall_ru.ts                     | 230 ++++++++++++----------
 translations/mirall_sk.ts                     | 221 +++++++++++----------
 translations/mirall_sl.ts                     | 273 ++++++++++++++------------
 translations/mirall_sv.ts                     | 235 +++++++++++-----------
 translations/mirall_th.ts                     | 217 ++++++++++----------
 translations/mirall_tr.ts                     | 227 +++++++++++----------
 translations/mirall_uk.ts                     | 223 +++++++++++----------
 translations/mirall_zh_CN.ts                  | 217 ++++++++++----------
 translations/mirall_zh_TW.ts                  | 217 ++++++++++----------
 72 files changed, 3916 insertions(+), 3193 deletions(-)

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