Updates for 1.x branch.

...ot translatable"