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

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