[Pkg-owncloud-commits] [owncloud] 16/223: Merge branch 'master' into update_shipped_apps_from_appstore

David Prévot taffit at moszumanska.debian.org
Sun Jun 22 01:54:00 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 0fe8f77c1748d167e115680346ae98bba78da38d
Merge: fad3bd7 e1beb8c
Author: Georg Ehrke <developer at georgehrke.com>
Date:   Thu Jun 5 22:54:27 2014 +0200

    Merge branch 'master' into update_shipped_apps_from_appstore
    
    Conflicts:
    	lib/private/app.php
    	settings/templates/apps.php

 .idea/codeStyleSettings.xml                        |   52 +
 .scrutinizer.yml                                   |    7 +-
 3rdparty                                           |    2 +-
 apps/files/admin.php                               |   12 -
 apps/files/appinfo/app.php                         |    2 -
 apps/files/appinfo/remote.php                      |    6 +-
 apps/files/appinfo/update.php                      |    8 +
 apps/files/appinfo/version                         |    2 +-
 apps/files/css/files.css                           |   27 +-
 apps/files/index.php                               |    3 +-
 apps/files/js/admin.js                             |    8 -
 apps/files/js/fileactions.js                       |    8 +-
 apps/files/js/filelist.js                          |    2 +-
 apps/files/js/files.js                             |    8 +-
 apps/files/js/navigation.js                        |    4 +-
 apps/files/l10n/ar.php                             |    6 +-
 apps/files/l10n/ast.php                            |    6 +-
 apps/files/l10n/bg_BG.php                          |    3 +-
 apps/files/l10n/bn_BD.php                          |    6 +-
 apps/files/l10n/ca.php                             |    6 +-
 apps/files/l10n/cs_CZ.php                          |    6 +-
 apps/files/l10n/cy_GB.php                          |    6 +-
 apps/files/l10n/da.php                             |    6 +-
 apps/files/l10n/de.php                             |    6 +-
 apps/files/l10n/de_AT.php                          |    4 +-
 apps/files/l10n/de_CH.php                          |    6 +-
 apps/files/l10n/de_DE.php                          |    6 +-
 apps/files/l10n/el.php                             |    6 +-
 apps/files/l10n/en_GB.php                          |    6 +-
 apps/files/l10n/eo.php                             |    6 +-
 apps/files/l10n/es.php                             |    6 +-
 apps/files/l10n/es_AR.php                          |    6 +-
 apps/files/l10n/es_MX.php                          |    6 +-
 apps/files/l10n/et_EE.php                          |    4 -
 apps/files/l10n/eu.php                             |    6 +-
 apps/files/l10n/eu_ES.php                          |    4 +-
 apps/files/l10n/fa.php                             |    6 +-
 apps/files/l10n/fi_FI.php                          |    6 +-
 apps/files/l10n/fr.php                             |    6 +-
 apps/files/l10n/gl.php                             |    8 +-
 apps/files/l10n/he.php                             |    6 +-
 apps/files/l10n/hr.php                             |    6 +-
 apps/files/l10n/hu_HU.php                          |    6 +-
 apps/files/l10n/hy.php                             |    4 +-
 apps/files/l10n/ia.php                             |    2 +-
 apps/files/l10n/id.php                             |    6 +-
 apps/files/l10n/is.php                             |    6 +-
 apps/files/l10n/it.php                             |    6 +-
 apps/files/l10n/ja.php                             |   11 +-
 apps/files/l10n/ka_GE.php                          |    6 +-
 apps/files/l10n/km.php                             |    9 +-
 apps/files/l10n/ko.php                             |    6 +-
 apps/files/l10n/lb.php                             |    6 +-
 apps/files/l10n/lt_LT.php                          |    6 +-
 apps/files/l10n/lv.php                             |    6 +-
 apps/files/l10n/mk.php                             |    6 +-
 apps/files/l10n/ms_MY.php                          |    6 +-
 apps/files/l10n/nb_NO.php                          |    4 -
 apps/files/l10n/nl.php                             |    4 -
 apps/files/l10n/nn_NO.php                          |    6 +-
 apps/files/l10n/oc.php                             |    6 +-
 apps/files/l10n/pa.php                             |    4 +-
 apps/files/l10n/pl.php                             |    6 +-
 apps/files/l10n/pt_BR.php                          |    6 +-
 apps/files/l10n/pt_PT.php                          |    4 -
 apps/files/l10n/ro.php                             |    6 +-
 apps/files/l10n/ru.php                             |    4 -
 apps/files/l10n/si_LK.php                          |    6 +-
 apps/files/l10n/sk.php                             |    4 +-
 apps/files/l10n/sk_SK.php                          |    6 +-
 apps/files/l10n/sl.php                             |    6 +-
 apps/files/l10n/sq.php                             |    6 +-
 apps/files/l10n/sr.php                             |    6 +-
 apps/files/l10n/sr at latin.php                       |    2 +-
 apps/files/l10n/sv.php                             |    6 +-
 apps/files/l10n/ta_LK.php                          |    6 +-
 apps/files/l10n/te.php                             |    4 +-
 apps/files/l10n/th_TH.php                          |    6 +-
 apps/files/l10n/tr.php                             |    6 +-
 apps/files/l10n/ug.php                             |    2 +-
 apps/files/l10n/uk.php                             |    6 +-
 apps/files/l10n/ur_PK.php                          |    4 +-
 apps/files/l10n/vi.php                             |    6 +-
 apps/files/l10n/zh_CN.php                          |    6 +-
 apps/files/l10n/zh_HK.php                          |    4 +-
 apps/files/l10n/zh_TW.php                          |    6 +-
 apps/files/list.php                                |    1 -
 apps/files/templates/admin.php                     |   28 +-
 apps/files/templates/appnavigation.php             |    2 +-
 apps/files/templates/list.php                      |   13 +-
 apps/files/tests/js/appSpec.js                     |   16 +-
 apps/files/tests/js/filelistSpec.js                |    2 +-
 .../3rdparty/Crypt_Blowfish/Blowfish.php           |   18 +-
 .../Crypt_Blowfish/Blowfish/DefaultKey.php         |    3 -
 apps/files_encryption/hooks/hooks.php              |   39 +-
 apps/files_encryption/l10n/ar.php                  |    1 +
 apps/files_encryption/l10n/gl.php                  |   16 +-
 apps/files_encryption/l10n/ja.php                  |    1 +
 apps/files_encryption/l10n/pl.php                  |    1 +
 apps/files_encryption/l10n/zh_TW.php               |    1 +
 apps/files_encryption/lib/crypt.php                |    2 +-
 apps/files_encryption/lib/proxy.php                |    9 +-
 apps/files_encryption/lib/util.php                 |  203 +-
 apps/files_encryption/tests/crypt.php              |    2 +-
 apps/files_encryption/tests/helper.php             |    9 +-
 apps/files_encryption/tests/stream.php             |    6 +
 apps/files_encryption/tests/util.php               |   12 -
 apps/files_encryption/tests/webdav.php             |   17 +-
 apps/files_external/3rdparty/phpseclib/AUTHORS     |    5 -
 apps/files_external/3rdparty/phpseclib/LICENSE     |   21 -
 apps/files_external/3rdparty/phpseclib/README.md   |   16 -
 .../3rdparty/phpseclib/composer.json               |   77 -
 .../3rdparty/phpseclib/composer.lock               |   95 -
 .../3rdparty/phpseclib/phpseclib/Crypt/AES.php     |  185 -
 .../3rdparty/phpseclib/phpseclib/Crypt/Base.php    | 1986 ---------
 .../phpseclib/phpseclib/Crypt/Blowfish.php         |  674 ---
 .../3rdparty/phpseclib/phpseclib/Crypt/DES.php     | 1535 -------
 .../3rdparty/phpseclib/phpseclib/Crypt/Hash.php    |  845 ----
 .../3rdparty/phpseclib/phpseclib/Crypt/RC2.php     |  653 ---
 .../3rdparty/phpseclib/phpseclib/Crypt/RC4.php     |  333 --
 .../3rdparty/phpseclib/phpseclib/Crypt/RSA.php     | 2811 -------------
 .../3rdparty/phpseclib/phpseclib/Crypt/Random.php  |  246 --
 .../phpseclib/phpseclib/Crypt/Rijndael.php         | 1371 ------
 .../phpseclib/phpseclib/Crypt/TripleDES.php        |  419 --
 .../3rdparty/phpseclib/phpseclib/Crypt/Twofish.php |  921 ----
 .../3rdparty/phpseclib/phpseclib/File/ANSI.php     |  560 ---
 .../3rdparty/phpseclib/phpseclib/File/ASN1.php     | 1319 ------
 .../3rdparty/phpseclib/phpseclib/File/X509.php     | 4433 --------------------
 .../phpseclib/phpseclib/Math/BigInteger.php        | 3706 ----------------
 .../3rdparty/phpseclib/phpseclib/Net/SCP.php       |  362 --
 .../3rdparty/phpseclib/phpseclib/Net/SFTP.php      | 2226 ----------
 .../phpseclib/phpseclib/Net/SFTP/Stream.php        |  775 ----
 .../3rdparty/phpseclib/phpseclib/Net/SSH1.php      | 1582 -------
 .../3rdparty/phpseclib/phpseclib/Net/SSH2.php      | 3686 ----------------
 .../phpseclib/phpseclib/System/SSH_Agent.php       |  315 --
 .../3rdparty/phpseclib/phpseclib/openssl.cnf       |    6 -
 .../3rdparty/phpseclib/phpunit.xml.dist            |   18 -
 apps/files_external/css/settings.css               |    5 +
 apps/files_external/l10n/fr.php                    |    1 +
 apps/files_external/l10n/gl.php                    |    4 +-
 apps/files_external/l10n/ja.php                    |    4 +-
 apps/files_external/l10n/ru.php                    |    5 +
 apps/files_external/lib/config.php                 |    5 -
 apps/files_external/lib/sftp.php                   |    5 -
 apps/files_external/lib/webdav.php                 |   30 +-
 apps/files_sharing/app/sharing.php                 |   25 +
 apps/files_sharing/appinfo/app.php                 |   12 +
 apps/files_sharing/appinfo/routes.php              |   15 +
 .../controller/adminsettingscontroller.php         |   60 +
 apps/files_sharing/css/authenticate.css            |    7 -
 apps/files_sharing/css/settings-admin.css          |   33 +
 apps/files_sharing/http/mailtemplateresponse.php   |   55 +
 apps/files_sharing/js/app.js                       |   35 +-
 apps/files_sharing/js/public.js                    |    4 +-
 apps/files_sharing/js/settings-admin.js            |   78 +
 apps/files_sharing/js/share.js                     |  239 +-
 apps/files_sharing/js/sharedfilelist.js            |   60 +-
 apps/files_sharing/l10n/ar.php                     |    2 +
 apps/files_sharing/l10n/ast.php                    |    6 +
 apps/files_sharing/l10n/bg_BG.php                  |    2 +
 apps/files_sharing/l10n/bn_BD.php                  |    1 +
 apps/files_sharing/l10n/{sr at latin.php => bs.php}   |    4 +-
 apps/files_sharing/l10n/ca.php                     |    2 +
 apps/files_sharing/l10n/cs_CZ.php                  |    2 +
 apps/files_sharing/l10n/cy_GB.php                  |    2 +
 apps/files_sharing/l10n/da.php                     |    2 +
 apps/files_sharing/l10n/de.php                     |    7 +
 apps/files_sharing/l10n/de_CH.php                  |    2 +
 apps/files_sharing/l10n/de_DE.php                  |    7 +
 apps/files_sharing/l10n/el.php                     |    7 +
 apps/files_sharing/l10n/en_GB.php                  |    7 +
 apps/files_sharing/l10n/eo.php                     |    2 +
 apps/files_sharing/l10n/es.php                     |    6 +
 apps/files_sharing/l10n/es_AR.php                  |    2 +
 apps/files_sharing/l10n/es_MX.php                  |    2 +
 apps/files_sharing/l10n/et_EE.php                  |    2 +
 apps/files_sharing/l10n/eu.php                     |    2 +
 apps/files_sharing/l10n/fa.php                     |    2 +
 apps/files_sharing/l10n/fi_FI.php                  |    7 +
 apps/files_sharing/l10n/fr.php                     |    7 +
 apps/files_sharing/l10n/gl.php                     |    7 +
 apps/files_sharing/l10n/he.php                     |    2 +
 apps/files_sharing/l10n/hi.php                     |    1 +
 apps/files_sharing/l10n/hr.php                     |    1 +
 apps/files_sharing/l10n/hu_HU.php                  |    2 +
 apps/files_sharing/l10n/ia.php                     |    1 +
 apps/files_sharing/l10n/id.php                     |    2 +
 apps/files_sharing/l10n/is.php                     |    2 +
 apps/files_sharing/l10n/it.php                     |    7 +
 apps/files_sharing/l10n/ja.php                     |    6 +
 apps/files_sharing/l10n/ka_GE.php                  |    2 +
 apps/files_sharing/l10n/km.php                     |    2 +
 apps/files_sharing/l10n/ko.php                     |    2 +
 apps/files_sharing/l10n/ku_IQ.php                  |    1 +
 apps/files_sharing/l10n/lb.php                     |    2 +
 apps/files_sharing/l10n/lt_LT.php                  |    2 +
 apps/files_sharing/l10n/lv.php                     |    2 +
 apps/files_sharing/l10n/mk.php                     |    2 +
 apps/files_sharing/l10n/ms_MY.php                  |    2 +
 apps/files_sharing/l10n/nb_NO.php                  |    7 +
 apps/files_sharing/l10n/nl.php                     |    2 +
 apps/files_sharing/l10n/nn_NO.php                  |    2 +
 apps/files_sharing/l10n/oc.php                     |    1 +
 apps/files_sharing/l10n/pl.php                     |    7 +
 apps/files_sharing/l10n/pt_BR.php                  |    7 +
 apps/files_sharing/l10n/pt_PT.php                  |    5 +
 apps/files_sharing/l10n/ro.php                     |    2 +
 apps/files_sharing/l10n/ru.php                     |    2 +
 apps/files_sharing/l10n/si_LK.php                  |    1 +
 apps/files_sharing/l10n/sk_SK.php                  |    2 +
 apps/files_sharing/l10n/sl.php                     |    2 +
 apps/files_sharing/l10n/sq.php                     |    2 +
 apps/files_sharing/l10n/sr.php                     |    2 +
 apps/files_sharing/l10n/sr at latin.php               |    1 +
 apps/files_sharing/l10n/sv.php                     |    7 +
 apps/files_sharing/l10n/ta_LK.php                  |    1 +
 apps/files_sharing/l10n/te.php                     |    3 +-
 apps/files_sharing/l10n/th_TH.php                  |    2 +
 apps/files_sharing/l10n/tr.php                     |    7 +
 apps/files_sharing/l10n/ug.php                     |    2 +
 apps/files_sharing/l10n/uk.php                     |    2 +
 apps/files_sharing/l10n/ur_PK.php                  |    2 +
 apps/files_sharing/l10n/vi.php                     |    2 +
 apps/files_sharing/l10n/zh_CN.php                  |    2 +
 apps/files_sharing/l10n/zh_HK.php                  |    1 +
 apps/files_sharing/l10n/zh_TW.php                  |    2 +
 apps/files_sharing/lib/api.php                     |    9 +-
 apps/files_sharing/lib/cache.php                   |    3 +-
 apps/files_sharing/lib/connector/publicauth.php    |    2 +-
 apps/files_sharing/lib/mailtemplate.php            |  126 +
 apps/files_sharing/lib/permissions.php             |  132 -
 apps/files_sharing/lib/sharedstorage.php           |    6 +-
 apps/files_sharing/public.php                      |    5 -
 apps/files_sharing/publicwebdav.php                |    6 +-
 apps/files_sharing/settings-admin.php              |   21 +
 apps/files_sharing/templates/authenticate.php      |    4 +-
 apps/files_sharing/templates/public.php            |    2 -
 apps/files_sharing/templates/settings-admin.php    |   41 +
 apps/files_sharing/tests/js/appSpec.js             |    6 +-
 apps/files_sharing/tests/js/shareSpec.js           |  450 ++
 apps/files_sharing/tests/js/sharedfilelistSpec.js  |  101 +-
 apps/files_trashbin/appinfo/database.xml           |   26 -
 apps/files_trashbin/appinfo/update.php             |    3 +-
 apps/files_trashbin/l10n/gl.php                    |    2 +-
 apps/files_trashbin/lib/trashbin.php               |   30 +-
 apps/files_versions/appinfo/database.xml           |   35 -
 apps/files_versions/appinfo/update.php             |   12 +-
 apps/files_versions/appinfo/version                |    2 +-
 apps/files_versions/l10n/gl.php                    |    2 +-
 apps/files_versions/lib/versions.php               |   72 +-
 apps/user_ldap/appinfo/app.php                     |    8 +-
 apps/user_ldap/appinfo/register_command.php        |   11 +
 apps/user_ldap/appinfo/update.php                  |   42 +-
 apps/user_ldap/appinfo/version                     |    2 +-
 apps/user_ldap/command/setconfig.php               |   69 +
 apps/user_ldap/command/showconfig.php              |   76 +
 apps/user_ldap/command/testconfig.php              |   75 +
 apps/user_ldap/js/settings.js                      |    2 +-
 apps/user_ldap/l10n/ast.php                        |    1 +
 apps/user_ldap/l10n/de.php                         |    2 +-
 apps/user_ldap/l10n/de_DE.php                      |    2 +-
 apps/user_ldap/l10n/el.php                         |    3 +
 apps/user_ldap/l10n/en_GB.php                      |    1 -
 apps/user_ldap/l10n/es.php                         |    1 -
 apps/user_ldap/l10n/et_EE.php                      |    1 -
 apps/user_ldap/l10n/fi_FI.php                      |    2 +
 apps/user_ldap/l10n/fr.php                         |    1 -
 apps/user_ldap/l10n/gl.php                         |    4 +-
 apps/user_ldap/l10n/it.php                         |    2 +-
 apps/user_ldap/l10n/ja.php                         |   17 +-
 apps/user_ldap/l10n/nb_NO.php                      |    1 -
 apps/user_ldap/l10n/nl.php                         |    1 -
 apps/user_ldap/l10n/pl.php                         |    4 +-
 apps/user_ldap/l10n/pt_BR.php                      |    1 -
 apps/user_ldap/l10n/pt_PT.php                      |   12 +
 apps/user_ldap/l10n/ru.php                         |    1 -
 apps/user_ldap/l10n/sv.php                         |    1 -
 apps/user_ldap/l10n/tr.php                         |    2 +-
 apps/user_ldap/lib/access.php                      |   31 +-
 apps/user_ldap/lib/configuration.php               |    2 +-
 .../user_ldap/lib/filesystemhelper.php             |   40 +-
 .../user_ldap/lib/logwrapper.php                   |   39 +-
 apps/user_ldap/lib/proxy.php                       |   15 +-
 .../user_ldap/lib/user/iusertools.php              |   46 +-
 apps/user_ldap/lib/user/manager.php                |  167 +
 apps/user_ldap/lib/user/user.php                   |  324 ++
 apps/user_ldap/templates/part.settingcontrols.php  |    2 +-
 apps/user_ldap/templates/part.wizardcontrols.php   |    2 +-
 apps/user_ldap/tests/access.php                    |   23 +-
 apps/user_ldap/tests/group_ldap.php                |   11 +-
 apps/user_ldap/tests/user/user.php                 |  680 +++
 apps/user_ldap/tests/user_ldap.php                 |   42 +-
 apps/user_ldap/user_ldap.php                       |  141 +-
 apps/user_webdavauth/l10n/ar.php                   |    3 +-
 apps/user_webdavauth/l10n/ast.php                  |    2 +-
 apps/user_webdavauth/l10n/bg_BG.php                |    3 +-
 apps/user_webdavauth/l10n/bn_BD.php                |    6 +-
 .../sr at latin.php => user_webdavauth/l10n/bs.php}   |    3 +-
 apps/user_webdavauth/l10n/ca.php                   |    2 +-
 apps/user_webdavauth/l10n/cs_CZ.php                |    2 +-
 .../l10n/cy_GB.php                                 |    3 +-
 apps/user_webdavauth/l10n/da.php                   |    2 +-
 apps/user_webdavauth/l10n/de.php                   |    3 +-
 .../l10n/hi.php => user_webdavauth/l10n/de_AT.php} |    2 +-
 apps/user_webdavauth/l10n/de_CH.php                |    2 +-
 apps/user_webdavauth/l10n/de_DE.php                |    3 +-
 apps/user_webdavauth/l10n/el.php                   |    2 +-
 apps/user_webdavauth/l10n/en_GB.php                |    2 +-
 apps/user_webdavauth/l10n/eo.php                   |    2 +-
 apps/user_webdavauth/l10n/es.php                   |    2 +-
 apps/user_webdavauth/l10n/es_AR.php                |    2 +-
 apps/user_webdavauth/l10n/es_MX.php                |    2 +-
 apps/user_webdavauth/l10n/et_EE.php                |    2 +-
 apps/user_webdavauth/l10n/eu.php                   |    2 +-
 .../l10n/hi.php => user_webdavauth/l10n/eu_ES.php} |    2 +-
 apps/user_webdavauth/l10n/fa.php                   |    3 +-
 apps/user_webdavauth/l10n/fi_FI.php                |    3 +-
 apps/user_webdavauth/l10n/fr.php                   |    2 +-
 apps/user_webdavauth/l10n/gl.php                   |    3 +-
 apps/user_webdavauth/l10n/he.php                   |    3 +-
 .../{files_sharing => user_webdavauth}/l10n/hi.php |    2 +-
 .../{files_sharing => user_webdavauth}/l10n/hr.php |    3 +-
 apps/user_webdavauth/l10n/hu_HU.php                |    2 +-
 .../l10n/hi.php => user_webdavauth/l10n/hy.php}    |    2 +-
 .../l10n/hi.php => user_webdavauth/l10n/ia.php}    |    2 +-
 apps/user_webdavauth/l10n/id.php                   |    2 +-
 apps/user_webdavauth/l10n/is.php                   |    3 +-
 apps/user_webdavauth/l10n/it.php                   |    3 +-
 apps/user_webdavauth/l10n/ja.php                   |    4 +-
 apps/user_webdavauth/l10n/ka_GE.php                |    3 +-
 apps/user_webdavauth/l10n/km.php                   |    2 +-
 apps/user_webdavauth/l10n/ko.php                   |    2 +-
 .../l10n/hi.php => user_webdavauth/l10n/ku_IQ.php} |    2 +-
 .../l10n/hi.php => user_webdavauth/l10n/lb.php}    |    2 +-
 apps/user_webdavauth/l10n/lt_LT.php                |    2 +-
 apps/user_webdavauth/l10n/lv.php                   |    3 +-
 apps/user_webdavauth/l10n/mk.php                   |    2 +-
 apps/user_webdavauth/l10n/ms_MY.php                |    2 +-
 apps/user_webdavauth/l10n/nb_NO.php                |    2 +-
 apps/user_webdavauth/l10n/nl.php                   |    2 +-
 apps/user_webdavauth/l10n/nn_NO.php                |    2 +-
 .../{files_sharing => user_webdavauth}/l10n/oc.php |    3 +-
 apps/user_webdavauth/l10n/pl.php                   |    2 +-
 apps/user_webdavauth/l10n/pt_BR.php                |    2 +-
 apps/user_webdavauth/l10n/pt_PT.php                |    2 +-
 apps/user_webdavauth/l10n/ro.php                   |    2 +-
 apps/user_webdavauth/l10n/ru.php                   |    2 +-
 apps/user_webdavauth/l10n/si_LK.php                |    6 +-
 {settings => apps/user_webdavauth}/l10n/sk.php     |    4 +-
 apps/user_webdavauth/l10n/sk_SK.php                |    2 +-
 apps/user_webdavauth/l10n/sl.php                   |    2 +-
 .../l10n/hi.php => user_webdavauth/l10n/sq.php}    |    2 +-
 apps/user_webdavauth/l10n/sr.php                   |    3 +-
 .../l10n/sr at latin.php                              |    3 +-
 apps/user_webdavauth/l10n/sv.php                   |    2 +-
 apps/user_webdavauth/l10n/ta_LK.php                |    6 +-
 .../l10n/hi.php => user_webdavauth/l10n/te.php}    |    2 +-
 apps/user_webdavauth/l10n/th_TH.php                |    3 +-
 apps/user_webdavauth/l10n/tr.php                   |    3 +-
 apps/user_webdavauth/l10n/ug.php                   |    3 +-
 apps/user_webdavauth/l10n/uk.php                   |    2 +-
 .../l10n/hi.php => user_webdavauth/l10n/ur_PK.php} |    2 +-
 apps/user_webdavauth/l10n/vi.php                   |    2 +-
 apps/user_webdavauth/l10n/zh_CN.php                |    2 +-
 apps/user_webdavauth/l10n/zh_HK.php                |    2 +-
 apps/user_webdavauth/l10n/zh_TW.php                |    2 +-
 apps/user_webdavauth/templates/settings.php        |    4 +-
 config/config.sample.php                           |    4 +-
 core/ajax/update.php                               |    3 +
 core/avatar/controller.php                         |   19 +-
 core/command/upgrade.php                           |    3 +
 core/css/apps.css                                  |   15 +-
 core/css/fixes.css                                 |   14 +-
 core/css/fonts.css                                 |   13 +
 core/css/header.css                                |  293 ++
 core/css/mobile.css                                |   77 -
 core/css/share.css                                 |    2 +-
 core/css/styles.css                                |  258 +-
 core/fonts/LICENSE.txt                             |  202 +
 core/fonts/OpenSans-Bold.woff                      |  Bin 0 -> 21272 bytes
 core/fonts/OpenSans-Regular.woff                   |  Bin 0 -> 20544 bytes
 core/img/actions/caret.png                         |  Bin 196 -> 296 bytes
 core/img/actions/caret.svg                         |   83 +-
 core/img/actions/logout.png                        |  Bin 352 -> 761 bytes
 core/img/actions/logout.svg                        |   59 +-
 core/img/filetypes/folder-shared.png               |  Bin 1155 -> 1229 bytes
 core/img/filetypes/folder-shared.svg               |   44 +-
 core/img/logo-icon.png                             |  Bin 0 -> 1347 bytes
 core/img/logo-icon.svg                             |   51 +
 core/js/apps.js                                    |   76 +
 core/js/avatar.js                                  |    4 +-
 core/js/compatibility.js                           |    3 +-
 core/js/core.json                                  |    1 -
 core/js/eventsource.js                             |   12 +-
 core/js/jquery.infieldlabel.js                     |  177 -
 core/js/jquery.ocdialog.js                         |   16 +-
 core/js/js.js                                      |   96 +-
 core/js/listview.js                                |    8 +-
 core/js/multiselect.js                             |   53 +-
 core/js/oc-dialogs.js                              |   18 +-
 core/js/octemplate.js                              |   11 +-
 core/js/placeholders.js                            |  459 ++
 core/js/setup.js                                   |   10 +-
 core/js/share.js                                   |  201 +-
 core/js/singleselect.js                            |    4 +-
 core/js/tags.js                                    |   34 +-
 core/js/tests/specHelper.js                        |    3 +-
 core/js/tests/specs/coreSpec.js                    |  128 +-
 core/js/tests/specs/shareSpec.js                   |  138 +-
 core/js/update.js                                  |    2 +-
 core/js/visitortimezone.js                         |    3 +-
 core/l10n/af_ZA.php                                |    1 -
 core/l10n/ar.php                                   |    1 -
 core/l10n/ast.php                                  |   14 +-
 core/l10n/bg_BG.php                                |    1 -
 core/l10n/bn_BD.php                                |    1 -
 core/l10n/ca.php                                   |    1 -
 core/l10n/cs_CZ.php                                |    1 -
 core/l10n/cy_GB.php                                |    1 -
 core/l10n/da.php                                   |    1 -
 core/l10n/de.php                                   |    3 +-
 core/l10n/de_CH.php                                |    1 -
 core/l10n/de_DE.php                                |    3 +-
 core/l10n/el.php                                   |    1 -
 core/l10n/en_GB.php                                |    1 -
 core/l10n/eo.php                                   |    1 -
 core/l10n/es.php                                   |    9 +-
 core/l10n/es_AR.php                                |    1 -
 core/l10n/es_MX.php                                |    1 -
 core/l10n/et_EE.php                                |    1 -
 core/l10n/eu.php                                   |    1 -
 core/l10n/fa.php                                   |    1 -
 core/l10n/fi_FI.php                                |    3 +-
 core/l10n/fr.php                                   |    1 -
 core/l10n/gl.php                                   |   19 +-
 core/l10n/he.php                                   |    1 -
 core/l10n/hi.php                                   |    1 -
 core/l10n/hr.php                                   |    1 -
 core/l10n/hu_HU.php                                |    1 -
 core/l10n/ia.php                                   |    1 -
 core/l10n/id.php                                   |    1 -
 core/l10n/is.php                                   |    1 -
 core/l10n/it.php                                   |   11 +-
 core/l10n/ja.php                                   |    7 +-
 core/l10n/ka_GE.php                                |    1 -
 core/l10n/km.php                                   |    1 -
 core/l10n/ko.php                                   |    1 -
 core/l10n/lb.php                                   |    1 -
 core/l10n/lt_LT.php                                |    1 -
 core/l10n/lv.php                                   |    1 -
 core/l10n/mk.php                                   |    1 -
 core/l10n/ms_MY.php                                |    1 -
 core/l10n/nb_NO.php                                |    1 -
 core/l10n/nl.php                                   |    1 -
 core/l10n/nn_NO.php                                |    1 -
 core/l10n/oc.php                                   |    1 -
 core/l10n/pl.php                                   |    9 +-
 core/l10n/pt_BR.php                                |    1 -
 core/l10n/pt_PT.php                                |    1 -
 core/l10n/ro.php                                   |    1 -
 core/l10n/ru.php                                   |    2 +-
 core/l10n/si_LK.php                                |    1 -
 core/l10n/sk_SK.php                                |    1 -
 core/l10n/sl.php                                   |    1 -
 core/l10n/sq.php                                   |    1 -
 core/l10n/sr.php                                   |    1 -
 core/l10n/sr at latin.php                             |    1 -
 core/l10n/sv.php                                   |    1 -
 core/l10n/ta_LK.php                                |    1 -
 core/l10n/th_TH.php                                |    1 -
 core/l10n/tr.php                                   |    3 +-
 core/l10n/uk.php                                   |    1 -
 core/l10n/ur_PK.php                                |    1 -
 core/l10n/vi.php                                   |    1 -
 core/l10n/zh_CN.php                                |    1 -
 core/l10n/zh_HK.php                                |    1 -
 core/l10n/zh_TW.php                                |    1 -
 core/lostpassword/templates/lostpassword.php       |    6 +-
 core/lostpassword/templates/resetpassword.php      |    6 +-
 core/templates/installation.php                    |   39 +-
 core/templates/layout.base.php                     |   12 +-
 core/templates/layout.guest.php                    |   12 +-
 core/templates/layout.user.php                     |   40 +-
 core/templates/login.php                           |   23 +-
 db_structure.xml                                   |   72 +-
 l10n/ach/core.po                                   |  246 +-
 l10n/ach/files.po                                  |   80 +-
 l10n/ach/files_sharing.po                          |   56 +-
 l10n/ach/lib.po                                    |   69 +-
 l10n/ach/settings.po                               |  292 +-
 l10n/ach/user_ldap.po                              |    6 +-
 l10n/ach/user_webdavauth.po                        |   20 +-
 l10n/ady/core.po                                   |  246 +-
 l10n/ady/files.po                                  |   80 +-
 l10n/ady/files_sharing.po                          |   56 +-
 l10n/ady/lib.po                                    |   69 +-
 l10n/ady/settings.po                               |  292 +-
 l10n/ady/user_ldap.po                              |    6 +-
 l10n/ady/user_webdavauth.po                        |   20 +-
 l10n/af_ZA/core.po                                 |  250 +-
 l10n/af_ZA/files.po                                |   80 +-
 l10n/af_ZA/files_sharing.po                        |   56 +-
 l10n/af_ZA/lib.po                                  |   69 +-
 l10n/af_ZA/settings.po                             |  292 +-
 l10n/af_ZA/user_ldap.po                            |    6 +-
 l10n/af_ZA/user_webdavauth.po                      |   20 +-
 l10n/ak/core.po                                    |  246 +-
 l10n/ak/files.po                                   |   80 +-
 l10n/ak/files_sharing.po                           |   56 +-
 l10n/ak/lib.po                                     |   69 +-
 l10n/ak/settings.po                                |  292 +-
 l10n/ak/user_ldap.po                               |    6 +-
 l10n/ak/user_webdavauth.po                         |   18 +-
 l10n/am_ET/core.po                                 |  246 +-
 l10n/am_ET/files.po                                |   80 +-
 l10n/am_ET/files_sharing.po                        |   56 +-
 l10n/am_ET/lib.po                                  |   69 +-
 l10n/am_ET/settings.po                             |  292 +-
 l10n/am_ET/user_ldap.po                            |    6 +-
 l10n/am_ET/user_webdavauth.po                      |   16 +-
 l10n/ar/core.po                                    |  248 +-
 l10n/ar/files.po                                   |   84 +-
 l10n/ar/files_encryption.po                        |    9 +-
 l10n/ar/files_sharing.po                           |   60 +-
 l10n/ar/files_trashbin.po                          |    6 +-
 l10n/ar/lib.po                                     |   71 +-
 l10n/ar/settings.po                                |  300 +-
 l10n/ar/user_ldap.po                               |    8 +-
 l10n/ar/user_webdavauth.po                         |   22 +-
 l10n/ast/core.po                                   |  274 +-
 l10n/ast/files.po                                  |   84 +-
 l10n/ast/files_sharing.po                          |   69 +-
 l10n/ast/files_trashbin.po                         |    6 +-
 l10n/ast/lib.po                                    |   65 +-
 l10n/ast/settings.po                               |  302 +-
 l10n/ast/user_ldap.po                              |   15 +-
 l10n/ast/user_webdavauth.po                        |   14 +-
 l10n/az/core.po                                    |  246 +-
 l10n/az/files.po                                   |   80 +-
 l10n/az/files_sharing.po                           |   56 +-
 l10n/az/lib.po                                     |   69 +-
 l10n/az/settings.po                                |  292 +-
 l10n/az/user_ldap.po                               |    6 +-
 l10n/az/user_webdavauth.po                         |   20 +-
 l10n/be/core.po                                    |  248 +-
 l10n/be/files.po                                   |   80 +-
 l10n/be/files_sharing.po                           |   56 +-
 l10n/be/lib.po                                     |   69 +-
 l10n/be/settings.po                                |  292 +-
 l10n/be/user_ldap.po                               |    6 +-
 l10n/be/user_webdavauth.po                         |   20 +-
 l10n/bg_BG/core.po                                 |  250 +-
 l10n/bg_BG/files.po                                |   80 +-
 l10n/bg_BG/files_sharing.po                        |   58 +-
 l10n/bg_BG/files_trashbin.po                       |    6 +-
 l10n/bg_BG/lib.po                                  |   71 +-
 l10n/bg_BG/settings.po                             |  296 +-
 l10n/bg_BG/user_ldap.po                            |    6 +-
 l10n/bg_BG/user_webdavauth.po                      |   20 +-
 l10n/bn_BD/core.po                                 |  248 +-
 l10n/bn_BD/files.po                                |   80 +-
 l10n/bn_BD/files_sharing.po                        |   58 +-
 l10n/bn_BD/files_trashbin.po                       |    6 +-
 l10n/bn_BD/lib.po                                  |   69 +-
 l10n/bn_BD/settings.po                             |  296 +-
 l10n/bn_BD/user_ldap.po                            |    6 +-
 l10n/bn_BD/user_webdavauth.po                      |   22 +-
 l10n/bn_IN/core.po                                 |  246 +-
 l10n/bn_IN/files.po                                |   80 +-
 l10n/bn_IN/files_sharing.po                        |   56 +-
 l10n/bn_IN/lib.po                                  |   69 +-
 l10n/bn_IN/settings.po                             |  292 +-
 l10n/bn_IN/user_ldap.po                            |    6 +-
 l10n/bn_IN/user_webdavauth.po                      |   12 +-
 l10n/bs/core.po                                    |  246 +-
 l10n/bs/files.po                                   |   80 +-
 l10n/bs/files_sharing.po                           |   58 +-
 l10n/bs/files_trashbin.po                          |    6 +-
 l10n/bs/lib.po                                     |   69 +-
 l10n/bs/settings.po                                |  292 +-
 l10n/bs/user_ldap.po                               |    6 +-
 l10n/bs/user_webdavauth.po                         |   20 +-
 l10n/ca/core.po                                    |  248 +-
 l10n/ca/files.po                                   |   82 +-
 l10n/ca/files_sharing.po                           |   60 +-
 l10n/ca/files_trashbin.po                          |    6 +-
 l10n/ca/lib.po                                     |   69 +-
 l10n/ca/settings.po                                |  296 +-
 l10n/ca/user_ldap.po                               |    6 +-
 l10n/ca/user_webdavauth.po                         |   22 +-
 l10n/ca at valencia/core.po                           |  248 +-
 l10n/ca at valencia/files.po                          |   46 +-
 l10n/ca at valencia/files_sharing.po                  |   56 +-
 l10n/ca at valencia/lib.po                            |   53 +-
 l10n/ca at valencia/settings.po                       |  292 +-
 l10n/ca at valencia/user_ldap.po                      |    8 +-
 l10n/ca at valencia/user_webdavauth.po                |   12 +-
 l10n/cs_CZ/core.po                                 |  264 +-
 l10n/cs_CZ/files.po                                |   98 +-
 l10n/cs_CZ/files_sharing.po                        |   66 +-
 l10n/cs_CZ/files_trashbin.po                       |    6 +-
 l10n/cs_CZ/lib.po                                  |   81 +-
 l10n/cs_CZ/settings.po                             |  310 +-
 l10n/cs_CZ/user_ldap.po                            |   18 +-
 l10n/cs_CZ/user_webdavauth.po                      |   24 +-
 l10n/cy_GB/core.po                                 |  250 +-
 l10n/cy_GB/files.po                                |   80 +-
 l10n/cy_GB/files_sharing.po                        |   58 +-
 l10n/cy_GB/files_trashbin.po                       |    6 +-
 l10n/cy_GB/lib.po                                  |   69 +-
 l10n/cy_GB/settings.po                             |  292 +-
 l10n/cy_GB/user_ldap.po                            |    6 +-
 l10n/cy_GB/user_webdavauth.po                      |   20 +-
 l10n/da/core.po                                    |  256 +-
 l10n/da/files.po                                   |   88 +-
 l10n/da/files_sharing.po                           |   66 +-
 l10n/da/files_trashbin.po                          |    6 +-
 l10n/da/lib.po                                     |   75 +-
 l10n/da/settings.po                                |  300 +-
 l10n/da/user_ldap.po                               |    8 +-
 l10n/da/user_webdavauth.po                         |   26 +-
 l10n/de/core.po                                    |  256 +-
 l10n/de/files.po                                   |   84 +-
 l10n/de/files_sharing.po                           |   73 +-
 l10n/de/files_trashbin.po                          |    6 +-
 l10n/de/lib.po                                     |   75 +-
 l10n/de/settings.po                                |  308 +-
 l10n/de/user_ldap.po                               |    8 +-
 l10n/de/user_webdavauth.po                         |   30 +-
 l10n/de_AT/core.po                                 |  246 +-
 l10n/de_AT/files.po                                |   80 +-
 l10n/de_AT/files_sharing.po                        |   56 +-
 l10n/de_AT/lib.po                                  |   69 +-
 l10n/de_AT/settings.po                             |  292 +-
 l10n/de_AT/user_ldap.po                            |    6 +-
 l10n/de_AT/user_webdavauth.po                      |   20 +-
 l10n/de_CH/core.po                                 |  258 +-
 l10n/de_CH/files.po                                |   88 +-
 l10n/de_CH/files_sharing.po                        |   62 +-
 l10n/de_CH/files_trashbin.po                       |    6 +-
 l10n/de_CH/lib.po                                  |   73 +-
 l10n/de_CH/settings.po                             |  306 +-
 l10n/de_CH/user_ldap.po                            |   14 +-
 l10n/de_CH/user_webdavauth.po                      |   32 +-
 l10n/de_DE/core.po                                 |  256 +-
 l10n/de_DE/files.po                                |   86 +-
 l10n/de_DE/files_sharing.po                        |   71 +-
 l10n/de_DE/files_trashbin.po                       |    6 +-
 l10n/de_DE/lib.po                                  |   71 +-
 l10n/de_DE/settings.po                             |  310 +-
 l10n/de_DE/user_ldap.po                            |   10 +-
 l10n/de_DE/user_webdavauth.po                      |   36 +-
 l10n/el/core.po                                    |  266 +-
 l10n/el/files.po                                   |   90 +-
 l10n/el/files_sharing.po                           |   70 +-
 l10n/el/files_trashbin.po                          |    6 +-
 l10n/el/lib.po                                     |   65 +-
 l10n/el/settings.po                                |  310 +-
 l10n/el/user_ldap.po                               |   19 +-
 l10n/el/user_webdavauth.po                         |   22 +-
 l10n/en at pirate/core.po                             |  248 +-
 l10n/en at pirate/files.po                            |   80 +-
 l10n/en at pirate/files_sharing.po                    |   58 +-
 l10n/en at pirate/lib.po                              |   69 +-
 l10n/en at pirate/settings.po                         |  292 +-
 l10n/en at pirate/user_ldap.po                        |    6 +-
 l10n/en at pirate/user_webdavauth.po                  |   20 +-
 l10n/en_GB/core.po                                 |  252 +-
 l10n/en_GB/files.po                                |   84 +-
 l10n/en_GB/files_sharing.po                        |   70 +-
 l10n/en_GB/files_trashbin.po                       |    6 +-
 l10n/en_GB/lib.po                                  |   63 +-
 l10n/en_GB/settings.po                             |  302 +-
 l10n/en_GB/user_ldap.po                            |   12 +-
 l10n/en_GB/user_webdavauth.po                      |   24 +-
 l10n/en_NZ/core.po                                 |  246 +-
 l10n/en_NZ/files.po                                |   80 +-
 l10n/en_NZ/files_sharing.po                        |   56 +-
 l10n/en_NZ/lib.po                                  |   69 +-
 l10n/en_NZ/settings.po                             |  292 +-
 l10n/en_NZ/user_ldap.po                            |    6 +-
 l10n/en_NZ/user_webdavauth.po                      |   12 +-
 l10n/eo/core.po                                    |  250 +-
 l10n/eo/files.po                                   |   80 +-
 l10n/eo/files_sharing.po                           |   60 +-
 l10n/eo/files_trashbin.po                          |    6 +-
 l10n/eo/lib.po                                     |   71 +-
 l10n/eo/settings.po                                |  296 +-
 l10n/eo/user_ldap.po                               |    6 +-
 l10n/eo/user_webdavauth.po                         |   20 +-
 l10n/es/core.po                                    |  280 +-
 l10n/es/files.po                                   |   96 +-
 l10n/es/files_sharing.po                           |   68 +-
 l10n/es/files_trashbin.po                          |    6 +-
 l10n/es/lib.po                                     |   81 +-
 l10n/es/settings.po                                |  320 +-
 l10n/es/user_ldap.po                               |   20 +-
 l10n/es/user_webdavauth.po                         |   30 +-
 l10n/es_AR/core.po                                 |  250 +-
 l10n/es_AR/files.po                                |   84 +-
 l10n/es_AR/files_sharing.po                        |   62 +-
 l10n/es_AR/files_trashbin.po                       |    6 +-
 l10n/es_AR/lib.po                                  |   71 +-
 l10n/es_AR/settings.po                             |  300 +-
 l10n/es_AR/user_ldap.po                            |   10 +-
 l10n/es_AR/user_webdavauth.po                      |   26 +-
 l10n/es_BO/core.po                                 |  246 +-
 l10n/es_BO/files.po                                |   80 +-
 l10n/es_BO/files_sharing.po                        |   56 +-
 l10n/es_BO/lib.po                                  |   69 +-
 l10n/es_BO/settings.po                             |  292 +-
 l10n/es_BO/user_ldap.po                            |    6 +-
 l10n/es_BO/user_webdavauth.po                      |   12 +-
 l10n/es_CL/core.po                                 |  246 +-
 l10n/es_CL/files.po                                |   80 +-
 l10n/es_CL/files_sharing.po                        |   56 +-
 l10n/es_CL/lib.po                                  |   69 +-
 l10n/es_CL/settings.po                             |  292 +-
 l10n/es_CL/user_ldap.po                            |    6 +-
 l10n/es_CL/user_webdavauth.po                      |   18 +-
 l10n/es_CO/core.po                                 |  246 +-
 l10n/es_CO/files.po                                |   80 +-
 l10n/es_CO/files_sharing.po                        |   56 +-
 l10n/es_CO/lib.po                                  |   69 +-
 l10n/es_CO/settings.po                             |  292 +-
 l10n/es_CO/user_ldap.po                            |    6 +-
 l10n/es_CO/user_webdavauth.po                      |   12 +-
 l10n/es_CR/core.po                                 |  246 +-
 l10n/es_CR/files.po                                |   80 +-
 l10n/es_CR/files_sharing.po                        |   56 +-
 l10n/es_CR/lib.po                                  |   69 +-
 l10n/es_CR/settings.po                             |  292 +-
 l10n/es_CR/user_ldap.po                            |    6 +-
 l10n/es_CR/user_webdavauth.po                      |   10 +-
 l10n/es_EC/core.po                                 |  246 +-
 l10n/es_EC/files.po                                |   80 +-
 l10n/es_EC/files_sharing.po                        |   56 +-
 l10n/es_EC/lib.po                                  |   69 +-
 l10n/es_EC/settings.po                             |  292 +-
 l10n/es_EC/user_ldap.po                            |    6 +-
 l10n/es_EC/user_webdavauth.po                      |   12 +-
 l10n/es_MX/core.po                                 |  248 +-
 l10n/es_MX/files.po                                |   80 +-
 l10n/es_MX/files_sharing.po                        |   60 +-
 l10n/es_MX/files_trashbin.po                       |    6 +-
 l10n/es_MX/lib.po                                  |   69 +-
 l10n/es_MX/settings.po                             |  296 +-
 l10n/es_MX/user_ldap.po                            |    6 +-
 l10n/es_MX/user_webdavauth.po                      |   20 +-
 l10n/es_PE/core.po                                 |  246 +-
 l10n/es_PE/files.po                                |   80 +-
 l10n/es_PE/files_sharing.po                        |   56 +-
 l10n/es_PE/lib.po                                  |   69 +-
 l10n/es_PE/settings.po                             |  292 +-
 l10n/es_PE/user_ldap.po                            |    6 +-
 l10n/es_PE/user_webdavauth.po                      |   12 +-
 l10n/es_PY/core.po                                 |  246 +-
 l10n/es_PY/files.po                                |   80 +-
 l10n/es_PY/files_sharing.po                        |   56 +-
 l10n/es_PY/lib.po                                  |   69 +-
 l10n/es_PY/settings.po                             |  292 +-
 l10n/es_PY/user_ldap.po                            |    6 +-
 l10n/es_PY/user_webdavauth.po                      |   12 +-
 l10n/es_US/core.po                                 |  246 +-
 l10n/es_US/files.po                                |   80 +-
 l10n/es_US/files_sharing.po                        |   56 +-
 l10n/es_US/lib.po                                  |   69 +-
 l10n/es_US/settings.po                             |  292 +-
 l10n/es_US/user_ldap.po                            |    6 +-
 l10n/es_US/user_webdavauth.po                      |   12 +-
 l10n/es_UY/core.po                                 |  246 +-
 l10n/es_UY/files.po                                |   80 +-
 l10n/es_UY/files_sharing.po                        |   56 +-
 l10n/es_UY/lib.po                                  |   69 +-
 l10n/es_UY/settings.po                             |  292 +-
 l10n/es_UY/user_ldap.po                            |    6 +-
 l10n/es_UY/user_webdavauth.po                      |   12 +-
 l10n/et_EE/core.po                                 |  250 +-
 l10n/et_EE/files.po                                |   78 +-
 l10n/et_EE/files_sharing.po                        |   62 +-
 l10n/et_EE/files_trashbin.po                       |    6 +-
 l10n/et_EE/lib.po                                  |   55 +-
 l10n/et_EE/settings.po                             |  298 +-
 l10n/et_EE/user_ldap.po                            |   12 +-
 l10n/et_EE/user_webdavauth.po                      |   24 +-
 l10n/eu/core.po                                    |  250 +-
 l10n/eu/files.po                                   |   80 +-
 l10n/eu/files_sharing.po                           |   60 +-
 l10n/eu/files_trashbin.po                          |    6 +-
 l10n/eu/lib.po                                     |   69 +-
 l10n/eu/settings.po                                |  298 +-
 l10n/eu/user_ldap.po                               |    6 +-
 l10n/eu/user_webdavauth.po                         |   22 +-
 l10n/eu_ES/core.po                                 |  246 +-
 l10n/eu_ES/files.po                                |   80 +-
 l10n/eu_ES/files_sharing.po                        |   56 +-
 l10n/eu_ES/lib.po                                  |   69 +-
 l10n/eu_ES/settings.po                             |  292 +-
 l10n/eu_ES/user_ldap.po                            |    6 +-
 l10n/eu_ES/user_webdavauth.po                      |   16 +-
 l10n/fa/core.po                                    |  252 +-
 l10n/fa/files.po                                   |   84 +-
 l10n/fa/files_sharing.po                           |   64 +-
 l10n/fa/files_trashbin.po                          |    6 +-
 l10n/fa/lib.po                                     |   71 +-
 l10n/fa/settings.po                                |  302 +-
 l10n/fa/user_ldap.po                               |    8 +-
 l10n/fa/user_webdavauth.po                         |   22 +-
 l10n/fi_FI/core.po                                 |  250 +-
 l10n/fi_FI/files.po                                |   86 +-
 l10n/fi_FI/files_sharing.po                        |   68 +-
 l10n/fi_FI/files_trashbin.po                       |    6 +-
 l10n/fi_FI/lib.po                                  |   71 +-
 l10n/fi_FI/settings.po                             |  298 +-
 l10n/fi_FI/user_ldap.po                            |   10 +-
 l10n/fi_FI/user_webdavauth.po                      |   20 +-
 l10n/fr/core.po                                    |  262 +-
 l10n/fr/files.po                                   |   88 +-
 l10n/fr/files_external.po                          |   19 +-
 l10n/fr/files_sharing.po                           |   73 +-
 l10n/fr/files_trashbin.po                          |    6 +-
 l10n/fr/lib.po                                     |   77 +-
 l10n/fr/settings.po                                |  315 +-
 l10n/fr/user_ldap.po                               |   18 +-
 l10n/fr/user_webdavauth.po                         |   26 +-
 l10n/fr_CA/core.po                                 |  246 +-
 l10n/fr_CA/files.po                                |   80 +-
 l10n/fr_CA/files_sharing.po                        |   56 +-
 l10n/fr_CA/lib.po                                  |   69 +-
 l10n/fr_CA/settings.po                             |  292 +-
 l10n/fr_CA/user_ldap.po                            |    6 +-
 l10n/fr_CA/user_webdavauth.po                      |   18 +-
 l10n/gl/core.po                                    |  270 +-
 l10n/gl/files.po                                   |   88 +-
 l10n/gl/files_encryption.po                        |   22 +-
 l10n/gl/files_external.po                          |  106 +-
 l10n/gl/files_sharing.po                           |   72 +-
 l10n/gl/files_trashbin.po                          |   11 +-
 l10n/gl/files_versions.po                          |   19 +-
 l10n/gl/lib.po                                     |   85 +-
 l10n/gl/settings.po                                |  306 +-
 l10n/gl/user_ldap.po                               |   16 +-
 l10n/gl/user_webdavauth.po                         |   25 +-
 l10n/he/core.po                                    |  250 +-
 l10n/he/files.po                                   |   82 +-
 l10n/he/files_sharing.po                           |   60 +-
 l10n/he/files_trashbin.po                          |    6 +-
 l10n/he/lib.po                                     |   69 +-
 l10n/he/settings.po                                |  296 +-
 l10n/he/user_ldap.po                               |    6 +-
 l10n/he/user_webdavauth.po                         |   20 +-
 l10n/hi/core.po                                    |  250 +-
 l10n/hi/files.po                                   |   80 +-
 l10n/hi/files_sharing.po                           |   56 +-
 l10n/hi/lib.po                                     |   69 +-
 l10n/hi/settings.po                                |  292 +-
 l10n/hi/user_ldap.po                               |    6 +-
 l10n/hi/user_webdavauth.po                         |   20 +-
 l10n/hi_IN/core.po                                 |  246 +-
 l10n/hi_IN/files.po                                |   80 +-
 l10n/hi_IN/files_sharing.po                        |   56 +-
 l10n/hi_IN/lib.po                                  |   69 +-
 l10n/hi_IN/settings.po                             |  292 +-
 l10n/hi_IN/user_ldap.po                            |    6 +-
 l10n/hi_IN/user_webdavauth.po                      |   12 +-
 l10n/hr/core.po                                    |  248 +-
 l10n/hr/files.po                                   |   80 +-
 l10n/hr/files_sharing.po                           |   58 +-
 l10n/hr/files_trashbin.po                          |    6 +-
 l10n/hr/lib.po                                     |   69 +-
 l10n/hr/settings.po                                |  292 +-
 l10n/hr/user_ldap.po                               |    6 +-
 l10n/hr/user_webdavauth.po                         |   20 +-
 l10n/hu_HU/core.po                                 |  252 +-
 l10n/hu_HU/files.po                                |   80 +-
 l10n/hu_HU/files_sharing.po                        |   60 +-
 l10n/hu_HU/files_trashbin.po                       |    6 +-
 l10n/hu_HU/lib.po                                  |   53 +-
 l10n/hu_HU/settings.po                             |  298 +-
 l10n/hu_HU/user_ldap.po                            |    6 +-
 l10n/hu_HU/user_webdavauth.po                      |   24 +-
 l10n/hy/core.po                                    |  246 +-
 l10n/hy/files.po                                   |   80 +-
 l10n/hy/files_sharing.po                           |   56 +-
 l10n/hy/lib.po                                     |   69 +-
 l10n/hy/settings.po                                |  292 +-
 l10n/hy/user_ldap.po                               |    6 +-
 l10n/hy/user_webdavauth.po                         |   20 +-
 l10n/ia/core.po                                    |  248 +-
 l10n/ia/files.po                                   |   80 +-
 l10n/ia/files_sharing.po                           |   58 +-
 l10n/ia/files_trashbin.po                          |    6 +-
 l10n/ia/lib.po                                     |   69 +-
 l10n/ia/settings.po                                |  292 +-
 l10n/ia/user_ldap.po                               |    6 +-
 l10n/ia/user_webdavauth.po                         |   20 +-
 l10n/id/core.po                                    |  248 +-
 l10n/id/files.po                                   |   80 +-
 l10n/id/files_sharing.po                           |   60 +-
 l10n/id/files_trashbin.po                          |    6 +-
 l10n/id/lib.po                                     |   69 +-
 l10n/id/settings.po                                |  296 +-
 l10n/id/user_ldap.po                               |    6 +-
 l10n/id/user_webdavauth.po                         |   24 +-
 l10n/is/core.po                                    |  248 +-
 l10n/is/files.po                                   |   80 +-
 l10n/is/files_sharing.po                           |   58 +-
 l10n/is/files_trashbin.po                          |    6 +-
 l10n/is/lib.po                                     |   69 +-
 l10n/is/settings.po                                |  296 +-
 l10n/is/user_ldap.po                               |    6 +-
 l10n/is/user_webdavauth.po                         |   22 +-
 l10n/it/core.po                                    |  266 +-
 l10n/it/files.po                                   |   82 +-
 l10n/it/files_sharing.po                           |   70 +-
 l10n/it/files_trashbin.po                          |    6 +-
 l10n/it/lib.po                                     |   73 +-
 l10n/it/settings.po                                |  302 +-
 l10n/it/user_ldap.po                               |    8 +-
 l10n/it/user_webdavauth.po                         |   20 +-
 l10n/ja/core.po                                    |  264 +-
 l10n/ja/files.po                                   |   96 +-
 l10n/ja/files_encryption.po                        |   14 +-
 l10n/ja/files_external.po                          |  108 +-
 l10n/ja/files_sharing.po                           |   71 +-
 l10n/ja/files_trashbin.po                          |    6 +-
 l10n/ja/lib.po                                     |   81 +-
 l10n/ja/settings.po                                |  314 +-
 l10n/ja/user_ldap.po                               |   38 +-
 l10n/ja/user_webdavauth.po                         |   27 +-
 l10n/jv/core.po                                    |  246 +-
 l10n/jv/files.po                                   |   80 +-
 l10n/jv/files_sharing.po                           |   56 +-
 l10n/jv/lib.po                                     |   69 +-
 l10n/jv/settings.po                                |  292 +-
 l10n/jv/user_ldap.po                               |    6 +-
 l10n/jv/user_webdavauth.po                         |   10 +-
 l10n/ka_GE/core.po                                 |  248 +-
 l10n/ka_GE/files.po                                |   80 +-
 l10n/ka_GE/files_sharing.po                        |   60 +-
 l10n/ka_GE/files_trashbin.po                       |    6 +-
 l10n/ka_GE/lib.po                                  |   69 +-
 l10n/ka_GE/settings.po                             |  298 +-
 l10n/ka_GE/user_ldap.po                            |    6 +-
 l10n/ka_GE/user_webdavauth.po                      |   22 +-
 l10n/km/core.po                                    |  250 +-
 l10n/km/files.po                                   |   90 +-
 l10n/km/files_sharing.po                           |   64 +-
 l10n/km/files_trashbin.po                          |    6 +-
 l10n/km/lib.po                                     |   76 +-
 l10n/km/settings.po                                |  300 +-
 l10n/km/user_ldap.po                               |    8 +-
 l10n/km/user_webdavauth.po                         |   22 +-
 l10n/kn/core.po                                    |  246 +-
 l10n/kn/files.po                                   |   80 +-
 l10n/kn/files_sharing.po                           |   56 +-
 l10n/kn/lib.po                                     |   69 +-
 l10n/kn/settings.po                                |  292 +-
 l10n/kn/user_ldap.po                               |    6 +-
 l10n/kn/user_webdavauth.po                         |   20 +-
 l10n/ko/core.po                                    |  256 +-
 l10n/ko/files.po                                   |   90 +-
 l10n/ko/files_sharing.po                           |   64 +-
 l10n/ko/files_trashbin.po                          |    6 +-
 l10n/ko/lib.po                                     |   77 +-
 l10n/ko/settings.po                                |  300 +-
 l10n/ko/user_ldap.po                               |   10 +-
 l10n/ko/user_webdavauth.po                         |   28 +-
 l10n/ku_IQ/core.po                                 |  246 +-
 l10n/ku_IQ/files.po                                |   80 +-
 l10n/ku_IQ/files_sharing.po                        |   58 +-
 l10n/ku_IQ/files_trashbin.po                       |    6 +-
 l10n/ku_IQ/lib.po                                  |   69 +-
 l10n/ku_IQ/settings.po                             |  292 +-
 l10n/ku_IQ/user_ldap.po                            |    6 +-
 l10n/ku_IQ/user_webdavauth.po                      |   20 +-
 l10n/l10n.pl                                       |    4 +
 l10n/lb/core.po                                    |  250 +-
 l10n/lb/files.po                                   |   80 +-
 l10n/lb/files_sharing.po                           |   60 +-
 l10n/lb/files_trashbin.po                          |    6 +-
 l10n/lb/lib.po                                     |   71 +-
 l10n/lb/settings.po                                |  294 +-
 l10n/lb/user_ldap.po                               |    6 +-
 l10n/lb/user_webdavauth.po                         |   20 +-
 l10n/lt_LT/core.po                                 |  254 +-
 l10n/lt_LT/files.po                                |   82 +-
 l10n/lt_LT/files_sharing.po                        |   62 +-
 l10n/lt_LT/files_trashbin.po                       |    6 +-
 l10n/lt_LT/lib.po                                  |   73 +-
 l10n/lt_LT/settings.po                             |  300 +-
 l10n/lt_LT/user_ldap.po                            |    6 +-
 l10n/lt_LT/user_webdavauth.po                      |   24 +-
 l10n/lv/core.po                                    |  248 +-
 l10n/lv/files.po                                   |   80 +-
 l10n/lv/files_sharing.po                           |   60 +-
 l10n/lv/files_trashbin.po                          |    6 +-
 l10n/lv/lib.po                                     |   69 +-
 l10n/lv/settings.po                                |  296 +-
 l10n/lv/user_ldap.po                               |    6 +-
 l10n/lv/user_webdavauth.po                         |   20 +-
 l10n/mk/core.po                                    |  250 +-
 l10n/mk/files.po                                   |   82 +-
 l10n/mk/files_sharing.po                           |   60 +-
 l10n/mk/files_trashbin.po                          |    6 +-
 l10n/mk/lib.po                                     |   69 +-
 l10n/mk/settings.po                                |  298 +-
 l10n/mk/user_ldap.po                               |    8 +-
 l10n/mk/user_webdavauth.po                         |   24 +-
 l10n/ml/core.po                                    |  246 +-
 l10n/ml/files.po                                   |   80 +-
 l10n/ml/files_sharing.po                           |   56 +-
 l10n/ml/lib.po                                     |   69 +-
 l10n/ml/settings.po                                |  292 +-
 l10n/ml/user_ldap.po                               |    6 +-
 l10n/ml/user_webdavauth.po                         |   16 +-
 l10n/ml_IN/core.po                                 |  246 +-
 l10n/ml_IN/files.po                                |   80 +-
 l10n/ml_IN/files_sharing.po                        |   56 +-
 l10n/ml_IN/lib.po                                  |   69 +-
 l10n/ml_IN/settings.po                             |  292 +-
 l10n/ml_IN/user_ldap.po                            |    6 +-
 l10n/ml_IN/user_webdavauth.po                      |   20 +-
 l10n/mn/core.po                                    |  246 +-
 l10n/mn/files.po                                   |   80 +-
 l10n/mn/files_sharing.po                           |   56 +-
 l10n/mn/lib.po                                     |   69 +-
 l10n/mn/settings.po                                |  292 +-
 l10n/mn/user_ldap.po                               |    6 +-
 l10n/mn/user_webdavauth.po                         |   16 +-
 l10n/ms_MY/core.po                                 |  248 +-
 l10n/ms_MY/files.po                                |   80 +-
 l10n/ms_MY/files_sharing.po                        |   58 +-
 l10n/ms_MY/files_trashbin.po                       |    6 +-
 l10n/ms_MY/lib.po                                  |   69 +-
 l10n/ms_MY/settings.po                             |  292 +-
 l10n/ms_MY/user_ldap.po                            |    6 +-
 l10n/ms_MY/user_webdavauth.po                      |   20 +-
 l10n/my_MM/core.po                                 |  246 +-
 l10n/my_MM/files.po                                |   80 +-
 l10n/my_MM/files_sharing.po                        |   56 +-
 l10n/my_MM/lib.po                                  |   69 +-
 l10n/my_MM/settings.po                             |  292 +-
 l10n/my_MM/user_ldap.po                            |    6 +-
 l10n/my_MM/user_webdavauth.po                      |   20 +-
 l10n/nb_NO/core.po                                 |  254 +-
 l10n/nb_NO/files.po                                |   48 +-
 l10n/nb_NO/files_sharing.po                        |   68 +-
 l10n/nb_NO/files_trashbin.po                       |    6 +-
 l10n/nb_NO/lib.po                                  |   55 +-
 l10n/nb_NO/settings.po                             |  302 +-
 l10n/nb_NO/user_ldap.po                            |   10 +-
 l10n/nb_NO/user_webdavauth.po                      |   24 +-
 l10n/nds/core.po                                   |  246 +-
 l10n/nds/files.po                                  |   80 +-
 l10n/nds/files_sharing.po                          |   56 +-
 l10n/nds/lib.po                                    |   69 +-
 l10n/nds/settings.po                               |  292 +-
 l10n/nds/user_ldap.po                              |    6 +-
 l10n/nds/user_webdavauth.po                        |   20 +-
 l10n/ne/core.po                                    |  246 +-
 l10n/ne/files.po                                   |   80 +-
 l10n/ne/files_sharing.po                           |   56 +-
 l10n/ne/lib.po                                     |   69 +-
 l10n/ne/settings.po                                |  292 +-
 l10n/ne/user_ldap.po                               |    6 +-
 l10n/ne/user_webdavauth.po                         |   20 +-
 l10n/nl/core.po                                    |  252 +-
 l10n/nl/files.po                                   |   48 +-
 l10n/nl/files_sharing.po                           |   62 +-
 l10n/nl/files_trashbin.po                          |    6 +-
 l10n/nl/lib.po                                     |   75 +-
 l10n/nl/settings.po                                |  300 +-
 l10n/nl/user_ldap.po                               |   14 +-
 l10n/nl/user_webdavauth.po                         |   24 +-
 l10n/nn_NO/core.po                                 |  254 +-
 l10n/nn_NO/files.po                                |   86 +-
 l10n/nn_NO/files_sharing.po                        |   62 +-
 l10n/nn_NO/files_trashbin.po                       |    6 +-
 l10n/nn_NO/lib.po                                  |   73 +-
 l10n/nn_NO/settings.po                             |  302 +-
 l10n/nn_NO/user_ldap.po                            |    6 +-
 l10n/nn_NO/user_webdavauth.po                      |   24 +-
 l10n/nqo/core.po                                   |  246 +-
 l10n/nqo/files.po                                  |   80 +-
 l10n/nqo/files_sharing.po                          |   56 +-
 l10n/nqo/lib.po                                    |   69 +-
 l10n/nqo/settings.po                               |  292 +-
 l10n/nqo/user_ldap.po                              |    6 +-
 l10n/nqo/user_webdavauth.po                        |   20 +-
 l10n/oc/core.po                                    |  248 +-
 l10n/oc/files.po                                   |   80 +-
 l10n/oc/files_sharing.po                           |   58 +-
 l10n/oc/files_trashbin.po                          |    6 +-
 l10n/oc/lib.po                                     |   69 +-
 l10n/oc/settings.po                                |  292 +-
 l10n/oc/user_ldap.po                               |    6 +-
 l10n/oc/user_webdavauth.po                         |   20 +-
 l10n/or_IN/core.po                                 |  246 +-
 l10n/or_IN/files.po                                |   80 +-
 l10n/or_IN/files_sharing.po                        |   56 +-
 l10n/or_IN/lib.po                                  |   69 +-
 l10n/or_IN/settings.po                             |  292 +-
 l10n/or_IN/user_ldap.po                            |    6 +-
 l10n/or_IN/user_webdavauth.po                      |   10 +-
 l10n/pa/core.po                                    |  246 +-
 l10n/pa/files.po                                   |   80 +-
 l10n/pa/files_sharing.po                           |   56 +-
 l10n/pa/lib.po                                     |   69 +-
 l10n/pa/settings.po                                |  292 +-
 l10n/pa/user_ldap.po                               |    6 +-
 l10n/pa/user_webdavauth.po                         |   20 +-
 l10n/pl/core.po                                    |  270 +-
 l10n/pl/files.po                                   |   90 +-
 l10n/pl/files_encryption.po                        |   12 +-
 l10n/pl/files_sharing.po                           |   70 +-
 l10n/pl/files_trashbin.po                          |    6 +-
 l10n/pl/lib.po                                     |   75 +-
 l10n/pl/settings.po                                |  308 +-
 l10n/pl/user_ldap.po                               |   22 +-
 l10n/pl/user_webdavauth.po                         |   24 +-
 l10n/pt_BR/core.po                                 |  252 +-
 l10n/pt_BR/files.po                                |   86 +-
 l10n/pt_BR/files_sharing.po                        |   68 +-
 l10n/pt_BR/files_trashbin.po                       |    6 +-
 l10n/pt_BR/lib.po                                  |   73 +-
 l10n/pt_BR/settings.po                             |  304 +-
 l10n/pt_BR/user_ldap.po                            |   12 +-
 l10n/pt_BR/user_webdavauth.po                      |   30 +-
 l10n/pt_PT/core.po                                 |  258 +-
 l10n/pt_PT/files.po                                |   84 +-
 l10n/pt_PT/files_sharing.po                        |   73 +-
 l10n/pt_PT/files_trashbin.po                       |    6 +-
 l10n/pt_PT/lib.po                                  |   75 +-
 l10n/pt_PT/settings.po                             |  308 +-
 l10n/pt_PT/user_ldap.po                            |   35 +-
 l10n/pt_PT/user_webdavauth.po                      |   24 +-
 l10n/ro/core.po                                    |  254 +-
 l10n/ro/files.po                                   |   94 +-
 l10n/ro/files_sharing.po                           |   60 +-
 l10n/ro/files_trashbin.po                          |    6 +-
 l10n/ro/lib.po                                     |   69 +-
 l10n/ro/settings.po                                |  300 +-
 l10n/ro/user_ldap.po                               |    8 +-
 l10n/ro/user_webdavauth.po                         |   20 +-
 l10n/ru/core.po                                    |  283 +-
 l10n/ru/files.po                                   |   94 +-
 l10n/ru/files_external.po                          |   27 +-
 l10n/ru/files_sharing.po                           |   66 +-
 l10n/ru/files_trashbin.po                          |    6 +-
 l10n/ru/lib.po                                     |   81 +-
 l10n/ru/settings.po                                |  324 +-
 l10n/ru/user_ldap.po                               |   28 +-
 l10n/ru/user_webdavauth.po                         |   26 +-
 l10n/si_LK/core.po                                 |  248 +-
 l10n/si_LK/files.po                                |   80 +-
 l10n/si_LK/files_sharing.po                        |   58 +-
 l10n/si_LK/files_trashbin.po                       |    6 +-
 l10n/si_LK/lib.po                                  |   69 +-
 l10n/si_LK/settings.po                             |  292 +-
 l10n/si_LK/user_ldap.po                            |    6 +-
 l10n/si_LK/user_webdavauth.po                      |   22 +-
 l10n/sk/core.po                                    |  246 +-
 l10n/sk/files.po                                   |   80 +-
 l10n/sk/files_sharing.po                           |   56 +-
 l10n/sk/lib.po                                     |   69 +-
 l10n/sk/settings.po                                |  292 +-
 l10n/sk/user_ldap.po                               |    6 +-
 l10n/sk/user_webdavauth.po                         |   20 +-
 l10n/sk_SK/core.po                                 |  250 +-
 l10n/sk_SK/files.po                                |   82 +-
 l10n/sk_SK/files_sharing.po                        |   62 +-
 l10n/sk_SK/files_trashbin.po                       |    6 +-
 l10n/sk_SK/lib.po                                  |   71 +-
 l10n/sk_SK/settings.po                             |  298 +-
 l10n/sk_SK/user_ldap.po                            |    8 +-
 l10n/sk_SK/user_webdavauth.po                      |   22 +-
 l10n/sl/core.po                                    |  250 +-
 l10n/sl/files.po                                   |   82 +-
 l10n/sl/files_sharing.po                           |   62 +-
 l10n/sl/files_trashbin.po                          |    6 +-
 l10n/sl/lib.po                                     |   71 +-
 l10n/sl/settings.po                                |  298 +-
 l10n/sl/user_ldap.po                               |    8 +-
 l10n/sl/user_webdavauth.po                         |   22 +-
 l10n/sq/core.po                                    |  248 +-
 l10n/sq/files.po                                   |   82 +-
 l10n/sq/files_sharing.po                           |   60 +-
 l10n/sq/files_trashbin.po                          |    6 +-
 l10n/sq/lib.po                                     |   69 +-
 l10n/sq/settings.po                                |  296 +-
 l10n/sq/user_ldap.po                               |    6 +-
 l10n/sq/user_webdavauth.po                         |   20 +-
 l10n/sr/core.po                                    |  248 +-
 l10n/sr/files.po                                   |   80 +-
 l10n/sr/files_sharing.po                           |   58 +-
 l10n/sr/files_trashbin.po                          |    6 +-
 l10n/sr/lib.po                                     |   69 +-
 l10n/sr/settings.po                                |  296 +-
 l10n/sr/user_ldap.po                               |    6 +-
 l10n/sr/user_webdavauth.po                         |   20 +-
 l10n/sr at latin/core.po                              |  252 +-
 l10n/sr at latin/files.po                             |   80 +-
 l10n/sr at latin/files_sharing.po                     |   58 +-
 l10n/sr at latin/files_trashbin.po                    |    6 +-
 l10n/sr at latin/lib.po                               |   69 +-
 l10n/sr at latin/settings.po                          |  292 +-
 l10n/sr at latin/user_ldap.po                         |    6 +-
 l10n/sr at latin/user_webdavauth.po                   |   20 +-
 l10n/su/core.po                                    |  246 +-
 l10n/su/files.po                                   |   80 +-
 l10n/su/files_sharing.po                           |   56 +-
 l10n/su/lib.po                                     |   69 +-
 l10n/su/settings.po                                |  292 +-
 l10n/su/user_ldap.po                               |    6 +-
 l10n/su/user_webdavauth.po                         |   16 +-
 l10n/sv/core.po                                    |  258 +-
 l10n/sv/files.po                                   |   94 +-
 l10n/sv/files_sharing.po                           |   71 +-
 l10n/sv/files_trashbin.po                          |    6 +-
 l10n/sv/lib.po                                     |   81 +-
 l10n/sv/settings.po                                |  306 +-
 l10n/sv/user_ldap.po                               |   22 +-
 l10n/sv/user_webdavauth.po                         |   24 +-
 l10n/sw_KE/core.po                                 |  246 +-
 l10n/sw_KE/files.po                                |   80 +-
 l10n/sw_KE/files_sharing.po                        |   56 +-
 l10n/sw_KE/lib.po                                  |   69 +-
 l10n/sw_KE/settings.po                             |  292 +-
 l10n/sw_KE/user_ldap.po                            |    6 +-
 l10n/sw_KE/user_webdavauth.po                      |   20 +-
 l10n/ta_IN/core.po                                 |  246 +-
 l10n/ta_IN/files.po                                |   80 +-
 l10n/ta_IN/files_sharing.po                        |   56 +-
 l10n/ta_IN/lib.po                                  |   69 +-
 l10n/ta_IN/settings.po                             |  292 +-
 l10n/ta_IN/user_ldap.po                            |    6 +-
 l10n/ta_IN/user_webdavauth.po                      |   12 +-
 l10n/ta_LK/core.po                                 |  248 +-
 l10n/ta_LK/files.po                                |   80 +-
 l10n/ta_LK/files_sharing.po                        |   58 +-
 l10n/ta_LK/files_trashbin.po                       |    6 +-
 l10n/ta_LK/lib.po                                  |   69 +-
 l10n/ta_LK/settings.po                             |  292 +-
 l10n/ta_LK/user_ldap.po                            |    6 +-
 l10n/ta_LK/user_webdavauth.po                      |   22 +-
 l10n/te/core.po                                    |  248 +-
 l10n/te/files.po                                   |   80 +-
 l10n/te/files_sharing.po                           |   58 +-
 l10n/te/files_trashbin.po                          |    6 +-
 l10n/te/lib.po                                     |   69 +-
 l10n/te/settings.po                                |  292 +-
 l10n/te/user_ldap.po                               |    6 +-
 l10n/te/user_webdavauth.po                         |   20 +-
 l10n/templates/core.pot                            |  244 +-
 l10n/templates/files.pot                           |   42 +-
 l10n/templates/files_encryption.pot                |    4 +-
 l10n/templates/files_external.pot                  |   12 +-
 l10n/templates/files_sharing.pot                   |   54 +-
 l10n/templates/files_trashbin.pot                  |    4 +-
 l10n/templates/files_versions.pot                  |    2 +-
 l10n/templates/lib.pot                             |   49 +-
 l10n/templates/private.pot                         |   40 +-
 l10n/templates/settings.pot                        |  290 +-
 l10n/templates/user_ldap.pot                       |    4 +-
 l10n/templates/user_webdavauth.pot                 |    8 +-
 l10n/th_TH/core.po                                 |  248 +-
 l10n/th_TH/files.po                                |   80 +-
 l10n/th_TH/files_sharing.po                        |   60 +-
 l10n/th_TH/files_trashbin.po                       |    6 +-
 l10n/th_TH/lib.po                                  |   69 +-
 l10n/th_TH/settings.po                             |  296 +-
 l10n/th_TH/user_ldap.po                            |    6 +-
 l10n/th_TH/user_webdavauth.po                      |   20 +-
 l10n/tr/core.po                                    |  256 +-
 l10n/tr/files.po                                   |   92 +-
 l10n/tr/files_sharing.po                           |   70 +-
 l10n/tr/files_trashbin.po                          |    6 +-
 l10n/tr/lib.po                                     |   79 +-
 l10n/tr/settings.po                                |  310 +-
 l10n/tr/user_ldap.po                               |   16 +-
 l10n/tr/user_webdavauth.po                         |   22 +-
 l10n/tzm/core.po                                   |  246 +-
 l10n/tzm/files.po                                  |   80 +-
 l10n/tzm/files_sharing.po                          |   56 +-
 l10n/tzm/lib.po                                    |   69 +-
 l10n/tzm/settings.po                               |  292 +-
 l10n/tzm/user_ldap.po                              |    6 +-
 l10n/tzm/user_webdavauth.po                        |   18 +-
 l10n/ug/core.po                                    |  246 +-
 l10n/ug/files.po                                   |   80 +-
 l10n/ug/files_sharing.po                           |   60 +-
 l10n/ug/files_trashbin.po                          |    6 +-
 l10n/ug/lib.po                                     |   69 +-
 l10n/ug/settings.po                                |  296 +-
 l10n/ug/user_ldap.po                               |    6 +-
 l10n/ug/user_webdavauth.po                         |   24 +-
 l10n/uk/core.po                                    |  252 +-
 l10n/uk/files.po                                   |   80 +-
 l10n/uk/files_sharing.po                           |   62 +-
 l10n/uk/files_trashbin.po                          |    6 +-
 l10n/uk/lib.po                                     |   69 +-
 l10n/uk/settings.po                                |  296 +-
 l10n/uk/user_ldap.po                               |    6 +-
 l10n/uk/user_webdavauth.po                         |   28 +-
 l10n/ur/core.po                                    |  246 +-
 l10n/ur/files.po                                   |   80 +-
 l10n/ur/files_sharing.po                           |   56 +-
 l10n/ur/lib.po                                     |   69 +-
 l10n/ur/settings.po                                |  292 +-
 l10n/ur/user_ldap.po                               |    6 +-
 l10n/ur/user_webdavauth.po                         |   16 +-
 l10n/ur_PK/core.po                                 |  250 +-
 l10n/ur_PK/files.po                                |   80 +-
 l10n/ur_PK/files_sharing.po                        |   58 +-
 l10n/ur_PK/files_trashbin.po                       |    6 +-
 l10n/ur_PK/lib.po                                  |   69 +-
 l10n/ur_PK/settings.po                             |  292 +-
 l10n/ur_PK/user_ldap.po                            |    6 +-
 l10n/ur_PK/user_webdavauth.po                      |   20 +-
 l10n/uz/core.po                                    |  246 +-
 l10n/uz/files.po                                   |   80 +-
 l10n/uz/files_sharing.po                           |   56 +-
 l10n/uz/lib.po                                     |   69 +-
 l10n/uz/settings.po                                |  292 +-
 l10n/uz/user_ldap.po                               |    6 +-
 l10n/uz/user_webdavauth.po                         |   18 +-
 l10n/vi/core.po                                    |  254 +-
 l10n/vi/files.po                                   |   86 +-
 l10n/vi/files_sharing.po                           |   60 +-
 l10n/vi/files_trashbin.po                          |    6 +-
 l10n/vi/lib.po                                     |   69 +-
 l10n/vi/settings.po                                |  296 +-
 l10n/vi/user_ldap.po                               |    6 +-
 l10n/vi/user_webdavauth.po                         |   22 +-
 l10n/zh_CN/core.po                                 |  256 +-
 l10n/zh_CN/files.po                                |   86 +-
 l10n/zh_CN/files_sharing.po                        |   62 +-
 l10n/zh_CN/files_trashbin.po                       |    6 +-
 l10n/zh_CN/lib.po                                  |   75 +-
 l10n/zh_CN/settings.po                             |  304 +-
 l10n/zh_CN/user_ldap.po                            |    8 +-
 l10n/zh_CN/user_webdavauth.po                      |   26 +-
 l10n/zh_HK/core.po                                 |  248 +-
 l10n/zh_HK/files.po                                |   80 +-
 l10n/zh_HK/files_sharing.po                        |   58 +-
 l10n/zh_HK/files_trashbin.po                       |    6 +-
 l10n/zh_HK/lib.po                                  |   69 +-
 l10n/zh_HK/settings.po                             |  292 +-
 l10n/zh_HK/user_ldap.po                            |    6 +-
 l10n/zh_HK/user_webdavauth.po                      |   22 +-
 l10n/zh_TW/core.po                                 |  252 +-
 l10n/zh_TW/files.po                                |   84 +-
 l10n/zh_TW/files_encryption.po                     |   11 +-
 l10n/zh_TW/files_sharing.po                        |   62 +-
 l10n/zh_TW/files_trashbin.po                       |    6 +-
 l10n/zh_TW/lib.po                                  |   73 +-
 l10n/zh_TW/settings.po                             |  298 +-
 l10n/zh_TW/user_ldap.po                            |   10 +-
 l10n/zh_TW/user_webdavauth.po                      |   32 +-
 lib/base.php                                       |   21 +-
 lib/l10n/ar.php                                    |    4 -
 lib/l10n/ast.php                                   |    3 -
 lib/l10n/bg_BG.php                                 |    4 -
 lib/l10n/bn_BD.php                                 |    4 -
 lib/l10n/ca.php                                    |    5 -
 lib/l10n/cs_CZ.php                                 |    5 -
 lib/l10n/cy_GB.php                                 |    4 -
 lib/l10n/da.php                                    |    5 -
 lib/l10n/de.php                                    |    5 -
 lib/l10n/de_CH.php                                 |    4 -
 lib/l10n/de_DE.php                                 |    5 -
 lib/l10n/el.php                                    |    5 -
 lib/l10n/en_GB.php                                 |    5 -
 lib/l10n/eo.php                                    |    4 -
 lib/l10n/es.php                                    |    5 -
 lib/l10n/es_AR.php                                 |    5 -
 lib/l10n/es_MX.php                                 |    5 -
 lib/l10n/et_EE.php                                 |    5 -
 lib/l10n/eu.php                                    |    5 -
 lib/l10n/fa.php                                    |    4 -
 lib/l10n/fi_FI.php                                 |    5 +-
 lib/l10n/fr.php                                    |    5 -
 lib/l10n/gl.php                                    |   15 +-
 lib/l10n/he.php                                    |    4 -
 lib/l10n/hu_HU.php                                 |    5 -
 lib/l10n/id.php                                    |    5 -
 lib/l10n/is.php                                    |    4 -
 lib/l10n/it.php                                    |    5 -
 lib/l10n/ja.php                                    |   11 +-
 lib/l10n/ka_GE.php                                 |    4 -
 lib/l10n/km.php                                    |    6 +-
 lib/l10n/ko.php                                    |    5 -
 lib/l10n/lt_LT.php                                 |    5 -
 lib/l10n/lv.php                                    |    4 -
 lib/l10n/mk.php                                    |    4 -
 lib/l10n/my_MM.php                                 |    4 -
 lib/l10n/nb_NO.php                                 |    5 -
 lib/l10n/nl.php                                    |    5 -
 lib/l10n/oc.php                                    |    3 -
 lib/l10n/pl.php                                    |    5 -
 lib/l10n/pt_BR.php                                 |    5 -
 lib/l10n/pt_PT.php                                 |    5 -
 lib/l10n/ro.php                                    |    4 -
 lib/l10n/ru.php                                    |    5 -
 lib/l10n/si_LK.php                                 |    4 -
 lib/l10n/sk_SK.php                                 |    5 -
 lib/l10n/sl.php                                    |    5 -
 lib/l10n/sq.php                                    |    4 -
 lib/l10n/sr.php                                    |    4 -
 lib/l10n/sv.php                                    |    5 -
 lib/l10n/ta_LK.php                                 |    4 -
 lib/l10n/th_TH.php                                 |    4 -
 lib/l10n/tr.php                                    |    5 -
 lib/l10n/uk.php                                    |    4 -
 lib/l10n/vi.php                                    |    4 -
 lib/l10n/zh_CN.php                                 |    5 -
 lib/l10n/zh_TW.php                                 |    5 -
 lib/private/app.php                                |  492 ++-
 lib/private/appconfig.php                          |   48 +-
 lib/private/backgroundjob/joblist.php              |    3 +
 lib/private/connector/sabre/ServiceUnavailable.php |   22 -
 .../sabre/aborteduploaddetectionplugin.php         |   18 +-
 lib/private/connector/sabre/auth.php               |   10 +-
 lib/private/connector/sabre/directory.php          |   27 +-
 .../connector/sabre/exception/entitytoolarge.php   |    2 +-
 .../connector/sabre/exception/filelocked.php       |   28 +
 .../sabre/exception/unsupportedmediatype.php       |    2 +-
 .../connector/sabre/exceptionloggerplugin.php      |   14 +-
 lib/private/connector/sabre/file.php               |   57 +-
 lib/private/connector/sabre/filesplugin.php        |   22 +-
 lib/private/connector/sabre/locks.php              |   14 +-
 lib/private/connector/sabre/maintenanceplugin.php  |   18 +-
 lib/private/connector/sabre/node.php               |   17 +-
 lib/private/connector/sabre/objecttree.php         |   55 +-
 lib/private/connector/sabre/principal.php          |   10 +-
 lib/private/connector/sabre/quotaplugin.php        |   17 +-
 lib/private/connector/sabre/request.php            |    2 +-
 lib/private/connector/sabre/server.php             |   34 +-
 lib/private/davclient.php                          |    2 +-
 lib/private/db.php                                 |   17 +
 lib/private/db/mdb2schemamanager.php               |  117 +-
 lib/private/db/mdb2schemareader.php                |    2 +-
 lib/private/db/migrationexception.php              |   26 +
 lib/private/db/migrator.php                        |  196 +
 lib/private/db/mysqlmigrator.php                   |   32 +
 lib/private/db/nocheckmigrator.php                 |   24 +
 lib/private/db/oraclemigrator.php                  |   40 +
 lib/private/db/sqlitemigrator.php                  |   40 +
 lib/private/files.php                              |   48 -
 lib/private/files/cache/backgroundwatcher.php      |  107 -
 lib/private/files/cache/cache.php                  |   17 +-
 lib/private/files/cache/changepropagator.php       |   98 +
 lib/private/files/cache/homecache.php              |    2 +-
 lib/private/files/cache/permissions.php            |  156 -
 lib/private/files/cache/scanner.php                |  106 +-
 lib/private/files/filesystem.php                   |    4 +-
 lib/private/files/node/folder.php                  |    5 -
 lib/private/files/storage/common.php               |    7 -
 lib/private/files/storage/loader.php               |    4 +-
 lib/private/files/storage/storage.php              |    8 -
 lib/private/files/storage/wrapper/wrapper.php      |   10 -
 lib/private/files/stream/quota.php                 |    2 +-
 lib/private/files/utils/scanner.php                |   21 +-
 lib/private/files/view.php                         |   27 +-
 lib/private/group/group.php                        |    2 +-
 lib/private/group/metadata.php                     |  188 +
 lib/private/helper.php                             |   49 +-
 lib/private/log/owncloud.php                       |   17 +-
 lib/private/request.php                            |    4 +-
 lib/private/share/share.php                        |    8 +-
 lib/private/updater.php                            |   62 +-
 lib/private/user.php                               |    2 +-
 lib/private/util.php                               |    4 +-
 lib/public/appframework/controller.php             |   10 +-
 lib/public/config.php                              |   10 +
 lib/public/files/locknotacquiredexception.php      |   47 +
 settings/admin.php                                 |    6 +-
 settings/ajax/creategroup.php                      |    1 +
 settings/ajax/createuser.php                       |    9 +-
 settings/ajax/enableapp.php                        |    4 +-
 settings/ajax/grouplist.php                        |   48 +
 settings/ajax/userlist.php                         |   51 +-
 settings/apps.php                                  |    3 +
 settings/css/settings.css                          |   81 +-
 settings/js/admin.js                               |    3 +
 settings/js/apps.js                                |  108 +-
 settings/js/users.js                               |  546 ---
 settings/js/users/deleteHandler.js                 |  171 +
 settings/js/users/filter.js                        |   82 +
 settings/js/users/groups.js                        |  292 ++
 settings/js/users/users.js                         |  616 +++
 settings/l10n/ar.php                               |    9 +-
 settings/l10n/ast.php                              |   13 +-
 settings/l10n/bg_BG.php                            |    5 +-
 settings/l10n/bn_BD.php                            |    3 +-
 settings/l10n/ca.php                               |    9 +-
 settings/l10n/cs_CZ.php                            |    9 +-
 settings/l10n/cy_GB.php                            |    1 +
 settings/l10n/da.php                               |    9 +-
 settings/l10n/de.php                               |   23 +-
 settings/l10n/de_AT.php                            |    1 +
 settings/l10n/de_CH.php                            |    5 +-
 settings/l10n/de_DE.php                            |   23 +-
 settings/l10n/el.php                               |   10 +-
 settings/l10n/en_GB.php                            |    9 +-
 settings/l10n/eo.php                               |    9 +-
 settings/l10n/es.php                               |   10 +-
 settings/l10n/es_AR.php                            |    9 +-
 settings/l10n/es_MX.php                            |    6 +-
 settings/l10n/et_EE.php                            |    9 +-
 settings/l10n/eu.php                               |    9 +-
 settings/l10n/fa.php                               |    8 +-
 settings/l10n/fi_FI.php                            |   21 +-
 settings/l10n/fr.php                               |   10 +-
 settings/l10n/gl.php                               |   23 +-
 settings/l10n/he.php                               |    8 +-
 settings/l10n/hr.php                               |    6 +-
 settings/l10n/hu_HU.php                            |    9 +-
 settings/l10n/ia.php                               |    6 +-
 settings/l10n/id.php                               |    9 +-
 settings/l10n/is.php                               |    3 +-
 settings/l10n/it.php                               |   23 +-
 settings/l10n/ja.php                               |   24 +-
 settings/l10n/ka_GE.php                            |    7 +-
 settings/l10n/km.php                               |    4 +-
 settings/l10n/ko.php                               |    8 +-
 settings/l10n/lb.php                               |    7 +-
 settings/l10n/lt_LT.php                            |    9 +-
 settings/l10n/lv.php                               |    8 +-
 settings/l10n/mk.php                               |    8 +-
 settings/l10n/ms_MY.php                            |    5 +-
 settings/l10n/nb_NO.php                            |   11 +-
 settings/l10n/nl.php                               |    9 +-
 settings/l10n/nn_NO.php                            |    7 +-
 settings/l10n/oc.php                               |    5 +-
 settings/l10n/pl.php                               |   12 +-
 settings/l10n/pt_BR.php                            |   11 +-
 settings/l10n/pt_PT.php                            |    9 +-
 settings/l10n/ro.php                               |    9 +-
 settings/l10n/ru.php                               |    9 +-
 settings/l10n/si_LK.php                            |    5 +-
 settings/l10n/sk.php                               |    1 +
 settings/l10n/sk_SK.php                            |    9 +-
 settings/l10n/sl.php                               |    9 +-
 settings/l10n/sq.php                               |    4 +-
 settings/l10n/sr.php                               |    7 +-
 settings/l10n/sr at latin.php                         |    1 +
 settings/l10n/sv.php                               |    9 +-
 settings/l10n/ta_LK.php                            |    6 +-
 settings/l10n/th_TH.php                            |    6 +-
 settings/l10n/tr.php                               |   23 +-
 settings/l10n/ug.php                               |    5 +-
 settings/l10n/uk.php                               |    7 +-
 settings/l10n/vi.php                               |    8 +-
 settings/l10n/zh_CN.php                            |    9 +-
 settings/l10n/zh_TW.php                            |    8 +-
 settings/routes.php                                |    4 +
 settings/templates/admin.php                       |   35 +-
 settings/templates/apps.php                        |   12 +-
 settings/templates/help.php                        |   57 +-
 settings/templates/users.php                       |  176 -
 settings/templates/users/main.php                  |   32 +
 settings/templates/users/part.createuser.php       |   34 +
 settings/templates/users/part.grouplist.php        |   50 +
 settings/templates/users/part.setquota.php         |   39 +
 settings/templates/users/part.userlist.php         |  116 +
 settings/users.php                                 |   42 +-
 tests/karma.config.js                              |    3 +-
 .../sabre/aborteduploaddetectionplugin.php         |   12 +-
 tests/lib/connector/sabre/directory.php            |    6 +-
 tests/lib/connector/sabre/file.php                 |    8 +-
 tests/lib/connector/sabre/objecttree.php           |    5 +-
 tests/lib/connector/sabre/quotaplugin.php          |   12 +-
 tests/lib/db/migrator.php                          |  122 +
 tests/lib/files/cache/changepropagator.php         |   72 +
 tests/lib/files/cache/permissions.php              |   75 -
 tests/lib/files/cache/scanner.php                  |   10 -
 tests/lib/files/cache/updater.php                  |   31 -
 tests/lib/files/cache/watcher.php                  |    2 -
 tests/lib/files/filesystem.php                     |   10 +-
 tests/lib/files/mount/mount.php                    |    2 +-
 tests/lib/files/node/folder.php                    |    8 -
 tests/lib/files/utils/scanner.php                  |   64 +
 tests/lib/files/view.php                           |   32 +-
 tests/lib/helperstorage.php                        |  145 +-
 tests/lib/util.php                                 |    2 +-
 version.php                                        |    2 +-
 1588 files changed, 58744 insertions(+), 76752 deletions(-)

