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

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