am 79c42480: (-s ours) am d1a2e38a: am d2f68160: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '79c424805d5710994795797033cdfe901f5e7292':
  Import revised translations.  DO NOT MERGE