[Pkg-owncloud-commits] [owncloud-client] 20/484: Merge remote-tracking branch 'origin/2.0'

[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 21dbf97a026e8ee1997d5928642a36bb465c15ca
Merge: 39bff05 66f3407
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Sep 7 10:32:16 2015 +0200

    Merge remote-tracking branch 'origin/2.0'

 src/gui/application.cpp                      |   4 +-
 src/gui/folder.cpp                           |   2 +-
 src/gui/folderman.cpp                        |   2 +-
 src/gui/folderwizard.cpp                     |   2 +-
 src/gui/ignorelisteditor.cpp                 |   2 +-
 src/gui/owncloudgui.cpp                      |   7 ++
 src/gui/wizard/owncloudadvancedsetuppage.cpp |   4 +-
 src/gui/wizard/owncloudadvancedsetuppage.ui  |   2 +-
 src/libsync/discoveryphase.cpp               |   2 +-
 src/libsync/owncloudpropagator.cpp           |   2 +-
 src/libsync/propagatorjobs.cpp               |   8 +-
 src/libsync/syncengine.cpp                   |  20 ++--
 src/libsync/utility_unix.cpp                 |   2 +-
 translations/client_ca.ts                    |  72 +++++++-------
 translations/client_cs.ts                    |  36 +++----
 translations/client_de.ts                    | 140 ++++++++++++++-------------
 translations/client_el.ts                    |  42 ++++----
 translations/client_en.ts                    |  36 +++----
 translations/client_es.ts                    |  36 +++----
 translations/client_es_AR.ts                 |  36 +++----
 translations/client_et.ts                    |  36 +++----
 translations/client_eu.ts                    |  36 +++----
 translations/client_fa.ts                    |  36 +++----
 translations/client_fi.ts                    |  42 ++++----
 translations/client_fr.ts                    |  36 +++----
 translations/client_gl.ts                    |  36 +++----
 translations/client_hu.ts                    |  36 +++----
 translations/client_it.ts                    |  42 ++++----
 translations/client_ja.ts                    |  36 +++----
 translations/client_nb_NO.ts                 |  36 +++----
 translations/client_nl.ts                    |  36 +++----
 translations/client_pl.ts                    |  36 +++----
 translations/client_pt.ts                    |  36 +++----
 translations/client_pt_BR.ts                 |  74 +++++++-------
 translations/client_ru.ts                    |  36 +++----
 translations/client_sk.ts                    |  36 +++----
 translations/client_sl.ts                    |  36 +++----
 translations/client_sr.ts                    |  36 +++----
 translations/client_sv.ts                    |  36 +++----
 translations/client_th.ts                    |  36 +++----
 translations/client_tr.ts                    |  36 +++----
 translations/client_uk.ts                    |  36 +++----
 translations/client_zh_CN.ts                 |  36 +++----
 translations/client_zh_TW.ts                 |  36 +++----
 44 files changed, 691 insertions(+), 680 deletions(-)


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