am df2ff458: (-s ours) am f447a3d7: Merge "Import revised translations" into gingerbread

Merge commit 'df2ff4581cb3b7c736d56e72b936b9a8f10f751c'

* commit 'df2ff4581cb3b7c736d56e72b936b9a8f10f751c':
  Import revised translations