am 3a2575f7: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

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