am 4bfc7fcb: (-s ours) am aabff4d4: (-s ours) Import translations. DO NOT MERGE

* commit '4bfc7fcbbb97d14ca1df8f88db967f116d6c65c4':
  Import translations. DO NOT MERGE