am c7af4c5c: (-s ours) am 605f4027: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'c7af4c5c5aff84fc70ac4d6e1547197d56a9ee9a'

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