am 8d257f85: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '8d257f85acc3316b9ba451337f7cbea9000eb8cf':
  Import revised translations.  DO NOT MERGE