am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '1887e80fd827a579b430c03b6e4069213b881ddc':
  Import translations. DO NOT MERGE