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

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