am 6fde6e27: (-s ours) Import translations. DO NOT MERGE

* commit '6fde6e272cdd90e5e7386e231cb47906120b535c':
  Import translations. DO NOT MERGE