am 04a536af: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '04a536af3c91fc78d07a7d5b242a40b2731ec0ff':
  Import revised translations.  DO NOT MERGE