am 35d4648b: (-s ours) am 962d599b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9

* commit '35d4648bb1e5eac717ccb4a33f397127a499e191':
  Import translations. DO NOT MERGE