am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE

* commit '1858bfd1a5d951b8c14f81b11172dfed84f5d87f':
  Import translations. DO NOT MERGE