am a869e372: (-s ours) am cb5b0dd3: (-s ours) Import translations. DO NOT MERGE

* commit 'a869e3720924890cc40c44d67c217edf89d0138a':
  Import translations. DO NOT MERGE