[Pkg-owncloud-commits] [owncloud-client] 115/120: Merge tag 'upstream/2.0.0_rc1+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Aug 24 00:02:55 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 f3b0cc4a2e44d2e71300928fb87e244a7d7e9828
Merge: bbbf862 88e83e8
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Sat Aug 22 16:34:22 2015 +0200
Merge tag 'upstream/2.0.0_rc1+dfsg'
Upstream version 2.0.0~rc1+dfsg
# gpg: Signature made Sa 22 Aug 2015 16:34:15 CEST using RSA key ID 50605636
# gpg: Good signature from "Sandro Knauß <bugs at sandroknauss.de>"
.tag | 2 +-
ChangeLog | 9 +-
VERSION.cmake | 2 +-
client.qrc | 3 +
cmake/modules/FindINotify.cmake | 11 +-
csync/src/csync.h | 3 +-
csync/src/csync_exclude.h | 3 +-
csync/src/csync_update.c | 16 +-
doc/architecture.rst | 20 +-
doc/autoupdate.rst | 2 +-
doc/building.rst | 46 +-
doc/conffile.rst | 2 +-
doc/faq.rst | 2 +-
doc/installing.rst | 2 +-
doc/navigating.rst | 16 +-
doc/troubleshooting.rst | 4 +-
resources/account.png | Bin 2777 -> 1439 bytes
resources/{account.png => account at 2x.png} | Bin
resources/activity.png | Bin 1993 -> 1129 bytes
resources/{activity.png => activity at 2x.png} | Bin
resources/network.png | Bin 1459 -> 879 bytes
resources/network at 2x.png | Bin 0 -> 2556 bytes
resources/settings.png | Bin 3677 -> 1950 bytes
resources/{settings.png => settings at 2x.png} | Bin
shell_integration/nautilus/syncstate.py | 3 +
src/gui/accountmanager.cpp | 12 +
src/gui/accountmanager.h | 3 +
src/gui/accountsettings.cpp | 44 +-
src/gui/accountsettings.h | 4 +-
src/gui/accountsettings.ui | 5 +-
src/gui/accountstate.cpp | 7 +-
src/gui/creds/shibboleth/shibbolethwebview.cpp | 3 +
src/gui/folder.cpp | 44 +-
src/gui/folder.h | 16 +-
src/gui/folderman.cpp | 19 +
src/gui/folderman.h | 9 +
src/gui/folderstatusdelegate.cpp | 42 +-
src/gui/folderstatusdelegate.h | 7 +
src/gui/folderstatusmodel.cpp | 136 +++--
src/gui/folderstatusmodel.h | 5 +-
src/gui/folderwatcher_win.cpp | 13 +-
src/gui/folderwizard.cpp | 15 +-
src/gui/generalsettings.cpp | 5 +
src/gui/ignorelisteditor.cpp | 15 +-
src/gui/ignorelisteditor.ui | 2 +-
src/gui/owncloudgui.cpp | 20 +-
src/gui/owncloudsetupwizard.cpp | 2 +
src/gui/protocolwidget.cpp | 33 +-
src/gui/protocolwidget.h | 1 +
src/gui/selectivesyncdialog.cpp | 1 +
src/gui/settingsdialog.cpp | 186 ++++--
src/gui/settingsdialog.h | 19 +-
src/gui/sharedialog.cpp | 7 +-
src/gui/socketapi.cpp | 15 +-
src/gui/socketapi.h | 2 +-
src/gui/sslbutton.cpp | 14 +-
src/gui/updater/ocupdater.cpp | 3 +
src/gui/updater/ocupdater.h | 3 +-
src/gui/wizard/owncloudadvancedsetuppage.ui | 47 +-
src/libsync/CMakeLists.txt | 13 +-
src/libsync/account.cpp | 6 +
src/libsync/account.h | 10 +
src/libsync/networkjobs.cpp | 26 +-
src/libsync/networkjobs.h | 1 +
src/libsync/owncloudpropagator.cpp | 11 +-
src/libsync/owncloudpropagator.h | 9 +-
src/libsync/owncloudtheme.cpp | 4 +-
src/libsync/progressdispatcher.cpp | 14 +-
src/libsync/progressdispatcher.h | 16 +-
src/libsync/propagateupload.cpp | 3 +-
src/libsync/syncengine.cpp | 11 +-
src/libsync/syncengine.h | 7 +-
src/libsync/theme.cpp | 5 +
src/libsync/theme.h | 4 +
src/libsync/utility.cpp | 4 +-
sync-exclude.lst | 4 +-
translations/client_ca.ts | 510 ++++++++--------
translations/client_cs.ts | 516 ++++++++--------
translations/client_de.ts | 540 +++++++++--------
translations/client_el.ts | 532 ++++++++--------
translations/client_en.ts | 506 ++++++++--------
translations/client_es.ts | 528 ++++++++--------
translations/client_es_AR.ts | 510 ++++++++--------
translations/client_et.ts | 540 +++++++++--------
translations/client_eu.ts | 510 ++++++++--------
translations/client_fa.ts | 506 ++++++++--------
translations/client_fi.ts | 518 ++++++++--------
translations/client_fr.ts | 691 +++++++++++----------
translations/client_gl.ts | 520 ++++++++--------
translations/client_hu.ts | 708 +++++++++++-----------
translations/client_it.ts | 540 +++++++++--------
translations/client_ja.ts | 577 +++++++++---------
translations/client_nb_NO.ts | 510 ++++++++--------
translations/client_nl.ts | 561 ++++++++---------
translations/client_pl.ts | 510 ++++++++--------
translations/client_pt.ts | 582 +++++++++---------
translations/client_pt_BR.ts | 516 ++++++++--------
translations/client_ru.ts | 665 ++++++++++----------
translations/client_sk.ts | 510 ++++++++--------
translations/client_sl.ts | 510 ++++++++--------
translations/client_sr.ts | 510 ++++++++--------
translations/client_sv.ts | 510 ++++++++--------
translations/client_th.ts | 799 +++++++++++++------------
translations/client_tr.ts | 510 ++++++++--------
translations/client_uk.ts | 510 ++++++++--------
translations/client_zh_CN.ts | 634 ++++++++++----------
translations/client_zh_TW.ts | 508 ++++++++--------
107 files changed, 9615 insertions(+), 8535 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