fixed wrong i18n strings
Merge branch '3.2'