am b05fea7d: am e6ef8d0b: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'b05fea7dc586173d5dcf7980e51966ac4ae761a0':
  Import revised translations.  DO NOT MERGE