am 3f3236e7: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '3f3236e7f5491c2ab44902a42f1eae2d032446be':
  Import revised translations.  DO NOT MERGE