am 2e715df8: (-s ours) am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

* commit '2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
  Import revised translations.  DO NOT MERGE