am b7185a54: (-s ours) am dfb78827: (-s ours) am 955ab98f: Import revised translations.  DO NOT MERGE

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