am 5ebfe1cb: (-s ours) am b959633f: (-s ours) Import translations. DO NOT MERGE

* commit '5ebfe1cbb9e889d9edfa42a6ba5d6e42f511ed25':
  Import translations. DO NOT MERGE