am 040b8559: (-s ours) Import translations. DO NOT MERGE

* commit '040b85595066ff9d3280e3fe4d711542264e6efb':
  Import translations. DO NOT MERGE