am cdb6bb59: (-s ours) Merge "Import translations. DO NOT MERGE"

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