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

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