am 6eff1618: (-s ours) am a73be78a: (-s ours) am f8972446: Import revised translations.  DO NOT MERGE

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