am b7f8032a: (-s ours) am 229309e5: Merge "Import revised translations" into gingerbread

Merge commit 'b7f8032a7ec171d61a40f636111a9e68c5e6167d'

* commit 'b7f8032a7ec171d61a40f636111a9e68c5e6167d':
  Import revised translations