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

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