[Pkg-owncloud-commits] [owncloud-client] 79/84: Merge tag 'upstream/2.2.4+dfsg'

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository owncloud-client.

commit 4701a42d6169cdb9d792af4ac834fd9b63dae374
Merge: 72bb2ca 307cc37
Author: Sandro Knauß <hefee at debian.org>
Date:   Fri Oct 21 23:05:49 2016 +0200

    Merge tag 'upstream/2.2.4+dfsg'
    
    Upstream version 2.2.4+dfsg
    
    # gpg: keyserver option 'no-try-dns-srv' is unknown
    # gpg: Signatur vom Fr 21 Okt 2016 23:05:48 CEST
    # gpg:                mittels RSA-Schlüssel 0xE3ADB00850605636
    # gpg:                Aussteller "hefee at debian.org"
    # gpg: Korrekte Signatur von "Sandro Knauß <sknauss at kde.org>" [vollständig]
    # gpg:                     alias "Sandro Knauß <bugs at sandroknauss.de>" [vollständig]
    # gpg:                     alias "Sandro Knauß <hefee at debian.org>" [vollständig]

 .tag                                               |   2 +-
 ChangeLog                                          |  13 +-
 Jenkinsfile                                        |  58 +++++
 VERSION.cmake                                      |   4 +-
 cmake/modules/NSIS.template.in                     |   3 +
 csync/tests/ownCloud/t_recall.pl                   |  10 +
 mirall.desktop.in                                  | 177 ++++++++++++++-
 .../dolphin/ownclouddolphinpluginhelper.cpp        |   6 +-
 src/cmd/cmd.cpp                                    |   6 +
 src/gui/application.cpp                            |   6 +
 src/gui/folderstatusmodel.cpp                      |  11 +-
 src/gui/folderstatusmodel.h                        |   1 +
 src/gui/sharelinkwidget.cpp                        |   2 +
 src/libsync/connectionvalidator.cpp                |   2 +-
 src/libsync/discoveryphase.cpp                     |   2 +-
 src/libsync/excludedfiles.cpp                      |   3 +-
 src/libsync/owncloudpropagator.cpp                 |   8 +
 src/libsync/owncloudpropagator.h                   |   4 +
 src/libsync/owncloudtheme.cpp                      |   2 +-
 src/libsync/propagatedownload.cpp                  |  46 ++--
 src/libsync/syncengine.cpp                         |   9 +-
 src/libsync/theme.cpp                              |   2 +-
 test/testchecksumvalidator.cpp                     |   8 +-
 test/testfolderwatcher.cpp                         |   8 +-
 test/testxmlparse.cpp                              |   8 +-
 translations/client_ca.ts                          |  98 ++++-----
 translations/client_cs.ts                          | 104 ++++-----
 translations/client_de.ts                          | 102 ++++-----
 translations/client_el.ts                          | 190 ++++++++--------
 translations/client_en.ts                          |  96 ++++----
 translations/client_es.ts                          | 102 ++++-----
 translations/client_es_AR.ts                       |  96 ++++----
 translations/client_et.ts                          |  96 ++++----
 translations/client_eu.ts                          |  98 ++++-----
 translations/client_fa.ts                          |  96 ++++----
 translations/client_fi.ts                          | 100 ++++-----
 translations/client_fr.ts                          | 102 ++++-----
 translations/client_gl.ts                          | 100 ++++-----
 translations/client_hu.ts                          | 100 ++++-----
 translations/client_it.ts                          | 102 ++++-----
 translations/client_ja.ts                          | 126 +++++------
 translations/client_nb_NO.ts                       | 100 ++++-----
 translations/client_nl.ts                          | 102 ++++-----
 translations/client_pl.ts                          | 102 ++++-----
 translations/client_pt.ts                          | 100 ++++-----
 translations/client_pt_BR.ts                       | 102 ++++-----
 translations/client_ru.ts                          | 102 ++++-----
 translations/client_sk.ts                          | 242 +++++++++++----------
 translations/client_sl.ts                          | 102 ++++-----
 translations/client_sr.ts                          | 100 ++++-----
 translations/client_sv.ts                          | 102 ++++-----
 translations/client_th.ts                          | 104 ++++-----
 translations/client_tr.ts                          | 154 ++++++-------
 translations/client_uk.ts                          | 100 ++++-----
 translations/client_zh_CN.ts                       | 112 +++++-----
 translations/client_zh_TW.ts                       |  98 ++++-----
 56 files changed, 2076 insertions(+), 1755 deletions(-)

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