am b0aff894: (-s ours) am 00c0e329: Import revised translations.  DO NOT MERGE

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