am 20347611: (-s ours) am fda4d671: (-s ours) Import translations. DO NOT MERGE

* commit '20347611513c1b3e5a129797f32c091d1a0e91ce':
  Import translations. DO NOT MERGE