am 7778173a: (-s ours) am 70f1a3b8: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit '7778173a32edcfccdcc31407169d2ec40916ca2f'

* commit '7778173a32edcfccdcc31407169d2ec40916ca2f':
  Import revised translations.  DO NOT MERGE