[Pkg-owncloud-commits] [owncloud-client] 32/498: Merge remote-tracking branch 'origin/1.8'

[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 cf5100a20bdff13ee4fb28e15421f221e9a4e456
Merge: ffbf2fb b039c2c
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Apr 20 14:58:45 2015 +0200

    Merge remote-tracking branch 'origin/1.8'

 admin/osx/macdeployqt.py                         |   10 +-
 admin/osx/sign_app.sh                            |    4 +-
 csync/CMakeLists.txt                             |    8 +-
 csync/src/csync.h                                |    2 -
 csync/src/csync_owncloud.c                       |    6 +-
 csync/src/csync_version.h.in                     |   17 +-
 src/3rdparty/qtsingleapplication/qtlocalpeer.cpp |    1 +
 src/gui/accountmigrator.h                        |    3 -
 src/gui/socketapi.h                              |    2 +-
 src/libsync/cookiejar.cpp                        |    1 +
 src/libsync/creds/httpcredentials.h              |    1 +
 src/libsync/theme.h                              |    1 +
 translations/client_ca.ts                        |  851 +++---
 translations/client_cs.ts                        |  877 ++++---
 translations/client_de.ts                        |  877 ++++---
 translations/client_el.ts                        |  870 ++++---
 translations/client_en.ts                        |  830 +++---
 translations/client_es.ts                        |  866 ++++---
 translations/client_es_AR.ts                     |  840 +++---
 translations/client_et.ts                        |  887 ++++---
 translations/client_eu.ts                        |  847 +++---
 translations/client_fa.ts                        |  838 +++---
 translations/client_fi.ts                        |  871 ++++---
 translations/client_fr.ts                        |  896 ++++---
 translations/client_gl.ts                        |  862 ++++---
 translations/client_hu.ts                        |  838 +++---
 translations/client_it.ts                        |  856 +++---
 translations/client_ja.ts                        |  876 ++++---
 translations/client_nl.ts                        |  872 ++++---
 translations/client_pl.ts                        |  861 ++++---
 translations/client_pt.ts                        |  880 ++++---
 translations/client_pt_BR.ts                     |  877 ++++---
 translations/client_ru.ts                        |  858 +++---
 translations/client_sk.ts                        |  879 ++++---
 translations/client_sl.ts                        |  861 ++++---
 translations/client_sr.ts                        |  876 ++++---
 translations/client_sv.ts                        |  865 ++++---
 translations/client_th.ts                        |  838 +++---
 translations/client_tr.ts                        |  879 ++++---
 translations/client_uk.ts                        |  877 ++++---
 translations/client_zh_CN.ts                     |  864 ++++---
 translations/client_zh_TW.ts                     |  850 +++---
 translations/mirall_en.ts                        | 3005 ----------------------
 43 files changed, 14235 insertions(+), 14745 deletions(-)

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