am 2816fa23: (-s ours) am d7055284: am 52ee025a: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '2816fa23415f3e5a790769dbd912d070b9ed08e4'

* commit '2816fa23415f3e5a790769dbd912d070b9ed08e4':
  Import revised translations.  DO NOT MERGE