[Pkg-owncloud-commits] [owncloud-client] 10/484: Merge branch '2.0'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:37:02 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 950bc578d0ba7bff520f365137f19b9b7dd7efbe
Merge: ccfcdff 9172a5f
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Mon Aug 31 14:34:04 2015 +0200
Merge branch '2.0'
ChangeLog | 12 +-
README.md | 2 +-
VERSION.cmake | 4 +-
admin/win/nsi/l10n/Dutch.nsh | 2 +-
admin/win/nsi/l10n/French.nsh | 2 +-
admin/win/nsi/l10n/Japanese.nsh | 2 +-
admin/win/nsi/l10n/Portuguese.nsh | 2 +-
admin/win/nsi/l10n/Russian.nsh | 2 +-
admin/win/nsi/l10n/Spanish.nsh | 2 +-
admin/win/nsi/l10n/Thai.nsh | 2 +-
client.qrc | 3 +
cmake/modules/FindINotify.cmake | 11 +-
csync/src/csync.h | 3 +-
csync/src/csync_exclude.c | 365 +++++-----
csync/src/csync_exclude.h | 25 +-
csync/src/csync_statedb.c | 2 +-
csync/src/csync_update.c | 16 +-
csync/src/std/c_string.c | 19 +
csync/src/std/c_string.h | 13 +
csync/tests/csync_tests/check_csync_exclude.c | 119 ++++
doc/architecture.rst | 20 +-
doc/autoupdate.rst | 2 +-
doc/building.rst | 46 +-
doc/conffile.rst | 2 +-
doc/faq.rst | 2 +-
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
src/3rdparty/qtmacgoodies | 2 +-
src/gui/accountmanager.cpp | 12 +
src/gui/accountmanager.h | 3 +
src/gui/accountsettings.cpp | 119 ++--
src/gui/accountsettings.h | 4 +-
src/gui/accountsettings.ui | 188 +++--
src/gui/accountstate.cpp | 21 +-
src/gui/accountstate.h | 6 +-
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 | 101 ++-
src/gui/folderstatusdelegate.h | 7 +
src/gui/folderstatusmodel.cpp | 180 +++--
src/gui/folderstatusmodel.h | 12 +-
src/gui/folderwatcher_win.cpp | 13 +-
src/gui/folderwizard.cpp | 56 +-
src/gui/folderwizard.h | 4 +-
src/gui/generalsettings.cpp | 5 +
src/gui/ignorelisteditor.cpp | 15 +-
src/gui/ignorelisteditor.ui | 2 +-
src/gui/owncloudgui.cpp | 33 +-
src/gui/owncloudsetupwizard.cpp | 3 +
src/gui/protocolwidget.cpp | 33 +-
src/gui/protocolwidget.h | 1 +
src/gui/selectivesyncdialog.cpp | 42 +-
src/gui/selectivesyncdialog.h | 2 +
src/gui/settingsdialog.cpp | 187 +++--
src/gui/settingsdialog.h | 18 +-
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.cpp | 18 +-
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/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 | 16 +-
sync-exclude.lst | 4 +-
test/testutility.h | 4 +
translations/client_ca.ts | 898 +++++++++++++-----------
translations/client_cs.ts | 649 +++++++++--------
translations/client_de.ts | 671 +++++++++---------
translations/client_el.ts | 665 ++++++++++--------
translations/client_en.ts | 633 +++++++++--------
translations/client_es.ts | 673 +++++++++---------
translations/client_es_AR.ts | 639 +++++++++--------
translations/client_et.ts | 671 +++++++++---------
translations/client_eu.ts | 641 +++++++++--------
translations/client_fa.ts | 635 +++++++++--------
translations/client_fi.ts | 667 +++++++++---------
translations/client_fr.ts | 822 ++++++++++++----------
translations/client_gl.ts | 653 +++++++++--------
translations/client_hu.ts | 835 +++++++++++-----------
translations/client_it.ts | 677 +++++++++---------
translations/client_ja.ts | 720 ++++++++++---------
translations/client_nb_NO.ts | 641 +++++++++--------
translations/client_nl.ts | 692 +++++++++---------
translations/client_pl.ts | 641 +++++++++--------
translations/client_pt.ts | 775 +++++++++++----------
translations/client_pt_BR.ts | 649 +++++++++--------
translations/client_ru.ts | 788 +++++++++++----------
translations/client_sk.ts | 641 +++++++++--------
translations/client_sl.ts | 677 +++++++++---------
translations/client_sr.ts | 641 +++++++++--------
translations/client_sv.ts | 641 +++++++++--------
translations/client_th.ts | 928 +++++++++++++------------
translations/client_tr.ts | 641 +++++++++--------
translations/client_uk.ts | 641 +++++++++--------
translations/client_zh_CN.ts | 759 ++++++++++----------
translations/client_zh_TW.ts | 639 +++++++++--------
121 files changed, 12934 insertions(+), 10722 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