am 5110111b: (-s ours) am 117317ee: Import translations. DO NOT MERGE

* commit '5110111bab9e840c9aeb6f47fcc28dda8a9b0428':
  Import translations. DO NOT MERGE