Localization fixes after merge.

Signed-off-by: Poren Chiang <ren.chiang@gmail.com>