[Pkg-owncloud-commits] [owncloud] 49/52: Merge tag 'upstream/6.0.0_rc2+dfsg'

David Prévot taffit at moszumanska.debian.org
Mon Dec 2 01:49:42 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 fce3fb6b8eacdf44e74d8b2d2ec34efb5684b702
Merge: 960a48c e31443b
Author: David Prévot <taffit at debian.org>
Date:   Sun Dec 1 20:55:35 2013 -0400

    Merge tag 'upstream/6.0.0_rc2+dfsg'
    
    Upstream version 6.0.0~rc2+dfsg
    
    # gpg: Signature faite le dim. 01 déc. 2013 20:55:18 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # 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
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 apps/activity/l10n/hu_HU.php                      |   1 +
 apps/activity/l10n/uk.php                         |   5 +-
 apps/bookmarks/l10n/cs_CZ/bookmarks.po            |   6 +-
 apps/bookmarks/l10n/en_GB.php                     |   1 +
 apps/bookmarks/l10n/en_GB/bookmarks.po            |   8 +-
 apps/bookmarks/l10n/ja_JP.php                     |   1 +
 apps/bookmarks/l10n/ja_JP/bookmarks.po            |   8 +-
 apps/bookmarks/l10n/templates/bookmarks.pot       |   2 +-
 apps/bookmarks/l10n/uk.php                        |   1 +
 apps/bookmarks/l10n/uk/bookmarks.po               |   8 +-
 apps/calendar/l10n/cs_CZ.php                      |   6 +-
 apps/calendar/l10n/cs_CZ/calendar.po              |  12 +--
 apps/calendar/l10n/en_GB.php                      |  16 ++++
 apps/calendar/l10n/en_GB/calendar.po              |  40 ++++-----
 apps/calendar/l10n/ja_JP.php                      |  13 +++
 apps/calendar/l10n/ja_JP/calendar.po              |  34 +++----
 apps/calendar/l10n/templates/calendar.pot         |   2 +-
 apps/calendar/l10n/uk.php                         |  16 ++++
 apps/calendar/l10n/uk/calendar.po                 |  41 ++++-----
 apps/contacts/appinfo/version                     |   2 +-
 apps/contacts/js/groups.js                        |   5 +-
 apps/contacts/l10n/cs_CZ/contacts.po              |   8 +-
 apps/contacts/l10n/templates/contacts.pot         |   4 +-
 apps/contacts/l10n/uk.php                         |  48 ++++++++++
 apps/contacts/l10n/uk/contacts.po                 | 104 +++++++++++-----------
 apps/contacts/lib/backend/database.php            |  34 ++++++-
 apps/contacts/lib/share/addressbook.php           |   2 +-
 apps/contacts/lib/utils/properties.php            |   2 +-
 apps/documents/appinfo/update.php                 |   2 +-
 apps/documents/l10n/cs_CZ.php                     |  12 +--
 apps/documents/l10n/cs_CZ/documents.po            |  18 ++--
 apps/documents/l10n/de.php                        |   2 +
 apps/documents/l10n/de/documents.po               |  10 +--
 apps/documents/l10n/de_DE.php                     |   2 +
 apps/documents/l10n/de_DE/documents.po            |  10 +--
 apps/documents/l10n/en_GB.php                     |   2 +
 apps/documents/l10n/en_GB/documents.po            |  10 +--
 apps/documents/l10n/gl.php                        |   2 +
 apps/documents/l10n/gl/documents.po               |  10 +--
 apps/documents/l10n/hu_HU.php                     |  37 ++++++++
 apps/documents/l10n/hu_HU/documents.po            |  81 ++++++++---------
 apps/documents/l10n/ja_JP.php                     |  42 ++++++++-
 apps/documents/l10n/ja_JP/documents.po            |  88 +++++++++---------
 apps/documents/l10n/pt_BR.php                     |   2 +
 apps/documents/l10n/pt_BR/documents.po            |  10 +--
 apps/documents/l10n/sl.php                        |   2 +
 apps/documents/l10n/sl/documents.po               |  10 +--
 apps/documents/l10n/templates/documents.pot       |   2 +-
 apps/documents/l10n/tr.php                        |   2 +
 apps/documents/l10n/tr/documents.po               |  10 +--
 apps/files/css/files.css                          |   2 +-
 apps/files/js/filelist.js                         |   2 +-
 apps/files/l10n/cs_CZ.php                         |   2 +-
 apps/files/l10n/es.php                            |   1 +
 apps/files/l10n/fi_FI.php                         |   3 +
 apps/files/l10n/ja_JP.php                         |   1 +
 apps/files/lib/app.php                            |   6 ++
 apps/files_encryption/ajax/getMigrationStatus.php |   9 +-
 apps/files_encryption/l10n/cs_CZ.php              |   2 +-
 apps/files_encryption/lib/helper.php              |   9 +-
 apps/files_external/lib/ftp.php                   |  19 ++++
 apps/files_external/lib/smb.php                   |  12 ++-
 apps/files_external/lib/streamwrapper.php         |  12 ++-
 apps/files_external/tests/ftp.php                 |  12 +++
 apps/files_sharing/l10n/uk.php                    |  11 ++-
 apps/files_sharing/lib/updater.php                |  23 +++--
 apps/files_texteditor/l10n/cs_CZ.php              |   2 +-
 apps/files_texteditor/l10n/hu_HU.php              |   1 +
 apps/files_texteditor/l10n/ja_JP.php              |   1 +
 apps/files_texteditor/l10n/uk.php                 |   1 +
 apps/files_trashbin/ajax/preview.php              |  10 ++-
 apps/files_versions/ajax/preview.php              |   5 +-
 apps/files_versions/appinfo/app.php               |   1 +
 apps/files_versions/l10n/uk.php                   |   3 +
 apps/files_versions/lib/hooks.php                 |  15 +++-
 apps/files_versions/lib/versions.php              |  51 ++++++++---
 apps/firstrunwizard/l10n/ja_JP.php                |   1 +
 apps/firstrunwizard/l10n/uk.php                   |   1 +
 apps/gallery/l10n/en_GB.php                       |   5 +-
 apps/gallery/l10n/fr.php                          |   5 +-
 apps/gallery/l10n/hu_HU.php                       |   5 +-
 apps/gallery/l10n/ja_JP.php                       |   5 +-
 apps/gallery/l10n/uk.php                          |   6 +-
 apps/user_ldap/l10n/ja_JP.php                     |   3 +
 core/css/fixes.css                                |   5 ++
 core/css/styles.css                               |  16 ++--
 core/l10n/cs_CZ.php                               |   8 +-
 core/l10n/en_GB.php                               |   3 +
 core/l10n/fr.php                                  |   9 +-
 core/l10n/ja_JP.php                               |   6 +-
 core/setup.php                                    |   1 +
 core/skeleton/ownCloudUserManual.pdf              | Bin 1393379 -> 1393380 bytes
 core/templates/login.php                          |   2 +
 l10n/ach/files.po                                 |  40 +++++----
 l10n/ach/files_encryption.po                      |   8 +-
 l10n/ady/files.po                                 |  40 +++++----
 l10n/ady/files_encryption.po                      |   8 +-
 l10n/af/files.po                                  |  40 +++++----
 l10n/af/files_encryption.po                       |   8 +-
 l10n/af_ZA/files.po                               |  40 +++++----
 l10n/af_ZA/files_encryption.po                    |   8 +-
 l10n/ar/files.po                                  |  40 +++++----
 l10n/ar/files_encryption.po                       |   8 +-
 l10n/be/files.po                                  |  40 +++++----
 l10n/be/files_encryption.po                       |   8 +-
 l10n/bg_BG/files.po                               |  40 +++++----
 l10n/bg_BG/files_encryption.po                    |   8 +-
 l10n/bn_BD/files.po                               |  40 +++++----
 l10n/bn_BD/files_encryption.po                    |   8 +-
 l10n/bs/files.po                                  |  40 +++++----
 l10n/bs/files_encryption.po                       |   8 +-
 l10n/ca/files.po                                  |  40 +++++----
 l10n/ca/files_encryption.po                       |  10 ++-
 l10n/cs_CZ/core.po                                |  28 +++---
 l10n/cs_CZ/files.po                               |  44 +++++----
 l10n/cs_CZ/files_encryption.po                    |  12 ++-
 l10n/cs_CZ/files_sharing.po                       |   6 +-
 l10n/cs_CZ/lib.po                                 |  12 +--
 l10n/cy_GB/files.po                               |  40 +++++----
 l10n/cy_GB/files_encryption.po                    |   8 +-
 l10n/da/files.po                                  |  40 +++++----
 l10n/da/files_encryption.po                       |   8 +-
 l10n/de/files.po                                  |  42 +++++----
 l10n/de/files_encryption.po                       |  10 ++-
 l10n/de/settings.po                               |  10 +--
 l10n/de_AT/files.po                               |  40 +++++----
 l10n/de_AT/files_encryption.po                    |   8 +-
 l10n/de_CH/files.po                               |  40 +++++----
 l10n/de_CH/files_encryption.po                    |   8 +-
 l10n/de_DE/files.po                               |  42 +++++----
 l10n/de_DE/files_encryption.po                    |  10 ++-
 l10n/de_DE/settings.po                            |  10 +--
 l10n/el/files.po                                  |  40 +++++----
 l10n/el/files_encryption.po                       |  10 ++-
 l10n/en at pirate/files.po                           |  40 +++++----
 l10n/en at pirate/files_encryption.po                |   8 +-
 l10n/en_GB/core.po                                |  26 +++---
 l10n/en_GB/files.po                               |  42 +++++----
 l10n/en_GB/files_encryption.po                    |  10 ++-
 l10n/en_GB/settings.po                            |  12 +--
 l10n/eo/files.po                                  |  40 +++++----
 l10n/eo/files_encryption.po                       |  10 ++-
 l10n/es/files.po                                  |  42 +++++----
 l10n/es/files_encryption.po                       |  10 ++-
 l10n/es/settings.po                               |  10 +--
 l10n/es_AR/files.po                               |  40 +++++----
 l10n/es_AR/files_encryption.po                    |   8 +-
 l10n/es_MX/files.po                               |  40 +++++----
 l10n/es_MX/files_encryption.po                    |   8 +-
 l10n/et_EE/files.po                               |  42 +++++----
 l10n/et_EE/files_encryption.po                    |  10 ++-
 l10n/eu/files.po                                  |  40 +++++----
 l10n/eu/files_encryption.po                       |   8 +-
 l10n/fa/files.po                                  |  40 +++++----
 l10n/fa/files_encryption.po                       |   8 +-
 l10n/fi_FI/files.po                               |  49 +++++-----
 l10n/fi_FI/files_encryption.po                    |   8 +-
 l10n/fr/core.po                                   |  33 +++----
 l10n/fr/files.po                                  |  42 +++++----
 l10n/fr/files_encryption.po                       |  10 ++-
 l10n/fr/settings.po                               |  13 +--
 l10n/fr_CA/files.po                               |  40 +++++----
 l10n/fr_CA/files_encryption.po                    |   8 +-
 l10n/gl/files.po                                  |  42 +++++----
 l10n/gl/files_encryption.po                       |  10 ++-
 l10n/gl/settings.po                               |  10 +--
 l10n/he/files.po                                  |  40 +++++----
 l10n/he/files_encryption.po                       |   8 +-
 l10n/hi/files.po                                  |  40 +++++----
 l10n/hi/files_encryption.po                       |   8 +-
 l10n/hr/files.po                                  |  40 +++++----
 l10n/hr/files_encryption.po                       |   8 +-
 l10n/hu_HU/files.po                               |  40 +++++----
 l10n/hu_HU/files_encryption.po                    |   8 +-
 l10n/hy/files.po                                  |  40 +++++----
 l10n/hy/files_encryption.po                       |   8 +-
 l10n/ia/files.po                                  |  40 +++++----
 l10n/ia/files_encryption.po                       |   8 +-
 l10n/id/files.po                                  |  40 +++++----
 l10n/id/files_encryption.po                       |   8 +-
 l10n/is/files.po                                  |  40 +++++----
 l10n/is/files_encryption.po                       |   8 +-
 l10n/it/files.po                                  |  42 +++++----
 l10n/it/files_encryption.po                       |  10 ++-
 l10n/ja_JP/core.po                                |  30 +++----
 l10n/ja_JP/files.po                               |  42 +++++----
 l10n/ja_JP/files_encryption.po                    |  10 ++-
 l10n/ja_JP/lib.po                                 |  14 +--
 l10n/ja_JP/settings.po                            |  18 ++--
 l10n/ja_JP/user_ldap.po                           |  12 +--
 l10n/ka/files.po                                  |  40 +++++----
 l10n/ka/files_encryption.po                       |   8 +-
 l10n/ka_GE/files.po                               |  40 +++++----
 l10n/ka_GE/files_encryption.po                    |   8 +-
 l10n/km/files.po                                  |  40 +++++----
 l10n/km/files_encryption.po                       |   8 +-
 l10n/kn/files.po                                  |  40 +++++----
 l10n/kn/files_encryption.po                       |   8 +-
 l10n/ko/files.po                                  |  40 +++++----
 l10n/ko/files_encryption.po                       |  10 ++-
 l10n/ku_IQ/files.po                               |  40 +++++----
 l10n/ku_IQ/files_encryption.po                    |   8 +-
 l10n/lb/files.po                                  |  40 +++++----
 l10n/lb/files_encryption.po                       |   8 +-
 l10n/lt_LT/files.po                               |  42 +++++----
 l10n/lt_LT/files_encryption.po                    |   8 +-
 l10n/lv/files.po                                  |  40 +++++----
 l10n/lv/files_encryption.po                       |   8 +-
 l10n/mk/files.po                                  |  40 +++++----
 l10n/mk/files_encryption.po                       |   8 +-
 l10n/ml_IN/files.po                               |  40 +++++----
 l10n/ml_IN/files_encryption.po                    |   8 +-
 l10n/ms_MY/files.po                               |  40 +++++----
 l10n/ms_MY/files_encryption.po                    |   8 +-
 l10n/my_MM/files.po                               |  40 +++++----
 l10n/my_MM/files_encryption.po                    |   8 +-
 l10n/nb_NO/files.po                               |  40 +++++----
 l10n/nb_NO/files_encryption.po                    |   8 +-
 l10n/nds/files.po                                 |  40 +++++----
 l10n/nds/files_encryption.po                      |   8 +-
 l10n/ne/files.po                                  |  40 +++++----
 l10n/ne/files_encryption.po                       |   8 +-
 l10n/nl/files.po                                  |  40 +++++----
 l10n/nl/files_encryption.po                       |  10 ++-
 l10n/nn_NO/files.po                               |  40 +++++----
 l10n/nn_NO/files_encryption.po                    |   8 +-
 l10n/nqo/files.po                                 |  40 +++++----
 l10n/nqo/files_encryption.po                      |   8 +-
 l10n/oc/files.po                                  |  40 +++++----
 l10n/oc/files_encryption.po                       |   8 +-
 l10n/pa/files.po                                  |  40 +++++----
 l10n/pa/files_encryption.po                       |   8 +-
 l10n/pl/files.po                                  |  40 +++++----
 l10n/pl/files_encryption.po                       |  10 ++-
 l10n/pt_BR/files.po                               |  42 +++++----
 l10n/pt_BR/files_encryption.po                    |  10 ++-
 l10n/pt_BR/settings.po                            |  10 +--
 l10n/pt_PT/files.po                               |  40 +++++----
 l10n/pt_PT/files_encryption.po                    |   8 +-
 l10n/ro/files.po                                  |  40 +++++----
 l10n/ro/files_encryption.po                       |   8 +-
 l10n/ru/files.po                                  |  40 +++++----
 l10n/ru/files_encryption.po                       |  10 ++-
 l10n/ru_RU/files.po                               |  40 +++++----
 l10n/ru_RU/files_encryption.po                    |   8 +-
 l10n/si_LK/files.po                               |  40 +++++----
 l10n/si_LK/files_encryption.po                    |   8 +-
 l10n/sk/files.po                                  |  40 +++++----
 l10n/sk/files_encryption.po                       |   8 +-
 l10n/sk_SK/files.po                               |  40 +++++----
 l10n/sk_SK/files_encryption.po                    |  10 ++-
 l10n/sl/files.po                                  |  42 +++++----
 l10n/sl/files_encryption.po                       |  10 ++-
 l10n/sl/lib.po                                    |  18 ++--
 l10n/sl/settings.po                               |  20 ++---
 l10n/sq/files.po                                  |  40 +++++----
 l10n/sq/files_encryption.po                       |   8 +-
 l10n/sr/files.po                                  |  40 +++++----
 l10n/sr/files_encryption.po                       |   8 +-
 l10n/sr at latin/files.po                            |  40 +++++----
 l10n/sr at latin/files_encryption.po                 |   8 +-
 l10n/sv/files.po                                  |  42 +++++----
 l10n/sv/files_encryption.po                       |  10 ++-
 l10n/sw_KE/files.po                               |  40 +++++----
 l10n/sw_KE/files_encryption.po                    |   8 +-
 l10n/ta_LK/files.po                               |  40 +++++----
 l10n/ta_LK/files_encryption.po                    |   8 +-
 l10n/te/files.po                                  |  40 +++++----
 l10n/te/files_encryption.po                       |   8 +-
 l10n/templates/core.pot                           |  16 ++--
 l10n/templates/files.pot                          |  38 ++++----
 l10n/templates/files_encryption.pot               |   6 +-
 l10n/templates/files_external.pot                 |   2 +-
 l10n/templates/files_sharing.pot                  |   2 +-
 l10n/templates/files_trashbin.pot                 |   4 +-
 l10n/templates/files_versions.pot                 |   2 +-
 l10n/templates/lib.pot                            |   2 +-
 l10n/templates/private.pot                        |   2 +-
 l10n/templates/settings.pot                       |   2 +-
 l10n/templates/user_ldap.pot                      |   2 +-
 l10n/templates/user_webdavauth.pot                |   2 +-
 l10n/th_TH/files.po                               |  40 +++++----
 l10n/th_TH/files_encryption.po                    |   8 +-
 l10n/tr/files.po                                  |  42 +++++----
 l10n/tr/files_encryption.po                       |  10 ++-
 l10n/tr/settings.po                               |  10 +--
 l10n/tzm/files.po                                 |  40 +++++----
 l10n/tzm/files_encryption.po                      |   8 +-
 l10n/ug/files.po                                  |  40 +++++----
 l10n/ug/files_encryption.po                       |   8 +-
 l10n/uk/files.po                                  |  40 +++++----
 l10n/uk/files_encryption.po                       |   8 +-
 l10n/uk/files_sharing.po                          |  25 +++---
 l10n/uk/files_versions.po                         |  25 +++---
 l10n/ur_PK/files.po                               |  40 +++++----
 l10n/ur_PK/files_encryption.po                    |   8 +-
 l10n/uz/files.po                                  |  40 +++++----
 l10n/uz/files_encryption.po                       |   8 +-
 l10n/vi/files.po                                  |  40 +++++----
 l10n/vi/files_encryption.po                       |   8 +-
 l10n/zh_CN/files.po                               |  40 +++++----
 l10n/zh_CN/files_encryption.po                    |   8 +-
 l10n/zh_HK/files.po                               |  40 +++++----
 l10n/zh_HK/files_encryption.po                    |   8 +-
 l10n/zh_TW/files.po                               |  40 +++++----
 l10n/zh_TW/files_encryption.po                    |  10 ++-
 lib/l10n/cs_CZ.php                                |   2 +-
 lib/l10n/ja_JP.php                                |   1 +
 lib/l10n/sl.php                                   |   5 ++
 lib/private/connector/sabre/file.php              |   2 +-
 lib/private/files/cache/updater.php               |   6 +-
 lib/private/preview.php                           |  41 +++++----
 lib/private/util.php                              |   8 +-
 lib/public/contacts/imanager.php                  |   4 +
 lib/public/iservercontainer.php                   |  11 ++-
 lib/public/share.php                              |  26 +++++-
 settings/l10n/de.php                              |   2 +
 settings/l10n/de_DE.php                           |   2 +
 settings/l10n/en_GB.php                           |   3 +
 settings/l10n/es.php                              |   2 +
 settings/l10n/fr.php                              |   3 +
 settings/l10n/gl.php                              |   2 +
 settings/l10n/ja_JP.php                           |   6 ++
 settings/l10n/pt_BR.php                           |   2 +
 settings/l10n/sl.php                              |   7 ++
 settings/l10n/tr.php                              |   2 +
 version.php                                       |   6 +-
 327 files changed, 3816 insertions(+), 2261 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