Update messaging around disabled? in moderation interface

app/views/admin/accounts/_buttons.html.haml

@@ -18,7 +18,7 @@
       - if account.local? && account.user_approved?
         = link_to t('admin.accounts.warn'), new_admin_account_action_path(account.id, type: 'none'), class: 'button' if can?(:warn, account)
         - if account.user_disabled?
-          = link_to t('admin.accounts.enable'), enable_admin_account_path(account.id), method: :post, class: 'button' if can?(:enable, account.user)
+          = link_to(account.user_confirmed? ? t('admin.accounts.enable') : t('admin.accounts.enable_unconfirmed'), enable_admin_account_path(account.id), method: :post, class: 'button') if can?(:enable, account.user)
         - elsif can?(:disable, account.user)
           = link_to t('admin.accounts.disable'), new_admin_account_action_path(account.id, type: 'disable'), class: 'button'
       - if account.sensitized?

app/views/admin/accounts/_counters.html.haml

@@ -30,12 +30,12 @@
           = t('admin.accounts.memorialized')
         - elsif account.silenced?
           = t('admin.accounts.silenced')
+        - elsif account.local? && !account.user_approved?
+          = t('admin.accounts.pending')
         - elsif account.local? && account.user_disabled?
           = t('admin.accounts.disabled')
         - elsif account.local? && !account.user_confirmed?
           = t('admin.accounts.confirming')
-        - elsif account.local? && !account.user_approved?
-          = t('admin.accounts.pending')
         - elsif account.sensitized?
           = t('admin.accounts.sensitive')
         - else

config/locales/en.yml

@@ -93,6 +93,7 @@ en:
       enable: Unfreeze
       enable_sign_in_token: Enable security code challenge
       enable_sign_in_token_auth: Enable email token authentication
+      enable_unconfirmed: Allow confirmation e-mail
       enabled: Enabled
       enabled_msg: Successfully unfroze %{username}'s account
       follow_recommendations: