am c7e670e2: (-s ours) am de4817e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

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