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

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