[Pkg-owncloud-commits] [owncloud-client] 69/498: Merge remote-tracking branch 'origin/1.8'

[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 f315423811add3efa49445ae504191cbea6a92dd
Merge: bfba6f7 9e3c335
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed May 6 10:04:22 2015 +0200

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

 src/gui/ignorelisteditor.cpp  |   1 -
 src/libsync/clientproxy.cpp   |   1 +
 src/libsync/syncengine.cpp    |   9 +++-
 src/libsync/syncjournaldb.cpp |  21 ++++++++-
 src/libsync/syncjournaldb.h   |   2 +
 translations/client_ca.ts     |  63 +++++++++++++------------
 translations/client_cs.ts     |  26 +++++------
 translations/client_de.ts     |  80 +++++++++++++++----------------
 translations/client_el.ts     |  32 ++++++-------
 translations/client_en.ts     |  26 +++++------
 translations/client_es.ts     |  46 +++++++++---------
 translations/client_es_AR.ts  |  26 +++++------
 translations/client_et.ts     |  26 +++++------
 translations/client_eu.ts     |  26 +++++------
 translations/client_fa.ts     |  26 +++++------
 translations/client_fi.ts     |  26 +++++------
 translations/client_fr.ts     |  26 +++++------
 translations/client_gl.ts     |  26 +++++------
 translations/client_hu.ts     |  26 +++++------
 translations/client_it.ts     |  26 +++++------
 translations/client_ja.ts     |  54 ++++++++++-----------
 translations/client_nl.ts     |  26 +++++------
 translations/client_pl.ts     |  26 +++++------
 translations/client_pt.ts     |  26 +++++------
 translations/client_pt_BR.ts  |  26 +++++------
 translations/client_ru.ts     |  28 +++++------
 translations/client_sk.ts     |  26 +++++------
 translations/client_sl.ts     |  26 +++++------
 translations/client_sr.ts     |  32 ++++++-------
 translations/client_sv.ts     |  26 +++++------
 translations/client_th.ts     |  26 +++++------
 translations/client_tr.ts     | 106 +++++++++++++++++++++---------------------
 translations/client_uk.ts     |  26 +++++------
 translations/client_zh_CN.ts  |  26 +++++------
 translations/client_zh_TW.ts  |  26 +++++------
 35 files changed, 538 insertions(+), 509 deletions(-)


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