am 9ad850e7: (-s ours) am 5f956afb: Import translations. DO NOT MERGE

* commit '9ad850e79f5aa38ef4069b4a7743c5aeb934ae29':
  Import translations. DO NOT MERGE