am e7be8e8f: (-s ours) am b6a007c5: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'e7be8e8f6c3db50df8e755033cd110aabd1143df'

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