[Pkg-owncloud-commits] [owncloud-client] 72/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 c418d679200762968a89c50dbf5e9a788818861d
Merge: 6e09e3a 745cf55
Author: Christian Kamm <mail at ckamm.de>
Date:   Thu Oct 15 15:54:09 2015 +0200

    Merge remote-tracking branch 'origin/2.0'

 admin/win/nsi/l10n/Farsi.nsh   |  28 +--
 admin/win/nsi/l10n/French.nsh  |   2 +-
 admin/win/nsi/l10n/Russian.nsh |   2 +-
 admin/win/nsi/l10n/Spanish.nsh |   2 +-
 admin/win/nsi/l10n/Turkish.nsh |   2 +-
 src/gui/application.cpp        |   2 +-
 translations/client_ca.ts      |  20 +-
 translations/client_cs.ts      |  20 +-
 translations/client_de.ts      | 104 +++++-----
 translations/client_el.ts      |  20 +-
 translations/client_en.ts      |  20 +-
 translations/client_es.ts      |  24 +--
 translations/client_es_AR.ts   |  20 +-
 translations/client_et.ts      |  20 +-
 translations/client_eu.ts      |  20 +-
 translations/client_fa.ts      | 425 +++++++++++++++++++++--------------------
 translations/client_fi.ts      |  20 +-
 translations/client_fr.ts      |  62 +++---
 translations/client_gl.ts      |  20 +-
 translations/client_hu.ts      | 135 ++++++-------
 translations/client_it.ts      |  20 +-
 translations/client_ja.ts      |  20 +-
 translations/client_nb_NO.ts   |  20 +-
 translations/client_nl.ts      |  20 +-
 translations/client_pl.ts      |  20 +-
 translations/client_pt.ts      |  20 +-
 translations/client_pt_BR.ts   |  20 +-
 translations/client_ru.ts      | 115 +++++------
 translations/client_sk.ts      |  20 +-
 translations/client_sl.ts      |  20 +-
 translations/client_sr.ts      | 106 +++++-----
 translations/client_sv.ts      |  20 +-
 translations/client_th.ts      |  20 +-
 translations/client_tr.ts      |  20 +-
 translations/client_uk.ts      |  20 +-
 translations/client_zh_CN.ts   |  64 +++----
 translations/client_zh_TW.ts   |  48 ++---
 37 files changed, 787 insertions(+), 774 deletions(-)


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