am 85384d66: (-s ours) am 6e0d2c19: (-s ours) am 90ec376f: (-s ours) Import translations. DO NOT MERGE

* commit '85384d6682a750266755a799ad1f9d965876fd8e':
  Import translations. DO NOT MERGE