am 64b594c0: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '64b594c0753c7c2963de53049a8ba203095b3b0b':
  Import revised translations.  DO NOT MERGE