remoe wrong translation messages.
Merge branch 'i18n-support' into stage