am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf

* commit '0dc42a5d66a16589b6e8c8a57922f0134d3bcdc0':
  Import translations. DO NOT MERGE