am 99cca89f: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

* commit '99cca89f41e500f8b39fd75eb17f337422c4ac90':
  Import revised translations.  DO NOT MERGE