[Pkg-owncloud-commits] [owncloud] 48/111: Merge branch 'master' into moviepreviewfallback
David Prévot
taffit at moszumanska.debian.org
Wed Nov 20 21:38:40 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 617dc0e468cd285a28f337c565f9f9ae1aa2e85f
Merge: 99ee95d ecc7b01
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date: Thu Nov 14 20:57:29 2013 +0100
Merge branch 'master' into moviepreviewfallback
Conflicts:
lib/private/preview/movies.php
apps/files/ajax/list.php | 2 +-
apps/files/index.php | 3 +-
apps/files/js/file-upload.js | 11 +-
apps/files/js/filelist.js | 12 +-
apps/files/js/files.js | 2 +-
apps/files/l10n/pt_BR.php | 1 +
apps/files/l10n/ru_RU.php | 1 +
apps/files/l10n/uz.php | 7 +
apps/files_encryption/l10n/pt_BR.php | 1 +
apps/files_encryption/lib/helper.php | 43 ++++++
apps/files_encryption/lib/keymanager.php | 54 +------
apps/files_encryption/lib/proxy.php | 6 +-
apps/files_encryption/lib/util.php | 5 +-
apps/files_encryption/tests/helper.php | 54 +++++++
apps/files_encryption/tests/keymanager.php | 17 ---
apps/files_external/css/settings.css | 4 +
apps/files_sharing/lib/sharedstorage.php | 110 ++++++-------
apps/files_sharing/lib/watcher.php | 27 +++-
apps/files_sharing/tests/api.php | 111 +-------------
apps/files_sharing/tests/base.php | 143 +++++++++++++++++
apps/files_sharing/tests/watcher.php | 161 ++++++++++++++++++++
apps/files_trashbin/l10n/ms_MY.php | 9 +-
apps/files_trashbin/lib/trashbin.php | 1 +
apps/files_versions/js/versions.js | 2 +-
apps/files_versions/l10n/ms_MY.php | 10 ++
apps/files_versions/lib/versions.php | 3 +
apps/user_ldap/css/settings.css | 8 +-
apps/user_ldap/js/settings.js | 27 ++--
apps/user_ldap/l10n/ar.php | 1 +
apps/user_ldap/l10n/bg_BG.php | 1 +
apps/user_ldap/l10n/bn_BD.php | 1 +
apps/user_ldap/l10n/bs.php | 3 +-
apps/user_ldap/l10n/ca.php | 1 +
apps/user_ldap/l10n/cs_CZ.php | 1 +
apps/user_ldap/l10n/cy_GB.php | 1 +
apps/user_ldap/l10n/da.php | 1 +
apps/user_ldap/l10n/de.php | 1 +
apps/user_ldap/l10n/de_CH.php | 1 +
apps/user_ldap/l10n/de_DE.php | 1 +
apps/user_ldap/l10n/el.php | 1 +
apps/user_ldap/l10n/en_GB.php | 1 +
apps/user_ldap/l10n/eo.php | 1 +
apps/user_ldap/l10n/es.php | 1 +
apps/user_ldap/l10n/es_AR.php | 1 +
apps/user_ldap/l10n/et_EE.php | 1 +
apps/user_ldap/l10n/eu.php | 1 +
apps/user_ldap/l10n/fa.php | 1 +
apps/user_ldap/l10n/fi_FI.php | 1 +
apps/user_ldap/l10n/fr.php | 1 +
apps/user_ldap/l10n/gl.php | 1 +
apps/user_ldap/l10n/he.php | 1 +
apps/user_ldap/l10n/hi.php | 1 +
apps/user_ldap/l10n/hr.php | 1 +
apps/user_ldap/l10n/hu_HU.php | 1 +
apps/user_ldap/l10n/hy.php | 3 +-
apps/user_ldap/l10n/ia.php | 1 +
apps/user_ldap/l10n/id.php | 1 +
apps/user_ldap/l10n/is.php | 1 +
apps/user_ldap/l10n/it.php | 1 +
apps/user_ldap/l10n/ja_JP.php | 1 +
apps/user_ldap/l10n/ka_GE.php | 1 +
apps/user_ldap/l10n/ko.php | 1 +
apps/user_ldap/l10n/ku_IQ.php | 1 +
apps/user_ldap/l10n/lb.php | 1 +
apps/user_ldap/l10n/lt_LT.php | 1 +
apps/user_ldap/l10n/lv.php | 1 +
apps/user_ldap/l10n/mk.php | 7 +
apps/user_ldap/l10n/ms_MY.php | 1 +
apps/user_ldap/l10n/nb_NO.php | 1 +
apps/user_ldap/l10n/nl.php | 1 +
apps/user_ldap/l10n/nn_NO.php | 1 +
apps/user_ldap/l10n/oc.php | 1 +
apps/user_ldap/l10n/pl.php | 1 +
apps/user_ldap/l10n/pt_BR.php | 2 +
apps/user_ldap/l10n/pt_PT.php | 1 +
apps/user_ldap/l10n/ro.php | 1 +
apps/user_ldap/l10n/ru.php | 65 ++++----
apps/user_ldap/l10n/ru_RU.php | 1 +
apps/user_ldap/l10n/si_LK.php | 1 +
apps/user_ldap/l10n/sk_SK.php | 1 +
apps/user_ldap/l10n/sl.php | 1 +
apps/user_ldap/l10n/sq.php | 1 +
apps/user_ldap/l10n/sr.php | 1 +
apps/user_ldap/l10n/sr at latin.php | 1 +
apps/user_ldap/l10n/sv.php | 1 +
apps/user_ldap/l10n/ta_LK.php | 1 +
apps/user_ldap/l10n/te.php | 1 +
apps/user_ldap/l10n/th_TH.php | 1 +
apps/user_ldap/l10n/tr.php | 1 +
apps/user_ldap/l10n/ug.php | 1 +
apps/user_ldap/l10n/uk.php | 1 +
apps/user_ldap/l10n/uz.php | 6 +
apps/user_ldap/l10n/vi.php | 1 +
apps/user_ldap/l10n/zh_CN.php | 1 +
apps/user_ldap/l10n/zh_HK.php | 1 +
apps/user_ldap/l10n/zh_TW.php | 1 +
apps/user_ldap/lib/wizard.php | 46 +++---
apps/user_ldap/templates/part.wizard-server.php | 4 +-
apps/user_ldap/templates/settings.php | 3 +-
apps/user_webdavauth/l10n/ms_MY.php | 7 +
config/config.sample.php | 6 +-
core/css/styles.css | 3 +-
core/l10n/uz.php | 9 ++
l10n/ach/user_ldap.po | 8 +-
l10n/ady/user_ldap.po | 8 +-
l10n/af/user_ldap.po | 8 +-
l10n/af_ZA/core.po | 50 +++---
l10n/af_ZA/files_sharing.po | 6 +-
l10n/af_ZA/settings.po | 4 +-
l10n/af_ZA/user_ldap.po | 8 +-
l10n/ar/core.po | 50 +++---
l10n/ar/files.po | 66 ++++----
l10n/ar/files_sharing.po | 6 +-
l10n/ar/settings.po | 4 +-
l10n/ar/user_ldap.po | 8 +-
l10n/be/user_ldap.po | 8 +-
l10n/bg_BG/core.po | 50 +++---
l10n/bg_BG/files.po | 66 ++++----
l10n/bg_BG/files_sharing.po | 6 +-
l10n/bg_BG/settings.po | 4 +-
l10n/bg_BG/user_ldap.po | 8 +-
l10n/bn_BD/core.po | 50 +++---
l10n/bn_BD/files.po | 66 ++++----
l10n/bn_BD/files_sharing.po | 6 +-
l10n/bn_BD/settings.po | 4 +-
l10n/bn_BD/user_ldap.po | 8 +-
l10n/bs/files.po | 66 ++++----
l10n/bs/user_ldap.po | 8 +-
l10n/ca/core.po | 4 +-
l10n/ca/files.po | 18 +--
l10n/ca/files_sharing.po | 6 +-
l10n/ca/settings.po | 14 +-
l10n/ca/user_ldap.po | 10 +-
l10n/cs_CZ/core.po | 4 +-
l10n/cs_CZ/files.po | 66 ++++----
l10n/cs_CZ/files_sharing.po | 6 +-
l10n/cs_CZ/settings.po | 4 +-
l10n/cs_CZ/user_ldap.po | 8 +-
l10n/cy_GB/core.po | 50 +++---
l10n/cy_GB/files.po | 66 ++++----
l10n/cy_GB/files_sharing.po | 6 +-
l10n/cy_GB/settings.po | 4 +-
l10n/cy_GB/user_ldap.po | 8 +-
l10n/da/core.po | 4 +-
l10n/da/files.po | 66 ++++----
l10n/da/files_sharing.po | 6 +-
l10n/da/settings.po | 4 +-
l10n/da/user_ldap.po | 8 +-
l10n/de/core.po | 4 +-
l10n/de/files.po | 18 +--
l10n/de/files_sharing.po | 6 +-
l10n/de/settings.po | 14 +-
l10n/de/user_ldap.po | 10 +-
l10n/de_AT/user_ldap.po | 8 +-
l10n/de_CH/core.po | 4 +-
l10n/de_CH/files.po | 66 ++++----
l10n/de_CH/files_sharing.po | 6 +-
l10n/de_CH/settings.po | 4 +-
l10n/de_CH/user_ldap.po | 8 +-
l10n/de_DE/core.po | 4 +-
l10n/de_DE/files.po | 18 +--
l10n/de_DE/files_sharing.po | 6 +-
l10n/de_DE/settings.po | 14 +-
l10n/de_DE/user_ldap.po | 10 +-
l10n/el/core.po | 4 +-
l10n/el/files.po | 66 ++++----
l10n/el/files_sharing.po | 6 +-
l10n/el/settings.po | 4 +-
l10n/el/user_ldap.po | 8 +-
l10n/en at pirate/core.po | 50 +++---
l10n/en at pirate/files_sharing.po | 6 +-
l10n/en at pirate/settings.po | 4 +-
l10n/en at pirate/user_ldap.po | 8 +-
l10n/en_GB/core.po | 4 +-
l10n/en_GB/files.po | 18 +--
l10n/en_GB/files_sharing.po | 6 +-
l10n/en_GB/settings.po | 4 +-
l10n/en_GB/user_ldap.po | 10 +-
l10n/eo/core.po | 50 +++---
l10n/eo/files.po | 18 +--
l10n/eo/files_sharing.po | 4 +-
l10n/eo/settings.po | 4 +-
l10n/eo/user_ldap.po | 10 +-
l10n/es/core.po | 4 +-
l10n/es/files.po | 18 +--
l10n/es/files_sharing.po | 6 +-
l10n/es/settings.po | 14 +-
l10n/es/user_ldap.po | 10 +-
l10n/es_AR/core.po | 4 +-
l10n/es_AR/files.po | 66 ++++----
l10n/es_AR/files_sharing.po | 6 +-
l10n/es_AR/settings.po | 4 +-
l10n/es_AR/user_ldap.po | 8 +-
l10n/es_MX/user_ldap.po | 8 +-
l10n/et_EE/core.po | 4 +-
l10n/et_EE/files.po | 18 +--
l10n/et_EE/files_sharing.po | 6 +-
l10n/et_EE/settings.po | 14 +-
l10n/et_EE/user_ldap.po | 10 +-
l10n/eu/core.po | 50 +++---
l10n/eu/files.po | 66 ++++----
l10n/eu/files_sharing.po | 6 +-
l10n/eu/settings.po | 4 +-
l10n/eu/user_ldap.po | 8 +-
l10n/fa/core.po | 4 +-
l10n/fa/files.po | 66 ++++----
l10n/fa/files_sharing.po | 6 +-
l10n/fa/settings.po | 4 +-
l10n/fa/user_ldap.po | 8 +-
l10n/fi_FI/core.po | 50 +++---
l10n/fi_FI/files.po | 18 +--
l10n/fi_FI/files_sharing.po | 6 +-
l10n/fi_FI/settings.po | 16 +-
l10n/fi_FI/user_ldap.po | 8 +-
l10n/fr/core.po | 4 +-
l10n/fr/files.po | 18 +--
l10n/fr/files_sharing.po | 6 +-
l10n/fr/settings.po | 14 +-
l10n/fr/user_ldap.po | 10 +-
l10n/gl/core.po | 4 +-
l10n/gl/files.po | 18 +--
l10n/gl/files_sharing.po | 6 +-
l10n/gl/settings.po | 14 +-
l10n/gl/user_ldap.po | 10 +-
l10n/he/core.po | 50 +++---
l10n/he/files.po | 66 ++++----
l10n/he/files_sharing.po | 6 +-
l10n/he/settings.po | 4 +-
l10n/he/user_ldap.po | 8 +-
l10n/hi/core.po | 50 +++---
l10n/hi/files.po | 66 ++++----
l10n/hi/files_sharing.po | 6 +-
l10n/hi/settings.po | 4 +-
l10n/hi/user_ldap.po | 8 +-
l10n/hr/core.po | 50 +++---
l10n/hr/files.po | 66 ++++----
l10n/hr/files_sharing.po | 6 +-
l10n/hr/settings.po | 4 +-
l10n/hr/user_ldap.po | 8 +-
l10n/hu_HU/core.po | 4 +-
l10n/hu_HU/files.po | 66 ++++----
l10n/hu_HU/files_sharing.po | 6 +-
l10n/hu_HU/settings.po | 4 +-
l10n/hu_HU/user_ldap.po | 8 +-
l10n/hy/files.po | 66 ++++----
l10n/hy/user_ldap.po | 8 +-
l10n/ia/core.po | 50 +++---
l10n/ia/files.po | 66 ++++----
l10n/ia/files_sharing.po | 6 +-
l10n/ia/settings.po | 4 +-
l10n/ia/user_ldap.po | 8 +-
l10n/id/core.po | 50 +++---
l10n/id/files.po | 66 ++++----
l10n/id/files_sharing.po | 6 +-
l10n/id/settings.po | 4 +-
l10n/id/user_ldap.po | 8 +-
l10n/is/core.po | 50 +++---
l10n/is/files.po | 66 ++++----
l10n/is/files_sharing.po | 6 +-
l10n/is/settings.po | 4 +-
l10n/is/user_ldap.po | 8 +-
l10n/it/core.po | 4 +-
l10n/it/files.po | 66 ++++----
l10n/it/files_sharing.po | 4 +-
l10n/it/settings.po | 14 +-
l10n/it/user_ldap.po | 10 +-
l10n/ja_JP/core.po | 4 +-
l10n/ja_JP/files.po | 66 ++++----
l10n/ja_JP/files_sharing.po | 6 +-
l10n/ja_JP/settings.po | 4 +-
l10n/ja_JP/user_ldap.po | 8 +-
l10n/ka/core.po | 50 +++---
l10n/ka/files_sharing.po | 6 +-
l10n/ka/settings.po | 4 +-
l10n/ka/user_ldap.po | 8 +-
l10n/ka_GE/core.po | 50 +++---
l10n/ka_GE/files.po | 66 ++++----
l10n/ka_GE/files_sharing.po | 6 +-
l10n/ka_GE/settings.po | 4 +-
l10n/ka_GE/user_ldap.po | 8 +-
l10n/km/user_ldap.po | 8 +-
l10n/kn/user_ldap.po | 8 +-
l10n/ko/core.po | 52 +++----
l10n/ko/files.po | 68 ++++-----
l10n/ko/files_sharing.po | 8 +-
l10n/ko/settings.po | 6 +-
l10n/ko/user_ldap.po | 8 +-
l10n/ku_IQ/core.po | 50 +++---
l10n/ku_IQ/files.po | 66 ++++----
l10n/ku_IQ/files_sharing.po | 6 +-
l10n/ku_IQ/settings.po | 4 +-
l10n/ku_IQ/user_ldap.po | 8 +-
l10n/lb/core.po | 4 +-
l10n/lb/files.po | 18 +--
l10n/lb/files_sharing.po | 6 +-
l10n/lb/settings.po | 4 +-
l10n/lb/user_ldap.po | 8 +-
l10n/lt_LT/core.po | 50 +++---
l10n/lt_LT/files.po | 66 ++++----
l10n/lt_LT/files_sharing.po | 6 +-
l10n/lt_LT/settings.po | 4 +-
l10n/lt_LT/user_ldap.po | 8 +-
l10n/lv/core.po | 50 +++---
l10n/lv/files.po | 66 ++++----
l10n/lv/files_sharing.po | 6 +-
l10n/lv/settings.po | 4 +-
l10n/lv/user_ldap.po | 8 +-
l10n/mk/core.po | 50 +++---
l10n/mk/files.po | 66 ++++----
l10n/mk/files_sharing.po | 6 +-
l10n/mk/settings.po | 4 +-
l10n/mk/user_ldap.po | 21 ++-
l10n/ml_IN/user_ldap.po | 8 +-
l10n/ms_MY/core.po | 50 +++---
l10n/ms_MY/files.po | 66 ++++----
l10n/ms_MY/files_sharing.po | 6 +-
l10n/ms_MY/files_trashbin.po | 23 +--
l10n/ms_MY/files_versions.po | 31 ++--
l10n/ms_MY/settings.po | 4 +-
l10n/ms_MY/user_ldap.po | 8 +-
l10n/ms_MY/user_webdavauth.po | 15 +-
l10n/my_MM/core.po | 50 +++---
l10n/my_MM/files_sharing.po | 6 +-
l10n/my_MM/settings.po | 4 +-
l10n/my_MM/user_ldap.po | 8 +-
l10n/nb_NO/core.po | 50 +++---
l10n/nb_NO/files.po | 66 ++++----
l10n/nb_NO/files_sharing.po | 6 +-
l10n/nb_NO/settings.po | 4 +-
l10n/nb_NO/user_ldap.po | 8 +-
l10n/nds/user_ldap.po | 8 +-
l10n/ne/user_ldap.po | 8 +-
l10n/nl/core.po | 4 +-
l10n/nl/files.po | 18 +--
l10n/nl/files_sharing.po | 6 +-
l10n/nl/settings.po | 4 +-
l10n/nl/user_ldap.po | 10 +-
l10n/nn_NO/core.po | 50 +++---
l10n/nn_NO/files.po | 66 ++++----
l10n/nn_NO/files_sharing.po | 6 +-
l10n/nn_NO/settings.po | 4 +-
l10n/nn_NO/user_ldap.po | 8 +-
l10n/nqo/user_ldap.po | 8 +-
l10n/oc/core.po | 50 +++---
l10n/oc/files.po | 66 ++++----
l10n/oc/files_sharing.po | 6 +-
l10n/oc/settings.po | 4 +-
l10n/oc/user_ldap.po | 8 +-
l10n/pa/core.po | 50 +++---
l10n/pa/files_sharing.po | 6 +-
l10n/pa/settings.po | 4 +-
l10n/pa/user_ldap.po | 8 +-
l10n/pl/core.po | 4 +-
l10n/pl/files.po | 66 ++++----
l10n/pl/files_sharing.po | 6 +-
l10n/pl/settings.po | 4 +-
l10n/pl/user_ldap.po | 8 +-
l10n/pt_BR/core.po | 4 +-
l10n/pt_BR/files.po | 70 ++++-----
l10n/pt_BR/files_encryption.po | 8 +-
l10n/pt_BR/files_sharing.po | 6 +-
l10n/pt_BR/settings.po | 26 ++--
l10n/pt_BR/user_ldap.po | 10 +-
l10n/pt_PT/core.po | 4 +-
l10n/pt_PT/files.po | 66 ++++----
l10n/pt_PT/files_sharing.po | 4 +-
l10n/pt_PT/settings.po | 4 +-
l10n/pt_PT/user_ldap.po | 8 +-
l10n/ro/core.po | 50 +++---
l10n/ro/files.po | 66 ++++----
l10n/ro/files_sharing.po | 6 +-
l10n/ro/settings.po | 4 +-
l10n/ro/user_ldap.po | 8 +-
l10n/ru/core.po | 4 +-
l10n/ru/files.po | 18 +--
l10n/ru/files_sharing.po | 6 +-
l10n/ru/settings.po | 32 ++--
l10n/ru/user_ldap.po | 75 ++++-----
l10n/ru_RU/core.po | 50 +++---
l10n/ru_RU/files.po | 68 ++++-----
l10n/ru_RU/files_sharing.po | 6 +-
l10n/ru_RU/settings.po | 4 +-
l10n/ru_RU/user_ldap.po | 8 +-
l10n/si_LK/core.po | 50 +++---
l10n/si_LK/files.po | 66 ++++----
l10n/si_LK/files_sharing.po | 6 +-
l10n/si_LK/settings.po | 4 +-
l10n/si_LK/user_ldap.po | 8 +-
l10n/sk/user_ldap.po | 8 +-
l10n/sk_SK/core.po | 50 +++---
l10n/sk_SK/files.po | 66 ++++----
l10n/sk_SK/files_sharing.po | 6 +-
l10n/sk_SK/settings.po | 4 +-
l10n/sk_SK/user_ldap.po | 8 +-
l10n/sl/core.po | 4 +-
l10n/sl/files.po | 66 ++++----
l10n/sl/files_sharing.po | 6 +-
l10n/sl/settings.po | 4 +-
l10n/sl/user_ldap.po | 8 +-
l10n/sq/core.po | 50 +++---
l10n/sq/files.po | 66 ++++----
l10n/sq/files_sharing.po | 6 +-
l10n/sq/settings.po | 4 +-
l10n/sq/user_ldap.po | 8 +-
l10n/sr/core.po | 50 +++---
l10n/sr/files.po | 66 ++++----
l10n/sr/files_sharing.po | 6 +-
l10n/sr/settings.po | 4 +-
l10n/sr/user_ldap.po | 8 +-
l10n/sr at latin/core.po | 50 +++---
l10n/sr at latin/files.po | 66 ++++----
l10n/sr at latin/files_sharing.po | 6 +-
l10n/sr at latin/settings.po | 4 +-
l10n/sr at latin/user_ldap.po | 8 +-
l10n/sv/core.po | 4 +-
l10n/sv/files.po | 66 ++++----
l10n/sv/files_sharing.po | 6 +-
l10n/sv/settings.po | 4 +-
l10n/sv/user_ldap.po | 8 +-
l10n/sw_KE/user_ldap.po | 8 +-
l10n/ta_LK/core.po | 50 +++---
l10n/ta_LK/files.po | 66 ++++----
l10n/ta_LK/files_sharing.po | 6 +-
l10n/ta_LK/settings.po | 4 +-
l10n/ta_LK/user_ldap.po | 8 +-
l10n/te/core.po | 50 +++---
l10n/te/files.po | 66 ++++----
l10n/te/files_sharing.po | 6 +-
l10n/te/settings.po | 4 +-
l10n/te/user_ldap.po | 8 +-
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 16 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 6 +-
l10n/templates/private.pot | 6 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 6 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/th_TH/core.po | 50 +++---
l10n/th_TH/files.po | 66 ++++----
l10n/th_TH/files_sharing.po | 6 +-
l10n/th_TH/settings.po | 4 +-
l10n/th_TH/user_ldap.po | 8 +-
l10n/tr/core.po | 4 +-
l10n/tr/files.po | 66 ++++----
l10n/tr/files_sharing.po | 6 +-
l10n/tr/settings.po | 14 +-
l10n/tr/user_ldap.po | 10 +-
l10n/tzm/user_ldap.po | 8 +-
l10n/ug/core.po | 50 +++---
l10n/ug/files.po | 66 ++++----
l10n/ug/files_sharing.po | 6 +-
l10n/ug/settings.po | 4 +-
l10n/ug/user_ldap.po | 8 +-
l10n/uk/core.po | 50 +++---
l10n/uk/files.po | 18 +--
l10n/uk/files_sharing.po | 6 +-
l10n/uk/settings.po | 4 +-
l10n/uk/user_ldap.po | 8 +-
l10n/ur_PK/core.po | 50 +++---
l10n/ur_PK/files_sharing.po | 6 +-
l10n/ur_PK/settings.po | 4 +-
l10n/ur_PK/user_ldap.po | 8 +-
l10n/{templates/core.pot => uz/core.po} | 32 ++--
l10n/{templates/files.pot => uz/files.po} | 42 +++--
.../files_encryption.po} | 38 ++---
.../files_external.pot => uz/files_external.po} | 24 +--
l10n/{ka => uz}/files_sharing.po | 14 +-
l10n/{ms_MY => uz}/files_trashbin.po | 16 +-
l10n/{ms_MY => uz}/files_versions.po | 20 +--
l10n/{templates/lib.pot => uz/lib.po} | 29 ++--
l10n/{ka => uz}/settings.po | 10 +-
l10n/{nqo => uz}/user_ldap.po | 12 +-
l10n/{ms_MY => uz}/user_webdavauth.po | 10 +-
l10n/vi/core.po | 50 +++---
l10n/vi/files.po | 66 ++++----
l10n/vi/files_sharing.po | 6 +-
l10n/vi/settings.po | 4 +-
l10n/vi/user_ldap.po | 8 +-
l10n/zh_CN/core.po | 4 +-
l10n/zh_CN/files.po | 66 ++++----
l10n/zh_CN/files_sharing.po | 6 +-
l10n/zh_CN/settings.po | 4 +-
l10n/zh_CN/user_ldap.po | 8 +-
l10n/zh_HK/core.po | 50 +++---
l10n/zh_HK/files.po | 66 ++++----
l10n/zh_HK/files_sharing.po | 6 +-
l10n/zh_HK/settings.po | 4 +-
l10n/zh_HK/user_ldap.po | 8 +-
l10n/zh_TW/core.po | 4 +-
l10n/zh_TW/files.po | 66 ++++----
l10n/zh_TW/files_sharing.po | 4 +-
l10n/zh_TW/settings.po | 4 +-
l10n/zh_TW/user_ldap.po | 8 +-
lib/base.php | 13 +-
lib/l10n/uz.php | 8 +
lib/private/api.php | 71 ++++++---
lib/private/connector/sabre/file.php | 28 +++-
lib/private/files/cache/homecache.php | 40 +++++
lib/private/files/cache/scanner.php | 5 +
lib/private/files/cache/watcher.php | 9 +-
lib/private/files/filesystem.php | 34 ++++-
lib/private/files/storage/common.php | 10 +-
lib/private/files/storage/home.php | 21 ++-
lib/private/preview/image.php | 4 +-
lib/private/preview/movies.php | 3 +-
lib/private/preview/mp3.php | 6 +-
lib/private/preview/office-cl.php | 3 +-
lib/private/preview/office-fallback.php | 3 +-
lib/private/setup.php | 15 +-
lib/public/share.php | 2 +-
settings/css/settings.css | 5 +
settings/l10n/ca.php | 4 +
settings/l10n/de.php | 4 +
settings/l10n/de_DE.php | 4 +
settings/l10n/es.php | 4 +
settings/l10n/et_EE.php | 4 +
settings/l10n/fi_FI.php | 5 +
settings/l10n/fr.php | 4 +
settings/l10n/gl.php | 4 +
settings/l10n/it.php | 4 +
settings/l10n/pt_BR.php | 10 ++
settings/l10n/ru.php | 20 ++-
settings/l10n/tr.php | 4 +
tests/lib/api.php | 128 ++++++++++++++++
tests/lib/files/cache/cache.php | 55 +++++--
tests/lib/files/cache/homecache.php | 95 ++++++++++++
tests/lib/files/cache/watcher.php | 3 +
tests/lib/files/filesystem.php | 121 ++++++++++++++-
tests/lib/files/storage/home.php | 29 +++-
version.php | 4 +-
535 files changed, 5632 insertions(+), 4279 deletions(-)
diff --cc lib/private/preview/movies.php
index 7e012ec,1802a20..28f130f
--- a/lib/private/preview/movies.php
+++ b/lib/private/preview/movies.php
@@@ -49,31 -31,18 +49,32 @@@ if (!\OC_Util::runningOnWindows())
$firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
file_put_contents($absPath, $firstmb);
- //$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
- $cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
+ if (self::$avconvBinary) {
+ $cmd = self::$avconvBinary . ' -an -y -ss 1'.
+ ' -i ' . escapeshellarg($absPath) .
+ ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath) .
+ ' > /dev/null 2>&1';
+ }
+ else {
+ $cmd = self::$ffmpegBinary . ' -y -ss 1' .
+ ' -i ' . escapeshellarg($absPath) .
+ ' -f mjpeg -vframes 1' .
+ ' -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) .
+ ' ' . escapeshellarg($tmpPath) .
+ ' > /dev/null 2>&1';
+ }
- shell_exec($cmd);
-
- $image = new \OC_Image();
- $image->loadFromFile($tmpPath);
+ exec($cmd, $output, $returnCode);
unlink($absPath);
- unlink($tmpPath);
- return $image->valid() ? $image : false;
+ if ($returnCode === 0) {
- $image = new \OC_Image($tmpPath);
++ $image = new \OC_Image();
++ $image->loadFromFile($tmpPath);
+ unlink($tmpPath);
+ return $image->valid() ? $image : false;
+ }
+ return false;
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list