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

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