[Pkg-owncloud-commits] [owncloud-client] 19/21: Merge tag 'upstream/2.0.2+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 91a75511dedfcce5563d852bfe57f8bdf6183345
Merge: caf76be a5bd823
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Oct 23 19:15:21 2015 +0200

    Merge tag 'upstream/2.0.2+dfsg'
    
    Upstream version 2.0.2+dfsg
    
    # gpg: Signature made Fr 23 Okt 2015 19:15:15 CEST using RSA key ID 50605636
    # gpg: Good signature from "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                         |   2 +-
 ChangeLog                    |  60 +++++++++++------------
 VERSION.cmake                |   2 +-
 binary.rej                   |   5 ++
 csync/src/csync_private.h    |   8 ++--
 src/gui/generalsettings.cpp  |   2 +-
 src/libsync/configfile.cpp   |   6 ++-
 src/libsync/theme.cpp        |   4 +-
 src/libsync/theme.h          |   5 +-
 translations/client_ca.ts    |  84 ++++++++++++++++----------------
 translations/client_cs.ts    |  84 ++++++++++++++++----------------
 translations/client_de.ts    |  86 ++++++++++++++++-----------------
 translations/client_el.ts    |  84 ++++++++++++++++----------------
 translations/client_en.ts    |  84 ++++++++++++++++----------------
 translations/client_es.ts    |  84 ++++++++++++++++----------------
 translations/client_es_AR.ts |  84 ++++++++++++++++----------------
 translations/client_et.ts    |  84 ++++++++++++++++----------------
 translations/client_eu.ts    |  84 ++++++++++++++++----------------
 translations/client_fa.ts    |  84 ++++++++++++++++----------------
 translations/client_fi.ts    |  84 ++++++++++++++++----------------
 translations/client_fr.ts    |  84 ++++++++++++++++----------------
 translations/client_gl.ts    |  84 ++++++++++++++++----------------
 translations/client_hu.ts    |  84 ++++++++++++++++----------------
 translations/client_it.ts    |  84 ++++++++++++++++----------------
 translations/client_ja.ts    | 112 +++++++++++++++++++++----------------------
 translations/client_nb_NO.ts |  84 ++++++++++++++++----------------
 translations/client_nl.ts    |  84 ++++++++++++++++----------------
 translations/client_pl.ts    |  84 ++++++++++++++++----------------
 translations/client_pt.ts    |  84 ++++++++++++++++----------------
 translations/client_pt_BR.ts |  84 ++++++++++++++++----------------
 translations/client_ru.ts    |  84 ++++++++++++++++----------------
 translations/client_sk.ts    |  84 ++++++++++++++++----------------
 translations/client_sl.ts    |  84 ++++++++++++++++----------------
 translations/client_sr.ts    |  84 ++++++++++++++++----------------
 translations/client_sv.ts    |  84 ++++++++++++++++----------------
 translations/client_th.ts    |  84 ++++++++++++++++----------------
 translations/client_tr.ts    |  84 ++++++++++++++++----------------
 translations/client_uk.ts    |  84 ++++++++++++++++----------------
 translations/client_zh_CN.ts |  84 ++++++++++++++++----------------
 translations/client_zh_TW.ts |  84 ++++++++++++++++----------------
 40 files changed, 1369 insertions(+), 1359 deletions(-)

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