[Pkg-owncloud-commits] [owncloud-client] 26/470: Merge remote-tracking branch 'origin/2.1'

[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 41d8d77535e39644c84756775bb703e469032115
Merge: e9307bb c98bf17
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed Feb 10 12:57:03 2016 +0100

    Merge remote-tracking branch 'origin/2.1'

 ChangeLog                                      | 5 +++--
 admin/win/nsi/l10n/Portuguese.nsh              | 2 +-
 admin/win/nsi/l10n/SpanishInternational.nsh    | 2 +-
 admin/win/nsi/l10n/bin/build_locale_nsi.py     | 5 +++--
 shell_integration/nautilus/createnemoplugin.sh | 2 +-
 shell_integration/nautilus/setappname.sh       | 2 +-
 translations/client_ca.ts                      | 2 +-
 translations/client_cs.ts                      | 2 +-
 translations/client_de.ts                      | 2 +-
 translations/client_el.ts                      | 2 +-
 translations/client_en.ts                      | 2 +-
 translations/client_es.ts                      | 2 +-
 translations/client_es_AR.ts                   | 2 +-
 translations/client_et.ts                      | 2 +-
 translations/client_eu.ts                      | 4 ++--
 translations/client_fa.ts                      | 2 +-
 translations/client_fi.ts                      | 2 +-
 translations/client_fr.ts                      | 4 ++--
 translations/client_gl.ts                      | 2 +-
 translations/client_hu.ts                      | 2 +-
 translations/client_it.ts                      | 2 +-
 translations/client_ja.ts                      | 2 +-
 translations/client_nb_NO.ts                   | 2 +-
 translations/client_nl.ts                      | 2 +-
 translations/client_pl.ts                      | 2 +-
 translations/client_pt.ts                      | 2 +-
 translations/client_pt_BR.ts                   | 2 +-
 translations/client_ru.ts                      | 2 +-
 translations/client_sk.ts                      | 2 +-
 translations/client_sl.ts                      | 2 +-
 translations/client_sr.ts                      | 2 +-
 translations/client_sv.ts                      | 2 +-
 translations/client_th.ts                      | 2 +-
 translations/client_tr.ts                      | 2 +-
 translations/client_uk.ts                      | 2 +-
 translations/client_zh_CN.ts                   | 2 +-
 translations/client_zh_TW.ts                   | 2 +-
 37 files changed, 43 insertions(+), 41 deletions(-)

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