am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '98041f02b471b100056c3dc16e50f04a059f9a58':
  Import revised translations.  DO NOT MERGE