am 3b6fa618: (-s ours) am 7a4adedf: (-s ours) Import translations. DO NOT MERGE

* commit '3b6fa618ce8a1f14bb3949ce8c7be3417fb8568a':
  Import translations. DO NOT MERGE