am 184ad241: (-s ours) Import translations. DO NOT MERGE

* commit '184ad2417e3855f868e4533d69f2b0b02b2705a0':
  Import translations. DO NOT MERGE