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

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