Removes deprecated settings() function and goes back to using option().
Thanks to @jeau for catching.
Internationalization improvements

more via @jeau
Merge remote-tracking branch 'upstream/master'

Conflicts:
	curatescape/custom.php