am 325232e3: (-s ours) am e953b2f8: (-s ours) Import translations. DO NOT MERGE

* commit '325232e344b257a3c236ead2adc60c7378f226c0':
  Import translations. DO NOT MERGE