Reverted the i18n stuff.

svn path=/trunk/; revision=3806