[Pkg-owncloud-commits] [owncloud-client] 19/470: Merge remote-tracking branch 'origin/2.1'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu May 12 16:24:39 UTC 2016
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 dd76d72d616d0fa8591273ca6356aa71375421d1
Merge: 3b60f6e ba87178
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Tue Jan 26 14:09:38 2016 +0100
Merge remote-tracking branch 'origin/2.1'
.gitmodules | 3 +
ChangeLog | 20 +
admin/osx/gen_sym_files.py | 2 +
admin/osx/macdeployqt.py | 39 +-
admin/osx/macosx.pkgproj | 34 ++
admin/osx/sign_app.sh | 3 +-
...-tray-icon-is-prepared-even-when-menu-bar.patch | 39 ++
admin/qt/patches/README.md | 1 +
admin/win/create_stable_toolchain.sh | 30 ++
admin/win/nsi/l10n/Basque.nsh | 2 +-
admin/win/nsi/l10n/Farsi.nsh | 2 +-
admin/win/nsi/l10n/Finnish.nsh | 4 +-
admin/win/nsi/l10n/Italian.nsh | 2 +-
admin/win/nsi/l10n/Japanese.nsh | 4 +-
admin/win/nsi/l10n/Portuguese.nsh | 4 +-
admin/win/nsi/l10n/Russian.nsh | 2 +-
admin/win/nsi/l10n/Slovenian.nsh | 4 +-
admin/win/nsi/l10n/Thai.nsh | 2 +-
admin/win/nsi/l10n/bin/build_locale_nsi.py | 8 +-
binary | 2 +-
csync/src/csync.h | 5 +-
csync/src/csync_private.h | 2 +-
csync/src/csync_reconcile.c | 8 +-
csync/src/csync_update.c | 10 +
csync/src/csync_util.c | 1 +
csync/tests/csync_tests/check_csync_exclude.c | 20 +
doc/navigating.rst | 5 +
doc/owncloudcmd.1.rst | 12 +
doc/owncloudcmd.rst | 31 +-
.../OwnCloudFinderSync/FinderSyncExt/FinderSync.h | 1 -
.../OwnCloudFinderSync/FinderSyncExt/FinderSync.m | 20 +-
.../dolphin/ownclouddolphinoverlayplugin.cpp | 8 +-
.../icons/nopadding/SVG/attention.svg | 72 +--
shell_integration/icons/nopadding/SVG/error.svg | 75 ++--
.../icons/nopadding/SVG/generate_windows_ico.sh | 8 +
shell_integration/icons/nopadding/SVG/ok.svg | 59 ++-
shell_integration/icons/nopadding/SVG/shared.svg | 109 ++---
shell_integration/icons/nopadding/SVG/sync.svg | 103 ++---
shell_integration/windows/OCOverlays/DllMain.cpp | 24 -
shell_integration/windows/OCOverlays/OCOverlay.cpp | 12 +-
shell_integration/windows/OCOverlays/OCOverlay.rc | Bin 6112 -> 5672 bytes
.../windows/OCOverlays/OCOverlayFactory.h | 6 +-
.../windows/OCOverlays/OCOverlays.vcxproj | 11 -
.../windows/OCOverlays/OverlayConstants.h | 6 -
shell_integration/windows/OCOverlays/ico/Error.ico | Bin 30166 -> 28077 bytes
.../windows/OCOverlays/ico/Error_Shared.ico | Bin 30166 -> 0 bytes
shell_integration/windows/OCOverlays/ico/OK.ico | Bin 30166 -> 27184 bytes
.../windows/OCOverlays/ico/OK_Shared.ico | Bin 30166 -> 29964 bytes
shell_integration/windows/OCOverlays/ico/Sync.ico | Bin 30166 -> 32010 bytes
.../windows/OCOverlays/ico/Sync_Shared.ico | Bin 30166 -> 0 bytes
.../windows/OCOverlays/ico/Warning.ico | Bin 30166 -> 25872 bytes
.../windows/OCOverlays/ico/Warning_Shared.ico | Bin 30166 -> 0 bytes
.../windows/OCUtil/CommunicationSocket.cpp | 4 -
shell_integration/windows/OCUtil/OCUtil.vcxproj | 2 +-
.../windows/OCUtil/RemotePathChecker.cpp | 6 +-
.../windows/OCUtil/RemotePathChecker.h | 6 +-
src/3rdparty/qtkeychain | 1 +
src/gui/accountsettings.cpp | 2 +-
src/gui/accountstate.cpp | 18 +-
src/gui/accountstate.h | 4 +-
src/gui/activityitemdelegate.cpp | 19 +-
src/gui/activitywidget.cpp | 10 +-
src/gui/application.cpp | 12 +-
src/gui/creds/shibbolethcredentials.cpp | 7 +-
src/gui/folder.cpp | 43 +-
src/gui/folder.h | 2 +-
src/gui/folderman.cpp | 12 +-
src/gui/folderstatusdelegate.cpp | 129 +++---
src/gui/folderstatusdelegate.h | 5 +-
src/gui/folderstatusmodel.cpp | 8 +-
src/gui/main.cpp | 23 +
src/gui/owncloudgui.cpp | 31 +-
src/gui/owncloudgui.h | 3 +
src/gui/protocolwidget.cpp | 18 +-
src/gui/protocolwidget.h | 2 +-
src/gui/protocolwidget.ui | 2 +-
src/gui/settingsdialog.cpp | 11 +-
src/gui/settingsdialogmac.cpp | 2 +-
src/gui/share.cpp | 9 +-
src/gui/share.h | 11 +-
src/gui/sharee.cpp | 1 +
src/gui/sharee.h | 3 +
src/gui/sharelinkwidget.cpp | 57 ++-
src/gui/sharelinkwidget.h | 6 +-
src/gui/shareusergroupwidget.cpp | 33 +-
src/gui/shareusergroupwidget.h | 3 +-
src/gui/shareusergroupwidget.ui | 12 +-
src/gui/socketapi.cpp | 10 +-
src/gui/syncrunfilelog.cpp | 3 +
src/gui/systray.mm | 19 +
src/libsync/abstractnetworkjob.cpp | 5 +-
src/libsync/configfile.cpp | 15 +-
src/libsync/configfile.h | 1 +
src/libsync/creds/httpcredentials.cpp | 49 +-
src/libsync/creds/httpcredentials.h | 1 +
src/libsync/creds/tokencredentials.cpp | 2 +-
src/libsync/creds/tokencredentials.h | 2 +-
src/libsync/filesystem.cpp | 50 ++-
src/libsync/filesystem.h | 13 +
src/libsync/owncloudpropagator.cpp | 84 +++-
src/libsync/owncloudpropagator.h | 17 +-
src/libsync/progressdispatcher.cpp | 2 +
src/libsync/progressdispatcher.h | 3 +-
src/libsync/propagatedownload.cpp | 66 ++-
src/libsync/propagatedownload.h | 16 +-
src/libsync/propagateremotemkdir.cpp | 27 +-
src/libsync/propagateremotemkdir.h | 13 +-
src/libsync/propagateupload.cpp | 56 ++-
src/libsync/propagateupload.h | 18 +-
src/libsync/propagatorjobs.cpp | 42 +-
src/libsync/propagatorjobs.h | 14 +-
src/libsync/syncengine.cpp | 50 ++-
src/libsync/syncfilestatus.cpp | 2 +-
src/libsync/syncfilestatus.h | 2 +-
src/libsync/syncjournaldb.cpp | 3 +-
translations/client_ca.ts | 332 +++++++-------
translations/client_cs.ts | 336 +++++++-------
translations/client_de.ts | 366 +++++++--------
translations/client_el.ts | 328 +++++++-------
translations/client_en.ts | 326 +++++++-------
translations/client_es.ts | 370 +++++++--------
translations/client_es_AR.ts | 328 +++++++-------
translations/client_et.ts | 336 +++++++-------
translations/client_eu.ts | 486 ++++++++++----------
translations/client_fa.ts | 328 +++++++-------
translations/client_fi.ts | 330 +++++++-------
translations/client_fr.ts | 350 ++++++++-------
translations/client_gl.ts | 328 +++++++-------
translations/client_hu.ts | 330 +++++++-------
translations/client_it.ts | 336 +++++++-------
translations/client_ja.ts | 336 +++++++-------
translations/client_nb_NO.ts | 336 +++++++-------
translations/client_nl.ts | 342 +++++++-------
translations/client_pl.ts | 328 +++++++-------
translations/client_pt.ts | 424 +++++++++---------
translations/client_pt_BR.ts | 344 +++++++-------
translations/client_ru.ts | 336 +++++++-------
translations/client_sk.ts | 328 +++++++-------
translations/client_sl.ts | 498 +++++++++++----------
translations/client_sr.ts | 466 +++++++++----------
translations/client_sv.ts | 336 +++++++-------
translations/client_th.ts | 336 +++++++-------
translations/client_tr.ts | 384 ++++++++--------
translations/client_uk.ts | 330 +++++++-------
translations/client_zh_CN.ts | 328 +++++++-------
translations/client_zh_TW.ts | 458 ++++++++++---------
146 files changed, 6973 insertions(+), 6064 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