[Pkg-owncloud-commits] [owncloud] 59/153: Merge branch 'master' into optimize-startup-queries

David Prévot taffit at moszumanska.debian.org
Tue May 27 03:05:36 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 f569c721a64486d0e7c7e307ed77ac0caed2dc2d
Merge: 47d70da 254fa5e
Author: Bart Visscher <bartv at thisnet.nl>
Date:   Wed May 7 17:54:38 2014 +0200

    Merge branch 'master' into optimize-startup-queries
    
    Conflicts:
    	apps/files_sharing/lib/sharedstorage.php
    	tests/lib/group/manager.php
    
    removed hasFilesSharedWith from lib/public/share.php and
    sharedstorage.php to fix merge

 .gitignore                                         |    5 +
 .gitmodules                                        |    2 +-
 .htaccess                                          |   14 +-
 .jshintrc                                          |   12 +-
 .scrutinizer.yml                                   |   28 +
 3rdparty                                           |    2 +-
 CONTRIBUTING.md                                    |    2 +-
 README.md                                          |    8 +-
 apps/files/ajax/delete.php                         |    7 +-
 apps/files/ajax/download.php                       |    7 +-
 apps/files/ajax/getstoragestats.php                |    4 +-
 apps/files/ajax/list.php                           |   29 +-
 apps/files/ajax/mimeicon.php                       |    1 +
 apps/files/ajax/move.php                           |    6 +-
 apps/files/ajax/newfile.php                        |   19 +-
 apps/files/ajax/newfolder.php                      |    5 +-
 apps/files/ajax/rawlist.php                        |   60 -
 apps/files/ajax/rename.php                         |    1 +
 apps/files/ajax/scan.php                           |    2 +-
 apps/files/ajax/upgrade.php                        |   44 -
 apps/files/ajax/upload.php                         |   78 +-
 apps/files/appinfo/app.php                         |    7 -
 apps/files/appinfo/remote.php                      |   28 +-
 apps/files/command/scan.php                        |    1 -
 apps/files/css/files.css                           |    7 +-
 apps/files/css/mobile.css                          |   68 +
 apps/files/index.php                               |  138 +-
 apps/files/js/admin.js                             |   19 +-
 apps/files/js/breadcrumb.js                        |  241 +
 apps/files/js/file-upload.js                       |  982 +-
 apps/files/js/fileactions.js                       |   51 +-
 apps/files/js/filelist.js                          | 1497 +--
 apps/files/js/files.js                             |  550 +-
 apps/files/js/filesummary.js                       |  195 +
 apps/files/js/upgrade.js                           |   28 -
 apps/files/l10n/af_ZA.php                          |    1 +
 apps/files/l10n/{af_ZA.php => am_ET.php}           |    0
 apps/files/l10n/ar.php                             |   27 +-
 apps/files/l10n/ast.php                            |   29 +
 apps/files/l10n/az.php                             |    8 +-
 apps/files/l10n/be.php                             |    4 +-
 apps/files/l10n/bg_BG.php                          |    8 +-
 apps/files/l10n/bn_BD.php                          |   13 +-
 apps/files/l10n/bs.php                             |    4 +-
 apps/files/l10n/ca.php                             |   37 +-
 apps/files/l10n/cs_CZ.php                          |   37 +-
 apps/files/l10n/cy_GB.php                          |   20 +-
 apps/files/l10n/da.php                             |   37 +-
 apps/files/l10n/de.php                             |   37 +-
 apps/files/l10n/de_AT.php                          |    6 +-
 apps/files/l10n/de_CH.php                          |   20 +-
 apps/files/l10n/de_DE.php                          |   39 +-
 apps/files/l10n/el.php                             |   38 +-
 apps/files/l10n/en_GB.php                          |   37 +-
 apps/files/l10n/{af_ZA.php => en_NZ.php}           |    0
 apps/files/l10n/eo.php                             |   28 +-
 apps/files/l10n/es.php                             |   43 +-
 apps/files/l10n/es_AR.php                          |   44 +-
 apps/files/l10n/es_CL.php                          |    7 +-
 apps/files/l10n/{af_ZA.php => es_CR.php}           |    0
 apps/files/l10n/es_MX.php                          |   30 +-
 apps/files/l10n/et_EE.php                          |   36 +-
 apps/files/l10n/eu.php                             |   39 +-
 apps/files/l10n/eu_ES.php                          |   10 +
 apps/files/l10n/fa.php                             |   24 +-
 apps/files/l10n/fi_FI.php                          |   37 +-
 apps/files/l10n/fr.php                             |   37 +-
 apps/files/l10n/gl.php                             |   37 +-
 apps/files/l10n/he.php                             |   13 +-
 apps/files/l10n/hi.php                             |    3 +-
 apps/files/l10n/{af_ZA.php => hi_IN.php}           |    0
 apps/files/l10n/hr.php                             |    8 +-
 apps/files/l10n/hu_HU.php                          |   30 +-
 apps/files/l10n/ia.php                             |    8 +-
 apps/files/l10n/id.php                             |   30 +-
 apps/files/l10n/is.php                             |   13 +-
 apps/files/l10n/it.php                             |   37 +-
 apps/files/l10n/ja.php                             |   92 +
 apps/files/l10n/ja_JP.php                          |   47 +-
 apps/files/l10n/jv.php                             |    8 +
 apps/files/l10n/ka_GE.php                          |   20 +-
 apps/files/l10n/km.php                             |    9 +
 apps/files/l10n/ko.php                             |   30 +-
 apps/files/l10n/ku_IQ.php                          |    6 +-
 apps/files/l10n/lb.php                             |    8 +-
 apps/files/l10n/lt_LT.php                          |   31 +-
 apps/files/l10n/lv.php                             |   20 +-
 apps/files/l10n/mk.php                             |   26 +-
 apps/files/l10n/{af_ZA.php => ml.php}              |    0
 apps/files/l10n/{af_ZA.php => mn.php}              |    0
 apps/files/l10n/ms_MY.php                          |    7 +-
 apps/files/l10n/nb_NO.php                          |   46 +-
 apps/files/l10n/nl.php                             |   37 +-
 apps/files/l10n/nn_NO.php                          |   27 +-
 apps/files/l10n/oc.php                             |    8 +-
 apps/files/l10n/{af_ZA.php => or_IN.php}           |    0
 apps/files/l10n/pa.php                             |    4 +-
 apps/files/l10n/pl.php                             |   37 +-
 apps/files/l10n/pl_PL.php                          |    5 -
 apps/files/l10n/pt_BR.php                          |   37 +-
 apps/files/l10n/pt_PT.php                          |   45 +-
 apps/files/l10n/ro.php                             |   99 +-
 apps/files/l10n/ru.php                             |   86 +-
 apps/files/l10n/si_LK.php                          |    8 +-
 apps/files/l10n/sk_SK.php                          |   38 +-
 apps/files/l10n/sl.php                             |   37 +-
 apps/files/l10n/sq.php                             |   26 +-
 apps/files/l10n/sr.php                             |   20 +-
 apps/files/l10n/sr at latin.php                       |    8 +-
 apps/files/l10n/{az.php => su.php}                 |    0
 apps/files/l10n/sv.php                             |   39 +-
 apps/files/l10n/{af_ZA.php => ta_IN.php}           |    0
 apps/files/l10n/ta_LK.php                          |   11 +-
 apps/files/l10n/te.php                             |    6 +-
 apps/files/l10n/th_TH.php                          |   21 +-
 apps/files/l10n/tr.php                             |   41 +-
 apps/files/l10n/ug.php                             |   12 +-
 apps/files/l10n/uk.php                             |   22 +-
 apps/files/l10n/ur_PK.php                          |    4 +-
 apps/files/l10n/vi.php                             |   49 +-
 apps/files/l10n/zh_CN.php                          |   53 +-
 apps/files/l10n/zh_HK.php                          |    7 +-
 apps/files/l10n/zh_TW.php                          |   29 +-
 apps/files/lib/app.php                             |   31 +-
 apps/files/lib/helper.php                          |  126 +-
 apps/files/templates/admin.php                     |   42 +-
 apps/files/templates/fileexists.html               |    4 +-
 apps/files/templates/index.php                     |   29 +-
 apps/files/templates/part.breadcrumb.php           |   17 -
 apps/files/templates/part.list.php                 |   63 -
 apps/files/templates/upgrade.php                   |    4 -
 apps/files/tests/ajax_rename.php                   |   96 +-
 apps/files/tests/js/breadcrumbSpec.js              |  248 +
 apps/files/tests/js/fileUploadSpec.js              |  127 +
 apps/files/tests/js/fileactionsSpec.js             |   79 +-
 apps/files/tests/js/filelistSpec.js                | 1421 ++-
 apps/files/tests/js/filesSpec.js                   |   28 +-
 apps/files/tests/js/filesummarySpec.js             |   87 +
 apps/files_encryption/appinfo/info.xml             |    2 +-
 apps/files_encryption/hooks/hooks.php              |  150 +-
 apps/files_encryption/js/settings-admin.js         |   22 -
 apps/files_encryption/l10n/ar.php                  |   42 +-
 apps/files_encryption/l10n/ast.php                 |   13 +
 apps/files_encryption/l10n/bg_BG.php               |    1 -
 apps/files_encryption/l10n/bn_BD.php               |    1 -
 apps/files_encryption/l10n/ca.php                  |    2 +-
 apps/files_encryption/l10n/cs_CZ.php               |    2 +-
 apps/files_encryption/l10n/cy_GB.php               |    1 -
 apps/files_encryption/l10n/da.php                  |    2 +-
 apps/files_encryption/l10n/de.php                  |    2 +-
 apps/files_encryption/l10n/de_CH.php               |    1 -
 apps/files_encryption/l10n/de_DE.php               |    4 +-
 apps/files_encryption/l10n/el.php                  |    2 +-
 apps/files_encryption/l10n/en_GB.php               |    2 +-
 apps/files_encryption/l10n/eo.php                  |    1 -
 apps/files_encryption/l10n/es.php                  |    2 +-
 apps/files_encryption/l10n/es_AR.php               |   10 +-
 apps/files_encryption/l10n/es_MX.php               |    1 -
 apps/files_encryption/l10n/et_EE.php               |    2 +-
 apps/files_encryption/l10n/eu.php                  |    1 -
 apps/files_encryption/l10n/fa.php                  |    1 -
 apps/files_encryption/l10n/fi_FI.php               |    2 +-
 apps/files_encryption/l10n/fr.php                  |    2 +-
 apps/files_encryption/l10n/gl.php                  |    2 +-
 apps/files_encryption/l10n/he.php                  |    1 -
 apps/files_encryption/l10n/hu_HU.php               |    2 +-
 apps/files_encryption/l10n/id.php                  |    1 -
 apps/files_encryption/l10n/is.php                  |    1 -
 apps/files_encryption/l10n/it.php                  |    2 +-
 apps/files_encryption/l10n/ja.php                  |   44 +
 apps/files_encryption/l10n/ja_JP.php               |   32 +-
 apps/files_encryption/l10n/ka_GE.php               |    1 -
 apps/files_encryption/l10n/km.php                  |   11 +
 apps/files_encryption/l10n/ko.php                  |    1 -
 apps/files_encryption/l10n/ku_IQ.php               |    1 -
 apps/files_encryption/l10n/lt_LT.php               |    3 +-
 apps/files_encryption/l10n/lv.php                  |    1 -
 apps/files_encryption/l10n/mk.php                  |    1 -
 apps/files_encryption/l10n/nb_NO.php               |   41 +-
 apps/files_encryption/l10n/nl.php                  |    2 +-
 apps/files_encryption/l10n/nn_NO.php               |    1 -
 apps/files_encryption/l10n/pl.php                  |    2 +-
 apps/files_encryption/l10n/pt_BR.php               |    2 +-
 apps/files_encryption/l10n/pt_PT.php               |    4 +-
 apps/files_encryption/l10n/ro.php                  |   18 +-
 apps/files_encryption/l10n/ru.php                  |    2 +-
 apps/files_encryption/l10n/si_LK.php               |    1 -
 apps/files_encryption/l10n/sk_SK.php               |    2 +-
 apps/files_encryption/l10n/sl.php                  |    2 +-
 apps/files_encryption/l10n/sr.php                  |    1 -
 apps/files_encryption/l10n/sv.php                  |    3 +-
 apps/files_encryption/l10n/ta_LK.php               |    1 -
 apps/files_encryption/l10n/th_TH.php               |    1 -
 apps/files_encryption/l10n/tr.php                  |    2 +-
 apps/files_encryption/l10n/ug.php                  |    1 -
 apps/files_encryption/l10n/uk.php                  |    1 -
 apps/files_encryption/l10n/vi.php                  |   20 +-
 apps/files_encryption/l10n/zh_CN.php               |    1 -
 apps/files_encryption/l10n/zh_TW.php               |    3 +-
 apps/files_encryption/lib/crypt.php                |    4 +-
 apps/files_encryption/lib/helper.php               |   11 +-
 apps/files_encryption/lib/proxy.php                |  169 +-
 apps/files_encryption/lib/session.php              |    8 +
 apps/files_encryption/lib/stream.php               |   31 +-
 apps/files_encryption/lib/util.php                 |  160 +-
 apps/files_encryption/templates/settings-admin.php |  113 +-
 .../templates/settings-personal.php                |  119 +-
 apps/files_encryption/tests/hooks.php              |   81 +-
 apps/files_encryption/tests/proxy.php              |   20 +
 apps/files_encryption/tests/share.php              |  105 +-
 apps/files_encryption/tests/util.php               |   71 +-
 apps/files_encryption/tests/webdav.php             |   20 +-
 apps/files_external/3rdparty/irodsphp/LICENSE.txt  |   28 -
 .../3rdparty/irodsphp/prods/doc_config.ini         |   87 -
 .../3rdparty/irodsphp/prods/release_notes.txt      |   34 -
 .../3rdparty/irodsphp/prods/src/LICENSE.txt        |   28 -
 .../3rdparty/irodsphp/prods/src/Prods.inc.php      |    3 -
 .../irodsphp/prods/src/ProdsConfig.inc.php         |   17 -
 .../3rdparty/irodsphp/prods/src/ProdsDir.class.php |  730 --
 .../irodsphp/prods/src/ProdsFile.class.php         |  434 -
 .../irodsphp/prods/src/ProdsPath.class.php         |  281 -
 .../irodsphp/prods/src/ProdsQuery.class.php        |  105 -
 .../irodsphp/prods/src/ProdsRule.class.php         |   60 -
 .../irodsphp/prods/src/ProdsStreamer.class.php     |  434 -
 .../irodsphp/prods/src/ProdsTicket.class.php       |   41 -
 .../irodsphp/prods/src/RODSAccount.class.php       |  201 -
 .../3rdparty/irodsphp/prods/src/RODSConn.class.php | 1613 ----
 .../irodsphp/prods/src/RODSConnManager.class.php   |   79 -
 .../irodsphp/prods/src/RODSDirStats.class.php      |   25 -
 .../irodsphp/prods/src/RODSException.class.php     |  182 -
 .../irodsphp/prods/src/RODSFileStats.class.php     |   34 -
 .../irodsphp/prods/src/RODSGenQueConds.class.php   |  112 -
 .../irodsphp/prods/src/RODSGenQueResults.class.php |   97 -
 .../irodsphp/prods/src/RODSGenQueSelFlds.class.php |  158 -
 .../irodsphp/prods/src/RODSKeyValPair.class.php    |   48 -
 .../irodsphp/prods/src/RODSMessage.class.php       |  183 -
 .../3rdparty/irodsphp/prods/src/RODSMeta.class.php |   21 -
 .../irodsphp/prods/src/RODSObjIOOpr.inc.php        |   19 -
 .../prods/src/RODSQueryCondition.class.php         |   22 -
 .../3rdparty/irodsphp/prods/src/RodsAPINum.inc.php |  216 -
 .../3rdparty/irodsphp/prods/src/RodsConst.inc.php  |    6 -
 .../irodsphp/prods/src/RodsErrorTable.inc.php      |  586 --
 .../irodsphp/prods/src/RodsGenQueryKeyWd.inc.php   |  224 -
 .../irodsphp/prods/src/RodsGenQueryNum.inc.php     |  234 -
 .../3rdparty/irodsphp/prods/src/autoload.inc.php   |   47 -
 .../irodsphp/prods/src/packet/RODSPacket.class.php |  248 -
 .../prods/src/packet/RP_BinBytesBuf.class.php      |   12 -
 .../irodsphp/prods/src/packet/RP_CollInp.class.php |   17 -
 .../prods/src/packet/RP_CollOprStat.class.php      |   15 -
 .../prods/src/packet/RP_DataObjCopyInp.class.php   |   17 -
 .../prods/src/packet/RP_DataObjInp.class.php       |   20 -
 .../prods/src/packet/RP_ExecCmdOut.class.php       |   54 -
 .../prods/src/packet/RP_ExecMyRuleInp.class.php    |   20 -
 .../prods/src/packet/RP_GenQueryInp.class.php      |   23 -
 .../prods/src/packet/RP_GenQueryOut.class.php      |   20 -
 .../prods/src/packet/RP_InxIvalPair.class.php      |   25 -
 .../prods/src/packet/RP_InxValPair.class.php       |   42 -
 .../prods/src/packet/RP_KeyValPair.class.php       |   45 -
 .../prods/src/packet/RP_MiscSvrInfo.class.php      |   15 -
 .../src/packet/RP_ModAVUMetadataInp.class.php      |   16 -
 .../irodsphp/prods/src/packet/RP_MsParam.class.php |   43 -
 .../prods/src/packet/RP_MsParamArray.class.php     |   19 -
 .../prods/src/packet/RP_MsgHeader.class.php        |   14 -
 .../prods/src/packet/RP_RHostAddr.class.php        |   13 -
 .../prods/src/packet/RP_RodsObjStat.class.php      |   18 -
 .../irodsphp/prods/src/packet/RP_STR.class.php     |   12 -
 .../prods/src/packet/RP_SqlResult.class.php        |   13 -
 .../prods/src/packet/RP_StartupPack.class.php      |   16 -
 .../prods/src/packet/RP_TransStat.class.php        |   14 -
 .../irodsphp/prods/src/packet/RP_Version.class.php |   14 -
 .../prods/src/packet/RP_authRequestOut.class.php   |   12 -
 .../prods/src/packet/RP_authResponseInp.class.php  |   12 -
 .../prods/src/packet/RP_dataObjCloseInp.class.php  |   14 -
 .../prods/src/packet/RP_dataObjReadInp.class.php   |   14 -
 .../prods/src/packet/RP_dataObjWriteInp.class.php  |   14 -
 .../prods/src/packet/RP_fileLseekInp.class.php     |   14 -
 .../prods/src/packet/RP_fileLseekOut.class.php     |   13 -
 .../src/packet/RP_getTempPasswordOut.class.php     |   12 -
 .../src/packet/RP_pamAuthRequestInp.class.php      |   12 -
 .../src/packet/RP_pamAuthRequestOut.class.php      |   12 -
 .../prods/src/packet/RP_sslEndInp.class.php        |   12 -
 .../prods/src/packet/RP_sslStartInp.class.php      |   12 -
 .../prods/src/packet/RP_ticketAdminInp.class.php   |   30 -
 .../3rdparty/irodsphp/prods/src/prods.ini          |   15 -
 .../3rdparty/irodsphp/prods/src/release_notes.txt  |   31 -
 .../3rdparty/irodsphp/prods/src/setRodsAPINum.php  |   68 -
 .../irodsphp/prods/src/setRodsErrorCodes.php       |   73 -
 .../irodsphp/prods/src/setRodsGenQueryKeyWd.php    |   71 -
 .../irodsphp/prods/src/setRodsGenQueryNum.php      |   61 -
 .../irodsphp/prods/utilities/exif2meta.php         |  145 -
 .../3rdparty/irodsphp/release_notes.txt            |   14 -
 apps/files_external/3rdparty/phpseclib/LICENSE     |    4 +-
 apps/files_external/3rdparty/phpseclib/README.md   |    4 +-
 .../3rdparty/phpseclib/composer.json               |   25 +-
 .../3rdparty/phpseclib/composer.lock               |   95 +
 .../3rdparty/phpseclib/phpseclib/Crypt/AES.php     |   23 +-
 .../3rdparty/phpseclib/phpseclib/Crypt/Base.php    |   27 +-
 .../phpseclib/phpseclib/Crypt/Blowfish.php         |   30 +-
 .../3rdparty/phpseclib/phpseclib/Crypt/DES.php     |   37 +-
 .../3rdparty/phpseclib/phpseclib/Crypt/Hash.php    |   30 +-
 .../3rdparty/phpseclib/phpseclib/Crypt/RC2.php     |   21 +-
 .../3rdparty/phpseclib/phpseclib/Crypt/RC4.php     |   28 +-
 .../3rdparty/phpseclib/phpseclib/Crypt/RSA.php     |   95 +-
 .../3rdparty/phpseclib/phpseclib/Crypt/Random.php  |   19 +-
 .../phpseclib/phpseclib/Crypt/Rijndael.php         |   23 +-
 .../phpseclib/phpseclib/Crypt/TripleDES.php        |   23 +-
 .../3rdparty/phpseclib/phpseclib/Crypt/Twofish.php |   27 +-
 .../3rdparty/phpseclib/phpseclib/File/ANSI.php     |   24 +-
 .../3rdparty/phpseclib/phpseclib/File/ASN1.php     |  141 +-
 .../3rdparty/phpseclib/phpseclib/File/X509.php     |  218 +-
 .../phpseclib/phpseclib/Math/BigInteger.php        |   56 +-
 .../3rdparty/phpseclib/phpseclib/Net/SCP.php       |   28 +-
 .../3rdparty/phpseclib/phpseclib/Net/SFTP.php      |   71 +-
 .../phpseclib/phpseclib/Net/SFTP/Stream.php        |   30 +-
 .../3rdparty/phpseclib/phpseclib/Net/SSH1.php      |  202 +-
 .../3rdparty/phpseclib/phpseclib/Net/SSH2.php      |  412 +-
 .../phpseclib/phpseclib/System/SSH_Agent.php       |  315 +
 .../3rdparty/phpseclib/phpseclib/openssl.cnf       |    2 +-
 apps/files_external/3rdparty/smb4php/smb.php       |   94 +-
 apps/files_external/appinfo/app.php                |  129 +-
 apps/files_external/css/settings.css               |   14 +-
 apps/files_external/js/settings.js                 |   31 +-
 apps/files_external/l10n/af_ZA.php                 |    3 +
 apps/files_external/l10n/ar.php                    |    6 +
 apps/files_external/l10n/ast.php                   |   17 +
 apps/files_external/l10n/bg_BG.php                 |    8 +-
 apps/files_external/l10n/bn_BD.php                 |    8 +-
 apps/files_external/l10n/bs.php                    |    5 +
 apps/files_external/l10n/ca.php                    |   21 +-
 apps/files_external/l10n/cs_CZ.php                 |   42 +-
 apps/files_external/l10n/cy_GB.php                 |    5 +
 apps/files_external/l10n/da.php                    |   28 +-
 apps/files_external/l10n/de.php                    |   53 +-
 apps/files_external/l10n/de_AT.php                 |    8 +
 apps/files_external/l10n/de_CH.php                 |   11 +-
 apps/files_external/l10n/de_DE.php                 |   53 +-
 apps/files_external/l10n/el.php                    |   17 +-
 apps/files_external/l10n/en at pirate.php             |    5 +
 apps/files_external/l10n/en_GB.php                 |   53 +-
 apps/files_external/l10n/eo.php                    |    8 +-
 apps/files_external/l10n/es.php                    |   53 +-
 apps/files_external/l10n/es_AR.php                 |   12 +-
 apps/files_external/l10n/es_CL.php                 |    8 +
 apps/files_external/l10n/es_MX.php                 |   11 +-
 apps/files_external/l10n/et_EE.php                 |   21 +-
 apps/files_external/l10n/eu.php                    |   20 +-
 apps/files_external/l10n/eu_ES.php                 |    6 +
 apps/files_external/l10n/fa.php                    |   11 +-
 apps/files_external/l10n/fi_FI.php                 |   26 +-
 apps/files_external/l10n/fr.php                    |   24 +-
 apps/files_external/l10n/gl.php                    |   53 +-
 apps/files_external/l10n/he.php                    |    8 +-
 apps/files_external/l10n/hi.php                    |    3 +
 apps/files_external/l10n/hr.php                    |    4 +
 apps/files_external/l10n/hu_HU.php                 |   12 +-
 apps/files_external/l10n/ia.php                    |    6 +
 apps/files_external/l10n/id.php                    |   27 +-
 apps/files_external/l10n/is.php                    |   10 +-
 apps/files_external/l10n/it.php                    |   53 +-
 apps/files_external/l10n/ja.php                    |   31 +
 apps/files_external/l10n/ja_JP.php                 |   19 +-
 apps/files_external/l10n/jv.php                    |    5 +
 apps/files_external/l10n/ka_GE.php                 |   11 +-
 apps/files_external/l10n/km.php                    |    9 +
 apps/files_external/l10n/ko.php                    |   13 +-
 apps/files_external/l10n/ku_IQ.php                 |    5 +
 apps/files_external/l10n/lb.php                    |    5 +
 apps/files_external/l10n/lt_LT.php                 |   11 +-
 apps/files_external/l10n/lv.php                    |   11 +-
 apps/files_external/l10n/mk.php                    |   10 +-
 apps/files_external/l10n/ms_MY.php                 |    5 +
 apps/files_external/l10n/my_MM.php                 |    3 +
 apps/files_external/l10n/nb_NO.php                 |   21 +-
 apps/files_external/l10n/nl.php                    |   53 +-
 apps/files_external/l10n/nn_NO.php                 |    6 +
 apps/files_external/l10n/oc.php                    |    5 +
 apps/files_external/l10n/pa.php                    |    3 +
 apps/files_external/l10n/pl.php                    |   53 +-
 apps/files_external/l10n/pt_BR.php                 |   53 +-
 apps/files_external/l10n/pt_PT.php                 |   36 +-
 apps/files_external/l10n/ro.php                    |   13 +-
 apps/files_external/l10n/ru.php                    |   13 +-
 apps/files_external/l10n/si_LK.php                 |    8 +-
 apps/files_external/l10n/sk.php                    |    2 +
 apps/files_external/l10n/sk_SK.php                 |   21 +-
 apps/files_external/l10n/sl.php                    |   23 +-
 apps/files_external/l10n/sq.php                    |    5 +
 apps/files_external/l10n/sr.php                    |    4 +
 apps/files_external/l10n/sr at latin.php              |    4 +
 apps/files_external/l10n/sv.php                    |   21 +-
 apps/files_external/l10n/ta_LK.php                 |    8 +-
 apps/files_external/l10n/te.php                    |    2 +
 apps/files_external/l10n/th_TH.php                 |   10 +-
 apps/files_external/l10n/tr.php                    |   55 +-
 apps/files_external/l10n/ug.php                    |    5 +
 apps/files_external/l10n/uk.php                    |   11 +-
 apps/files_external/l10n/ur_PK.php                 |    2 +
 apps/files_external/l10n/vi.php                    |   11 +-
 apps/files_external/l10n/zh_CN.php                 |   29 +-
 apps/files_external/l10n/zh_HK.php                 |    5 +
 apps/files_external/l10n/zh_TW.php                 |   13 +-
 apps/files_external/lib/amazons3.php               |   12 +
 apps/files_external/lib/config.php                 |  604 +-
 apps/files_external/lib/dropbox.php                |   11 +
 apps/files_external/lib/ftp.php                    |   12 +
 apps/files_external/lib/google.php                 |   11 +
 apps/files_external/lib/irods.php                  |  155 -
 apps/files_external/lib/smb.php                    |   16 +-
 apps/files_external/lib/smb_oc.php                 |   93 +
 apps/files_external/lib/swift.php                  |   30 +-
 apps/files_external/lib/webdav.php                 |  204 +-
 apps/files_external/personal.php                   |    5 +-
 apps/files_external/settings.php                   |   18 +-
 apps/files_external/templates/settings.php         |  262 +-
 apps/files_external/tests/config.php               |    2 +-
 apps/files_external/tests/dynamicmountconfig.php   |  101 +
 apps/files_external/tests/irods.php                |   32 -
 apps/files_external/tests/mountconfig.php          |  599 +-
 apps/files_sharing/ajax/list.php                   |   91 +
 apps/files_sharing/ajax/publicpreview.php          |    8 +-
 apps/files_sharing/appinfo/app.php                 |    2 -
 apps/files_sharing/appinfo/info.xml                |    2 +-
 apps/files_sharing/appinfo/routes.php              |    9 +-
 apps/files_sharing/appinfo/update.php              |  134 +-
 apps/files_sharing/appinfo/version                 |    2 +-
 apps/files_sharing/css/mobile.css                  |   10 +-
 apps/files_sharing/css/public.css                  |   49 +-
 apps/files_sharing/js/public.js                    |   91 +-
 apps/files_sharing/js/share.js                     |   38 +-
 apps/files_sharing/l10n/ar.php                     |   16 +-
 apps/files_sharing/l10n/ast.php                    |    7 +
 apps/files_sharing/l10n/bg_BG.php                  |    7 +-
 apps/files_sharing/l10n/bn_BD.php                  |    7 +-
 apps/files_sharing/l10n/ca.php                     |    7 +-
 apps/files_sharing/l10n/cs_CZ.php                  |    7 +-
 apps/files_sharing/l10n/cy_GB.php                  |    7 +-
 apps/files_sharing/l10n/da.php                     |    7 +-
 apps/files_sharing/l10n/de.php                     |    9 +-
 apps/files_sharing/l10n/de_AT.php                  |    6 +
 apps/files_sharing/l10n/de_CH.php                  |    8 +-
 apps/files_sharing/l10n/de_DE.php                  |    7 +-
 apps/files_sharing/l10n/el.php                     |    7 +-
 apps/files_sharing/l10n/en at pirate.php              |    5 +-
 apps/files_sharing/l10n/en_GB.php                  |    7 +-
 apps/files_sharing/l10n/eo.php                     |    6 +-
 apps/files_sharing/l10n/es.php                     |    7 +-
 apps/files_sharing/l10n/es_AR.php                  |    8 +-
 apps/files_sharing/l10n/es_CL.php                  |    2 +-
 apps/files_sharing/l10n/es_MX.php                  |    6 +-
 apps/files_sharing/l10n/et_EE.php                  |    7 +-
 apps/files_sharing/l10n/eu.php                     |    7 +-
 apps/files_sharing/l10n/eu_ES.php                  |    5 +
 apps/files_sharing/l10n/fa.php                     |    8 +-
 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                     |    8 +-
 apps/files_sharing/l10n/hi.php                     |    3 +-
 apps/files_sharing/l10n/hr.php                     |    4 +-
 apps/files_sharing/l10n/hu_HU.php                  |    6 +-
 apps/files_sharing/l10n/ia.php                     |    3 +-
 apps/files_sharing/l10n/id.php                     |    6 +-
 apps/files_sharing/l10n/is.php                     |    7 +-
 apps/files_sharing/l10n/it.php                     |    7 +-
 apps/files_sharing/l10n/ja.php                     |   17 +
 apps/files_sharing/l10n/ja_JP.php                  |    9 +-
 apps/files_sharing/l10n/jv.php                     |    5 +
 apps/files_sharing/l10n/ka_GE.php                  |    8 +-
 apps/files_sharing/l10n/km.php                     |    6 +
 apps/files_sharing/l10n/ko.php                     |    6 +-
 apps/files_sharing/l10n/ku_IQ.php                  |    6 +-
 apps/files_sharing/l10n/lb.php                     |    7 +-
 apps/files_sharing/l10n/lt_LT.php                  |    6 +-
 apps/files_sharing/l10n/lv.php                     |    8 +-
 apps/files_sharing/l10n/mk.php                     |    8 +-
 apps/files_sharing/l10n/ms_MY.php                  |    4 +-
 apps/files_sharing/l10n/nb_NO.php                  |   14 +-
 apps/files_sharing/l10n/nl.php                     |    7 +-
 apps/files_sharing/l10n/nn_NO.php                  |    8 +-
 apps/files_sharing/l10n/oc.php                     |    4 +-
 apps/files_sharing/l10n/pa.php                     |    4 +-
 apps/files_sharing/l10n/pl.php                     |    7 +-
 apps/files_sharing/l10n/pt_BR.php                  |    7 +-
 apps/files_sharing/l10n/pt_PT.php                  |    7 +-
 apps/files_sharing/l10n/ro.php                     |    7 +-
 apps/files_sharing/l10n/ru.php                     |   12 +-
 apps/files_sharing/l10n/si_LK.php                  |    7 +-
 apps/files_sharing/l10n/sk_SK.php                  |    7 +-
 apps/files_sharing/l10n/sl.php                     |    7 +-
 apps/files_sharing/l10n/sq.php                     |    7 +-
 apps/files_sharing/l10n/sr.php                     |    4 +-
 apps/files_sharing/l10n/sr at latin.php               |    3 +-
 apps/files_sharing/l10n/sv.php                     |    7 +-
 apps/files_sharing/l10n/ta_LK.php                  |    8 +-
 apps/files_sharing/l10n/th_TH.php                  |    8 +-
 apps/files_sharing/l10n/tr.php                     |    9 +-
 apps/files_sharing/l10n/ug.php                     |    4 +-
 apps/files_sharing/l10n/uk.php                     |    6 +-
 apps/files_sharing/l10n/vi.php                     |    8 +-
 apps/files_sharing/l10n/zh_CN.php                  |    9 +-
 apps/files_sharing/l10n/zh_HK.php                  |    3 +-
 apps/files_sharing/l10n/zh_TW.php                  |    8 +-
 apps/files_sharing/lib/api.php                     |   39 +-
 apps/files_sharing/lib/cache.php                   |  168 +-
 apps/files_sharing/lib/connector/publicauth.php    |   71 +
 apps/files_sharing/lib/helper.php                  |  183 +
 apps/files_sharing/lib/permissions.php             |    4 +-
 apps/files_sharing/lib/share/file.php              |  144 +-
 apps/files_sharing/lib/sharedstorage.php           |  303 +-
 apps/files_sharing/lib/updater.php                 |   90 +-
 apps/files_sharing/lib/watcher.php                 |    2 +-
 apps/files_sharing/public.php                      |   89 +-
 apps/files_sharing/publicwebdav.php                |   58 +
 apps/files_sharing/templates/authenticate.php      |    7 +-
 apps/files_sharing/templates/public.php            |   16 +-
 apps/files_sharing/tests/api.php                   |  464 +-
 apps/files_sharing/tests/base.php                  |   13 +-
 apps/files_sharing/tests/cache.php                 |   91 +-
 apps/files_sharing/tests/permissions.php           |   15 +-
 apps/files_sharing/tests/sharedstorage.php         |   83 +
 apps/files_sharing/tests/updater.php               |  146 +
 apps/files_sharing/tests/watcher.php               |   33 +-
 apps/files_trashbin/ajax/list.php                  |   41 +-
 apps/files_trashbin/ajax/preview.php               |    2 +-
 apps/files_trashbin/ajax/undelete.php              |    2 +-
 apps/files_trashbin/appinfo/database.xml           |    4 +-
 apps/files_trashbin/appinfo/routes.php             |    5 +-
 apps/files_trashbin/appinfo/update.php             |    2 +-
 apps/files_trashbin/appinfo/version                |    2 +-
 apps/files_trashbin/css/trash.css                  |    3 +-
 apps/files_trashbin/index.php                      |   44 +-
 apps/files_trashbin/js/disableDefaultActions.js    |    1 -
 apps/files_trashbin/js/filelist.js                 |  233 +-
 apps/files_trashbin/js/trash.js                    |  248 +-
 apps/files_trashbin/l10n/ar.php                    |    6 +-
 apps/files_trashbin/l10n/ast.php                   |   13 +
 apps/files_trashbin/l10n/bg_BG.php                 |    4 +-
 apps/files_trashbin/l10n/ca.php                    |    5 +-
 apps/files_trashbin/l10n/cs_CZ.php                 |    5 +-
 apps/files_trashbin/l10n/cy_GB.php                 |    5 +-
 apps/files_trashbin/l10n/da.php                    |    5 +-
 apps/files_trashbin/l10n/de.php                    |    5 +-
 apps/files_trashbin/l10n/de_AT.php                 |    3 +-
 apps/files_trashbin/l10n/de_CH.php                 |    5 +-
 apps/files_trashbin/l10n/de_DE.php                 |    5 +-
 apps/files_trashbin/l10n/el.php                    |    5 +-
 apps/files_trashbin/l10n/en_GB.php                 |    5 +-
 apps/files_trashbin/l10n/eo.php                    |    5 +-
 apps/files_trashbin/l10n/es.php                    |    5 +-
 apps/files_trashbin/l10n/es_AR.php                 |    5 +-
 apps/files_trashbin/l10n/es_CL.php                 |    5 +
 apps/files_trashbin/l10n/es_MX.php                 |    5 +-
 apps/files_trashbin/l10n/et_EE.php                 |    5 +-
 apps/files_trashbin/l10n/eu.php                    |    5 +-
 apps/files_trashbin/l10n/eu_ES.php                 |    5 +
 apps/files_trashbin/l10n/fa.php                    |    5 +-
 apps/files_trashbin/l10n/fi_FI.php                 |    5 +-
 apps/files_trashbin/l10n/fr.php                    |    5 +-
 apps/files_trashbin/l10n/gl.php                    |    5 +-
 apps/files_trashbin/l10n/he.php                    |    6 +-
 apps/files_trashbin/l10n/hu_HU.php                 |    5 +-
 apps/files_trashbin/l10n/id.php                    |    5 +-
 apps/files_trashbin/l10n/it.php                    |    5 +-
 apps/files_trashbin/l10n/ja.php                    |   15 +
 apps/files_trashbin/l10n/ja_JP.php                 |    5 +-
 apps/files_trashbin/l10n/ka_GE.php                 |    5 +-
 apps/files_trashbin/l10n/km.php                    |    3 +
 apps/files_trashbin/l10n/ko.php                    |    5 +-
 apps/files_trashbin/l10n/lt_LT.php                 |    5 +-
 apps/files_trashbin/l10n/lv.php                    |    5 +-
 apps/files_trashbin/l10n/mk.php                    |    5 +-
 apps/files_trashbin/l10n/ms_MY.php                 |    4 +-
 apps/files_trashbin/l10n/nb_NO.php                 |    6 +-
 apps/files_trashbin/l10n/nl.php                    |    5 +-
 apps/files_trashbin/l10n/nn_NO.php                 |    5 +-
 apps/files_trashbin/l10n/pl.php                    |    5 +-
 apps/files_trashbin/l10n/pt_BR.php                 |    5 +-
 apps/files_trashbin/l10n/pt_PT.php                 |    5 +-
 apps/files_trashbin/l10n/ro.php                    |    1 +
 apps/files_trashbin/l10n/ru.php                    |    5 +-
 apps/files_trashbin/l10n/sk_SK.php                 |    5 +-
 apps/files_trashbin/l10n/sl.php                    |    5 +-
 apps/files_trashbin/l10n/sq.php                    |    5 +-
 apps/files_trashbin/l10n/sr.php                    |    1 +
 apps/files_trashbin/l10n/sv.php                    |    5 +-
 apps/files_trashbin/l10n/th_TH.php                 |    4 +-
 apps/files_trashbin/l10n/tr.php                    |    7 +-
 apps/files_trashbin/l10n/ug.php                    |    1 +
 apps/files_trashbin/l10n/uk.php                    |    5 +-
 apps/files_trashbin/l10n/vi.php                    |    8 +-
 apps/files_trashbin/l10n/zh_CN.php                 |    5 +-
 apps/files_trashbin/l10n/zh_TW.php                 |    5 +-
 apps/files_trashbin/lib/helper.php                 |  125 +-
 apps/files_trashbin/lib/trashbin.php               |  199 +-
 apps/files_trashbin/templates/index.php            |   12 +-
 apps/files_trashbin/templates/part.breadcrumb.php  |   19 -
 apps/files_trashbin/templates/part.list.php        |   79 -
 apps/files_versions/appinfo/info.xml               |    2 +-
 apps/files_versions/appinfo/routes.php             |    3 +-
 apps/files_versions/js/versions.js                 |    3 +-
 apps/files_versions/l10n/ast.php                   |   10 +
 apps/files_versions/l10n/ja.php                    |   10 +
 apps/files_versions/l10n/km.php                    |   10 +
 apps/files_versions/l10n/nb_NO.php                 |    4 +
 apps/files_versions/l10n/sq.php                    |    5 +
 apps/files_versions/l10n/vi.php                    |    3 +
 apps/files_versions/l10n/zh_CN.php                 |    3 +
 apps/files_versions/lib/versions.php               |    5 +-
 apps/user_ldap/appinfo/info.xml                    |    4 +-
 apps/user_ldap/group_ldap.php                      |  220 +-
 apps/user_ldap/group_proxy.php                     |   19 +-
 apps/user_ldap/js/ldapFilter.js                    |  100 +
 apps/user_ldap/js/settings.js                      |  100 +-
 apps/user_ldap/l10n/af_ZA.php                      |    3 +-
 apps/user_ldap/l10n/{de_AT.php => am_ET.php}       |    0
 apps/user_ldap/l10n/ar.php                         |    7 +-
 apps/user_ldap/l10n/ast.php                        |   44 +
 apps/user_ldap/l10n/az.php                         |    6 +-
 apps/user_ldap/l10n/bn_BD.php                      |    1 -
 apps/user_ldap/l10n/ca.php                         |   12 +-
 apps/user_ldap/l10n/cs_CZ.php                      |   10 +-
 apps/user_ldap/l10n/da.php                         |    1 -
 apps/user_ldap/l10n/de.php                         |   12 +-
 apps/user_ldap/l10n/de_AT.php                      |    5 +-
 apps/user_ldap/l10n/de_CH.php                      |    1 -
 apps/user_ldap/l10n/de_DE.php                      |   12 +-
 apps/user_ldap/l10n/el.php                         |   10 +-
 apps/user_ldap/l10n/en_GB.php                      |   12 +-
 apps/user_ldap/l10n/{de_AT.php => en_NZ.php}       |    0
 apps/user_ldap/l10n/eo.php                         |    1 -
 apps/user_ldap/l10n/es.php                         |   14 +-
 apps/user_ldap/l10n/es_AR.php                      |   36 +-
 apps/user_ldap/l10n/es_CL.php                      |    1 +
 apps/user_ldap/l10n/{de_AT.php => es_CR.php}       |    0
 apps/user_ldap/l10n/es_MX.php                      |    4 -
 apps/user_ldap/l10n/et_EE.php                      |   10 +-
 apps/user_ldap/l10n/eu.php                         |    4 -
 apps/user_ldap/l10n/eu_ES.php                      |    7 +
 apps/user_ldap/l10n/fa.php                         |    1 -
 apps/user_ldap/l10n/fi_FI.php                      |    1 -
 apps/user_ldap/l10n/fr.php                         |   12 +-
 apps/user_ldap/l10n/gl.php                         |   12 +-
 apps/user_ldap/l10n/{de_AT.php => hi_IN.php}       |    0
 apps/user_ldap/l10n/hu_HU.php                      |    5 +-
 apps/user_ldap/l10n/ia.php                         |    3 +-
 apps/user_ldap/l10n/id.php                         |    1 -
 apps/user_ldap/l10n/it.php                         |   12 +-
 apps/user_ldap/l10n/ja.php                         |  112 +
 apps/user_ldap/l10n/ja_JP.php                      |   72 +-
 apps/user_ldap/l10n/{de_AT.php => jv.php}          |    0
 apps/user_ldap/l10n/ka_GE.php                      |    1 -
 apps/user_ldap/l10n/km.php                         |   16 +-
 apps/user_ldap/l10n/ko.php                         |    4 -
 apps/user_ldap/l10n/lv.php                         |    1 -
 apps/user_ldap/l10n/{de_AT.php => ml.php}          |    0
 apps/user_ldap/l10n/{de_AT.php => mn.php}          |    0
 apps/user_ldap/l10n/nb_NO.php                      |   64 +-
 apps/user_ldap/l10n/nl.php                         |   12 +-
 apps/user_ldap/l10n/{de_AT.php => or_IN.php}       |    0
 apps/user_ldap/l10n/pl.php                         |   44 +-
 apps/user_ldap/l10n/pt_BR.php                      |   12 +-
 apps/user_ldap/l10n/pt_PT.php                      |   38 +-
 apps/user_ldap/l10n/ro.php                         |   27 +-
 apps/user_ldap/l10n/ru.php                         |    8 +-
 apps/user_ldap/l10n/sk_SK.php                      |   32 +-
 apps/user_ldap/l10n/sl.php                         |    5 +-
 apps/user_ldap/l10n/sq.php                         |    1 -
 apps/user_ldap/l10n/sr.php                         |    1 -
 apps/user_ldap/l10n/{az.php => su.php}             |    0
 apps/user_ldap/l10n/sv.php                         |   14 +-
 apps/user_ldap/l10n/{de_AT.php => ta_IN.php}       |    0
 apps/user_ldap/l10n/ta_LK.php                      |    1 -
 apps/user_ldap/l10n/te.php                         |    3 +-
 apps/user_ldap/l10n/th_TH.php                      |    1 -
 apps/user_ldap/l10n/tr.php                         |   48 +-
 apps/user_ldap/l10n/uk.php                         |    1 -
 apps/user_ldap/l10n/vi.php                         |    2 +-
 apps/user_ldap/l10n/zh_CN.php                      |    3 +-
 apps/user_ldap/l10n/zh_TW.php                      |    1 -
 apps/user_ldap/lib/access.php                      |   88 +-
 apps/user_ldap/lib/configuration.php               |   10 +-
 apps/user_ldap/lib/connection.php                  |    5 +
 apps/user_ldap/lib/helper.php                      |    2 +-
 apps/user_ldap/lib/ldap.php                        |    4 +-
 apps/user_ldap/lib/proxy.php                       |    3 +
 apps/user_ldap/lib/wizard.php                      |   39 +-
 apps/user_ldap/lib/wizardresult.php                |    4 +
 apps/user_ldap/settings.php                        |    1 +
 apps/user_ldap/templates/settings.php              |    6 +-
 apps/user_ldap/tests/connection.php                |   54 +
 apps/user_ldap/tests/group_ldap.php                |  115 +
 apps/user_ldap/tests/wizard.php                    |  210 +
 apps/user_ldap/user_proxy.php                      |   17 +-
 apps/user_webdavauth/appinfo/info.xml              |    2 +-
 apps/user_webdavauth/l10n/ast.php                  |    7 +
 apps/user_webdavauth/l10n/id.php                   |    4 +-
 apps/user_webdavauth/l10n/ja.php                   |    7 +
 apps/user_webdavauth/l10n/km.php                   |    7 +
 apps/user_webdavauth/l10n/nb_NO.php                |    4 +-
 apps/user_webdavauth/l10n/ro.php                   |    3 +-
 apps/user_webdavauth/l10n/vi.php                   |    4 +-
 apps/user_webdavauth/templates/settings.php        |   14 +-
 autotest.sh                                        |    2 +-
 build/package.json                                 |    4 +-
 config/.htaccess                                   |   12 +
 config/config.sample.php                           |   23 +-
 console.php                                        |    4 +-
 core/ajax/preview.php                              |   39 +-
 core/ajax/share.php                                |   48 +-
 core/ajax/update.php                               |   10 -
 core/command/upgrade.php                           |   38 +-
 core/command/user/report.php                       |    3 +-
 core/css/apps.css                                  |   45 +-
 core/css/auth.css                                  |   39 -
 core/css/icons.css                                 |   15 +-
 core/css/jquery.ocdialog.css                       |    2 +-
 core/css/mobile.css                                |   99 +-
 core/css/styles.css                                |  187 +-
 core/img/actions/add.png                           |  Bin 111 -> 132 bytes
 core/img/actions/add.svg                           |    5 +-
 core/img/actions/close.png                         |  Bin 181 -> 206 bytes
 core/img/actions/close.svg                         |    5 +-
 core/img/actions/delete-hover.png                  |  Bin 222 -> 274 bytes
 core/img/actions/delete-hover.svg                  |    2 +-
 core/img/actions/delete.png                        |  Bin 181 -> 243 bytes
 core/img/actions/delete.svg                        |    4 +-
 core/img/actions/download.png                      |  Bin 162 -> 134 bytes
 core/img/actions/download.svg                      |    3 +-
 core/img/actions/upload.png                        |  Bin 161 -> 144 bytes
 core/img/actions/upload.svg                        |    6 +-
 core/img/actions/view-close.png                    |  Bin 295 -> 317 bytes
 core/img/actions/view-close.svg                    |    5 +-
 core/img/logo-mail.gif                             |  Bin 2196 -> 1191 bytes
 core/js/compatibility.js                           |    4 +
 core/js/config.php                                 |   32 +-
 core/js/core.json                                  |    4 +-
 core/js/eventsource.js                             |   16 +-
 core/js/jquery-1.10.0.js                           | 9800 ++++++++++++++++++++
 core/js/jquery-migrate-1.2.1.js                    |  521 ++
 core/js/jquery.avatar.js                           |   41 +-
 core/js/js.js                                      |  704 +-
 core/js/oc-dialogs.js                              |  361 +-
 core/js/oc-requesttoken.js                         |    5 +-
 core/js/router.js                                  |   81 -
 core/js/setup.js                                   |    2 +
 core/js/share.js                                   |   65 +-
 core/js/tags.js                                    |   67 +-
 core/js/tests/specHelper.js                        |   17 +-
 core/js/tests/specs/coreSpec.js                    |  241 +-
 core/js/underscore.js                              | 1344 +++
 core/l10n/af_ZA.php                                |  115 +-
 core/l10n/{de_AT.php => am_ET.php}                 |    0
 core/l10n/ar.php                                   |   18 +-
 core/l10n/ast.php                                  |   85 +
 core/l10n/az.php                                   |   12 +-
 core/l10n/be.php                                   |    2 -
 core/l10n/bg_BG.php                                |   31 +-
 core/l10n/bn_BD.php                                |    3 +-
 core/l10n/bs.php                                   |    1 +
 core/l10n/ca.php                                   |   25 +-
 core/l10n/cs_CZ.php                                |   23 +-
 core/l10n/cy_GB.php                                |    3 +-
 core/l10n/da.php                                   |   16 +-
 core/l10n/de.php                                   |   21 +-
 core/l10n/de_AT.php                                |   30 +-
 core/l10n/de_CH.php                                |    7 +-
 core/l10n/de_DE.php                                |   25 +-
 core/l10n/el.php                                   |   28 +-
 core/l10n/en_GB.php                                |   21 +-
 core/l10n/{de_AT.php => en_NZ.php}                 |    0
 core/l10n/eo.php                                   |   39 +-
 core/l10n/es.php                                   |   27 +-
 core/l10n/es_AR.php                                |   58 +-
 core/l10n/es_CL.php                                |   37 +
 core/l10n/{de_AT.php => es_CR.php}                 |    0
 core/l10n/es_MX.php                                |    8 +-
 core/l10n/et_EE.php                                |   23 +-
 core/l10n/eu.php                                   |    9 +-
 core/l10n/eu_ES.php                                |   12 +
 core/l10n/fa.php                                   |    6 +-
 core/l10n/fi_FI.php                                |   32 +-
 core/l10n/fr.php                                   |   21 +-
 core/l10n/gl.php                                   |   23 +-
 core/l10n/he.php                                   |    5 +-
 core/l10n/hi.php                                   |    1 -
 core/l10n/{de_AT.php => hi_IN.php}                 |    0
 core/l10n/hr.php                                   |    3 +-
 core/l10n/hu_HU.php                                |   24 +-
 core/l10n/ia.php                                   |   94 +-
 core/l10n/id.php                                   |   19 +-
 core/l10n/is.php                                   |    3 +-
 core/l10n/it.php                                   |   21 +-
 core/l10n/ja.php                                   |  185 +
 core/l10n/ja_JP.php                                |   72 +-
 core/l10n/{de_AT.php => jv.php}                    |    0
 core/l10n/ka_GE.php                                |    4 +-
 core/l10n/km.php                                   |   88 +-
 core/l10n/ko.php                                   |   14 +-
 core/l10n/ku_IQ.php                                |    5 +-
 core/l10n/lb.php                                   |    7 +-
 core/l10n/lt_LT.php                                |   16 +-
 core/l10n/lv.php                                   |    5 +-
 core/l10n/mk.php                                   |    4 +-
 core/l10n/{de_AT.php => ml.php}                    |    0
 core/l10n/{de_AT.php => mn.php}                    |    0
 core/l10n/ms_MY.php                                |    2 +-
 core/l10n/my_MM.php                                |    1 -
 core/l10n/nb_NO.php                                |   82 +-
 core/l10n/nl.php                                   |   21 +-
 core/l10n/nn_NO.php                                |    8 +-
 core/l10n/oc.php                                   |    3 +-
 core/l10n/{de_AT.php => or_IN.php}                 |    0
 core/l10n/pa.php                                   |    2 +-
 core/l10n/pl.php                                   |   21 +-
 core/l10n/pl_PL.php                                |    6 -
 core/l10n/pt_BR.php                                |   21 +-
 core/l10n/pt_PT.php                                |   45 +-
 core/l10n/ro.php                                   |    6 +-
 core/l10n/ru.php                                   |   20 +-
 core/l10n/si_LK.php                                |    3 +-
 core/l10n/sk.php                                   |    3 +-
 core/l10n/sk_SK.php                                |   39 +-
 core/l10n/sl.php                                   |   21 +-
 core/l10n/sq.php                                   |    7 +-
 core/l10n/sr.php                                   |    3 +-
 core/l10n/sr at latin.php                             |    7 +-
 core/l10n/{az.php => su.php}                       |    0
 core/l10n/sv.php                                   |   29 +-
 core/l10n/{de_AT.php => ta_IN.php}                 |    0
 core/l10n/ta_LK.php                                |    3 +-
 core/l10n/te.php                                   |   12 +-
 core/l10n/th_TH.php                                |    4 +-
 core/l10n/tr.php                                   |   71 +-
 core/l10n/ug.php                                   |    2 +-
 core/l10n/uk.php                                   |   16 +-
 core/l10n/ur_PK.php                                |    1 -
 core/l10n/vi.php                                   |   67 +-
 core/l10n/zh_CN.php                                |   65 +-
 core/l10n/zh_HK.php                                |    2 -
 core/l10n/zh_TW.php                                |   14 +-
 core/lostpassword/controller.php                   |    2 +-
 core/lostpassword/templates/resetpassword.php      |   10 +-
 core/routes.php                                    |    7 +-
 core/setup/controller.php                          |   29 +-
 core/templates/installation.php                    |   10 +-
 core/templates/layout.base.php                     |    4 +-
 core/templates/layout.guest.php                    |    4 +-
 core/templates/layout.user.php                     |    6 +-
 core/templates/login.php                           |    2 +-
 core/templates/mail.php                            |   22 +-
 cron.php                                           |    9 +-
 index.php                                          |    2 -
 l10n/.tx/config                                    |    3 +-
 l10n/ach/core.po                                   |  292 +-
 l10n/ach/files.po                                  |  270 +-
 l10n/ach/files_encryption.po                       |   16 +-
 l10n/ach/files_external.po                         |  249 +-
 l10n/ach/files_sharing.po                          |   39 +-
 l10n/ach/files_trashbin.po                         |   32 +-
 l10n/ach/lib.po                                    |  263 +-
 l10n/ach/settings.po                               |  448 +-
 l10n/ach/user_ldap.po                              |   99 +-
 l10n/ady/core.po                                   |  292 +-
 l10n/ady/files.po                                  |  270 +-
 l10n/ady/files_encryption.po                       |   16 +-
 l10n/ady/files_external.po                         |  249 +-
 l10n/ady/files_sharing.po                          |   39 +-
 l10n/ady/files_trashbin.po                         |   32 +-
 l10n/ady/lib.po                                    |  263 +-
 l10n/ady/settings.po                               |  448 +-
 l10n/ady/user_ldap.po                              |   99 +-
 l10n/af/core.po                                    |  270 +-
 l10n/af/files.po                                   |  229 +-
 l10n/af/files_encryption.po                        |   16 +-
 l10n/af/files_external.po                          |   93 +-
 l10n/af/files_sharing.po                           |   36 +-
 l10n/af/files_trashbin.po                          |   32 +-
 l10n/af/lib.po                                     |  151 +-
 l10n/af/settings.po                                |  426 +-
 l10n/af/user_ldap.po                               |   99 +-
 l10n/af_ZA/core.po                                 |  498 +-
 l10n/af_ZA/files.po                                |  272 +-
 l10n/af_ZA/files_encryption.po                     |   16 +-
 l10n/af_ZA/files_external.po                       |  249 +-
 l10n/af_ZA/files_sharing.po                        |   35 +-
 l10n/af_ZA/files_trashbin.po                       |   32 +-
 l10n/af_ZA/lib.po                                  |  271 +-
 l10n/af_ZA/settings.po                             |  450 +-
 l10n/af_ZA/user_ldap.po                            |  101 +-
 l10n/ak/core.po                                    |  292 +-
 l10n/ak/files.po                                   |  270 +-
 l10n/ak/files_encryption.po                        |   16 +-
 l10n/ak/files_external.po                          |  247 +-
 l10n/ak/files_sharing.po                           |   35 +-
 l10n/ak/files_trashbin.po                          |   18 +-
 l10n/ak/lib.po                                     |  263 +-
 l10n/ak/settings.po                                |  448 +-
 l10n/ak/user_ldap.po                               |   93 +-
 l10n/am_ET/core.po                                 |  805 ++
 l10n/am_ET/files.po                                |  405 +
 l10n/am_ET/files_encryption.po                     |  201 +
 l10n/am_ET/files_external.po                       |  292 +
 l10n/am_ET/files_sharing.po                        |   71 +
 l10n/am_ET/files_trashbin.po                       |   64 +
 l10n/am_ET/files_versions.po                       |   43 +
 l10n/am_ET/lib.po                                  |  470 +
 l10n/am_ET/settings.po                             |  858 ++
 l10n/am_ET/user_ldap.po                            |  534 ++
 l10n/am_ET/user_webdavauth.po                      |   33 +
 l10n/ar/core.po                                    |  314 +-
 l10n/ar/files.po                                   |  286 +-
 l10n/ar/files_encryption.po                        |   96 +-
 l10n/ar/files_external.po                          |  247 +-
 l10n/ar/files_sharing.po                           |   56 +-
 l10n/ar/files_trashbin.po                          |   39 +-
 l10n/ar/lib.po                                     |  297 +-
 l10n/ar/settings.po                                |  549 +-
 l10n/ar/user_ldap.po                               |  104 +-
 l10n/ast/core.po                                   |  806 ++
 l10n/ast/files.po                                  |  405 +
 l10n/ast/files_encryption.po                       |  202 +
 l10n/ast/files_external.po                         |  292 +
 l10n/ast/files_sharing.po                          |   71 +
 l10n/ast/files_trashbin.po                         |   65 +
 l10n/ast/files_versions.po                         |   45 +
 l10n/ast/lib.po                                    |  471 +
 l10n/ast/settings.po                               |  859 ++
 l10n/ast/user_ldap.po                              |  536 ++
 l10n/ast/user_webdavauth.po                        |   34 +
 l10n/az/core.po                                    |  299 +-
 l10n/az/files.po                                   |  275 +-
 l10n/az/files_encryption.po                        |   16 +-
 l10n/az/files_external.po                          |  249 +-
 l10n/az/files_sharing.po                           |   37 +-
 l10n/az/files_trashbin.po                          |   20 +-
 l10n/az/lib.po                                     |  269 +-
 l10n/az/settings.po                                |  450 +-
 l10n/az/user_ldap.po                               |   97 +-
 l10n/be/core.po                                    |  294 +-
 l10n/be/files.po                                   |  268 +-
 l10n/be/files_encryption.po                        |   16 +-
 l10n/be/files_external.po                          |  249 +-
 l10n/be/files_sharing.po                           |   39 +-
 l10n/be/files_trashbin.po                          |   34 +-
 l10n/be/lib.po                                     |  261 +-
 l10n/be/settings.po                                |  446 +-
 l10n/be/user_ldap.po                               |   91 +-
 l10n/bg_BG/core.po                                 |  353 +-
 l10n/bg_BG/files.po                                |  274 +-
 l10n/bg_BG/files_encryption.po                     |   18 +-
 l10n/bg_BG/files_external.po                       |  253 +-
 l10n/bg_BG/files_sharing.po                        |   37 +-
 l10n/bg_BG/files_trashbin.po                       |   36 +-
 l10n/bg_BG/lib.po                                  |  273 +-
 l10n/bg_BG/settings.po                             |  456 +-
 l10n/bg_BG/user_ldap.po                            |   93 +-
 l10n/bn_BD/core.po                                 |  294 +-
 l10n/bn_BD/files.po                                |  280 +-
 l10n/bn_BD/files_encryption.po                     |   18 +-
 l10n/bn_BD/files_external.po                       |  253 +-
 l10n/bn_BD/files_sharing.po                        |   37 +-
 l10n/bn_BD/files_trashbin.po                       |   36 +-
 l10n/bn_BD/lib.po                                  |  263 +-
 l10n/bn_BD/settings.po                             |  458 +-
 l10n/bn_BD/user_ldap.po                            |   95 +-
 l10n/bs/core.po                                    |  292 +-
 l10n/bs/files.po                                   |  270 +-
 l10n/bs/files_encryption.po                        |   18 +-
 l10n/bs/files_external.po                          |  249 +-
 l10n/bs/files_sharing.po                           |   39 +-
 l10n/bs/files_trashbin.po                          |   32 +-
 l10n/bs/lib.po                                     |  263 +-
 l10n/bs/settings.po                                |  450 +-
 l10n/bs/user_ldap.po                               |   93 +-
 l10n/ca/core.po                                    |  303 +-
 l10n/ca/files.po                                   |  295 +-
 l10n/ca/files_encryption.po                        |   18 +-
 l10n/ca/files_external.po                          |  260 +-
 l10n/ca/files_sharing.po                           |   39 +-
 l10n/ca/files_trashbin.po                          |   36 +-
 l10n/ca/lib.po                                     |  275 +-
 l10n/ca/settings.po                                |  463 +-
 l10n/ca/user_ldap.po                               |  101 +-
 l10n/cs_CZ/core.po                                 |  304 +-
 l10n/cs_CZ/files.po                                |  291 +-
 l10n/cs_CZ/files_encryption.po                     |   60 +-
 l10n/cs_CZ/files_external.po                       |  263 +-
 l10n/cs_CZ/files_sharing.po                        |   40 +-
 l10n/cs_CZ/files_trashbin.po                       |   36 +-
 l10n/cs_CZ/lib.po                                  |  278 +-
 l10n/cs_CZ/settings.po                             |  464 +-
 l10n/cs_CZ/user_ldap.po                            |  100 +-
 l10n/cy_GB/core.po                                 |  294 +-
 l10n/cy_GB/files.po                                |  280 +-
 l10n/cy_GB/files_encryption.po                     |   18 +-
 l10n/cy_GB/files_external.po                       |  247 +-
 l10n/cy_GB/files_sharing.po                        |   37 +-
 l10n/cy_GB/files_trashbin.po                       |   36 +-
 l10n/cy_GB/lib.po                                  |  273 +-
 l10n/cy_GB/settings.po                             |  454 +-
 l10n/cy_GB/user_ldap.po                            |   93 +-
 l10n/da/core.po                                    |  300 +-
 l10n/da/files.po                                   |  291 +-
 l10n/da/files_encryption.po                        |   20 +-
 l10n/da/files_external.po                          |  261 +-
 l10n/da/files_sharing.po                           |   38 +-
 l10n/da/files_trashbin.po                          |   36 +-
 l10n/da/lib.po                                     |  275 +-
 l10n/da/settings.po                                |  460 +-
 l10n/da/user_ldap.po                               |   95 +-
 l10n/de/core.po                                    |  306 +-
 l10n/de/files.po                                   |  294 +-
 l10n/de/files_encryption.po                        |   19 +-
 l10n/de/files_external.po                          |  261 +-
 l10n/de/files_sharing.po                           |   40 +-
 l10n/de/files_trashbin.po                          |   36 +-
 l10n/de/lib.po                                     |  277 +-
 l10n/de/settings.po                                |  468 +-
 l10n/de/user_ldap.po                               |  105 +-
 l10n/de_AT/core.po                                 |  348 +-
 l10n/de_AT/files.po                                |  278 +-
 l10n/de_AT/files_encryption.po                     |   16 +-
 l10n/de_AT/files_external.po                       |  251 +-
 l10n/de_AT/files_sharing.po                        |   43 +-
 l10n/de_AT/files_trashbin.po                       |   34 +-
 l10n/de_AT/lib.po                                  |  267 +-
 l10n/de_AT/settings.po                             |  462 +-
 l10n/de_AT/user_ldap.po                            |  105 +-
 l10n/de_CH/core.po                                 |  302 +-
 l10n/de_CH/files.po                                |  286 +-
 l10n/de_CH/files_encryption.po                     |   20 +-
 l10n/de_CH/files_external.po                       |  259 +-
 l10n/de_CH/files_sharing.po                        |   37 +-
 l10n/de_CH/files_trashbin.po                       |   36 +-
 l10n/de_CH/lib.po                                  |  275 +-
 l10n/de_CH/settings.po                             |  460 +-
 l10n/de_CH/user_ldap.po                            |   99 +-
 l10n/de_DE/core.po                                 |  313 +-
 l10n/de_DE/files.po                                |  298 +-
 l10n/de_DE/files_encryption.po                     |   21 +-
 l10n/de_DE/files_external.po                       |  261 +-
 l10n/de_DE/files_sharing.po                        |   39 +-
 l10n/de_DE/files_trashbin.po                       |   36 +-
 l10n/de_DE/lib.po                                  |  282 +-
 l10n/de_DE/settings.po                             |  479 +-
 l10n/de_DE/user_ldap.po                            |  105 +-
 l10n/el/core.po                                    |  314 +-
 l10n/el/files.po                                   |  295 +-
 l10n/el/files_encryption.po                        |   19 +-
 l10n/el/files_external.po                          |  261 +-
 l10n/el/files_sharing.po                           |   38 +-
 l10n/el/files_trashbin.po                          |   36 +-
 l10n/el/lib.po                                     |  282 +-
 l10n/el/settings.po                                |  504 +-
 l10n/el/user_ldap.po                               |  108 +-
 l10n/en at pirate/core.po                             |  292 +-
 l10n/en at pirate/files.po                            |  270 +-
 l10n/en at pirate/files_encryption.po                 |   16 +-
 l10n/en at pirate/files_external.po                   |  249 +-
 l10n/en at pirate/files_sharing.po                    |   35 +-
 l10n/en at pirate/files_trashbin.po                   |   32 +-
 l10n/en at pirate/lib.po                              |  263 +-
 l10n/en at pirate/settings.po                         |  448 +-
 l10n/en at pirate/user_ldap.po                        |   99 +-
 l10n/en_GB/core.po                                 |  300 +-
 l10n/en_GB/files.po                                |  290 +-
 l10n/en_GB/files_encryption.po                     |   18 +-
 l10n/en_GB/files_external.po                       |  259 +-
 l10n/en_GB/files_sharing.po                        |   39 +-
 l10n/en_GB/files_trashbin.po                       |   36 +-
 l10n/en_GB/lib.po                                  |  275 +-
 l10n/en_GB/settings.po                             |  460 +-
 l10n/en_GB/user_ldap.po                            |  103 +-
 l10n/en_NZ/core.po                                 |  805 ++
 l10n/en_NZ/files.po                                |  405 +
 l10n/en_NZ/files_encryption.po                     |  201 +
 l10n/en_NZ/files_external.po                       |  292 +
 l10n/en_NZ/files_sharing.po                        |   71 +
 l10n/en_NZ/files_trashbin.po                       |   64 +
 l10n/en_NZ/files_versions.po                       |   43 +
 l10n/en_NZ/lib.po                                  |  470 +
 l10n/en_NZ/settings.po                             |  858 ++
 l10n/en_NZ/user_ldap.po                            |  534 ++
 l10n/en_NZ/user_webdavauth.po                      |   33 +
 l10n/eo/core.po                                    |  364 +-
 l10n/eo/files.po                                   |  288 +-
 l10n/eo/files_encryption.po                        |   18 +-
 l10n/eo/files_external.po                          |  253 +-
 l10n/eo/files_sharing.po                           |   37 +-
 l10n/eo/files_trashbin.po                          |   36 +-
 l10n/eo/lib.po                                     |  285 +-
 l10n/eo/settings.po                                |  458 +-
 l10n/eo/user_ldap.po                               |   95 +-
 l10n/es/core.po                                    |  310 +-
 l10n/es/files.po                                   |  296 +-
 l10n/es/files_encryption.po                        |   20 +-
 l10n/es/files_external.po                          |  261 +-
 l10n/es/files_sharing.po                           |   39 +-
 l10n/es/files_trashbin.po                          |   36 +-
 l10n/es/lib.po                                     |  279 +-
 l10n/es/settings.po                                |  467 +-
 l10n/es/user_ldap.po                               |  107 +-
 l10n/es_AR/core.po                                 |  381 +-
 l10n/es_AR/files.po                                |  322 +-
 l10n/es_AR/files_encryption.po                     |   79 +-
 l10n/es_AR/files_external.po                       |  259 +-
 l10n/es_AR/files_sharing.po                        |   42 +-
 l10n/es_AR/files_trashbin.po                       |   36 +-
 l10n/es_AR/lib.po                                  |  276 +-
 l10n/es_AR/settings.po                             |  529 +-
 l10n/es_AR/user_ldap.po                            |  159 +-
 l10n/es_CL/core.po                                 |  367 +-
 l10n/es_CL/files.po                                |  280 +-
 l10n/es_CL/files_encryption.po                     |   16 +-
 l10n/es_CL/files_external.po                       |  249 +-
 l10n/es_CL/files_sharing.po                        |   37 +-
 l10n/es_CL/files_trashbin.po                       |   36 +-
 l10n/es_CL/lib.po                                  |  273 +-
 l10n/es_CL/settings.po                             |  452 +-
 l10n/es_CL/user_ldap.po                            |   95 +-
 l10n/es_CR/core.po                                 |  805 ++
 l10n/es_CR/files.po                                |  405 +
 l10n/es_CR/files_encryption.po                     |  201 +
 l10n/es_CR/files_external.po                       |  292 +
 l10n/es_CR/files_sharing.po                        |   71 +
 l10n/es_CR/files_trashbin.po                       |   64 +
 l10n/es_CR/files_versions.po                       |   43 +
 l10n/es_CR/lib.po                                  |  470 +
 l10n/es_CR/settings.po                             |  858 ++
 l10n/es_CR/user_ldap.po                            |  534 ++
 l10n/es_CR/user_webdavauth.po                      |   33 +
 l10n/es_MX/core.po                                 |  298 +-
 l10n/es_MX/files.po                                |  288 +-
 l10n/es_MX/files_encryption.po                     |   18 +-
 l10n/es_MX/files_external.po                       |  259 +-
 l10n/es_MX/files_sharing.po                        |   37 +-
 l10n/es_MX/files_trashbin.po                       |   36 +-
 l10n/es_MX/lib.po                                  |  273 +-
 l10n/es_MX/settings.po                             |  456 +-
 l10n/es_MX/user_ldap.po                            |  101 +-
 l10n/et_EE/core.po                                 |  300 +-
 l10n/et_EE/files.po                                |  288 +-
 l10n/et_EE/files_encryption.po                     |   62 +-
 l10n/et_EE/files_external.po                       |  260 +-
 l10n/et_EE/files_sharing.po                        |   39 +-
 l10n/et_EE/files_trashbin.po                       |   36 +-
 l10n/et_EE/lib.po                                  |  275 +-
 l10n/et_EE/settings.po                             |  460 +-
 l10n/et_EE/user_ldap.po                            |  103 +-
 l10n/eu/core.po                                    |  298 +-
 l10n/eu/files.po                                   |  294 +-
 l10n/eu/files_encryption.po                        |   18 +-
 l10n/eu/files_external.po                          |  260 +-
 l10n/eu/files_sharing.po                           |   37 +-
 l10n/eu/files_trashbin.po                          |   36 +-
 l10n/eu/lib.po                                     |  273 +-
 l10n/eu/settings.po                                |  458 +-
 l10n/eu/user_ldap.po                               |  101 +-
 l10n/eu_ES/core.po                                 |  636 +-
 l10n/eu_ES/files.po                                |  354 +-
 l10n/eu_ES/files_encryption.po                     |  191 +-
 l10n/eu_ES/files_external.po                       |  258 +-
 l10n/eu_ES/files_sharing.po                        |   59 +-
 l10n/eu_ES/files_trashbin.po                       |   64 +
 l10n/eu_ES/files_versions.po                       |   33 +-
 l10n/eu_ES/lib.po                                  |  437 +-
 l10n/eu_ES/settings.po                             |  759 +-
 l10n/eu_ES/user_ldap.po                            |  500 +-
 l10n/eu_ES/user_webdavauth.po                      |   33 +
 l10n/fa/core.po                                    |  298 +-
 l10n/fa/files.po                                   |  285 +-
 l10n/fa/files_encryption.po                        |   18 +-
 l10n/fa/files_external.po                          |  259 +-
 l10n/fa/files_sharing.po                           |   37 +-
 l10n/fa/files_trashbin.po                          |   36 +-
 l10n/fa/lib.po                                     |  273 +-
 l10n/fa/settings.po                                |  508 +-
 l10n/fa/user_ldap.po                               |   95 +-
 l10n/fi_FI/core.po                                 |  323 +-
 l10n/fi_FI/files.po                                |  296 +-
 l10n/fi_FI/files_encryption.po                     |   21 +-
 l10n/fi_FI/files_external.po                       |  260 +-
 l10n/fi_FI/files_sharing.po                        |   39 +-
 l10n/fi_FI/files_trashbin.po                       |   36 +-
 l10n/fi_FI/lib.po                                  |  281 +-
 l10n/fi_FI/settings.po                             |  470 +-
 l10n/fi_FI/user_ldap.po                            |   95 +-
 l10n/fr/core.po                                    |  300 +-
 l10n/fr/files.po                                   |  293 +-
 l10n/fr/files_encryption.po                        |   18 +-
 l10n/fr/files_external.po                          |  262 +-
 l10n/fr/files_sharing.po                           |   39 +-
 l10n/fr/files_trashbin.po                          |   36 +-
 l10n/fr/lib.po                                     |  276 +-
 l10n/fr/settings.po                                |  476 +-
 l10n/fr/user_ldap.po                               |  102 +-
 l10n/fr_CA/core.po                                 |  292 +-
 l10n/fr_CA/files.po                                |  270 +-
 l10n/fr_CA/files_encryption.po                     |   16 +-
 l10n/fr_CA/files_external.po                       |  247 +-
 l10n/fr_CA/files_sharing.po                        |   35 +-
 l10n/fr_CA/files_trashbin.po                       |   18 +-
 l10n/fr_CA/lib.po                                  |  263 +-
 l10n/fr_CA/settings.po                             |  448 +-
 l10n/fr_CA/user_ldap.po                            |   99 +-
 l10n/gl/core.po                                    |  301 +-
 l10n/gl/files.po                                   |  287 +-
 l10n/gl/files_encryption.po                        |   18 +-
 l10n/gl/files_external.po                          |  260 +-
 l10n/gl/files_sharing.po                           |   38 +-
 l10n/gl/files_trashbin.po                          |   36 +-
 l10n/gl/lib.po                                     |  276 +-
 l10n/gl/settings.po                                |  455 +-
 l10n/gl/user_ldap.po                               |  102 +-
 l10n/he/core.po                                    |  296 +-
 l10n/he/files.po                                   |  278 +-
 l10n/he/files_encryption.po                        |   18 +-
 l10n/he/files_external.po                          |  253 +-
 l10n/he/files_sharing.po                           |   37 +-
 l10n/he/files_trashbin.po                          |   39 +-
 l10n/he/lib.po                                     |  263 +-
 l10n/he/settings.po                                |  456 +-
 l10n/he/user_ldap.po                               |   93 +-
 l10n/hi/core.po                                    |  294 +-
 l10n/hi/files.po                                   |  272 +-
 l10n/hi/files_encryption.po                        |   16 +-
 l10n/hi/files_external.po                          |  249 +-
 l10n/hi/files_sharing.po                           |   35 +-
 l10n/hi/files_trashbin.po                          |   38 +-
 l10n/hi/lib.po                                     |  263 +-
 l10n/hi/settings.po                                |  450 +-
 l10n/hi/user_ldap.po                               |   93 +-
 l10n/hi_IN/core.po                                 |  805 ++
 l10n/hi_IN/files.po                                |  405 +
 l10n/hi_IN/files_encryption.po                     |  201 +
 l10n/hi_IN/files_external.po                       |  292 +
 l10n/hi_IN/files_sharing.po                        |   71 +
 l10n/hi_IN/files_trashbin.po                       |   64 +
 l10n/hi_IN/files_versions.po                       |   43 +
 l10n/hi_IN/lib.po                                  |  470 +
 l10n/hi_IN/settings.po                             |  858 ++
 l10n/hi_IN/user_ldap.po                            |  534 ++
 l10n/hi_IN/user_webdavauth.po                      |   33 +
 l10n/hr/core.po                                    |  294 +-
 l10n/hr/files.po                                   |  274 +-
 l10n/hr/files_encryption.po                        |   18 +-
 l10n/hr/files_external.po                          |  247 +-
 l10n/hr/files_sharing.po                           |   35 +-
 l10n/hr/files_trashbin.po                          |   36 +-
 l10n/hr/lib.po                                     |  263 +-
 l10n/hr/settings.po                                |  456 +-
 l10n/hr/user_ldap.po                               |   93 +-
 l10n/hu_HU/core.po                                 |  305 +-
 l10n/hu_HU/files.po                                |  288 +-
 l10n/hu_HU/files_encryption.po                     |   61 +-
 l10n/hu_HU/files_external.po                       |  259 +-
 l10n/hu_HU/files_sharing.po                        |   37 +-
 l10n/hu_HU/files_trashbin.po                       |   36 +-
 l10n/hu_HU/lib.po                                  |  275 +-
 l10n/hu_HU/settings.po                             |  460 +-
 l10n/hu_HU/user_ldap.po                            |  101 +-
 l10n/hy/core.po                                    |  292 +-
 l10n/hy/files.po                                   |  270 +-
 l10n/hy/files_encryption.po                        |   16 +-
 l10n/hy/files_external.po                          |  247 +-
 l10n/hy/files_sharing.po                           |   39 +-
 l10n/hy/files_trashbin.po                          |   30 +-
 l10n/hy/lib.po                                     |  263 +-
 l10n/hy/settings.po                                |  448 +-
 l10n/hy/user_ldap.po                               |   93 +-
 l10n/ia/core.po                                    |  455 +-
 l10n/ia/files.po                                   |  274 +-
 l10n/ia/files_encryption.po                        |   16 +-
 l10n/ia/files_external.po                          |  249 +-
 l10n/ia/files_sharing.po                           |   35 +-
 l10n/ia/files_trashbin.po                          |   36 +-
 l10n/ia/lib.po                                     |  281 +-
 l10n/ia/settings.po                                |  452 +-
 l10n/ia/user_ldap.po                               |   95 +-
 l10n/id/core.po                                    |  297 +-
 l10n/id/files.po                                   |  286 +-
 l10n/id/files_encryption.po                        |   18 +-
 l10n/id/files_external.po                          |  260 +-
 l10n/id/files_sharing.po                           |   37 +-
 l10n/id/files_trashbin.po                          |   34 +-
 l10n/id/lib.po                                     |  273 +-
 l10n/id/settings.po                                |  456 +-
 l10n/id/user_ldap.po                               |   93 +-
 l10n/id/user_webdavauth.po                         |   13 +-
 l10n/is/core.po                                    |  294 +-
 l10n/is/files.po                                   |  280 +-
 l10n/is/files_encryption.po                        |   18 +-
 l10n/is/files_external.po                          |  257 +-
 l10n/is/files_sharing.po                           |   37 +-
 l10n/is/files_trashbin.po                          |   36 +-
 l10n/is/lib.po                                     |  263 +-
 l10n/is/settings.po                                |  456 +-
 l10n/is/user_ldap.po                               |   93 +-
 l10n/it/core.po                                    |  304 +-
 l10n/it/files.po                                   |  291 +-
 l10n/it/files_encryption.po                        |   20 +-
 l10n/it/files_external.po                          |  261 +-
 l10n/it/files_sharing.po                           |   37 +-
 l10n/it/files_trashbin.po                          |   36 +-
 l10n/it/lib.po                                     |  280 +-
 l10n/it/settings.po                                |  462 +-
 l10n/it/user_ldap.po                               |  104 +-
 l10n/ja/core.po                                    |  807 ++
 l10n/ja/files.po                                   |  410 +
 l10n/ja/files_encryption.po                        |  205 +
 l10n/ja/files_external.po                          |  295 +
 l10n/ja/files_sharing.po                           |   74 +
 l10n/ja/files_trashbin.po                          |   68 +
 l10n/ja/files_versions.po                          |   44 +
 l10n/ja/lib.po                                     |  472 +
 l10n/ja/settings.po                                |  864 ++
 l10n/ja/user_ldap.po                               |  537 ++
 l10n/ja/user_webdavauth.po                         |   37 +
 l10n/ja_JP/core.po                                 |  775 --
 l10n/ja_JP/files.po                                |  416 -
 l10n/ja_JP/files_encryption.po                     |  204 -
 l10n/ja_JP/files_external.po                       |  123 -
 l10n/ja_JP/files_sharing.po                        |   86 -
 l10n/ja_JP/files_trashbin.po                       |   63 -
 l10n/ja_JP/files_versions.po                       |   44 -
 l10n/ja_JP/lib.po                                  |  333 -
 l10n/ja_JP/settings.po                             |  672 --
 l10n/ja_JP/user_ldap.po                            |  514 -
 l10n/ja_JP/user_webdavauth.po                      |   37 -
 l10n/jv/core.po                                    |  805 ++
 l10n/jv/files.po                                   |  405 +
 l10n/jv/files_encryption.po                        |  201 +
 l10n/jv/files_external.po                          |  292 +
 l10n/jv/files_sharing.po                           |   71 +
 l10n/jv/files_trashbin.po                          |   64 +
 l10n/jv/files_versions.po                          |   43 +
 l10n/jv/lib.po                                     |  470 +
 l10n/jv/settings.po                                |  858 ++
 l10n/jv/user_ldap.po                               |  534 ++
 l10n/jv/user_webdavauth.po                         |   33 +
 l10n/ka_GE/core.po                                 |  294 +-
 l10n/ka_GE/files.po                                |  280 +-
 l10n/ka_GE/files_encryption.po                     |   18 +-
 l10n/ka_GE/files_external.po                       |  259 +-
 l10n/ka_GE/files_sharing.po                        |   37 +-
 l10n/ka_GE/files_trashbin.po                       |   36 +-
 l10n/ka_GE/lib.po                                  |  273 +-
 l10n/ka_GE/settings.po                             |  456 +-
 l10n/ka_GE/user_ldap.po                            |   95 +-
 l10n/km/core.po                                    |  453 +-
 l10n/km/files.po                                   |  282 +-
 l10n/km/files_encryption.po                        |   73 +-
 l10n/km/files_external.po                          |  255 +-
 l10n/km/files_sharing.po                           |   44 +-
 l10n/km/files_trashbin.po                          |   40 +-
 l10n/km/files_versions.po                          |   31 +-
 l10n/km/lib.po                                     |  342 +-
 l10n/km/settings.po                                |  592 +-
 l10n/km/user_ldap.po                               |  128 +-
 l10n/km/user_webdavauth.po                         |   15 +-
 l10n/kn/core.po                                    |  292 +-
 l10n/kn/files.po                                   |  270 +-
 l10n/kn/files_encryption.po                        |   16 +-
 l10n/kn/files_external.po                          |  249 +-
 l10n/kn/files_sharing.po                           |   39 +-
 l10n/kn/files_trashbin.po                          |   32 +-
 l10n/kn/lib.po                                     |  263 +-
 l10n/kn/settings.po                                |  448 +-
 l10n/kn/user_ldap.po                               |   99 +-
 l10n/ko/core.po                                    |  299 +-
 l10n/ko/files.po                                   |  288 +-
 l10n/ko/files_encryption.po                        |   18 +-
 l10n/ko/files_external.po                          |  260 +-
 l10n/ko/files_sharing.po                           |   37 +-
 l10n/ko/files_trashbin.po                          |   36 +-
 l10n/ko/lib.po                                     |  275 +-
 l10n/ko/settings.po                                |  459 +-
 l10n/ko/user_ldap.po                               |  101 +-
 l10n/ku_IQ/core.po                                 |  300 +-
 l10n/ku_IQ/files.po                                |  274 +-
 l10n/ku_IQ/files_encryption.po                     |   18 +-
 l10n/ku_IQ/files_external.po                       |  249 +-
 l10n/ku_IQ/files_sharing.po                        |   35 +-
 l10n/ku_IQ/files_trashbin.po                       |   38 +-
 l10n/ku_IQ/lib.po                                  |  265 +-
 l10n/ku_IQ/settings.po                             |  454 +-
 l10n/ku_IQ/user_ldap.po                            |   93 +-
 l10n/lb/core.po                                    |  296 +-
 l10n/lb/files.po                                   |  274 +-
 l10n/lb/files_encryption.po                        |   18 +-
 l10n/lb/files_external.po                          |  247 +-
 l10n/lb/files_sharing.po                           |   37 +-
 l10n/lb/files_trashbin.po                          |   36 +-
 l10n/lb/lib.po                                     |  263 +-
 l10n/lb/settings.po                                |  456 +-
 l10n/lb/user_ldap.po                               |   93 +-
 l10n/lt_LT/core.po                                 |  316 +-
 l10n/lt_LT/files.po                                |  296 +-
 l10n/lt_LT/files_encryption.po                     |   24 +-
 l10n/lt_LT/files_external.po                       |  259 +-
 l10n/lt_LT/files_sharing.po                        |   37 +-
 l10n/lt_LT/files_trashbin.po                       |   36 +-
 l10n/lt_LT/lib.po                                  |  273 +-
 l10n/lt_LT/settings.po                             |  462 +-
 l10n/lt_LT/user_ldap.po                            |   93 +-
 l10n/lv/core.po                                    |  296 +-
 l10n/lv/files.po                                   |  280 +-
 l10n/lv/files_encryption.po                        |   18 +-
 l10n/lv/files_external.po                          |  259 +-
 l10n/lv/files_sharing.po                           |   37 +-
 l10n/lv/files_trashbin.po                          |   36 +-
 l10n/lv/lib.po                                     |  273 +-
 l10n/lv/settings.po                                |  456 +-
 l10n/lv/user_ldap.po                               |   95 +-
 l10n/mk/core.po                                    |  294 +-
 l10n/mk/files.po                                   |  286 +-
 l10n/mk/files_encryption.po                        |   18 +-
 l10n/mk/files_external.po                          |  257 +-
 l10n/mk/files_sharing.po                           |   37 +-
 l10n/mk/files_trashbin.po                          |   36 +-
 l10n/mk/lib.po                                     |  263 +-
 l10n/mk/settings.po                                |  458 +-
 l10n/mk/user_ldap.po                               |   93 +-
 l10n/ml/core.po                                    |  805 ++
 l10n/ml/files.po                                   |  405 +
 l10n/ml/files_encryption.po                        |  201 +
 l10n/ml/files_external.po                          |  292 +
 l10n/ml/files_sharing.po                           |   71 +
 l10n/ml/files_trashbin.po                          |   64 +
 l10n/ml/files_versions.po                          |   43 +
 l10n/ml/lib.po                                     |  470 +
 l10n/ml/settings.po                                |  858 ++
 l10n/ml/user_ldap.po                               |  534 ++
 l10n/ml/user_webdavauth.po                         |   33 +
 l10n/ml_IN/core.po                                 |  292 +-
 l10n/ml_IN/files.po                                |  270 +-
 l10n/ml_IN/files_encryption.po                     |   16 +-
 l10n/ml_IN/files_external.po                       |  249 +-
 l10n/ml_IN/files_sharing.po                        |   39 +-
 l10n/ml_IN/files_trashbin.po                       |   32 +-
 l10n/ml_IN/lib.po                                  |  263 +-
 l10n/ml_IN/settings.po                             |  448 +-
 l10n/ml_IN/user_ldap.po                            |   99 +-
 l10n/mn/core.po                                    |  805 ++
 l10n/mn/files.po                                   |  405 +
 l10n/mn/files_encryption.po                        |  201 +
 l10n/mn/files_external.po                          |  292 +
 l10n/mn/files_sharing.po                           |   71 +
 l10n/mn/files_trashbin.po                          |   64 +
 l10n/mn/files_versions.po                          |   43 +
 l10n/mn/lib.po                                     |  470 +
 l10n/mn/settings.po                                |  858 ++
 l10n/mn/user_ldap.po                               |  534 ++
 l10n/mn/user_webdavauth.po                         |   33 +
 l10n/ms_MY/core.po                                 |  294 +-
 l10n/ms_MY/files.po                                |  272 +-
 l10n/ms_MY/files_encryption.po                     |   18 +-
 l10n/ms_MY/files_external.po                       |  247 +-
 l10n/ms_MY/files_sharing.po                        |   35 +-
 l10n/ms_MY/files_trashbin.po                       |   36 +-
 l10n/ms_MY/lib.po                                  |  263 +-
 l10n/ms_MY/settings.po                             |  456 +-
 l10n/ms_MY/user_ldap.po                            |   93 +-
 l10n/my_MM/core.po                                 |  294 +-
 l10n/my_MM/files.po                                |  270 +-
 l10n/my_MM/files_encryption.po                     |   16 +-
 l10n/my_MM/files_external.po                       |  249 +-
 l10n/my_MM/files_sharing.po                        |   35 +-
 l10n/my_MM/files_trashbin.po                       |   32 +-
 l10n/my_MM/lib.po                                  |  263 +-
 l10n/my_MM/settings.po                             |  450 +-
 l10n/my_MM/user_ldap.po                            |   99 +-
 l10n/nb_NO/core.po                                 |  432 +-
 l10n/nb_NO/files.po                                |  325 +-
 l10n/nb_NO/files_encryption.po                     |   95 +-
 l10n/nb_NO/files_external.po                       |  260 +-
 l10n/nb_NO/files_sharing.po                        |   54 +-
 l10n/nb_NO/files_trashbin.po                       |   39 +-
 l10n/nb_NO/files_versions.po                       |   28 +-
 l10n/nb_NO/lib.po                                  |  323 +-
 l10n/nb_NO/settings.po                             |  548 +-
 l10n/nb_NO/user_ldap.po                            |  216 +-
 l10n/nb_NO/user_webdavauth.po                      |   13 +-
 l10n/nds/core.po                                   |  292 +-
 l10n/nds/files.po                                  |  270 +-
 l10n/nds/files_encryption.po                       |   16 +-
 l10n/nds/files_external.po                         |  249 +-
 l10n/nds/files_sharing.po                          |   39 +-
 l10n/nds/files_trashbin.po                         |   32 +-
 l10n/nds/lib.po                                    |  263 +-
 l10n/nds/settings.po                               |  448 +-
 l10n/nds/user_ldap.po                              |   99 +-
 l10n/ne/core.po                                    |  292 +-
 l10n/ne/files.po                                   |  270 +-
 l10n/ne/files_encryption.po                        |   16 +-
 l10n/ne/files_external.po                          |  249 +-
 l10n/ne/files_sharing.po                           |   39 +-
 l10n/ne/files_trashbin.po                          |   32 +-
 l10n/ne/lib.po                                     |  263 +-
 l10n/ne/settings.po                                |  448 +-
 l10n/ne/user_ldap.po                               |   99 +-
 l10n/nl/core.po                                    |  300 +-
 l10n/nl/files.po                                   |  288 +-
 l10n/nl/files_encryption.po                        |   18 +-
 l10n/nl/files_external.po                          |  259 +-
 l10n/nl/files_sharing.po                           |   39 +-
 l10n/nl/files_trashbin.po                          |   36 +-
 l10n/nl/lib.po                                     |  275 +-
 l10n/nl/settings.po                                |  458 +-
 l10n/nl/user_ldap.po                               |  101 +-
 l10n/nn_NO/core.po                                 |  299 +-
 l10n/nn_NO/files.po                                |  286 +-
 l10n/nn_NO/files_encryption.po                     |   18 +-
 l10n/nn_NO/files_external.po                       |  249 +-
 l10n/nn_NO/files_sharing.po                        |   37 +-
 l10n/nn_NO/files_trashbin.po                       |   36 +-
 l10n/nn_NO/lib.po                                  |  263 +-
 l10n/nn_NO/settings.po                             |  454 +-
 l10n/nn_NO/user_ldap.po                            |   93 +-
 l10n/nqo/core.po                                   |  292 +-
 l10n/nqo/files.po                                  |  270 +-
 l10n/nqo/files_encryption.po                       |   16 +-
 l10n/nqo/files_external.po                         |  249 +-
 l10n/nqo/files_sharing.po                          |   39 +-
 l10n/nqo/files_trashbin.po                         |   32 +-
 l10n/nqo/lib.po                                    |  263 +-
 l10n/nqo/settings.po                               |  448 +-
 l10n/nqo/user_ldap.po                              |   99 +-
 l10n/oc/core.po                                    |  294 +-
 l10n/oc/files.po                                   |  274 +-
 l10n/oc/files_encryption.po                        |   18 +-
 l10n/oc/files_external.po                          |  247 +-
 l10n/oc/files_sharing.po                           |   35 +-
 l10n/oc/files_trashbin.po                          |   36 +-
 l10n/oc/lib.po                                     |  263 +-
 l10n/oc/settings.po                                |  458 +-
 l10n/oc/user_ldap.po                               |   93 +-
 l10n/or_IN/core.po                                 |  805 ++
 l10n/or_IN/files.po                                |  405 +
 l10n/or_IN/files_encryption.po                     |  201 +
 l10n/or_IN/files_external.po                       |  292 +
 l10n/or_IN/files_sharing.po                        |   71 +
 l10n/or_IN/files_trashbin.po                       |   64 +
 l10n/or_IN/files_versions.po                       |   43 +
 l10n/or_IN/lib.po                                  |  470 +
 l10n/or_IN/settings.po                             |  858 ++
 l10n/or_IN/user_ldap.po                            |  534 ++
 l10n/or_IN/user_webdavauth.po                      |   33 +
 l10n/pa/core.po                                    |  292 +-
 l10n/pa/files.po                                   |  274 +-
 l10n/pa/files_encryption.po                        |   18 +-
 l10n/pa/files_external.po                          |  247 +-
 l10n/pa/files_sharing.po                           |   35 +-
 l10n/pa/files_trashbin.po                          |   36 +-
 l10n/pa/lib.po                                     |  263 +-
 l10n/pa/settings.po                                |  454 +-
 l10n/pa/user_ldap.po                               |   99 +-
 l10n/pl/core.po                                    |  301 +-
 l10n/pl/files.po                                   |  294 +-
 l10n/pl/files_encryption.po                        |   19 +-
 l10n/pl/files_external.po                          |  260 +-
 l10n/pl/files_sharing.po                           |   38 +-
 l10n/pl/files_trashbin.po                          |   36 +-
 l10n/pl/lib.po                                     |  275 +-
 l10n/pl/settings.po                                |  469 +-
 l10n/pl/user_ldap.po                               |  180 +-
 l10n/pl_PL/core.po                                 |  617 --
 l10n/pl_PL/files.po                                |  322 -
 l10n/pl_PL/files_encryption.po                     |  103 -
 l10n/pl_PL/files_external.po                       |  123 -
 l10n/pl_PL/files_sharing.po                        |   48 -
 l10n/pl_PL/files_trashbin.po                       |   84 -
 l10n/pl_PL/files_versions.po                       |   57 -
 l10n/pl_PL/lib.po                                  |  245 -
 l10n/pl_PL/settings.po                             |  496 -
 l10n/pl_PL/user_ldap.po                            |  419 -
 l10n/pl_PL/user_webdavauth.po                      |   33 -
 l10n/pt_BR/core.po                                 |  300 +-
 l10n/pt_BR/files.po                                |  288 +-
 l10n/pt_BR/files_encryption.po                     |   18 +-
 l10n/pt_BR/files_external.po                       |  259 +-
 l10n/pt_BR/files_sharing.po                        |   39 +-
 l10n/pt_BR/files_trashbin.po                       |   36 +-
 l10n/pt_BR/lib.po                                  |  276 +-
 l10n/pt_BR/settings.po                             |  459 +-
 l10n/pt_BR/user_ldap.po                            |  103 +-
 l10n/pt_PT/core.po                                 |  359 +-
 l10n/pt_PT/files.po                                |  319 +-
 l10n/pt_PT/files_encryption.po                     |   68 +-
 l10n/pt_PT/files_external.po                       |  262 +-
 l10n/pt_PT/files_sharing.po                        |   39 +-
 l10n/pt_PT/files_trashbin.po                       |   36 +-
 l10n/pt_PT/lib.po                                  |  275 +-
 l10n/pt_PT/settings.po                             |  459 +-
 l10n/pt_PT/user_ldap.po                            |  172 +-
 l10n/ro/core.po                                    |  296 +-
 l10n/ro/files.po                                   |  374 +-
 l10n/ro/files_encryption.po                        |   49 +-
 l10n/ro/files_external.po                          |  260 +-
 l10n/ro/files_sharing.po                           |   37 +-
 l10n/ro/files_trashbin.po                          |   36 +-
 l10n/ro/lib.po                                     |  265 +-
 l10n/ro/settings.po                                |  499 +-
 l10n/ro/user_ldap.po                               |  142 +-
 l10n/ro/user_webdavauth.po                         |   17 +-
 l10n/ru/core.po                                    |  301 +-
 l10n/ru/files.po                                   |  345 +-
 l10n/ru/files_encryption.po                        |   19 +-
 l10n/ru/files_external.po                          |  260 +-
 l10n/ru/files_sharing.po                           |   44 +-
 l10n/ru/files_trashbin.po                          |   36 +-
 l10n/ru/lib.po                                     |  273 +-
 l10n/ru/settings.po                                |  460 +-
 l10n/ru/user_ldap.po                               |  101 +-
 l10n/si_LK/core.po                                 |  294 +-
 l10n/si_LK/files.po                                |  274 +-
 l10n/si_LK/files_encryption.po                     |   18 +-
 l10n/si_LK/files_external.po                       |  253 +-
 l10n/si_LK/files_sharing.po                        |   37 +-
 l10n/si_LK/files_trashbin.po                       |   36 +-
 l10n/si_LK/lib.po                                  |  263 +-
 l10n/si_LK/settings.po                             |  456 +-
 l10n/si_LK/user_ldap.po                            |   93 +-
 l10n/sk/core.po                                    |  292 +-
 l10n/sk/files.po                                   |  268 +-
 l10n/sk/files_encryption.po                        |   16 +-
 l10n/sk/files_external.po                          |  245 +-
 l10n/sk/files_sharing.po                           |   33 +-
 l10n/sk/files_trashbin.po                          |   16 +-
 l10n/sk/lib.po                                     |  261 +-
 l10n/sk/settings.po                                |  448 +-
 l10n/sk/user_ldap.po                               |   91 +-
 l10n/sk_SK/core.po                                 |  316 +-
 l10n/sk_SK/files.po                                |  294 +-
 l10n/sk_SK/files_encryption.po                     |   60 +-
 l10n/sk_SK/files_external.po                       |  261 +-
 l10n/sk_SK/files_sharing.po                        |   39 +-
 l10n/sk_SK/files_trashbin.po                       |   36 +-
 l10n/sk_SK/lib.po                                  |  275 +-
 l10n/sk_SK/settings.po                             |  474 +-
 l10n/sk_SK/user_ldap.po                            |  123 +-
 l10n/sk_SK/user_webdavauth.po                      |    6 +-
 l10n/sl/core.po                                    |  300 +-
 l10n/sl/files.po                                   |  288 +-
 l10n/sl/files_encryption.po                        |   18 +-
 l10n/sl/files_external.po                          |  259 +-
 l10n/sl/files_sharing.po                           |   39 +-
 l10n/sl/files_trashbin.po                          |   34 +-
 l10n/sl/lib.po                                     |  275 +-
 l10n/sl/settings.po                                |  460 +-
 l10n/sl/user_ldap.po                               |  103 +-
 l10n/sq/core.po                                    |  296 +-
 l10n/sq/files.po                                   |  289 +-
 l10n/sq/files_encryption.po                        |   18 +-
 l10n/sq/files_external.po                          |  247 +-
 l10n/sq/files_sharing.po                           |   42 +-
 l10n/sq/files_trashbin.po                          |   36 +-
 l10n/sq/files_versions.po                          |   29 +-
 l10n/sq/lib.po                                     |  273 +-
 l10n/sq/settings.po                                |  458 +-
 l10n/sq/user_ldap.po                               |   95 +-
 l10n/sr/core.po                                    |  294 +-
 l10n/sr/files.po                                   |  280 +-
 l10n/sr/files_encryption.po                        |   18 +-
 l10n/sr/files_external.po                          |  247 +-
 l10n/sr/files_sharing.po                           |   35 +-
 l10n/sr/files_trashbin.po                          |   36 +-
 l10n/sr/lib.po                                     |  263 +-
 l10n/sr/settings.po                                |  456 +-
 l10n/sr/user_ldap.po                               |   95 +-
 l10n/sr at latin/core.po                              |  303 +-
 l10n/sr at latin/files.po                             |  272 +-
 l10n/sr at latin/files_encryption.po                  |   16 +-
 l10n/sr at latin/files_external.po                    |  247 +-
 l10n/sr at latin/files_sharing.po                     |   35 +-
 l10n/sr at latin/files_trashbin.po                    |   36 +-
 l10n/sr at latin/lib.po                               |  265 +-
 l10n/sr at latin/settings.po                          |  450 +-
 l10n/sr at latin/user_ldap.po                         |   93 +-
 l10n/su/core.po                                    |  800 ++
 l10n/su/files.po                                   |  402 +
 l10n/su/files_encryption.po                        |  201 +
 l10n/su/files_external.po                          |  292 +
 l10n/su/files_sharing.po                           |   71 +
 l10n/su/files_trashbin.po                          |   64 +
 l10n/su/files_versions.po                          |   43 +
 l10n/su/lib.po                                     |  466 +
 l10n/su/settings.po                                |  858 ++
 l10n/su/user_ldap.po                               |  532 ++
 l10n/su/user_webdavauth.po                         |   33 +
 l10n/sv/core.po                                    |  312 +-
 l10n/sv/files.po                                   |  296 +-
 l10n/sv/files_encryption.po                        |   63 +-
 l10n/sv/files_external.po                          |  262 +-
 l10n/sv/files_sharing.po                           |   38 +-
 l10n/sv/files_trashbin.po                          |   36 +-
 l10n/sv/lib.po                                     |  276 +-
 l10n/sv/settings.po                                |  490 +-
 l10n/sv/user_ldap.po                               |  108 +-
 l10n/sw_KE/core.po                                 |  292 +-
 l10n/sw_KE/files.po                                |  270 +-
 l10n/sw_KE/files_encryption.po                     |   16 +-
 l10n/sw_KE/files_external.po                       |  249 +-
 l10n/sw_KE/files_sharing.po                        |   39 +-
 l10n/sw_KE/files_trashbin.po                       |   32 +-
 l10n/sw_KE/lib.po                                  |  263 +-
 l10n/sw_KE/settings.po                             |  448 +-
 l10n/sw_KE/user_ldap.po                            |   99 +-
 l10n/ta_IN/core.po                                 |  805 ++
 l10n/ta_IN/files.po                                |  405 +
 l10n/ta_IN/files_encryption.po                     |  201 +
 l10n/ta_IN/files_external.po                       |  292 +
 l10n/ta_IN/files_sharing.po                        |   71 +
 l10n/ta_IN/files_trashbin.po                       |   64 +
 l10n/ta_IN/files_versions.po                       |   43 +
 l10n/ta_IN/lib.po                                  |  470 +
 l10n/ta_IN/settings.po                             |  858 ++
 l10n/ta_IN/user_ldap.po                            |  534 ++
 l10n/ta_IN/user_webdavauth.po                      |   33 +
 l10n/ta_LK/core.po                                 |  294 +-
 l10n/ta_LK/files.po                                |  276 +-
 l10n/ta_LK/files_encryption.po                     |   18 +-
 l10n/ta_LK/files_external.po                       |  253 +-
 l10n/ta_LK/files_sharing.po                        |   37 +-
 l10n/ta_LK/files_trashbin.po                       |   36 +-
 l10n/ta_LK/lib.po                                  |  263 +-
 l10n/ta_LK/settings.po                             |  458 +-
 l10n/ta_LK/user_ldap.po                            |   95 +-
 l10n/te/core.po                                    |  315 +-
 l10n/te/files.po                                   |  270 +-
 l10n/te/files_encryption.po                        |   16 +-
 l10n/te/files_external.po                          |  247 +-
 l10n/te/files_sharing.po                           |   35 +-
 l10n/te/files_trashbin.po                          |   36 +-
 l10n/te/lib.po                                     |  273 +-
 l10n/te/settings.po                                |  450 +-
 l10n/te/user_ldap.po                               |   95 +-
 l10n/templates/core.pot                            |  287 +-
 l10n/templates/files.pot                           |  266 +-
 l10n/templates/files_encryption.pot                |   54 +-
 l10n/templates/files_external.pot                  |  243 +-
 l10n/templates/files_sharing.pot                   |   31 +-
 l10n/templates/files_trashbin.pot                  |   38 +-
 l10n/templates/files_versions.pot                  |   12 +-
 l10n/templates/lib.pot                             |  261 +-
 l10n/templates/private.pot                         |  243 +-
 l10n/templates/settings.pot                        |  446 +-
 l10n/templates/user_ldap.pot                       |   89 +-
 l10n/templates/user_webdavauth.pot                 |    8 +-
 l10n/th_TH/core.po                                 |  294 +-
 l10n/th_TH/files.po                                |  282 +-
 l10n/th_TH/files_encryption.po                     |   18 +-
 l10n/th_TH/files_external.po                       |  257 +-
 l10n/th_TH/files_sharing.po                        |   37 +-
 l10n/th_TH/files_trashbin.po                       |   36 +-
 l10n/th_TH/lib.po                                  |  263 +-
 l10n/th_TH/settings.po                             |  456 +-
 l10n/th_TH/user_ldap.po                            |   95 +-
 l10n/tr/core.po                                    |  348 +-
 l10n/tr/files.po                                   |  291 +-
 l10n/tr/files_encryption.po                        |   18 +-
 l10n/tr/files_external.po                          |  261 +-
 l10n/tr/files_sharing.po                           |   39 +-
 l10n/tr/files_trashbin.po                          |   38 +-
 l10n/tr/lib.po                                     |  297 +-
 l10n/tr/settings.po                                |  470 +-
 l10n/tr/user_ldap.po                               |  135 +-
 l10n/tzm/core.po                                   |  292 +-
 l10n/tzm/files.po                                  |  270 +-
 l10n/tzm/files_encryption.po                       |   16 +-
 l10n/tzm/files_external.po                         |  247 +-
 l10n/tzm/files_sharing.po                          |   37 +-
 l10n/tzm/files_trashbin.po                         |   30 +-
 l10n/tzm/lib.po                                    |  263 +-
 l10n/tzm/settings.po                               |  448 +-
 l10n/tzm/user_ldap.po                              |   99 +-
 l10n/ug/core.po                                    |  294 +-
 l10n/ug/files.po                                   |  276 +-
 l10n/ug/files_encryption.po                        |   18 +-
 l10n/ug/files_external.po                          |  247 +-
 l10n/ug/files_sharing.po                           |   35 +-
 l10n/ug/files_trashbin.po                          |   36 +-
 l10n/ug/lib.po                                     |  263 +-
 l10n/ug/settings.po                                |  456 +-
 l10n/ug/user_ldap.po                               |   93 +-
 l10n/uk/core.po                                    |  299 +-
 l10n/uk/files.po                                   |  284 +-
 l10n/uk/files_encryption.po                        |   18 +-
 l10n/uk/files_external.po                          |  259 +-
 l10n/uk/files_sharing.po                           |   37 +-
 l10n/uk/files_trashbin.po                          |   36 +-
 l10n/uk/lib.po                                     |  273 +-
 l10n/uk/settings.po                                |  458 +-
 l10n/uk/user_ldap.po                               |   95 +-
 l10n/ur/core.po                                    |  290 +-
 l10n/ur/files.po                                   |  268 +-
 l10n/ur/files_encryption.po                        |   14 +-
 l10n/ur/files_external.po                          |  245 +-
 l10n/ur/files_sharing.po                           |   33 +-
 l10n/ur/files_trashbin.po                          |   16 +-
 l10n/ur/lib.po                                     |  261 +-
 l10n/ur/settings.po                                |  446 +-
 l10n/ur/user_ldap.po                               |   91 +-
 l10n/ur_PK/core.po                                 |  294 +-
 l10n/ur_PK/files.po                                |  270 +-
 l10n/ur_PK/files_encryption.po                     |   16 +-
 l10n/ur_PK/files_external.po                       |  249 +-
 l10n/ur_PK/files_sharing.po                        |   35 +-
 l10n/ur_PK/files_trashbin.po                       |   38 +-
 l10n/ur_PK/lib.po                                  |  263 +-
 l10n/ur_PK/settings.po                             |  450 +-
 l10n/ur_PK/user_ldap.po                            |   99 +-
 l10n/uz/core.po                                    |  292 +-
 l10n/uz/files.po                                   |  270 +-
 l10n/uz/files_encryption.po                        |   16 +-
 l10n/uz/files_external.po                          |  247 +-
 l10n/uz/files_sharing.po                           |   37 +-
 l10n/uz/files_trashbin.po                          |   30 +-
 l10n/uz/lib.po                                     |  263 +-
 l10n/uz/settings.po                                |  448 +-
 l10n/uz/user_ldap.po                               |   99 +-
 l10n/vi/core.po                                    |  403 +-
 l10n/vi/files.po                                   |  335 +-
 l10n/vi/files_encryption.po                        |   53 +-
 l10n/vi/files_external.po                          |  259 +-
 l10n/vi/files_sharing.po                           |   37 +-
 l10n/vi/files_trashbin.po                          |   41 +-
 l10n/vi/files_versions.po                          |   25 +-
 l10n/vi/lib.po                                     |  275 +-
 l10n/vi/settings.po                                |  475 +-
 l10n/vi/user_ldap.po                               |   97 +-
 l10n/vi/user_webdavauth.po                         |   14 +-
 l10n/zh_CN/core.po                                 |  389 +-
 l10n/zh_CN/files.po                                |  336 +-
 l10n/zh_CN/files_encryption.po                     |   18 +-
 l10n/zh_CN/files_external.po                       |  260 +-
 l10n/zh_CN/files_sharing.po                        |   43 +-
 l10n/zh_CN/files_trashbin.po                       |   36 +-
 l10n/zh_CN/files_versions.po                       |   26 +-
 l10n/zh_CN/lib.po                                  |  307 +-
 l10n/zh_CN/settings.po                             |  538 +-
 l10n/zh_CN/user_ldap.po                            |  100 +-
 l10n/zh_HK/core.po                                 |  294 +-
 l10n/zh_HK/files.po                                |  274 +-
 l10n/zh_HK/files_encryption.po                     |   16 +-
 l10n/zh_HK/files_external.po                       |  249 +-
 l10n/zh_HK/files_sharing.po                        |   35 +-
 l10n/zh_HK/files_trashbin.po                       |   36 +-
 l10n/zh_HK/lib.po                                  |  263 +-
 l10n/zh_HK/settings.po                             |  452 +-
 l10n/zh_HK/user_ldap.po                            |   93 +-
 l10n/zh_TW/core.po                                 |  298 +-
 l10n/zh_TW/files.po                                |  286 +-
 l10n/zh_TW/files_encryption.po                     |   64 +-
 l10n/zh_TW/files_external.po                       |  259 +-
 l10n/zh_TW/files_sharing.po                        |   37 +-
 l10n/zh_TW/files_trashbin.po                       |   36 +-
 l10n/zh_TW/lib.po                                  |  276 +-
 l10n/zh_TW/settings.po                             |  495 +-
 l10n/zh_TW/user_ldap.po                            |   95 +-
 lib/base.php                                       |  175 +-
 lib/l10n/af_ZA.php                                 |    7 +-
 lib/l10n/{de_AT.php => am_ET.php}                  |    0
 lib/l10n/ar.php                                    |   25 +-
 lib/l10n/ast.php                                   |   30 +
 lib/l10n/az.php                                    |   10 +-
 lib/l10n/bg_BG.php                                 |    5 -
 lib/l10n/ca.php                                    |   19 +-
 lib/l10n/cs_CZ.php                                 |   29 +-
 lib/l10n/cy_GB.php                                 |    5 -
 lib/l10n/da.php                                    |   17 +-
 lib/l10n/de.php                                    |   40 +-
 lib/l10n/de_AT.php                                 |    2 +
 lib/l10n/de_CH.php                                 |   11 +-
 lib/l10n/de_DE.php                                 |   42 +-
 lib/l10n/el.php                                    |   20 +-
 lib/l10n/en_GB.php                                 |   40 +-
 lib/l10n/{de_AT.php => en_NZ.php}                  |    0
 lib/l10n/eo.php                                    |   16 +-
 lib/l10n/es.php                                    |   42 +-
 lib/l10n/es_AR.php                                 |   12 +-
 lib/l10n/es_CL.php                                 |    8 +-
 lib/l10n/{de_AT.php => es_CR.php}                  |    0
 lib/l10n/es_MX.php                                 |   11 +-
 lib/l10n/et_EE.php                                 |   39 +-
 lib/l10n/eu.php                                    |   12 +-
 lib/l10n/eu_ES.php                                 |    9 +
 lib/l10n/fa.php                                    |   10 +-
 lib/l10n/fi_FI.php                                 |   33 +-
 lib/l10n/fr.php                                    |   35 +-
 lib/l10n/gl.php                                    |   42 +-
 lib/l10n/he.php                                    |    5 +-
 lib/l10n/{de_AT.php => hi_IN.php}                  |    0
 lib/l10n/hu_HU.php                                 |   12 +-
 lib/l10n/ia.php                                    |   14 +-
 lib/l10n/id.php                                    |   11 +-
 lib/l10n/it.php                                    |   42 +-
 lib/l10n/ja.php                                    |   81 +
 lib/l10n/ja_JP.php                                 |   47 +-
 lib/l10n/{de_AT.php => jv.php}                     |    0
 lib/l10n/ka_GE.php                                 |    9 +-
 lib/l10n/km.php                                    |   46 +-
 lib/l10n/ko.php                                    |   19 +-
 lib/l10n/ku_IQ.php                                 |    1 +
 lib/l10n/lb.php                                    |    1 +
 lib/l10n/lt_LT.php                                 |   11 +-
 lib/l10n/lv.php                                    |   12 +-
 lib/l10n/mk.php                                    |    4 +-
 lib/l10n/{de_AT.php => ml.php}                     |    0
 lib/l10n/{de_AT.php => mn.php}                     |    0
 lib/l10n/nb_NO.php                                 |   34 +-
 lib/l10n/nl.php                                    |   40 +-
 lib/l10n/nn_NO.php                                 |    5 +-
 lib/l10n/{de_AT.php => or_IN.php}                  |    0
 lib/l10n/pl.php                                    |   40 +-
 lib/l10n/pl_PL.php                                 |    5 -
 lib/l10n/pt_BR.php                                 |   40 +-
 lib/l10n/pt_PT.php                                 |   17 +-
 lib/l10n/ro.php                                    |    5 +-
 lib/l10n/ru.php                                    |   11 +-
 lib/l10n/sk_SK.php                                 |   29 +-
 lib/l10n/sl.php                                    |   29 +-
 lib/l10n/sq.php                                    |   10 +-
 lib/l10n/sr.php                                    |    4 +-
 lib/l10n/sr at latin.php                              |    2 +-
 lib/l10n/{az.php => su.php}                        |    0
 lib/l10n/sv.php                                    |   37 +-
 lib/l10n/{de_AT.php => ta_IN.php}                  |    0
 lib/l10n/te.php                                    |    9 +-
 lib/l10n/tr.php                                    |   64 +-
 lib/l10n/ug.php                                    |    4 +-
 lib/l10n/uk.php                                    |   10 +-
 lib/l10n/vi.php                                    |   11 +-
 lib/l10n/zh_CN.php                                 |   53 +-
 lib/l10n/zh_TW.php                                 |   12 +-
 lib/private/activitymanager.php                    |    2 +-
 lib/private/api.php                                |   64 +-
 lib/private/app.php                                |   21 +-
 lib/private/appconfig.php                          |    7 +-
 .../dependencyinjection/dicontainer.php            |   10 +-
 lib/private/appframework/http/downloadresponse.php |   50 -
 lib/private/appframework/http/redirectresponse.php |   57 -
 lib/private/appframework/http/request.php          |   87 +-
 .../middleware/security/securitymiddleware.php     |    2 +-
 lib/private/appframework/routing/routeconfig.php   |   17 +-
 .../appframework/utility/simplecontainer.php       |    3 -
 lib/private/archive.php                            |    7 +-
 lib/private/arrayparser.php                        |   13 +
 lib/private/cache.php                              |    2 +-
 lib/private/cache/file.php                         |   20 +-
 lib/private/config.php                             |    4 +-
 .../sabre/aborteduploaddetectionplugin.php         |   33 +-
 lib/private/connector/sabre/auth.php               |   16 +-
 lib/private/connector/sabre/directory.php          |   56 +-
 .../connector/sabre/exceptionloggerplugin.php      |   17 +-
 lib/private/connector/sabre/file.php               |   81 +-
 lib/private/connector/sabre/node.php               |  176 +-
 lib/private/connector/sabre/objecttree.php         |  110 +-
 lib/private/connector/sabre/quotaplugin.php        |   44 +-
 lib/private/contactsmanager.php                    |   11 +-
 lib/private/davclient.php                          |   13 +
 lib/private/db.php                                 |    5 +-
 lib/private/db/mdb2schemamanager.php               |    3 +
 lib/private/db/mdb2schemareader.php                |    2 +
 lib/private/db/statementwrapper.php                |   14 +-
 lib/private/defaults.php                           |   25 +-
 lib/private/eventsource.php                        |    3 +-
 lib/private/filechunking.php                       |   41 +-
 lib/private/files.php                              |  226 +-
 lib/private/files/cache/cache.php                  |   42 +-
 lib/private/files/cache/homecache.php              |   24 +-
 lib/private/files/cache/legacy.php                 |  139 -
 lib/private/files/cache/scanner.php                |   17 +-
 lib/private/files/cache/updater.php                |    9 +-
 lib/private/files/cache/upgrade.php                |  235 -
 lib/private/files/fileinfo.php                     |   16 +-
 lib/private/files/filesystem.php                   |  105 +-
 lib/private/files/mount/manager.php                |    7 +
 lib/private/files/mount/mount.php                  |    7 +
 lib/private/files/storage/common.php               |   85 +-
 lib/private/files/storage/local.php                |   21 +-
 lib/private/files/storage/mappedlocal.php          |   18 +-
 lib/private/files/storage/wrapper/quota.php        |   21 +-
 lib/private/files/type/detection.php               |   40 +-
 lib/private/files/view.php                         |  226 +-
 lib/private/forbiddenexception.php                 |   16 +
 lib/private/geo.php                                |   12 +-
 lib/private/group.php                              |   23 +-
 lib/private/group/backend.php                      |   24 +-
 lib/private/group/database.php                     |   23 +-
 lib/private/group/dummy.php                        |   10 +
 lib/private/group/group.php                        |   39 +-
 lib/private/group/manager.php                      |   40 +-
 lib/private/helper.php                             |  114 +-
 lib/private/image.php                              |  190 +-
 lib/private/installer.php                          |    2 +-
 lib/private/json.php                               |    7 +-
 lib/private/l10n.php                               |   74 +-
 lib/private/legacy/appconfig.php                   |    2 -
 lib/private/legacy/config.php                      |    6 +-
 lib/private/mail.php                               |   27 +-
 lib/private/migrate.php                            |   39 +-
 lib/private/migration/content.php                  |    2 +-
 lib/private/mimetypes.list.php                     |  213 +-
 lib/private/ocs.php                                |   29 +-
 lib/private/ocs/cloud.php                          |   43 +-
 lib/private/ocs/result.php                         |    2 +-
 lib/private/ocsclient.php                          |   33 +-
 lib/private/preview.php                            |  515 +-
 lib/private/preview/image.php                      |    3 +-
 lib/private/preview/movies.php                     |   39 +-
 lib/private/preview/mp3.php                        |    2 +-
 lib/private/preview/office-cl.php                  |    4 +-
 lib/private/preview/office-fallback.php            |  143 -
 lib/private/preview/office.php                     |   33 +-
 lib/private/preview/pdf.php                        |   50 +-
 lib/private/preview/provider.php                   |    1 +
 lib/private/preview/svg.php                        |   61 +-
 lib/private/request.php                            |  118 +-
 lib/private/response.php                           |    6 +-
 lib/private/route.php                              |  124 -
 lib/private/route/cachingrouter.php                |   44 +
 lib/private/route/route.php                        |  138 +
 lib/private/route/router.php                       |  248 +
 lib/private/router.php                             |  185 -
 lib/private/search.php                             |    2 +-
 lib/private/server.php                             |   46 +-
 lib/private/session/internal.php                   |   14 +-
 lib/private/session/memory.php                     |   20 +
 lib/private/session/session.php                    |   12 +
 lib/private/setup.php                              |   59 +-
 lib/private/setup/postgresql.php                   |   20 +-
 lib/private/share/constants.php                    |   44 +
 lib/private/share/helper.php                       |  251 +
 lib/private/share/hooks.php                        |  108 +
 lib/private/share/mailnotifications.php            |   24 +-
 lib/private/share/share.php                        | 1746 ++++
 lib/private/subadmin.php                           |   22 +-
 lib/private/template.php                           |   27 +-
 lib/private/template/base.php                      |    4 +-
 lib/private/template/functions.php                 |    9 +-
 lib/private/templatelayout.php                     |   45 +-
 lib/private/updater.php                            |   73 +-
 lib/private/urlgenerator.php                       |   16 +-
 lib/private/user.php                               |   13 +-
 lib/private/user/database.php                      |  105 +-
 lib/private/user/manager.php                       |   29 +-
 lib/private/util.php                               |  169 +-
 lib/private/vobject.php                            |   59 +-
 lib/public/appframework/app.php                    |    2 +-
 lib/public/appframework/controller.php             |   14 +-
 lib/public/appframework/http/downloadresponse.php  |   50 +
 lib/public/appframework/http/jsonresponse.php      |    4 +-
 lib/public/appframework/http/redirectresponse.php  |   57 +
 lib/public/appframework/http/response.php          |   13 +
 lib/public/appframework/http/templateresponse.php  |    6 +
 lib/public/appframework/iappcontainer.php          |    4 +-
 lib/public/config.php                              |    6 +-
 lib/public/contacts/imanager.php                   |    4 +-
 lib/public/files/fileinfo.php                      |    2 +-
 lib/public/iappconfig.php                          |    5 +-
 lib/public/il10n.php                               |   12 +-
 lib/public/iservercontainer.php                    |    8 +-
 lib/public/isession.php                            |    5 +
 lib/public/route/iroute.php                        |   85 +
 lib/public/route/irouter.php                       |   75 +
 lib/public/share.php                               | 1770 +---
 lib/public/template.php                            |    2 +-
 lib/public/util.php                                |   46 +-
 ocs/v1.php                                         |   13 +-
 public.php                                         |   21 +-
 remote.php                                         |    1 -
 search/ajax/search.php                             |    1 -
 search/css/results.css                             |   18 +-
 settings/admin.php                                 |   36 +-
 settings/admin/controller.php                      |  123 +
 settings/ajax/changedisplayname.php                |    2 +-
 settings/ajax/decryptall.php                       |    9 +-
 settings/ajax/lostpassword.php                     |    4 +-
 settings/apps.php                                  |    1 -
 settings/changepassword/controller.php             |    6 -
 settings/css/oauth.css                             |    4 -
 settings/css/settings.css                          |   64 +-
 settings/help.php                                  |    1 -
 settings/js/admin.js                               |   42 +
 settings/js/apps-custom.php                        |    4 +-
 settings/js/apps.js                                |   48 +-
 settings/js/personal.js                            |  144 +-
 settings/js/users.js                               |    9 +-
 settings/l10n/af_ZA.php                            |    3 +
 settings/l10n/ar.php                               |   77 +-
 settings/l10n/ast.php                              |  198 +
 settings/l10n/bg_BG.php                            |   11 +-
 settings/l10n/bn_BD.php                            |   13 +-
 settings/l10n/ca.php                               |   53 +-
 settings/l10n/cs_CZ.php                            |   61 +-
 settings/l10n/cy_GB.php                            |    8 +-
 settings/l10n/da.php                               |   35 +-
 settings/l10n/de.php                               |   67 +-
 settings/l10n/de_AT.php                            |    9 +-
 settings/l10n/de_CH.php                            |   11 +-
 settings/l10n/de_DE.php                            |   75 +-
 settings/l10n/el.php                               |   90 +-
 settings/l10n/en_GB.php                            |   59 +-
 settings/l10n/eo.php                               |   14 +-
 settings/l10n/es.php                               |   63 +-
 settings/l10n/es_AR.php                            |   82 +-
 settings/l10n/es_CL.php                            |    2 +
 settings/l10n/es_MX.php                            |   13 +-
 settings/l10n/et_EE.php                            |   55 +-
 settings/l10n/eu.php                               |   16 +-
 settings/l10n/eu_ES.php                            |    8 +
 settings/l10n/fa.php                               |   43 +-
 settings/l10n/fi_FI.php                            |   62 +-
 settings/l10n/fr.php                               |   67 +-
 settings/l10n/gl.php                               |   57 +-
 settings/l10n/he.php                               |   13 +-
 settings/l10n/hi.php                               |    2 +-
 settings/l10n/hr.php                               |    5 +-
 settings/l10n/hu_HU.php                            |   23 +-
 settings/l10n/ia.php                               |    8 +
 settings/l10n/id.php                               |   20 +-
 settings/l10n/is.php                               |   10 +-
 settings/l10n/it.php                               |   57 +-
 settings/l10n/ja.php                               |  198 +
 settings/l10n/ja_JP.php                            |  128 +-
 settings/l10n/jv.php                               |    5 +
 settings/l10n/ka_GE.php                            |   13 +-
 settings/l10n/km.php                               |   81 +-
 settings/l10n/ko.php                               |   33 +-
 settings/l10n/ku_IQ.php                            |    8 +-
 settings/l10n/lb.php                               |    7 +-
 settings/l10n/lt_LT.php                            |   17 +-
 settings/l10n/lv.php                               |   13 +-
 settings/l10n/mk.php                               |   14 +-
 settings/l10n/ms_MY.php                            |    6 +-
 settings/l10n/my_MM.php                            |    1 +
 settings/l10n/nb_NO.php                            |   76 +-
 settings/l10n/nl.php                               |   59 +-
 settings/l10n/nn_NO.php                            |   11 +-
 settings/l10n/oc.php                               |    5 +-
 settings/l10n/pa.php                               |    5 +-
 settings/l10n/pl.php                               |   62 +-
 settings/l10n/pl_PL.php                            |    6 -
 settings/l10n/pt_BR.php                            |   57 +-
 settings/l10n/pt_PT.php                            |   43 +-
 settings/l10n/ro.php                               |   54 +-
 settings/l10n/ru.php                               |   42 +-
 settings/l10n/si_LK.php                            |   10 +-
 settings/l10n/sk.php                               |    1 +
 settings/l10n/sk_SK.php                            |   65 +-
 settings/l10n/sl.php                               |   48 +-
 settings/l10n/sq.php                               |    8 +-
 settings/l10n/sr.php                               |   12 +-
 settings/l10n/sr at latin.php                         |    2 +
 settings/l10n/sv.php                               |   70 +-
 settings/l10n/ta_LK.php                            |   11 +-
 settings/l10n/te.php                               |    2 +
 settings/l10n/th_TH.php                            |   13 +-
 settings/l10n/tr.php                               |   71 +-
 settings/l10n/ug.php                               |   11 +-
 settings/l10n/uk.php                               |   17 +-
 settings/l10n/ur_PK.php                            |    1 +
 settings/l10n/vi.php                               |   22 +-
 settings/l10n/zh_CN.php                            |   92 +-
 settings/l10n/zh_HK.php                            |    7 +-
 settings/l10n/zh_TW.php                            |   70 +-
 settings/personal.php                              |    3 +-
 settings/routes.php                                |    8 +
 settings/settings.php                              |    1 -
 settings/templates/admin.php                       |  204 +-
 settings/templates/apps.php                        |   49 +-
 settings/templates/oauth-required-apps.php         |   19 -
 settings/templates/personal.php                    |  175 +-
 settings/users.php                                 |    1 -
 status.php                                         |    4 +-
 tests/bootstrap.php                                |   10 +-
 tests/data/db_structure.xml                        |   15 +
 tests/data/db_structure2.xml                       |   15 +
 tests/data/lorem-big.txt                           |   29 +
 tests/enable_all.php                               |    2 +-
 tests/karma.config.js                              |   10 +-
 tests/lib/api.php                                  |    2 +-
 .../dependencyinjection/DIContainerTest.php        |    2 +-
 .../lib/appframework/http/DownloadResponseTest.php |    2 +-
 tests/lib/appframework/http/JSONResponseTest.php   |   17 +-
 .../lib/appframework/http/RedirectResponseTest.php |    2 +-
 tests/lib/appframework/http/RequestTest.php        |   28 +-
 tests/lib/appframework/http/ResponseTest.php       |   22 +-
 .../lib/appframework/http/TemplateResponseTest.php |   10 +
 .../middleware/MiddlewareDispatcherTest.php        |    2 +-
 .../middleware/security/SecurityMiddlewareTest.php |    2 +-
 tests/lib/appframework/routing/RoutingTest.php     |   38 +-
 .../sabre/aborteduploaddetectionplugin.php         |   27 +-
 tests/lib/connector/sabre/directory.php            |   22 +-
 tests/lib/connector/sabre/file.php                 |   77 +-
 tests/lib/connector/sabre/objecttree.php           |   15 +-
 tests/lib/connector/sabre/quotaplugin.php          |   23 +-
 tests/lib/dbschema.php                             |    3 +
 tests/lib/files/cache/homecache.php                |    1 -
 tests/lib/files/cache/scanner.php                  |   26 +-
 tests/lib/files/cache/updater.php                  |   90 +-
 tests/lib/files/etagtest.php                       |    6 +-
 tests/lib/files/filesystem.php                     |   51 +
 tests/lib/files/storage/storage.php                |   81 +-
 tests/lib/files/storage/wrapper/quota.php          |   34 +
 tests/lib/files/view.php                           |   48 +-
 tests/lib/group.php                                |   19 -
 tests/lib/group/group.php                          |   64 +-
 tests/lib/group/manager.php                        |   52 +-
 tests/lib/helper.php                               |  213 +-
 tests/lib/helperstorage.php                        |  113 +
 tests/lib/image.php                                |   24 +-
 tests/lib/mail.php                                 |   39 +
 tests/lib/preview.php                              |  140 +-
 tests/lib/public/ocpconfig.php                     |   37 +
 tests/lib/request.php                              |  137 +
 tests/lib/share/helper.php                         |   54 +
 tests/lib/share/share.php                          |   12 +-
 tests/lib/template.php                             |   38 +-
 tests/lib/urlgenerator.php                         |   73 +-
 tests/lib/user/manager.php                         |   12 +-
 tests/lib/util.php                                 |   25 +-
 tests/lib/utilcheckserver.php                      |  108 +
 tests/phpunit-autotest.xml                         |    1 +
 tests/phpunit.xml.dist                             |    3 +
 tests/startsessionlistener.php                     |   47 +
 tests/testcleanuplistener.php                      |   37 +-
 version.php                                        |    6 +-
 2229 files changed, 195479 insertions(+), 86573 deletions(-)

