[Pkg-owncloud-commits] [owncloud] 66/69: Merge tag 'upstream/7_20140509+dfsg'
David Prévot
taffit at moszumanska.debian.org
Sat May 10 16:20:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 4f3f9d065eddc4886e3d772ee0fa665f11c8f6cd
Merge: 88bf632 eaed023
Author: David Prévot <taffit at debian.org>
Date: Sat May 10 11:09:37 2014 -0400
Merge tag 'upstream/7_20140509+dfsg'
Upstream version 7~20140509+dfsg
# gpg: Signature faite le sam. 10 mai 2014 11:04:25 AST
# gpg: avec la clef RSA B82A217AFDFE09F2
# gpg: Bonne signature de « David Prévot <david at tilapin.org> »
# gpg: alias « David Prévot <davidp at altern.org> »
# gpg: alias « David Prévot <davidp at no-log.org> »
# gpg: alias « David Prévot <taffit at debian.org> »
# gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
# gpg: Rien n'indique que la signature appartient à son propriétaire.
# Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF 7E1E B82A 217A FDFE 09F2
apps/activity/l10n/ar.php | 10 +-
apps/activity/l10n/eu.php | 2 +-
apps/activity/l10n/id.php | 11 +-
apps/activity/l10n/ko.php | 1 +
apps/activity/l10n/pt_PT.php | 5 +-
apps/activity/l10n/ru.php | 6 +-
apps/activity/l10n/zh_CN.php | 11 +-
apps/bookmarks/l10n/templates/bookmarks.pot | 2 +-
apps/calendar/l10n/ar.php | 71 ++--
apps/calendar/l10n/ar/calendar.po | 133 +++----
apps/calendar/l10n/eu.php | 3 +
apps/calendar/l10n/eu/calendar.po | 65 ++--
apps/calendar/l10n/pt_PT/calendar.po | 56 +--
apps/calendar/l10n/templates/calendar.pot | 54 +--
apps/contacts/js/contacts.js | 7 +-
apps/contacts/l10n/ar.php | 10 +
apps/contacts/l10n/ar/contacts.po | 27 +-
apps/contacts/l10n/eu.php | 21 ++
apps/contacts/l10n/eu/contacts.po | 49 +--
apps/contacts/l10n/pt_PT.php | 3 +
apps/contacts/l10n/pt_PT/contacts.po | 13 +-
apps/contacts/l10n/ro/contacts.po | 6 +-
apps/contacts/l10n/ru.php | 23 ++
apps/contacts/l10n/ru/contacts.po | 54 +--
apps/contacts/l10n/templates/contacts.pot | 2 +-
apps/contacts/l10n/zh_CN.php | 12 +
apps/contacts/l10n/zh_CN/contacts.po | 32 +-
apps/contacts/lib/controller/pagecontroller.php | 3 +
apps/contacts/lib/dispatcher.php | 6 +-
.../contacts/lib/localusersaddressbookprovider.php | 1 +
apps/contacts/lib/utils/properties.php | 2 +-
apps/contacts/templates/contacts.php | 6 +-
apps/documents/css/style.css | 38 +-
apps/documents/js/documents.js | 417 +++++++++++----------
apps/documents/l10n/da.php | 1 +
apps/documents/l10n/da/documents.po | 6 +-
apps/documents/l10n/eu.php | 11 +
apps/documents/l10n/eu/documents.po | 29 +-
apps/documents/l10n/id.php | 1 +
apps/documents/l10n/id/documents.po | 6 +-
apps/documents/l10n/km.php | 2 +
apps/documents/l10n/km/documents.po | 10 +-
apps/documents/l10n/pt_PT.php | 14 +-
apps/documents/l10n/pt_PT/documents.po | 63 ++--
apps/documents/l10n/templates/documents.pot | 38 +-
apps/documents/l10n/zh_CN.php | 9 +-
apps/documents/l10n/zh_CN/documents.po | 23 +-
apps/files/l10n/es_CL.php | 1 +
apps/files/l10n/eu.php | 7 +
apps/files/l10n/sl.php | 1 +
apps/files_external/l10n/cs_CZ.php | 1 +
apps/files_external/l10n/eu.php | 9 +
apps/files_external/l10n/id.php | 17 +
apps/files_external/l10n/ko.php | 2 +
apps/files_external/l10n/sl.php | 22 ++
apps/files_external/l10n/zh_CN.php | 18 +
apps/files_external/lib/config.php | 37 +-
apps/files_external/tests/config.php | 2 +-
apps/files_external/tests/dynamicmountconfig.php | 2 -
apps/files_external/tests/mountconfig.php | 2 -
apps/files_sharing/ajax/publicpreview.php | 8 +-
apps/files_sharing/appinfo/routes.php | 8 +-
apps/files_sharing/js/public.js | 106 +++---
apps/files_sharing/l10n/ast.php | 12 +-
apps/files_sharing/l10n/eu.php | 1 +
apps/files_sharing/l10n/ru.php | 1 +
apps/files_sharing/l10n/zh_CN.php | 1 +
apps/files_sharing/lib/cache.php | 6 +
apps/files_sharing/lib/helper.php | 10 +-
apps/files_sharing/lib/share/file.php | 17 +-
apps/files_sharing/lib/sharedstorage.php | 26 +-
apps/files_sharing/lib/updater.php | 11 +-
apps/files_sharing/templates/public.php | 1 -
apps/files_sharing/tests/api.php | 57 ++-
apps/files_trashbin/appinfo/routes.php | 5 +-
apps/files_versions/appinfo/routes.php | 3 +-
apps/firstrunwizard/l10n/eu.php | 2 +
apps/firstrunwizard/l10n/id.php | 2 +
apps/firstrunwizard/l10n/ru.php | 2 +
apps/firstrunwizard/l10n/zh_CN.php | 1 +
apps/gallery/js/slideshow.js | 30 +-
apps/gallery/l10n/templates/gallery.pot | 4 +-
apps/updater/l10n/ast.php | 21 +-
apps/user_ldap/group_ldap.php | 24 +-
apps/user_ldap/group_proxy.php | 16 -
apps/user_ldap/l10n/ast.php | 5 +
apps/user_ldap/l10n/pt_PT.php | 2 +
apps/user_ldap/l10n/ru.php | 6 +
core/ajax/preview.php | 8 +-
core/css/styles.css | 2 -
core/doc/user/_sources/files/versioncontrol.txt | 1 +
core/doc/user/files/versioncontrol.html | 1 +
core/img/places/folder.svg | 9 +-
core/l10n/eu.php | 2 +
core/l10n/id.php | 11 +
core/l10n/pt_PT.php | 5 +
core/routes.php | 2 +
core/skeleton/ownCloudUserManual.pdf | Bin 1572003 -> 1572992 bytes
l10n/ast/files_sharing.po | 31 +-
l10n/ast/user_ldap.po | 18 +-
l10n/cs_CZ/files_external.po | 6 +-
l10n/da/files.po | 4 +-
l10n/da/files_external.po | 4 +-
l10n/es_CL/files.po | 6 +-
l10n/eu/core.po | 11 +-
l10n/eu/files.po | 20 +-
l10n/eu/files_external.po | 25 +-
l10n/eu/files_sharing.po | 14 +-
l10n/eu/settings.po | 6 +-
l10n/id/core.po | 29 +-
l10n/id/files_external.po | 41 +-
l10n/id/settings.po | 16 +-
l10n/it/files_sharing.po | 6 +-
l10n/ko/files_external.po | 11 +-
l10n/ko/lib.po | 42 +--
l10n/ko/settings.po | 6 +-
l10n/pl/files.po | 4 +-
l10n/pl/files_external.po | 4 +-
l10n/pt_PT/core.po | 17 +-
l10n/pt_PT/lib.po | 37 +-
l10n/pt_PT/user_ldap.po | 10 +-
l10n/ro/files.po | 4 +-
l10n/ro/user_ldap.po | 4 +-
l10n/ro/user_webdavauth.po | 4 +-
l10n/ru/files_sharing.po | 13 +-
l10n/ru/user_ldap.po | 20 +-
l10n/sl/files.po | 8 +-
l10n/sl/files_external.po | 60 +--
l10n/sl/files_sharing.po | 10 +-
l10n/sl/lib.po | 46 +--
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 12 +-
l10n/templates/files_sharing.pot | 6 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 32 +-
l10n/templates/private.pot | 32 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/tr/files_sharing.po | 8 +-
l10n/zh_CN/files_external.po | 43 +--
l10n/zh_CN/files_sharing.po | 13 +-
l10n/zh_CN/lib.po | 102 ++---
l10n/zh_CN/settings.po | 108 +++---
lib/l10n/ko.php | 10 +-
lib/l10n/pt_PT.php | 7 +-
lib/l10n/sl.php | 1 +
lib/l10n/zh_CN.php | 42 ++-
.../connector/sabre/exceptionloggerplugin.php | 17 +-
lib/private/files.php | 5 +-
lib/private/files/cache/cache.php | 4 +
lib/private/group.php | 12 +-
lib/private/group/backend.php | 22 +-
lib/private/group/database.php | 25 --
lib/private/group/group.php | 6 +-
lib/private/group/manager.php | 34 ++
lib/private/helper.php | 18 +-
lib/private/l10n.php | 2 +-
lib/private/memcache/memcached.php | 2 +-
lib/private/preview.php | 62 ++-
lib/private/preview/image.php | 3 +-
lib/private/preview/mp3.php | 2 +-
lib/private/preview/pdf.php | 1 +
lib/private/preview/provider.php | 1 +
lib/private/preview/svg.php | 3 +-
lib/private/server.php | 12 +-
lib/private/share/share.php | 189 +++++-----
lib/private/tags.php | 53 +--
lib/private/user/database.php | 4 +-
lib/private/user/manager.php | 4 +-
lib/private/util.php | 16 +-
lib/public/share.php | 143 ++++---
lib/public/util.php | 9 +-
settings/l10n/eu.php | 1 +
settings/l10n/id.php | 6 +
settings/l10n/ko.php | 1 +
settings/l10n/zh_CN.php | 50 +++
version.php | 2 +-
181 files changed, 2082 insertions(+), 1521 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