Merge pull request #11565 from owncloud/fix-behaviourOnOSX

Add darwin to if block
Merge pull request #11570 from owncloud/backport-11408-master

Backport 11408 master
Migrate new app settings to AppFramework

Let's migrate those two new files.
[tx-robot] updated from transifex
make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space
Merge pull request #11524 from nazar-pc/patch-1

Page size calculation based on real page height
Merge pull request #11595 from owncloud/make_get_display_name_more_robust

strip whitespace from the beginning and end of the display name
left-align checkbox on server tab
Fix SPACE_UNKNOWN constant
Fix SVG icons

FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.

Conflicts:
	lib/private/preview.php
Remove insane comment
Merge pull request #11609 from owncloud/trashbin-space-constant

Fix SPACE_UNKNOWN constant
include the apps' versions hash to invalidate the cached assets
fixing typo in English source string
Merge pull request #11478 from owncloud/fix-11448

LDAP: add setting to wizard that disables auto-detection and enables raw mode
Merge pull request #11383 from ockham/share-tags2

Share tags
Merge pull request #11615 from owncloud/fix-translation-source-string

fixing typo in English source string
Fix unit test

Regression introduced with https://github.com/owncloud/core/pull/11615
Merge pull request #11521 from owncloud/configsamplephp

small corrections to config.sample.php
Merge pull request #11591 from owncloud/addAppVersionToCSSandJS

Add app version to JS and CSS