am 048d6446: (-s ours) am e7aee4b3: (-s ours) Import translations. DO NOT MERGE

* commit '048d6446e150ca1feef2f9aa2000f88640a4eff3':
  Import translations. DO NOT MERGE