am 051723ff: (-s ours) am 10b9bda3: (-s ours) Import translations. DO NOT MERGE

* commit '051723ff169ff515610fd7df89ea5ab767f83630':
  Import translations. DO NOT MERGE