am 29dfdb59: (-s ours) Import translations. DO NOT MERGE

* commit '29dfdb59fd852bc07e97f1734257bfa96775ee5c':
  Import translations. DO NOT MERGE