add i18n and make it consequent throughout
Merge branch 'master' into trunk
Merge pull request #383 from senlin/trunk

Add i18n to example-functions.php. props @senlin.
Merge branch 'master' into trunk