am cfba8c03: (-s ours) am 194f5244: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711'

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