am a7dae24c: (-s ours) am 01ee34d7: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8'

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