am b2ddeee2: (-s ours) am 3d1ce9ec: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b'

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