am 06172af6: (-s ours) Import translations. DO NOT MERGE

* commit '06172af69451678f5d1dd388a372ab00b58d682f':
  Import translations. DO NOT MERGE