am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE

* commit '24daa2a17c22fb2c2f40f212a3fd96ed77805819':
  Import translations. DO NOT MERGE