am 5e84ce3d: (-s ours) am b3921b9c: Import translations. DO NOT MERGE

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