am 18061e31: (-s ours) Import translations. DO NOT MERGE

* commit '18061e311df6c9845ce8827dbb736481ed366bf0':
  Import translations. DO NOT MERGE