1052858 - i18n is incomplete, code changes needed

(cherry picked from commit 59169271aa24afc1d7c9062f207b6a656dbf95fe)