am 87b15e21: (-s ours) Import translations. DO NOT MERGE

* commit '87b15e21a94902ba95a44c538ca00cedc4057ff0':
  Import translations. DO NOT MERGE