Email translation follow-up
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into emailI18N
Reverted back to `ACTIVITY_` keys
Removed trailing comma
Merge pull request #3793 from nicolaasmatthijs/emailI18N

Email i18n improvements