BZ-1052858 - i18n is incomplete, code changes needed