Merge "Import revised translations.  DO NOT MERGE.  Bug 3394542" into honeycomb