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

Merge commit 'c035d83a01b8c82a286298f29fae9e3989de0d29'

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