am b7e09a0f: (-s ours) am 01a12eb1: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr2

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