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

Merge commit 'c1b387aed8a10031b4fde6d82ab9353d975486b3'

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