minor
merging internationlization code