Merge pull request #2826 from HyphaApp/enhancement/use_trimmed_on_blocktrans

.../apply/users/templates/two_factor/core/backup_tokens.html

...ers/templates/two_factor/core/backup_tokens_password.html

hypha/apply/users/templates/two_factor/profile/disable.html

hypha/apply/users/templates/two_factor/profile/profile.html

hypha/apply/users/templates/users/change_password.html

.../users/templates/users/email_change/confirm_password.html

hypha/apply/users/templates/users/login.html

...a/apply/users/templates/users/password_reset/confirm.html