am 048a468b: am 61ace95b: Import translations. DO NOT MERGE

* commit '048a468b51bc4db791b703a9f31e973ca9fc225d':
  Import translations. DO NOT MERGE