am 4aaca3d7: (-s ours) am b7627801: (-s ours) Import translations. DO NOT MERGE

* commit '4aaca3d7189878e7c356e871672056e9f8ab3231':
  Import translations. DO NOT MERGE