am 6bde0a59: (-s ours) am 16d76289: Import revised translations.  DO NOT MERGE

Merge commit '6bde0a59ed14e662031e943ab7f7b644b6aef60f'

* commit '6bde0a59ed14e662031e943ab7f7b644b6aef60f':
  Import revised translations.  DO NOT MERGE