am 6a18f6e2: (-s ours) am 0982dc64: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '6a18f6e289f1bd6cdb4a3b73015935fac1c9b11d':
  Import revised translations.  DO NOT MERGE