Merge branch 'master' into ext-fs-irods-master

README

README.md

apps/files/l10n/ca.php

apps/files/l10n/nb_NO.php

apps/files/l10n/pt_BR.php

apps/files/l10n/zh_CN.GB2312.php

apps/files/l10n/zh_TW.php

apps/files_encryption/appinfo/info.xml

apps/files_encryption/l10n/cs_CZ.php

apps/files_sharing/l10n/nb_NO.php

apps/files_trashbin/l10n/zh_CN.GB2312.php

apps/user_ldap/l10n/pt_PT.php

config/config.sample.php

core/l10n/pt_PT.php

core/l10n/zh_TW.php

l10n/af_ZA/core.po

l10n/af_ZA/lib.po

l10n/ar/core.po

l10n/ar/files.po

l10n/ar/files_external.po