diff --cc lib/private/group/manager.php
index 151b185,d31225e..40c6074
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@@ -153,14 -134,8 +153,8 @@@ class Manager extends PublicEmitter 
  		$groups = array();
  		foreach ($this->backends as $backend) {
  			$groupIds = $backend->getGroups($search, $limit, $offset);
- 			if (!is_null($limit)) {
- 				$limit -= count($groupIds);
- 			}
- 			if (!is_null($offset)) {
- 				$offset -= count($groupIds);
- 			}
  			foreach ($groupIds as $groupId) {
 -				$groups[$groupId] = $this->getGroupObject($groupId);
 +				$groups[$groupId] = $this->get($groupId);
  			}
  			if (!is_null($limit) and $limit <= 0) {
  				return array_values($groups);
@@@ -174,18 -149,47 +168,52 @@@
  	 * @return \OC\Group\Group[]
  	 */
  	public function getUserGroups($user) {
 +		$uid = $user->getUID();
 +		if (isset($this->cachedUserGroups[$uid])) {
 +			return $this->cachedUserGroups[$uid];
 +		}
  		$groups = array();
  		foreach ($this->backends as $backend) {
 -			$groupIds = $backend->getUserGroups($user->getUID());
 +			$groupIds = $backend->getUserGroups($uid);
  			foreach ($groupIds as $groupId) {
 -				$groups[$groupId] = $this->getGroupObject($groupId);
 +				$groups[$groupId] = $this->get($groupId);
  			}
  		}
 -		return array_values($groups);
 +		$this->cachedUserGroups[$uid] = array_values($groups);
 +		return $this->cachedUserGroups[$uid];
  	}
+ 
+ 	/**
+ 	 * @brief get a list of all display names in a group
+ 	 * @param string $gid
+ 	 * @param string $search
+ 	 * @param int $limit
+ 	 * @param int $offset
+ 	 * @return array with display names (value) and user ids (key)
+ 	 */
+ 	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+ 		$group = $this->get($gid);
+ 		if(is_null($group)) {
+ 			return array();
+ 		}
+ 		// only user backends have the capability to do a complex search for users
+ 		$groupUsers  = $group->searchUsers('', $limit, $offset);
+ 		$search = trim($search);
+ 		if(!empty($search)) {
+ 			//TODO: for OC 7 earliest: user backend should get a method to check selected users against a pattern
+ 			$filteredUsers = $this->userManager->search($search);
+ 			$testUsers = true;
+ 		} else {
+ 			$filteredUsers = array();
+ 			$testUsers = false;
+ 		}
+ 
+ 		$matchingUsers = array();
+ 		foreach($groupUsers as $user) {
+ 			if(!$testUsers || isset($filteredUsers[$user->getUID()])) {
+ 				$matchingUsers[$user->getUID()] = $user->getDisplayName();
+ 			}
+ 		}
+ 		return $matchingUsers;
+ 	}
  }
