Add missed i18n change
Remove TODO, change TODO to explanatory comment