Typo in gettext string
Dutch translation
Dutch translation
Dutch translation
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/admin-options.php
	zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.mo
	zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.po