am 040f6150: (-s ours) am 9967ce04: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '040f61504aeab1d905ac9fb85945699877e78d4e':
  Import revised translations.  DO NOT MERGE