am 3e8cec75: (-s ours) am 9ca34e9a: (-s ours) Import translations. DO NOT MERGE

* commit '3e8cec75288a91a566f4957e33122223877a7011':
  Import translations. DO NOT MERGE