am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

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