am 4d68b619: (-s ours) Import translations. DO NOT MERGE

* commit '4d68b619bcb238d6fc7f7feaa7c90cccbacf2392':
  Import translations. DO NOT MERGE