diff --cc tests/lib/group/manager.php
index c39a7d6,9d1f175..bab9621
--- a/tests/lib/group/manager.php
+++ b/tests/lib/group/manager.php
@@@ -344,97 -344,53 +344,147 @@@ class Manager extends \PHPUnit_Framewor
  		$this->assertEquals('group2', $group2->getGID());
  	}
  
+ 	public function testDisplayNamesInGroupMultipleUserBackends() {
+ 		$user1 = new User('user1', null);
+ 		$user2 = new User('user2', null);
+ 		$user3 = new User('user3', null);
+ 		$user4 = new User('user33', null);
+ 
+ 		/**
+ 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
+ 		 */
+ 		$backend = $this->getMock('\OC_Group_Database');
+ 		$backend->expects($this->exactly(1))
+ 			->method('groupExists')
+ 			->with('testgroup')
+ 			->will($this->returnValue(true));
+ 
+ 		$backend->expects($this->once())
+ 			->method('usersInGroup')
+ 			->with('testgroup', '', -1, 0)
+ 			->will($this->returnValue(array('user2', 'user33')));
+ 
+ 		/**
+ 		 * @var \OC\User\Manager $userManager
+ 		 */
+ 		$userManager = $this->getMock('\OC\User\Manager');
+ 		$userManager->expects($this->once())
+ 			->method('search')
+ 			->with('user3')
+ 			->will($this->returnValue(array('user3' => $user3, 'user33' => $user4)));
+ 
+ 		$userManager->expects($this->any())
+ 			->method('get')
+ 			->will($this->returnCallback(function($uid) {
+ 				switch($uid) {
+ 					case 'user1' : return new User('user1', null);
+ 					case 'user2' : return new User('user2', null);
+ 					case 'user3' : return new User('user3', null);
+ 					case 'user33': return new User('user33', null);
+ 					default:
+ 						return null;
+ 				}
+ 			}));
+ 
+ 		$manager = new \OC\Group\Manager($userManager);
+ 		$manager->addBackend($backend);
+ 
+ 		$users = $manager->displayNamesInGroup('testgroup', 'user3');
+ 		$this->assertEquals(1, count($users));
+ 		$this->assertTrue(isset($users['user33']));
+ 	}
++
 +	public function testGetUserGroupsWithAddUser() {
 +		/**
 +		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
 +		 */
 +		$backend = $this->getMock('\OC_Group_Database');
 +		$expectedGroups = array();
 +		$backend->expects($this->any())
 +			->method('getUserGroups')
 +			->with('user1')
 +			->will($this->returnCallback(function () use (&$expectedGroups) {
 +				return $expectedGroups;
 +			}));
 +		$backend->expects($this->any())
 +			->method('groupExists')
 +			->with('group1')
 +			->will($this->returnValue(true));
 +		$backend->expects($this->once())
 +			->method('implementsActions')
 +			->will($this->returnValue(true));
 +
 +		/**
 +		 * @var \OC\User\Manager $userManager
 +		 */
 +		$userManager = $this->getMock('\OC\User\Manager');
 +		$manager = new \OC\Group\Manager($userManager);
 +		$manager->addBackend($backend);
 +
 +		// prime cache
 +		$user1 = new User('user1', null);
 +		$groups = $manager->getUserGroups($user1);
 +		$this->assertEquals(array(), $groups);
 +
 +		// add user
 +		$group = $manager->get('group1');
 +		$group->addUser($user1);
 +		$expectedGroups = array('group1');
 +
 +		// check result
 +		$groups = $manager->getUserGroups($user1);
 +		$this->assertEquals(1, count($groups));
 +		$group1 = $groups[0];
 +		$this->assertEquals('group1', $group1->getGID());
 +	}
 +
 +	public function testGetUserGroupsWithRemoveUser() {
 +		/**
 +		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
 +		 */
 +		$backend = $this->getMock('\OC_Group_Database');
 +		$expectedGroups = array('group1');
 +		$backend->expects($this->any())
 +			->method('getUserGroups')
 +			->with('user1')
 +			->will($this->returnCallback(function () use (&$expectedGroups) {
 +				return $expectedGroups;
 +			}));
 +		$backend->expects($this->any())
 +			->method('groupExists')
 +			->with('group1')
 +			->will($this->returnValue(true));
 +		$backend->expects($this->once())
 +			->method('implementsActions')
 +			->will($this->returnValue(true));
 +		$backend->expects($this->once())
 +			->method('inGroup')
 +			->will($this->returnValue(true));
 +		$backend->expects($this->once())
 +			->method('removeFromGroup')
 +			->will($this->returnValue(true));
 +
 +		/**
 +		 * @var \OC\User\Manager $userManager
 +		 */
 +		$userManager = $this->getMock('\OC\User\Manager');
 +		$manager = new \OC\Group\Manager($userManager);
 +		$manager->addBackend($backend);
 +
 +		// prime cache
 +		$user1 = new User('user1', null);
 +		$groups = $manager->getUserGroups($user1);
 +		$this->assertEquals(1, count($groups));
 +		$group1 = $groups[0];
 +		$this->assertEquals('group1', $group1->getGID());
 +
 +		// remove user
 +		$group = $manager->get('group1');
 +		$group->removeUser($user1);
 +		$expectedGroups = array();
 +
 +		// check result
 +		$groups = $manager->getUserGroups($user1);
 +		$this->assertEquals(array(), $groups);
 +	}
  }

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