am 0fa90ee7: (-s ours) am 3cb9fb1c: Import translations. DO NOT MERGE

* commit '0fa90ee7ea06dfa03a5c4593917a28357fa0af4b':
  Import translations. DO NOT MERGE