am 6c79c1e1: (-s ours) am a185feb9: (-s ours) Import translations. DO NOT MERGE

* commit '6c79c1e156005cea6c6db41872f96c1b3100e2a1':
  Import translations. DO NOT MERGE