am 171ed627: (-s ours) am 6670a579: (-s ours) am a8484d84: (-s ours) Import translations. DO NOT MERGE

* commit '171ed627eab58b017bed79d267ad3def7ab90b7e':
  Import translations. DO NOT MERGE