am 2c30c859: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr2

* commit '2c30c8596e615f6995d5e48be8b59bd612e63510':
  Import revised translations.  DO NOT MERGE