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

* commit 'd2f68160437d1e84cd6d320fbad3e84e8955099a':
  Import revised translations.  DO NOT MERGE