[Pkg-owncloud-commits] [owncloud-client] 157/159: Merge tag 'upstream/1.8.1_rc1+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Fri May 1 13:05:40 UTC 2015
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 2b903653dbe83eef5e30176b325175e9e0f5d310
Merge: 77db7b8 a3355b7
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Fri May 1 12:57:54 2015 +0200
Merge tag 'upstream/1.8.1_rc1+dfsg'
Upstream version 1.8.1~rc1+dfsg
# gpg: Unterschrift vom Fr 01 Mai 2015 12:57:54 CEST mittels RSA-Schlüssel ID 50605636
# gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"
.tag | 2 +-
ChangeLog | 46 +-
VERSION.cmake | 4 +-
csync/CMakeLists.txt | 8 +-
csync/src/csync.c | 10 +-
csync/src/csync.h | 7 -
csync/src/csync_owncloud.c | 6 +-
csync/src/csync_private.h | 12 +-
csync/src/csync_reconcile.c | 4 +-
csync/src/csync_statedb.c | 8 +-
csync/src/csync_update.c | 2 +-
csync/src/csync_version.h.in | 17 +-
csync/src/vio/csync_vio_file_stat.c | 6 +-
doc/advancedusage.rst | 1 +
doc/autoupdate.rst | 10 +-
doc/installing.rst | 6 +
doc/introduction.rst | 3 +
doc/options.rst | 21 +-
doc/owncloudcmd.rst | 66 +-
shell_integration/nautilus/syncstate.py | 6 +-
src/3rdparty/qtsingleapplication/qtlocalpeer.cpp | 1 +
src/cmd/cmd.cpp | 7 +-
src/cmd/simplesslerrorhandler.cpp | 3 +-
src/cmd/simplesslerrorhandler.h | 2 +-
src/gui/CMakeLists.txt | 9 +
src/gui/accountmigrator.h | 3 -
src/gui/accountstate.cpp | 17 +-
src/gui/application.cpp | 8 +-
src/gui/folder.cpp | 1 +
src/gui/folderman.cpp | 7 +
src/gui/folderwizard.cpp | 8 +
src/gui/owncloudsetupwizard.cpp | 96 +-
src/gui/owncloudsetupwizard.h | 4 +-
src/gui/protocolwidget.cpp | 35 +-
src/gui/protocolwidget.h | 6 +-
src/gui/selectivesyncdialog.cpp | 31 +-
src/gui/sharedialog.cpp | 83 +-
src/gui/sharedialog.h | 5 +-
src/gui/sharedialog.ui | 217 +--
src/gui/socketapi.cpp | 36 +-
src/gui/socketapi.h | 20 +-
src/gui/sslbutton.cpp | 48 +-
src/gui/sslbutton.h | 5 +-
src/gui/sslerrordialog.cpp | 3 +-
src/gui/sslerrordialog.h | 2 +-
src/gui/updater/ocupdater.cpp | 7 +-
src/gui/version.rc.in | 25 +
src/libsync/CMakeLists.txt | 1 -
src/libsync/account.cpp | 30 +-
src/libsync/account.h | 4 +-
src/libsync/clientproxy.cpp | 55 +-
src/libsync/clientproxy.h | 20 +-
src/libsync/configfile.cpp | 26 +-
src/libsync/configfile.h | 2 +-
src/libsync/connectionvalidator.cpp | 36 +
src/libsync/connectionvalidator.h | 5 +
src/libsync/cookiejar.cpp | 4 +-
src/libsync/cookiejar.h | 3 +-
src/libsync/creds/http/httpconfigfile.cpp | 81 --
src/libsync/creds/http/httpconfigfile.h | 44 -
src/libsync/creds/httpcredentials.cpp | 13 +-
src/libsync/creds/httpcredentials.h | 2 +
src/libsync/discoveryphase.cpp | 59 +-
src/libsync/discoveryphase.h | 58 +-
src/libsync/networkjobs.cpp | 263 ++--
src/libsync/networkjobs.h | 18 +
src/libsync/owncloudpropagator.cpp | 8 +
src/libsync/owncloudpropagator.h | 4 +
src/libsync/owncloudpropagator_p.h | 10 +-
src/libsync/propagatedownload.cpp | 22 +-
src/libsync/propagatedownload.h | 2 +
src/libsync/propagateremotedelete.cpp | 11 +-
src/libsync/propagateupload.cpp | 11 +-
src/libsync/propagateupload.h | 1 +
src/libsync/propagator_legacy.cpp | 3 +-
src/libsync/syncengine.cpp | 26 +-
src/libsync/syncengine.h | 14 +
src/libsync/syncjournaldb.cpp | 15 +-
src/libsync/syncjournaldb.h | 3 +-
src/libsync/theme.cpp | 18 +-
src/libsync/theme.h | 7 +-
test/CMakeLists.txt | 2 +-
test/testxmlparse.h | 245 ++++
translations/.tx/config | 1 +
translations/client_ca.ts | 898 ++++++------
translations/client_cs.ts | 884 ++++++------
translations/client_de.ts | 887 ++++++------
translations/client_el.ts | 940 +++++++------
translations/client_en.ts | 840 ++++++-----
translations/client_es.ts | 876 ++++++------
translations/client_es_AR.ts | 850 ++++++-----
translations/client_et.ts | 897 ++++++------
translations/client_eu.ts | 857 +++++++-----
translations/client_fa.ts | 848 ++++++-----
translations/client_fi.ts | 881 ++++++------
translations/client_fr.ts | 996 +++++++------
translations/client_gl.ts | 876 ++++++------
translations/client_hu.ts | 848 ++++++-----
translations/client_it.ts | 866 ++++++------
translations/client_ja.ts | 894 ++++++------
translations/client_nl.ts | 882 ++++++------
translations/client_pl.ts | 881 ++++++------
translations/client_pt.ts | 890 ++++++------
translations/client_pt_BR.ts | 887 ++++++------
translations/client_ru.ts | 878 ++++++------
translations/client_sk.ts | 889 ++++++------
translations/client_sl.ts | 879 ++++++------
translations/{mirall_en.ts => client_sr.ts} | 1626 +++++++++++-----------
translations/client_sv.ts | 875 ++++++------
translations/client_th.ts | 848 ++++++-----
translations/client_tr.ts | 889 ++++++------
translations/client_uk.ts | 941 +++++++------
translations/client_zh_CN.ts | 912 ++++++------
translations/client_zh_TW.ts | 860 ++++++------
114 files changed, 16223 insertions(+), 13113 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list