[Pkg-owncloud-commits] [owncloud-client] 35/115: Merge remote-tracking branch 'origin/master' into selective_sync

[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 4b2c1bacd125bc5ba964f24b411914106d4d0814
Merge: 12459bf 3909102
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Aug 15 10:28:50 2014 +0200

    Merge remote-tracking branch 'origin/master' into selective_sync

 .gitmodules                                        |   2 +-
 admin/win/nsi/l10n/Farsi.nsh                       |  46 +++++
 admin/win/nsi/l10n/languages.nsh                   |   1 +
 csync/src/csync_exclude.c                          |   5 +-
 csync/src/csync_statedb.c                          |  31 ++-
 csync/src/csync_update.c                           |   1 +
 csync/src/csync_util.c                             |   4 +-
 csync/tests/ownCloud/ownCloud/Test.pm              |   6 +-
 shell_integration/nautilus/ownCloud.py             |  33 +++-
 src/3rdparty/qtmacgoodies                          |   2 +-
 src/CMakeLists.txt                                 |   3 +-
 src/creds/shibbolethcredentials.cpp                |  20 --
 src/creds/shibbolethcredentials.h                  |   1 -
 src/mirall/application.cpp                         |   4 +
 .../shibboleth => mirall}/authenticationdialog.cpp |   0
 .../shibboleth => mirall}/authenticationdialog.h   |   0
 src/mirall/folder.cpp                              |   2 +-
 src/mirall/generalsettings.cpp                     |   1 +
 src/mirall/mirallaccessmanager.cpp                 |  32 +++-
 src/mirall/mirallaccessmanager.h                   |   2 +
 src/mirall/networkjobs.cpp                         |   4 +-
 src/mirall/owncloudgui.cpp                         |  15 ++
 src/mirall/owncloudsetupwizard.cpp                 |  11 ++
 src/mirall/owncloudsetupwizard.h                   |   1 +
 src/mirall/owncloudtheme.cpp                       |   6 +-
 src/mirall/syncengine.cpp                          |   4 +
 src/mirall/syncjournaldb.cpp                       |  23 ++-
 src/mirall/theme.cpp                               |   4 +-
 src/mirall/utility.cpp                             |   1 +
 src/wizard/owncloudwizard.cpp                      |   6 +
 src/wizard/owncloudwizard.h                        |   1 +
 translations/mirall_ca.ts                          | 161 ++++++++--------
 translations/mirall_cs.ts                          | 161 ++++++++--------
 translations/mirall_de.ts                          | 161 ++++++++--------
 translations/mirall_el.ts                          | 162 ++++++++--------
 translations/mirall_en.ts                          | 157 ++++++++--------
 translations/mirall_es.ts                          | 161 ++++++++--------
 translations/mirall_es_AR.ts                       | 159 ++++++++--------
 translations/mirall_et.ts                          | 161 ++++++++--------
 translations/mirall_eu.ts                          | 161 ++++++++--------
 translations/mirall_fa.ts                          | 207 +++++++++++----------
 translations/mirall_fi.ts                          | 159 ++++++++--------
 translations/mirall_fr.ts                          | 163 ++++++++--------
 translations/mirall_gl.ts                          | 167 +++++++++--------
 translations/mirall_hu.ts                          | 157 ++++++++--------
 translations/mirall_it.ts                          | 161 ++++++++--------
 translations/mirall_ja.ts                          | 161 ++++++++--------
 translations/mirall_nl.ts                          | 161 ++++++++--------
 translations/mirall_pl.ts                          | 161 ++++++++--------
 translations/mirall_pt.ts                          | 161 ++++++++--------
 translations/mirall_pt_BR.ts                       | 161 ++++++++--------
 translations/mirall_ru.ts                          | 161 ++++++++--------
 translations/mirall_sk.ts                          | 161 ++++++++--------
 translations/mirall_sl.ts                          | 161 ++++++++--------
 translations/mirall_sv.ts                          | 161 ++++++++--------
 translations/mirall_th.ts                          | 157 ++++++++--------
 translations/mirall_tr.ts                          | 161 ++++++++--------
 translations/mirall_uk.ts                          | 157 ++++++++--------
 translations/mirall_zh_CN.ts                       | 159 ++++++++--------
 translations/mirall_zh_TW.ts                       | 157 ++++++++--------
 60 files changed, 2640 insertions(+), 2330 deletions(-)


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