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

* commit '1bfb2db93514f8ed70d0a02c12d7ce4791d6b336':
  Import revised translations.  DO NOT MERGE