finally fix i18n strings in config.php
actually fix prevous commit
allow basic commenting of locale string
Merge remote-tracking branch 'upstream/master'