am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

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