Fixed internationalization issues.

Change-Id: I79067e3238c6b53e9b4d1cfc721240a187c293b1