am 2aae3926: (-s ours) am a3cb8d02: (-s ours) Import translations. DO NOT MERGE

* commit '2aae39266832c785242d8fb4cc47bc2bdec92e7c':
  Import translations. DO NOT MERGE