[tx-robot] updated from transifex
Merge branch 'master' into contactsmanager-register

Conflicts:
	lib/private/contactsmanager.php
Fix wrong var name
Merge pull request #8341 from owncloud/template-tests-output-buffering

Improve Template Tests by Removing Manual Output Buffering
"echo" is a language construct. Don't treat it like a function.
Merge pull request #8353 from owncloud/publicshare-webdav

Expose public shares over webdav
Merge pull request #8343 from owncloud/fix-status

Use echo since print_unescaped is not defined
fix single quote sanitization
Add another example to the trusted_domains config

Users often ask in IRC or the forum how to add another domain. 
Hopefully they will be able to find it out on their own if we have an example with two domains.
Merge pull request #8371 from owncloud/example-config

Add another example to the trusted_domains config
Clarify the trusted_domain error page
[tx-robot] updated from transifex
Grammatical fixes
Remove an added t by the github webeditor

Notice to myself: Stick to my IDE.
Merge pull request #8372 from owncloud/give-admins-a-hint

Clarify the trusted_domain error page
[tx-robot] updated from transifex
Merge pull request #7473 from owncloud/append-error-document

Remove .htaccess creation code
Merge pull request #8327 from owncloud/l10n-files_external-fields

Add translatable mount configs
Escape literal dots in mod_rewrite regexes
Remove trailing tab