am 31920dae: (-s ours) am f6f93cfe: Import translations. DO NOT MERGE

* commit '31920daec9d919c83f88e12002914fcef48882da':
  Import translations. DO NOT MERGE