[Pkg-owncloud-commits] [owncloud] 171/239: Merge branch 'master' into encryption_initial_enc_indicator
David Prévot
taffit at moszumanska.debian.org
Fri Nov 29 01:32:34 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 7240d349da32af187b1920d8cf1cf67d81d268a1
Merge: c7e1fe5 1fef97f
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date: Tue Nov 26 19:15:53 2013 +0100
Merge branch 'master' into encryption_initial_enc_indicator
apps/files/l10n/cs_CZ.php | 1 +
apps/files/l10n/fr.php | 1 +
apps/files/l10n/sv.php | 2 +
apps/files_encryption/l10n/cs_CZ.php | 1 +
apps/files_encryption/l10n/sv.php | 1 +
apps/files_external/3rdparty/smb4php/smb.php | 16 +++++++-
apps/files_external/lib/dropbox.php | 56 ++++++++++++++++++++++------
apps/files_external/lib/sftp.php | 3 ++
apps/files_external/lib/streamwrapper.php | 3 +-
apps/files_external/tests/dropbox.php | 16 ++++++++
apps/files_external/tests/smb.php | 5 +++
apps/files_sharing/l10n/cs_CZ.php | 3 +-
apps/files_versions/lib/versions.php | 23 ++++++------
apps/user_ldap/l10n/cs_CZ.php | 10 +++++
apps/user_ldap/l10n/sv.php | 4 ++
core/command/maintenance/repair.php | 41 ++++++++++++++++++++
core/js/update.js | 2 +-
core/l10n/ca.php | 6 +--
core/l10n/cs_CZ.php | 12 +++++-
core/l10n/da.php | 6 +--
core/l10n/de.php | 8 ++--
core/l10n/de_DE.php | 8 ++--
core/l10n/el.php | 6 +--
core/l10n/en_GB.php | 6 +--
core/l10n/es.php | 6 +--
core/l10n/et_EE.php | 6 +--
core/l10n/fi_FI.php | 6 ++-
core/l10n/fr.php | 7 ++--
core/l10n/gl.php | 22 ++++++-----
core/l10n/hu_HU.php | 6 +--
core/l10n/it.php | 9 +++--
core/l10n/ja_JP.php | 6 +--
core/l10n/lb.php | 4 +-
core/l10n/lt_LT.php | 6 +--
core/l10n/mk.php | 6 +--
core/l10n/nl.php | 6 +--
core/l10n/pl.php | 4 +-
core/l10n/pt_BR.php | 6 +--
core/l10n/ru.php | 6 +--
core/l10n/sk_SK.php | 4 +-
core/l10n/sl.php | 6 +--
core/l10n/sv.php | 7 ++--
core/l10n/tr.php | 8 ++--
core/l10n/zh_TW.php | 6 +--
core/register_command.php | 1 +
l10n/ach/core.po | 38 ++++++++++++-------
l10n/ach/settings.po | 8 ++--
l10n/ady/core.po | 38 ++++++++++++-------
l10n/ady/settings.po | 8 ++--
l10n/af/core.po | 38 ++++++++++++-------
l10n/af/settings.po | 8 ++--
l10n/af_ZA/core.po | 38 ++++++++++++-------
l10n/af_ZA/settings.po | 8 ++--
l10n/ar/core.po | 38 ++++++++++++-------
l10n/ar/settings.po | 8 ++--
l10n/be/core.po | 38 ++++++++++++-------
l10n/be/settings.po | 8 ++--
l10n/bg_BG/core.po | 38 ++++++++++++-------
l10n/bg_BG/settings.po | 8 ++--
l10n/bn_BD/core.po | 38 ++++++++++++-------
l10n/bn_BD/settings.po | 8 ++--
l10n/bs/core.po | 38 ++++++++++++-------
l10n/bs/settings.po | 8 ++--
l10n/ca/core.po | 38 ++++++++++++-------
l10n/ca/settings.po | 10 ++---
l10n/cs_CZ/core.po | 51 +++++++++++++++----------
l10n/cs_CZ/files.po | 13 ++++---
l10n/cs_CZ/files_encryption.po | 9 +++--
l10n/cs_CZ/files_sharing.po | 9 +++--
l10n/cs_CZ/lib.po | 15 ++++----
l10n/cs_CZ/settings.po | 31 +++++++--------
l10n/cs_CZ/user_ldap.po | 27 +++++++-------
l10n/cy_GB/core.po | 38 ++++++++++++-------
l10n/cy_GB/settings.po | 8 ++--
l10n/da/core.po | 38 ++++++++++++-------
l10n/da/settings.po | 10 ++---
l10n/de/core.po | 41 +++++++++++++-------
l10n/de/settings.po | 13 ++++---
l10n/de_AT/core.po | 38 ++++++++++++-------
l10n/de_AT/settings.po | 8 ++--
l10n/de_CH/core.po | 38 ++++++++++++-------
l10n/de_CH/settings.po | 10 ++---
l10n/de_DE/core.po | 40 +++++++++++++-------
l10n/de_DE/settings.po | 12 +++---
l10n/el/core.po | 40 +++++++++++++-------
l10n/el/settings.po | 50 ++++++++++++-------------
l10n/en at pirate/core.po | 38 ++++++++++++-------
l10n/en at pirate/settings.po | 8 ++--
l10n/en_GB/core.po | 40 +++++++++++++-------
l10n/en_GB/settings.po | 16 ++++----
l10n/eo/core.po | 38 ++++++++++++-------
l10n/eo/settings.po | 8 ++--
l10n/es/core.po | 38 ++++++++++++-------
l10n/es/settings.po | 10 ++---
l10n/es_AR/core.po | 38 ++++++++++++-------
l10n/es_AR/settings.po | 10 ++---
l10n/es_MX/core.po | 38 ++++++++++++-------
l10n/es_MX/settings.po | 8 ++--
l10n/et_EE/core.po | 40 +++++++++++++-------
l10n/et_EE/settings.po | 12 +++---
l10n/eu/core.po | 38 ++++++++++++-------
l10n/eu/settings.po | 8 ++--
l10n/fa/core.po | 38 ++++++++++++-------
l10n/fa/settings.po | 8 ++--
l10n/fi_FI/core.po | 40 +++++++++++++-------
l10n/fi_FI/settings.po | 14 +++----
l10n/fr/core.po | 40 +++++++++++++-------
l10n/fr/files.po | 12 +++---
l10n/fr/lib.po | 15 ++++----
l10n/fr/settings.po | 16 ++++----
l10n/gl/core.po | 54 ++++++++++++++++-----------
l10n/gl/settings.po | 10 ++---
l10n/he/core.po | 38 ++++++++++++-------
l10n/he/settings.po | 8 ++--
l10n/hi/core.po | 38 ++++++++++++-------
l10n/hi/settings.po | 8 ++--
l10n/hr/core.po | 38 ++++++++++++-------
l10n/hr/settings.po | 8 ++--
l10n/hu_HU/core.po | 38 ++++++++++++-------
l10n/hu_HU/settings.po | 10 ++---
l10n/hy/core.po | 38 ++++++++++++-------
l10n/hy/settings.po | 8 ++--
l10n/ia/core.po | 38 ++++++++++++-------
l10n/ia/settings.po | 8 ++--
l10n/id/core.po | 38 ++++++++++++-------
l10n/id/settings.po | 8 ++--
l10n/is/core.po | 38 ++++++++++++-------
l10n/is/settings.po | 8 ++--
l10n/it/core.po | 40 +++++++++++++-------
l10n/it/settings.po | 10 ++---
l10n/ja_JP/core.po | 40 +++++++++++++-------
l10n/ja_JP/settings.po | 10 ++---
l10n/ka/core.po | 38 ++++++++++++-------
l10n/ka/settings.po | 8 ++--
l10n/ka_GE/core.po | 38 ++++++++++++-------
l10n/ka_GE/settings.po | 8 ++--
l10n/km/core.po | 38 ++++++++++++-------
l10n/km/settings.po | 8 ++--
l10n/kn/core.po | 38 ++++++++++++-------
l10n/kn/settings.po | 8 ++--
l10n/ko/core.po | 38 ++++++++++++-------
l10n/ko/settings.po | 8 ++--
l10n/ku_IQ/core.po | 38 ++++++++++++-------
l10n/ku_IQ/settings.po | 8 ++--
l10n/lb/core.po | 38 ++++++++++++-------
l10n/lb/settings.po | 8 ++--
l10n/lt_LT/core.po | 38 ++++++++++++-------
l10n/lt_LT/settings.po | 10 ++---
l10n/lv/core.po | 38 ++++++++++++-------
l10n/lv/settings.po | 10 ++---
l10n/mk/core.po | 38 ++++++++++++-------
l10n/mk/settings.po | 8 ++--
l10n/ml_IN/core.po | 38 ++++++++++++-------
l10n/ml_IN/settings.po | 8 ++--
l10n/ms_MY/core.po | 38 ++++++++++++-------
l10n/ms_MY/settings.po | 8 ++--
l10n/my_MM/core.po | 38 ++++++++++++-------
l10n/my_MM/settings.po | 8 ++--
l10n/nb_NO/core.po | 38 ++++++++++++-------
l10n/nb_NO/settings.po | 8 ++--
l10n/nds/core.po | 38 ++++++++++++-------
l10n/nds/settings.po | 8 ++--
l10n/ne/core.po | 38 ++++++++++++-------
l10n/ne/settings.po | 8 ++--
l10n/nl/core.po | 38 ++++++++++++-------
l10n/nl/settings.po | 10 ++---
l10n/nn_NO/core.po | 38 ++++++++++++-------
l10n/nn_NO/settings.po | 10 ++---
l10n/nqo/core.po | 38 ++++++++++++-------
l10n/nqo/settings.po | 8 ++--
l10n/oc/core.po | 38 ++++++++++++-------
l10n/oc/settings.po | 8 ++--
l10n/pa/core.po | 38 ++++++++++++-------
l10n/pa/settings.po | 8 ++--
l10n/pl/core.po | 38 ++++++++++++-------
l10n/pl/settings.po | 10 ++---
l10n/pt_BR/core.po | 40 +++++++++++++-------
l10n/pt_BR/settings.po | 12 +++---
l10n/pt_PT/core.po | 38 ++++++++++++-------
l10n/pt_PT/settings.po | 10 ++---
l10n/ro/core.po | 38 ++++++++++++-------
l10n/ro/settings.po | 8 ++--
l10n/ru/core.po | 38 ++++++++++++-------
l10n/ru/settings.po | 10 ++---
l10n/ru_RU/core.po | 38 ++++++++++++-------
l10n/ru_RU/settings.po | 8 ++--
l10n/si_LK/core.po | 38 ++++++++++++-------
l10n/si_LK/settings.po | 8 ++--
l10n/sk/core.po | 38 ++++++++++++-------
l10n/sk/settings.po | 8 ++--
l10n/sk_SK/core.po | 38 ++++++++++++-------
l10n/sk_SK/settings.po | 10 ++---
l10n/sl/core.po | 40 +++++++++++++-------
l10n/sl/lib.po | 20 +++++-----
l10n/sl/settings.po | 10 ++---
l10n/sl/user_ldap.po | 4 +-
l10n/sq/core.po | 38 ++++++++++++-------
l10n/sq/settings.po | 8 ++--
l10n/sr/core.po | 38 ++++++++++++-------
l10n/sr/settings.po | 8 ++--
l10n/sr at latin/core.po | 38 ++++++++++++-------
l10n/sr at latin/settings.po | 8 ++--
l10n/sv/core.po | 40 +++++++++++++-------
l10n/sv/files.po | 15 ++++----
l10n/sv/files_encryption.po | 9 +++--
l10n/sv/lib.po | 15 ++++----
l10n/sv/settings.po | 17 +++++----
l10n/sv/user_ldap.po | 14 +++----
l10n/sw_KE/core.po | 38 ++++++++++++-------
l10n/sw_KE/settings.po | 8 ++--
l10n/ta_LK/core.po | 38 ++++++++++++-------
l10n/ta_LK/settings.po | 8 ++--
l10n/te/core.po | 38 ++++++++++++-------
l10n/te/settings.po | 8 ++--
l10n/templates/core.pot | 36 ++++++++++++------
l10n/templates/files.pot | 6 +--
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 8 ++--
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 16 ++++----
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 4 +-
l10n/templates/private.pot | 4 +-
l10n/templates/settings.pot | 6 +--
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/th_TH/core.po | 38 ++++++++++++-------
l10n/th_TH/settings.po | 8 ++--
l10n/tr/core.po | 40 +++++++++++++-------
l10n/tr/settings.po | 10 ++---
l10n/tzm/core.po | 38 ++++++++++++-------
l10n/tzm/settings.po | 8 ++--
l10n/ug/core.po | 38 ++++++++++++-------
l10n/ug/settings.po | 8 ++--
l10n/uk/core.po | 38 ++++++++++++-------
l10n/uk/settings.po | 8 ++--
l10n/ur_PK/core.po | 38 ++++++++++++-------
l10n/ur_PK/settings.po | 8 ++--
l10n/uz/core.po | 38 ++++++++++++-------
l10n/uz/settings.po | 8 ++--
l10n/vi/core.po | 38 ++++++++++++-------
l10n/vi/settings.po | 8 ++--
l10n/zh_CN/core.po | 38 ++++++++++++-------
l10n/zh_CN/settings.po | 10 ++---
l10n/zh_HK/core.po | 38 ++++++++++++-------
l10n/zh_HK/settings.po | 8 ++--
l10n/zh_TW/core.po | 38 ++++++++++++-------
l10n/zh_TW/settings.po | 10 ++---
lib/l10n/cs_CZ.php | 1 +
lib/l10n/fr.php | 1 +
lib/l10n/sl.php | 5 +++
lib/l10n/sv.php | 1 +
lib/private/log/owncloud.php | 2 +
lib/private/repair.php | 21 +++++++++++
lib/private/request.php | 29 ++++++++++----
lib/private/updater.php | 6 ++-
settings/ajax/decryptall.php | 3 ++
settings/l10n/ca.php | 1 -
settings/l10n/cs_CZ.php | 11 +++++-
settings/l10n/da.php | 1 -
settings/l10n/de.php | 2 +-
settings/l10n/de_CH.php | 1 -
settings/l10n/de_DE.php | 2 +-
settings/l10n/el.php | 20 ++++++++++
settings/l10n/en_GB.php | 4 +-
settings/l10n/es.php | 1 -
settings/l10n/es_AR.php | 1 -
settings/l10n/et_EE.php | 1 -
settings/l10n/fi_FI.php | 3 +-
settings/l10n/fr.php | 4 +-
settings/l10n/gl.php | 2 +-
settings/l10n/hu_HU.php | 1 -
settings/l10n/it.php | 2 +-
settings/l10n/ja_JP.php | 1 -
settings/l10n/lt_LT.php | 1 -
settings/l10n/lv.php | 1 -
settings/l10n/nl.php | 1 -
settings/l10n/nn_NO.php | 1 -
settings/l10n/pl.php | 1 -
settings/l10n/pt_BR.php | 1 -
settings/l10n/pt_PT.php | 1 -
settings/l10n/ru.php | 1 -
settings/l10n/sk_SK.php | 1 -
settings/l10n/sv.php | 4 +-
settings/l10n/tr.php | 2 +-
settings/l10n/zh_CN.php | 1 -
settings/l10n/zh_TW.php | 1 -
tests/lib/files/storage/storage.php | 13 ++++++-
tests/lib/request.php | 11 ++++--
289 files changed, 3226 insertions(+), 1892 deletions(-)
--
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