am 17fd0a4b: (-s ours) am b05f0b84: am 3a2575f7: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '17fd0a4be9695f644e538e613a145cea3a9b583e':
  Import revised translations.  DO NOT MERGE