am 097ea0bb: (-s ours) am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread

Merge commit '097ea0bb508e3c6e9253e3c50dc9a6704681ce43'

* commit '097ea0bb508e3c6e9253e3c50dc9a6704681ce43':
  Import revised translations DO NOT MERGE