am b23196d6: (-s ours) am 8d257f85: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

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