am f2d20696: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

* commit 'f2d206961c678fec3aa3eef4920e6c2c85f0d002':
  Import translations. DO NOT MERGE