Merge "Import revised translations." into honeycomb