am 8b312c6c: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
  Import revised translations.  DO NOT MERGE