am 49adc031: (-s ours) am e6e1bc4f: am ba12a2ce: Import translations. DO NOT MERGE

* commit '49adc03188a8986a0fb2c7bd2ab32b938d315000':
  Import translations. DO NOT MERGE