[Pkg-owncloud-commits] [owncloud-client] 23/27: Merge tag 'upstream/2.0.0+dfsg'

[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 f68f1e948e0032a4073f7352d5bdf004ef1e558c
Merge: 541c396 1f96efd
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Aug 28 02:13:47 2015 +0200

    Merge tag 'upstream/2.0.0+dfsg'
    
    Upstream version 2.0.0+dfsg
    
    # gpg: Signature made Fr 28 Aug 2015 02:13:40 CEST using RSA key ID 50605636
    # gpg: Good signature from "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                         |   2 +-
 ChangeLog                                    |   3 +-
 VERSION.cmake                                |   2 +-
 src/gui/accountsettings.cpp                  |   6 +-
 src/gui/folderstatusdelegate.cpp             |  59 ++---
 src/gui/folderstatusmodel.cpp                |   9 +-
 src/gui/owncloudgui.cpp                      |   8 +
 src/gui/selectivesyncdialog.cpp              |  41 ++-
 src/gui/selectivesyncdialog.h                |   2 +
 src/gui/settingsdialog.cpp                   |  27 +-
 src/gui/settingsdialog.h                     |   2 +-
 src/gui/wizard/owncloudadvancedsetuppage.cpp |  18 +-
 src/libsync/utility.cpp                      |  12 +-
 translations/client_ca.ts                    | 370 ++++++++++++++-------------
 translations/client_cs.ts                    |  95 +++----
 translations/client_de.ts                    |  93 +++----
 translations/client_el.ts                    |  95 +++----
 translations/client_en.ts                    |  93 +++----
 translations/client_es.ts                    |  95 +++----
 translations/client_es_AR.ts                 |  93 +++----
 translations/client_et.ts                    |  93 +++----
 translations/client_eu.ts                    |  93 +++----
 translations/client_fa.ts                    |  93 +++----
 translations/client_fi.ts                    | 111 ++++----
 translations/client_fr.ts                    |  95 +++----
 translations/client_gl.ts                    |  97 +++----
 translations/client_hu.ts                    |  93 +++----
 translations/client_it.ts                    |  95 +++----
 translations/client_ja.ts                    | 115 +++++----
 translations/client_nb_NO.ts                 |  93 +++----
 translations/client_nl.ts                    | 109 ++++----
 translations/client_pl.ts                    |  93 +++----
 translations/client_pt.ts                    | 171 +++++++------
 translations/client_pt_BR.ts                 |  95 +++----
 translations/client_ru.ts                    |  95 +++----
 translations/client_sk.ts                    |  93 +++----
 translations/client_sl.ts                    |  93 +++----
 translations/client_sr.ts                    |  93 +++----
 translations/client_sv.ts                    |  93 +++----
 translations/client_th.ts                    |  97 +++----
 translations/client_tr.ts                    |  93 +++----
 translations/client_uk.ts                    |  93 +++----
 translations/client_zh_CN.ts                 |  95 +++----
 translations/client_zh_TW.ts                 |  93 +++----
 44 files changed, 1868 insertions(+), 1641 deletions(-)

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