am f2af2d92: (-s ours) am 4318ab05: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d'

* commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d':
  Import revised translations.  DO NOT MERGE