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

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