am 8f8956aa: (-s ours) am 6c75d2f1: Import revised translations.  DO NOT MERGE

Merge commit '8f8956aa724929ad1781f0e922a0b02b17ad4542'

* commit '8f8956aa724929ad1781f0e922a0b02b17ad4542':
  Import revised translations.  DO NOT MERGE