am 293336c3: (-s ours) am b7c63fa4: (-s ours) Import translations. DO NOT MERGE

* commit '293336c3f4f0a33df60fa6a53977bccc9c133d76':
  Import translations. DO NOT MERGE