Merge in es translation, refactor persona
Add persona merging to translation merge script
Add es full translation