am bb8af31f: (-s ours) am 1a04c21b: am 7f050e2e: Import revised translations.  DO NOT MERGE

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