diff --cc lib/private/app.php
index 5e32717,2650ad9..0292abb
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@@ -214,41 -218,48 +223,45 @@@ class OC_App 
  	 *
  	 * This function set an app as enabled in appconfig.
  	 */
- 	public static function enable( $app ) {
+ 	public static function enable($app, $groups = null) {
  		self::$enabledAppsCache = array(); // flush
  		if (!OC_Installer::isInstalled($app)) {
 -			// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
 -			if (!is_numeric($app)) {
 -				$app = OC_Installer::installShippedApp($app);
 -			} else {
 -				$appdata = OC_OCSClient::getApplication($app);
 -				$download = OC_OCSClient::getApplicationDownload($app, 1);
 -				if (isset($download['downloadlink']) and $download['downloadlink'] != '') {
 -					// Replace spaces in download link without encoding entire URL
 -					$download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
 -					$info = array('source' => 'http', 'href' => $download['downloadlink'], 'appdata' => $appdata);
 -					$app = OC_Installer::installApp($info);
 -				}
 -			}
 +			$app = self::installApp($app);
  		}
 -		$l = OC_L10N::get('core');
 -		if ($app !== false) {
 -			// check if the app is compatible with this version of ownCloud
 -			$info = OC_App::getAppInfo($app);
 -			$version = OC_Util::getVersion();
 -			if(!self::isAppCompatible($version, $info)) {
 -				throw new \Exception(
 -					$l->t("App \"%s\" can't be installed because it is not compatible with this version of ownCloud.",
 -						array($info['name'])
 -					)
 -				);
 -			} else {
 -				if (!is_null($groups)) {
 -					OC_Appconfig::setValue($app, 'enabled', json_encode($groups));
 -				}else{
 -					OC_Appconfig::setValue($app, 'enabled', 'yes');
 -				}
 -				if (isset($appdata['id'])) {
 -					OC_Appconfig::setValue($app, 'ocsid', $appdata['id']);
 -				}
 -				\OC_Hook::emit('OC_App', 'post_enable', array('app' => $app));
 -			}
 -		} else {
 -			throw new \Exception($l->t("No app name specified"));
 +
- 		OC_Appconfig::setValue( $app, 'enabled', 'yes' );
++		if (!is_null($groups)) {
++			OC_Appconfig::setValue($app, 'enabled', json_encode($groups));
++		}else{
++			OC_Appconfig::setValue($app, 'enabled', 'yes');
++		}
 +	}
 +
 +	/**
 +	 * @param string $app
 +	 * @return int
 +	 */
 +	public static function downloadApp($app) {
 +		$appdata=OC_OCSClient::getApplication($app);
 +		$download=OC_OCSClient::getApplicationDownload($app, 1);
 +		if(isset($download['downloadlink']) and $download['downloadlink']!='') {
 +			// Replace spaces in download link without encoding entire URL
 +			$download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
 +			$info = array('source'=>'http', 'href'=>$download['downloadlink'], 'appdata'=>$appdata);
 +			$app=OC_Installer::installApp($info);
 +		}
 +		return $app;
 +	}
 +
 +	/**
 +	 * @param string $app
 +	 * @return bool
 +	 */
 +	public static function removeApp($app) {
 +		if (self::isShipped($app)) {
 +			return false;
  		}
 +
 +		return OC_Installer::removeApp($app);
  	}
  
  	/**
@@@ -262,7 -273,12 +275,7 @@@
  		self::$enabledAppsCache = array(); // flush
  		// check if app is a shipped app or not. if not delete
  		\OC_Hook::emit('OC_App', 'pre_disable', array('app' => $app));
- 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
 -		OC_Appconfig::setValue($app, 'enabled', 'no');
 -
 -		// check if app is a shipped app or not. if not delete
 -		if (!OC_App::isShipped($app)) {
 -			OC_Installer::removeApp($app);
 -		}
++		OC_Appconfig::setValue($app, 'enabled', 'no' );
  	}
  
  	/**
@@@ -443,46 -461,17 +458,46 @@@
  	}
  
  
 -	protected static function findAppInDirectories($appid) {
 +	/**
 +	 * search for an app in all app-directories
 +	 * @param $appId
 +	 * @return mixed (bool|string)
 +	 */
 +	protected static function findAppInDirectories($appId) {
  		static $app_dir = array();
 -		if (isset($app_dir[$appid])) {
 -			return $app_dir[$appid];
 +
 +		if (isset($app_dir[$appId])) {
 +			return $app_dir[$appId];
  		}
 -		foreach (OC::$APPSROOTS as $dir) {
 -			if (file_exists($dir['path'] . '/' . $appid)) {
 -				return $app_dir[$appid] = $dir;
 +
 +		$possibleApps = array();
 +		foreach(OC::$APPSROOTS as $dir) {
- 			if(file_exists($dir['path'].'/'.$appId)) {
++			if(file_exists($dir['path'] . '/' . $appId)) {
 +				$possibleApps[] = $dir;
  			}
  		}
 -		return false;
 +
 +		if (empty($possibleApps)) {
 +			return false;
 +		} elseif(count($possibleApps) === 1) {
 +			$dir = array_shift($possibleApps);
 +			$app_dir[$appId] = $dir;
 +			return $dir;
 +		} else {
 +			$versionToLoad = array();
 +			foreach($possibleApps as $possibleApp) {
 +				$version = self::getAppVersionByPath($possibleApp['path']);
 +				if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
 +					$versionToLoad = array(
 +						'dir' => $possibleApp,
 +						'version' => $version,
 +					);
 +				}
 +			}
 +			$app_dir[$appId] = $versionToLoad['dir'];
 +			return $versionToLoad['dir'];
 +			//TODO - write test
 +		}
  	}
  
  	/**
@@@ -528,23 -506,12 +543,23 @@@
  	 * @return string
  	 */
  	public static function getAppVersion($appid) {
 -		$file = self::getAppPath($appid) . '/appinfo/version';
 -		if (is_file($file) && $version = trim(file_get_contents($file))) {
 -			return $version;
 -		} else {
 -			$appData = self::getAppInfo($appid);
 +		$file = self::getAppPath($appid);
 +		return self::getAppVersionByPath($file);
 +	}
 +
 +	/**
 +	 * get app's version based on it's path
 +	 * @param string $path
 +	 * @return string
 +	 */
 +	public static function getAppVersionByPath($path) {
 +		$versionFile = $path . '/appinfo/version';
 +		$infoFile = $path . '/appinfo/info.xml';
 +		if(is_file($versionFile)) {
 +			return trim(file_get_contents($versionFile));
 +		}else{
- 			$appData=self::getAppInfo($infoFile, true);
- 			return isset($appData['version'])? $appData['version'] : '';
++			$appData = self::getAppInfo($infoFile, true);
+ 			return isset($appData['version']) ? $appData['version'] : '';
  		}
  	}
  
@@@ -771,20 -745,18 +793,20 @@@
  
  				$info['active'] = $active;
  
- 				if(isset($info['shipped']) and ($info['shipped']=='true')) {
- 					$info['internal']=true;
- 					$info['internallabel']='Internal App';
- 					$info['internalclass']='';
 -				if (isset($info['shipped']) and ($info['shipped'] == 'true')) {
++				if(isset($info['shipped']) and ($info['shipped'] == 'true')) {
+ 					$info['internal'] = true;
+ 					$info['internallabel'] = 'Internal App';
+ 					$info['internalclass'] = '';
 -					$info['update'] = false;
 +					$info['removable'] = false;
  				} else {
- 					$info['internal']=false;
- 					$info['internallabel']='3rd Party';
- 					$info['internalclass']='externalapp';
+ 					$info['internal'] = false;
+ 					$info['internallabel'] = '3rd Party';
+ 					$info['internalclass'] = 'externalapp';
 -					$info['update'] = OC_Installer::isUpdateAvailable($app);
 +					$info['removable'] = true;
  				}
  
 +				$info['update'] = OC_Installer::isUpdateAvailable($app);
 +
  				$info['preview'] = OC_Helper::imagePath('settings', 'trans.png');
  				$info['version'] = OC_App::getAppVersion($app);
  				$appList[] = $info;
@@@ -869,42 -841,29 +891,42 @@@
  				$app1[$i]['ocs_id'] = $app['id'];
  				$app1[$i]['internal'] = $app1[$i]['active'] = 0;
  				$app1[$i]['update'] = false;
 +				$app1[$i]['removable'] = false;
- 				if($app['label']=='recommended') {
+ 				if ($app['label'] == 'recommended') {
  					$app1[$i]['internallabel'] = 'Recommended';
  					$app1[$i]['internalclass'] = 'recommendedapp';
- 				}else{
+ 				} else {
  					$app1[$i]['internallabel'] = '3rd Party';
  					$app1[$i]['internalclass'] = 'externalapp';
  				}
  
  
  				// rating img
 -				if ($app['score'] >= 0 and $app['score'] < 5) $img = OC_Helper::imagePath("core", "rating/s1.png");
 -				elseif ($app['score'] >= 5 and $app['score'] < 15) $img = OC_Helper::imagePath("core", "rating/s2.png");
 -				elseif ($app['score'] >= 15 and $app['score'] < 25) $img = OC_Helper::imagePath("core", "rating/s3.png");
 -				elseif ($app['score'] >= 25 and $app['score'] < 35) $img = OC_Helper::imagePath("core", "rating/s4.png");
 -				elseif ($app['score'] >= 35 and $app['score'] < 45) $img = OC_Helper::imagePath("core", "rating/s5.png");
 -				elseif ($app['score'] >= 45 and $app['score'] < 55) $img = OC_Helper::imagePath("core", "rating/s6.png");
 -				elseif ($app['score'] >= 55 and $app['score'] < 65) $img = OC_Helper::imagePath("core", "rating/s7.png");
 -				elseif ($app['score'] >= 65 and $app['score'] < 75) $img = OC_Helper::imagePath("core", "rating/s8.png");
 -				elseif ($app['score'] >= 75 and $app['score'] < 85) $img = OC_Helper::imagePath("core", "rating/s9.png");
 -				elseif ($app['score'] >= 85 and $app['score'] < 95) $img = OC_Helper::imagePath("core", "rating/s10.png");
 -				elseif ($app['score'] >= 95 and $app['score'] < 100) $img = OC_Helper::imagePath("core", "rating/s11.png");
 +				if ($app['score'] < 5) {
 +					$img = OC_Helper::imagePath( "core", "rating/s1.png" );
 +				} elseif ($app['score'] < 15) {
 +					$img = OC_Helper::imagePath( "core", "rating/s2.png" );
 +				} elseif($app['score'] < 25) {
 +					$img = OC_Helper::imagePath( "core", "rating/s3.png" );
 +				} elseif($app['score'] < 35) {
 +					$img = OC_Helper::imagePath( "core", "rating/s4.png" );
 +				} elseif($app['score'] < 45) {
 +					$img = OC_Helper::imagePath( "core", "rating/s5.png" );
 +				} elseif($app['score'] < 55) {
 +					$img = OC_Helper::imagePath( "core", "rating/s6.png" );
 +				} elseif($app['score'] < 65) {
 +					$img = OC_Helper::imagePath( "core", "rating/s7.png" );
 +				} elseif($app['score'] < 75) {
 +					$img = OC_Helper::imagePath( "core", "rating/s8.png" );
 +				} elseif($app['score'] < 85) {
 +					$img = OC_Helper::imagePath( "core", "rating/s9.png" );
 +				} elseif($app['score'] < 95) {
 +					$img = OC_Helper::imagePath( "core", "rating/s10.png" );
 +				} elseif($app['score'] < 100) {
 +					$img = OC_Helper::imagePath( "core", "rating/s11.png" );
 +				}
  
- 				$app1[$i]['score'] = '<img src="'.$img.'"> Score: '.$app['score'].'%';
+ 				$app1[$i]['score'] = '<img src="' . $img . '"> Score: ' . $app['score'] . '%';
  				$i++;
  			}
  		}
@@@ -1071,70 -1043,25 +1106,71 @@@
  		return $versions;
  	}
  
 +
 +	/**
 +	 * @param mixed $app
 +	 * @return bool
 +	 */
 +	public static function installApp($app) {
 +		$l = OC_L10N::get('core');
 +		$appdata=OC_OCSClient::getApplication($app);
 +
 +		// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
 +		if(!is_numeric($app)) {
 +			$shippedVersion=self::getAppVersion($app);
 +			if($appdata && version_compare($shippedVersion, $appdata['version'], '<')) {
 +				$app = self::downloadApp($app);
 +			} else {
 +				$app = OC_Installer::installShippedApp($app);
 +			}
 +		}else{
 +			$app = self::downloadApp($app);
 +		}
 +
 +		if($app!==false) {
 +			// check if the app is compatible with this version of ownCloud
 +			$info = self::getAppInfo($app);
 +			$version=OC_Util::getVersion();
 +			if(!self::isAppCompatible($version, $info)) {
 +				throw new \Exception(
 +					$l->t('App \"%s\" can\'t be installed because it is not compatible with this version of ownCloud.',
 +						array($info['name'])
 +					)
 +				);
 +			}else{
 +				OC_Appconfig::setValue( $app, 'enabled', 'yes' );
 +				if(isset($appdata['id'])) {
 +					OC_Appconfig::setValue( $app, 'ocsid', $appdata['id'] );
 +				}
 +				\OC_Hook::emit('OC_App', 'post_enable', array('app' => $app));
 +			}
 +		}else{
 +			throw new \Exception($l->t("No app name specified"));
 +		}
 +
 +		return $app;
 +	}
 +
  	/**
  	 * update the database for the app and call the update script
+ 	 *
  	 * @param string $appid
 +	 * @return bool
  	 */
  	public static function updateApp($appid) {
- 		if(file_exists(self::getAppPath($appid).'/appinfo/preupdate.php')) {
+ 		if (file_exists(self::getAppPath($appid) . '/appinfo/preupdate.php')) {
  			self::loadApp($appid);
- 			include self::getAppPath($appid).'/appinfo/preupdate.php';
+ 			include self::getAppPath($appid) . '/appinfo/preupdate.php';
  		}
- 		if(file_exists(self::getAppPath($appid).'/appinfo/database.xml')) {
- 			OC_DB::updateDbFromStructure(self::getAppPath($appid).'/appinfo/database.xml');
+ 		if (file_exists(self::getAppPath($appid) . '/appinfo/database.xml')) {
+ 			OC_DB::updateDbFromStructure(self::getAppPath($appid) . '/appinfo/database.xml');
  		}
- 		if(!self::isEnabled($appid)) {
- 			return false;
+ 		if (!self::isEnabled($appid)) {
+ 			return;
  		}
- 		if(file_exists(self::getAppPath($appid).'/appinfo/update.php')) {
+ 		if (file_exists(self::getAppPath($appid) . '/appinfo/update.php')) {
  			self::loadApp($appid);
- 			include self::getAppPath($appid).'/appinfo/update.php';
+ 			include self::getAppPath($appid) . '/appinfo/update.php';
  		}
  
  		//set remote/public handlers
diff --cc settings/js/apps.js
index a12131b,2539982..95e5648
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@@ -300,14 -336,21 +356,28 @@@ $(document).ready(function()
  			OC.Settings.Apps.updateApp(appid, element);
  		}
  	});
 +	$('#app-content input.uninstall').click(function(){
 +		var element = $(this);
 +		var appid=$(this).data('appid');
 +		if(appid) {
 +			OC.Settings.Apps.uninstallApp(appid, element);
 +		}
 +	});
  
+ 	$('#group_select').change(function() {
+ 		var element = $('#app-content input.enable');
+ 		var groups = $(this).val();
+ 		var appid = element.data('appid');
+ 		if (appid) {
+ 			OC.Settings.Apps.enableApp(appid, false, element, groups);
+ 			var li = $('[data-id="'+appid+'"]');
+ 			var app = OC.get('appData_' + $(li).data('id'));
+ 			app.groups = groups;
+ 			li.data('groups', groups);
+ 			li.attr('data-groups', JSON.stringify(groups));
+ 		}
+ 	});
+ 
  	if(appid) {
  		var item = $('#app-navigation ul li[data-id="'+appid+'"]');
  		if(item) {
diff --cc settings/templates/apps.php
index e2bc78b,776c322..b35eda4
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@@ -53,7 -53,16 +53,17 @@@
  		print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
  	<input class="enable hidden" type="submit" />
  	<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
 +	<input class="uninstall hidden" type="submit" value="<?php p($l->t('Uninstall')); ?>"/>
+ 	<br />
+ 	<input class="hidden" type="checkbox" id="groups_enable"/>
+ 	<label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label>
+ 	<br />
+ 	<select class="hidden" id="group_select" multiple="multiple" title="<?php p($l->t('All')); ?>">
+ 		<?php foreach($_['groups'] as $group):?>
+ 			<option value="<?php p($group);?>"><?php p($group); ?></option>
+ 		<?php endforeach;?>
+ 	</select>
+ 
  	<div class="warning hidden"></div>
  	</div>
  </div>

-- 
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