Merge branch 'master' into files_encryption_check_private_key

.gitignore

apps/files_encryption/l10n/el.php

apps/files_encryption/l10n/pt_PT.php

apps/files_encryption/lib/util.php

apps/files_encryption/tests/crypt.php

apps/files_encryption/tests/keymanager.php

apps/files_encryption/tests/share.php

apps/files_encryption/tests/stream.php

apps/files_encryption/tests/trashbin.php

apps/files_encryption/tests/util.php

apps/user_ldap/l10n/pt_PT.php

core/l10n/el.php

db_structure.xml

l10n/af_ZA/core.po

l10n/af_ZA/lib.po

l10n/af_ZA/settings.po

l10n/ar/core.po

l10n/ar/files.po

l10n/ar/files_external.po

l10n/ar/files_sharing.po