replace i18n in specs with strings
Merge branch 'master' into spec_new_match