am 717ed1e6: (-s ours) am bef50389: (-s ours) Import translations. DO NOT MERGE

* commit '717ed1e6ff84f63d7adfe022a59559a18fb64571':
  Import translations. DO NOT MERGE