[Pkg-owncloud-commits] [owncloud-client] 12/470: Merge remote-tracking branch 'origin/2.1'

[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 639301e9e986aa7d12c178a486773ed9449e1361
Merge: 8f26bb6 970cdcf
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Jan 4 12:38:17 2016 +0100

    Merge remote-tracking branch 'origin/2.1'
    
     Conflicts:
    	VERSION.cmake

 admin/osx/macdeployqt.py                  |   2 -
 cmake/modules/NSIS.template.in            |   5 -
 csync/src/vio/csync_vio_local_win.c       |  11 ++
 doc/ocdoc                                 |   2 +-
 shell_integration/nautilus/CMakeLists.txt |  14 ++-
 src/gui/accountstate.cpp                  |   1 -
 src/gui/application.cpp                   |  12 +-
 src/gui/folder.cpp                        |   2 +-
 src/gui/folderman.cpp                     |   2 +-
 src/gui/folderwatcher_linux.cpp           |   3 +-
 src/gui/sharee.cpp                        |  18 ++-
 src/gui/sharelinkwidget.ui                |   1 -
 src/gui/shareusergroupwidget.cpp          |  37 ++++++-
 src/gui/shareusergroupwidget.h            |   2 +
 src/gui/socketapi.cpp                     |  12 +-
 src/libsync/account.cpp                   |   1 -
 src/libsync/filesystem.cpp                |   2 +-
 src/libsync/propagatorjobs.cpp            |   6 +
 translations/client_ca.ts                 |  50 ++++-----
 translations/client_cs.ts                 |  50 ++++-----
 translations/client_de.ts                 |  50 ++++-----
 translations/client_el.ts                 |  52 ++++-----
 translations/client_en.ts                 |  50 ++++-----
 translations/client_es.ts                 |  86 +++++++--------
 translations/client_es_AR.ts              |  50 ++++-----
 translations/client_et.ts                 | 136 +++++++++++------------
 translations/client_eu.ts                 | 176 +++++++++++++++---------------
 translations/client_fa.ts                 |  50 ++++-----
 translations/client_fi.ts                 |  50 ++++-----
 translations/client_fr.ts                 |  50 ++++-----
 translations/client_gl.ts                 |  50 ++++-----
 translations/client_hu.ts                 |  60 +++++-----
 translations/client_it.ts                 |  50 ++++-----
 translations/client_ja.ts                 |  50 ++++-----
 translations/client_nb_NO.ts              | 164 ++++++++++++++--------------
 translations/client_nl.ts                 |  50 ++++-----
 translations/client_pl.ts                 |  50 ++++-----
 translations/client_pt.ts                 |  50 ++++-----
 translations/client_pt_BR.ts              |  62 +++++------
 translations/client_ru.ts                 |  92 ++++++++--------
 translations/client_sk.ts                 |  50 ++++-----
 translations/client_sl.ts                 |  50 ++++-----
 translations/client_sr.ts                 |  50 ++++-----
 translations/client_sv.ts                 |  50 ++++-----
 translations/client_th.ts                 |  50 ++++-----
 translations/client_tr.ts                 |  50 ++++-----
 translations/client_uk.ts                 | 132 +++++++++++-----------
 translations/client_zh_CN.ts              |  50 ++++-----
 translations/client_zh_TW.ts              |  50 ++++-----
 49 files changed, 1135 insertions(+), 1058 deletions(-)

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