am a817a6af: (-s ours) am 20bfdeb1: (-s ours) Import translations. DO NOT MERGE

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