Move magic words to .i18n.php
Merge origin/master