am b8c5df85: (-s ours) am 40a4ab13: Import translations. DO NOT MERGE

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