Merge pull request #565 from regisb/regisb/upgrade-build-header

chore: upgrade frontend-build and frontend-component-header
2021-12-20 17:52:25 +01:00 · 2021-12-20 17:28:48 +01:00
133 changed files with 14005 additions and 31900 deletions
--- a/.env
+++ b/.env
@@ -25,8 +25,3 @@ SITE_NAME=''
 STUDIO_BASE_URL=''
 SUPPORT_URL=''
 USER_INFO_COOKIE_NAME=''
-ENABLE_COPPA_COMPLIANCE=''
-ENABLE_DOB_UPDATE=''
-MARKETING_EMAILS_OPT_IN=''
-APP_ID=
-MFE_CONFIG_API_URL=
--- a/.env.development
+++ b/.env.development
@@ -26,9 +26,3 @@ SITE_NAME=localhost
 STUDIO_BASE_URL=''
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
-ENABLE_COPPA_COMPLIANCE=''
-ENABLE_DOB_UPDATE=''
-MARKETING_EMAILS_OPT_IN=''
-APP_ID=
-MFE_CONFIG_API_URL=
-
--- a/.env.test
+++ b/.env.test
@@ -25,8 +25,3 @@ SITE_NAME=localhost
 STUDIO_BASE_URL=''
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
-ENABLE_COPPA_COMPLIANCE=''
-ENABLE_DOB_UPDATE=''
-MARKETING_EMAILS_OPT_IN=''
-APP_ID=
-MFE_CONFIG_API_URL=
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
 const { createConfig } = require('@edx/frontend-build');

 module.exports = createConfig('eslint');
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @edx/community-engineering
--- a/.github/workflows/add-depr-ticket-to-depr-board.yml
+++ b/.github/workflows/add-depr-ticket-to-depr-board.yml
@@ -1,19 +0,0 @@
-# Run the workflow that adds new tickets that are either:
-# - labelled "DEPR"
-# - title starts with "[DEPR]"
-# - body starts with "Proposal Date" (this is the first template field)
-# to the org-wide DEPR project board
-
-name: Add newly created DEPR issues to the DEPR project board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  routeissue:
-    uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
-    secrets:
-      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
-      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,3 +1,4 @@
+---
 name: ci
 on:
  push:
@@ -5,26 +6,27 @@ on:
    - master
  pull_request:
 jobs:
-  tests:
+  build:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node: [16]
-        npm: [8.5.0]
+        node-version:
+        - 12
        npm-test:
        - i18n_extract
+        - is-es5
        - lint
        - test
    steps:
    - uses: actions/checkout@v2
    - uses: actions/setup-node@v2
      with:
-        node-version: ${{ matrix.node }}
-    - run: npm install -g npm@${{ matrix.npm }}
+        node-version: ${{ matrix.node-version }}
+    - run: npm install -g npm@6
    - run: make requirements
    - run: make test NPM_TESTS=build
    - run: make test NPM_TESTS=${{ matrix.npm-test }}
    - name: upload coverage
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v2
      with:
        fail_ci_if_error: false
--- a/.github/workflows/commitlint.yml
+++ b/.github/workflows/commitlint.yml
@@ -7,4 +7,4 @@ on:

 jobs:
  commitlint:
-    uses: openedx/.github/.github/workflows/commitlint.yml@master
+    uses: edx/.github/.github/workflows/commitlint.yml@master
--- a/.github/workflows/lockfileversion-check.yml
+++ b/.github/workflows/lockfileversion-check.yml
@@ -1,14 +0,0 @@
-#check package-lock file version
-
-name: Lockfile Version check
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
-    
--- a/.github/workflows/update-browserlist.yml
+++ b/.github/workflows/update-browserlist.yml
@@ -1,44 +0,0 @@
-name: Update Browserlist DB
-on:
-  schedule:
-    - cron:  '0 0 * * 1'
-  workflow_dispatch:
-
-jobs:
-  update-dep:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [16]
-        npm: [8.5.x]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node }}
-      - run: npm install -g npm@${{ matrix.npm }}
-      - run: make requirements
-      - name: Update dependencies
-        run: npx update-browserslist-db@latest
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v4.1.1
-        with:
-            token: ${{ secrets.requirements_bot_github_token }}
-            commit-message: 'chore: update browserslist'
-            title: Update browserslist
-            body: |
-              - Dependency updates
-  
-              Auto-generated by [create-pull-request][1]
-  
-              [1]: https://github.com/peter-evans/create-pull-request
-            branch: update-browserslist
-
-      - name: Enable Pull Request Automerge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v2
-        with:
-          token: ${{ secrets.requirements_bot_github_token }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: squash
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-v16
--- a/.tx/config
+++ b/.tx/config
@@ -1,9 +1,8 @@
 [main]
 host = https://www.transifex.com

-[o:open-edx:p:edx-platform:r:frontend-app-account]
+[edx-platform.frontend-app-account]
 file_filter = src/i18n/messages/<lang>.json
 source_file = src/i18n/transifex_input.json
 source_lang = en
-type        = KEYVALUEJSON
-
+type = KEYVALUEJSON
--- a/13
+++ b/13
@@ -1,6 +1,5 @@
-export TRANSIFEX_RESOURCE = frontend-app-account
 transifex_resource = frontend-app-account
-transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"
+transifex_langs = "ar,fr,es_419,zh_CN"

 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
@@ -11,7 +10,7 @@ tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transi
 # This directory must match .babelrc .
 transifex_temp = ./temp/babel-plugin-react-intl

-NPM_TESTS=build i18n_extract lint test
+NPM_TESTS=build i18n_extract lint test is-es5

 .PHONY: test
 test: $(addprefix test.npm.,$(NPM_TESTS))  ## validate ci suite
@@ -46,15 +45,15 @@ push_translations:
 	# Pushing strings to Transifex...
 	tx push -s
 	# Fetching hashes from Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
+	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
 	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
+	$(transifex_utils) $(transifex_temp) --comments
 	# Pushing comments to Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
+	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)

 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
+	tx pull -f --mode reviewed --language=$(transifex_langs)

 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@ This is a micro-frontend application responsible for the display and updating of

 What is the domain of this MFE?

-In this MFE: Private user settings UIs. Public facing profile is in a `separate MFE (Profile) <https://github.com/openedx/frontend-app-profile>`_
+In this MFE: Private user settings UIs. Public facing profile is in a `separate MFE (Profile) <https://github.com/edx/frontend-app-profile>`_

 - Account settings page

@@ -23,9 +23,9 @@ In this MFE: Private user settings UIs. Public facing profile is in a `separate
 Installation
 ------------

-This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ section for setup instructions.
+This MFE is bundled with `Devstack <https://github.com/edx/devstack>`_, see the `Getting Started <https://github.com/edx/devstack#getting-started>`_ section for setup instructions.

-1. Install Devstack using the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ instructions.
+1. Install Devstack using the `Getting Started <https://github.com/edx/devstack#getting-started>`_ instructions.

 2. Start up Devstack, if it's not already started.

@@ -102,8 +102,8 @@ In the future, it's possible that demographics could be modeled as a plugin rath

 ==============================

-.. |ci-badge| image:: https://github.com/openedx/edx-developer-docs/actions/workflows/ci.yml/badge.svg
-   :target: https://github.com/openedx/edx-developer-docs/actions/workflows/ci.yml
+.. |ci-badge| image:: https://github.com/edx/edx-developer-docs/actions/workflows/ci.yml/badge.svg
+   :target: https://github.com/edx/edx-developer-docs/actions/workflows/ci.yml
   :alt: Continuous Integration
 .. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-app-account
   :target: https://codecov.io/gh/edx/frontend-app-account
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,49 +6,50 @@
  "license": "AGPL-3.0",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/openedx/frontend-app-account.git"
+    "url": "git+https://github.com/edx/frontend-app-account.git"
  },
  "scripts": {
    "build": "fedx-scripts webpack",
    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
+    "is-es5": "es-check es5 ./dist/*.js",
    "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
    "snapshot": "fedx-scripts jest --updateSnapshot",
    "start": "fedx-scripts webpack-dev-server --progress",
-    "test": "TZ=UTC fedx-scripts jest --coverage --passWithNoTests"
+    "test": "fedx-scripts jest --coverage --passWithNoTests"
  },
  "bugs": {
-    "url": "https://github.com/openedx/frontend-app-account/issues"
+    "url": "https://github.com/edx/frontend-app-account/issues"
  },
-  "homepage": "https://github.com/openedx/frontend-app-account#readme",
+  "homepage": "https://github.com/edx/frontend-app-account#readme",
  "publishConfig": {
    "access": "public"
  },
  "browserslist": [
-    "extends @edx/browserslist-config"
+    "last 2 versions",
+    "ie 11"
  ],
  "dependencies": {
    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-footer": "11.5.2",
-    "@edx/frontend-component-header": "3.5.0",
-    "@edx/frontend-platform": "2.6.2",
-    "@edx/paragon": "20.21.2",
+    "@edx/frontend-component-footer": "10.1.6",
+    "@edx/frontend-component-header": "^2.4.3",
+    "@edx/frontend-platform": "1.12.7",
+    "@edx/paragon": "16.1.0",
    "@fortawesome/fontawesome-svg-core": "1.2.36",
    "@fortawesome/free-brands-svg-icons": "5.15.4",
    "@fortawesome/free-regular-svg-icons": "5.15.4",
    "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "0.2.0",
+    "@fortawesome/react-fontawesome": "0.1.15",
    "@tensorflow-models/blazeface": "0.0.7",
-    "@tensorflow/tfjs-converter": "3.21.0",
-    "@tensorflow/tfjs-core": "3.21.0",
+    "@tensorflow/tfjs-converter": "1.7.4",
+    "@tensorflow/tfjs-core": "1.7.4",
    "bowser": "2.11.0",
-    "classnames": "2.3.2",
-    "core-js": "3.26.1",
+    "classnames": "2.3.1",
+    "core-js": "3.18.2",
    "font-awesome": "4.7.0",
-    "form-urlencoded": "4.5.1",
+    "form-urlencoded": "4.0.1",
    "formdata-polyfill": "4.0.10",
    "history": "4.10.1",
-    "jslib-html5-camera-photo": "3.3.4",
-    "lodash.camelcase": "4.3.0",
+    "jslib-html5-camera-photo": "3.1.8",
    "lodash.debounce": "4.0.8",
    "lodash.findindex": "4.6.0",
    "lodash.get": "4.4.2",
@@ -57,36 +58,34 @@
    "lodash.omit": "4.5.0",
    "lodash.pick": "4.4.0",
    "lodash.pickby": "4.6.0",
-    "long": "5.2.1",
    "memoize-one": "5.2.1",
    "prop-types": "15.7.2",
-    "qs": "6.10.3",
+    "qs": "6.10.1",
    "react": "16.14.0",
    "react-dom": "16.14.0",
-    "react-helmet": "6.1.0",
-    "react-redux": "7.2.9",
+    "react-redux": "7.2.5",
    "react-router": "5.2.1",
    "react-router-dom": "5.3.0",
-    "react-router-hash-link": "2.4.3",
+    "react-router-hash-link": "1.2.2",
    "react-scrollspy": "3.4.3",
-    "react-transition-group": "4.4.5",
-    "redux": "4.1.2",
+    "react-transition-group": "4.4.2",
+    "redux": "4.1.1",
    "redux-devtools-extension": "2.13.9",
    "redux-logger": "3.0.6",
    "redux-saga": "1.1.3",
    "redux-thunk": "2.3.0",
-    "regenerator-runtime": "0.13.11",
+    "regenerator-runtime": "0.13.9",
    "reselect": "4.0.0",
    "universal-cookie": "4.0.4"
  },
  "devDependencies": {
-    "@edx/browserslist-config": "1.1.1",
-    "@edx/frontend-build": "12.4.0",
-    "@edx/reactifex": "1.1.0",
-    "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/react": "12.1.5",
+    "@edx/frontend-build": "^9.0.5",
+    "@testing-library/jest-dom": "5.14.1",
+    "@testing-library/react": "12.1.2",
+    "codecov": "3.8.3",
    "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.7",
+    "enzyme-adapter-react-16": "1.15.6",
+    "es-check": "6.0.0",
    "react-test-renderer": "16.14.0",
    "reactifex": "1.1.1",
    "redux-mock-store": "1.5.4"
--- a/renovate.json
+++ b/renovate.json
@@ -22,11 +22,6 @@
        "pin"
      ],
      "automerge": true
-    },
-    {
-      "matchPackagePatterns": ["@edx"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true
    }
  ],
  "timezone": "America/New_York"
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -31,20 +31,17 @@ import PageLoading from './PageLoading';
 import JumpNav from './JumpNav';
 import DeleteAccount from './delete-account';
 import EditableField from './EditableField';
-import EditableSelectField from './EditableSelectField';
 import ResetPassword from './reset-password';
 import NameChange from './name-change';
 import ThirdPartyAuth from './third-party-auth';
 import BetaLanguageBanner from './BetaLanguageBanner';
 import EmailField from './EmailField';
 import OneTimeDismissibleAlert from './OneTimeDismissibleAlert';
-import DOBModal from './DOBForm';
 import {
  YEAR_OF_BIRTH_OPTIONS,
  EDUCATION_LEVELS,
  GENDER_OPTIONS,
  COUNTRY_WITH_STATES,
-  COPPA_COMPLIANCE_YEAR,
  getStatesList,
 } from './data/constants';
 import { fetchSiteLanguages } from './site-language';
@@ -149,13 +146,28 @@ class AccountSettingsPage extends React.Component {
    })),
  }));

+  sortDates = (a, b) => {
+    const aTimeSinceEpoch = new Date(a).getTime();
+    const bTimeSinceEpoch = new Date(b).getTime();
+
+    return bTimeSinceEpoch - aTimeSinceEpoch;
+  }
+
+  sortVerifiedNameRecords = verifiedNameHistory => {
+    if (Array.isArray(verifiedNameHistory)) {
+      return [...verifiedNameHistory].sort(this.sortDates);
+    }
+
+    return [];
+  }
+
  handleEditableFieldChange = (name, value) => {
    this.props.updateDraft(name, value);
-  };
+  }

  handleSubmit = (formId, values) => {
    this.props.saveSettings(formId, values);
-  };
+  }

  handleSubmitProfileName = (formId, values) => {
    if (Object.keys(this.props.drafts).includes('useVerifiedNameForCerts')) {
@@ -183,7 +195,7 @@ class AccountSettingsPage extends React.Component {
    } else {
      this.props.saveSettings(formId, values);
    }
-  };
+  }

  isEditable(fieldName) {
    return !this.props.staticFields.includes(fieldName);
@@ -247,28 +259,27 @@ class AccountSettingsPage extends React.Component {
    );
  }

-  renderFullNameHelpText = (status, proctoredExamId) => {
-    if (!this.props.verifiedNameHistory) {
+  renderFullNameHelpText = (status) => {
+    if (
+      !this.props.verifiedNameHistory
+      || !this.props.verifiedNameEnabled
+    ) {
      return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text']);
    }

-    let messageString = 'account.settings.field.full.name.help.text';
-
-    if (status === 'submitted') {
-      messageString += '.submitted';
-      if (proctoredExamId) {
-        messageString += '.proctored';
-      }
-    } else {
-      messageString += '.default';
+    switch (status) {
+      case 'submitted':
+        if (this.props.committedValues.useVerifiedNameForCerts) {
+          return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.submitted']);
+        }
+        return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.submitted.certificate']);
+      default:
+        if (this.props.committedValues.useVerifiedNameForCerts) {
+          return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.non.certificate']);
+        }
+        return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.certificate']);
    }
-
-    if (!this.props.committedValues.useVerifiedNameForCerts) {
-      messageString += '.certificate';
-    }
-
-    return this.props.intl.formatMessage(messages[messageString]);
-  };
+  }

  renderVerifiedNameSuccessMessage = (verifiedName, created) => {
    const dateValue = new Date(created).valueOf();
@@ -283,7 +294,7 @@ class AccountSettingsPage extends React.Component {
        body={this.props.intl.formatMessage(messages['account.settings.field.name.verified.success.message'])}
      />
    );
-  };
+  }

  renderVerifiedNameFailureMessage = (verifiedName, created) => {
    const dateValue = new Date(created).valueOf();
@@ -314,7 +325,7 @@ class AccountSettingsPage extends React.Component {
        }
      />
    );
-  };
+  }

  renderVerifiedNameSubmittedMessage = (willCertNameChange) => (
    <Alert
@@ -332,7 +343,7 @@ class AccountSettingsPage extends React.Component {
        }
      </p>
    </Alert>
-  );
+  )

  renderVerifiedNameMessage = verifiedNameRecord => {
    const {
@@ -340,7 +351,6 @@ class AccountSettingsPage extends React.Component {
      status,
      profile_name: profileName,
      verified_name: verifiedName,
-      proctored_exam_attempt_id: proctoredExamId,
    } = verifiedNameRecord;
    let willCertNameChange = false;

@@ -359,10 +369,6 @@ class AccountSettingsPage extends React.Component {
      willCertNameChange = true;
    }

-    if (proctoredExamId) {
-      return null;
-    }
-
    switch (status) {
      case 'approved':
        return this.renderVerifiedNameSuccessMessage(verifiedName, created);
@@ -373,7 +379,7 @@ class AccountSettingsPage extends React.Component {
      default:
        return null;
    }
-  };
+  }

  renderVerifiedNameIcon = (status) => {
    switch (status) {
@@ -384,32 +390,24 @@ class AccountSettingsPage extends React.Component {
      default:
        return null;
    }
-  };
+  }

-  renderVerifiedNameHelpText = (status, proctoredExamId) => {
-    let messageStr = 'account.settings.field.name.verified.help.text';
-
-    // add additional string based on status
-    if (status === 'approved') {
-      messageStr += '.verified';
-    } else if (status === 'submitted') {
-      messageStr += '.submitted';
-    } else {
-      return null;
+  renderVerifiedNameHelpText = (status) => {
+    switch (status) {
+      case 'approved':
+        if (this.props.committedValues.useVerifiedNameForCerts) {
+          return this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.certificate']);
+        }
+        return this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.verified']);
+      case 'submitted':
+        if (this.props.committedValues.useVerifiedNameForCerts) {
+          return this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.submitted.certificate']);
+        }
+        return this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.submitted']);
+      default:
+        return null;
    }
-
-    // add additional string if verified name came from a proctored exam attempt
-    if (proctoredExamId) {
-      messageStr += '.proctored';
-    }
-
-    // add additional string based on certificate name use
-    if (this.props.committedValues.useVerifiedNameForCerts) {
-      messageStr += '.certificate';
-    }
-
-    return this.props.intl.formatMessage(messages[messageStr]);
-  };
+  }

  renderEmptyStaticFieldMessage() {
    if (this.isManagedProfile()) {
@@ -473,7 +471,7 @@ class AccountSettingsPage extends React.Component {
    // Show State field only if the country is US (could include Canada later)
    const showState = this.props.formValues.country === COUNTRY_WITH_STATES;

-    const { verifiedName } = this.props;
+    const { verifiedName, verifiedNameEnabled } = this.props;

    const timeZoneOptions = this.getLocalizedTimeZoneOptions(
      this.props.timeZoneOptions,
@@ -482,39 +480,15 @@ class AccountSettingsPage extends React.Component {
    );

    const hasLinkedTPA = findIndex(this.props.tpaProviders, provider => provider.connected) >= 0;
-
-    // if user is under 13 and does not have cookie set
-    const shouldUpdateDOB = (
-      getConfig().ENABLE_COPPA_COMPLIANCE
-      && getConfig().ENABLE_DOB_UPDATE
-      && this.props.formValues.year_of_birth.toString() >= COPPA_COMPLIANCE_YEAR.toString()
-      && !localStorage.getItem('submittedDOB')
-    );
    return (
      <>
-        { shouldUpdateDOB
-          && (
-          <DOBModal
-            {...editableFieldProps}
-          />
-          )}
-        <div className="account-section pt-3 mb-5" id="basic-information" ref={this.navLinkRefs['#basic-information']}>
+        <div className="account-section" id="basic-information" ref={this.navLinkRefs['#basic-information']}>
          {
-            this.props.mostRecentVerifiedName
+            verifiedNameEnabled && this.props.mostRecentVerifiedName
            && this.renderVerifiedNameMessage(this.props.mostRecentVerifiedName)
          }
-          {localStorage.getItem('submittedDOB')
-            && (
-            <OneTimeDismissibleAlert
-              id="updated-dob"
-              variant="success"
-              icon={CheckCircle}
-              header={this.props.intl.formatMessage(messages['account.settings.field.dob.form.success'])}
-              body=""
-            />
-            )}

-          <h2 className="section-heading h4 mb-3">
+          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.account.information'])}
          </h2>
          <p>{this.props.intl.formatMessage(messages['account.settings.section.account.information.description'])}</p>
@@ -538,7 +512,8 @@ class AccountSettingsPage extends React.Component {
            name="name"
            type="text"
            value={
-              verifiedName?.status === 'submitted'
+              verifiedNameEnabled
+              && verifiedName?.status === 'submitted'
              && this.props.formValues.pending_name_change
                ? this.props.formValues.pending_name_change
                : this.props.formValues.name
@@ -550,22 +525,22 @@ class AccountSettingsPage extends React.Component {
                : this.renderEmptyStaticFieldMessage()
            }
            helpText={
-              verifiedName
-                ? this.renderFullNameHelpText(verifiedName.status, verifiedName.proctored_exam_attempt_id)
+              verifiedNameEnabled && verifiedName
+                ? this.renderFullNameHelpText(verifiedName.status)
                : this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])
            }
            isEditable={
-              verifiedName
+              verifiedNameEnabled && verifiedName
                ? this.isEditable('verifiedName') && this.isEditable('name')
                : this.isEditable('name')
            }
            isGrayedOut={
-              verifiedName && !this.isEditable('verifiedName')
+              verifiedNameEnabled && verifiedName && !this.isEditable('verifiedName')
            }
            onChange={this.handleEditableFieldChange}
            onSubmit={this.handleSubmitProfileName}
          />
-          {verifiedName
+          {verifiedNameEnabled && verifiedName
            && (
            <EditableField
              name="verified_name"
@@ -581,7 +556,7 @@ class AccountSettingsPage extends React.Component {
                  </div>
                )
              }
-              helpText={this.renderVerifiedNameHelpText(verifiedName.status, verifiedName.proctored_exam_attempt_id)}
+              helpText={this.renderVerifiedNameHelpText(verifiedName.status)}
              isEditable={this.isEditable('verifiedName')}
              isGrayedOut={!this.isEditable('verifiedName')}
              onChange={this.handleEditableFieldChange}
@@ -608,19 +583,16 @@ class AccountSettingsPage extends React.Component {
          />
          {this.renderSecondaryEmailField(editableFieldProps)}
          <ResetPassword email={this.props.formValues.email} />
-          {(!getConfig().ENABLE_COPPA_COMPLIANCE)
-            && (
-            <EditableSelectField
-              name="year_of_birth"
-              type="select"
-              label={this.props.intl.formatMessage(messages['account.settings.field.dob'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.dob.empty'])}
-              value={this.props.formValues.year_of_birth}
-              options={yearOfBirthOptions}
-              {...editableFieldProps}
-            />
-            )}
-          <EditableSelectField
+          <EditableField
+            name="year_of_birth"
+            type="select"
+            label={this.props.intl.formatMessage(messages['account.settings.field.dob'])}
+            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.dob.empty'])}
+            value={this.props.formValues.year_of_birth}
+            options={yearOfBirthOptions}
+            {...editableFieldProps}
+          />
+          <EditableField
            name="country"
            type="select"
            value={this.props.formValues.country}
@@ -636,7 +608,7 @@ class AccountSettingsPage extends React.Component {
          />
          {showState
            && (
-            <EditableSelectField
+            <EditableField
              name="state"
              type="select"
              value={this.props.formValues.state}
@@ -653,23 +625,21 @@ class AccountSettingsPage extends React.Component {
            )}
        </div>

-        <div className="account-section pt-3 mb-5" id="profile-information" ref={this.navLinkRefs['#profile-information']}>
-          <h2 className="section-heading h4 mb-3">
+        <div className="account-section" id="profile-information" ref={this.navLinkRefs['#profile-information']}>
+          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.profile.information'])}
          </h2>

-          <EditableSelectField
+          <EditableField
            name="level_of_education"
            type="select"
            value={this.props.formValues.level_of_education}
-            options={getConfig().ENABLE_COPPA_COMPLIANCE
-              ? educationLevelOptions.filter(option => option.value !== 'el')
-              : educationLevelOptions}
+            options={educationLevelOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.education'])}
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.education.empty'])}
            {...editableFieldProps}
          />
-          <EditableSelectField
+          <EditableField
            name="gender"
            type="select"
            value={this.props.formValues.gender}
@@ -678,7 +648,7 @@ class AccountSettingsPage extends React.Component {
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.gender.empty'])}
            {...editableFieldProps}
          />
-          <EditableSelectField
+          <EditableField
            name="language_proficiencies"
            type="select"
            value={this.props.formValues.language_proficiencies}
@@ -698,8 +668,8 @@ class AccountSettingsPage extends React.Component {
            )}
        </div>
        {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && this.renderDemographicsSection()}
-        <div className="account-section pt-3 mb-5" id="social-media">
-          <h2 className="section-heading h4 mb-3">
+        <div className="account-section" id="social-media">
+          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.social.media'])}
          </h2>
          <p>
@@ -735,13 +705,13 @@ class AccountSettingsPage extends React.Component {
          />
        </div>

-        <div className="account-section pt-3 mb-5" id="site-preferences" ref={this.navLinkRefs['#site-preferences']}>
-          <h2 className="section-heading h4 mb-3">
+        <div className="account-section" id="site-preferences" ref={this.navLinkRefs['#site-preferences']}>
+          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.site.preferences'])}
          </h2>

          <BetaLanguageBanner />
-          <EditableSelectField
+          <EditableField
            name="siteLanguage"
            type="select"
            options={this.props.siteLanguageOptions}
@@ -750,7 +720,7 @@ class AccountSettingsPage extends React.Component {
            helpText={this.props.intl.formatMessage(messages['account.settings.field.site.language.help.text'])}
            {...editableFieldProps}
          />
-          <EditableSelectField
+          <EditableField
            name="time_zone"
            type="select"
            value={this.props.formValues.time_zone}
@@ -766,8 +736,8 @@ class AccountSettingsPage extends React.Component {
          />
        </div>

-        <div className="account-section pt-3 mb-5" id="linked-accounts" ref={this.navLinkRefs['#linked-accounts']}>
-          <h2 className="section-heading h4 mb-3">{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts'])}</h2>
+        <div className="account-section" id="linked-accounts" ref={this.navLinkRefs['#linked-accounts']}>
+          <h2 className="section-heading">{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts'])}</h2>
          <p>
            {this.props.intl.formatMessage(
              messages['account.settings.section.linked.accounts.description'],
@@ -777,7 +747,7 @@ class AccountSettingsPage extends React.Component {
          <ThirdPartyAuth />
        </div>

-        <div className="account-section pt-3 mb-5" id="delete-account" ref={this.navLinkRefs['#delete-account']}>
+        <div className="account-section" id="delete-account" ref={this.navLinkRefs['#delete-account']}>
          <DeleteAccount
            isVerifiedAccount={this.props.isActive}
            hasLinkedTPA={hasLinkedTPA}
@@ -914,21 +884,19 @@ AccountSettingsPage.propTypes = {
  nameChangeModal: PropTypes.shape({
    formId: PropTypes.string,
  }),
+  verifiedNameEnabled: PropTypes.bool,
  verifiedName: PropTypes.shape({
    verified_name: PropTypes.string,
    status: PropTypes.string,
-    proctored_exam_attempt_id: PropTypes.number,
  }),
  mostRecentVerifiedName: PropTypes.shape({
    verified_name: PropTypes.string,
    status: PropTypes.string,
-    proctored_exam_attempt_id: PropTypes.number,
  }),
  verifiedNameHistory: PropTypes.arrayOf(
    PropTypes.shape({
      verified_name: PropTypes.string,
      status: PropTypes.string,
-      proctored_exam_attempt_id: PropTypes.number,
    }),
  ),
 };
@@ -953,6 +921,7 @@ AccountSettingsPage.defaultProps = {
  isActive: true,
  secondary_email_enabled: false,
  nameChangeModal: {},
+  verifiedNameEnabled: false,
  verifiedName: null,
  mostRecentVerifiedName: {},
  verifiedNameHistory: [],
--- a/src/account-settings/AccountSettingsPage.messages.jsx
+++ b/src/account-settings/AccountSettingsPage.messages.jsx
@@ -91,13 +91,13 @@ const messages = defineMessages({
    defaultMessage: 'The name that is used for ID verification and that appears on your certificates.',
    description: 'Help text for the account settings name field.',
  },
-  'account.settings.field.full.name.help.text.default': {
-    id: 'account.settings.field.full.name.help.text.default',
+  'account.settings.field.full.name.help.text.non.certificate': {
+    id: 'account.settings.field.full.name.help.text.non.certificate',
    defaultMessage: 'The name that appears on your public profile.',
    description: 'Help text for the account settings name field.',
  },
-  'account.settings.field.full.name.help.text.default.certificate': {
-    id: 'account.settings.field.full.name.help.text.default.certificate',
+  'account.settings.field.full.name.help.text.certificate': {
+    id: 'account.settings.field.full.name.help.text.certificate',
    defaultMessage: 'This name is selected to appear on your certificates and public-facing records.',
    description: 'Help text for the account settings name field.',
  },
@@ -108,47 +108,27 @@ const messages = defineMessages({
  },
  'account.settings.field.name.verified.help.text.verified': {
    id: 'account.settings.field.name.verified.help.text.verified',
-    defaultMessage: 'This name has been verified by photo ID.',
+    defaultMessage: 'This name has been verified by government ID.',
    description: 'Help text for the account settings verified name field when the name is verified.',
  },
-  'account.settings.field.name.verified.help.text.verified.proctored': {
-    id: 'account.settings.field.name.verified.help.text.verified.proctored',
-    defaultMessage: 'This name has been verified by proctoring.',
-    description: 'Help text for the account settings verified name field when the name is verified through proctoring.',
-  },
-  'account.settings.field.name.verified.help.text.verified.certificate': {
-    id: 'account.settings.field.name.verified.help.text.verified.certificate',
-    defaultMessage: 'This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.',
+  'account.settings.field.name.verified.help.text.certificate': {
+    id: 'account.settings.field.name.verified.help.text.certificate',
+    defaultMessage: 'This name has been verified by government ID and selected to appear on your certificates and public-facing records.',
    description: 'Help text for the account settings verified name field when the name is selected for certificates.',
  },
-  'account.settings.field.name.verified.help.text.verified.proctored.certificate': {
-    id: 'account.settings.field.name.verified.help.text.verified.proctored.certificate',
-    defaultMessage: 'This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.',
-    description: 'Help text for the account settings verified name field when the name is selected for certificates, and the name is verified through proctoring.',
-  },
  'account.settings.field.name.verified.help.text.submitted': {
    id: 'account.settings.field.name.verified.help.text.submitted',
    defaultMessage: 'Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.',
    description: 'Help text for the account settings verified name field when a verified name has been submitted.',
  },
-  'account.settings.field.name.verified.help.text.submitted.proctored': {
-    id: 'account.settings.field.name.verified.help.text.submitted.proctored',
-    defaultMessage: 'Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.',
-    description: 'Help text for the account settings verified name field when a verified name has been submitted through proctoring.',
-  },
  'account.settings.field.name.verified.help.text.submitted.certificate': {
    id: 'account.settings.field.name.verified.help.text.submitted.certificate',
    defaultMessage: 'When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.',
    description: 'Help text for the account settings verified name field when a verified name has been submitted and will appear on certificates.',
  },
-  'account.settings.field.name.verified.help.text.submitted.proctored.certificate': {
-    id: 'account.settings.field.name.verified.help.text.submitted.proctored.certificate',
-    defaultMessage: 'Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.',
-    description: 'Help text for the account settings verified name field when a verified name has been submitted through proctoring and will appear on certificates.',
-  },
  'account.settings.field.name.verified.verification.alert': {
    id: 'account.settings.field.name.verified.verification.help',
-    defaultMessage: 'Enter your name as it appears on your unexpired student, work, or government-issued identification card.',
+    defaultMessage: 'Enter your name as it appears on your government-issued ID.',
    description: 'Form label instructing the user to enter the name on their ID.',
  },
  'account.settings.field.full.name.help.text.submitted': {
@@ -156,21 +136,11 @@ const messages = defineMessages({
    defaultMessage: 'Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.',
    description: 'Help text for the account settings full name field when a verified name has been submitted.',
  },
-  'account.settings.field.full.name.help.text.submitted.proctored': {
-    id: 'account.settings.field.full.name.help.text.submitted.proctored',
-    defaultMessage: 'Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.',
-    description: 'Help text for the account settings full name field when a verified name has been submitted through proctoring.',
-  },
  'account.settings.field.full.name.help.text.submitted.certificate': {
    id: 'account.settings.field.full.name.help.text.submitted.certificate',
    defaultMessage: 'When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.',
    description: 'Help text for the account settings full name field when a full name has been submitted and will appear on certificates.',
  },
-  'account.settings.field.full.name.help.text.submitted.proctored.certificate': {
-    id: 'account.settings.field.full.name.help.text.submitted.proctored.certificate',
-    defaultMessage: 'Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.',
-    description: 'Help text for the account settings full name field when a full name has been submitted and will appear on certificates.',
-  },
  'account.settings.field.name.verified.success.message': {
    id: 'account.settings.field.name.verified.success.message',
    defaultMessage: 'Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.',
@@ -266,56 +236,6 @@ const messages = defineMessages({
    defaultMessage: 'Select a year of birth',
    description: 'Option for empty value on account settings year of birth field.',
  },
-  'account.settings.field.dob.month': {
-    id: 'account.settings.field.dob.month',
-    defaultMessage: 'Month',
-    description: 'Label for account settings month of birth field.',
-  },
-  'account.settings.field.dob.year': {
-    id: 'account.settings.field.dob.year',
-    defaultMessage: 'Year',
-    description: 'Label for account settings year of birth field.',
-  },
-  'account.settings.field.dob.month.default': {
-    id: 'account.settings.field.month.year.default',
-    defaultMessage: 'Select month',
-    description: 'Default label for account settings month of birth field.',
-  },
-  'account.settings.field.dob.year.default': {
-    id: 'account.settings.field.dob.year.default',
-    defaultMessage: 'Select year',
-    description: 'Default label for account settings year of birth field.',
-  },
-  'account.settings.field.dob.form.button': {
-    id: 'account.settings.field.dob.form.button',
-    defaultMessage: 'Please confirm your date of birth',
-    description: 'Message to prompt user to enter dob',
-  },
-  'account.settings.field.dob.form.title': {
-    id: 'account.settings.field.dob.form.title',
-    defaultMessage: 'Enter your birth month and year',
-    description: 'Title of DOB form',
-  },
-  'account.settings.field.dob.form.help.text': {
-    id: 'account.settings.field.dob.form.help.text',
-    defaultMessage: 'We ask for birth month and year information to help us comply with our legal obligations.',
-    description: 'Help text for DOB form',
-  },
-  'account.settings.field.dob.form.success': {
-    id: 'account.settings.field.dob.form.success',
-    defaultMessage: 'Thank you for entering your information.',
-    description: 'Title of banner when date of birth is successfully entered',
-  },
-  'account.settings.field.month_of_birth.options.empty': {
-    id: 'account.settings.field.month_of_birth.options.empty',
-    defaultMessage: 'Select a month of birth',
-    description: 'Option for empty value on account settings month of birth field.',
-  },
-  'account.settingsfield.dob.error.general': {
-    id: 'account.settingsfield.dob.error.general',
-    defaultMessage: 'A technical error occurred. Please try again.',
-    description: 'Generic error message.',
-  },
  'account.settings.field.country': {
    id: 'account.settings.field.country',
    defaultMessage: 'Country',
--- a/src/account-settings/Alert.jsx
+++ b/src/account-settings/Alert.jsx
@@ -2,16 +2,18 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';

-const Alert = (props) => (
-  <div className={classNames('alert d-flex align-items-start', props.className)}>
-    <div>
-      {props.icon}
+function Alert(props) {
+  return (
+    <div className={classNames('alert d-flex align-items-start', props.className)}>
+      <div>
+        {props.icon}
+      </div>
+      <div>
+        {props.children}
+      </div>
    </div>
-    <div>
-      {props.children}
-    </div>
-  </div>
-);
+  );
+}

 Alert.propTypes = {
  className: PropTypes.string,
--- a/src/account-settings/DOBForm.jsx
+++ b/src/account-settings/DOBForm.jsx
@@ -1,162 +0,0 @@
-import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Form, StatefulButton, ModalDialog, ActionRow, useToggle, Button,
-} from '@edx/paragon';
-import React, { useCallback, useEffect, useState } from 'react';
-import { connect, useDispatch } from 'react-redux';
-import messages from './AccountSettingsPage.messages';
-import { YEAR_OF_BIRTH_OPTIONS } from './data/constants';
-import { editableFieldSelector } from './data/selectors';
-import { saveSettingsReset } from './data/actions';
-
-const DOBModal = (props) => {
-  const {
-    saveState,
-    error,
-    onSubmit,
-    intl,
-  } = props;
-
-  const dispatch = useDispatch();
-
-  // eslint-disable-next-line no-unused-vars
-  const [isOpen, open, close, toggle] = useToggle(true, {});
-  const [monthValue, setMonthValue] = useState('');
-  const [yearValue, setYearValue] = useState('');
-
-  const handleChange = (e) => {
-    e.preventDefault();
-
-    if (e.target.name === 'month') {
-      setMonthValue(e.target.value);
-    } else if (e.target.name === 'year') {
-      setYearValue(e.target.value);
-    }
-  };
-
-  const handleSubmit = (e) => {
-    e.preventDefault();
-
-    const data = monthValue !== '' && yearValue !== '' ? [{ field_name: 'DOB', field_value: `${yearValue}-${monthValue}` }] : [];
-    onSubmit('extended_profile', data);
-  };
-
-  const handleComplete = useCallback(() => {
-    localStorage.setItem('submittedDOB', 'true');
-    close();
-    dispatch(saveSettingsReset());
-  }, [dispatch, close]);
-
-  const handleClose = useCallback(() => {
-    close();
-    dispatch(saveSettingsReset());
-  }, [dispatch, close]);
-
-  function renderErrors() {
-    if (saveState === 'error' || error) {
-      return (
-        <Form.Control.Feedback type="invalid" key="general-error">
-          {intl.formatMessage(messages['account.settingsfield.dob.error.general'])}
-        </Form.Control.Feedback>
-      );
-    }
-    return null;
-  }
-
-  useEffect(() => {
-    if (saveState === 'complete' && isOpen) {
-      handleComplete();
-    }
-  }, [handleComplete, saveState, isOpen, monthValue, yearValue]);
-
-  return (
-    <>
-      <Button variant="primary" onClick={open}>
-        {intl.formatMessage(messages['account.settings.field.dob.form.button'])}
-      </Button>
-      <ModalDialog
-        title={intl.formatMessage(messages['account.settings.field.dob.form.title'])}
-        isOpen={isOpen}
-        onClose={handleClose}
-        hasCloseButton={false}
-        variant="default"
-      >
-        <form onSubmit={handleSubmit}>
-
-          <ModalDialog.Header>
-            <ModalDialog.Title>
-              {intl.formatMessage(messages['account.settings.field.dob.form.title'])}
-            </ModalDialog.Title>
-          </ModalDialog.Header>
-
-          <ModalDialog.Body className="overflow-hidden" style={{ padding: '1.5rem' }}>
-            <p>{intl.formatMessage(messages['account.settings.field.dob.form.help.text'])}</p>
-            <Form.Group>
-              <Form.Label>
-                {intl.formatMessage(messages['account.settings.field.dob.month'])}
-              </Form.Label>
-              <Form.Control
-                as="select"
-                name="month"
-                onChange={handleChange}
-              >
-                <option value="">{intl.formatMessage(messages['account.settings.field.dob.month.default'])}</option>
-                {[...Array(12).keys()].map(month => (
-                  <option key={month + 1} value={month + 1}>{month + 1}</option>
-                ))}
-              </Form.Control>
-            </Form.Group>
-            <Form.Group>
-              <Form.Label>
-                {intl.formatMessage(messages['account.settings.field.dob.year'])}
-              </Form.Label>
-              <Form.Control
-                as="select"
-                name="year"
-                onChange={handleChange}
-              >
-                <option value="">{intl.formatMessage(messages['account.settings.field.dob.year.default'])}</option>
-                {YEAR_OF_BIRTH_OPTIONS.map(year => (
-                  <option key={year.value} value={year.value}>{year.label}</option>
-                ))}
-              </Form.Control>
-            </Form.Group>
-            {renderErrors()}
-          </ModalDialog.Body>
-
-          <ModalDialog.Footer>
-            <ActionRow>
-              <ModalDialog.CloseButton variant="tertiary">
-                Cancel
-              </ModalDialog.CloseButton>
-              <StatefulButton
-                type="submit"
-                state={!(monthValue && yearValue) ? 'unedited' : saveState}
-                labels={{
-                  default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
-                }}
-                disabledStates={['unedited']}
-              />
-            </ActionRow>
-          </ModalDialog.Footer>
-
-        </form>
-      </ModalDialog>
-    </>
-  );
-};
-
-DOBModal.propTypes = {
-  saveState: PropTypes.oneOf(['default', 'pending', 'complete', 'error']),
-  error: PropTypes.string,
-  onSubmit: PropTypes.func.isRequired,
-  intl: intlShape.isRequired,
-};
-
-DOBModal.defaultProps = {
-  saveState: undefined,
-  error: undefined,
-};
-
-export default connect(editableFieldSelector)(injectIntl(DOBModal));
--- a/src/account-settings/EditableField.jsx
+++ b/src/account-settings/EditableField.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
-  Button, Form, StatefulButton,
+  Button, Input, StatefulButton, ValidationFormGroup,
 } from '@edx/paragon';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -18,7 +18,7 @@ import {
 import { editableFieldSelector } from './data/selectors';
 import CertificatePreference from './certificate-preference/CertificatePreference';

-const EditableField = (props) => {
+function EditableField(props) {
  const {
    name,
    label,
@@ -26,6 +26,7 @@ const EditableField = (props) => {
    type,
    value,
    userSuppliedValue,
+    options,
    saveState,
    error,
    confirmationMessageDefinition,
@@ -73,6 +74,15 @@ const EditableField = (props) => {
    }
    let finalValue = rawValue;

+    if (options) {
+      // Use == instead of === to prevent issues when HTML casts numbers as strings
+      // eslint-disable-next-line eqeqeq
+      const selectedOption = options.find(option => option.value == rawValue);
+      if (selectedOption) {
+        finalValue = selectedOption.label;
+      }
+    }
+
    if (userSuppliedValue) {
      finalValue += `: ${userSuppliedValue}`;
    }
@@ -96,24 +106,25 @@ const EditableField = (props) => {
        editing: (
          <>
            <form onSubmit={handleSubmit}>
-              <Form.Group
-                controlId={id}
-                isInvalid={error != null}
+              <ValidationFormGroup
+                for={id}
+                invalid={error != null}
+                invalidMessage={error}
+                helpText={helpText}
              >
-                <Form.Label size="sm" className="h6 d-block" htmlFor={id}>{label}</Form.Label>
-                <Form.Control
+                <label className="h6 d-block" htmlFor={id}>{label}</label>
+                <Input
                  data-hj-suppress
                  name={name}
                  id={id}
                  type={type}
                  value={value}
                  onChange={handleChange}
+                  options={options}
                  {...others}
                />
-                {!!helpText && <Form.Text>{helpText}</Form.Text>}
-                {error != null && <Form.Control.Feedback hasIcon={false}>{error}</Form.Control.Feedback>}
-                {others.children}
-              </Form.Group>
+                <>{others.children}</>
+              </ValidationFormGroup>
              <p>
                <StatefulButton
                  type="submit"
@@ -162,7 +173,7 @@ const EditableField = (props) => {
      }}
    />
  );
-};
+}

 EditableField.propTypes = {
  name: PropTypes.string.isRequired,
@@ -171,6 +182,10 @@ EditableField.propTypes = {
  type: PropTypes.string.isRequired,
  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
  userSuppliedValue: PropTypes.string,
+  options: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  })),
  saveState: PropTypes.oneOf(['default', 'pending', 'complete', 'error']),
  error: PropTypes.string,
  confirmationMessageDefinition: PropTypes.shape({
@@ -192,6 +207,7 @@ EditableField.propTypes = {

 EditableField.defaultProps = {
  value: undefined,
+  options: undefined,
  saveState: undefined,
  label: undefined,
  emptyLabel: undefined,
--- a/src/account-settings/EditableSelectField.jsx
+++ b/src/account-settings/EditableSelectField.jsx
@@ -1,232 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Button, Form, StatefulButton,
-} from '@edx/paragon';
-import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import SwitchContent from './SwitchContent';
-import messages from './AccountSettingsPage.messages';
-
-import {
-  openForm,
-  closeForm,
-} from './data/actions';
-import { editableFieldSelector } from './data/selectors';
-import CertificatePreference from './certificate-preference/CertificatePreference';
-
-const EditableSelectField = (props) => {
-  const {
-    name,
-    label,
-    emptyLabel,
-    type,
-    value,
-    userSuppliedValue,
-    options,
-    saveState,
-    error,
-    confirmationMessageDefinition,
-    confirmationValue,
-    helpText,
-    onEdit,
-    onCancel,
-    onSubmit,
-    onChange,
-    isEditing,
-    isEditable,
-    isGrayedOut,
-    intl,
-    ...others
-  } = props;
-  const id = `field-${name}`;
-
-  const handleSubmit = (e) => {
-    e.preventDefault();
-    onSubmit(name, new FormData(e.target).get(name));
-  };
-
-  const handleChange = (e) => {
-    onChange(name, e.target.value);
-  };
-
-  const handleEdit = () => {
-    onEdit(name);
-  };
-
-  const handleCancel = () => {
-    onCancel(name);
-  };
-
-  const renderEmptyLabel = () => {
-    if (isEditable) {
-      return <Button variant="link" onClick={handleEdit} className="p-0">{emptyLabel}</Button>;
-    }
-    return <span className="text-muted">{emptyLabel}</span>;
-  };
-
-  const renderValue = (rawValue) => {
-    if (!rawValue) {
-      return renderEmptyLabel();
-    }
-    let finalValue = rawValue;
-
-    if (options) {
-      // Use == instead of === to prevent issues when HTML casts numbers as strings
-      // eslint-disable-next-line eqeqeq
-      const selectedOption = options.find(option => option.value == rawValue);
-      if (selectedOption) {
-        finalValue = selectedOption.label;
-      }
-    }
-
-    if (userSuppliedValue) {
-      finalValue += `: ${userSuppliedValue}`;
-    }
-
-    return finalValue;
-  };
-
-  const renderConfirmationMessage = () => {
-    if (!confirmationMessageDefinition || !confirmationValue) {
-      return null;
-    }
-    return intl.formatMessage(confirmationMessageDefinition, {
-      value: confirmationValue,
-    });
-  };
-  const selectOptions = options.map(option => (
-    <option value={option.value} key={`${option.value}-${option.label}`}>{option.label}</option>
-  ));
-
-  return (
-    <SwitchContent
-      expression={isEditing ? 'editing' : 'default'}
-      cases={{
-        editing: (
-          <>
-            <form onSubmit={handleSubmit}>
-              <Form.Group
-                controlId={id}
-                isInvalid={error != null}
-              >
-                <Form.Label size="sm" className="h6 d-block" htmlFor={id}>{label}</Form.Label>
-                <Form.Control
-                  data-hj-suppress
-                  name={name}
-                  id={id}
-                  type={type}
-                  as={type}
-                  value={value}
-                  onChange={handleChange}
-                  {...others}
-                >
-                  {options.length > 0 && selectOptions}
-                </Form.Control>
-                {!!helpText && <Form.Text>{helpText}</Form.Text>}
-                {error != null && <Form.Control.Feedback>{error}</Form.Control.Feedback>}
-                {others.children}
-              </Form.Group>
-              <p>
-                <StatefulButton
-                  type="submit"
-                  className="mr-2"
-                  state={saveState}
-                  labels={{
-                    default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
-                  }}
-                  onClick={(e) => {
-                    // Swallow clicks if the state is pending.
-                    // We do this instead of disabling the button to prevent
-                    // it from losing focus (disabled elements cannot have focus).
-                    // Disabling it would causes upstream issues in focus management.
-                    // Swallowing the onSubmit event on the form would be better, but
-                    // we would have to add that logic for every field given our
-                    // current structure of the application.
-                    if (saveState === 'pending') { e.preventDefault(); }
-                  }}
-                  disabledStates={[]}
-                />
-                <Button
-                  variant="outline-primary"
-                  onClick={handleCancel}
-                >
-                  {intl.formatMessage(messages['account.settings.editable.field.action.cancel'])}
-                </Button>
-              </p>
-            </form>
-            {['name', 'verified_name'].includes(name) && <CertificatePreference fieldName={name} />}
-          </>
-        ),
-        default: (
-          <div className="form-group">
-            <div className="d-flex align-items-start">
-              <h6 aria-level="3">{label}</h6>
-              {isEditable ? (
-                <Button variant="link" onClick={handleEdit} className="ml-3">
-                  <FontAwesomeIcon className="mr-1" icon={faPencilAlt} />{intl.formatMessage(messages['account.settings.editable.field.action.edit'])}
-                </Button>
-              ) : null}
-            </div>
-            <p data-hj-suppress className={isGrayedOut ? 'grayed-out' : null}>{renderValue(value)}</p>
-            <p className="small text-muted mt-n2">{renderConfirmationMessage() || helpText}</p>
-          </div>
-        ),
-      }}
-    />
-  );
-};
-
-EditableSelectField.propTypes = {
-  name: PropTypes.string.isRequired,
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.node]),
-  emptyLabel: PropTypes.node,
-  type: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  userSuppliedValue: PropTypes.string,
-  options: PropTypes.arrayOf(PropTypes.shape({
-    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  })),
-  saveState: PropTypes.oneOf(['default', 'pending', 'complete', 'error']),
-  error: PropTypes.string,
-  confirmationMessageDefinition: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    description: PropTypes.string,
-  }),
-  confirmationValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  helpText: PropTypes.node,
-  onEdit: PropTypes.func.isRequired,
-  onCancel: PropTypes.func.isRequired,
-  onSubmit: PropTypes.func.isRequired,
-  onChange: PropTypes.func.isRequired,
-  isEditing: PropTypes.bool,
-  isEditable: PropTypes.bool,
-  isGrayedOut: PropTypes.bool,
-  intl: intlShape.isRequired,
-};
-
-EditableSelectField.defaultProps = {
-  value: undefined,
-  options: [],
-  saveState: undefined,
-  label: undefined,
-  emptyLabel: undefined,
-  error: undefined,
-  confirmationMessageDefinition: undefined,
-  confirmationValue: undefined,
-  helpText: undefined,
-  isEditing: false,
-  isEditable: true,
-  isGrayedOut: false,
-  userSuppliedValue: undefined,
-};
-
-export default connect(editableFieldSelector, {
-  onEdit: openForm,
-  onCancel: closeForm,
-})(injectIntl(EditableSelectField));
--- a/src/account-settings/EmailField.jsx
+++ b/src/account-settings/EmailField.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
 import {
-  Button, StatefulButton, Form,
+  Button, StatefulButton, Input, ValidationFormGroup,
 } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
@@ -18,7 +18,7 @@ import {
 } from './data/actions';
 import { editableFieldSelector } from './data/selectors';

-const EmailField = (props) => {
+function EmailField(props) {
  const {
    name,
    label,
@@ -106,12 +106,14 @@ const EmailField = (props) => {
      cases={{
        editing: (
          <form onSubmit={handleSubmit}>
-            <Form.Group
-              controlId={id}
-              isInvalid={error != null}
+            <ValidationFormGroup
+              for={id}
+              invalid={error != null}
+              invalidMessage={error}
+              helpText={helpText}
            >
-              <Form.Label className="h6 d-block" htmlFor={id}>{label}</Form.Label>
-              <Form.Control
+              <label className="h6 d-block" htmlFor={id}>{label}</label>
+              <Input
                data-hj-suppress
                name={name}
                id={id}
@@ -119,9 +121,7 @@ const EmailField = (props) => {
                value={value}
                onChange={handleChange}
              />
-              {!!helpText && <Form.Text>{helpText}</Form.Text>}
-              {error != null && <Form.Control.Feedback hasIcon={false}>{error}</Form.Control.Feedback>}
-            </Form.Group>
+            </ValidationFormGroup>
            <p>
              <StatefulButton
                type="submit"
@@ -169,7 +169,7 @@ const EmailField = (props) => {
      }}
    />
  );
-};
+}

 EmailField.propTypes = {
  name: PropTypes.string.isRequired,
--- a/src/account-settings/JumpNav.jsx
+++ b/src/account-settings/JumpNav.jsx
@@ -1,20 +1,15 @@
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { breakpoints, useWindowSize } from '@edx/paragon';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
 import React from 'react';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { NavHashLink } from 'react-router-hash-link';
 import Scrollspy from 'react-scrollspy';
+
+import { getConfig } from '@edx/frontend-platform';
+import PropTypes from 'prop-types';
 import messages from './AccountSettingsPage.messages';

-const JumpNav = ({
-  intl,
-  displayDemographicsLink,
-}) => {
-  const stickToTop = useWindowSize().width > breakpoints.small.minWidth;
+function JumpNav({ intl, displayDemographicsLink }) {
  return (
-    <div className={classNames('jump-nav', { 'jump-nav-sm position-sticky pt-3': stickToTop })}>
+    <div className="jump-nav">
      <Scrollspy
        items={[
          'basic-information',
@@ -69,7 +64,7 @@ const JumpNav = ({
      </Scrollspy>
    </div>
  );
-};
+}

 JumpNav.propTypes = {
  intl: intlShape.isRequired,
--- a/src/account-settings/NotFoundPage.jsx
+++ b/src/account-settings/NotFoundPage.jsx
@@ -1,16 +1,16 @@
 import React from 'react';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';

-const NotFoundPage = () => (
-  <div className="container-fluid d-flex py-5 justify-content-center align-items-start text-center">
-    <p className="my-0 py-5 text-muted" style={{ maxWidth: '32em' }}>
-      <FormattedMessage
-        id="error.notfound.message"
-        defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
-        description="Error message when a page does not exist"
-      />
-    </p>
-  </div>
-);
-
-export default NotFoundPage;
+export default function NotFoundPage() {
+  return (
+    <div className="container-fluid d-flex py-5 justify-content-center align-items-start text-center">
+      <p className="my-0 py-5 text-muted" style={{ maxWidth: '32em' }}>
+        <FormattedMessage
+          id="error.notfound.message"
+          defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
+          description="error message when a page does not exist"
+        />
+      </p>
+    </div>
+  );
+}
--- a/src/account-settings/OneTimeDismissibleAlert.jsx
+++ b/src/account-settings/OneTimeDismissibleAlert.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';

 import { Alert } from '@edx/paragon';

-const OneTimeDismissibleAlert = (props) => {
+export default function OneTimeDismissibleAlert(props) {
  const [dismissed, setDismissed] = useState(localStorage.getItem(props.id) !== 'true');

  const onClose = () => {
@@ -25,7 +25,7 @@ const OneTimeDismissibleAlert = (props) => {
      </p>
    </Alert>
  );
-};
+}

 OneTimeDismissibleAlert.propTypes = {
  id: PropTypes.string.isRequired,
@@ -41,5 +41,3 @@ OneTimeDismissibleAlert.defaultProps = {
  header: undefined,
  body: undefined,
 };
-
-export default OneTimeDismissibleAlert;
--- a/src/account-settings/SwitchContent.jsx
+++ b/src/account-settings/SwitchContent.jsx
@@ -22,7 +22,7 @@ const onChildExit = (htmlNode) => {
  }
 };

-const SwitchContent = ({ expression, cases, className }) => {
+function SwitchContent({ expression, cases, className }) {
  const getContent = (caseKey) => {
    if (cases[caseKey]) {
      if (typeof cases[caseKey] === 'string') {
@@ -48,7 +48,7 @@ const SwitchContent = ({ expression, cases, className }) => {
      {getContent(expression)}
    </TransitionReplace>
  );
-};
+}

 SwitchContent.propTypes = {
  expression: PropTypes.string,
--- a/src/account-settings/_style.scss
+++ b/src/account-settings/_style.scss
@@ -14,11 +14,12 @@
    display: inline-block;
  }

-  .jump-nav-sm {
-    top: 1rem;
-  }
-
  .jump-nav {
+    @media (min-width: map-get($grid-breakpoints, "sm")) {
+      padding-top: 1rem;
+      position: sticky;
+      top: 1rem;
+    }

    li {
      margin-bottom: .5rem;
@@ -29,6 +30,16 @@
    }
  }

+  .section-heading {
+    @extend .h4;
+    margin-bottom: map-get($spacers, 3);
+  }
+
+  .account-section {
+    // These properties together will shift the hashlink position
+    margin-bottom: map-get($spacers, 5);
+    padding-top: 1rem;
+  }

  .custom-switch {
    padding: 0;
--- a/src/account-settings/certificate-preference/CertificatePreference.jsx
+++ b/src/account-settings/certificate-preference/CertificatePreference.jsx
@@ -21,20 +21,26 @@ import { certPreferenceSelector } from '../data/selectors';
 import commonMessages from '../AccountSettingsPage.messages';
 import messages from './messages';

-const CertificatePreference = ({
+function CertificatePreference({
  intl,
  fieldName,
  originalFullName,
  originalVerifiedName,
  saveState,
  useVerifiedNameForCerts,
-}) => {
+  verifiedNameEnabled,
+}) {
+  if (!verifiedNameEnabled || !originalVerifiedName) {
+    // If the user doesn't have an approved verified name, do not display this component
+    return null;
+  }
+
  const dispatch = useDispatch();
  const [checked, setChecked] = useState(false);
  const [modalIsOpen, setModalIsOpen] = useState(false);
  const formId = 'useVerifiedNameForCerts';

-  const handleCheckboxChange = () => {
+  function handleCheckboxChange() {
    if (!checked) {
      if (fieldName === 'verified_name') {
        dispatch(updateDraft(formId, true));
@@ -44,22 +50,22 @@ const CertificatePreference = ({
    } else {
      setModalIsOpen(true);
    }
-  };
+  }

-  const handleCancel = () => {
+  function handleCancel() {
    setModalIsOpen(false);
    dispatch(resetDrafts());
-  };
+  }

-  const handleModalChange = (e) => {
+  function handleModalChange(e) {
    if (e.target.value === 'fullName') {
      dispatch(updateDraft(formId, false));
    } else {
      dispatch(updateDraft(formId, true));
    }
-  };
+  }

-  const handleSubmit = (e) => {
+  function handleSubmit(e) {
    e.preventDefault();

    if (saveState === 'pending') {
@@ -67,30 +73,24 @@ const CertificatePreference = ({
    }

    dispatch(saveSettings(formId, useVerifiedNameForCerts));
-  };
+  }

  useEffect(() => {
-    if (originalVerifiedName) {
-      if (fieldName === 'verified_name') {
-        setChecked(useVerifiedNameForCerts);
-      } else {
-        setChecked(!useVerifiedNameForCerts);
-      }
+    if (fieldName === 'verified_name') {
+      setChecked(useVerifiedNameForCerts);
+    } else {
+      setChecked(!useVerifiedNameForCerts);
    }
-  }, [originalVerifiedName, fieldName, useVerifiedNameForCerts]);
+  }, [useVerifiedNameForCerts]);

  useEffect(() => {
-    if (originalVerifiedName) {
-      if (modalIsOpen && saveState === 'complete') {
-        setModalIsOpen(false);
-        dispatch(closeForm(fieldName));
-      }
+    if (modalIsOpen && saveState === 'complete') {
+      setModalIsOpen(false);
+      dispatch(closeForm(fieldName));
    }
-  }, [dispatch, originalVerifiedName, fieldName, modalIsOpen, saveState]);
+  }, [modalIsOpen, saveState]);

-  // If the user doesn't have an approved verified name, do not display this component
-
-  return originalVerifiedName ? (
+  return (
    <>
      <Form.Checkbox className="mt-1 mb-4" checked={checked} onChange={handleCheckboxChange}>
        {intl.formatMessage(messages['account.settings.field.name.checkbox.certificate.select'])}
@@ -151,8 +151,8 @@ const CertificatePreference = ({
        </Form>
      </ModalDialog>
    </>
-  ) : null;
-};
+  );
+}

 CertificatePreference.propTypes = {
  intl: intlShape.isRequired,
@@ -161,6 +161,7 @@ CertificatePreference.propTypes = {
  originalVerifiedName: PropTypes.string,
  saveState: PropTypes.string,
  useVerifiedNameForCerts: PropTypes.bool,
+  verifiedNameEnabled: PropTypes.bool,
 };

 CertificatePreference.defaultProps = {
@@ -168,6 +169,7 @@ CertificatePreference.defaultProps = {
  originalVerifiedName: '',
  saveState: null,
  useVerifiedNameForCerts: false,
+  verifiedNameEnabled: false,
 };

 export default connect(certPreferenceSelector)(injectIntl(CertificatePreference));
--- a/src/account-settings/certificate-preference/test/CertificatePreference.test.jsx
+++ b/src/account-settings/certificate-preference/test/CertificatePreference.test.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-import-assign */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
@@ -57,6 +56,7 @@ describe('NameChange', () => {
      originalVerifiedName: 'edX Verified',
      saveState: null,
      useVerifiedNameForCerts: false,
+      verifiedNameEnabled: true,
      intl: {},
    };

--- a/src/account-settings/coaching/CoachingConsent.jsx
+++ b/src/account-settings/coaching/CoachingConsent.jsx
@@ -17,9 +17,13 @@ import LogoSVG from '../../logo.svg';
 import { fetchSettings } from '../data/actions';
 import { coachingConsentPageSelector } from '../data/selectors';

-const Logo = ({ src, alt, ...attributes }) => <img src={src} alt={alt} {...attributes} />;
+const Logo = ({ src, alt, ...attributes }) => (
+  <>
+    <img src={src} alt={alt} {...attributes} />
+  </>
+);

-const SuccessMessage = (props) => (
+const SuccessMessage = props => (
  <div className="col-12 col-lg-6 shadow-lg mx-auto mt-4 p-5">
    <FontAwesomeIcon className="text-success" icon={faCheck} size="5x" />
    <div className="h3">{props.header}</div>
@@ -32,7 +36,6 @@ const SuccessMessage = (props) => (

 const AutoRedirect = (props) => {
  window.location.href = props.redirectUrl;
-  // eslint-disable-next-line react/jsx-no-useless-fragment
  return <></>;
 };

@@ -68,23 +71,6 @@ class CoachingConsent extends React.Component {
    this.props.fetchSettings();
  }

-  handleSubmit(e) {
-    e.preventDefault();
-    const fullName = e.target.fullName.value;
-    const phoneNumber = e.target.phoneNumber.value;
-    const body = {
-      coaching_consent: true,
-      consent_form_seen: true,
-      phone_number: phoneNumber,
-      full_name: fullName,
-    };
-    this.setState({
-      formErrors: {},
-      formSubmitted: true,
-      declineSubmitted: false,
-    }, () => this.patchUsingCoachingConsentForm(body));
-  }
-
  sanitizeForwardingUrl(url) {
    // Redirect to root of MFE if invalid next param is sent
    return url && url.startsWith(getConfig().LMS_BASE_URL) ? url : `${getConfig().LMS_BASE_URL}/dashboard/`;
@@ -113,6 +99,23 @@ class CoachingConsent extends React.Component {
    }
  }

+  handleSubmit(e) {
+    e.preventDefault();
+    const fullName = e.target.fullName.value;
+    const phoneNumber = e.target.phoneNumber.value;
+    const body = {
+      coaching_consent: true,
+      consent_form_seen: true,
+      phone_number: phoneNumber,
+      full_name: fullName,
+    };
+    this.setState({
+      formErrors: {},
+      formSubmitted: true,
+      declineSubmitted: false,
+    }, () => this.patchUsingCoachingConsentForm(body));
+  }
+
  declineCoaching(e) {
    e.preventDefault();
    const body = {
@@ -157,7 +160,6 @@ class CoachingConsent extends React.Component {
      case VIEWS.DECLINED:
        return <AutoRedirect redirectUrl={this.state.redirectUrl} />;
      default:
-        // eslint-disable-next-line react/jsx-no-useless-fragment
        return <></>;
    }
  }
@@ -251,12 +253,12 @@ CoachingConsent.propTypes = {
    }),
  }).isRequired,
  formErrors: PropTypes.shape({
-    coaching: PropTypes.shape({}),
+    coaching: PropTypes.object,
  }).isRequired,
  confirmationValues: PropTypes.shape({
-    coaching: PropTypes.shape({}),
-    name: PropTypes.shape({}),
-    phone_number: PropTypes.shape({}),
+    coaching: PropTypes.object,
+    name: PropTypes.object,
+    phone_number: PropTypes.object,
  }).isRequired,
  fetchSettings: PropTypes.func.isRequired,
  profileDataManager: PropTypes.string,
--- a/src/account-settings/coaching/CoachingConsentForm.jsx
+++ b/src/account-settings/coaching/CoachingConsentForm.jsx
@@ -1,28 +1,30 @@
 import React from 'react';

 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Form, Button, Hyperlink } from '@edx/paragon';
+import { Input, Button, Hyperlink } from '@edx/paragon';

 import PropTypes from 'prop-types';

 import Alert from '../Alert';
 import messages from './CoachingConsent.messages';

-const ErrorMessage = (props) => <div className="alert-warning mb-2">{props.message}</div>;
+const ErrorMessage = props => (
+  <div className="alert-warning mb-2">{props.message}</div>
+);

 const ManagedProfileAlert = ({ profileDataManager }) => (
  <Alert className="alert alert-primary" role="alert">
    <FormattedMessage
      id="account.settings.coaching.managed.alert"
      defaultMessage="Your name is managed by {managerTitle}. Contact your administrator for help."
-      description="Alert message informing the user their account data is managed by a third party"
+      description="alert message informing the user their account data is managed by a third party"
      values={{
        managerTitle: <b>{profileDataManager}</b>,
      }}
    />
  </Alert>
 );
-const CoachingForm = (props) => (
+const CoachingForm = props => (
  <div className="col-12 col-md-6 col-xl-5 mx-auto mt-4 p-5 shadow-lg">
    <h2 className="h2">
      {props.intl.formatMessage(messages['account.settings.coaching.consent.welcome.header'])}
@@ -32,13 +34,13 @@ const CoachingForm = (props) => (
      <form onSubmit={props.onSubmit}>
        <div className="py-3">
          {!!props.profileDataManager && (
-          <ManagedProfileAlert profileDataManager={props.profileDataManager} />
+            <ManagedProfileAlert profileDataManager={props.profileDataManager} />
          )}
          <ErrorMessage message={props.formErrors.full_name} />
          <label className="h6" htmlFor="fullName">
            {props.intl.formatMessage(messages['account.settings.coaching.consent.label.name'])}
          </label>
-          <Form.Control
+          <Input
            type="text"
            name="full-name"
            id="fullName"
@@ -51,7 +53,7 @@ const CoachingForm = (props) => (
          <label className="h6" htmlFor="phoneNumber">
            {props.intl.formatMessage(messages['account.settings.coaching.consent.label.phone-number'])}
          </label>
-          <Form.Control
+          <Input
            type="text"
            name="phone_number"
            id="phoneNumber"
--- a/src/account-settings/coaching/CoachingToggle.jsx
+++ b/src/account-settings/coaching/CoachingToggle.jsx
@@ -2,13 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Form } from '@edx/paragon';
+import { ValidationFormGroup, Input } from '@edx/paragon';
 import messages from './CoachingToggle.messages';
 import { editableFieldSelector } from '../data/selectors';
 import { saveSettings, updateDraft, saveMultipleSettings } from '../data/actions';
 import EditableField from '../EditableField';

-const CoachingToggle = (props) => (
+const CoachingToggle = props => (
  <>
    <EditableField
      name="phone_number"
@@ -37,18 +37,20 @@ const CoachingToggle = (props) => (
        return props.saveSettings('phone_number', props.phone_number);
      }}
    />
-    <Form.Group
-      isInvalid={!!props.error}
+    <ValidationFormGroup
+      for="coachingConsent"
+      helpText={props.intl.formatMessage(messages['account.settings.field.coaching_consent.tooltip'])}
+      invalid={!!props.error}
+      invalidMessage={props.intl.formatMessage(messages['account.settings.field.coaching_consent.error'])}
      className="custom-control custom-switch"
    >
-      <Form.Switch
+      <Input
        name={props.name}
        className="custom-control-input"
        disabled={props.saveState === 'pending'}
        type="checkbox"
        id="coachingConsent"
        checked={props.coaching.coaching_consent}
-        helperText={props.intl.formatMessage(messages['account.settings.field.coaching_consent.tooltip'])}
        value={props.coaching.coaching_consent}
        onChange={async (e) => {
          const { name } = e.target;
@@ -56,21 +58,14 @@ const CoachingToggle = (props) => (
          const { user, eligible_for_coaching } = props.coaching;
          const value = {
            user,
-            // eslint-disable-next-line camelcase
            eligible_for_coaching,
            coaching_consent: e.target.checked,
          };
          props.saveSettings(name, value);
        }}
-      >
-        {props.intl.formatMessage(messages['account.settings.field.coaching_consent'])}
-      </Form.Switch>
-      {!!props.error && (
-        <Form.Control.Feedback>
-          {props.intl.formatMessage(messages['account.settings.field.coaching_consent.error'])}
-        </Form.Control.Feedback>
-      )}
-    </Form.Group>
+      />
+      <label className="custom-control-label" htmlFor="coachingConsent">{props.intl.formatMessage(messages['account.settings.field.coaching_consent'])}</label>
+    </ValidationFormGroup>
  </>
 );

--- a/src/account-settings/coaching/test/CoachingConsent.test.jsx
+++ b/src/account-settings/coaching/test/CoachingConsent.test.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-import-assign */
 import React from 'react';
 import { Provider } from 'react-redux';
 import renderer from 'react-test-renderer';
--- a/src/account-settings/coaching/test/snapshots/CoachingConsent.test.jsx.snap
+++ b/src/account-settings/coaching/test/snapshots/CoachingConsent.test.jsx.snap
@@ -34,11 +34,13 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
          >
            <div />
            <div>
-              Your name is managed by 
-              <b>
-                test person
-              </b>
-              . Contact your administrator for help.
+              <span>
+                Your name is managed by 
+                <b>
+                  test person
+                </b>
+                . Contact your administrator for help.
+              </span>
            </div>
          </div>
          <div
@@ -52,20 +54,14 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
          >
            Please confirm your name
          </label>
-          <div
-            className="pgn__form-control-decorator-group"
-          >
-            <input
-              className="has-value form-control"
-              defaultValue="edx edx"
-              disabled={true}
-              id="fullName"
-              name="full-name"
-              onBlur={[Function]}
-              onChange={[Function]}
-              type="text"
-            />
-          </div>
+          <input
+            className="form-control"
+            defaultValue="edx edx"
+            disabled={true}
+            id="fullName"
+            name="full-name"
+            type="text"
+          />
        </div>
        <div
          className="py-3"
@@ -81,19 +77,13 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
          >
            Enter your mobile number
          </label>
-          <div
-            className="pgn__form-control-decorator-group"
-          >
-            <input
-              className="has-value form-control"
-              defaultValue="1234567890"
-              id="phoneNumber"
-              name="phone_number"
-              onBlur={[Function]}
-              onChange={[Function]}
-              type="text"
-            />
-          </div>
+          <input
+            className="form-control"
+            defaultValue="1234567890"
+            id="phoneNumber"
+            name="phone_number"
+            type="text"
+          />
        </div>
        <div
          className=" py-3"
@@ -124,7 +114,7 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
          className="mt-3"
        >
          <a
-            className="pgn__hyperlink default-link standalone-link mt-3 text-dark btn-link small"
+            className="mt-3 text-dark btn-link small"
            href="http://localhost:18000/dashboard/"
            onClick={[Function]}
            target="_self"
@@ -213,20 +203,14 @@ exports[`CoachingConsent should render 1`] = `
          >
            Please confirm your name
          </label>
-          <div
-            className="pgn__form-control-decorator-group"
-          >
-            <input
-              className="has-value form-control"
-              defaultValue="edx edx"
-              disabled={false}
-              id="fullName"
-              name="full-name"
-              onBlur={[Function]}
-              onChange={[Function]}
-              type="text"
-            />
-          </div>
+          <input
+            className="form-control"
+            defaultValue="edx edx"
+            disabled={false}
+            id="fullName"
+            name="full-name"
+            type="text"
+          />
        </div>
        <div
          className="py-3"
@@ -242,19 +226,13 @@ exports[`CoachingConsent should render 1`] = `
          >
            Enter your mobile number
          </label>
-          <div
-            className="pgn__form-control-decorator-group"
-          >
-            <input
-              className="has-value form-control"
-              defaultValue="1234567890"
-              id="phoneNumber"
-              name="phone_number"
-              onBlur={[Function]}
-              onChange={[Function]}
-              type="text"
-            />
-          </div>
+          <input
+            className="form-control"
+            defaultValue="1234567890"
+            id="phoneNumber"
+            name="phone_number"
+            type="text"
+          />
        </div>
        <div
          className=" py-3"
@@ -285,7 +263,7 @@ exports[`CoachingConsent should render 1`] = `
          className="mt-3"
        >
          <a
-            className="pgn__hyperlink default-link standalone-link mt-3 text-dark btn-link small"
+            className="mt-3 text-dark btn-link small"
            href="http://localhost:18000/dashboard/"
            onClick={[Function]}
            target="_self"
--- a/src/account-settings/data/constants.js
+++ b/src/account-settings/data/constants.js
@@ -10,11 +10,6 @@ export const YEAR_OF_BIRTH_OPTIONS = (() => {
  return years.reverse();
 })();

-export const COPPA_COMPLIANCE_YEAR = (() => {
-  const currentYear = new Date().getFullYear();
-  return currentYear - 13;
-})();
-
 export const EDUCATION_LEVELS = [
  '',
  'p',
--- a/src/account-settings/data/reducers.js
+++ b/src/account-settings/data/reducers.js
@@ -39,9 +39,10 @@ export const defaultState = {
  verifiedName: null,
  mostRecentVerifiedName: {},
  verifiedNameHistory: {},
+  verifiedNameEnabled: false,
 };

-const reducer = (state = defaultState, action = {}) => {
+const reducer = (state = defaultState, action) => {
  let dispatcherIsOpenForm;

  switch (action.type) {
--- a/src/account-settings/data/selectors.js
+++ b/src/account-settings/data/selectors.js
@@ -12,6 +12,7 @@ const verifiedNameSettingsSelector = createSelector(
  accountSettingsSelector,
  accountSettings => ({
    history: accountSettings.verifiedNameHistory.results,
+    verifiedNameEnabled: accountSettings?.verifiedNameHistory.verified_name_enabled,
    useVerifiedNameForCerts: accountSettings?.verifiedNameHistory.use_verified_name_for_certs,
  }),
 );
@@ -179,7 +180,7 @@ const formValuesSelector = createSelector(

 const transformTimeZonesToOptions = timeZoneArr => timeZoneArr
  .map(({ time_zone, description }) => ({ // eslint-disable-line camelcase
-    value: time_zone, label: description, // eslint-disable-line camelcase
+    value: time_zone, label: description,
  }));

 const timeZonesSelector = createSelector(
@@ -228,6 +229,7 @@ export const accountSettingsPageSelector = createSelector(
  mostRecentApprovedVerifiedNameValueSelector,
  mostRecentVerifiedNameSelector,
  sortedVerifiedNameHistorySelector,
+  verifiedNameSettingsSelector,
  (
    accountSettings,
    siteLanguageOptions,
@@ -245,6 +247,7 @@ export const accountSettingsPageSelector = createSelector(
    verifiedName,
    mostRecentVerifiedName,
    verifiedNameHistory,
+    verifiedNameSettings,
  ) => ({
    siteLanguageOptions,
    siteLanguage,
@@ -265,16 +268,19 @@ export const accountSettingsPageSelector = createSelector(
    verifiedName,
    mostRecentVerifiedName,
    verifiedNameHistory,
+    verifiedNameEnabled: verifiedNameSettings?.verifiedNameEnabled,
  }),
 );

 export const certPreferenceSelector = createSelector(
+  verifiedNameSettingsSelector,
  valuesSelector,
  formValuesSelector,
  mostRecentApprovedVerifiedNameValueSelector,
  saveStateSelector,
  errorSelector,
  (
+    verifiedNameSettings,
    committedValues,
    formValues,
    mostRecentApprovedVerifiedNameValue,
@@ -285,6 +291,7 @@ export const certPreferenceSelector = createSelector(
    originalVerifiedName: mostRecentApprovedVerifiedNameValue?.verified_name || '',
    useVerifiedNameForCerts: formValues.useVerifiedNameForCerts || false,
    saveState,
+    verifiedNameEnabled: verifiedNameSettings.verifiedNameEnabled || false,
    formErrors: errors,
  }),
 );
--- a/src/account-settings/data/service.js
+++ b/src/account-settings/data/service.js
@@ -177,6 +177,19 @@ export async function shouldDisplayDemographicsQuestions() {
  return false;
 }

+export async function getVerifiedNameEnabled() {
+  let data;
+  const client = getAuthenticatedHttpClient();
+  try {
+    const requestUrl = `${getConfig().LMS_BASE_URL}/api/edx_name_affirmation/v1/verified_name_enabled`;
+    ({ data } = await client.get(requestUrl));
+  } catch (error) {
+    return {};
+  }
+
+  return data;
+}
+
 export async function getVerifiedName() {
  let data;
  const client = getAuthenticatedHttpClient();
--- a/src/account-settings/delete-account/ConfirmationModal.jsx
+++ b/src/account-settings/delete-account/ConfirmationModal.jsx
@@ -2,12 +2,12 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';

 import {
-  AlertModal,
-  Button, Input, ValidationFormGroup, ActionRow,
+  Button, Input, Modal, ValidationFormGroup,
 } from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { faExclamationCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+
 import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';
 import Alert from '../Alert';
@@ -74,58 +74,59 @@ export class ConfirmationModal extends Component {
      : 'account.settings.delete.account.modal.text.2';

    return (
-      <AlertModal
-        isOpen={open}
+      <Modal
+        open={open}
        title={intl.formatMessage(messages['account.settings.delete.account.modal.header'])}
-        onClose={onCancel}
-        footerNode={(
-          <ActionRow>
-            <Button variant="link" onClick={onCancel}>Cancel</Button>
-            <Button variant="danger" onClick={onSubmit}>Yes, Delete</Button>
-          </ActionRow>
+        body={(
+          <div>
+            {this.renderError()}
+            <Alert
+              className="alert-warning mt-n2"
+              icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
+            >
+              <h6>
+                {intl.formatMessage(
+                  messages['account.settings.delete.account.modal.text.1'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </h6>
+              <p>
+                {intl.formatMessage(
+                  messages[deleteAccountModalText2MessageKey],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </p>
+              <p>
+                <PrintingInstructions />
+              </p>
+            </Alert>
+            <ValidationFormGroup
+              for={passwordFieldId}
+              invalid={errorType !== null}
+              invalidMessage={intl.formatMessage(invalidMessage)}
+            >
+              <label className="d-block" htmlFor={passwordFieldId}>
+                {intl.formatMessage(messages['account.settings.delete.account.modal.enter.password'])}
+              </label>
+              <Input
+                name="password"
+                id={passwordFieldId}
+                type="password"
+                value={password}
+                onChange={onChange}
+              />
+            </ValidationFormGroup>
+          </div>
        )}
-      >
-        <div className="p-3">
-          {this.renderError()}
-          <Alert
-            className="alert-warning mt-n2"
-            icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
-          >
-            <h6>
-              {intl.formatMessage(
-                messages['account.settings.delete.account.modal.text.1'],
-                { siteName: getConfig().SITE_NAME },
-              )}
-            </h6>
-            <p>
-              {intl.formatMessage(
-                messages[deleteAccountModalText2MessageKey],
-                { siteName: getConfig().SITE_NAME },
-              )}
-            </p>
-            <p>
-              <PrintingInstructions />
-            </p>
-          </Alert>
-          <ValidationFormGroup
-            for={passwordFieldId}
-            invalid={errorType !== null}
-            invalidMessage={intl.formatMessage(invalidMessage)}
-          >
-            <label className="d-block" htmlFor={passwordFieldId}>
-              {intl.formatMessage(messages['account.settings.delete.account.modal.enter.password'])}
-            </label>
-            <Input
-              name="password"
-              id={passwordFieldId}
-              type="password"
-              value={password}
-              onChange={onChange}
-            />
-          </ValidationFormGroup>
-        </div>
-
-      </AlertModal>
+        buttons={[
+          <Button variant="danger" onClick={onSubmit}>
+            {intl.formatMessage(messages['account.settings.delete.account.modal.confirm.delete'])}
+          </Button>,
+        ]}
+        closeText={intl.formatMessage(messages['account.settings.delete.account.modal.confirm.cancel'])}
+        renderHeaderCloseButton={false}
+        onClose={onCancel}
+      />
    );
  }
 }
--- a/src/account-settings/delete-account/DeleteAccount.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.jsx
@@ -66,13 +66,9 @@ export class DeleteAccount extends React.Component {
      ? 'account.settings.delete.account.text.2.edX'
      : 'account.settings.delete.account.text.2';

-    const optInInstructionMessageId = getConfig().MARKETING_EMAILS_OPT_IN
-      ? 'account.settings.delete.account.please.confirm'
-      : 'account.settings.delete.account.please.activate';
-
    return (
      <div>
-        <h2 className="section-heading h4 mb-3">
+        <h2 className="section-heading">
          {intl.formatMessage(messages['account.settings.delete.account.header'])}
        </h2>
        <p>{intl.formatMessage(messages['account.settings.delete.account.subheader'])}</p>
@@ -92,10 +88,8 @@ export class DeleteAccount extends React.Component {
          <PrintingInstructions />
        </p>
        <p className="text-danger h6">
-          {intl.formatMessage(
-            messages['account.settings.delete.account.text.warning'],
-            { siteName: getConfig().SITE_NAME },
-          )}
+          {intl.formatMessage(messages['account.settings.delete.account.text.warning'],
+            { siteName: getConfig().SITE_NAME })}
        </p>
        <p>
          <Hyperlink destination="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings">
@@ -114,8 +108,8 @@ export class DeleteAccount extends React.Component {

        {isVerifiedAccount ? null : (
          <BeforeProceedingBanner
-            instructionMessageId={optInInstructionMessageId}
-            supportArticleUrl="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-confirm-my-email-"
+            instructionMessageId="account.settings.delete.account.please.activate"
+            supportArticleUrl="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
          />
        )}

--- a/src/account-settings/delete-account/DeleteAccount.test.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.test.jsx
@@ -1,15 +1,10 @@
-/* eslint-disable react/jsx-no-useless-fragment */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';

 // Testing the modals separately, they just clutter up the snapshots if included here.
-jest.mock('./ConfirmationModal', () => function () {
-  return <></>;
-});
-jest.mock('./SuccessModal', () => function () {
-  return <></>;
-});
+jest.mock('./ConfirmationModal');
+jest.mock('./SuccessModal');

 import { DeleteAccount } from './DeleteAccount'; // eslint-disable-line import/first

@@ -42,7 +37,6 @@ describe('DeleteAccount', () => {
        </IntlProvider>
      ))
      .toJSON();
-
    expect(tree).toMatchSnapshot();
  });

--- a/src/account-settings/delete-account/SuccessModal.jsx
+++ b/src/account-settings/delete-account/SuccessModal.jsx
@@ -1,31 +1,27 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { ModalLayer, ModalCloseButton } from '@edx/paragon';
+import { Modal } from '@edx/paragon';

 import messages from './messages';

 export const SuccessModal = (props) => {
  const { status, intl, onClose } = props;
  return (
-
-    <ModalLayer isOpen={status === 'deleted'} onClose={onClose}>
-      <div className="mw-sm p-5 bg-white mx-auto my-3">
-        <h3>
-          {intl.formatMessage(messages['account.settings.delete.account.modal.after.header'])}
-        </h3>
-        <div className="p-3">
+    <Modal
+      open={status === 'deleted'}
+      title={intl.formatMessage(messages['account.settings.delete.account.modal.after.header'])}
+      body={(
+        <div>
          <p className="h6">
            {intl.formatMessage(messages['account.settings.delete.account.modal.after.text'])}
          </p>
        </div>
-        <p>
-          <ModalCloseButton className="float-right" variant="link">Close</ModalCloseButton>
-        </p>
-      </div>
-
-    </ModalLayer>
-
+      )}
+      closeText={intl.formatMessage(messages['account.settings.delete.account.modal.after.button'])}
+      renderHeaderCloseButton={false}
+      onClose={onClose}
+    />
  );
 };

--- a/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
@@ -1,67 +1,254 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`ConfirmationModal should match default closed confirmation modal snapshot 1`] = `null`;
+exports[`ConfirmationModal should match default closed confirmation modal snapshot 1`] = `
+Array [
+  <div
+    className="fade"
+    role="presentation"
+  />,
+  <div
+    className="modal fade"
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id1"
+      aria-modal={true}
+      className=""
+      role="dialog"
+    >
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-lock-disabled="disabled"
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onWheelCapture={[Function]}
+      >
+        <div
+          className="modal-content"
+        >
+          <div
+            className="modal-header"
+          >
+            <h2
+              className="modal-title"
+              id="id1"
+            >
+              Are you sure?
+            </h2>
+          </div>
+          <div
+            className="modal-body"
+          >
+            <div>
+              <div
+                className="alert d-flex align-items-start alert-warning mt-n2"
+              >
+                <div>
+                  <svg
+                    aria-hidden="true"
+                    className="svg-inline--fa fa-exclamation-triangle fa-w-18 mr-2"
+                    data-icon="exclamation-triangle"
+                    data-prefix="fas"
+                    focusable="false"
+                    role="img"
+                    style={Object {}}
+                    viewBox="0 0 576 512"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
+                      fill="currentColor"
+                      style={Object {}}
+                    />
+                  </svg>
+                </div>
+                <div>
+                  <h6>
+                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
+                  </h6>
+                  <p>
+                    If you proceed, you will be unable to use this account to take courses on localhost.
+                  </p>
+                  <p>
+                    <span>
+                      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+                    </span>
+                  </p>
+                </div>
+              </div>
+              <div
+                className="form-group"
+              >
+                <label
+                  className="d-block"
+                  htmlFor="passwordFieldId"
+                >
+                  If you still wish to continue and delete your account, please enter your account password:
+                </label>
+                <input
+                  aria-describedby=""
+                  className="form-control"
+                  id="passwordFieldId"
+                  name="password"
+                  onChange={[MockFunction]}
+                  type="password"
+                  value="fluffy bunnies"
+                />
+                <strong
+                  className="invalid-feedback"
+                  id="passwordFieldId-invalid-feedback"
+                >
+                  Unable to delete account
+                </strong>
+              </div>
+            </div>
+          </div>
+          <div
+            className="modal-footer"
+          >
+            <button
+              className="btn btn-link"
+              disabled={false}
+              onClick={[Function]}
+              type="button"
+            >
+              Cancel
+            </button>
+            <button
+              className="btn btn-danger"
+              disabled={false}
+              onClick={[MockFunction]}
+              type="button"
+            >
+              Yes, Delete
+            </button>
+          </div>
+        </div>
+      </div>
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+    </div>
+  </div>,
+]
+`;

 exports[`ConfirmationModal should match empty password confirmation modal snapshot 1`] = `
 Array [
  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
+    className="modal-backdrop show"
+    role="presentation"
  />,
  <div
-    className="pgn__modal-layer"
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
+    className="modal show d-block"
+    role="presentation"
  >
    <div
-      className="pgn__modal-content-container"
+      aria-labelledby="id3"
+      aria-modal={true}
+      className="modal-dialog"
+      role="dialog"
    >
      <div
-        className="pgn__modal-backdrop"
-        onClick={[MockFunction]}
-        onKeyDown={[MockFunction]}
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={0}
      />
      <div
-        aria-label="Are you sure?"
-        className="pgn__modal pgn__modal-md pgn__modal-default pgn__alert-modal"
-        role="dialog"
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={1}
+      />
+      <div
+        data-focus-lock-disabled={false}
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onMouseDown={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onTouchStart={[Function]}
+        onWheelCapture={[Function]}
      >
        <div
-          className="pgn__modal-header"
+          className="modal-content"
        >
-          <h2
-            className="pgn__modal-title"
-          >
-            Are you sure?
-          </h2>
-        </div>
-        <div
-          className="pgn__modal-body pgn__modal-body-scroll-top pgn__modal-body-scroll-bottom"
-        >
-          <div />
          <div
-            className="pgn__modal-body-content"
+            className="modal-header"
          >
-            <div
-              className="p-3"
+            <h2
+              className="modal-title"
+              id="id3"
            >
+              Are you sure?
+            </h2>
+          </div>
+          <div
+            className="modal-body"
+          >
+            <div>
              <div
                className="alert d-flex align-items-start alert-danger mt-n2"
              >
@@ -125,7 +312,9 @@ Array [
                    If you proceed, you will be unable to use this account to take courses on localhost.
                  </p>
                  <p>
-                    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+                    <span>
+                      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+                    </span>
                  </p>
                </div>
              </div>
@@ -156,18 +345,13 @@ Array [
              </div>
            </div>
          </div>
-          <div />
-        </div>
-        <div
-          className="pgn__modal-footer"
-        >
          <div
-            className="pgn__action-row"
+            className="modal-footer"
          >
            <button
              className="btn btn-link"
              disabled={false}
-              onClick={[MockFunction]}
+              onClick={[Function]}
              type="button"
            >
              Cancel
@@ -183,84 +367,99 @@ Array [
          </div>
        </div>
      </div>
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={0}
+      />
    </div>
  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
 ]
 `;

 exports[`ConfirmationModal should match open confirmation modal snapshot 1`] = `
 Array [
  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
+    className="modal-backdrop show"
+    role="presentation"
  />,
  <div
-    className="pgn__modal-layer"
-    data-focus-lock-disabled="disabled"
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onWheelCapture={[Function]}
+    className="modal show d-block"
+    role="presentation"
  >
    <div
-      className="pgn__modal-content-container"
+      aria-labelledby="id2"
+      aria-modal={true}
+      className="modal-dialog"
+      role="dialog"
    >
      <div
-        className="pgn__modal-backdrop"
-        onClick={[MockFunction]}
-        onKeyDown={[MockFunction]}
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={0}
      />
      <div
-        aria-label="Are you sure?"
-        className="pgn__modal pgn__modal-md pgn__modal-default pgn__alert-modal"
-        role="dialog"
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={1}
+      />
+      <div
+        data-focus-lock-disabled={false}
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onMouseDown={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onTouchStart={[Function]}
+        onWheelCapture={[Function]}
      >
        <div
-          className="pgn__modal-header"
+          className="modal-content"
        >
-          <h2
-            className="pgn__modal-title"
-          >
-            Are you sure?
-          </h2>
-        </div>
-        <div
-          className="pgn__modal-body pgn__modal-body-scroll-top pgn__modal-body-scroll-bottom"
-        >
-          <div />
          <div
-            className="pgn__modal-body-content"
+            className="modal-header"
          >
-            <div
-              className="p-3"
+            <h2
+              className="modal-title"
+              id="id2"
            >
+              Are you sure?
+            </h2>
+          </div>
+          <div
+            className="modal-body"
+          >
+            <div>
              <div
                className="alert d-flex align-items-start alert-warning mt-n2"
              >
@@ -291,7 +490,9 @@ Array [
                    If you proceed, you will be unable to use this account to take courses on localhost.
                  </p>
                  <p>
-                    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+                    <span>
+                      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+                    </span>
                  </p>
                </div>
              </div>
@@ -322,18 +523,13 @@ Array [
              </div>
            </div>
          </div>
-          <div />
-        </div>
-        <div
-          className="pgn__modal-footer"
-        >
          <div
-            className="pgn__action-row"
+            className="modal-footer"
          >
            <button
              className="btn btn-link"
              disabled={false}
-              onClick={[MockFunction]}
+              onClick={[Function]}
              type="button"
            >
              Cancel
@@ -349,22 +545,22 @@ Array [
          </div>
        </div>
      </div>
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={0}
+      />
    </div>
  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
-  />,
 ]
 `;
--- a/src/account-settings/delete-account/snapshots/DeleteAccount.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/DeleteAccount.test.jsx.snap
@@ -3,7 +3,7 @@
 exports[`DeleteAccount should match default section snapshot 1`] = `
 <div>
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Delete My Account
  </h2>
@@ -17,7 +17,9 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
    Once your account is deleted, you cannot use it to take courses on localhost.
  </p>
  <p>
-    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    <span>
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    </span>
  </p>
  <p
    className="text-danger h6"
@@ -26,7 +28,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
  </p>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -50,7 +52,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
 exports[`DeleteAccount should match unverified account section snapshot 1`] = `
 <div>
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Delete My Account
  </h2>
@@ -64,7 +66,9 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
    Once your account is deleted, you cannot use it to take courses on localhost.
  </p>
  <p>
-    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    <span>
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    </span>
  </p>
  <p
    className="text-danger h6"
@@ -73,7 +77,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
  </p>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -114,16 +118,18 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
      </svg>
    </div>
    <div>
-      Before proceeding, please 
-      <a
-        className="pgn__hyperlink default-link standalone-link"
-        href="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-confirm-my-email-"
-        onClick={[Function]}
-        target="_self"
-      >
-        activate your account
-      </a>
-      .
+      <span>
+        Before proceeding, please 
+        <a
+          className="default-link standalone-link"
+          href="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
+          onClick={[Function]}
+          target="_self"
+        >
+          activate your account
+        </a>
+        .
+      </span>
    </div>
  </div>
 </div>
@@ -132,7 +138,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
 exports[`DeleteAccount should match unverified account section snapshot 2`] = `
 <div>
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Delete My Account
  </h2>
@@ -146,7 +152,9 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
    Once your account is deleted, you cannot use it to take courses on localhost.
  </p>
  <p>
-    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    <span>
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    </span>
  </p>
  <p
    className="text-danger h6"
@@ -155,7 +163,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
  </p>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -196,16 +204,18 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
      </svg>
    </div>
    <div>
-      Before proceeding, please 
-      <a
-        className="pgn__hyperlink default-link standalone-link"
-        href="https://support.edx.org/hc/en-us/articles/207206067"
-        onClick={[Function]}
-        target="_self"
-      >
-        unlink all social media accounts
-      </a>
-      .
+      <span>
+        Before proceeding, please 
+        <a
+          className="default-link standalone-link"
+          href="https://support.edx.org/hc/en-us/articles/207206067"
+          onClick={[Function]}
+          target="_self"
+        >
+          unlink all social media accounts
+        </a>
+        .
+      </span>
    </div>
  </div>
 </div>
--- a/src/account-settings/delete-account/snapshots/SuccessModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/SuccessModal.test.jsx.snap
@@ -1,89 +1,563 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`SuccessModal should match default closed success modal snapshot 1`] = `null`;
+exports[`SuccessModal should match default closed success modal snapshot 1`] = `
+Array [
+  <div
+    className="fade"
+    role="presentation"
+  />,
+  <div
+    className="modal fade"
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id1"
+      aria-modal={true}
+      className=""
+      role="dialog"
+    >
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-lock-disabled="disabled"
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onWheelCapture={[Function]}
+      >
+        <div
+          className="modal-content"
+        >
+          <div
+            className="modal-header"
+          >
+            <h2
+              className="modal-title"
+              id="id1"
+            >
+              We're sorry to see you go!  Your account will be deleted shortly.
+            </h2>
+          </div>
+          <div
+            className="modal-body"
+          >
+            <div>
+              <p
+                className="h6"
+              >
+                Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+              </p>
+            </div>
+          </div>
+          <div
+            className="modal-footer"
+          >
+            <button
+              className="btn btn-link"
+              disabled={false}
+              onClick={[Function]}
+              type="button"
+            >
+              Close
+            </button>
+          </div>
+        </div>
+      </div>
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+    </div>
+  </div>,
+]
+`;

-exports[`SuccessModal should match default closed success modal snapshot 2`] = `null`;
+exports[`SuccessModal should match default closed success modal snapshot 2`] = `
+Array [
+  <div
+    className="fade"
+    role="presentation"
+  />,
+  <div
+    className="modal fade"
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id2"
+      aria-modal={true}
+      className=""
+      role="dialog"
+    >
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-lock-disabled="disabled"
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onWheelCapture={[Function]}
+      >
+        <div
+          className="modal-content"
+        >
+          <div
+            className="modal-header"
+          >
+            <h2
+              className="modal-title"
+              id="id2"
+            >
+              We're sorry to see you go!  Your account will be deleted shortly.
+            </h2>
+          </div>
+          <div
+            className="modal-body"
+          >
+            <div>
+              <p
+                className="h6"
+              >
+                Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+              </p>
+            </div>
+          </div>
+          <div
+            className="modal-footer"
+          >
+            <button
+              className="btn btn-link"
+              disabled={false}
+              onClick={[Function]}
+              type="button"
+            >
+              Close
+            </button>
+          </div>
+        </div>
+      </div>
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+    </div>
+  </div>,
+]
+`;

-exports[`SuccessModal should match default closed success modal snapshot 3`] = `null`;
+exports[`SuccessModal should match default closed success modal snapshot 3`] = `
+Array [
+  <div
+    className="fade"
+    role="presentation"
+  />,
+  <div
+    className="modal fade"
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id3"
+      aria-modal={true}
+      className=""
+      role="dialog"
+    >
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-lock-disabled="disabled"
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onWheelCapture={[Function]}
+      >
+        <div
+          className="modal-content"
+        >
+          <div
+            className="modal-header"
+          >
+            <h2
+              className="modal-title"
+              id="id3"
+            >
+              We're sorry to see you go!  Your account will be deleted shortly.
+            </h2>
+          </div>
+          <div
+            className="modal-body"
+          >
+            <div>
+              <p
+                className="h6"
+              >
+                Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+              </p>
+            </div>
+          </div>
+          <div
+            className="modal-footer"
+          >
+            <button
+              className="btn btn-link"
+              disabled={false}
+              onClick={[Function]}
+              type="button"
+            >
+              Close
+            </button>
+          </div>
+        </div>
+      </div>
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+    </div>
+  </div>,
+]
+`;

-exports[`SuccessModal should match default closed success modal snapshot 4`] = `null`;
+exports[`SuccessModal should match default closed success modal snapshot 4`] = `
+Array [
+  <div
+    className="fade"
+    role="presentation"
+  />,
+  <div
+    className="modal fade"
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id4"
+      aria-modal={true}
+      className=""
+      role="dialog"
+    >
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+      <div
+        data-focus-lock-disabled="disabled"
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onWheelCapture={[Function]}
+      >
+        <div
+          className="modal-content"
+        >
+          <div
+            className="modal-header"
+          >
+            <h2
+              className="modal-title"
+              id="id4"
+            >
+              We're sorry to see you go!  Your account will be deleted shortly.
+            </h2>
+          </div>
+          <div
+            className="modal-body"
+          >
+            <div>
+              <p
+                className="h6"
+              >
+                Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+              </p>
+            </div>
+          </div>
+          <div
+            className="modal-footer"
+          >
+            <button
+              className="btn btn-link"
+              disabled={false}
+              onClick={[Function]}
+              type="button"
+            >
+              Close
+            </button>
+          </div>
+        </div>
+      </div>
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
+    </div>
+  </div>,
+]
+`;

 exports[`SuccessModal should match open success modal snapshot 1`] = `
 Array [
  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
+    className="modal-backdrop show"
+    role="presentation"
  />,
  <div
-    className="pgn__modal-layer"
-    data-focus-lock-disabled="disabled"
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onWheelCapture={[Function]}
+    className="modal show d-block"
+    role="presentation"
  >
    <div
-      className="pgn__modal-content-container"
+      aria-labelledby="id5"
+      aria-modal={true}
+      className="modal-dialog"
+      role="dialog"
    >
      <div
-        className="pgn__modal-backdrop"
-        onClick={[MockFunction]}
-        onKeyDown={[MockFunction]}
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={0}
      />
      <div
-        className="mw-sm p-5 bg-white mx-auto my-3"
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={1}
+      />
+      <div
+        data-focus-lock-disabled={false}
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onMouseDown={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onTouchStart={[Function]}
+        onWheelCapture={[Function]}
      >
-        <h3>
-          We're sorry to see you go!  Your account will be deleted shortly.
-        </h3>
        <div
-          className="p-3"
+          className="modal-content"
        >
-          <p
-            className="h6"
+          <div
+            className="modal-header"
          >
-            Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-          </p>
+            <h2
+              className="modal-title"
+              id="id5"
+            >
+              We're sorry to see you go!  Your account will be deleted shortly.
+            </h2>
+          </div>
+          <div
+            className="modal-body"
+          >
+            <div>
+              <p
+                className="h6"
+              >
+                Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+              </p>
+            </div>
+          </div>
+          <div
+            className="modal-footer"
+          >
+            <button
+              className="btn btn-link"
+              disabled={false}
+              onClick={[Function]}
+              type="button"
+            >
+              Close
+            </button>
+          </div>
        </div>
-        <p>
-          <button
-            className="pgn__modal-close-button float-right btn btn-link"
-            disabled={false}
-            onClick={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </p>
      </div>
+      <div
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={0}
+      />
    </div>
  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
-  />,
 ]
 `;
--- a/src/account-settings/delete-account/index.js
+++ b/src/account-settings/delete-account/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-exports
 export { default } from './DeleteAccount';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/account-settings/delete-account/messages.js
+++ b/src/account-settings/delete-account/messages.js
@@ -51,11 +51,6 @@ const messages = defineMessages({
    defaultMessage: 'activate your account',
    description: 'This is the text on a link that goes to the support page.  It is part of this sentence: Before proceeding, please activate your account.',
  },
-  'account.settings.delete.account.please.confirm': {
-    id: 'account.settings.delete.account.please.confirm',
-    defaultMessage: 'confirm your account',
-    description: 'This is the text on a link that goes to the support page.  It is part of this sentence: Before proceeding, please confirm your account.',
-  },
  'account.settings.delete.account.please.unlink': {
    id: 'account.settings.delete.account.please.unlink',
    defaultMessage: 'unlink all social media accounts',
--- a/src/account-settings/demographics/Checkboxes.jsx
+++ b/src/account-settings/demographics/Checkboxes.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { Form } from '@edx/paragon';
+import { CheckBox } from '@edx/paragon';
 import { DECLINED } from '../data/constants';

 const Checkboxes = (props) => {
@@ -14,7 +14,7 @@ const Checkboxes = (props) => {
  const [selected, setSelected] = useState(values);
  useEffect(() => {
    onChange(id, selected);
-  }, [id, onChange, selected]);
+  }, [selected]);

  const handleToggle = (value, option) => {
    // If the user checked 'declined', uncheck all other options
@@ -40,17 +40,16 @@ const Checkboxes = (props) => {
    const isChecked = selected.includes(option.value);
    return (
      <div key={option.value} className="checkboxOption">
-        <Form.Checkbox
+        <CheckBox
          type="checkbox"
          id={option.value}
          name={option.value}
          value={option.value}
          checked={isChecked}
          autoFocus={isFirst}
-          onChange={(event) => handleToggle(event.target.checked, option.value)}
-        >
-          {option.label}
-        </Form.Checkbox>
+          label={option.label}
+          onChange={(value) => handleToggle(value, option.value)}
+        />
      </div>
    );
  });
--- a/src/account-settings/demographics/DemographicsSection.jsx
+++ b/src/account-settings/demographics/DemographicsSection.jsx
@@ -5,7 +5,7 @@ import {
  intlShape,
 } from '@edx/frontend-platform/i18n';

-import { Hyperlink, Form } from '@edx/paragon';
+import { Hyperlink, Input } from '@edx/paragon';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
@@ -13,7 +13,7 @@ import get from 'lodash.get';
 import isEmpty from 'lodash.isempty';
 import memoize from 'memoize-one';
 import { demographicsSectionSelector } from '../data/selectors';
-import EditableSelectField from '../EditableSelectField';
+import EditableField from '../EditableField';
 import Checkboxes from './Checkboxes';
 import Alert from '../Alert';
 import { saveMultipleSettings, updateDraft } from '../data/actions';
@@ -75,7 +75,7 @@ class DemographicsSection extends React.Component {
      const matchingOption = demographicsEthnicityOptions.filter(option => option.value === e)[0];
      return matchingOption && matchingOption.label;
    }).join(', ');
-  };
+  }

  handleEditableFieldChange = (name, value) => {
    this.props.updateDraft(name, value);
@@ -162,8 +162,8 @@ class DemographicsSection extends React.Component {
    const showWorkStatusDescribe = this.props.formValues.demographics_work_status === OTHER;

    return (
-      <div className="account-section pt-3 mb-5" id="demographics-information" ref={this.props.forwardRef}>
-        <h2 className="section-heading h4 mb-3">
+      <div className="account-section" id="demographics-information" ref={this.props.forwardRef}>
+        <h2 className="section-heading">
          {this.props.intl.formatMessage(messages['account.settings.section.demographics.information'])}
        </h2>
        <p>
@@ -188,7 +188,7 @@ class DemographicsSection extends React.Component {
        */}
        {this.hasRetrievedDemographicsOptions() && (
          <div id="demographics-fields">
-            <EditableSelectField
+            <EditableField
              name="demographics_gender"
              type="select"
              value={this.props.formValues.demographics_gender}
@@ -199,7 +199,7 @@ class DemographicsSection extends React.Component {
              {...editableFieldProps}
            >
              {showSelfDescribe && (
-                <Form.Control
+                <Input
                  name="demographics_gender_description"
                  id="field-demographics_gender_description"
                  type="text"
@@ -210,8 +210,8 @@ class DemographicsSection extends React.Component {
                  className="mt-1"
                />
              )}
-            </EditableSelectField>
-            <EditableSelectField
+            </EditableField>
+            <EditableField
              name="demographics_user_ethnicity"
              type="select"
              hidden
@@ -226,8 +226,8 @@ class DemographicsSection extends React.Component {
                values={this.props.formValues.demographics_user_ethnicity}
                {...editableFieldProps}
              />
-            </EditableSelectField>
-            <EditableSelectField
+            </EditableField>
+            <EditableField
              name="demographics_income"
              type="select"
              value={this.props.formValues.demographics_income}
@@ -236,7 +236,7 @@ class DemographicsSection extends React.Component {
              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.income.empty'])}
              {...editableFieldProps}
            />
-            <EditableSelectField
+            <EditableField
              name="demographics_military_history"
              type="select"
              value={this.props.formValues.demographics_military_history}
@@ -245,7 +245,7 @@ class DemographicsSection extends React.Component {
              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.military_history.empty'])}
              {...editableFieldProps}
            />
-            <EditableSelectField
+            <EditableField
              name="demographics_learner_education_level"
              type="select"
              value={this.props.formValues.demographics_learner_education_level}
@@ -254,7 +254,7 @@ class DemographicsSection extends React.Component {
              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.learner_education_level.empty'])}
              {...editableFieldProps}
            />
-            <EditableSelectField
+            <EditableField
              name="demographics_parent_education_level"
              type="select"
              value={this.props.formValues.demographics_parent_education_level}
@@ -263,7 +263,7 @@ class DemographicsSection extends React.Component {
              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.parent_education_level.empty'])}
              {...editableFieldProps}
            />
-            <EditableSelectField
+            <EditableField
              name="demographics_work_status"
              type="select"
              value={this.props.formValues.demographics_work_status}
@@ -276,7 +276,7 @@ class DemographicsSection extends React.Component {
              {...editableFieldProps}
            >
              {showWorkStatusDescribe && (
-                <Form.Control
+                <Input
                  name="demographics_work_status_description"
                  id="field-demographics_work_status_description"
                  type="text"
@@ -287,8 +287,8 @@ class DemographicsSection extends React.Component {
                  className="mt-1"
                />
              )}
-            </EditableSelectField>
-            <EditableSelectField
+            </EditableField>
+            <EditableField
              name="demographics_current_work_sector"
              type="select"
              value={this.props.formValues.demographics_current_work_sector}
@@ -297,7 +297,7 @@ class DemographicsSection extends React.Component {
              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.current_work_sector.empty'])}
              {...editableFieldProps}
            />
-            <EditableSelectField
+            <EditableField
              name="demographics_future_work_sector"
              type="select"
              value={this.props.formValues.demographics_future_work_sector}
@@ -317,7 +317,7 @@ DemographicsSection.propTypes = {
  intl: intlShape.isRequired,
  formValues: PropTypes.shape({
    demographics_gender: PropTypes.string,
-    demographics_user_ethnicity: PropTypes.shape([]),
+    demographics_user_ethnicity: PropTypes.array,
    demographics_income: PropTypes.string,
    demographics_military_history: PropTypes.string,
    demographics_learner_education_level: PropTypes.string,
@@ -327,11 +327,11 @@ DemographicsSection.propTypes = {
    demographics_future_work_sector: PropTypes.string,
    demographics_work_status_description: PropTypes.string,
    demographics_gender_description: PropTypes.string,
-    demographicsOptions: PropTypes.shape({}),
+    demographicsOptions: PropTypes.object,
  }).isRequired,
  drafts: PropTypes.shape({
    demographics_gender: PropTypes.string,
-    demographics_user_ethnicity: PropTypes.shape([]),
+    demographics_user_ethnicity: PropTypes.array,
    demographics_income: PropTypes.string,
    demographics_military_history: PropTypes.string,
    demographics_learner_education_level: PropTypes.string,
@@ -341,7 +341,7 @@ DemographicsSection.propTypes = {
    demographics_future_work_sector: PropTypes.string,
    demographics_work_status_description: PropTypes.string,
    demographics_gender_description: PropTypes.string,
-    demographicsOptions: PropTypes.shape({}),
+    demographicsOptions: PropTypes.object,
  }).isRequired,
  formErrors: PropTypes.shape({
    demographicsError: PropTypes.string,
--- a/src/account-settings/demographics/test/DemographicsSection.test.jsx
+++ b/src/account-settings/demographics/test/DemographicsSection.test.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-import-assign */
 import * as auth from '@edx/frontend-platform/auth';

 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
--- a/src/account-settings/demographics/test/snapshots/DemographicsSection.test.jsx.snap
+++ b/src/account-settings/demographics/test/snapshots/DemographicsSection.test.jsx.snap
@@ -2,27 +2,27 @@

 exports[`DemographicsSection should render 1`] = `
 <div
-  className="account-section pt-3 mb-5"
+  className="account-section"
  id="demographics-information"
 >
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noreferrer"
+      rel="noopener noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
+        className="d-inline-block align-text-top"
      >
+         
        <span
          className="pgn__icon"
          style={
@@ -34,6 +34,7 @@ exports[`DemographicsSection should render 1`] = `
        >
          <svg
            aria-hidden={true}
+            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -47,11 +48,6 @@ exports[`DemographicsSection should render 1`] = `
              fill="currentColor"
            />
          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
        </span>
      </span>
    </a>
@@ -648,27 +644,27 @@ exports[`DemographicsSection should render 1`] = `

 exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
 <div
-  className="account-section pt-3 mb-5"
+  className="account-section"
  id="demographics-information"
 >
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noreferrer"
+      rel="noopener noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
+        className="d-inline-block align-text-top"
      >
+         
        <span
          className="pgn__icon"
          style={
@@ -680,6 +676,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
        >
          <svg
            aria-hidden={true}
+            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -693,11 +690,6 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
              fill="currentColor"
            />
          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
        </span>
      </span>
    </a>
@@ -710,7 +702,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
    >
      <div />
      <div>
-        An error occurred attempting to retrieve or save your account information. Please try again later.
+        <span>
+          An error occurred attempting to retrieve or save your account information. Please try again later.
+        </span>
      </div>
    </div>
  </div>
@@ -1306,27 +1300,27 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `

 exports[`DemographicsSection should render an Alert when demographicsOptions props are empty 1`] = `
 <div
-  className="account-section pt-3 mb-5"
+  className="account-section"
  id="demographics-information"
 >
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noreferrer"
+      rel="noopener noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
+        className="d-inline-block align-text-top"
      >
+         
        <span
          className="pgn__icon"
          style={
@@ -1338,6 +1332,7 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
        >
          <svg
            aria-hidden={true}
+            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -1351,11 +1346,6 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
              fill="currentColor"
            />
          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
        </span>
      </span>
    </a>
@@ -1368,7 +1358,9 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
    >
      <div />
      <div>
-        An error occurred attempting to retrieve or save your account information. Please try again later.
+        <span>
+          An error occurred attempting to retrieve or save your account information. Please try again later.
+        </span>
      </div>
    </div>
  </div>
@@ -1377,27 +1369,27 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro

 exports[`DemographicsSection should render ethnicity correctly when multiple options are selected 1`] = `
 <div
-  className="account-section pt-3 mb-5"
+  className="account-section"
  id="demographics-information"
 >
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noreferrer"
+      rel="noopener noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
+        className="d-inline-block align-text-top"
      >
+         
        <span
          className="pgn__icon"
          style={
@@ -1409,6 +1401,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
        >
          <svg
            aria-hidden={true}
+            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -1422,11 +1415,6 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
              fill="currentColor"
            />
          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
        </span>
      </span>
    </a>
@@ -2016,27 +2004,27 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt

 exports[`DemographicsSection should render ethnicity text correctly 1`] = `
 <div
-  className="account-section pt-3 mb-5"
+  className="account-section"
  id="demographics-information"
 >
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noreferrer"
+      rel="noopener noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
+        className="d-inline-block align-text-top"
      >
+         
        <span
          className="pgn__icon"
          style={
@@ -2048,6 +2036,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
        >
          <svg
            aria-hidden={true}
+            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -2061,11 +2050,6 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
              fill="currentColor"
            />
          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
        </span>
      </span>
    </a>
@@ -2655,27 +2639,27 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `

 exports[`DemographicsSection should set user input correctly when user provides answers to work_status question 1`] = `
 <div
-  className="account-section pt-3 mb-5"
+  className="account-section"
  id="demographics-information"
 >
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noreferrer"
+      rel="noopener noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
+        className="d-inline-block align-text-top"
      >
+         
        <span
          className="pgn__icon"
          style={
@@ -2687,6 +2671,7 @@ exports[`DemographicsSection should set user input correctly when user provides
        >
          <svg
            aria-hidden={true}
+            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -2700,11 +2685,6 @@ exports[`DemographicsSection should set user input correctly when user provides
              fill="currentColor"
            />
          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
        </span>
      </span>
    </a>
@@ -3301,27 +3281,27 @@ exports[`DemographicsSection should set user input correctly when user provides

 exports[`DemographicsSection should set user input correctly when user provides gender self-description 1`] = `
 <div
-  className="account-section pt-3 mb-5"
+  className="account-section"
  id="demographics-information"
 >
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noreferrer"
+      rel="noopener noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
+        className="d-inline-block align-text-top"
      >
+         
        <span
          className="pgn__icon"
          style={
@@ -3333,6 +3313,7 @@ exports[`DemographicsSection should set user input correctly when user provides
        >
          <svg
            aria-hidden={true}
+            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -3346,11 +3327,6 @@ exports[`DemographicsSection should set user input correctly when user provides
              fill="currentColor"
            />
          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
        </span>
      </span>
    </a>
--- a/src/account-settings/index.js
+++ b/src/account-settings/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-exports
 export { default } from './AccountSettingsPage';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/account-settings/name-change/NameChange.jsx
+++ b/src/account-settings/name-change/NameChange.jsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { connect, useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import PropTypes from 'prop-types';
@@ -21,35 +21,35 @@ import { nameChangeSelector } from '../data/selectors';
 import { requestNameChange, requestNameChangeFailure, requestNameChangeReset } from './data/actions';
 import messages from './messages';

-const NameChangeModal = ({
+function NameChangeModal({
  targetFormId,
  errors,
  formValues,
  intl,
  saveState,
-}) => {
+}) {
  const dispatch = useDispatch();
  const { push } = useHistory();
  const { username } = getAuthenticatedUser();
  const [verifiedNameInput, setVerifiedNameInput] = useState(formValues.verified_name || '');
  const [confirmedWarning, setConfirmedWarning] = useState(false);

-  const resetLocalState = useCallback(() => {
+  function resetLocalState() {
    setConfirmedWarning(false);
    dispatch(requestNameChangeReset());
-  }, [dispatch]);
+  }

-  const handleChange = (e) => {
+  function handleChange(e) {
    setVerifiedNameInput(e.target.value);
-  };
+  }

-  const handleClose = useCallback(() => {
+  function handleClose() {
    resetLocalState();
    dispatch(closeForm(targetFormId));
    dispatch(saveSettingsReset());
-  }, [dispatch, resetLocalState, targetFormId]);
+  }

-  const handleSubmit = (e) => {
+  function handleSubmit(e) {
    e.preventDefault();

    if (saveState === 'pending') {
@@ -64,14 +64,14 @@ const NameChangeModal = ({
      const draftProfileName = targetFormId === 'name' ? formValues.name : null;
      dispatch(requestNameChange(username, draftProfileName, verifiedNameInput));
    }
-  };
+  }

  useEffect(() => {
    if (saveState === 'complete') {
      handleClose();
-      push(`/id-verification?next=${encodeURIComponent('account/settings')}`);
+      push('/id-verification');
    }
-  }, [handleClose, push, saveState]);
+  }, [saveState]);

  function renderErrors() {
    if (Object.keys(errors).length > 0) {
@@ -183,7 +183,7 @@ const NameChangeModal = ({

    </ModalDialog>
  );
-};
+}

 NameChangeModal.propTypes = {
  targetFormId: PropTypes.string.isRequired,
--- a/src/account-settings/name-change/index.js
+++ b/src/account-settings/name-change/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-exports
 export { default } from './NameChange';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/account-settings/name-change/messages.js
+++ b/src/account-settings/name-change/messages.js
@@ -23,12 +23,12 @@ const messages = defineMessages({
  },
  'account.settings.name.change.id.name.label': {
    id: 'account.settings.name.change.id.name.label',
-    defaultMessage: 'Enter your name as it appears on your unexpired student, work, or government-issued identification card.',
+    defaultMessage: 'Enter your name as it appears on your government-issued ID.',
    description: 'Form label instructing the user to enter the name on their ID.',
  },
  'account.settings.name.change.id.name.placeholder': {
    id: 'account.settings.name.change.id.name.placeholder',
-    defaultMessage: 'Enter the name on your photo ID',
+    defaultMessage: 'Enter the name on your government ID',
    description: 'Form label instructing the user to enter the name on their ID.',
  },
  'account.settings.name.change.error.valid.name': {
--- a/src/account-settings/name-change/test/NameChange.test.jsx
+++ b/src/account-settings/name-change/test/NameChange.test.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-import-assign */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
@@ -71,7 +70,7 @@ describe('NameChange', () => {
  afterEach(() => jest.clearAllMocks());

  it('renders populated input after clicking continue if verified_name in form data', async () => {
-    const getInput = () => screen.queryByPlaceholderText('Enter the name on your photo ID');
+    const getInput = () => screen.queryByPlaceholderText('Enter the name on your government ID');

    render(reduxWrapper(<IntlNameChange {...props} />));
    expect(getInput()).toBeNull();
@@ -83,7 +82,7 @@ describe('NameChange', () => {
  });

  it('renders empty input after clicking continue if verified_name not in form data', async () => {
-    const getInput = () => screen.queryByPlaceholderText('Enter the name on your photo ID');
+    const getInput = () => screen.queryByPlaceholderText('Enter the name on your government ID');
    const formProps = {
      ...props,
      formValues: {
@@ -113,7 +112,7 @@ describe('NameChange', () => {
    const continueButton = screen.getByText('Continue');
    fireEvent.click(continueButton);

-    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
+    const input = screen.getByPlaceholderText('Enter the name on your government ID');
    fireEvent.change(input, { target: { value: 'Verified Name' } });

    const submitButton = screen.getByText('Continue');
@@ -140,7 +139,7 @@ describe('NameChange', () => {
    const continueButton = screen.getByText('Continue');
    fireEvent.click(continueButton);

-    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
+    const input = screen.getByPlaceholderText('Enter the name on your government ID');
    fireEvent.change(input, { target: { value: 'Verified Name' } });

    const submitButton = screen.getByText('Continue');
@@ -156,7 +155,7 @@ describe('NameChange', () => {
    const continueButton = screen.getByText('Continue');
    fireEvent.click(continueButton);

-    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
+    const input = screen.getByPlaceholderText('Enter the name on your government ID');
    fireEvent.change(input, { target: { value: 'Verified Name' } });

    const submitButton = screen.getByText('Continue');
--- a/src/account-settings/reset-password/index.js
+++ b/src/account-settings/reset-password/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-exports
 export { default } from './ResetPassword';
 export { default as reducer } from './data/reducers';
 export { RESET_PASSWORD } from './data/actions';
--- a/src/account-settings/test/snapshots/JumpNav.test.jsx.snap
+++ b/src/account-settings/test/snapshots/JumpNav.test.jsx.snap
@@ -2,7 +2,7 @@

 exports[`JumpNav should not render Optional Information link 1`] = `
 <div
-  className="jump-nav jump-nav-sm position-sticky pt-3"
+  className="jump-nav"
 >
  <ul
    className="list-unstyled"
@@ -12,9 +12,11 @@ exports[`JumpNav should not render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#basic-information"
        onClick={[Function]}
+        style={Object {}}
      >
        Account Information
      </a>
@@ -23,9 +25,11 @@ exports[`JumpNav should not render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#profile-information"
        onClick={[Function]}
+        style={Object {}}
      >
        Profile Information
      </a>
@@ -34,9 +38,11 @@ exports[`JumpNav should not render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#social-media"
        onClick={[Function]}
+        style={Object {}}
      >
        Social Media Links
      </a>
@@ -45,9 +51,11 @@ exports[`JumpNav should not render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#site-preferences"
        onClick={[Function]}
+        style={Object {}}
      >
        Site Preferences
      </a>
@@ -56,9 +64,11 @@ exports[`JumpNav should not render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#linked-accounts"
        onClick={[Function]}
+        style={Object {}}
      >
        Linked Accounts
      </a>
@@ -67,9 +77,11 @@ exports[`JumpNav should not render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#delete-account"
        onClick={[Function]}
+        style={Object {}}
      >
        Delete My Account
      </a>
@@ -80,7 +92,7 @@ exports[`JumpNav should not render Optional Information link 1`] = `

 exports[`JumpNav should render Optional Information link 1`] = `
 <div
-  className="jump-nav jump-nav-sm position-sticky pt-3"
+  className="jump-nav"
 >
  <ul
    className="list-unstyled"
@@ -90,9 +102,11 @@ exports[`JumpNav should render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#basic-information"
        onClick={[Function]}
+        style={Object {}}
      >
        Account Information
      </a>
@@ -101,9 +115,11 @@ exports[`JumpNav should render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#profile-information"
        onClick={[Function]}
+        style={Object {}}
      >
        Profile Information
      </a>
@@ -112,9 +128,11 @@ exports[`JumpNav should render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#demographics-information"
        onClick={[Function]}
+        style={Object {}}
      >
        Optional Information
      </a>
@@ -123,9 +141,11 @@ exports[`JumpNav should render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#social-media"
        onClick={[Function]}
+        style={Object {}}
      >
        Social Media Links
      </a>
@@ -134,9 +154,11 @@ exports[`JumpNav should render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#site-preferences"
        onClick={[Function]}
+        style={Object {}}
      >
        Site Preferences
      </a>
@@ -145,9 +167,11 @@ exports[`JumpNav should render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#linked-accounts"
        onClick={[Function]}
+        style={Object {}}
      >
        Linked Accounts
      </a>
@@ -156,9 +180,11 @@ exports[`JumpNav should render Optional Information link 1`] = `
      className=""
    >
      <a
-        aria-current={null}
+        aria-current="page"
+        className="active"
        href="/#delete-account"
        onClick={[Function]}
+        style={Object {}}
      >
        Delete My Account
      </a>
--- a/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
+++ b/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
@@ -16,7 +16,7 @@ class ThirdPartyAuth extends Component {
    }
    const disconnectUrl = e.currentTarget.getAttribute('data-disconnect-url');
    this.props.disconnectAuth(disconnectUrl, providerId);
-  };
+  }

  renderUnconnectedProvider(url, name) {
    return (
--- a/src/account-settings/third-party-auth/index.js
+++ b/src/account-settings/third-party-auth/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-exports
 export { default } from './ThirdPartyAuth';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,4 +0,0 @@
-export const IDLE_STATUS = 'idle';
-export const LOADING_STATUS = 'loading';
-export const SUCCESS_STATUS = 'success';
-export const FAILURE_STATUS = 'failure';
--- a/src/head/Head.jsx
+++ b/src/head/Head.jsx
@@ -1,21 +0,0 @@
-import React from 'react';
-import { Helmet } from 'react-helmet';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { getConfig } from '@edx/frontend-platform';
-
-import messages from './messages';
-
-const Head = ({ intl }) => (
-  <Helmet>
-    <title>
-      {intl.formatMessage(messages['account.page.title'], { siteName: getConfig().SITE_NAME })}
-    </title>
-    <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
-  </Helmet>
-);
-
-Head.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(Head);
--- a/src/head/Head.test.jsx
+++ b/src/head/Head.test.jsx
@@ -1,17 +0,0 @@
-import React from 'react';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
-import { Helmet } from 'react-helmet';
-import { mount } from 'enzyme';
-import { getConfig } from '@edx/frontend-platform';
-import Head from './Head';
-
-describe('Head', () => {
-  const props = {};
-  it('should match render title tag and fivicon with the site configuration values', () => {
-    mount(<IntlProvider locale="en"><Head {...props} /></IntlProvider>);
-    const helmet = Helmet.peek();
-    expect(helmet.title).toEqual(`Account | ${getConfig().SITE_NAME}`);
-    expect(helmet.linkTags[0].rel).toEqual('shortcut icon');
-    expect(helmet.linkTags[0].href).toEqual(getConfig().FAVICON_URL);
-  });
-});
--- a/src/head/messages.js
+++ b/src/head/messages.js
@@ -1,11 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'account.page.title': {
-    id: 'account.page.title',
-    defaultMessage: 'Account | {siteName}',
-    description: 'Title tag',
-  },
-});
-
-export default messages;
--- a/src/hooks.js
+++ b/src/hooks.js
@@ -1,55 +1,23 @@
 import { useEffect, useState } from 'react';

-import {
-  IDLE_STATUS, LOADING_STATUS, SUCCESS_STATUS, FAILURE_STATUS,
-} from './constants';
-
 // eslint-disable-next-line import/prefer-default-export
 export function useAsyncCall(asyncFunc) {
-  // React doesn't batch setStates call in async useEffect hooks,
-  // so we use a combined object here to ensure that users
-  // re-render once.
-  const [data, setData] = useState({ status: IDLE_STATUS });
+  const [isLoading, setIsLoading] = useState();
+  const [data, setData] = useState();

  useEffect(
    () => {
      (async () => {
-        setData(currData => ({ ...currData, status: LOADING_STATUS }));
+        setIsLoading(true);
        const response = await asyncFunc();
-
-        if (Object.keys(response).length === 0) {
-          setData(currData => ({ ...currData, status: FAILURE_STATUS, data: response }));
-        } else {
-          setData(currData => ({ ...currData, status: SUCCESS_STATUS, data: response }));
+        setIsLoading(false);
+        if (response) {
+          setData(response);
        }
      })();
    },
    [asyncFunc],
  );

-  return data;
-}
-
-// Redirect the user to their original location based on session storage
-export function useRedirect() {
-  const [redirect, setRedirect] = useState({
-    location: 'dashboard',
-    text: 'id.verification.return.dashboard',
-  });
-
-  useEffect(() => {
-    if (sessionStorage.getItem('courseId')) {
-      setRedirect({
-        location: `courses/${sessionStorage.getItem('courseId')}`,
-        text: 'id.verification.return.course',
-      });
-    } else if (sessionStorage.getItem('next')) {
-      setRedirect({
-        location: sessionStorage.getItem('next'),
-        text: 'id.verification.return.generic',
-      });
-    }
-  }, []);
-
-  return redirect;
+  return [isLoading, data];
 }
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -1,27 +1,31 @@
 import arMessages from './messages/ar.json';
-import frMessages from './messages/fr.json';
-import es419Messages from './messages/es_419.json';
-import zhcnMessages from './messages/zh_CN.json';
-import ptMessages from './messages/pt.json';
-import itMessages from './messages/it.json';
-import ukMessages from './messages/uk.json';
-import deMessages from './messages/de.json';
-import ruMessages from './messages/ru.json';
-import hiMessages from './messages/hi.json';
-import frCAMessages from './messages/fr_CA.json';
+import caMessages from './messages/ca.json';
 // no need to import en messages-- they are in the defaultMessage field
+import es419Messages from './messages/es_419.json';
+import frMessages from './messages/fr.json';
+import zhcnMessages from './messages/zh_CN.json';
+import heMessages from './messages/he.json';
+import idMessages from './messages/id.json';
+import kokrMessages from './messages/ko_kr.json';
+import plMessages from './messages/pl.json';
+import ptbrMessages from './messages/pt_br.json';
+import ruMessages from './messages/ru.json';
+import thMessages from './messages/th.json';
+import ukMessages from './messages/uk.json';

 const messages = {
  ar: arMessages,
  'es-419': es419Messages,
  fr: frMessages,
  'zh-cn': zhcnMessages,
-  pt: ptMessages,
-  it: itMessages,
-  de: deMessages,
-  hi: hiMessages,
-  'fr-ca': frCAMessages,
+  ca: caMessages,
+  he: heMessages,
+  id: idMessages,
+  'ko-kr': kokrMessages,
+  pl: plMessages,
+  'pt-br': ptbrMessages,
  ru: ruMessages,
+  th: thMessages,
  uk: ukMessages,
 };

--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1,89 +1,73 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "حساب {provider} الذي حددته موصول من قبل بحساب آخر على {siteName}.",
-  "account.settings.message.managed.settings": "إعدادات ملفك الشخصي يديرها {ManagerTitle}. اتصل بمديرك أو ب{support} للحصول على المساعدة.",
+  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
+  "account.settings.message.managed.settings": "تتم إدارة إعدادات الملف الشخصي بواسطة {ManagerTitle}. اتصل بالمسؤول أو {support} للحصول على المساعدة.",
  "account.settings.message.managed.settings.support": "الدعم",
  "account.settings.page.heading": "إعدادات الحساب",
-  "account.settings.loading.message": "التحميل جارٍ...",
+  "account.settings.loading.message": "جاري التحميل...",
  "account.settings.loading.error": "خطأ: {error}",
-  "account.settings.banner.beta.language": "لقد قمت بضبط لغتك على {beta_language}، وهي حاليا غير مترجمة بالكامل. يمكنك مساعدتنا في إتمام ترجمة هذه اللغة من خلال الانضمام إلى مجتمع Transifex وإضافة ترجمات من الإنجليزية للمتعلمين الذين يتحدثون {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "العودة إلى {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "ساعد في الترجمة إلى {beta_language}",
+  "account.settings.banner.beta.language": "لقد قمت بتعيين لغتك الى {beta_language}، والتي لم تتم ترجمتها بالكامل حاليًا. يمكنك مساعدتنا في ترجمة هذه اللغة بالكامل من خلال الانضمام إلى مجتمع Transifex وإضافة ترجمات من الإنجليزية للمتعلمين الذين يتحدثون {beta_language}.",
+  "account.settings.banner.beta.language.action.switch.back": "العودة لـِ {previous_language}",
+  "account.settings.banner.beta.language.action.help.translate": "المساعدة في الترجمة إلى {beta_language}",
  "account.settings.section.account.information": "معلومات الحساب",
  "account.settings.section.account.information.description": "تتضمن هذه الإعدادات معلومات أساسية عن حسابك.",
  "account.settings.section.profile.information": "معلومات الملف الشخصي",
  "account.settings.section.demographics.information": "معلومات اختيارية",
  "account.settings.section.site.preferences": "تفضيلات الموقع",
-  "account.settings.section.linked.accounts": "الحسابات الموصولة",
-  "account.settings.section.linked.accounts.description": "يمكنك وصل حسابات هويتك لتبسيط تسجيل دخولك إلى {siteName}.",
+  "account.settings.section.linked.accounts": "الحسابات المرتبطة",
+  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
  "account.settings.field.username": "اسم المستخدم",
-  "account.settings.field.username.help.text": "الاسم الذي يعرّفك على {siteName}. لا يمكنك تغيير اسم المستخدم الخاص بك.",
+  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
  "account.settings.field.full.name": "الاسم الكامل",
-  "account.settings.field.full.name.empty": "إضافة الاسم",
-  "account.settings.field.full.name.help.text": "الاسم المستعمل للتحقق من هويتك والذي يظهر في شهاداتك.",
-  "account.settings.field.full.name.help.text.default": "الاسم الذي يظهر في ملفك الشخصي العامّ.",
-  "account.settings.field.full.name.help.text.default.certificate": "سيظهر هذا الاسم في شهاداتك و سجلّاتك العامّة.",
-  "account.settings.field.name.verified": "اسم متحقَّق منه",
-  "account.settings.field.name.verified.help.text.verified": "تم التحقق من هذا الاسم عن طريق بطاقة تعريف ذات صورة.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "تم التحقق من هذا الاسم عن طريق المراقبة.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "تم التحقق من هذا الاسم عن طريق بطاقة هوية ذات صورة، وتم اختياره للظهور في الشهادات والسجلات العامة.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "تم التحقق من هذا الاسم من خلال المراقبة، وتم تحديده للظهور في الشهادات والسجلات العامة.",
-  "account.settings.field.name.verified.help.text.submitted": "تم تسليم طلب التحقق. في العادة يستغرق هذا 48 ساعة أو أقل. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "تم تسليم امتحانك المراقَب. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت. رجاءً أعد التفقد بعد 2-5 أيام.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "عند نجاح التحقق من الهوية، سيظهر هذا الاسم على شهاداتك و سجلاتك العامة. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "بمجرد اجتياز امتحانك المراقب للمراجعة، سيظهر هذا الاسم في شهادتك و سجلاتك العامة. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
-  "account.settings.field.name.verified.verification.help": "أدخل اسمك كما يظهر في بطاقة تعريف الطالب أو الموظف الخاصة بك، أو بطاقة تعريفك الصادرة عن الحكومة.",
-  "account.settings.field.full.name.help.text.submitted": "تم تسليم طلب التحقق. يستغرق هذا عادةً 48 ساعة أو أقل. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "تم تسليم امتحانك المراقب. لا يمكن تغيير الاسم الكامل في هذا الوقت. يرجى التحقق مرة أخرى خلال 2-5 أيام.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "عند نجاح التحقق من الهوية، سيظهر هذا الاسم على الشهادات والسجلات العامة. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "بمجرد اجتياز امتحانك المراقب للمراجعة، سيظهر هذا الاسم في شهاداتك وسجلاتك العامة. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
-  "account.settings.field.name.verified.success.message": "اكتمل طلب التحقق من هويتك بنجاح. لديك الآن خيار تحديد الاسم الذي تفضل ظهوره على شهاداتك وسجلاتك العامة.",
-  "account.settings.field.name.verified.success.message.header": "اكتمل طلب تغيير اسمك!",
-  "account.settings.field.name.verified.failure.message": "لم تنجح آخر محاولاتك للتحقق من هويتك. تم إرجاع إعدادات الحساب ذات الصلة إلى وضعها السابق.",
-  "account.settings.field.name.verified.failure.message.header": "لم نستطع التحقق من هويتك.",
-  "account.settings.field.name.verified.failure.message.help.link": "اعرف المزيد عن التحقق من الهوية.",
-  "account.settings.field.name.verified.submitted.message": "تم تسليم طلب التحقق من هويتك و عادة ما يستغرق إكماله ما بين 24 و 48 ساعة.",
-  "account.settings.field.name.verified.submitted.message.certificate": "عند الموافقة على طلبك، سيظهر اسمك المحدَّث على جميع الشهادات السجلات العامة ذات الصلة.",
-  "account.settings.field.name.verified.submitted.message.header": "طلب تغيير اسمك يكاد يكتمل!",
-  "account.settings.field.email": "البريد الالكتروني (تسجيل الدخول)",
+  "account.settings.field.full.name.empty": "إضافة اسم",
+  "account.settings.field.full.name.help.text": "الاسم المستخدم للتحقق من هويتك والذي سوف يظهر على الشهادات الخاصة بك.",
+  "account.settings.field.full.name.help.text.non.certificate": "The name that appears on your public profile.",
+  "account.settings.field.full.name.help.text.certificate": "This name is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified": "Verified name",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by government ID.",
+  "account.settings.field.name.verified.help.text.certificate": "This name has been verified by government ID and selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
+  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
+  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your government-issued ID.",
+  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
+  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
+  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
+  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
+  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
+  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
+  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
+  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
+  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
+  "account.settings.field.email": "البريد الالكتروني (الدخول)",
  "account.settings.field.email.empty": "إضافة عنوان البريد الإلكتروني",
-  "account.settings.field.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر على الرابط في الرسالة لتحديث عنوان بريدك الإلكتروني.",
-  "account.settings.field.email.help.text": "على هذا العنوان تصلك الرسائل من {siteName} و من فرق المساقات.",
-  "account.settings.field.secondary.email": "عنوان بريد الاستعادة الإلكتروني.",
-  "account.settings.field.secondary.email.empty": "إضافة عنوان بريد إلكتروني لاستعادة حسابك",
-  "account.settings.field.secondary.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر على الرابط في الرسالة لتحديث عنوان بريد الاستعادة الإلكتروني الخاص بك.",
+  "account.settings.field.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر فوق الرابط في الرسالة لتحديث عنوان بريدك الإلكتروني.",
+  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
+  "account.settings.field.secondary.email": "عنوان البريد الإلكتروني للاسترداد",
+  "account.settings.field.secondary.email.empty": "إضافة عنوان البريد الإلكتروني للاسترداد",
+  "account.settings.field.secondary.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر فوق الرابط في الرسالة لتحديث عنوان بريد الاسترداد الإلكتروني.",
  "account.settings.email.field.confirmation.header": "تعليق عملية التأكيد",
  "account.settings.field.dob": "سنة الميلاد",
  "account.settings.field.dob.empty": "إضافة سنة الميلاد",
-  "account.settings.field.year_of_birth.options.empty": "تحديد سنة الميلاد",
-  "account.settings.field.dob.month": "الشهر",
-  "account.settings.field.dob.year": "السنة",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "يرجى تأكيد تاريخ ميلادك",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "تحديد شهر الميلاد",
-  "account.settingsfield.dob.error.general": "حدث خطأ تقني. رجاءً حاول مجددا.",
-  "account.settings.field.country": "البلد",
+  "account.settings.field.year_of_birth.options.empty": "اختر سنة ميلاد",
+  "account.settings.field.country": "الدولة",
  "account.settings.field.country.empty": "إضافة البلد ",
-  "account.settings.field.country.options.empty": "اختر البلد",
-  "account.settings.field.state": "المنطقة / الولاية / المحافظة",
-  "account.settings.field.state.empty": "إضافة المنطقة / الولاية / المحافظة",
-  "account.settings.field.state.options.empty": "حدد المنطقة",
+  "account.settings.field.country.options.empty": "اختر دولة",
+  "account.settings.field.state": "الحالة",
+  "account.settings.field.state.empty": "إضافة منطقة",
+  "account.settings.field.state.options.empty": "اختر منطقة",
  "account.settings.field.site.language": "لغة الموقع",
  "account.settings.field.site.language.help.text": "اللغة المستخدمة في كافة أقسام هذا الموقع. يتوفّر هذا الموقع حاليًا بعدد محدود من اللغات.",
  "account.settings.field.education": "المستوى التعليمي",
  "account.settings.field.education.empty": "إضافة المستوى التعليمي",
-  "account.settings.field.education.levels.empty": "اختر مستوى تعليميًّا",
+  "account.settings.field.education.levels.empty": "اختر المستوى التعليمي",
  "account.settings.field.education.levels.p": "دكتوراه",
-  "account.settings.field.education.levels.m": "ماجستير / ماستر أو شهادة مهنيّة",
-  "account.settings.field.education.levels.b": "بكالوريوس / ليسانس",
-  "account.settings.field.education.levels.a": "درجة الزمالة / دبلوم الدراسات الجامعية",
-  "account.settings.field.education.levels.hs": "الثانوية العامة / البكالوريا",
-  "account.settings.field.education.levels.jhs": "المدرسة الإعدادية / المتوسطة",
-  "account.settings.field.education.levels.el": "المدرسة الابتدائية / الأساسية",
-  "account.settings.field.education.levels.none": "دون تعليم رسمي",
+  "account.settings.field.education.levels.m": "ماجستير أو شهادة مهنيّة",
+  "account.settings.field.education.levels.b": "بكالوريوس",
+  "account.settings.field.education.levels.a": "زمالة",
+  "account.settings.field.education.levels.hs": "شهادة الثانوية العامة",
+  "account.settings.field.education.levels.jhs": "شهادة الثانوية الصغرى/الإعدادية/المرحلة المتوسّطة",
+  "account.settings.field.education.levels.el": "شهادة المدرسة الابتدائية",
+  "account.settings.field.education.levels.none": "لا يوجد تعليم رسمي",
  "account.settings.field.education.levels.o": "نوع آخر من التعليم",
  "account.settings.field.gender": "الجنس",
  "account.settings.field.gender.empty": "إضافة الجنس",
@@ -96,184 +80,183 @@
  "account.settings.field.language_proficiencies.options.empty": "اختر لغة",
  "account.settings.field.time.zone": "المنطقة الزمنية",
  "account.settings.field.time.zone.empty": "ضبط المنطقة الزمنية",
-  "account.settings.field.time.zone.description": "حدد المنطقة الزمنية لعرض تواريخ المساقات. إذا لم تحدد منطقة زمنية، فسيتم عرض تواريخ المساق، بما في ذلك المواعيد النهائية للواجبات بالتوقيت المحلّي للمتصفح.",
-  "account.settings.field.time.zone.default": "الافتراضي (المنطقة الزمنية المحلية)",
+  "account.settings.field.time.zone.description": "حدد المنطقة الزمنية لعرض تواريخ المساق. إذا لم تحدد منطقة زمنية، فسيتم عرض تواريخ المساق، بما في ذلك المواعيد النهائية للواجب في المنطقة الزمنية المحلية في المتصفح.",
+  "account.settings.field.time.zone.default": "الافتراضي (منطقة التوقيت المحلي)",
  "account.settings.field.time.zone.all": "جميع المناطق الزمنية",
-  "account.settings.field.time.zone.country": "المناطق الزمنية للبلدان",
-  "account.settings.section.social.media": "روابط التواصل الإجتماعي",
-  "account.settings.section.social.media.description": "اختياريًا، اربط حساباتك الشخصية بأيقونات التواصل الاجتماعي في ملفك على {siteName}.",
+  "account.settings.field.time.zone.country": "المنطقة الزمنية للدولة",
+  "account.settings.section.social.media": "روابط منصات التواصل الإجتماعي",
+  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
  "account.settings.field.social.platform.name.linkedin": "لينكد إن",
-  "account.settings.field.social.platform.name.linkedin.empty": "إضافة سيرة لينكد إن",
-  "account.settings.jump.nav.delete.account": "حذف حسابي",
+  "account.settings.field.social.platform.name.linkedin.empty": "إضافة عنوان ملف لينكد إن ",
+  "account.settings.jump.nav.delete.account": "احذف حسابي",
  "account.settings.field.social.platform.name.twitter": "تويتر",
-  "account.settings.field.social.platform.name.twitter.empty": "إضافة صفحة تويتر",
+  "account.settings.field.social.platform.name.twitter.empty": "إضافة عنوان صفحة تويتر",
  "account.settings.field.social.platform.name.facebook": "فيسبوك",
-  "account.settings.field.social.platform.name.facebook.empty": "إضافة حساب فيسبوك",
+  "account.settings.field.social.platform.name.facebook.empty": "إضافة عنوان صفحة فيسبوك",
  "account.settings.editable.field.action.save": "حفظ",
  "account.settings.editable.field.action.cancel": "إلغاء",
-  "account.settings.editable.field.action.edit": "تعديل",
-  "account.settings.static.field.empty": "لا قيمة محددة. رجاءً اتصل بمديرك في {enterprise} ليقوم بالتعديلات.",
-  "account.settings.static.field.empty.no.admin": "لا قيمة محددة.",
-  "account.settings.field.name.certificate.select": "في حال التأشير، سيظهر هذا الاسم في شهاداتك و سجلاتك العامة.",
-  "account.settings.field.name.modal.certificate.title": "اختر اسمًا مفضلًا للشهادات والسجلات العامة",
-  "account.settings.field.name.modal.certificate.select": "اختر اسمًا",
-  "account.settings.field.name.modal.certificate.option.full": "الاسم الكامل",
-  "account.settings.field.name.modal.certificate.option.verified": "اسم متحقَّق منه",
-  "account.settings.field.name.modal.certificate.button.choose": "اختيار الاسم",
-  "account.settings.coaching.consent.welcome.header": "لنبدأ.",
+  "account.settings.editable.field.action.edit": "تحرير",
+  "account.settings.static.field.empty": "لم يتم تحديد قيمة، فضلًا اتصل بمدير  {enterprise} لتعيين بعض التغييرات.",
+  "account.settings.static.field.empty.no.admin": "لم يتم تحديد قيمة",
+  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
+  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
+  "account.settings.field.name.modal.certificate.select": "Select a name",
+  "account.settings.field.name.modal.certificate.option.full": "Full Name",
+  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
+  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
+  "account.settings.coaching.consent.welcome.header": "لنبدأ",
  "account.settings.coaching.consent.welcome.subheader": "نحن هنا لأجلك من البداية حتى النهاية",
-  "account.settings.coaching.consent.description": "تتضمن برامج MicroBachelors مرافقة تركز على مهنتك و تعليمك و كيفية تحقيقك للنتائج، و ذلك من خلال التواصل الفردي مع خبير متمرس. إن كنت مهتمًا، فيرجى تزويدنا بالمعلومات أدناه و النقر على \"إرسال\"، و سيتصل بك شريكنا في المرافقة عبر البريد الإلكتروني و/أو الرسائل النصية لمساعدتك على المضي قدمًا. تنطبق الشروط والأحكام.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* خدمات المرافقة مشمولة دون تكاليف إضافية للمتعلمين الذين لديهم أرقام هواتف أمريكية. تتضمن المرافقة رسائل نصية دورية. قد تنطبق أسعار على الرسائل والبيانات. أرسل STOP للانسحاب.",
-  "account.settings.coaching.consent.accept-coaching": "سجّل للاستفادة من خدمات المرافقة",
-  "account.settings.coaching.consent.decline-coaching": "أفضّل ألا يٌتصَل بي بخصوص خدمات المرافقة المجانية",
-  "account.settings.coaching.consent.label.name": "رجاءً أكّد اسمك",
-  "account.settings.coaching.consent.label.phone-number": "أدخل رقم هاتفك الجوّال",
-  "account.settings.coaching.consent.success.header": "نجحت العملية!",
-  "account.settings.coaching.consent.success.message": "أنت الآن مشترك في المرافقة. ترقّب رسالة عبر البريد الإلكتروني أو خدمة الرسائل القصيرة في في الأيام المقبلة.",
+  "account.settings.coaching.consent.description": "تتضمن برامج البكالوريوس التدريب الذي يركز على مهنتك وتعليمك وكيفية تحقيق نتائج مبهرة من خلال التواصل الشخصي مع خبراء متمرسين. إذا كنت مهتمًا، فقدّم المعلومات أدناه وانقر فوق \"إرسال\"، وسيتصل بك شريكنا في التدريب عبر البريد الإلكتروني و/أو الرسائل النصية لمساعدتك على المضي قدمًا. تنطبق الشروط والأحكام.*",
+  "account.settings.coaching.consent.text-messaging.disclaimer": "* يتم تضمين خدمات التدريب بدون أي تكلفة إضافية للمتعلمين الذين لديهم أرقام هواتف أمريكية. يتضمن التدريب رسائل نصية متكررة. قد تنطبق أسعار الرسائل والبيانات. إيقاف النص لإلغاء الاشتراك.",
+  "account.settings.coaching.consent.accept-coaching": "سجّل للاستفادة من خدمات التدريب",
+  "account.settings.coaching.consent.decline-coaching": "أفضّل عدم الاتصال بخدمات التدريب المجانية",
+  "account.settings.coaching.consent.label.name": "يرجى تأكيد الاسم",
+  "account.settings.coaching.consent.label.phone-number": "فضلًا أدخل رقم الهاتف ",
+  "account.settings.coaching.consent.success.header": "تمت العملية بنجاح",
+  "account.settings.coaching.consent.success.message": "لقد اشتركت في التدريب. يمكنك توقع استلام رسالة عبر البريد الإلكتروني أو الرسائل القصيرة في الأيام المقبلة.",
  "account.settings.coaching.consent.success.continue": "البدء في مساقي",
  "account.settings.coaching.managed.support": "الدعم",
-  "account.settings.coaching.managed.alert": "اسمك يديره {ManagerTitle}. اتصل بمديرك للحصول على المساعدة.",
+  "account.settings.coaching.managed.alert": "تتم إدارة اسمك بواسطة {ManagerTitle}. اتصل بالمسؤول للحصول على المساعدة.",
  "account.settings.field.phone_number": "رقم الهاتف",
-  "account.settings.field.phone_number.empty": "إضافة رقم هاتف",
-  "account.settings.field.coaching_consent": "الموافقة على المرافقة",
-  "account.settings.field.coaching_consent.tooltip": "تتضمن برامج MicroBachelors مرافقة قائمة على الرسائل النصية، تساعدك على إقران تجاربك التعلّمية مع أهدافك المهنية من خلال النصائح الفردية. خدمات المرافقة مشمولة دون تكاليف إضافية، وهي متوفرة للمتعلمين الذين لديهم أرقام هواتف جوالة أمريكية. تنطبق أسعار المراسلة القياسية. أرسل 'STOP' في أي وقت للانسحاب من الرسائل.",
-  "account.settings.field.coaching_consent.error": "مطلوب رقم هاتف أمريكي صحيح للتسجيل في المرافقة",
+  "account.settings.field.phone_number.empty": "إضافة رقم الهاتف",
+  "account.settings.field.coaching_consent": "اتفاقية التدريب",
+  "account.settings.field.coaching_consent.tooltip": "تتضمن برامج البكالوريوس التدريب القائم على الرسائل النصية الذي يساعدك على إقران التجارب التعليمية مع أهدافك المهنية من خلال النصائح الشخصية. يتم تضمين خدمات التدريب بدون أي تكلفة إضافية، وهي متوفرة للمتعلمين الذين لديهم أرقام هواتف نقالة أمريكية. تنطبق أسعار المراسلة القياسية. أرسل \"قف\" في أي وقت لإلغاء الرسائل.",
+  "account.settings.field.coaching_consent.error": "مطلوب رقم هاتف أمريكي صالح للدخول في التدريب",
  "account.settings.delete.account.before.proceeding": "قبل المتابعة، يرجى {actionLink}.",
-  "account.settings.delete.account.header": "حذف حسابي",
+  "account.settings.delete.account.header": "احذف حسابي",
  "account.settings.delete.account.subheader": "نأسف لذهابك!",
-  "account.settings.delete.account.text.1": "ترجى الملاحظة: إن حذف حسابك وبياناتك الشخصية له أثر دائم و لا يمكن التراجع عنه. لن يكون بمقدور {siteName} استعادة حسابك ولا البيانات التي يتم حذفها.",
-  "account.settings.delete.account.text.2": "بمجرد حذف حسابك، فإنك لن تستطيع استخدامه لمتابعة المساقات على {siteName}.",
-  "account.settings.delete.account.text.2.edX": "بمجرد حذف حسابك، فإنك لن تستطيع استخدامه لمتابعة المساقات على تطبيق edX ولا edx.org ولا أي موقع آخر تستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة و الوصول إلى المواقع الخاصة التي تقدمها MIT Open Learning و Wharton Executive Education و Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "اتّبع هذه التعليمات لطباعة أو تحميل شهادة",
-  "account.settings.delete.account.text.warning": "تحذير: حذف الحساب أثره دائم. يرجى قراءة ما ورد أعلاه بعناية قبل المتابعة. هذا إجراء غير رجعي، و لن تتمكن بعده من استخدام نفس البريد الإلكتروني على {siteName}.",
-  "account.settings.delete.account.text.change.instead": "هل تريد بدلاً من ذلك تغيير بريدك الإلكتروني أو اسمك أو كلمة المرور الخاصة بك؟",
-  "account.settings.delete.account.button": "حذف حسابي",
-  "account.settings.delete.account.please.activate": "تفعيل حسابك",
-  "account.settings.delete.account.please.confirm": "تأكيد حسابك",
-  "account.settings.delete.account.please.unlink": "فصل جميع حسابات التواصل الاجتماعي",
+  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
+  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
+  "account.settings.delete.account.text.change.instead": "هل تريد تغيير البريد الإلكتروني أو الاسم أو كلمة المرور بدلاً من ذلك؟",
+  "account.settings.delete.account.button": "احذف حسابي",
+  "account.settings.delete.account.please.activate": "تنشيط حسابك",
+  "account.settings.delete.account.please.unlink": "إلغاء ربط جميع حسابات التواصل الاجتماعي",
  "account.settings.delete.account.modal.header": "هل أنت متأكد؟",
-  "account.settings.delete.account.modal.text.1": "لقد اخترت \"حذف حسابي\". إن حذف حسابك وبياناتك الشخصية ذو أثر دائم لا يمكن التراجع عنه. لن يكون بمقدور {siteName} استعادة حسابك و لا البيانات التي حذفت.",
-  "account.settings.delete.account.modal.text.2": "إن واصلت، فلن تستطيع استخدام هذا الحساب لمتابعة المساقات على {siteName}.",
-  "account.settings.delete.account.modal.text.2.edX": "إن واصلت، فلن تستطيع استخدام هذا الحساب لمتابعة المساقات على على تطبيق edX و لا edx.org و لا أي موقع آخر تستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة و الوصول إلى المواقع الخاصة التي يقدمها MIT Open Learning و Wharton Executive Education و Harvard Medical School.",
-  "account.settings.delete.account.modal.enter.password": "إن كنت لا تزال ترغب في المتابعة و حذف حسابك، فيرجى إدخال كلمة المرور:",
-  "account.settings.delete.account.modal.confirm.delete": "تعم، احذف",
-  "account.settings.delete.account.modal.confirm.cancel": "لا",
-  "account.settings.delete.account.error.unable.to.delete": "لم نستطع حذف الحساب",
+  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
+  "account.settings.delete.account.modal.enter.password": "إذا كنت لا تزال ترغب في المتابعة وحذف حسابك ، فيرجى إدخال كلمة مرور حسابك:",
+  "account.settings.delete.account.modal.confirm.delete": "تعم، أحذف",
+  "account.settings.delete.account.modal.confirm.cancel": "إلغاء",
+  "account.settings.delete.account.error.unable.to.delete": "تعذر حذف الحساب",
  "account.settings.delete.account.error.no.password": "كلمة المرور مطلوبة",
-  "account.settings.delete.account.error.invalid.password": "كلمة المرور غير صحيحة",
-  "account.settings.delete.account.error.unable.to.delete.details": "عذراً، حدث خطأ أثناء محاولة معالجة طلبك. رجاءً أعد المحاولة لاحقًا.",
-  "account.settings.delete.account.modal.after.header": "نأسف لذهابك! سيُحذف حسابك في ظرف وجيز.",
-  "account.settings.delete.account.modal.after.text": "حذف الحساب، بما في ذلك من إزالة من القوائم البريدية، إجراء قد يستغرق بضعة أسابيع حتى يكتمل عبر نظامنا. إن كنت تريد قبل ذلك الحين إيقاف تلقي البريد الإلكتروني، فيرجى إلغاء الاشتراك من تذييل أي بريد إلكتروني.",
+  "account.settings.delete.account.error.invalid.password": "كلمة المرور المدخلة غير صحيحة",
+  "account.settings.delete.account.error.unable.to.delete.details": "عذراً ، حدث خطأ أثناء محاولة معالجة طلبك. الرجاء معاودة المحاولة في وقت لاحق.",
+  "account.settings.delete.account.modal.after.header": "نأسف لذهابك! سيتم حذف حسابك قريبا.",
+  "account.settings.delete.account.modal.after.text": "قد يستغرق حذف الحساب ، بما في ذلك الإزالة من قوائم البريد الإلكتروني ، بضعة أسابيع حتى تتم معالجته بالكامل من خلال نظامنا. إذا كنت ترغب في إلغاء الاشتراك في رسائل البريد الإلكتروني قبل ذلك الحين ، يرجى إلغاء الاشتراك من تذييل أي بريد إلكتروني.",
  "account.settings.delete.account.modal.after.button": "إغلاق ",
-  "account.settings.delete.account.text.3.edX": "قد تفقد كذلك إمكانية الوصول إلى الشهادات الموثقة و كذا مؤهلات البرامج الأخرى مثل شهادات MicroMasters. يمكنك الاحتفاظ بنسخة عنها لديك قبل المواصلة إلى الحذف. {actionLink}.",
-  "account.settings.delete.account.text.3": "قد تفقد كذلك إمكانية الوصول إلى الشهادات الموثقة و كذا مؤهلات البرامج الأخرى. يمكنك الاحتفاظ بنسخة عنها لديك قبل المواصلة إلى الحذف.",
-  "account.settings.message.demographics.service.issue": "حدث خطأ أثناء محاولة استخراج أو حفظ معلومات حسابك. رجاءً أعد المحاولة لاحقًا.",
+  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
+  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
+  "account.settings.message.demographics.service.issue": "حدث خطأ أثناء محاولة استرداد معلومات حسابك أو حفظها. يرجى المحاولة مرة أخرى لاحقًا.",
  "account.settings.field.demographics.gender": "هوية الجنس",
  "account.settings.field.demographics.gender.empty": "إضافة هوية الجنس",
  "account.settings.field.demographics.gender.options.empty": "حدد هوية الجنس",
  "account.settings.field.demographics.gender_description": "وصف هوية الجنس",
-  "account.settings.field.demographics.gender_description.empty": "أدخل الوصف",
+  "account.settings.field.demographics.gender_description.empty": "أدخل وصفًا",
  "account.settings.field.demographics.ethnicity": "هوية العرق/ الأصل",
-  "account.settings.field.demographics.ethnicity.empty": "إضافة هوية العرق / الأصل",
-  "account.settings.field.demographics.ethnicity.options.empty": "اختر كل ما ينطبق",
-  "account.settings.field.demographics.income": "دخل الأسرة",
-  "account.settings.field.demographics.income.empty": "إضافة دخل الأسرة",
-  "account.settings.field.demographics.income.options.empty": "حدد نطاقًا لدخل الأسرة",
-  "account.settings.field.demographics.military_history": "الوضعية إزاء الخدمة العسكرية في الولايات المتحدة",
-  "account.settings.field.demographics.military_history.empty": "إضافة الوضعية إزاء الخدمة العسكرية",
-  "account.settings.field.demographics.military_history.options.empty": "اختر الوضعية إزاء الخدمة العسكرية",
-  "account.settings.field.demographics.learner_education_level": "مستواك التعليمي",
-  "account.settings.field.demographics.learner_education_level.empty": "إضافة المستوى التعليمي",
-  "account.settings.field.demographics.parent_education_level": "مستوى الوالدين/الأولياء التعليمي",
-  "account.settings.field.demographics.parent_education_level.empty": "إضافة المستوى التعليمي",
-  "account.settings.field.demographics.education_level.options.empty": "حدد المستوى التعليمي",
+  "account.settings.field.demographics.ethnicity.empty": "إضافة هوية العرق/الأصل",
+  "account.settings.field.demographics.ethnicity.options.empty": "فضلًا اختر جميع ما ينطبق",
+  "account.settings.field.demographics.income": "الدخل المادي الأسري",
+  "account.settings.field.demographics.income.empty": "إضافة الدخل المادي الأسري",
+  "account.settings.field.demographics.income.options.empty": "حدد نطاق الدخل المادي للأسرة",
+  "account.settings.field.demographics.military_history": "حالة الخدمة العسكرية في الولايات المتحدة الأمريكية",
+  "account.settings.field.demographics.military_history.empty": "إضافة حالة الخدمة العسكرية",
+  "account.settings.field.demographics.military_history.options.empty": "اختر حالة الخدمة العسكرية",
+  "account.settings.field.demographics.learner_education_level": "مؤهلك التعليمي",
+  "account.settings.field.demographics.learner_education_level.empty": "إضافة مؤهلك التعليمي",
+  "account.settings.field.demographics.parent_education_level": "مؤهل الوالدين/الآوصياء التعليمي",
+  "account.settings.field.demographics.parent_education_level.empty": "إضافة المؤهل التعليمي",
+  "account.settings.field.demographics.education_level.options.empty": "حدد موهلاً تعليميًا",
  "account.settings.field.demographics.work_status": "الحالة الوظيفية",
  "account.settings.field.demographics.work_status.empty": "إضافة الحالة الوظيفية",
-  "account.settings.field.demographics.work_status.options.empty": "حدد الحالة الوظيفية",
+  "account.settings.field.demographics.work_status.options.empty": "فضلًا حدد حالتك الوظيفية",
  "account.settings.field.demographics.work_status_description": "وصف الحالة الوظيفية",
-  "account.settings.field.demographics.work_status_description.empty": "أدخل الوصف",
+  "account.settings.field.demographics.work_status_description.empty": "أدخل وصفًا",
  "account.settings.field.demographics.current_work_sector": "مجال العمل الحالي",
  "account.settings.field.demographics.current_work_sector.empty": "إضافة مجال العمل",
  "account.settings.field.demographics.future_work_sector": "مجال العمل المستقبلي",
  "account.settings.field.demographics.future_work_sector.empty": "إضافة مجال العمل",
  "account.settings.field.demographics.work_sector.options.empty": "حدد مجال العمل",
-  "account.settings.section.demographics.why": "ما هي غاية {siteName} من جمع هذه المعلومات؟",
-  "account.settings.name.change.title.id": "تغيير الاسم هذا يتطلب التحقق من الهوية",
-  "account.settings.name.change.title.begin": "قبل أن نبدأ",
-  "account.settings.name.change.warning.one": "تحذير: يقوم هذا الإجراء بتحديث الاسم الذي يظهر على جميع الشهادات التي تم الحصول عليها على هذا الحساب في الماضي و أي شهادات تحصل عليها حاليا أو مستقبلاً.",
-  "account.settings.name.change.warning.two": "لا يمكن التراجع عن هذا الإجراء دون التحقق من هويتك.",
-  "account.settings.name.change.id.name.label": "أدخل اسمك كما يظهر في بطاقة تعريف الطالب أو العمل أو بطاقة الهوية الصادرة عن الحكومة.",
-  "account.settings.name.change.id.name.placeholder": "أدخل الاسم الموجود في بطاقة تعريفك ذات الصورة.",
-  "account.settings.name.change.error.valid.name": "رجاءً أدخل اسما صحيحا.",
-  "account.settings.name.change.error.general": "حدث خطأ تقني. رجاءً حاول مجددًا.",
-  "account.settings.name.change.continue": "مواصلة",
-  "account.settings.name.change.cancel": "إلغاء",
-  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
+  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
+  "account.settings.name.change.title.id": "This name change requires identity verification",
+  "account.settings.name.change.title.begin": "Before we begin",
+  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
+  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
+  "account.settings.name.change.id.name.label": "Enter your name as it appears on your government-issued ID.",
+  "account.settings.name.change.id.name.placeholder": "Enter the name on your government ID",
+  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
+  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
+  "account.settings.name.change.continue": "Continue",
+  "account.settings.name.change.cancel": "Cancel",
+  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في نص الرابط. الرجاء التحقق من الرابط والمحاولة مجددا.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "الدعم الفني",
-  "account.settings.editable.field.password.reset.button.confirmation": "لقد أرسلنا رسالة إلى {email}. انقر على الرابط في الرسالة لإعادة ضبط كلمة المرور الخاصة بك. لم تصلك الرسالة؟ اتصل بـ{technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "إعادة ضبط كلمة المرور",
-  "account.settings.editable.field.password.reset.button.forbidden": "طلبك السابق في تقدّم، رجاءً حاول مجددًا بعد لحظات قليلة.",
+  "account.settings.editable.field.password.reset.button.confirmation": "لقد أرسلنا رسالة إلى {email}. انقر فوق الرابط في الرسالة لإعادة تعيين كلمة المرور. إذا لم يتم استلام الرسالة؟ اتصل بـ {technicalSupportLink}.",
+  "account.settings.editable.field.password.reset.button": "تغيير كلمة المرور",
+  "account.settings.editable.field.password.reset.button.forbidden": "طلبك السابق قيد التقدم، يرجى إعادة المحاولة بعد لحظات قليلة.",
  "account.settings.editable.field.password.reset.label": "كلمة المرور",
-  "account.settings.sso.link.account": "تسجيل الدخول باستخدام {name}",
-  "account.settings.sso.account.connected": "موصول",
-  "account.settings.sso.account.disconnect.error": "حدثت مشكلة أثناء فصل هذا الحساب، اتصل بالدعم إن استمرت المشكلة.",
-  "account.settings.sso.unlink.account": "فصل حساب {name}",
-  "account.settings.sso.no.providers": "لا يمكن وصل أي حسابات في الوقت الراهن.",
-  "account.page.title": "الحساب | {siteName}",
-  "id.verification.access.blocked.denied": "لا يمكننا التحقق من هويتك في الوقت الراهن. إن لم تكن قد فعّلت حسابك بعد، فيرجى تفقد مجلد الرسائل غير المرغوب فيها بحثًا عن بريد التفعيل الإلكتروني من {email}.",
+  "account.settings.sso.link.account": "تسجيل الدخول كـ  {name}",
+  "account.settings.sso.account.connected": "مربوط",
+  "account.settings.sso.account.disconnect.error": "حدثت مشكلة أثناء قطع اتصال هذا الحساب، اتصل بالدعم عند استمرار المشكلة.",
+  "account.settings.sso.unlink.account": "إلغاء ربط حساب {name} ",
+  "account.settings.sso.no.providers": "لا يمكن ربط أية حسابات حاليًا",
+  "id.verification.access.blocked.denied": "لا يمكنك التحقق من هويتك في الوقت الحالي. إذا لم تقم بعد بتنشيط حسابك، فيرجى التحقق من مجلد البريد المهمل للحصول على رسالة التفعيل من {email}.",
  "id.verification.next": "التالي",
-  "id.verification.support": "الدعم",
-  "id.verification.example.card.alt": "مثال بطاقة تعريف صحيحة بالاسم الكامل والصورة.",
-  "id.verification.requirements.title": "متطلبات التحقق باستخدام الصورة",
-  "id.verification.requirements.description": "لإكمال التحقق بالصورة، ستحتاج ما يلي:",
+  "id.verification.support": "support",
+  "id.verification.continue.upload": "Continue with Upload",
+  "id.verification.example.card.alt": "مثال على بطاقة هوية صحيحة بالاسم الكامل وصورة.",
+  "id.verification.requirements.title": "متطلبات التحقق من الصورة",
+  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
  "id.verification.requirements.card.device.title": "جهاز مزود بكاميرا",
-  "id.verification.requirements.card.device.allow": "السماح",
-  "id.verification.requirements.card.id.title": "بطاقة تعريف بها صورة",
-  "id.verification.requirements.card.id.text": "تحتاج إلى بطاقة تعريف صالحة تحتوي اسمك الكامل وصورتك، كرخصة القيادة أو جواز السفر مثلاً.",
-  "id.verification.privacy.title": "معلومات الخصوصية",
-  "id.verification.privacy.need.photo.question": "ما حاجة {siteName} لصورتي؟",
-  "id.verification.privacy.need.photo.answer": "نستخدم صور التحقق الخاصة بك لتأكيد هويتك ولضمان صحة شهادتك.",
-  "id.verification.privacy.do.with.photo.question": "ماذا يُفعَل بهذه الصورة في {siteName}؟",
-  "id.verification.privacy.do.with.photo.answer": "نقوم بتشفير صورتك بشكل آمن وإرسالها إلى خدمة الترخيص الخاصة بنا للمراجعة. صورتك و معلوماتك لا تُحفَظ و لا تظهر في أي مكان على {siteName} بعد اكتمال عملية التحقق.",
+  "id.verification.requirements.card.device.allow": "موافق",
+  "id.verification.requirements.card.id.title": "Photo Identification Card",
+  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
+  "id.verification.privacy.title": "بيانات الخصوصية.",
+  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
+  "id.verification.privacy.need.photo.answer": "نستخدم صور التحقق الخاصة بك لتأكيد هويتك والتأكد من صحة شهادتك.",
+  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
+  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
  "id.verification.access.blocked.title": "التحقق من الهوية",
-  "id.verification.access.blocked.enrollment": "أنت حاليا غير ملتحق بأي مساق يتطلب التحقق من الهوية.",
-  "id.verification.access.blocked.pending": "لقد سلّمت من قبل معلومات التحقق الخاصة بك. ستصلك رسالة على لوحة المعلومات الخاصة بك عند اكتمال عملية التحقق (عادةً في ظرف 5 أيام).",
+  "id.verification.access.blocked.enrollment": "أنت الآن ملتحق بمساق يتطلب التحقق من الهوية.",
+  "id.verification.access.blocked.pending": "لقد قمت بالفعل بإرسال معلومات التحقق الخاصة بك. ستصلك رسالة على لوحة المعلومات عند اكتمال عملية التحقق (عادةً خلال 5 أيام).",
  "id.verification.photo.take": "التقاط صورة ",
-  "id.verification.photo.retake": "إعادة التقاط الصورة؟",
-  "id.verification.photo.enable.detection": "تفعيل اكتشاف الوجوه",
-  "id.verification.photo.enable.detection.portrait.help.text": "في حال التأشير، سيبرز مربع حول وجهك. يمكن رؤية وجهك بوضوح إن كان المربع المحيط به أزرق اللون. أما إن كان وجهك في وضع غير جيد أو غير قابل للاكتشاف، فسيكون المربع أحمر اللون.",
-  "id.verification.photo.enable.detection.id.help.text": "في حال التأشير، سيظهر مربع حول صورة وجهك في بطاقة الهوية. يمكن رؤية وجهك بوضوح إن كان المربع المحيط به أزرق اللون. أما إن كان وجهك في وضع غير جيد أو غير قابل للاكتشاف، فسيكون المربع أحمر اللون.",
-  "id.verification.photo.feedback.correct": "موضع الوجه جيد.",
-  "id.verification.photo.feedback.two.faces": "تم اكتشاف أكثر من وجه واحد.",
-  "id.verification.photo.feedback.no.faces": "لم يتم اكتشاف أي وجه.",
-  "id.verification.photo.feedback.top.left": "الموضع خاطئ. أعلى اليسار.",
-  "id.verification.photo.feedback.top.center": "الموضع خاطئ. أعلى الوسط.",
-  "id.verification.photo.feedback.top.right": "الموضع خاطئ. أعلى اليمين.",
-  "id.verification.photo.feedback.center.left": "الموضع خاطئ. وسط اليسار.",
-  "id.verification.photo.feedback.center.center": "الموضع خاطئ. قريب جدًا من الكاميرا.",
-  "id.verification.photo.feedback.center.right": "الموضع خاطئ. وسط اليمين.",
-  "id.verification.photo.feedback.bottom.left": "الموضع خاطئ. أسفل اليسار.",
-  "id.verification.photo.feedback.bottom.center": "الموضع خاطئ. أسفل الوسط.",
-  "id.verification.photo.feedback.bottom.right": "الموضع خاطئ. أسفل اليمين.",
+  "id.verification.photo.retake": "Retake Photo?",
+  "id.verification.photo.enable.detection": "تمكين خاصية التعرف على الوجه",
+  "id.verification.photo.enable.detection.portrait.help.text": "عند تحديد هذا الخيار، فسيظهر مربع حول وجهك. يمكن رؤية وجهك بوضوح إذا كان المربع المحيط به أزرق. إذا لم يكن وجهك في وضع جيد أو إذا لم يكن قابلاً للاكتشاف، فسيكون المربع باللون الأحمر.",
+  "id.verification.photo.enable.detection.id.help.text": "عند تحديد هذا الخيار، فسيظهر مربع حول صورة وجهك في بطاقة الهوية. يمكن رؤية وجهك بوضوح إذا كان المربع المحيط به أزرق. إذا لم يكن وجهك في وضع جيد أو إذا لم يكن قابلاً للاكتشاف، فسيكون المربع باللون الأحمر.",
+  "id.verification.photo.feedback.correct": "وضع الوجه جيد.",
+  "id.verification.photo.feedback.two.faces": "تم تحديد أكثر من وجه.",
+  "id.verification.photo.feedback.no.faces": "لم يتم تحديد أي وجه.",
+  "id.verification.photo.feedback.top.left": "وضع خاطئ. أعلى اليسار.",
+  "id.verification.photo.feedback.top.center": "وضع خاطئ. أعلى الوسط.",
+  "id.verification.photo.feedback.top.right": "وضع خاطئ. أعلى اليمين.",
+  "id.verification.photo.feedback.center.left": "وضع خاطئ. وسط اليسار.",
+  "id.verification.photo.feedback.center.center": "وضع خاطئ. قريب جدًا من الكاميرا.",
+  "id.verification.photo.feedback.center.right": "وضع خاطئ. وسط اليمين.",
+  "id.verification.photo.feedback.bottom.left": "وضع خاطئ. أسفل اليسار.",
+  "id.verification.photo.feedback.bottom.center": "وضع خاطئ. أسفل الوسط.",
+  "id.verification.photo.feedback.bottom.right": "وضع خاطئ. أسفل اليمين.",
  "id.verification.camera.access.title": "صلاحيات الكاميرا",
-  "id.verification.camera.access.title.success": "الوصول للكاميرا ممكن",
+  "id.verification.camera.access.title.success": "تمكين الوصول للكاميرا",
  "id.verification.camera.access.title.failed": "تعذّر الوصول للكاميرا.",
-  "id.verification.camera.access.click.allow": "رجاءً تأكد من النقر على \"السماح\"",
-  "id.verification.camera.access.enable": "تفعيل الكاميرا",
-  "id.verification.camera.access.problems": "لديك مشاكل؟",
-  "id.verification.camera.access.skip": "تَخَطَّ و قم برفع ملفات صور بدلاً من ذلك.",
-  "id.verification.camera.access.success": "يبدو أن كاميرا جهازك جاهزة و تعمل.",
-  "id.verification.camera.access.failure": "يبدو أننا غير قادرين على الوصول إلى كاميرا جهازك. ستحتاج لرفع ملف صورتك و صورة بطاقة هويتك.",
-  "id.verification.camera.access.failure.temporary": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. رجاءً تحقق من أن كاميرا جهازك متصلة ومن أنك قد سمحت للمتصفح بالوصول إليها.",
-  "id.verification.camera.access.failure.temporary.chrome": "لتفعيل الوصول للكاميرا في متصفح كروم:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "افتح كروم.",
+  "id.verification.camera.access.click.allow": "فضلًا تأكد من اختيار الأمر \"السماح\"",
+  "id.verification.camera.access.enable": "تمكين الكاميرا",
+  "id.verification.camera.access.problems": "هل تواجه أية مشكلة؟",
+  "id.verification.camera.access.skip": "قم بتخطي ملفات الصور وتحميلها بدلاً من ذلك",
+  "id.verification.camera.access.success": "يبدو أن الكاميرا تعمل وجاهزة.",
+  "id.verification.camera.access.failure": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. ستحتاج إلى تحميل ملفات الصور الخاصة بك و معرّف الصور الخاص بك.",
+  "id.verification.camera.access.failure.temporary": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. يرجى التحقق من أن كاميرا الويب متصلة ومن أنك سمحت للمتصفح بالوصول إليها.",
+  "id.verification.camera.access.failure.temporary.chrome": "تمكين الوصول للكاميرا في متصفّح كروم: ",
+  "id.verification.camera.access.failure.temporary.chrome.step1": "فتح متصفّح كروم.",
  "id.verification.camera.access.failure.temporary.chrome.step2": "توجه إلى المزيد > الإعدادات.",
  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "لنظام ويندوز: Alt+F أو Alt+E أو F10 متبوعاً بـ SPACEBAR",
  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "لنظام ماك: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "تحت علامة التبويب \"الخصوصية والأمان\"، اختر \"إعدادات الموقع\" ثم \"الكاميرا\".",
+  "id.verification.camera.access.failure.temporary.chrome.step3": "ضمن علامة التبويب \"الخصوصية والأمان\"، حدد \"إعدادات الموقع\" ثم \"الكاميرا\".",
  "id.verification.camera.access.failure.temporary.chrome.step4": "ضمن \"قائمة الحظر\"، ابحث عن \"edx.org\" وحدده.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "في قسم \"الصلاحيات\"، قم بتحديث صلاحيات الكاميرا إلى \"السماح\".",
-  "id.verification.camera.access.failure.temporary.ie11": "لتفعيل الوصول للكاميرا في متصفح انترنت إكسبلورر:",
+  "id.verification.camera.access.failure.temporary.chrome.step5": "في القسم \"الصلاحيات\"، قم بتحديث صلاحيات الكاميرا إلى \"السماح\".",
+  "id.verification.camera.access.failure.temporary.ie11": "تمكين الوصول للكاميرا في متصفح انترنت إكسبلورر:",
  "id.verification.camera.access.failure.temporary.ie11.step1": "افتح إدارة إعدادات Flash Player عن طريق الانتقال إلى إعدادات Windows > لوحة التحكم > Flash Player.",
  "id.verification.camera.access.failure.temporary.ie11.step2": "حدد علامة التبويب \"Camera and Mic\" (الكاميرا والميكروفون)، ثم حدد الزر \"Camera and Microphone Settings by Site\" (إعدادات الكاميرا والميكروفون حسب الموقع).",
  "id.verification.camera.access.failure.temporary.ie11.step3": "اختر \"edx.org\" من قائمة مواقع ويب وقم بتغيير الصلاحيات من خلال تحديد \"السماح\" في القائمة المنسدلة.",
@@ -287,75 +270,94 @@
  "id.verification.camera.access.failure.temporary.firefox.step7": "اختر \"حفظ التغييرات.\"",
  "id.verification.camera.access.failure.temporary.safari": "تمكين الوصول للكاميرا في متصفّح سفاري: ",
  "id.verification.camera.access.failure.temporary.safari.step1": "فتح متصفّح سفاري.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "انقر فوق قائمة تطبيق سفاري، ثم حدد \"Preferences\" (التفضيلات). يمكنك أيضاً استخدام الأمرCommand+, كاختصار للوحة المفاتيح",
-  "id.verification.camera.access.failure.temporary.safari.step3": "حدد علامة التبويب \"مواقع الويب\" ثم حدد \"كاميرا\".",
+  "id.verification.camera.access.failure.temporary.safari.step2": "انقر فوق قائمة تطبيق سفاري، ثم حدد \"Preferences\" (التفضيلات). يمكنك أيضاً استخدام الأمرCommand+ كاختصار للوحة المفاتيح",
+  "id.verification.camera.access.failure.temporary.safari.step3": "حدد علامة التبويب \"مواقع ويب\" ثم حدد \"كاميرا\".",
  "id.verification.camera.access.failure.temporary.safari.step4": "حدد \"edx.org\" وقم بتغيير صلاحيات الكاميرا إلى \"السماح\".",
-  "id.verification.camera.access.failure.unsupported": "يبدو أن متصفحك لا يدعم الوصول إلى الكاميرا.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "لا يدعم متصفح Chrome حاليًا الوصول إلى الكاميرا على أجهزة iOS مثل أجهزة iPhone و iPad.",
-  "id.verification.camera.access.failure.unsupported.instructions": "رجاءً استخدم متصفحًا آخر لإكمال التحقق من الهوية.",
-  "id.verification.photo.tips.title": "نصائح مفيدة بخصوص الصورة",
-  "id.verification.photo.tips.description": "بعد ذلك، سنحتاج منك التقاط صورة لوجهك. يرجى مراجعة النصائح المفيدة أدناه.",
-  "id.verification.photo.tips.list.title": "نصائح بخصوص الصورة",
+  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
+  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
+  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
+  "id.verification.photo.tips.title": "تلميحات مفيدة للصورة",
+  "id.verification.photo.tips.description": "بعد ذلك، سنحتاج منك التقاط صورة لوجهك. يرجى مراجعة التلميحات المفيدة أدناه.",
+  "id.verification.photo.tips.list.title": "تلميحات الصورة",
  "id.verification.photo.tips.list.description": "لالتقاط صورة ناجحة، يُرجى التأكّد ممّا يلي:",
-  "id.verification.photo.tips.list.well.lit": "أنّ وجهك مُضاء جيدًا.",
-  "id.verification.photo.tips.list.inside.frame": "أنّ وجهك كلَّه داخل إطار الصورة.",
+  "id.verification.photo.tips.list.well.lit": "أنّ الإضاءة جيّدة على وجهك.",
+  "id.verification.photo.tips.list.inside.frame": "أنّ وجهك داخل إطار الصورة بالكامل.",
  "id.verification.portrait.photo.title.camera": "التقط صورة لنفسك",
-  "id.verification.portrait.photo.instructions.camera": "عندما يكون وجهك في موضعه، استخدم زر 'التقاط صورة' أدناه لالتقاط صورتك.",
-  "id.verification.camera.help.sight.question": "ماذا إن لم أتمكن من رؤية صورة الكاميرا أو إن لم أتمكن من رؤية صورتي لتحديد أي جانب مرئي؟",
-  "id.verification.camera.help.sight.answer.portrait": "قد تتمكن من إكمال إجراء التقاط الصور دون مساعدة، لكن قد يتطلب الأمر بضع محاولات لضبط موضع الكاميرا بشكل صحيح.يختلف موضع الكاميرا المثالي من حاسوب ﻵخر، لكن عمومًا يكون أفضل موضع لتصوير الرأس تقريبًا على بعد 12-18 بوصة (30-45 سنتمترًا) من الكاميرا، مع وضع رأسك في المنتصف بالنسبة إلى شاشة الحاسوب. إن تم رفض الصور التي ترسلها، فحاول تغيير اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة.",
-  "id.verification.camera.help.sight.answer.id": "قد تتمكن من إكمال إجراء التقاط الصور دون مساعدة، لكن قد يتطلب الأمر بضع محاولات لضبط موضع الكاميرا بشكل صحيح.يختلف موضع الكاميرا المثالي من حاسوب ﻵخر، لكن عمومًا يكون أفضل موضع لتصوير بطاقة تعريف تقريبًا على بعد 8-12 بوصة (20-30 سنتمترًا) من الكاميرا، مع وضع البطاقة في المنتصف بالنسبة للكاميرا. إن تم رفض الصور التي ترسلها، فحاول تغيير اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة. إن أكثر سبب للرفض هو عدم القدرة على قراءة نص بطاقة التعريف.",
+  "id.verification.portrait.photo.title.upload": "ارفع صورتك",
+  "id.verification.portrait.photo.preview.alt": "معاينة صورة وجه المستخدم.",
+  "id.verification.portrait.photo.instructions.camera": "عندما يكون وجهك في موضعه، استخدم زر التقاط صورة أدناه لالتقاط الصورة.",
+  "id.verification.portrait.photo.instructions.upload": "Please upload a portrait photo. Ensure your entire face fits inside the frame and is well-lit. Supported formats: ",
+  "id.verification.camera.help.sight.question": "ماذا لو لم أتمكن من رؤية صورة الكاميرا ؟ أو إذا لم أتمكن من رؤية صورتي لتحديد أي جانب مرئي؟",
+  "id.verification.camera.help.sight.answer.portrait": "قد تتمكن من إكمال إجراء التقاط الصور من دون مساعدة، ولكن قد يتطلب الأمر بضع محاولات ضبط وضع الكاميرا بشكل صحيح. يختلف وضع الكاميرا المثالي باختلاف الكمبيوتر، ولكن بشكل عام، يكون أفضل موضع للتصوير في الرأس هو 12 إلى 18 بوصة (30-45 سم) تقريبًا من الكاميرا، مع وضع الرأس في المنتصف بالنسبة إلى شاشة الكمبيوتر. إذا تم رفض الصور التي ترسلها، فحاول تحريك اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة.",
+  "id.verification.camera.help.sight.answer.id": "قد تتمكن من إكمال إجراء التقاط الصور من دون مساعدة، ولكن قد يتطلب الأمر بضع محاولات لضبط وضع الكاميرا بشكل صحيح. يختلف الوضع الأمثل للكاميرا باختلاف جهاز الكمبيوتر، ولكن بشكل عام، يكون أفضل وضع لصورة بطاقة تعريف من 8 إلى 12 بوصة (من 20 إلى 30 سم) عن الكاميرا، مع وضع بطاقة الهوية في الوسط بالنسبة للكاميرا. إذا تم رفض الصور التي ترسلها، فحاول تحريك اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة. إن السبب الأكثر شيوعاً للرفض هو عدم القدرة على قراءة النص الموجود على بطاقة الهوية.",
  "id.verification.camera.help.difficulty.question.portrait": "ماذا لو واجهت صعوبة في تثبيت رأسي في الموضع المناسب للكاميرا؟",
  "id.verification.camera.help.difficulty.question.id": "ماذا لو واجهت صعوبة في تثبيت بطاقة هويتي في الموضع المناسب للكاميرا؟",
-  "id.verification.camera.help.difficulty.answer": "إن احتجت لمساعدة في التقاط صورة لإرسالها، فاتصل بدعم {siteName} للحصول على اقتراحات إضافية.",
-  "id.verification.id.photo.unclear.question": "هل صورة بطاقة تعريفك غير واضحة أو ضبابية جدًا؟",
-  "id.verification.id.tips.title": "نصائح مفيدة بخصوص بطاقة التعريف",
-  "id.verification.id.tips.description": "بعد ذلك، عليك التقاط صورة لبطاقة تعريف صالحة تتضمن اسمك الكامل مع صورة، مثل رخصة القيادة أو جواز السفر.يرجى منك تجهيز بطاقة تعريفك.",
-  "id.verification.id.tips.list.well.lit": "أن تكون بطاقة تعريفك مضاءة جيدًا.",
+  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
+  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
+  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
+  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
+  "id.verification.id.tips.title": "Helpful Identification Card Tips",
+  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
+  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
  "id.verification.id.tips.list.clear": "تأكد من قدرتك على رؤية صورتك وقراءة اسمك بوضوح.",
-  "id.verification.id.photo.title.camera": "التقط صورة لبطاقة تعريفك",
-  "id.verification.id.photo.title.upload": "ارفع صورة لبطاقة تعريفك",
+  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
+  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
  "id.verification.id.photo.preview.alt": "معاينة صورة الهوية.",
-  "id.verification.id.photo.instructions.camera": "عندما تكون بطاقتك في موضعها، استخدم زر 'التقاط صورة' أدناه لالتقاط صورتك. يرجى استخدام جواز سفر أو رخصة قيادة أو بطاقة تعريف أخرى تتضمن اسمك الكامل وصورة لوجهك.",
-  "id.verification.id.photo.instructions.upload": "يرجى رفع صورة لبطاقة تعريفك. تأكد من أن البطاقة كاملة داخل الإطار و أنها مضاءة جيدًا. يجب أن يكون حجم الملف أقل من 10 ميجابايت. الأنساق المدعومة:",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "الملف الذي حددته ليس ضمن أنواع الصورة المدعومة. اختر رجاءً من بين الأنساق التالية:",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "الملف الذي حددته كبير جداً. رجاءً أعد المحاولة باستخدام ملف ذي حجم أقل من 10 ميجابايت.",
-  "id.verification.name.check.title": "تحقق مرة أخرى من اسمك",
-  "id.verification.name.check.instructions": "هل الاسم أدناه يطابق الاسم الموجود في بطاقة تعريفك ذات الصورة. إن لم يكن كذلك، فقم بتحديث الاسم أدناه ليطابق بطاقة تعريفك.",
-  "id.verification.name.check.mismatch.information": "إن كان الاسم أدناه لا يطابق بطاقة تعريفك، فسيتم رفض تأكيد هويتك.",
-  "id.verification.name.error": "رجاءً أدخل اسمك كما يظهر في بطاقة تعريفك ذات الصورة.",
-  "id.verification.account.name.warning.prefix": "تُرجى الملاحظة:",
+  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
+  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
+  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
+  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
+  "id.verification.account.name.title": "التحقق من اسم الحساب",
+  "id.verification.name.check.title": "Double-Check Your Name",
+  "id.verification.account.name.instructions": "يجب أن يكون الاسم الموجود على حسابك والاسم الموجود على المعرّف الخاص بك متطابقًا تمامًا. إذا لم يكن الأمر كذلك، فيرجى النقر فوق \"لا\" لتحديث اسم حسابك.",
+  "id.verification.name.check.instructions": "Does the name below match the name on your government-issued ID? If not, update the name below to match your goverment-issued ID.",
+  "id.verification.name.check.mismatch.information": "If the name below does not match your government-issued ID, your identity verification will be denied.",
+  "id.verification.account.name.radio.label": "هل يتطابق الاسم الموجود على هويتك مع اسم الحساب أدناه؟",
+  "id.verification.name.check.radio.label": "Select an option",
+  "id.verification.account.name.radio.yes": "نعم",
+  "id.verification.name.check.radio.yes": "Yes, the name below matches my ID",
+  "id.verification.account.name.radio.no": "لا",
+  "id.verification.name.check.radio.no": "No, the name below does not match my ID",
+  "id.verification.account.name.error": "يرجى تحديث اسم الحساب لمطابقة الاسم على بطاقة الهوية.",
+  "id.verification.account.name.warning.prefix": "يُرجى الملاحظة:",
  "id.verification.account.name.settings": "إعدادات الحساب",
-  "id.verification.name.label": "الاسم",
-  "id.verification.account.name.photo.alt": "صورة بطاقة هويتك التي ستُسلَّم.",
+  "id.verification.account.name.label": "اسم الحساب",
+  "id.verification.name.label": "Name",
+  "id.verification.account.name.photo.alt": "صورة من هويتك للتقديم.",
+  "id.verification.account.name.save": "حفظ ثم التالي",
  "id.verification.review.title": "مراجعة صورك",
  "id.verification.review.description": "يُرجى التأكّد من أنّ الصور والمعلومات التي قدّمتها تمكّننا من التحقّق من هويّتك. ",
  "id.verification.review.portrait.label": "صورتك الشخصية",
-  "id.verification.review.portrait.alt": "صورة وجهك التي ستُسلَّم.",
-  "id.verification.review.portrait.retake": "إعادة التقاط الصورة الشخصية",
-  "id.verification.review.id.label": "بطاقة تعريفك",
-  "id.verification.review.id.alt": "صورة بطاقة تعريفك التي ستُسلَّم.",
-  "id.verification.review.id.retake": "إعادة التقاط صورة بطاقة الهوية",
-  "id.verification.review.confirm": "تسليم",
-  "id.verification.submission.alert.error.face": "مطلوبة صورة لوجهك. رجاءً أعد التقاط صورتك الشخصية.",
-  "id.verification.submission.alert.error.id": "مطلوبة صورة لبطاقة تعريفك. رجاءً أعد التقاط صورة لبطاقة تعريفك.",
-  "id.verification.submission.alert.error.name": "مطلوب اسم حساب صحيح. يرجى تحديث اسم حسابك لمطابقة الاسم على بطاقة تعريفك.",
-  "id.verification.submission.alert.error.unsupported": "واحد أو أكثر من الملفات التي قمت برفعها في نَسقٍ غير مدعوم. رجاءً اختر مما يلي:",
-  "id.verification.review.error": "{siteName} صفحة دعم",
-  "id.verification.submitted.title": "التحقق من الهوية جارٍ",
-  "id.verification.submitted.text": "لقد تلقينا معلوماتك و نحن الآن نتحقق من هويتك. سيتم إخطارك عند اكتمال عملية التحقق (عادةً في ظرف 5 أيام). إلى ذلكم الحين، لا يزال يمكنك الوصول لجميع محتويات المساق المتاحة.",
-  "id.verification.return.dashboard": "العودة للوحة المعلومات",
+  "id.verification.review.portrait.alt": "صورة شخصية للتقديم.",
+  "id.verification.review.portrait.retake": "إعادة التقاط الصورة شخصية",
+  "id.verification.review.id.label": "Your Identification Card",
+  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
+  "id.verification.review.id.retake": "إعادة التقاط صورة الهوية",
+  "id.verification.review.confirm": "إرسال",
+  "id.verification.submission.alert.error.face": "مطلوب صورة لوجهك. يرجى إعادة التقاط الصورة الشخصية.",
+  "id.verification.submission.alert.error.id": "مطلوب صورة لبطاقة هويتك. يرجى إعادة التقاط صورة بطاقة الهوية.",
+  "id.verification.submission.alert.error.name": "مطلوب اسم حساب صالح. يرجى تحديث اسم حسابك لمطابقة الاسم على هويتك.",
+  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
+  "id.verification.review.error": "{siteName} Support Page",
+  "id.verification.submitted.title": "جارِ التحقق من الهوية",
+  "id.verification.submitted.text": "لقد تلقينا معلوماتك وجاري الآن العمل على التحقق من هويتك. ستصلك رسالة على لوحة المعلومات عند اكتمال عملية التحقق (عادةً خلال 5 أيام). في غضون ذلك، لا يزال بإمكانك الوصول إلى كل محتوى المساق المتوفر.",
+  "id.verification.return.dashboard": "العودة إلى لوحة المعلومات",
  "id.verification.return.course": "العودة للمساق",
-  "id.verification.return.generic": "العودة",
-  "id.verification.photo.upload.help.title": "قم يدلا من هذا برفع صورة",
-  "id.verification.photo.camera.help.title": "استخدم الكاميرا بدلاً من هذا",
-  "id.verification.photo.upload.help.text": "إن واجهتك مشكلة في استخدام مُلتقط الصور أعلاه، فقد ترغب بدﻷ من ذلك في رفع صورة. لرفع صورة، انقر على الزر أدناه.",
-  "id.verification.photo.camera.help.text": "إن واجهتك مشكلة في رفع صورة أعلاه، فقد ترغب بدلا من ذلك في استخدام كاميرا جهازك. لاستخدام الكاميرا، انقر على الزر أدناه.",
-  "id.verification.upload.help.button": "انتقل إلى وضع الرفع",
-  "id.verification.camera.help.button": "انتقل إلى وضع الكاميرا",
-  "id.verification.request.camera.access.instructions": "حتى تلتقط صورة باستخدام الكاميرا، قد تتلقى طلبًا من المتصفح للوصول إلى الكاميرا. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "إعدادات حسابك يديرها {managerTitle}. إن لم يكن الاسم في بطاقة هويتك ذات الصورة. مطابقًا للاسم الذي في حسابك، فيرجى الاتصال بالمسؤول {profileDataManager} أو ب{support} للحصول على المساعدة قبل إتمام عملية التحقق من الصورة..",
-  "id.verification.requirements.card.device.text": "أنت بحاجة إلى جهاز مزود بكاميرا. إذا تلقيت طلبًا من المتصفح للوصول إلى كاميرا جهازك، فتأكد رجاءً من النقر على {السماح}.",
-  "id.verification.account.name.summary.alert": "إعدادات حسابك يديرها {managerTitle}. إن لم يكن الاسم في بطاقة هويتك ذات الصورة. مطابقًا للاسم الذي في حسابك، فيرجى الاتصال بالمسؤول {profileDataManager} أو ب{support} للحصول على المساعدة قبل إتمام عملية التحقق من الصورة..",
-  "idv.submission.alert.error": "\nواجهنا خطأ فني أثناء محاولة رفع طلب التحقق من الهوية\nقد تكون هذه مشكلة مؤقتة، لذا يرجى المحاولة مجددًا بعد بضع دقائق\nإن استمرت المشكلة، فيرجى الذهاب إلى {support_link} للحصول على المساعدة.",
-  "id.verification.account.name.edit": "تعديل {sr}"
+  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
+  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
+  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
+  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
+  "id.verification.upload.help.button": "Switch to Upload Mode",
+  "id.verification.camera.help.button": "Switch to Camera Mode",
+  "id.verification.choose.mode.title": "Photo Requirements Options",
+  "id.verification.choose.mode.hep.text": "To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.",
+  "id.verification.choose.mode.radio.upload": "Upload photos from my device",
+  "id.verification.choose.mode.radio.camera": "Take pictures using my camera",
+  "id.verification.account.name.managed.alert": "Your profile settings are managed by {managerTitle}, so you are not allowed to update your name. Please contact your {profileDataManager} administrator or {support} for help.",
+  "id.verification.request.camera.access.instructions": "لالتقاط صورة باستخدام كاميرا الويب، قد تتلقى طلب المتصفح للوصول إلى الكاميرا. {clickAllow}",
+  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
+  "id.verification.requirements.card.device.text": "أنت بحاجة إلى جهاز مزود بكاميرا. إذا تلقيت طلب المتصفح للوصول إلى الكاميرا، فيرجى التأكد من النقر فوق {السماح}.",
+  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
+  "idv.submission.alert.error": "\nواجهنا خطأ فني أثناء محاولة رفع طلب التحقق من الهوية\nقد تكون هذه مشكلة مؤقتة، لذا يرجى المحاولة مرة أخرى بعد بضع دقائق\nعند استمرار المشكلة يرجى الانتقال إلى {support_link} للحصول على المساعدة",
+  "id.verification.account.name.edit": "Edit {sr}"
 }
--- a/src/i18n/messages/ca.json
+++ b/src/i18n/messages/ca.json
@@ -0,0 +1,11 @@
+{
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
+}
--- a/src/i18n/messages/de.json
+++ b/src/i18n/messages/de.json
@@ -1,361 +0,0 @@
-{
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
-  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
-  "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Account Settings",
-  "account.settings.loading.message": "Loading...",
-  "account.settings.loading.error": "Error: {error}",
-  "account.settings.banner.beta.language": "You have set your language to {beta_language}, which is currently not fully translated. You can help us translate this language fully by joining the Transifex community and adding translations from English for learners that speak {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Help Translate into {beta_language}",
-  "account.settings.section.account.information": "Account Information",
-  "account.settings.section.account.information.description": "These settings include basic information about your account.",
-  "account.settings.section.profile.information": "Profile Information",
-  "account.settings.section.demographics.information": "Optional Information",
-  "account.settings.section.site.preferences": "Site Preferences",
-  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
-  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
-  "account.settings.field.full.name": "Full name",
-  "account.settings.field.full.name.empty": "Add name",
-  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified": "Verified name",
-  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.",
-  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
-  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
-  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
-  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
-  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
-  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
-  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
-  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
-  "account.settings.field.email": "Email address (Sign in)",
-  "account.settings.field.email.empty": "Add email address",
-  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
-  "account.settings.field.secondary.email": "Recovery email address",
-  "account.settings.field.secondary.email.empty": "Add a recovery email address",
-  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
-  "account.settings.email.field.confirmation.header": "Pending confirmation",
-  "account.settings.field.dob": "Year of birth",
-  "account.settings.field.dob.empty": "Add year of birth",
-  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.dob.month": "Month",
-  "account.settings.field.dob.year": "Year",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Please confirm your date of birth",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
-  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
-  "account.settings.field.country": "Country",
-  "account.settings.field.country.empty": "Add country",
-  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
-  "account.settings.field.site.language": "Site language",
-  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
-  "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Add level of education",
-  "account.settings.field.education.levels.empty": "Select a level of education",
-  "account.settings.field.education.levels.p": "Doctorate",
-  "account.settings.field.education.levels.m": "Master's or professional degree",
-  "account.settings.field.education.levels.b": "Bachelor's Degree",
-  "account.settings.field.education.levels.a": "Associate's degree",
-  "account.settings.field.education.levels.hs": "Secondary/high school",
-  "account.settings.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "account.settings.field.education.levels.el": "Elementary/primary school",
-  "account.settings.field.education.levels.none": "No formal education",
-  "account.settings.field.education.levels.o": "Other education",
-  "account.settings.field.gender": "Gender",
-  "account.settings.field.gender.empty": "Add gender",
-  "account.settings.field.gender.options.empty": "Select a gender",
-  "account.settings.field.gender.options.f": "Female",
-  "account.settings.field.gender.options.m": "Male",
-  "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken language",
-  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
-  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
-  "account.settings.field.time.zone": "Time zone",
-  "account.settings.field.time.zone.empty": "Set time zone",
-  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
-  "account.settings.field.time.zone.default": "Default (Local Time Zone)",
-  "account.settings.field.time.zone.all": "All time zones",
-  "account.settings.field.time.zone.country": "Country time zones",
-  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
-  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
-  "account.settings.jump.nav.delete.account": "Delete My Account",
-  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
-  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
-  "account.settings.editable.field.action.save": "Save",
-  "account.settings.editable.field.action.cancel": "Cancel",
-  "account.settings.editable.field.action.edit": "Edit",
-  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
-  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
-  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
-  "account.settings.field.name.modal.certificate.select": "Select a name",
-  "account.settings.field.name.modal.certificate.option.full": "Full Name",
-  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
-  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Phone Number",
-  "account.settings.field.phone_number.empty": "Add a phone number",
-  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
-  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
-  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
-  "account.settings.delete.account.header": "Delete My Account",
-  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
-  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
-  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
-  "account.settings.delete.account.button": "Delete My Account",
-  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.confirm": "confirm your account",
-  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
-  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
-  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
-  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
-  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
-  "account.settings.delete.account.error.unable.to.delete": "Unable to delete account",
-  "account.settings.delete.account.error.no.password": "A password is required",
-  "account.settings.delete.account.error.invalid.password": "Password is incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Sorry, there was an error trying to process your request. Please try again later.",
-  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
-  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
-  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
-  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
-  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
-  "account.settings.field.demographics.gender": "Gender identity",
-  "account.settings.field.demographics.gender.empty": "Add gender identity",
-  "account.settings.field.demographics.gender.options.empty": "Select a gender identity",
-  "account.settings.field.demographics.gender_description": "Gender identity description",
-  "account.settings.field.demographics.gender_description.empty": "Enter description",
-  "account.settings.field.demographics.ethnicity": "Race/Ethnicity identity",
-  "account.settings.field.demographics.ethnicity.empty": "Add race/ethnicity identity",
-  "account.settings.field.demographics.ethnicity.options.empty": "Select all that apply",
-  "account.settings.field.demographics.income": "Family income",
-  "account.settings.field.demographics.income.empty": "Add family income",
-  "account.settings.field.demographics.income.options.empty": "Select a family income range",
-  "account.settings.field.demographics.military_history": "U.S. Military status",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
-  "account.settings.field.demographics.military_history.options.empty": "Select military status",
-  "account.settings.field.demographics.learner_education_level": "Your education level",
-  "account.settings.field.demographics.learner_education_level.empty": "Add education level",
-  "account.settings.field.demographics.parent_education_level": "Parents/Guardians education level",
-  "account.settings.field.demographics.parent_education_level.empty": "Add education level",
-  "account.settings.field.demographics.education_level.options.empty": "Select education level",
-  "account.settings.field.demographics.work_status": "Employment status",
-  "account.settings.field.demographics.work_status.empty": "Add employment status",
-  "account.settings.field.demographics.work_status.options.empty": "Select employment status",
-  "account.settings.field.demographics.work_status_description": "Employment status description",
-  "account.settings.field.demographics.work_status_description.empty": "Enter description",
-  "account.settings.field.demographics.current_work_sector": "Current work industry",
-  "account.settings.field.demographics.current_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.future_work_sector": "Future work industry",
-  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
-  "account.settings.name.change.title.id": "This name change requires identity verification",
-  "account.settings.name.change.title.begin": "Before we begin",
-  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
-  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
-  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
-  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
-  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
-  "account.settings.name.change.continue": "Continue",
-  "account.settings.name.change.cancel": "Cancel",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
-  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
-  "account.settings.editable.field.password.reset.label": "Password",
-  "account.settings.sso.link.account": "Sign in with {name}",
-  "account.settings.sso.account.connected": "Linked",
-  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "account.page.title": "Account | {siteName}",
-  "id.verification.access.blocked.denied": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
-  "id.verification.next": "Next",
-  "id.verification.support": "support",
-  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
-  "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
-  "id.verification.requirements.card.device.title": "Device with Camera",
-  "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification Card",
-  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
-  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
-  "id.verification.access.blocked.title": "Identity Verification",
-  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
-  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
-  "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo?",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
-  "id.verification.camera.access.title": "Camera Permissions",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
-  "id.verification.camera.access.click.allow": "Please make sure to click \"Allow\"",
-  "id.verification.camera.access.enable": "Enable Camera",
-  "id.verification.camera.access.problems": "Having problems?",
-  "id.verification.camera.access.skip": "Skip and upload image files instead",
-  "id.verification.camera.access.success": "Looks like your camera is working and ready.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
-  "id.verification.photo.tips.title": "Helpful Photo Tips",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful Identification Card Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
-  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
-  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.name.label": "Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Identification Card",
-  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.submission.alert.error.face": "A photo of your face is required. Please retake your portrait photo.",
-  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
-  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
-  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "{siteName} Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.return.generic": "Return",
-  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
-  "idv.submission.alert.error": "\n          We encountered a technical error while trying to submit ID verification.\n          This might be a temporary issue, so please try again in a few minutes.\n          If the problem persists, please go to {support_link} for help.\n        ",
-  "id.verification.account.name.edit": "Edit {sr}"
-}
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,5 +1,5 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "La cuenta de {provider} seleccionada ya está vinculada con otra cuenta de {siteName}. ",
+  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
  "account.settings.message.managed.settings": "Los ajustes en el perfil son administrados por {managerTitle}. Contacte su administrador o {support} para obtener ayuda.",
  "account.settings.message.managed.settings.support": "soporte",
  "account.settings.page.heading": "Configuración de cuenta",
@@ -14,40 +14,34 @@
  "account.settings.section.demographics.information": "Información opcional",
  "account.settings.section.site.preferences": "Preferencias del sitio",
  "account.settings.section.linked.accounts": "Cuentas vinculadas",
-  "account.settings.section.linked.accounts.description": "Puedes vincular tus cuentas de redes sociales para simplificar el proceso de iniciar sesión en {siteName}.",
+  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
  "account.settings.field.username": "Nombre de usuario",
-  "account.settings.field.username.help.text": "El nombre que lo identifica en {siteName}. No podrá cambiar el nombre de usuario.",
+  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
  "account.settings.field.full.name": "Nombre completo",
  "account.settings.field.full.name.empty": "Añade nombre",
  "account.settings.field.full.name.help.text": "El nombre que es usado para la verificación de identidad y aparece en sus certificados.",
-  "account.settings.field.full.name.help.text.default": "El nombre que aparece en tu perfil público.",
-  "account.settings.field.full.name.help.text.default.certificate": "Este nombre está seleccionado para aparecer en tus certificados y registros públicos.",
-  "account.settings.field.name.verified": "Nombre verificado",
-  "account.settings.field.name.verified.help.text.verified": "Este nombre ha sido verificado por una identificación con foto.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "Este nombre ha sido verificado por supervisión.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "Este nombre ha sido verificado por una identificación con foto y está seleccionado para aparecer en sus certificados y registros públicos.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "Este nombre se ha verificado mediante supervisión y se ha seleccionado para que aparezca en sus certificados y registros públicos.",
-  "account.settings.field.name.verified.help.text.submitted": "La verificación ha sido enviada. Este proceso usualmente toma 48 horas o menos. El nombre verificado no puede ser modificado en este momento. ",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Su examen supervisado ha sido enviado. El nombre verificado no se puede cambiar en este momento. Vuelva a consultar en 2-5 días.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "Cuando el proceso de verificación de identidad sea exitoso, este nombre aparecerá en tus certificados y registros públicos. El nombre verificado no puede ser cambiado en este momento. ",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Una vez que su examen supervisado pase la revisión, este nombre aparecerá en su certificado y en los registros públicos. El nombre verificado no se puede cambiar en este momento.",
-  "account.settings.field.name.verified.verification.help": "Ingrese su nombre tal como aparece en su tarjeta de identificación vigente de estudiante, trabajo o emitida por el gobierno.",
-  "account.settings.field.full.name.help.text.submitted": "La verificación ha sido enviada. Este proceso usualmente toma 48 horas o menos. El nombre verificado no puede ser modificado en este momento. ",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Su examen supervisado ha sido enviado. El nombre completo no se puede cambiar en este momento. Vuelva a consultar en 2-5 días.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "En cuanto el proceso de verificación de identidad sea exitoso, este nombre aparecerá en tus certificados y registros públicos. El nombre completo no puede ser cambiado en este momento. ",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Una vez que su examen supervisado pase la revisión, este nombre aparecerá en sus certificados y registros públicos. El nombre completo no se puede cambiar en este momento.",
-  "account.settings.field.name.verified.success.message": "Tu solicitud de verificación de identidad se ha completado exitosamente. Ahora puedes seleccionar el nombre prefieres que aparezca en tus certificados y registros públicos.",
-  "account.settings.field.name.verified.success.message.header": "¡Tu solicitud de cambio de nombre está completada!",
-  "account.settings.field.name.verified.failure.message": "Tu más reciente intento de verificación de ID no fue aprobado. Las configuraciones relacionadas con el proceso se han restablecido.",
-  "account.settings.field.name.verified.failure.message.header": "No pudimos verificar tu identidad.",
+  "account.settings.field.full.name.help.text.non.certificate": "The name that appears on your public profile.",
+  "account.settings.field.full.name.help.text.certificate": "This name is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified": "Verified name",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by government ID.",
+  "account.settings.field.name.verified.help.text.certificate": "This name has been verified by government ID and selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
+  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
+  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your government-issued ID.",
+  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
+  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
+  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
+  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
+  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
  "account.settings.field.name.verified.failure.message.help.link": "Más información sobre la verificación de ID",
-  "account.settings.field.name.verified.submitted.message": "Tu solicitud de verificación de identidad ha sido enviada y usualmente se tarda entre 24 a 48 horas para completarse. ",
-  "account.settings.field.name.verified.submitted.message.certificate": "Cuando la solicitud esté aprobada, la actualización de tu nombre aparecerá en todos los certificados asociados y registros públicos.",
-  "account.settings.field.name.verified.submitted.message.header": "¡Tu solicitud de cambio de nombre esta por completarse!",
+  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
+  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
+  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
  "account.settings.field.email": "Correo electrónico (Ingresar)",
  "account.settings.field.email.empty": "Agregar correo electrónico",
  "account.settings.field.email.confirmation": "Le enviamos un mensaje de confirmación a  {value}. Hacer click en la liga del mensaje para actualizar su correo electrónico.",
-  "account.settings.field.email.help.text": "Tienes un mensaje de {siteName} y el equipo de curso en esta dirección. ",
+  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
  "account.settings.field.secondary.email": "Correo electrónico de recuperación",
  "account.settings.field.secondary.email.empty": "Agregar un correo electrónico de recuperación",
  "account.settings.field.secondary.email.confirmation": "Le enviamos un mensaje de confirmación a  {value}. Hacer click en la liga del mensaje para actualizar su correo electrónico.",
@@ -55,16 +49,6 @@
  "account.settings.field.dob": "Año de nacimiento",
  "account.settings.field.dob.empty": "Agregar año de nacimiento",
  "account.settings.field.year_of_birth.options.empty": "Selecciona año de nacimiento",
-  "account.settings.field.dob.month": "Mes",
-  "account.settings.field.dob.year": "Año",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Por favor confirme su fecha de nacimiento",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Seleccione un mes de nacimiento",
-  "account.settingsfield.dob.error.general": "Ha ocurrido un error técnico. Por favor intentalo de nuevo.",
  "account.settings.field.country": "País",
  "account.settings.field.country.empty": "Agregar país",
  "account.settings.field.country.options.empty": "Seleccionar un país",
@@ -101,7 +85,7 @@
  "account.settings.field.time.zone.all": "Todas las zonas horarias",
  "account.settings.field.time.zone.country": "Zonas horarias",
  "account.settings.section.social.media": "Enlaces de redes sociales",
-  "account.settings.section.social.media.description": "Opcionalmente, conecte sus cuentas personales a los iconos de redes sociales en su perfil de {siteName}.",
+  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
  "account.settings.field.social.platform.name.linkedin.empty": "Agregar perfil de LinkedIn",
  "account.settings.jump.nav.delete.account": "Eliminar mi cuenta",
@@ -114,12 +98,12 @@
  "account.settings.editable.field.action.edit": "Editar",
  "account.settings.static.field.empty": "No hay valor establecido. Contacte su administrador {enterprise} para hacer cambios.",
  "account.settings.static.field.empty.no.admin": "No hay valor establecido.",
-  "account.settings.field.name.certificate.select": "En caso de ser seleccionado, este nombre aparecerá en tus certificados y registros públicos. ",
-  "account.settings.field.name.modal.certificate.title": "Escoge un nombre de preferencia para tus certificados y registros públicos.",
-  "account.settings.field.name.modal.certificate.select": "Selecciona un nombre",
-  "account.settings.field.name.modal.certificate.option.full": "Nombre completo",
-  "account.settings.field.name.modal.certificate.option.verified": "Nombre verificado",
-  "account.settings.field.name.modal.certificate.button.choose": "Escoge un nombre",
+  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
+  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
+  "account.settings.field.name.modal.certificate.select": "Select a name",
+  "account.settings.field.name.modal.certificate.option.full": "Full Name",
+  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
+  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
  "account.settings.coaching.consent.welcome.header": "Empecemos",
  "account.settings.coaching.consent.welcome.subheader": "Estamos aquí para ustede desde el inicio hasta el final",
  "account.settings.coaching.consent.description": "Los programas de MicroBachelors incluyen entrenamiento que se enfoca en su carrera, educación y cómo logrará resultados a través de la comunicación individual con un profesional experimentado. Si está interesado, proporcione la información a continuación y haga clic en \"Enviar\", y nuestro socio asesor se comunicará con usted por correo electrónico y / o mensaje de texto para ayudarlo a avanzar. Los términos y Condiciones aplican.*",
@@ -141,19 +125,18 @@
  "account.settings.delete.account.before.proceeding": "Antes de continuar, por favor {actionLink}.",
  "account.settings.delete.account.header": "Eliminar mi cuenta",
  "account.settings.delete.account.subheader": "¡Sentimos que te vayas!",
-  "account.settings.delete.account.text.1": "Para tener en cuenta: La eliminación de su cuenta y sus datos personales es permanente y no se puede deshacer. {siteName} no podrá recuperar tu cuenta o la información que sea eliminada.",
-  "account.settings.delete.account.text.2": "Una véz tu cuenta haya sido eliminada, no podrás usarla para tomar cursos en {siteName}. ",
+  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
  "account.settings.delete.account.text.2.edX": "Una vez su cuenta haya sido eliminada, no la podrá usar para tomar cursos en la app de edX, edx.org o en cualquier otro sitio administrado por edX. Esto incluye el acceso a edx.org desde el sistema de su empleador o  universidad y el acceso a páginas privadas ofrecidas por MIT Open Learning, Wharton Executive Education y Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "Sigue estas instrucciones para imprimir o descargar un certificado. ",
-  "account.settings.delete.account.text.warning": "Atención: la eliminación de su cuenta es permanente. Por favor lea el previo aviso cautelosamente antes de proceder, ya que esto es una acción irreversible, y no podrá usar el mismo correo electrónico en {siteName}.",
+  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
  "account.settings.delete.account.text.change.instead": "En lugar de eso, ¿quieres cambiar tu correo electrónico, nombre o contraseña?",
  "account.settings.delete.account.button": "Eliminar mi cuenta",
  "account.settings.delete.account.please.activate": "activar su cuenta",
-  "account.settings.delete.account.please.confirm": "Confirma tu cuenta",
  "account.settings.delete.account.please.unlink": "Desvincular todas las cuentas de redes sociales.",
  "account.settings.delete.account.modal.header": "¿Está seguro?",
-  "account.settings.delete.account.modal.text.1": "Has seleccionado la opción ''Eliminar mi cuenta''. Ten en cuenta que la eliminación de tu cuenta e información personal es permanente y no puede revertirse. {siteName} no será capaz de recuperar tu cuenta o información una vez esta sea eliminada. ",
-  "account.settings.delete.account.modal.text.2": "Si aceptas proceder, ya no podrás usar esta cuenta para tomar cursos en {siteName}.",
+  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
  "account.settings.delete.account.modal.text.2.edX": "Si procedes, no será posible usar esta cuenta para tomar cursos ni en la aplicación móvil de edX, ni en edx.org, ni en cualquier otro sitio hospedado por edX. Esto incluye el acceso a edx.org desde el sistema de tu empleador o universidad, y el acceso a sitios privados ofrecidos por MIT Open Learning, Wharton Executive Education, y Harvard Medical School.",
  "account.settings.delete.account.modal.enter.password": "Si deseas continuar y eliminar tu cuenta, por favor introduce la contraseña de tu cuenta:",
  "account.settings.delete.account.modal.confirm.delete": "Si, Eliminar",
@@ -165,8 +148,8 @@
  "account.settings.delete.account.modal.after.header": "¡Sentimos que te vayas! Tu cuenta será eliminada en breve.",
  "account.settings.delete.account.modal.after.text": "La eliminación de cuenta, incluyendo la eliminación de las listas de correo electrónico, puede tardar unas semanas en procesarse totalmente en nuestro sistema. Si quieres renunciar a recibir correos antes de que la eliminación se haya completado, por favor date de baja mediante el enlace que aparece al final de los correos.",
  "account.settings.delete.account.modal.after.button": "Cerrar",
-  "account.settings.delete.account.text.3.edX": "También podrás perder el acceso a certificados verificados y a otras credenciales del programa como los certificados MicroMasters. Puedes hacer una copia de estos registros antes de proceder con la eliminación. {actionLink}.",
-  "account.settings.delete.account.text.3": "También podrás perder el acceso a certificados verificados y a otras credenciales del programa. Puedes hacer una copia de estos registros antes de proceder con la eliminación. ",
+  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
+  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
  "account.settings.message.demographics.service.issue": "Ocurrió un error al intentar recuperar o guardar la información de tu cuenta. Por favor inténtalo más tarde.",
  "account.settings.field.demographics.gender": "Identidad de género",
  "account.settings.field.demographics.gender.empty": "Añade identidad de género",
@@ -197,17 +180,17 @@
  "account.settings.field.demographics.future_work_sector": "Área profesional futura",
  "account.settings.field.demographics.future_work_sector.empty": "Añade área profesional",
  "account.settings.field.demographics.work_sector.options.empty": "Selecciona área profesional",
-  "account.settings.section.demographics.why": "¿Por qué {siteName} recauda esta información?",
-  "account.settings.name.change.title.id": "Este cambio de nombre requiere de verificación de identidad.",
-  "account.settings.name.change.title.begin": "Antes de empezar",
-  "account.settings.name.change.warning.one": "Atención: esta acción actualizará el nombre que aparece en todos los certificados obtenidos a través de esta cuenta en el pasado y en aquellos en que actualmente estás obteniendo o que adquirirás en el futuro.",
-  "account.settings.name.change.warning.two": "Esta acción no podrá revertirse sin antes verificar tu identidad.",
-  "account.settings.name.change.id.name.label": "Ingrese su nombre tal como aparece en su tarjeta de identificación vigente de estudiante, trabajo o emitida por el gobierno.",
-  "account.settings.name.change.id.name.placeholder": "Ingrese el nombre en su identificación con foto",
-  "account.settings.name.change.error.valid.name": "Por favor ingresa un nombre valido.",
-  "account.settings.name.change.error.general": "Ha ocurrido un error técnico. Por favor intentalo de nuevo.",
-  "account.settings.name.change.continue": "Continuar",
-  "account.settings.name.change.cancel": "Cancelar",
+  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
+  "account.settings.name.change.title.id": "This name change requires identity verification",
+  "account.settings.name.change.title.begin": "Before we begin",
+  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
+  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
+  "account.settings.name.change.id.name.label": "Enter your name as it appears on your government-issued ID.",
+  "account.settings.name.change.id.name.placeholder": "Enter the name on your government ID",
+  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
+  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
+  "account.settings.name.change.continue": "Continue",
+  "account.settings.name.change.cancel": "Cancel",
  "error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, comprueba la URL y vuelve a intentarlo.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "soporte técnico",
  "account.settings.editable.field.password.reset.button.confirmation": "Hemos mandado un mensaje a {email}. Haz clic en el enlace en el mensaje para restablecer tu contraseña. ¿No recibiste el mensaje? Contáctate con {technicalSupportLink}.",
@@ -219,22 +202,22 @@
  "account.settings.sso.account.disconnect.error": "Hubo un problema al desconectar esta Cuenta. Si el problema persiste, contacte soporte.",
  "account.settings.sso.unlink.account": "Desvincular la cuenta de {accountName} ",
  "account.settings.sso.no.providers": "No se pueden vincular cuentas en este momento.",
-  "account.page.title": "Cuenta | {siteName}",
-  "id.verification.access.blocked.denied": "No podemos verificar tu identidad en este momento. Si aún no has activado tu cuenta, comprueba en tu carpeta de correo no deseado el correo de activación de {email}.",
+  "id.verification.access.blocked.denied": "No puedes verificar tu identidad en este momento. Si aún tienes que activar tu cuenta, revisa tu carpeta de correo no deseado y busca el correo electrónico de activación de {email}.",
  "id.verification.next": "Siguiente",
  "id.verification.support": "soporte",
+  "id.verification.continue.upload": "Continue with Upload",
  "id.verification.example.card.alt": "Ejemplo de un documento de identidad válido con foto y nombre completo.",
  "id.verification.requirements.title": "Requerimientos de verificación por foto",
-  "id.verification.requirements.description": "Para completa la verificación de foto, necesitarás lo siguiente:",
+  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
  "id.verification.requirements.card.device.title": "Dispositivo con cámara",
  "id.verification.requirements.card.device.allow": "Permitir",
-  "id.verification.requirements.card.id.title": "Tarjeta de identificación con foto",
-  "id.verification.requirements.card.id.text": "Necesitas una tarjeta de identificación válida que contenga tu nombre completo y foto, similar a una licencia de conducir o pasaporte.",
+  "id.verification.requirements.card.id.title": "Photo Identification Card",
+  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
  "id.verification.privacy.title": "Información de privacidad",
-  "id.verification.privacy.need.photo.question": "¿Por qué {siteName} necesita mi foto?",
+  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
  "id.verification.privacy.need.photo.answer": "Utilizamos tus fotos de verificación para confirmar tu identidad y garantizar la validez de tu certificado.",
-  "id.verification.privacy.do.with.photo.question": "¿Qué hace {siteName} con esta foto?",
-  "id.verification.privacy.do.with.photo.answer": "Encriptamos de forma segura tu foto y la enviamos a nuestro servicio de autorización para su revisión. Tu foto e información no se guardan ni se ven en ninguna parte de {siteName} después de que se completa el proceso de verificación.",
+  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
+  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
  "id.verification.access.blocked.title": "Verificación de identidad",
  "id.verification.access.blocked.enrollment": "Actualmente, no estás inscrito en un curso que requiera verificación de identidad.",
  "id.verification.access.blocked.pending": "Ya has enviado tu información de verificación de identidad. Recibirás un mensaje en tu panel principal cuando el proceso de verificación esté completado (usualmente dentro de los 5 días).",
@@ -290,9 +273,9 @@
  "id.verification.camera.access.failure.temporary.safari.step2": "Haz clic en el menú de la aplicación Safari y luego selecciona \"Preferencias\". También puedes utilizar Command +, como método abreviado de teclado.",
  "id.verification.camera.access.failure.temporary.safari.step3": "Selecciona la pestaña \"Sitios web\" y luego selecciona \"Cámara\".",
  "id.verification.camera.access.failure.temporary.safari.step4": "Selecciona \"edx.org\" y cambia los permisos de la cámara a \"Permitir.\"",
-  "id.verification.camera.access.failure.unsupported": "Parece que tu navegar no soporta el acceso a la cámara.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "El navegador de Chrome actualmente no soporta el acceso a la cámara en dispositivos iOS, como iPhones y iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Por favor utilice otro navegador para completar la verificación de identidad.",
+  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
+  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
+  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
  "id.verification.photo.tips.title": "Consejos útiles de fotos",
  "id.verification.photo.tips.description": "A continuación, necesitaremos que tomes una foto de tu rostro. Por favor, revisa los siguientes consejos útiles.",
  "id.verification.photo.tips.list.title": "Consejos para fotos",
@@ -300,62 +283,81 @@
  "id.verification.photo.tips.list.well.lit": "El rostro esté bien iluminado",
  "id.verification.photo.tips.list.inside.frame": "Tu cara está completamente dentro del marco de la foto.",
  "id.verification.portrait.photo.title.camera": "Toma una foto de ti mismo",
+  "id.verification.portrait.photo.title.upload": "Sube una foto tuya",
+  "id.verification.portrait.photo.preview.alt": "Previsualización de la foto con el rostro del usuario",
  "id.verification.portrait.photo.instructions.camera": "Cuando tu rostro esté en posición, usa el botón Tomar foto a continuación para tomar tu foto.",
+  "id.verification.portrait.photo.instructions.upload": "Please upload a portrait photo. Ensure your entire face fits inside the frame and is well-lit. Supported formats: ",
  "id.verification.camera.help.sight.question": "¿Qué pasa si no puedo ver la imagen de la cámara o si no puedo ver mi foto para determinar qué lado es visible?",
  "id.verification.camera.help.sight.answer.portrait": "Es posible que puedas completar el procedimiento de captura de imágenes sin ayuda, pero es posible que necesites un par de intentos de envío para que la cámara se coloque correctamente. La posición óptima de la cámara varía con cada computadora, pero generalmente la mejor distancia para una foto de rostro es aproximadamente a 12 a 18 pulgadas (30 a 45 centímetros) de la cámara, con la cabeza centrada en relación con la pantalla de la computadora. Si las fotos que envías son rechazadas, intenta mover la computadora o la orientación de la cámara para cambiar el ángulo de iluminación.",
  "id.verification.camera.help.sight.answer.id": "Es posible que puedas completar el procedimiento de captura de imágenes sin ayuda, pero es posible que necesites un par de intentos de envío para que la cámara se coloque correctamente. El posicionamiento óptimo de la cámara varía con cada computadora pero, generalmente, la mejor distancia para una foto de un documento de identificación es a 8 a 12 pulgadas (20 a 30 centímetros) de la cámara, con el documento de identificación centrado en relación con la cámara. Si las fotos que envías son rechazadas, intenta mover la computadora o la orientación de la cámara para cambiar el ángulo de iluminación. La razón más común de rechazo es la imposibilidad de leer el texto del documento de identidad.",
  "id.verification.camera.help.difficulty.question.portrait": "¿Qué sucede si tengo dificultades para mantener la cabeza en posición con respecto a la cámara?",
  "id.verification.camera.help.difficulty.question.id": "¿Qué sucede si tengo dificultades para mantener mi identificación en posición con respecto a la cámara?",
-  "id.verification.camera.help.difficulty.answer": "Si requieres de asistencia para cargar una foto, contacta el equipo de soporte de {siteName} para sugerencias adicionales.",
-  "id.verification.id.photo.unclear.question": "¿No es clara la foto de tu tarjeta de ID ó es muy borrosa?",
-  "id.verification.id.tips.title": "Tips de ayuda para tarjetas de identificación",
-  "id.verification.id.tips.description": "Después, necesitaremos que tomes una foto de una tarjeta de ID válida que tengas en la que incluya tu nombre completo y foto, como una licencia de conducción o un pasaporte. Por favor ten tú ID lista.",
-  "id.verification.id.tips.list.well.lit": "Tu tarjeta de identificación está bien iluminada.",
+  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
+  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
+  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
+  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
+  "id.verification.id.tips.title": "Helpful Identification Card Tips",
+  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
+  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
  "id.verification.id.tips.list.clear": "Asegúrate de que puedes ver tu foto y leer claramente tu nombre.",
-  "id.verification.id.photo.title.camera": "Toma una foto de tu tarjeta de identificación",
-  "id.verification.id.photo.title.upload": "Sube una foto de tu tarjeta de identificación",
+  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
+  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
  "id.verification.id.photo.preview.alt": "Previsualización de Foto ID",
-  "id.verification.id.photo.instructions.camera": "Cuando tú ID este en posición, utiliza el botón de tomar foto que se encuentra debajo para proceder a tomar tu foto. Por favor usa un pasaporte, licencia de conducción, u otra tarjeta de identificación que incluya tu nombre completo y una foto de tu rostro.",
-  "id.verification.id.photo.instructions.upload": "Por favor sube una foto de tu identificación. Asegurate de que todo el ID encaje dentro de el marco y que este bien iluminado. El tamaño del archivo debe ser por debajo de 10 MB. Los formatos soportados son: ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "El archivo que has seleccionado no cumple con el tipo de imágenes soportadas. Por favor escoge entre los siguientes formatos:",
+  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
+  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
+  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "El archivo que has seleccionado es demasiado grande. Vuelve a intentarlo con un archivo de menos de 10 MB.",
-  "id.verification.name.check.title": "Revisa nuevamente tu nombre",
-  "id.verification.name.check.instructions": "¿El nombre a continuación coincide con el nombre en su identificación con foto? De lo contrario, actualice el nombre a continuación para que coincida con su identificación con foto.",
-  "id.verification.name.check.mismatch.information": "Si el nombre a continuación no coincide con su identificación con foto, se denegará su verificación de identidad.",
-  "id.verification.name.error": "Ingrese su nombre tal como aparece en su identificación con foto.",
+  "id.verification.account.name.title": "Verificación de nombre de cuenta",
+  "id.verification.name.check.title": "Double-Check Your Name",
+  "id.verification.account.name.instructions": "El nombre de tu cuenta y el nombre de tu identificación deben coincidir exactamente. De lo contrario, haz clic en \"No\" para actualizar el nombre de tu cuenta.",
+  "id.verification.name.check.instructions": "Does the name below match the name on your government-issued ID? If not, update the name below to match your goverment-issued ID.",
+  "id.verification.name.check.mismatch.information": "If the name below does not match your government-issued ID, your identity verification will be denied.",
+  "id.verification.account.name.radio.label": "¿El nombre de tu identificación coincide con el nombre de la cuenta a continuación?",
+  "id.verification.name.check.radio.label": "Select an option",
+  "id.verification.account.name.radio.yes": "Si",
+  "id.verification.name.check.radio.yes": "Yes, the name below matches my ID",
+  "id.verification.account.name.radio.no": "No",
+  "id.verification.name.check.radio.no": "No, the name below does not match my ID",
+  "id.verification.account.name.error": "Actualiza el nombre de la cuenta para que coincida con el nombre de tu identificación.",
  "id.verification.account.name.warning.prefix": "Ten en cuenta:",
  "id.verification.account.name.settings": "Configuración de cuenta",
-  "id.verification.name.label": "Nombre",
+  "id.verification.account.name.label": "Nombre de la cuenta",
+  "id.verification.name.label": "Name",
  "id.verification.account.name.photo.alt": "Foto de tu identificación a enviar.",
+  "id.verification.account.name.save": "Guardar y siguiente",
  "id.verification.review.title": "Revisar tus fotos",
  "id.verification.review.description": "Asegúrate de que podamos verificar tu identidad con las imágenes y la información suministradas.",
  "id.verification.review.portrait.label": "Tu Retrato",
  "id.verification.review.portrait.alt": "Foto de tu rostro a enviar.",
  "id.verification.review.portrait.retake": "Retomar Foto de Retrato",
-  "id.verification.review.id.label": "Tú tarjeta de identificación",
-  "id.verification.review.id.alt": "Foto de tu tarjeta de identificación para ser enviada.",
+  "id.verification.review.id.label": "Your Identification Card",
+  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
  "id.verification.review.id.retake": "Retomar Foto de identificación",
  "id.verification.review.confirm": "Enviar",
  "id.verification.submission.alert.error.face": "Se requiere una foto de tu rostro. Vuelve a tomar tu foto de retrato.",
  "id.verification.submission.alert.error.id": "Se requiere una foto de tu documento de ID. Vuelve a tomar tu foto de ID.",
  "id.verification.submission.alert.error.name": "Se requiere un nombre de cuenta válido. Actualiza el nombre de tu cuenta para que coincida con el nombre que figura en tu ID.",
-  "id.verification.submission.alert.error.unsupported": "Uno o más de los siguientes archivos que has subido se encuentran en un formato no soportado. Por favor escoge de los siguientes formatos:",
-  "id.verification.review.error": "Página de soporte de {siteName}",
+  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
+  "id.verification.review.error": "{siteName} Support Page",
  "id.verification.submitted.title": "Verificación de identidad en progreso.",
-  "id.verification.submitted.text": "Hemos recibido su información y estamos verificando su identidad. Se le notificará cuando se complete el proceso de verificación (generalmente dentro de los 5 días). Mientras tanto, aún puede acceder a todo el contenido del curso disponible.",
+  "id.verification.submitted.text": "Hemos recibido tu información y estamos verificando tu identidad. Verás un mensaje en tu tablero cuando se complete el proceso de verificación (generalmente en un periodo de 5 días). Mientras tanto, aún puedes acceder a todo el contenido del curso disponible.",
  "id.verification.return.dashboard": "Volver al panel principal",
  "id.verification.return.course": "Regresar al curso",
-  "id.verification.return.generic": "Regresar",
-  "id.verification.photo.upload.help.title": "Cargar una imágen en vez",
-  "id.verification.photo.camera.help.title": "Usar la cámara en vez",
-  "id.verification.photo.upload.help.text": "Si estás presentando problemas usando el capturador de fotos, es posible que prefieras subir una foto en vez. Para subir una foto, has clic en el botón a continuación ",
-  "id.verification.photo.camera.help.text": "Si estás presentando problemas subiendo una foto, es posible que prefieras usar la cámara en vez. Para usar una cámara, has clic en el botón a continuación.",
-  "id.verification.upload.help.button": "Cambia a modo de carga",
-  "id.verification.camera.help.button": "Cambia a modo de cámara",
+  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
+  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
+  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
+  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
+  "id.verification.upload.help.button": "Switch to Upload Mode",
+  "id.verification.camera.help.button": "Switch to Camera Mode",
+  "id.verification.choose.mode.title": "Photo Requirements Options",
+  "id.verification.choose.mode.hep.text": "To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.",
+  "id.verification.choose.mode.radio.upload": "Upload photos from my device",
+  "id.verification.choose.mode.radio.camera": "Take pictures using my camera",
+  "id.verification.account.name.managed.alert": "Your profile settings are managed by {managerTitle}, so you are not allowed to update your name. Please contact your {profileDataManager} administrator or {support} for help.",
  "id.verification.request.camera.access.instructions": "Para tomar una foto con tu cámara web, es posible que recibas un aviso del navegador para acceder a tu cámara. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "La configuración de tu perfil es administrada por {managerTitle}. Por lo tanto si el nombre en tu ID de foto coincide con tu nombre de cuenta por favor ponte en contacto con tu administrador de {profileDataManager} o con {soporte} para solicitar ayuda antes de completar el proceso de verificación de foto.",
+  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
  "id.verification.requirements.card.device.text": "Necesitas un dispositivo que tenga una cámara. Si has recibido un aviso del navegador para habilitar acceso a tu cámara, por favor asegúrate de seleccionar [allow].",
-  "id.verification.account.name.summary.alert": "La configuración de tu perfil es administrada por {managerTitle}. Por lo tanto si el nombre en tu ID de foto coincide con tu nombre de cuenta por favor ponte en contacto con tu administrador de {profileDataManager} o con {soporte} para solicitar ayuda.",
+  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
  "idv.submission.alert.error": "\n          Se produjo un error técnico al intentar enviar la verificación de ID.\n          Es posible que sea una cuestión temporal, así que inténtalo de nuevo en unos minutos.\n          Si el problema continúa, dirígete a {support_link} para obtener ayuda.\n        ",
  "id.verification.account.name.edit": "Editar {sr}"
 }
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -20,22 +20,16 @@
  "account.settings.field.full.name": "Nom complet",
  "account.settings.field.full.name.empty": "Ajouter un nom",
  "account.settings.field.full.name.help.text": "Le nom qui apparaîtra sur vos certificats et dans le cadre de toute vérification d'identité.",
-  "account.settings.field.full.name.help.text.default": "Le nom qui apparaît sur votre profile public.",
-  "account.settings.field.full.name.help.text.default.certificate": "Ce nom va apparaître sur vos attestations et dossiers publics.",
+  "account.settings.field.full.name.help.text.non.certificate": "Le nom qui apparaît sur votre profile public.",
+  "account.settings.field.full.name.help.text.certificate": "Ce nom va apparaître sur vos attestations et dossiers publics.",
  "account.settings.field.name.verified": "Nom vérifié",
-  "account.settings.field.name.verified.help.text.verified": "Ce nom a été vérifié par une pièce d&#39;identité avec photo.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "Ce nom a été vérifié par la surveillance.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "Ce nom a été vérifié par une pièce d&#39;identité avec photo et est sélectionné pour apparaître sur vos certificats et vos dossiers publics.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "Ce nom a été vérifié par la surveillance et est sélectionné pour apparaître sur vos certificats et vos enregistrements publics.",
+  "account.settings.field.name.verified.help.text.verified": "Ce nom a été vérifié par une pièce d'identité gouvernementale.",
+  "account.settings.field.name.verified.help.text.certificate": "This name has been verified by government ID and selected to appear on your certificates and public-facing records.",
  "account.settings.field.name.verified.help.text.submitted": "La vérification a été soumise. Cela prend généralement 48 heures ou moins. Le nom vérifié ne peut pas être modifié pour le moment.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Votre examen surveillé a été soumis. Le nom vérifié ne peut pas être modifié pour le moment. Veuillez réessayer dans 2 à 5 jours.",
  "account.settings.field.name.verified.help.text.submitted.certificate": "Une fois la vérification d'identité réussie, ce nom apparaîtra sur vos attestations et vos dossiers publics. Le nom complet ne peut pas être modifié pour le moment.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Une fois que votre examen surveillé a réussi l&#39;examen, ce nom apparaîtra sur votre certificat et vos dossiers publics. Le nom vérifié ne peut pas être modifié pour le moment.",
-  "account.settings.field.name.verified.verification.help": "Entrez votre nom tel qu&#39;il apparaît sur votre carte d&#39;étudiant, de travail ou d&#39;identité émise par le gouvernement.",
+  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your government-issued ID.",
  "account.settings.field.full.name.help.text.submitted": "La vérification a été soumise. Cela prend généralement 48 heures ou moins. Le nom vérifié ne peut pas être modifié pour le moment.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Votre examen surveillé a été soumis. Le nom complet ne peut pas être modifié pour le moment. Veuillez réessayer dans 2 à 5 jours.",
  "account.settings.field.full.name.help.text.submitted.certificate": "Une fois la vérification d'identité réussie, ce nom apparaîtra sur vos attestations et vos dossiers publics. Le nom complet ne peut pas être modifié pour le moment.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Une fois que votre examen surveillé a réussi l&#39;examen, ce nom apparaîtra sur vos certificats et vos dossiers publics. Le nom complet ne peut pas être modifié pour le moment.",
  "account.settings.field.name.verified.success.message": "Votre demande de vérification d'identité a été complétée avec succès. Vous avez maintenant la possibilité de sélectionner le nom que vous préférez voir apparaître sur vos attestations et documents publics.",
  "account.settings.field.name.verified.success.message.header": "Votre demande de changement de nom est terminée!",
  "account.settings.field.name.verified.failure.message": "Votre dernière tentative de vérification d'identité n'a pas abouti. Les paramètres du compte correspondant ont été restaurés.",
@@ -55,16 +49,6 @@
  "account.settings.field.dob": "Année de naissance",
  "account.settings.field.dob.empty": "Ajouter année de naissance",
  "account.settings.field.year_of_birth.options.empty": "Sélectionnez une année de naissance",
-  "account.settings.field.dob.month": "Month",
-  "account.settings.field.dob.year": "Year",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Please confirm your date of birth",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
-  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
  "account.settings.field.country": "Pays",
  "account.settings.field.country.empty": "Ajouter un pays",
  "account.settings.field.country.options.empty": "Sélectionnez un pays",
@@ -149,7 +133,6 @@
  "account.settings.delete.account.text.change.instead": "Vous souhaitez modifier votre adresse électronique, votre nom ou votre mot de passe?",
  "account.settings.delete.account.button": "Supprimer mon compte",
  "account.settings.delete.account.please.activate": "activez votre compte",
-  "account.settings.delete.account.please.confirm": "confirmer votre compte",
  "account.settings.delete.account.please.unlink": "dissocier tous les comptes de médias sociaux",
  "account.settings.delete.account.modal.header": "Êtes-vous certain ?",
  "account.settings.delete.account.modal.text.1": "Vous avez sélectionné \"Supprimer mon compte\". La suppression de votre compte et de vos données personnelles est permanente et ne peut être annulée. {siteName} ne pourra ni récupérer votre compte ni les données supprimées.",
@@ -202,8 +185,8 @@
  "account.settings.name.change.title.begin": "Avant que l'on commençons",
  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
  "account.settings.name.change.warning.two": "Cette action ne peut pas être renversée sans vérification d'identité.",
-  "account.settings.name.change.id.name.label": "Entrez votre nom tel qu&#39;il apparaît sur votre carte d&#39;étudiant, de travail ou d&#39;identité émise par le gouvernement.",
-  "account.settings.name.change.id.name.placeholder": "Entrez le nom sur votre pièce d&#39;identité avec photo",
+  "account.settings.name.change.id.name.label": "Enter your name as it appears on your government-issued ID.",
+  "account.settings.name.change.id.name.placeholder": "Enter the name on your government ID",
  "account.settings.name.change.error.valid.name": "Entrez un nom valide",
  "account.settings.name.change.error.general": "Une erreur est survenue. Veuillez réessayer.",
  "account.settings.name.change.continue": "Continuer",
@@ -219,10 +202,10 @@
  "account.settings.sso.account.disconnect.error": "Un problème est survenu lors de la déconnexion de ce compte. Contactez le support si le problème persiste.",
  "account.settings.sso.unlink.account": "Dissocier le compte {name}",
  "account.settings.sso.no.providers": "Aucun compte ne peut être lié pour le moment.",
-  "account.page.title": "Account | {siteName}",
-  "id.verification.access.blocked.denied": "Nous ne pouvez pas vérifier votre identité pour le moment. Si vous n'avez pas encore activé votre compte, veuillez vérifier votre dossier de pourriels pour le courriel d'activation de {email}.",
+  "id.verification.access.blocked.denied": "Vous ne pouvez pas vérifier votre identité pour le moment. Si vous n'avez pas encore activé votre compte, veuillez vérifier votre dossier de pourriels pour le courriel d'activation de {email}.",
  "id.verification.next": "Suivant",
  "id.verification.support": "support",
+  "id.verification.continue.upload": "Continuer avec le téléchargement",
  "id.verification.example.card.alt": "Exemple de carte d'identité valide avec un nom complet et une photo.",
  "id.verification.requirements.title": "Exigences de vérification des photos",
  "id.verification.requirements.description": "Afin de procéder à la vérification des photos, vous aurez besoin des éléments suivants :",
@@ -300,13 +283,18 @@
  "id.verification.photo.tips.list.well.lit": "Votre visage est bien éclairé",
  "id.verification.photo.tips.list.inside.frame": " Votre visage est entièrement dans le cadre.",
  "id.verification.portrait.photo.title.camera": "Prenez une photo de vous",
+  "id.verification.portrait.photo.title.upload": "Téléchargez une photo de vous",
+  "id.verification.portrait.photo.preview.alt": "Aperçu de la photo du visage de l'utilisateur.",
  "id.verification.portrait.photo.instructions.camera": "Lorsque votre visage est en position, utilisez le bouton Prendre une photo ci-dessous pour prendre votre photo.",
+  "id.verification.portrait.photo.instructions.upload": "Veuillez télécharger une photo de portrait. Assurez-vous que tout votre visage s'insère dans le cadre et est bien éclairé. Formats pris en charge :",
  "id.verification.camera.help.sight.question": "Que faire si je ne peux pas voir l'image de la caméra ou si je ne peux pas voir ma photo pour déterminer quel côté est visible?",
  "id.verification.camera.help.sight.answer.portrait": "Vous pourrez peut-être terminer la procédure de capture d'image sans aide, mais cela peut prendre quelques tentatives de soumission pour obtenir le bon positionnement de la caméra. Le positionnement optimal de la caméra varie avec chaque ordinateur, mais généralement la meilleure position pour une prise de vue de la tête est d'environ 12-18 pouces (30-45 centimètres) de la caméra, la tête étant centrée par rapport à l'écran de l'ordinateur. Si les photos que vous soumettez sont rejetées, essayez de déplacer l’orientation de l’ordinateur ou de l’appareil photo pour modifier l’angle d’éclairage.",
  "id.verification.camera.help.sight.answer.id": "Vous pourrez peut-être terminer la procédure de capture d'image sans aide, mais cela peut prendre quelques tentatives de soumission pour obtenir le bon positionnement de la caméra. Le positionnement optimal de la caméra varie avec chaque ordinateur, mais généralement, la meilleure position pour une photo d'une carte d'identité est de 8-12 pouces (20-30 centimètres) de la caméra, la carte d'identité étant centrée par rapport à la caméra. Si les photos que vous soumettez sont rejetées, essayez de déplacer l’orientation de l’ordinateur ou de l’appareil photo pour modifier l’angle d’éclairage. La raison la plus courante de rejet est l'incapacité de lire le texte sur la carte d'identité.",
  "id.verification.camera.help.difficulty.question.portrait": "Que faire si j'ai des difficultés à maintenir ma tête en position par rapport à la caméra ?",
  "id.verification.camera.help.difficulty.question.id": "Que faire si j'ai des difficultés à tenir ma carte d'identité en position par rapport à la caméra ?",
  "id.verification.camera.help.difficulty.answer": "Si vous avez besoin d'aide pour prendre une photo à soumettre, contactez le support {siteName} pour des suggestions supplémentaires.",
+  "id.verification.camera.help.upload.question": "Et si je souhaite télécharger une photo à la place ?",
+  "id.verification.camera.help.upload.answer": "Sur la page suivante, vous aurez la possibilité de passer en mode téléchargement. En sélectionnant cette option, vous pourrez télécharger une photo à la place.",
  "id.verification.id.photo.unclear.question": "L'image de votre carte d'identité n'est pas claire ou trop floue ?",
  "id.verification.id.tips.title": "Conseils utiles pour les cartes d'identité",
  "id.verification.id.tips.description": "Ensuite, nous vous demanderons de prendre une photo d'une carte d'identité valide comportant votre nom complet et votre photo, comme un permis de conduire ou un passeport. Veuillez préparer votre carte d'identité.",
@@ -319,14 +307,24 @@
  "id.verification.id.photo.instructions.upload": "Veuillez téléverser une photo de votre carte d'identité. Assurez-vous que la totalité de la carte d'identité rentre dans le cadre et qu'elle est bien éclairée. La taille du fichier doit être inférieure à 10 Mo. Formats pris en charge : ",
  "id.verification.id.photo.instructions.upload.error.invalidFileType": "Le fichier que vous avez sélectionné n'est pas un type d'image pris en charge. Veuillez choisir parmi les formats suivants :",
  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "Le fichier que vous avez sélectionné est trop volumineux. Veuillez réessayer avec un fichier de moins de 10 Mo.",
+  "id.verification.account.name.title": "Vérification du nom du compte",
  "id.verification.name.check.title": "Vérifiez votre nom",
-  "id.verification.name.check.instructions": "Le nom ci-dessous correspond-il au nom sur votre pièce d&#39;identité avec photo ? Si ce n&#39;est pas le cas, mettez à jour le nom ci-dessous pour qu&#39;il corresponde à votre pièce d&#39;identité avec photo.",
-  "id.verification.name.check.mismatch.information": "Si le nom ci-dessous ne correspond pas à votre pièce d&#39;identité avec photo, votre vérification d&#39;identité sera refusée.",
-  "id.verification.name.error": "Veuillez entrer votre nom tel qu&#39;il apparaît sur votre pièce d&#39;identité avec photo.",
+  "id.verification.account.name.instructions": "Le nom de votre compte et le nom de votre pièce d'identité doivent correspondre exactement. Sinon, cliquez sur \"Non\" pour mettre à jour le nom de votre compte.",
+  "id.verification.name.check.instructions": "Le nom ci-dessous correspond-il au nom figurant sur votre pièce d'identité officielle ? Si ce n'est pas le cas, mettez à jour le nom ci-dessous afin qu'il corresponde à votre pièce d'identité.",
+  "id.verification.name.check.mismatch.information": "Si le nom ci-dessous ne correspond pas à votre pièce d'identité, la vérification de votre identité sera refusée.",
+  "id.verification.account.name.radio.label": "Le nom sur votre pièce d'identité correspond-il au nom du compte ci-dessous?",
+  "id.verification.name.check.radio.label": "Sélectionnez une option",
+  "id.verification.account.name.radio.yes": "Oui",
+  "id.verification.name.check.radio.yes": "Oui, le nom ci-dessous correspond à mon ID",
+  "id.verification.account.name.radio.no": "Non",
+  "id.verification.name.check.radio.no": "Non, le nom ci-dessous ne correspond pas à mon ID",
+  "id.verification.account.name.error": "Veuillez mettre à jour le nom de votre compte pour qu'il corresponde au nom sur votre pièce d'identité.",
  "id.verification.account.name.warning.prefix": "Veuillez noter:",
  "id.verification.account.name.settings": "Paramètres du compte",
+  "id.verification.account.name.label": "Nom du compte",
  "id.verification.name.label": "Nom",
  "id.verification.account.name.photo.alt": "Photo de votre pièce d'identité à soumettre.",
+  "id.verification.account.name.save": "Enregistrer et suivant",
  "id.verification.review.title": "Vérifiez vos photos",
  "id.verification.review.description": "Assurez-vous que nous pourrons vérifier votre identité avec les photos et les informations fournies.",
  "id.verification.review.portrait.label": "Votre portrait",
@@ -342,16 +340,20 @@
  "id.verification.submission.alert.error.unsupported": "Un ou plusieurs des fichiers que vous avez téléchargés sont dans un format non pris en charge. Veuillez choisir parmi les formats suivants :",
  "id.verification.review.error": "Page de Support {siteName}",
  "id.verification.submitted.title": "Vérification d'identité en cours",
-  "id.verification.submitted.text": "Nous avons reçu vos informations et vérifions votre identité. Vous serez averti lorsque le processus de vérification sera terminé (généralement dans les 5 jours). En attendant, vous pouvez toujours accéder à tous les contenus de cours disponibles.",
+  "id.verification.submitted.text": "Nous avons reçu vos informations et vérifions votre identité. Vous verrez un message sur votre tableau de bord lorsque le processus de vérification sera terminé (généralement dans les 5 jours). En attendant, vous pouvez toujours accéder à tous les contenus de cours disponibles.",
  "id.verification.return.dashboard": "Retour au Tableau de bord",
  "id.verification.return.course": "Revenir au cours",
-  "id.verification.return.generic": "Retour",
  "id.verification.photo.upload.help.title": "Téléchargez une photo à la place",
  "id.verification.photo.camera.help.title": "Utilisez votre appareil photo à la place",
  "id.verification.photo.upload.help.text": "Si vous rencontrez des difficultés lors de l'utilisation de la capture de photo ci-dessus, vous souhaiterez peut-être télécharger une photo à la place. Pour télécharger une photo, cliquez sur le bouton ci-dessous.",
  "id.verification.photo.camera.help.text": "Si vous rencontrez des difficultés pour télécharger une photo ci-dessus, vous pouvez utiliser votre appareil photo à la place. Pour utiliser votre appareil photo, cliquez sur le bouton ci-dessous.",
  "id.verification.upload.help.button": "Passer en mode de téléchargement",
  "id.verification.camera.help.button": "Passer en mode caméra",
+  "id.verification.choose.mode.title": "Options d'exigences relatives aux photos",
+  "id.verification.choose.mode.hep.text": "Pour terminer la vérification, veuillez sélectionner l'une des options suivantes pour soumettre des photos. Vous pourrez basculer entre ces options tout au long du processus si nécessaire.",
+  "id.verification.choose.mode.radio.upload": "Télécharger des photos depuis mon appareil",
+  "id.verification.choose.mode.radio.camera": "Prendre des photos avec mon appareil photo",
+  "id.verification.account.name.managed.alert": "Les paramètres de votre profil sont gérés par {managerTitle}, vous n'êtes donc pas autorisé à mettre à jour votre nom. Veuillez contacter votre administrateur {profileDataManager} ou {support} pour obtenir de l'aide.",
  "id.verification.request.camera.access.instructions": "Afin de prendre une photo à l'aide de votre webcam, vous pouvez recevoir une invite du navigateur pour accéder à votre caméra. {clickAllow}",
  "id.verification.requirements.account.managed.alert": "Les paramètres de votre compte sont gérés par {managerTitle}. Si le nom sur votre pièce d'identité avec photo ne correspond pas au nom de votre compte, veuillez contacter votre administrateur {profileDataManager} ou {support} pour obtenir de l'aide avant de terminer le processus de vérification des photos.",
  "id.verification.requirements.card.device.text": "Vous avez besoin d'un appareil équipé d'une caméra. Si vous recevez une invite du navigateur pour accéder à votre caméra, assurez-vous de cliquer sur {allow}.",
--- a/src/i18n/messages/fr_CA.json
+++ b/src/i18n/messages/fr_CA.json
@@ -1,361 +0,0 @@
-{
-  "account.settings.message.duplicate.tpa.provider": "Le compte {provider} que vous avez sélectionné est déjà lié à un autre compte {siteName}.",
-  "account.settings.message.managed.settings": "Les paramètres de votre profil sont gérés par {managerTitle}. Contactez votre administrateur ou {support} pour obtenir de l'aide.",
-  "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Paramètres du compte",
-  "account.settings.loading.message": "Chargement...",
-  "account.settings.loading.error": "Erreur : {error}",
-  "account.settings.banner.beta.language": "Vous avez réglé votre langue au {beta_language}, qui n'est pas entièrement traduite. Vous pouvez nous aider à traduire cette langue en rejoignant la communauté Transifex pour traduire de l'anglais au {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Revenir au {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Aidez-nous à traduire en {beta_language}",
-  "account.settings.section.account.information": "Information du compte",
-  "account.settings.section.account.information.description": "Ces paramètres comprennent des informations de base à propos de votre compte.",
-  "account.settings.section.profile.information": "Informations de profil",
-  "account.settings.section.demographics.information": "Informations optionnelles",
-  "account.settings.section.site.preferences": "Préférences de site",
-  "account.settings.section.linked.accounts": "Comptes liés",
-  "account.settings.section.linked.accounts.description": "Vous pouvez associer vos comptes de réseaux sociaux pour simplifier la connexion à {siteName}.",
-  "account.settings.field.username": "Nom d'utilisateur",
-  "account.settings.field.username.help.text": "Le nom qui vous identifie sur {siteName}. Vous ne pouvez pas changer votre nom d'utilisateur.",
-  "account.settings.field.full.name": "Nom complet",
-  "account.settings.field.full.name.empty": "Ajouter un nom",
-  "account.settings.field.full.name.help.text": "Le nom que vous avez utilisé pour la vérification d'identité et qui apparaît sur vos attestations.",
-  "account.settings.field.full.name.help.text.default": "Le nom qui apparaît sur votre profil public.",
-  "account.settings.field.full.name.help.text.default.certificate": "Ce nom va apparaître sur vos attestations et dossiers publics.",
-  "account.settings.field.name.verified": "Nom vérifié",
-  "account.settings.field.name.verified.help.text.verified": "Ce nom a été vérifié par une pièce d'identité avec photo.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "Ce nom a été vérifié par la surveillance.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "Ce nom a été vérifié par une pièce d'identité avec photo et est sélectionné pour apparaître sur vos attestations et vos dossiers publics.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "Ce nom a été vérifié par la surveillance et est sélectionné pour apparaître sur vos attestations et vos dossiers publics.",
-  "account.settings.field.name.verified.help.text.submitted": "La vérification a été soumise. Cela prend généralement 48 heures ou moins. Le nom vérifié ne peut pas être modifié pour le moment.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Votre examen surveillé a été soumis. Le nom vérifié ne peut pas être modifié pour le moment. Veuillez réessayer dans 2 à 5 jours.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "Une fois la vérification d'identité réussie, ce nom apparaîtra sur vos attestations et vos documents publics. Un nom vérifié ne peut pas être modifié pour le moment.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Une fois que votre examen surveillé a réussi l'examen, ce nom apparaîtra sur votre attestation et vos dossiers publics. Le nom vérifié ne peut pas être modifié pour le moment.",
-  "account.settings.field.name.verified.verification.help": "Entrez votre nom tel qu'il apparaît sur votre carte d'étudiant, de travail ou d'identité émise par le gouvernement.",
-  "account.settings.field.full.name.help.text.submitted": "La vérification a été soumise. Cela prend généralement 48 heures ou moins. Le nom complet ne peut pas être modifié pour le moment.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Votre examen surveillé a été soumis. Le nom complet ne peut pas être modifié pour le moment. Veuillez réessayer dans 2 à 5 jours.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "Une fois la vérification d'identité réussie, ce nom apparaîtra sur vos attestations et vos dossiers publics. Le nom complet ne peut pas être modifié pour le moment.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Une fois que votre examen surveillé a réussi l'examen, ce nom apparaîtra sur vos attestations et vos dossiers publics. Le nom complet ne peut pas être modifié pour le moment.",
-  "account.settings.field.name.verified.success.message": "Votre demande de vérification d'identité a été complétée avec succès. Vous avez maintenant la possibilité de sélectionner le nom que vous préférez voir apparaître sur vos attestations et documents publics.",
-  "account.settings.field.name.verified.success.message.header": "Votre demande de changement de nom est terminée!",
-  "account.settings.field.name.verified.failure.message": "Votre dernière tentative de vérification d'identité n'a pas abouti. Les paramètres du compte correspondant ont été restaurés.",
-  "account.settings.field.name.verified.failure.message.header": "Nous n'avons pas pu vérifier votre identité.",
-  "account.settings.field.name.verified.failure.message.help.link": "En savoir plus sur la vérification d'identité",
-  "account.settings.field.name.verified.submitted.message": "Votre demande de vérification d'identité a bien été envoyée et prend généralement entre 24 et 48 heures afin d'être validée.",
-  "account.settings.field.name.verified.submitted.message.certificate": "Lorsque votre demande est approuvée, votre nouveau nom apparaîtra sur tous les certificats associés et les documents publics.",
-  "account.settings.field.name.verified.submitted.message.header": "Votre demande de changement de nom est presque terminée!",
-  "account.settings.field.email": "Adresse courriel (Connexion)",
-  "account.settings.field.email.empty": "Ajouter une adresse courriel",
-  "account.settings.field.email.confirmation": "Nous avons envoyé un message de confirmation à {value}. Cliquez sur le lien dans le message pour mettre à jour votre adresse courriel.",
-  "account.settings.field.email.help.text": "Vous recevrez des messages de {siteName} et des équipes pédagogiques à cette adresse.",
-  "account.settings.field.secondary.email": "Adresse courriel de récupération",
-  "account.settings.field.secondary.email.empty": "Ajouter une adresse courriel de récupération",
-  "account.settings.field.secondary.email.confirmation": "Nous avons envoyé un message de confirmation à {valeur}. Cliquez sur le lien dans le message pour mettre à jour votre adresse courriel de récupération.",
-  "account.settings.email.field.confirmation.header": "En attente de confirmation",
-  "account.settings.field.dob": "Année de naissance",
-  "account.settings.field.dob.empty": "Ajouter votre année de naissance",
-  "account.settings.field.year_of_birth.options.empty": "Sélectionner une année de naissance",
-  "account.settings.field.dob.month": "Mois",
-  "account.settings.field.dob.year": "Année",
-  "account.settings.field.month.year.default": "Sélectionnez le mois",
-  "account.settings.field.dob.year.default": "Sélectionnez l'année",
-  "account.settings.field.dob.form.button": "Veuillez confirmer votre date de naissance",
-  "account.settings.field.dob.form.title": "Entrez votre mois et votre année de naissance",
-  "account.settings.field.dob.form.help.text": "Nous demandons des informations sur le mois et l'année de naissance pour nous aider à respecter nos obligations légales.",
-  "account.settings.field.dob.form.success": "Merci d'avoir entré vos informations.",
-  "account.settings.field.month_of_birth.options.empty": "Sélectionnez un mois de naissance",
-  "account.settingsfield.dob.error.general": "Une erreur est survenue. Veuillez réessayer.",
-  "account.settings.field.country": "Pays",
-  "account.settings.field.country.empty": "Ajouter un pays",
-  "account.settings.field.country.options.empty": "Sélectionner un pays",
-  "account.settings.field.state": "État",
-  "account.settings.field.state.empty": "Ajouter un état",
-  "account.settings.field.state.options.empty": "Choisir un état",
-  "account.settings.field.site.language": "Langue du site",
-  "account.settings.field.site.language.help.text": "La langue utilisée au travers du site. Le site est actuellement disponible dans un nombre limité de langues.",
-  "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Ajouter un niveau d'études",
-  "account.settings.field.education.levels.empty": "Sélectionner un niveau d'études",
-  "account.settings.field.education.levels.p": "Doctorat",
-  "account.settings.field.education.levels.m": "Maitrise ou diplôme professionnel",
-  "account.settings.field.education.levels.b": "Diplôme de baccalauréat",
-  "account.settings.field.education.levels.a": "Diplôme d'associé",
-  "account.settings.field.education.levels.hs": "Lycée / enseignement secondaire",
-  "account.settings.field.education.levels.jhs": "Collège / enseignement secondaire inférieur",
-  "account.settings.field.education.levels.el": "Enseignement primaire",
-  "account.settings.field.education.levels.none": "Sans diplôme",
-  "account.settings.field.education.levels.o": "Autre",
-  "account.settings.field.gender": "Genre",
-  "account.settings.field.gender.empty": "Ajouter le genre",
-  "account.settings.field.gender.options.empty": "Sélectionner un genre",
-  "account.settings.field.gender.options.f": "Femme",
-  "account.settings.field.gender.options.m": "Homme",
-  "account.settings.field.gender.options.o": "Autre",
-  "account.settings.field.language.proficiencies": "Langue parlée",
-  "account.settings.field.language.proficiencies.empty": "Ajouter une langue parlée",
-  "account.settings.field.language_proficiencies.options.empty": "Sélectionnez une langue",
-  "account.settings.field.time.zone": "Fuseau horaire",
-  "account.settings.field.time.zone.empty": "Définir le fuseau horaire",
-  "account.settings.field.time.zone.description": "Sélectionnez le fuseau horaire pour l'affichage des dates de cours. Si vous n'indiquez aucun fuseau horaire, les dates de cours, y compris les échéances de devoirs, seront affichés en fonction du fuseau horaire local de votre navigateur.",
-  "account.settings.field.time.zone.default": "Par défaut (Fuseau horaire local)",
-  "account.settings.field.time.zone.all": "Tous les fuseaux horaires",
-  "account.settings.field.time.zone.country": "Fuseaux horaires du pays",
-  "account.settings.section.social.media": "Liens vers les réseaux sociaux",
-  "account.settings.section.social.media.description": "Optionnellement, liez vos comptes personnels aux icônes des réseaux sociaux sur votre profil {siteName}.",
-  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Ajouter un profil LinkedIn",
-  "account.settings.jump.nav.delete.account": "Supprimer mon compte",
-  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Ajouter un profil Twitter",
-  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Ajouter un profil Facebook",
-  "account.settings.editable.field.action.save": "Sauvegarder",
-  "account.settings.editable.field.action.cancel": "Annuler",
-  "account.settings.editable.field.action.edit": "Modifier",
-  "account.settings.static.field.empty": "Aucune valeur définie. Contactez l'administrateur de votree {entreprise} pour effectuer des modifications.",
-  "account.settings.static.field.empty.no.admin": "Aucune valeur définie.",
-  "account.settings.field.name.certificate.select": "Si sélectionné, ce nom va apparaître sur vos attestations et dossiers publics.",
-  "account.settings.field.name.modal.certificate.title": "Choisissez le nom qui va apparaîtres sur vos attestations et dossiers publics.",
-  "account.settings.field.name.modal.certificate.select": "Sélectionnez un nom",
-  "account.settings.field.name.modal.certificate.option.full": "Nom complet",
-  "account.settings.field.name.modal.certificate.option.verified": "Nom vérifié",
-  "account.settings.field.name.modal.certificate.button.choose": "Choisissez un nom",
-  "account.settings.coaching.consent.welcome.header": "Commençons.",
-  "account.settings.coaching.consent.welcome.subheader": "Nous vous accompagnons du début jusqu'à la fin",
-  "account.settings.coaching.consent.description": "Un parcours MicroBachelors inclus du coaching avec un professionnel expériementé qui vous guidera sur votre carrière, votre éducation et comment atteindre vos objectifs. Si vous êtes intéressés, entrez les informations requises ci-dessous et cliquez \"Soumettre\". Un guide vous contactera par courriel ou texto pour vous aider à progresser. Termes et conditions s'appliquent. *",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Nos services de coaching sont inclus sans coût additionnel aux apprenant ayant un numéro de téléphone US. Le coaching comprend des textos récurrents. Le coût des messages et des données peuvent s'appliquer. Texter STOP pour arrêter.",
-  "account.settings.coaching.consent.accept-coaching": "S'inscrire pour le coaching.",
-  "account.settings.coaching.consent.decline-coaching": "Je préfère ne pas être contacté par les services de coaching gratuit.",
-  "account.settings.coaching.consent.label.name": "Veuillez confirmer votre nom",
-  "account.settings.coaching.consent.label.phone-number": "Entrer un numéro de cellulaire",
-  "account.settings.coaching.consent.success.header": "Opération réussie!",
-  "account.settings.coaching.consent.success.message": "Vous êtes inscrit au coaching. Vous pouvez vous attendre à un message par courriel ou SMS dans les prochains jours.",
-  "account.settings.coaching.consent.success.continue": "Commencer mon cours",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Votre nom est géré par {managerTitle}. Contactez votre administrateur pour obtenir de l'aide.",
-  "account.settings.field.phone_number": "Numéro de téléphone",
-  "account.settings.field.phone_number.empty": "Ajouter un numéro de téléphone",
-  "account.settings.field.coaching_consent": "Consentement pour le coaching",
-  "account.settings.field.coaching_consent.tooltip": "Un parcours MicroBachelors inclus du coaching par texto avec un professionnel expériementé qui vous aidera à combiner votre expérience éducationnelle et vos objectifs de carrière. Les services de coaching sont inclus sans coût additionnel aux apprenant ayant un numéro de téléphone US. Le coût standard des textos s'applique. Texter 'STOP' en tout temp pour arrêter les messages.",
-  "account.settings.field.coaching_consent.error": "Un numéro de téléphone US valide est requis pour s'inscrire pour du coaching",
-  "account.settings.delete.account.before.proceeding": "Avant de continuer, veuillez {actionLink}.",
-  "account.settings.delete.account.header": "Supprimer mon compte",
-  "account.settings.delete.account.subheader": "Nous sommes désolés de vous voir quitter!",
-  "account.settings.delete.account.text.1": "Veuillez noter que la suppression de votre compte et de vos données personnelles est permanente et ne peut être annulée. {siteName} ne pourra pas récupérer votre compte ou les données supprimées.",
-  "account.settings.delete.account.text.2": "Une fois votre compte supprimé, vous ne pourrez plus l'utiliser pour suivre des cours sur {siteName}.",
-  "account.settings.delete.account.text.2.edX": "Une fois votre compte supprimé, vous ne pouvez pas l'utiliser pour suivre des cours sur l'application EDUlib, edulib.org ou sur tout autre site hébergé par EDUlib. Cela inclut l'accès à edulib.org depuis le système de votre employeur ou de votre université et l'accès à des sites privés offerts par MIT Open Learning, Wharton Executive Education et Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "Suivez ces instructions pour imprimer ou télécharger une attestation",
-  "account.settings.delete.account.text.warning": "Avertissement : la suppression d'un compte est permanente. Veuillez lire attentivement ce qui précède avant de continuer. Cette action est irréversible et vous ne pourrez plus utiliser la même adresse courriel sur {siteName}.",
-  "account.settings.delete.account.text.change.instead": "Vous souhaitez modifier votre adresse électronique, votre nom ou votre mot de passe?",
-  "account.settings.delete.account.button": "Supprimer mon compte",
-  "account.settings.delete.account.please.activate": "activez votre compte",
-  "account.settings.delete.account.please.confirm": "confirmer votre compte",
-  "account.settings.delete.account.please.unlink": "dissocier tous les comptes de réseaux sociaux",
-  "account.settings.delete.account.modal.header": "Êtes-vous certain ?",
-  "account.settings.delete.account.modal.text.1": "Vous avez sélectionné \"Supprimer mon compte\". La suppression de votre compte et de vos données personnelles est permanente et ne peut être annulée. {siteName} ne pourra ni récupérer votre compte ni les données supprimées.",
-  "account.settings.delete.account.modal.text.2": "Si vous continuez, vous ne pourrez plus utiliser ce compte pour suivre des cours sur {siteName}.",
-  "account.settings.delete.account.modal.text.2.edX": "Si vous continuez, vous ne pourrez plus utiliser ce compte pour suivre des cours sur l'application EDUlib, edulib.org ou sur tout autre site hébergé par EDUlib. Cela inclut l'accès à edulib.org depuis le système de votre employeur ou de votre université et l'accès à des sites privés offerts par MIT Open Learning, Wharton Executive Education et Harvard Medical School.",
-  "account.settings.delete.account.modal.enter.password": "Si vous souhaitez continuer et supprimer votre compte, veuillez entrer le mot de passe de votre compte :",
-  "account.settings.delete.account.modal.confirm.delete": "Oui, supprimer",
-  "account.settings.delete.account.modal.confirm.cancel": "Annuler",
-  "account.settings.delete.account.error.unable.to.delete": "Impossible de supprimer le compte",
-  "account.settings.delete.account.error.no.password": "Un mot de passe est requis",
-  "account.settings.delete.account.error.invalid.password": "Mot de passe incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Désolé, une erreur s'est produite lors du traitement de votre demande. Veuillez réessayer plus tard.",
-  "account.settings.delete.account.modal.after.header": "Nous sommes désolés de vous voir quitter! Votre compte sera bientôt supprimé.",
-  "account.settings.delete.account.modal.after.text": "La suppression du compte, y compris la suppression des listes de diffusion, peut prendre quelques semaines pour être entièrement traitée via notre système. Si vous souhaitez désactiver les courriels avant cette date, veuillez vous désabonner du bas de page de chaque courriel.",
-  "account.settings.delete.account.modal.after.button": "Fermer",
-  "account.settings.delete.account.text.3.edX": "Vous pouvez également perdre l'accès aux attestations vérifiées et à d'autres informations d'identification de programme, comme les attestations MicroMasters. Vous pouvez en faire une copie pour vos dossiers avant de procéder à la suppression. {actionLink}.",
-  "account.settings.delete.account.text.3": "Vous pouvez également perdre accès aux attestations vérifiées et à d'autres informations d'identification de programme. Vous pouvez en faire une copie pour vos dossiers avant de procéder à la suppression.",
-  "account.settings.message.demographics.service.issue": "Une erreur s'est produite lors de la tentative de récupération ou de sauvegarde des informations de votre compte. Veuillez réessayer plus tard.",
-  "account.settings.field.demographics.gender": "Identité de genre",
-  "account.settings.field.demographics.gender.empty": "Ajouter une identité de genre",
-  "account.settings.field.demographics.gender.options.empty": "Sélectionnez une identité de genre",
-  "account.settings.field.demographics.gender_description": "Description de l'identité de genre",
-  "account.settings.field.demographics.gender_description.empty": "Entrez la description",
-  "account.settings.field.demographics.ethnicity": "Identité raciale / ethnique",
-  "account.settings.field.demographics.ethnicity.empty": "Ajouter une identité raciale / ethnique",
-  "account.settings.field.demographics.ethnicity.options.empty": "Sélectionnez tout ce qui s'y rapporte",
-  "account.settings.field.demographics.income": "Revenu familial",
-  "account.settings.field.demographics.income.empty": "Ajouter le revenu familial",
-  "account.settings.field.demographics.income.options.empty": "Sélectionnez une fourchette de revenu familial",
-  "account.settings.field.demographics.military_history": "Statut militaire U.S.",
-  "account.settings.field.demographics.military_history.empty": "Ajouter un statut militaire",
-  "account.settings.field.demographics.military_history.options.empty": "Sélectionnez un statut militaire",
-  "account.settings.field.demographics.learner_education_level": "Votre niveau d'études",
-  "account.settings.field.demographics.learner_education_level.empty": "Ajouter un niveau d'études",
-  "account.settings.field.demographics.parent_education_level": "Niveau d'études des parents / tuteurs",
-  "account.settings.field.demographics.parent_education_level.empty": "Ajouter un niveau d'études",
-  "account.settings.field.demographics.education_level.options.empty": "Sélectionnez le niveau d'études",
-  "account.settings.field.demographics.work_status": "Statut d'emploi",
-  "account.settings.field.demographics.work_status.empty": "Ajouter un statut d'emploi",
-  "account.settings.field.demographics.work_status.options.empty": "Sélectionnez le statut d'emploi",
-  "account.settings.field.demographics.work_status_description": "Description du statut d'emploi",
-  "account.settings.field.demographics.work_status_description.empty": "Entrez la description",
-  "account.settings.field.demographics.current_work_sector": "Secteur d'emploi actuel",
-  "account.settings.field.demographics.current_work_sector.empty": "Ajouter le secteur d'emploi",
-  "account.settings.field.demographics.future_work_sector": "Secteur d'emploi futur",
-  "account.settings.field.demographics.future_work_sector.empty": "Ajouter le secteur d'emploi",
-  "account.settings.field.demographics.work_sector.options.empty": "Sélectionnez un secteur d'emploi",
-  "account.settings.section.demographics.why": "Pourquoi est-ce que {siteName} collecte ces informations ?",
-  "account.settings.name.change.title.id": "Ce changement de nom requiert une vérification d'identité",
-  "account.settings.name.change.title.begin": "Avant que l'on commençe",
-  "account.settings.name.change.warning.one": "Attention : Cette action change le nom apparaissant sur toutes les attestations qui ont été obtenues sur ce compte par le passé, toutes les attestations que vous obtenez présentement ainsi que toutes celles que vous obtiendriez.",
-  "account.settings.name.change.warning.two": "Cette action ne peut pas être renversée sans vérification d'identité.",
-  "account.settings.name.change.id.name.label": "Entrez votre nom tel qu'il apparaît sur votre carte d'étudiant, de travail ou d'identité émise par le gouvernement.",
-  "account.settings.name.change.id.name.placeholder": "Entrez le nom sur votre pièce d'identité avec photo",
-  "account.settings.name.change.error.valid.name": "Entrez un nom valide.",
-  "account.settings.name.change.error.general": "Une erreur est survenue. Veuillez réessayer.",
-  "account.settings.name.change.continue": "Continuer",
-  "account.settings.name.change.cancel": "Annuler",
-  "error.notfound.message": "La page que vous recherchez n'est pas disponible ou il y a une erreur dans l'URL. Veuillez vérifier l'URL et réessayer.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "support technique",
-  "account.settings.editable.field.password.reset.button.confirmation": "Nous avons envoyé un message à {email}. Cliquez sur le lien dans le message pour réinitialiser votre mot de passe. Vous n'avez pas reçu le message? Contactez {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Réinitialiser le mot de passe",
-  "account.settings.editable.field.password.reset.button.forbidden": "Votre demande précédente est en cours, veuillez réessayer dans quelques instants.",
-  "account.settings.editable.field.password.reset.label": "Mot de passe",
-  "account.settings.sso.link.account": "Se connecter avec {name}",
-  "account.settings.sso.account.connected": "Lié",
-  "account.settings.sso.account.disconnect.error": "Un problème est survenu lors de la déconnexion de ce compte. Contactez le support si le problème persiste.",
-  "account.settings.sso.unlink.account": "Dissocier le compte {name}",
-  "account.settings.sso.no.providers": "Aucun compte ne peut être lié pour le moment.",
-  "account.page.title": "Compte | {siteName}",
-  "id.verification.access.blocked.denied": "Nous ne pouvons pas vérifier votre identité en ce moment. Si vous n'avez pas encore activé votre compte, veuillez regarder dans vos pourriels pour trouver le courriel d'activation provenant de {email}.",
-  "id.verification.next": "Suivant",
-  "id.verification.support": "support",
-  "id.verification.example.card.alt": "Exemple de pièce d'identité valide avec un nom complet et une photo.",
-  "id.verification.requirements.title": "Exigences de vérification des photos",
-  "id.verification.requirements.description": "Afin de procéder à la vérification des photos, vous aurez besoin des éléments suivants :",
-  "id.verification.requirements.card.device.title": "Appareil avec caméra",
-  "id.verification.requirements.card.device.allow": "Permettre",
-  "id.verification.requirements.card.id.title": "Pièce d'identité avec photo",
-  "id.verification.requirements.card.id.text": "Vous avez besoin d'une pièce d'identité valide contenant votre nom complet et votre photo, exemple : un permis de conduire ou un passeport.",
-  "id.verification.privacy.title": "Information sur la confidentialité",
-  "id.verification.privacy.need.photo.question": "Pourquoi est-ce que {siteName} a besoin de ma photo?",
-  "id.verification.privacy.need.photo.answer": "Nous utilisons vos photos de vérification pour confirmer votre identité et assurer la validité de votre attestation.",
-  "id.verification.privacy.do.with.photo.question": "Qu'est-ce que {siteName} fait avec cette photo?",
-  "id.verification.privacy.do.with.photo.answer": "Nous encryptons votre photo et l'envoyons à notre service d'autorisation pour examen. Votre photo et vos informations ne sont ni enregistrées ni visibles sur {siteName} une fois le processus de vérification est terminé.",
-  "id.verification.access.blocked.title": "Vérification d'identité",
-  "id.verification.access.blocked.enrollment": "Vous n'êtes actuellement pas inscrit à un cours nécessitant une vérification d'identité.",
-  "id.verification.access.blocked.pending": "Vous avez déjà soumis vos informations de vérification. Vous verrez un message sur votre tableau de bord lorsque le processus de vérification sera terminé (généralement dans les 5 jours).",
-  "id.verification.photo.take": "Prendre une photo",
-  "id.verification.photo.retake": "Reprendre la photo ?",
-  "id.verification.photo.enable.detection": "Activer la détection des visages",
-  "id.verification.photo.enable.detection.portrait.help.text": "Si coché, une case apparaîtra autour de votre visage. Votre visage peut être vu clairement si la boîte qui l'entoure est bleue. Si votre visage n'est pas dans une bonne position ou indétectable, la case sera rouge.",
-  "id.verification.photo.enable.detection.id.help.text": "Si coché, une case apparaîtra autour du visage sur votre pièce d'identité. Le visage peut être vu clairement si la boîte qui l'entoure est bleue. Si le visage n'est pas dans une bonne position ou indétectable, la case sera rouge.",
-  "id.verification.photo.feedback.correct": "Le visage est en bonne position.",
-  "id.verification.photo.feedback.two.faces": "Plus d'un visage détecté.",
-  "id.verification.photo.feedback.no.faces": "Aucun visage détecté.",
-  "id.verification.photo.feedback.top.left": "Position incorrecte. En haut à gauche.",
-  "id.verification.photo.feedback.top.center": "Position incorrecte. En haut au centre.",
-  "id.verification.photo.feedback.top.right": "Position incorrecte. En haut à droite.",
-  "id.verification.photo.feedback.center.left": "Position incorrecte. Centre gauche.",
-  "id.verification.photo.feedback.center.center": "Position incorrecte. Trop près de la caméra.",
-  "id.verification.photo.feedback.center.right": "Position incorrecte. Centre droit.",
-  "id.verification.photo.feedback.bottom.left": "Position incorrecte. En bas à gauche.",
-  "id.verification.photo.feedback.bottom.center": "Position incorrecte. En bas au centre.",
-  "id.verification.photo.feedback.bottom.right": "Position incorrecte. En bas à droite.",
-  "id.verification.camera.access.title": "Autorisations de la caméra",
-  "id.verification.camera.access.title.success": "Accès à la caméra activé",
-  "id.verification.camera.access.title.failed": "L'accès à la caméra a échoué",
-  "id.verification.camera.access.click.allow": "Veuillez vous assurer de cliquer sur \"Autoriser\"",
-  "id.verification.camera.access.enable": "Activer la caméra",
-  "id.verification.camera.access.problems": "Vous avez des problèmes?",
-  "id.verification.camera.access.skip": "Ignorer et télécharger les fichiers image au lieu",
-  "id.verification.camera.access.success": "Il semble que votre appareil photo fonctionne et est prêt.",
-  "id.verification.camera.access.failure": "Il semble que nous ne puissions pas accéder à votre caméra. Vous devrez télécharger des fichiers image de vous et de votre pièce d'identité.",
-  "id.verification.camera.access.failure.temporary": "Il semblerait que nous ne pouvons pas accéder à votre caméra. Vérifiez qu'elle est bien connectée et que votre navigateur est autorisé à y accéder.",
-  "id.verification.camera.access.failure.temporary.chrome": "Pour activer l'accès à la caméra dans Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Ouvrir Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Accédez à Plus> Paramètres.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "Pour Windows: Alt+F, Alt+E ou F10 suivi de la barre d'espace",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "Pour Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Sous l'onglet «Confidentialité et sécurité», sélectionnez «Paramètres du site», puis «Appareil photo».",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Sous \"Bloqué\", recherchez \"edulib.org\" et sélectionnez-le.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "Dans la section \"Autorisations\", mettez à jour les autorisations de la caméra pour \"Autoriser\".",
-  "id.verification.camera.access.failure.temporary.ie11": "Pour activer l'accès à la caméra dans Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Ouvrez le Gestionnaire des paramètres de Flash Player en accédant à Paramètres Windows> Panneau de configuration> Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Sélectionnez l'onglet \"Caméra et micro\", puis sélectionnez le bouton \"Paramètres de la caméra et du microphone par site\".",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choisissez \"edulib.org\" dans la liste des sites Web et modifiez les autorisations en sélectionnant \"Autoriser\" dans le menu déroulant.",
-  "id.verification.camera.access.failure.temporary.firefox": "Pour activer l'accès à la caméra dans Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Ouvrez Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Saisissez \"about:preferences\" dans la barre d'URL.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Sélectionnez l'onglet \"Confidentialité et sécurité\" et accédez à la section \"Autorisations\".",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "À côté de \"Appareil photo\", sélectionnez le bouton \"Paramètres…\".",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "Dans la barre de recherche, saisissez \"edulib.org\".",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "Dans la colonne d'état de \"edulib.org\", sélectionnez \"Autoriser\" dans le menu déroulant.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Sélectionnez \"Enregistrer les modifications\".",
-  "id.verification.camera.access.failure.temporary.safari": "Pour activer l'accès à la caméra dans Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Ouvrir Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Cliquez sur le menu de l'application Safari, puis sélectionnez \"Préférences\". Vous pouvez également utiliser Command+ comme raccourci clavier.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Sélectionnez l'onglet \"Sites Web\", puis sélectionnez \"Appareil photo\".",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Sélectionnez \"edulib.org\" et modifiez les autorisations de la caméra pour \"Autoriser\".",
-  "id.verification.camera.access.failure.unsupported": "Il semble que votre fureteur ne prend pas en charge l'accès à la caméra.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "Le fureteur Chrome ne prend actuellement pas en charge l'accès à la caméra sur les appareils iOS, tels que les iPhones et les iPad.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Veuillez utiliser un autre navigateur pour terminer la vérification d'identité.",
-  "id.verification.photo.tips.title": "Conseils photo utiles",
-  "id.verification.photo.tips.description": "Ensuite, nous aurons besoin de vous preniez une photo de votre visage. Veuillez consulter les conseils utiles ci-dessous.",
-  "id.verification.photo.tips.list.title": "Conseils photo",
-  "id.verification.photo.tips.list.description": "Pour prendre une bonne photo, assurez-vous que : ",
-  "id.verification.photo.tips.list.well.lit": "votre visage est bien éclairé.",
-  "id.verification.photo.tips.list.inside.frame": "Votre visage est entièrement dans le cadre.",
-  "id.verification.portrait.photo.title.camera": "Prenez une photo de vous",
-  "id.verification.portrait.photo.instructions.camera": "Lorsque votre visage est en position, utilisez le bouton Prendre une photo ci-dessous pour prendre votre photo.",
-  "id.verification.camera.help.sight.question": "Que faire si je ne peux pas voir l'image de la caméra ou si je ne peux pas voir ma photo pour déterminer quel côté est visible?",
-  "id.verification.camera.help.sight.answer.portrait": "Vous pourrez peut-être terminer la procédure de capture d'image sans aide, mais cela peut prendre quelques tentatives de soumission pour obtenir le bon positionnement de la caméra. Le positionnement optimal de la caméra varie avec chaque ordinateur, mais généralement la meilleure position pour une prise de vue de la tête est d'environ 12-18 pouces (30-45 centimètres) de la caméra, la tête étant centrée par rapport à l'écran de l'ordinateur. Si les photos que vous soumettez sont rejetées, essayez de déplacer l’orientation de l’ordinateur ou de l’appareil photo pour modifier l’angle d’éclairage.",
-  "id.verification.camera.help.sight.answer.id": "Vous pourrez peut-être terminer la procédure de capture d'image sans aide, mais cela peut prendre quelques tentatives de soumission pour obtenir le bon positionnement de la caméra. Le positionnement optimal de la caméra varie avec chaque ordinateur, mais généralement, la meilleure position pour une photo d'une pièce d'identité est de 8-12 pouces (20-30 centimètres) de la caméra, la pièce d'identité étant centrée par rapport à la caméra. Si les photos que vous soumettez sont rejetées, essayez de déplacer l’orientation de l’ordinateur ou de l’appareil photo pour modifier l’angle d’éclairage. La raison la plus courante de rejet est l'incapacité de lire le texte sur la pièce d'identité.",
-  "id.verification.camera.help.difficulty.question.portrait": "Que faire si j'ai de la difficulté à tenir ma tête en position relativement à la caméra ?",
-  "id.verification.camera.help.difficulty.question.id": "Que faire si j'ai de la difficulté à tenir ma pièce d'identité en position relativement à la caméra ?",
-  "id.verification.camera.help.difficulty.answer": "Si vous avez besoin d'aide pour prendre une photo à soumettre, contactez le support {siteName} pour des suggestions supplémentaires.",
-  "id.verification.id.photo.unclear.question": "L'image de votre pièce d'identité n'est pas claire ou trop floue ?",
-  "id.verification.id.tips.title": "Conseils utiles pour les pièces d'identité",
-  "id.verification.id.tips.description": "Ensuite, nous vous demanderons de prendre une photo d'une pièce d'identité valide comportant votre nom complet et votre photo, exemple : un permis de conduire ou un passeport. Veuillez préparer votre pièce d'identité.",
-  "id.verification.id.tips.list.well.lit": "Votre pièce d'identité est bien éclairée.",
-  "id.verification.id.tips.list.clear": "Assurez-vous que vous pouvez voir votre photo et lire clairement votre nom.",
-  "id.verification.id.photo.title.camera": "Prenez une photo de votre pièce d'identité",
-  "id.verification.id.photo.title.upload": "Téléversez une photo de votre pièce d'identité",
-  "id.verification.id.photo.preview.alt": "Aperçu de la pièce d'identité avec photo.",
-  "id.verification.id.photo.instructions.camera": "Lorsque votre pièce d'identité est en place, utilisez le bouton Prendre une photo ci-dessous pour prendre votre photo. Veuillez utiliser un passeport, un permis de conduire ou une autre pièce d'identité comportant votre nom complet et une photo de votre visage.",
-  "id.verification.id.photo.instructions.upload": "Veuillez téléverser une photo de votre pièce d'identité. Assurez-vous que la totalité de la pièce d'identité rentre dans le cadre et qu'elle est bien éclairée. La taille du fichier doit être inférieure à 10 Mo. Formats pris en charge : ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "Le fichier que vous avez sélectionné n'est pas un type d'image pris en charge. Veuillez choisir parmi les formats suivants :",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "Le fichier que vous avez sélectionné est trop volumineux. Veuillez réessayer avec un fichier de moins de 10 Mo.",
-  "id.verification.name.check.title": "Vérifiez votre nom",
-  "id.verification.name.check.instructions": "Le nom ci-dessous correspond-il au nom sur votre pièce d'identité avec photo ? Si ce n'est pas le cas, mettez à jour le nom ci-dessous pour qu'il corresponde à votre pièce d'identité avec photo.",
-  "id.verification.name.check.mismatch.information": "Si le nom ci-dessous ne correspond pas à votre pièce d'identité avec photo, votre vérification d'identité sera refusée.",
-  "id.verification.name.error": "Veuillez entrer votre nom tel qu'il apparaît sur votre pièce d'identité avec photo.",
-  "id.verification.account.name.warning.prefix": "Veuillez noter:",
-  "id.verification.account.name.settings": "Paramètres du compte",
-  "id.verification.name.label": "Nom",
-  "id.verification.account.name.photo.alt": "Photo de votre pièce d'identité à soumettre.",
-  "id.verification.review.title": "Vérifiez vos photos",
-  "id.verification.review.description": "Assurez-vous que nous pourrons vérifier votre identité avec les photos et les informations fournies.",
-  "id.verification.review.portrait.label": "Votre portrait",
-  "id.verification.review.portrait.alt": "Photo de votre visage à soumettre.",
-  "id.verification.review.portrait.retake": "Reprendre la photo de portrait",
-  "id.verification.review.id.label": "Votre pièce d'identité",
-  "id.verification.review.id.alt": "Photo à soumettre de votre pièce d'identité.",
-  "id.verification.review.id.retake": "Reprendre la photo de la pièce d'identité",
-  "id.verification.review.confirm": "Soumettre",
-  "id.verification.submission.alert.error.face": "Une photo de votre visage est requise. Veuillez reprendre votre photo de portrait.",
-  "id.verification.submission.alert.error.id": "Une photo de votre pièce d'identité est requise. Veuillez reprendre votre photo d'identité.",
-  "id.verification.submission.alert.error.name": "Un nom de compte valide est requis. Veuillez mettre à jour le nom de votre compte pour qu'il corresponde au nom sur votre pièce d'identité.",
-  "id.verification.submission.alert.error.unsupported": "Un ou plusieurs des fichiers que vous avez téléchargés sont dans un format non pris en charge. Veuillez choisir parmi les formats suivants :",
-  "id.verification.review.error": "Page de Support {siteName}",
-  "id.verification.submitted.title": "Vérification d'identité en cours",
-  "id.verification.submitted.text": "Nous avons reçu vos informations et vérifions votre identité. Vous serez averti lorsque le processus de vérification sera terminé (généralement dans les 5 jours). En attendant, vous pouvez toujours accéder à tous les contenus de cours disponibles.",
-  "id.verification.return.dashboard": "Retour à votre tableau de bord",
-  "id.verification.return.course": "Revenir au cours",
-  "id.verification.return.generic": "Retour",
-  "id.verification.photo.upload.help.title": "Téléchargez une photo à la place",
-  "id.verification.photo.camera.help.title": "Utilisez votre appareil photo à la place",
-  "id.verification.photo.upload.help.text": "Si vous rencontrez des difficultés lors de l'utilisation de la capture de photo ci-dessus, vous souhaiterez peut-être télécharger une photo à la place. Pour télécharger une photo, cliquez sur le bouton ci-dessous.",
-  "id.verification.photo.camera.help.text": "Si vous rencontrez des difficultés pour télécharger une photo ci-dessus, vous pouvez utiliser votre appareil photo à la place. Pour utiliser votre appareil photo, cliquez sur le bouton ci-dessous.",
-  "id.verification.upload.help.button": "Passer en mode de téléchargement",
-  "id.verification.camera.help.button": "Passer en mode caméra",
-  "id.verification.request.camera.access.instructions": "Afin de prendre une photo à l'aide de votre webcam, vous pouvez recevoir une invite du navigateur pour accéder à votre caméra. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Les paramètres de votre compte sont gérés par {managerTitle}. Si le nom sur votre pièce d'identité avec photo ne correspond pas au nom de votre compte, veuillez contacter votre administrateur {profileDataManager} ou {support} pour obtenir de l'aide avant de terminer le processus de vérification des photos.",
-  "id.verification.requirements.card.device.text": "Vous avez besoin d'un appareil équipé d'une caméra. Si vous recevez une invite du navigateur pour accéder à votre caméra, assurez-vous de cliquer sur {allow}.",
-  "id.verification.account.name.summary.alert": "Les paramètres de votre compte sont gérés par {managerTitle}. Si le nom sur votre pièce d'identité avec photo ne correspond pas au nom de votre compte, veuillez contacter votre administrateur {profileDataManager} ou {support} pour obtenir de l'aide.",
-  "idv.submission.alert.error": "\n          Nous avons rencontré une erreur technique en essayant de soumettre la vérification d'identité.\n          Il peut s'agir d'un problème temporaire. Veuillez réessayer dans quelques minutes.\n          Si le problème persiste, veuillez consulter {support_link} pour obtenir de l'aide.\n        ",
-  "id.verification.account.name.edit": "Modifier {sr}"
-}
--- a/src/i18n/messages/he.json
+++ b/src/i18n/messages/he.json
@@ -0,0 +1,11 @@
+{
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
+}
--- a/src/i18n/messages/hi.json
+++ b/src/i18n/messages/hi.json
@@ -1,361 +0,0 @@
-{
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
-  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
-  "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Account Settings",
-  "account.settings.loading.message": "Loading...",
-  "account.settings.loading.error": "Error: {error}",
-  "account.settings.banner.beta.language": "You have set your language to {beta_language}, which is currently not fully translated. You can help us translate this language fully by joining the Transifex community and adding translations from English for learners that speak {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Help Translate into {beta_language}",
-  "account.settings.section.account.information": "Account Information",
-  "account.settings.section.account.information.description": "These settings include basic information about your account.",
-  "account.settings.section.profile.information": "Profile Information",
-  "account.settings.section.demographics.information": "Optional Information",
-  "account.settings.section.site.preferences": "Site Preferences",
-  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
-  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
-  "account.settings.field.full.name": "Full name",
-  "account.settings.field.full.name.empty": "Add name",
-  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified": "Verified name",
-  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.",
-  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
-  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
-  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
-  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
-  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
-  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
-  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
-  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
-  "account.settings.field.email": "Email address (Sign in)",
-  "account.settings.field.email.empty": "Add email address",
-  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
-  "account.settings.field.secondary.email": "Recovery email address",
-  "account.settings.field.secondary.email.empty": "Add a recovery email address",
-  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
-  "account.settings.email.field.confirmation.header": "Pending confirmation",
-  "account.settings.field.dob": "Year of birth",
-  "account.settings.field.dob.empty": "Add year of birth",
-  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.dob.month": "Month",
-  "account.settings.field.dob.year": "Year",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Please confirm your date of birth",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
-  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
-  "account.settings.field.country": "Country",
-  "account.settings.field.country.empty": "Add country",
-  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
-  "account.settings.field.site.language": "Site language",
-  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
-  "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Add level of education",
-  "account.settings.field.education.levels.empty": "Select a level of education",
-  "account.settings.field.education.levels.p": "Doctorate",
-  "account.settings.field.education.levels.m": "Master's or professional degree",
-  "account.settings.field.education.levels.b": "Bachelor's Degree",
-  "account.settings.field.education.levels.a": "Associate's degree",
-  "account.settings.field.education.levels.hs": "Secondary/high school",
-  "account.settings.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "account.settings.field.education.levels.el": "Elementary/primary school",
-  "account.settings.field.education.levels.none": "No formal education",
-  "account.settings.field.education.levels.o": "Other education",
-  "account.settings.field.gender": "Gender",
-  "account.settings.field.gender.empty": "Add gender",
-  "account.settings.field.gender.options.empty": "Select a gender",
-  "account.settings.field.gender.options.f": "Female",
-  "account.settings.field.gender.options.m": "Male",
-  "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken language",
-  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
-  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
-  "account.settings.field.time.zone": "Time zone",
-  "account.settings.field.time.zone.empty": "Set time zone",
-  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
-  "account.settings.field.time.zone.default": "Default (Local Time Zone)",
-  "account.settings.field.time.zone.all": "All time zones",
-  "account.settings.field.time.zone.country": "Country time zones",
-  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
-  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
-  "account.settings.jump.nav.delete.account": "Delete My Account",
-  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
-  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
-  "account.settings.editable.field.action.save": "Save",
-  "account.settings.editable.field.action.cancel": "Cancel",
-  "account.settings.editable.field.action.edit": "Edit",
-  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
-  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
-  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
-  "account.settings.field.name.modal.certificate.select": "Select a name",
-  "account.settings.field.name.modal.certificate.option.full": "Full Name",
-  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
-  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Phone Number",
-  "account.settings.field.phone_number.empty": "Add a phone number",
-  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
-  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
-  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
-  "account.settings.delete.account.header": "Delete My Account",
-  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
-  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
-  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
-  "account.settings.delete.account.button": "Delete My Account",
-  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.confirm": "confirm your account",
-  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
-  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
-  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
-  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
-  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
-  "account.settings.delete.account.error.unable.to.delete": "Unable to delete account",
-  "account.settings.delete.account.error.no.password": "A password is required",
-  "account.settings.delete.account.error.invalid.password": "Password is incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Sorry, there was an error trying to process your request. Please try again later.",
-  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
-  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
-  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
-  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
-  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
-  "account.settings.field.demographics.gender": "Gender identity",
-  "account.settings.field.demographics.gender.empty": "Add gender identity",
-  "account.settings.field.demographics.gender.options.empty": "Select a gender identity",
-  "account.settings.field.demographics.gender_description": "Gender identity description",
-  "account.settings.field.demographics.gender_description.empty": "Enter description",
-  "account.settings.field.demographics.ethnicity": "Race/Ethnicity identity",
-  "account.settings.field.demographics.ethnicity.empty": "Add race/ethnicity identity",
-  "account.settings.field.demographics.ethnicity.options.empty": "Select all that apply",
-  "account.settings.field.demographics.income": "Family income",
-  "account.settings.field.demographics.income.empty": "Add family income",
-  "account.settings.field.demographics.income.options.empty": "Select a family income range",
-  "account.settings.field.demographics.military_history": "U.S. Military status",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
-  "account.settings.field.demographics.military_history.options.empty": "Select military status",
-  "account.settings.field.demographics.learner_education_level": "Your education level",
-  "account.settings.field.demographics.learner_education_level.empty": "Add education level",
-  "account.settings.field.demographics.parent_education_level": "Parents/Guardians education level",
-  "account.settings.field.demographics.parent_education_level.empty": "Add education level",
-  "account.settings.field.demographics.education_level.options.empty": "Select education level",
-  "account.settings.field.demographics.work_status": "Employment status",
-  "account.settings.field.demographics.work_status.empty": "Add employment status",
-  "account.settings.field.demographics.work_status.options.empty": "Select employment status",
-  "account.settings.field.demographics.work_status_description": "Employment status description",
-  "account.settings.field.demographics.work_status_description.empty": "Enter description",
-  "account.settings.field.demographics.current_work_sector": "Current work industry",
-  "account.settings.field.demographics.current_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.future_work_sector": "Future work industry",
-  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
-  "account.settings.name.change.title.id": "This name change requires identity verification",
-  "account.settings.name.change.title.begin": "Before we begin",
-  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
-  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
-  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
-  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
-  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
-  "account.settings.name.change.continue": "Continue",
-  "account.settings.name.change.cancel": "Cancel",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
-  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
-  "account.settings.editable.field.password.reset.label": "Password",
-  "account.settings.sso.link.account": "Sign in with {name}",
-  "account.settings.sso.account.connected": "Linked",
-  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "account.page.title": "Account | {siteName}",
-  "id.verification.access.blocked.denied": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
-  "id.verification.next": "Next",
-  "id.verification.support": "support",
-  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
-  "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
-  "id.verification.requirements.card.device.title": "Device with Camera",
-  "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification Card",
-  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
-  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
-  "id.verification.access.blocked.title": "Identity Verification",
-  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
-  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
-  "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo?",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
-  "id.verification.camera.access.title": "Camera Permissions",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
-  "id.verification.camera.access.click.allow": "Please make sure to click \"Allow\"",
-  "id.verification.camera.access.enable": "Enable Camera",
-  "id.verification.camera.access.problems": "Having problems?",
-  "id.verification.camera.access.skip": "Skip and upload image files instead",
-  "id.verification.camera.access.success": "Looks like your camera is working and ready.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
-  "id.verification.photo.tips.title": "Helpful Photo Tips",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful Identification Card Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
-  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
-  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.name.label": "Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Identification Card",
-  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.submission.alert.error.face": "A photo of your face is required. Please retake your portrait photo.",
-  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
-  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
-  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "{siteName} Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.return.generic": "Return",
-  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
-  "idv.submission.alert.error": "\n          We encountered a technical error while trying to submit ID verification.\n          This might be a temporary issue, so please try again in a few minutes.\n          If the problem persists, please go to {support_link} for help.\n        ",
-  "id.verification.account.name.edit": "Edit {sr}"
-}
--- a/src/i18n/messages/id.json
+++ b/src/i18n/messages/id.json
@@ -0,0 +1,11 @@
+{
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
+}
--- a/src/i18n/messages/it.json
+++ b/src/i18n/messages/it.json
@@ -1,361 +0,0 @@
-{
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
-  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
-  "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Account Settings",
-  "account.settings.loading.message": "Loading...",
-  "account.settings.loading.error": "Error: {error}",
-  "account.settings.banner.beta.language": "You have set your language to {beta_language}, which is currently not fully translated. You can help us translate this language fully by joining the Transifex community and adding translations from English for learners that speak {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Help Translate into {beta_language}",
-  "account.settings.section.account.information": "Account Information",
-  "account.settings.section.account.information.description": "These settings include basic information about your account.",
-  "account.settings.section.profile.information": "Profile Information",
-  "account.settings.section.demographics.information": "Optional Information",
-  "account.settings.section.site.preferences": "Site Preferences",
-  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
-  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
-  "account.settings.field.full.name": "Full name",
-  "account.settings.field.full.name.empty": "Add name",
-  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified": "Verified name",
-  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.",
-  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
-  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
-  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
-  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
-  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
-  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
-  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
-  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
-  "account.settings.field.email": "Email address (Sign in)",
-  "account.settings.field.email.empty": "Add email address",
-  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
-  "account.settings.field.secondary.email": "Recovery email address",
-  "account.settings.field.secondary.email.empty": "Add a recovery email address",
-  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
-  "account.settings.email.field.confirmation.header": "Pending confirmation",
-  "account.settings.field.dob": "Year of birth",
-  "account.settings.field.dob.empty": "Add year of birth",
-  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.dob.month": "Month",
-  "account.settings.field.dob.year": "Year",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Please confirm your date of birth",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
-  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
-  "account.settings.field.country": "Country",
-  "account.settings.field.country.empty": "Add country",
-  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
-  "account.settings.field.site.language": "Site language",
-  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
-  "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Add level of education",
-  "account.settings.field.education.levels.empty": "Select a level of education",
-  "account.settings.field.education.levels.p": "Doctorate",
-  "account.settings.field.education.levels.m": "Master's or professional degree",
-  "account.settings.field.education.levels.b": "Bachelor's Degree",
-  "account.settings.field.education.levels.a": "Associate's degree",
-  "account.settings.field.education.levels.hs": "Secondary/high school",
-  "account.settings.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "account.settings.field.education.levels.el": "Elementary/primary school",
-  "account.settings.field.education.levels.none": "No formal education",
-  "account.settings.field.education.levels.o": "Other education",
-  "account.settings.field.gender": "Gender",
-  "account.settings.field.gender.empty": "Add gender",
-  "account.settings.field.gender.options.empty": "Select a gender",
-  "account.settings.field.gender.options.f": "Female",
-  "account.settings.field.gender.options.m": "Male",
-  "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken language",
-  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
-  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
-  "account.settings.field.time.zone": "Time zone",
-  "account.settings.field.time.zone.empty": "Set time zone",
-  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
-  "account.settings.field.time.zone.default": "Default (Local Time Zone)",
-  "account.settings.field.time.zone.all": "All time zones",
-  "account.settings.field.time.zone.country": "Country time zones",
-  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
-  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
-  "account.settings.jump.nav.delete.account": "Delete My Account",
-  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
-  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
-  "account.settings.editable.field.action.save": "Save",
-  "account.settings.editable.field.action.cancel": "Cancel",
-  "account.settings.editable.field.action.edit": "Edit",
-  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
-  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
-  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
-  "account.settings.field.name.modal.certificate.select": "Select a name",
-  "account.settings.field.name.modal.certificate.option.full": "Full Name",
-  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
-  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Phone Number",
-  "account.settings.field.phone_number.empty": "Add a phone number",
-  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
-  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
-  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
-  "account.settings.delete.account.header": "Delete My Account",
-  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
-  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
-  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
-  "account.settings.delete.account.button": "Delete My Account",
-  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.confirm": "confirm your account",
-  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
-  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
-  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
-  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
-  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
-  "account.settings.delete.account.error.unable.to.delete": "Unable to delete account",
-  "account.settings.delete.account.error.no.password": "A password is required",
-  "account.settings.delete.account.error.invalid.password": "Password is incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Sorry, there was an error trying to process your request. Please try again later.",
-  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
-  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
-  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
-  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
-  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
-  "account.settings.field.demographics.gender": "Gender identity",
-  "account.settings.field.demographics.gender.empty": "Add gender identity",
-  "account.settings.field.demographics.gender.options.empty": "Select a gender identity",
-  "account.settings.field.demographics.gender_description": "Gender identity description",
-  "account.settings.field.demographics.gender_description.empty": "Enter description",
-  "account.settings.field.demographics.ethnicity": "Race/Ethnicity identity",
-  "account.settings.field.demographics.ethnicity.empty": "Add race/ethnicity identity",
-  "account.settings.field.demographics.ethnicity.options.empty": "Select all that apply",
-  "account.settings.field.demographics.income": "Family income",
-  "account.settings.field.demographics.income.empty": "Add family income",
-  "account.settings.field.demographics.income.options.empty": "Select a family income range",
-  "account.settings.field.demographics.military_history": "U.S. Military status",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
-  "account.settings.field.demographics.military_history.options.empty": "Select military status",
-  "account.settings.field.demographics.learner_education_level": "Your education level",
-  "account.settings.field.demographics.learner_education_level.empty": "Add education level",
-  "account.settings.field.demographics.parent_education_level": "Parents/Guardians education level",
-  "account.settings.field.demographics.parent_education_level.empty": "Add education level",
-  "account.settings.field.demographics.education_level.options.empty": "Select education level",
-  "account.settings.field.demographics.work_status": "Employment status",
-  "account.settings.field.demographics.work_status.empty": "Add employment status",
-  "account.settings.field.demographics.work_status.options.empty": "Select employment status",
-  "account.settings.field.demographics.work_status_description": "Employment status description",
-  "account.settings.field.demographics.work_status_description.empty": "Enter description",
-  "account.settings.field.demographics.current_work_sector": "Current work industry",
-  "account.settings.field.demographics.current_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.future_work_sector": "Future work industry",
-  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
-  "account.settings.name.change.title.id": "This name change requires identity verification",
-  "account.settings.name.change.title.begin": "Before we begin",
-  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
-  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
-  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
-  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
-  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
-  "account.settings.name.change.continue": "Continue",
-  "account.settings.name.change.cancel": "Cancel",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
-  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
-  "account.settings.editable.field.password.reset.label": "Password",
-  "account.settings.sso.link.account": "Sign in with {name}",
-  "account.settings.sso.account.connected": "Linked",
-  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "account.page.title": "Account | {siteName}",
-  "id.verification.access.blocked.denied": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
-  "id.verification.next": "Next",
-  "id.verification.support": "support",
-  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
-  "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
-  "id.verification.requirements.card.device.title": "Device with Camera",
-  "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification Card",
-  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
-  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
-  "id.verification.access.blocked.title": "Identity Verification",
-  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
-  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
-  "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo?",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
-  "id.verification.camera.access.title": "Camera Permissions",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
-  "id.verification.camera.access.click.allow": "Please make sure to click \"Allow\"",
-  "id.verification.camera.access.enable": "Enable Camera",
-  "id.verification.camera.access.problems": "Having problems?",
-  "id.verification.camera.access.skip": "Skip and upload image files instead",
-  "id.verification.camera.access.success": "Looks like your camera is working and ready.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
-  "id.verification.photo.tips.title": "Helpful Photo Tips",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful Identification Card Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
-  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
-  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.name.label": "Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Identification Card",
-  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.submission.alert.error.face": "A photo of your face is required. Please retake your portrait photo.",
-  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
-  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
-  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "{siteName} Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.return.generic": "Return",
-  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
-  "idv.submission.alert.error": "\n          We encountered a technical error while trying to submit ID verification.\n          This might be a temporary issue, so please try again in a few minutes.\n          If the problem persists, please go to {support_link} for help.\n        ",
-  "id.verification.account.name.edit": "Edit {sr}"
-}
--- a/src/i18n/messages/ko_kr.json
+++ b/src/i18n/messages/ko_kr.json
@@ -0,0 +1,11 @@
+{
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
+}
--- a/src/i18n/messages/pl.json
+++ b/src/i18n/messages/pl.json
@@ -0,0 +1,11 @@
+{
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
+}
--- a/src/i18n/messages/pt.json
+++ b/src/i18n/messages/pt.json
@@ -1,361 +0,0 @@
-{
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
-  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
-  "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Account Settings",
-  "account.settings.loading.message": "Loading...",
-  "account.settings.loading.error": "Error: {error}",
-  "account.settings.banner.beta.language": "You have set your language to {beta_language}, which is currently not fully translated. You can help us translate this language fully by joining the Transifex community and adding translations from English for learners that speak {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Help Translate into {beta_language}",
-  "account.settings.section.account.information": "Account Information",
-  "account.settings.section.account.information.description": "These settings include basic information about your account.",
-  "account.settings.section.profile.information": "Profile Information",
-  "account.settings.section.demographics.information": "Optional Information",
-  "account.settings.section.site.preferences": "Site Preferences",
-  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
-  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
-  "account.settings.field.full.name": "Full name",
-  "account.settings.field.full.name.empty": "Add name",
-  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified": "Verified name",
-  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.",
-  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
-  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
-  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
-  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
-  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
-  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
-  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
-  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
-  "account.settings.field.email": "Email address (Sign in)",
-  "account.settings.field.email.empty": "Add email address",
-  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
-  "account.settings.field.secondary.email": "Recovery email address",
-  "account.settings.field.secondary.email.empty": "Add a recovery email address",
-  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
-  "account.settings.email.field.confirmation.header": "Pending confirmation",
-  "account.settings.field.dob": "Year of birth",
-  "account.settings.field.dob.empty": "Add year of birth",
-  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.dob.month": "Month",
-  "account.settings.field.dob.year": "Year",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Please confirm your date of birth",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
-  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
-  "account.settings.field.country": "Country",
-  "account.settings.field.country.empty": "Add country",
-  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
-  "account.settings.field.site.language": "Site language",
-  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
-  "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Add level of education",
-  "account.settings.field.education.levels.empty": "Select a level of education",
-  "account.settings.field.education.levels.p": "Doctorate",
-  "account.settings.field.education.levels.m": "Master's or professional degree",
-  "account.settings.field.education.levels.b": "Bachelor's Degree",
-  "account.settings.field.education.levels.a": "Associate's degree",
-  "account.settings.field.education.levels.hs": "Secondary/high school",
-  "account.settings.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "account.settings.field.education.levels.el": "Elementary/primary school",
-  "account.settings.field.education.levels.none": "No formal education",
-  "account.settings.field.education.levels.o": "Other education",
-  "account.settings.field.gender": "Gender",
-  "account.settings.field.gender.empty": "Add gender",
-  "account.settings.field.gender.options.empty": "Select a gender",
-  "account.settings.field.gender.options.f": "Female",
-  "account.settings.field.gender.options.m": "Male",
-  "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken language",
-  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
-  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
-  "account.settings.field.time.zone": "Time zone",
-  "account.settings.field.time.zone.empty": "Set time zone",
-  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
-  "account.settings.field.time.zone.default": "Default (Local Time Zone)",
-  "account.settings.field.time.zone.all": "All time zones",
-  "account.settings.field.time.zone.country": "Country time zones",
-  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
-  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
-  "account.settings.jump.nav.delete.account": "Delete My Account",
-  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
-  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
-  "account.settings.editable.field.action.save": "Save",
-  "account.settings.editable.field.action.cancel": "Cancel",
-  "account.settings.editable.field.action.edit": "Edit",
-  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
-  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
-  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
-  "account.settings.field.name.modal.certificate.select": "Select a name",
-  "account.settings.field.name.modal.certificate.option.full": "Full Name",
-  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
-  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Phone Number",
-  "account.settings.field.phone_number.empty": "Add a phone number",
-  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
-  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
-  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
-  "account.settings.delete.account.header": "Delete My Account",
-  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
-  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
-  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
-  "account.settings.delete.account.button": "Delete My Account",
-  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.confirm": "confirm your account",
-  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
-  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
-  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
-  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
-  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
-  "account.settings.delete.account.error.unable.to.delete": "Unable to delete account",
-  "account.settings.delete.account.error.no.password": "A password is required",
-  "account.settings.delete.account.error.invalid.password": "Password is incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Sorry, there was an error trying to process your request. Please try again later.",
-  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
-  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
-  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
-  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
-  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
-  "account.settings.field.demographics.gender": "Gender identity",
-  "account.settings.field.demographics.gender.empty": "Add gender identity",
-  "account.settings.field.demographics.gender.options.empty": "Select a gender identity",
-  "account.settings.field.demographics.gender_description": "Gender identity description",
-  "account.settings.field.demographics.gender_description.empty": "Enter description",
-  "account.settings.field.demographics.ethnicity": "Race/Ethnicity identity",
-  "account.settings.field.demographics.ethnicity.empty": "Add race/ethnicity identity",
-  "account.settings.field.demographics.ethnicity.options.empty": "Select all that apply",
-  "account.settings.field.demographics.income": "Family income",
-  "account.settings.field.demographics.income.empty": "Add family income",
-  "account.settings.field.demographics.income.options.empty": "Select a family income range",
-  "account.settings.field.demographics.military_history": "U.S. Military status",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
-  "account.settings.field.demographics.military_history.options.empty": "Select military status",
-  "account.settings.field.demographics.learner_education_level": "Your education level",
-  "account.settings.field.demographics.learner_education_level.empty": "Add education level",
-  "account.settings.field.demographics.parent_education_level": "Parents/Guardians education level",
-  "account.settings.field.demographics.parent_education_level.empty": "Add education level",
-  "account.settings.field.demographics.education_level.options.empty": "Select education level",
-  "account.settings.field.demographics.work_status": "Employment status",
-  "account.settings.field.demographics.work_status.empty": "Add employment status",
-  "account.settings.field.demographics.work_status.options.empty": "Select employment status",
-  "account.settings.field.demographics.work_status_description": "Employment status description",
-  "account.settings.field.demographics.work_status_description.empty": "Enter description",
-  "account.settings.field.demographics.current_work_sector": "Current work industry",
-  "account.settings.field.demographics.current_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.future_work_sector": "Future work industry",
-  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
-  "account.settings.name.change.title.id": "This name change requires identity verification",
-  "account.settings.name.change.title.begin": "Before we begin",
-  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
-  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
-  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
-  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
-  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
-  "account.settings.name.change.continue": "Continue",
-  "account.settings.name.change.cancel": "Cancel",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
-  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
-  "account.settings.editable.field.password.reset.label": "Password",
-  "account.settings.sso.link.account": "Sign in with {name}",
-  "account.settings.sso.account.connected": "Linked",
-  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "account.page.title": "Account | {siteName}",
-  "id.verification.access.blocked.denied": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
-  "id.verification.next": "Next",
-  "id.verification.support": "support",
-  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
-  "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
-  "id.verification.requirements.card.device.title": "Device with Camera",
-  "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification Card",
-  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
-  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
-  "id.verification.access.blocked.title": "Identity Verification",
-  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
-  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
-  "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo?",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
-  "id.verification.camera.access.title": "Camera Permissions",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
-  "id.verification.camera.access.click.allow": "Please make sure to click \"Allow\"",
-  "id.verification.camera.access.enable": "Enable Camera",
-  "id.verification.camera.access.problems": "Having problems?",
-  "id.verification.camera.access.skip": "Skip and upload image files instead",
-  "id.verification.camera.access.success": "Looks like your camera is working and ready.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
-  "id.verification.photo.tips.title": "Helpful Photo Tips",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful Identification Card Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
-  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
-  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.name.label": "Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Identification Card",
-  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.submission.alert.error.face": "A photo of your face is required. Please retake your portrait photo.",
-  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
-  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
-  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "{siteName} Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.return.generic": "Return",
-  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
-  "idv.submission.alert.error": "\n          We encountered a technical error while trying to submit ID verification.\n          This might be a temporary issue, so please try again in a few minutes.\n          If the problem persists, please go to {support_link} for help.\n        ",
-  "id.verification.account.name.edit": "Edit {sr}"
-}
--- a/src/i18n/messages/pt_br.json
+++ b/src/i18n/messages/pt_br.json
@@ -0,0 +1,11 @@
+{
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
+}
--- a/src/i18n/messages/ru.json
+++ b/src/i18n/messages/ru.json
@@ -1,361 +1,11 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
-  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
-  "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Account Settings",
-  "account.settings.loading.message": "Loading...",
-  "account.settings.loading.error": "Error: {error}",
-  "account.settings.banner.beta.language": "You have set your language to {beta_language}, which is currently not fully translated. You can help us translate this language fully by joining the Transifex community and adding translations from English for learners that speak {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Help Translate into {beta_language}",
-  "account.settings.section.account.information": "Account Information",
-  "account.settings.section.account.information.description": "These settings include basic information about your account.",
-  "account.settings.section.profile.information": "Profile Information",
-  "account.settings.section.demographics.information": "Optional Information",
-  "account.settings.section.site.preferences": "Site Preferences",
-  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
-  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
-  "account.settings.field.full.name": "Full name",
-  "account.settings.field.full.name.empty": "Add name",
-  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified": "Verified name",
-  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.",
-  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
-  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
-  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
-  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
-  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
-  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
-  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
-  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
-  "account.settings.field.email": "Email address (Sign in)",
-  "account.settings.field.email.empty": "Add email address",
-  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
-  "account.settings.field.secondary.email": "Recovery email address",
-  "account.settings.field.secondary.email.empty": "Add a recovery email address",
-  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
-  "account.settings.email.field.confirmation.header": "Pending confirmation",
-  "account.settings.field.dob": "Year of birth",
-  "account.settings.field.dob.empty": "Add year of birth",
-  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.dob.month": "Month",
-  "account.settings.field.dob.year": "Year",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Please confirm your date of birth",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
-  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
-  "account.settings.field.country": "Country",
-  "account.settings.field.country.empty": "Add country",
-  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
-  "account.settings.field.site.language": "Site language",
-  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
-  "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Add level of education",
-  "account.settings.field.education.levels.empty": "Select a level of education",
-  "account.settings.field.education.levels.p": "Doctorate",
-  "account.settings.field.education.levels.m": "Master's or professional degree",
-  "account.settings.field.education.levels.b": "Bachelor's Degree",
-  "account.settings.field.education.levels.a": "Associate's degree",
-  "account.settings.field.education.levels.hs": "Secondary/high school",
-  "account.settings.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "account.settings.field.education.levels.el": "Elementary/primary school",
-  "account.settings.field.education.levels.none": "No formal education",
-  "account.settings.field.education.levels.o": "Other education",
-  "account.settings.field.gender": "Gender",
-  "account.settings.field.gender.empty": "Add gender",
-  "account.settings.field.gender.options.empty": "Select a gender",
-  "account.settings.field.gender.options.f": "Female",
-  "account.settings.field.gender.options.m": "Male",
-  "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken language",
-  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
-  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
-  "account.settings.field.time.zone": "Time zone",
-  "account.settings.field.time.zone.empty": "Set time zone",
-  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
-  "account.settings.field.time.zone.default": "Default (Local Time Zone)",
-  "account.settings.field.time.zone.all": "All time zones",
-  "account.settings.field.time.zone.country": "Country time zones",
-  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
-  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
-  "account.settings.jump.nav.delete.account": "Delete My Account",
-  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
-  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
-  "account.settings.editable.field.action.save": "Save",
-  "account.settings.editable.field.action.cancel": "Cancel",
-  "account.settings.editable.field.action.edit": "Edit",
-  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
-  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
-  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
-  "account.settings.field.name.modal.certificate.select": "Select a name",
-  "account.settings.field.name.modal.certificate.option.full": "Full Name",
-  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
-  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Phone Number",
-  "account.settings.field.phone_number.empty": "Add a phone number",
-  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
-  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
-  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
-  "account.settings.delete.account.header": "Delete My Account",
-  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
-  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
-  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
-  "account.settings.delete.account.button": "Delete My Account",
-  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.confirm": "confirm your account",
-  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
-  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
-  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
-  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
-  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
-  "account.settings.delete.account.error.unable.to.delete": "Unable to delete account",
-  "account.settings.delete.account.error.no.password": "A password is required",
-  "account.settings.delete.account.error.invalid.password": "Password is incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Sorry, there was an error trying to process your request. Please try again later.",
-  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
-  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
-  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
-  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
-  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
-  "account.settings.field.demographics.gender": "Gender identity",
-  "account.settings.field.demographics.gender.empty": "Add gender identity",
-  "account.settings.field.demographics.gender.options.empty": "Select a gender identity",
-  "account.settings.field.demographics.gender_description": "Gender identity description",
-  "account.settings.field.demographics.gender_description.empty": "Enter description",
-  "account.settings.field.demographics.ethnicity": "Race/Ethnicity identity",
-  "account.settings.field.demographics.ethnicity.empty": "Add race/ethnicity identity",
-  "account.settings.field.demographics.ethnicity.options.empty": "Select all that apply",
-  "account.settings.field.demographics.income": "Family income",
-  "account.settings.field.demographics.income.empty": "Add family income",
-  "account.settings.field.demographics.income.options.empty": "Select a family income range",
-  "account.settings.field.demographics.military_history": "U.S. Military status",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
-  "account.settings.field.demographics.military_history.options.empty": "Select military status",
-  "account.settings.field.demographics.learner_education_level": "Your education level",
-  "account.settings.field.demographics.learner_education_level.empty": "Add education level",
-  "account.settings.field.demographics.parent_education_level": "Parents/Guardians education level",
-  "account.settings.field.demographics.parent_education_level.empty": "Add education level",
-  "account.settings.field.demographics.education_level.options.empty": "Select education level",
-  "account.settings.field.demographics.work_status": "Employment status",
-  "account.settings.field.demographics.work_status.empty": "Add employment status",
-  "account.settings.field.demographics.work_status.options.empty": "Select employment status",
-  "account.settings.field.demographics.work_status_description": "Employment status description",
-  "account.settings.field.demographics.work_status_description.empty": "Enter description",
-  "account.settings.field.demographics.current_work_sector": "Current work industry",
-  "account.settings.field.demographics.current_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.future_work_sector": "Future work industry",
-  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
-  "account.settings.name.change.title.id": "This name change requires identity verification",
-  "account.settings.name.change.title.begin": "Before we begin",
-  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
-  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
-  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
-  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
-  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
-  "account.settings.name.change.continue": "Continue",
-  "account.settings.name.change.cancel": "Cancel",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
-  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
-  "account.settings.editable.field.password.reset.label": "Password",
-  "account.settings.sso.link.account": "Sign in with {name}",
-  "account.settings.sso.account.connected": "Linked",
-  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "account.page.title": "Account | {siteName}",
-  "id.verification.access.blocked.denied": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
-  "id.verification.next": "Next",
-  "id.verification.support": "support",
-  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
-  "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
-  "id.verification.requirements.card.device.title": "Device with Camera",
-  "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification Card",
-  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
-  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
-  "id.verification.access.blocked.title": "Identity Verification",
-  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
-  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
-  "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo?",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
-  "id.verification.camera.access.title": "Camera Permissions",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
-  "id.verification.camera.access.click.allow": "Please make sure to click \"Allow\"",
-  "id.verification.camera.access.enable": "Enable Camera",
-  "id.verification.camera.access.problems": "Having problems?",
-  "id.verification.camera.access.skip": "Skip and upload image files instead",
-  "id.verification.camera.access.success": "Looks like your camera is working and ready.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
-  "id.verification.photo.tips.title": "Helpful Photo Tips",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful Identification Card Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
-  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
-  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.name.label": "Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Identification Card",
-  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.submission.alert.error.face": "A photo of your face is required. Please retake your portrait photo.",
-  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
-  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
-  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "{siteName} Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.return.generic": "Return",
-  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
-  "idv.submission.alert.error": "\n          We encountered a technical error while trying to submit ID verification.\n          This might be a temporary issue, so please try again in a few minutes.\n          If the problem persists, please go to {support_link} for help.\n        ",
-  "id.verification.account.name.edit": "Edit {sr}"
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
 }
--- a/src/i18n/messages/th.json
+++ b/src/i18n/messages/th.json
@@ -0,0 +1,11 @@
+{
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
+}
--- a/src/i18n/messages/uk.json
+++ b/src/i18n/messages/uk.json
@@ -1,361 +1,11 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
-  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
-  "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Account Settings",
-  "account.settings.loading.message": "Loading...",
-  "account.settings.loading.error": "Error: {error}",
-  "account.settings.banner.beta.language": "You have set your language to {beta_language}, which is currently not fully translated. You can help us translate this language fully by joining the Transifex community and adding translations from English for learners that speak {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Help Translate into {beta_language}",
-  "account.settings.section.account.information": "Account Information",
-  "account.settings.section.account.information.description": "These settings include basic information about your account.",
-  "account.settings.section.profile.information": "Profile Information",
-  "account.settings.section.demographics.information": "Optional Information",
-  "account.settings.section.site.preferences": "Site Preferences",
-  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
-  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
-  "account.settings.field.full.name": "Full name",
-  "account.settings.field.full.name.empty": "Add name",
-  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified": "Verified name",
-  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.",
-  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
-  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
-  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
-  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
-  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
-  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
-  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
-  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
-  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
-  "account.settings.field.email": "Email address (Sign in)",
-  "account.settings.field.email.empty": "Add email address",
-  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
-  "account.settings.field.secondary.email": "Recovery email address",
-  "account.settings.field.secondary.email.empty": "Add a recovery email address",
-  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
-  "account.settings.email.field.confirmation.header": "Pending confirmation",
-  "account.settings.field.dob": "Year of birth",
-  "account.settings.field.dob.empty": "Add year of birth",
-  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.dob.month": "Month",
-  "account.settings.field.dob.year": "Year",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Please confirm your date of birth",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
-  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
-  "account.settings.field.country": "Country",
-  "account.settings.field.country.empty": "Add country",
-  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
-  "account.settings.field.site.language": "Site language",
-  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
-  "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Add level of education",
-  "account.settings.field.education.levels.empty": "Select a level of education",
-  "account.settings.field.education.levels.p": "Doctorate",
-  "account.settings.field.education.levels.m": "Master's or professional degree",
-  "account.settings.field.education.levels.b": "Bachelor's Degree",
-  "account.settings.field.education.levels.a": "Associate's degree",
-  "account.settings.field.education.levels.hs": "Secondary/high school",
-  "account.settings.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "account.settings.field.education.levels.el": "Elementary/primary school",
-  "account.settings.field.education.levels.none": "No formal education",
-  "account.settings.field.education.levels.o": "Other education",
-  "account.settings.field.gender": "Gender",
-  "account.settings.field.gender.empty": "Add gender",
-  "account.settings.field.gender.options.empty": "Select a gender",
-  "account.settings.field.gender.options.f": "Female",
-  "account.settings.field.gender.options.m": "Male",
-  "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken language",
-  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
-  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
-  "account.settings.field.time.zone": "Time zone",
-  "account.settings.field.time.zone.empty": "Set time zone",
-  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
-  "account.settings.field.time.zone.default": "Default (Local Time Zone)",
-  "account.settings.field.time.zone.all": "All time zones",
-  "account.settings.field.time.zone.country": "Country time zones",
-  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
-  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
-  "account.settings.jump.nav.delete.account": "Delete My Account",
-  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
-  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
-  "account.settings.editable.field.action.save": "Save",
-  "account.settings.editable.field.action.cancel": "Cancel",
-  "account.settings.editable.field.action.edit": "Edit",
-  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
-  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
-  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
-  "account.settings.field.name.modal.certificate.select": "Select a name",
-  "account.settings.field.name.modal.certificate.option.full": "Full Name",
-  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
-  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Phone Number",
-  "account.settings.field.phone_number.empty": "Add a phone number",
-  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
-  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
-  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
-  "account.settings.delete.account.header": "Delete My Account",
-  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
-  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
-  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
-  "account.settings.delete.account.button": "Delete My Account",
-  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.confirm": "confirm your account",
-  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
-  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
-  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
-  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
-  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
-  "account.settings.delete.account.error.unable.to.delete": "Unable to delete account",
-  "account.settings.delete.account.error.no.password": "A password is required",
-  "account.settings.delete.account.error.invalid.password": "Password is incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Sorry, there was an error trying to process your request. Please try again later.",
-  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
-  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
-  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
-  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
-  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
-  "account.settings.field.demographics.gender": "Gender identity",
-  "account.settings.field.demographics.gender.empty": "Add gender identity",
-  "account.settings.field.demographics.gender.options.empty": "Select a gender identity",
-  "account.settings.field.demographics.gender_description": "Gender identity description",
-  "account.settings.field.demographics.gender_description.empty": "Enter description",
-  "account.settings.field.demographics.ethnicity": "Race/Ethnicity identity",
-  "account.settings.field.demographics.ethnicity.empty": "Add race/ethnicity identity",
-  "account.settings.field.demographics.ethnicity.options.empty": "Select all that apply",
-  "account.settings.field.demographics.income": "Family income",
-  "account.settings.field.demographics.income.empty": "Add family income",
-  "account.settings.field.demographics.income.options.empty": "Select a family income range",
-  "account.settings.field.demographics.military_history": "U.S. Military status",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
-  "account.settings.field.demographics.military_history.options.empty": "Select military status",
-  "account.settings.field.demographics.learner_education_level": "Your education level",
-  "account.settings.field.demographics.learner_education_level.empty": "Add education level",
-  "account.settings.field.demographics.parent_education_level": "Parents/Guardians education level",
-  "account.settings.field.demographics.parent_education_level.empty": "Add education level",
-  "account.settings.field.demographics.education_level.options.empty": "Select education level",
-  "account.settings.field.demographics.work_status": "Employment status",
-  "account.settings.field.demographics.work_status.empty": "Add employment status",
-  "account.settings.field.demographics.work_status.options.empty": "Select employment status",
-  "account.settings.field.demographics.work_status_description": "Employment status description",
-  "account.settings.field.demographics.work_status_description.empty": "Enter description",
-  "account.settings.field.demographics.current_work_sector": "Current work industry",
-  "account.settings.field.demographics.current_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.future_work_sector": "Future work industry",
-  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
-  "account.settings.name.change.title.id": "This name change requires identity verification",
-  "account.settings.name.change.title.begin": "Before we begin",
-  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
-  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
-  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
-  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
-  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
-  "account.settings.name.change.continue": "Continue",
-  "account.settings.name.change.cancel": "Cancel",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
-  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
-  "account.settings.editable.field.password.reset.label": "Password",
-  "account.settings.sso.link.account": "Sign in with {name}",
-  "account.settings.sso.account.connected": "Linked",
-  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "account.page.title": "Account | {siteName}",
-  "id.verification.access.blocked.denied": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
-  "id.verification.next": "Next",
-  "id.verification.support": "support",
-  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
-  "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
-  "id.verification.requirements.card.device.title": "Device with Camera",
-  "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification Card",
-  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
-  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
-  "id.verification.access.blocked.title": "Identity Verification",
-  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
-  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
-  "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo?",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
-  "id.verification.camera.access.title": "Camera Permissions",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
-  "id.verification.camera.access.click.allow": "Please make sure to click \"Allow\"",
-  "id.verification.camera.access.enable": "Enable Camera",
-  "id.verification.camera.access.problems": "Having problems?",
-  "id.verification.camera.access.skip": "Skip and upload image files instead",
-  "id.verification.camera.access.success": "Looks like your camera is working and ready.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
-  "id.verification.photo.tips.title": "Helpful Photo Tips",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful Identification Card Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
-  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
-  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.name.label": "Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Identification Card",
-  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.submission.alert.error.face": "A photo of your face is required. Please retake your portrait photo.",
-  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
-  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
-  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "{siteName} Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.return.generic": "Return",
-  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
-  "idv.submission.alert.error": "\n          We encountered a technical error while trying to submit ID verification.\n          This might be a temporary issue, so please try again in a few minutes.\n          If the problem persists, please go to {support_link} for help.\n        ",
-  "id.verification.account.name.edit": "Edit {sr}"
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs & Degrees",
+  "siteheader.links.schools": "Schools & Partners",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up"
 }
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -20,22 +20,16 @@
  "account.settings.field.full.name": "Full name",
  "account.settings.field.full.name.empty": "Add name",
  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.full.name.help.text.non.certificate": "The name that appears on your public profile.",
+  "account.settings.field.full.name.help.text.certificate": "This name is selected to appear on your certificates and public-facing records.",
  "account.settings.field.name.verified": "Verified name",
-  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
-  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
-  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
-  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by government ID.",
+  "account.settings.field.name.verified.help.text.certificate": "This name has been verified by government ID and selected to appear on your certificates and public-facing records.",
  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
-  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.",
-  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
+  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your government-issued ID.",
  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
-  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
@@ -55,16 +49,6 @@
  "account.settings.field.dob": "Year of birth",
  "account.settings.field.dob.empty": "Add year of birth",
  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.dob.month": "Month",
-  "account.settings.field.dob.year": "Year",
-  "account.settings.field.month.year.default": "Select month",
-  "account.settings.field.dob.year.default": "Select year",
-  "account.settings.field.dob.form.button": "Please confirm your date of birth",
-  "account.settings.field.dob.form.title": "Enter your birth month and year",
-  "account.settings.field.dob.form.help.text": "We ask for birth month and year information to help us comply with our legal obligations.",
-  "account.settings.field.dob.form.success": "Thank you for entering your information.",
-  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
-  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
  "account.settings.field.country": "Country",
  "account.settings.field.country.empty": "Add country",
  "account.settings.field.country.options.empty": "Select a Country",
@@ -149,7 +133,6 @@
  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
  "account.settings.delete.account.button": "Delete My Account",
  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.confirm": "confirm your account",
  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
  "account.settings.delete.account.modal.header": "Are you sure?",
  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
@@ -202,8 +185,8 @@
  "account.settings.name.change.title.begin": "Before we begin",
  "account.settings.name.change.warning.one": "Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.",
  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
-  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
+  "account.settings.name.change.id.name.label": "Enter your name as it appears on your government-issued ID.",
+  "account.settings.name.change.id.name.placeholder": "Enter the name on your government ID",
  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
  "account.settings.name.change.continue": "Continue",
@@ -219,10 +202,10 @@
  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
  "account.settings.sso.unlink.account": "Unlink {name} account",
  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "account.page.title": "Account | {siteName}",
-  "id.verification.access.blocked.denied": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
+  "id.verification.access.blocked.denied": "You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
  "id.verification.next": "Next",
  "id.verification.support": "support",
+  "id.verification.continue.upload": "Continue with Upload",
  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
  "id.verification.requirements.title": "Photo Verification Requirements",
  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
@@ -300,13 +283,18 @@
  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
+  "id.verification.portrait.photo.title.upload": "Upload a Photo of Yourself",
+  "id.verification.portrait.photo.preview.alt": "Preview of photo of user's face.",
  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
+  "id.verification.portrait.photo.instructions.upload": "Please upload a portrait photo. Ensure your entire face fits inside the frame and is well-lit. Supported formats: ",
  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
+  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
+  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
  "id.verification.id.tips.title": "Helpful Identification Card Tips",
  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
@@ -319,14 +307,24 @@
  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
+  "id.verification.account.name.title": "Account Name Check",
  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
-  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
+  "id.verification.account.name.instructions": "The name on your account and the name on your ID must be an exact match. If not, please click \"No\" to update your account name.",
+  "id.verification.name.check.instructions": "Does the name below match the name on your government-issued ID? If not, update the name below to match your goverment-issued ID.",
+  "id.verification.name.check.mismatch.information": "If the name below does not match your government-issued ID, your identity verification will be denied.",
+  "id.verification.account.name.radio.label": "Does the name on your ID match the Account Name below?",
+  "id.verification.name.check.radio.label": "Select an option",
+  "id.verification.account.name.radio.yes": "Yes",
+  "id.verification.name.check.radio.yes": "Yes, the name below matches my ID",
+  "id.verification.account.name.radio.no": "No",
+  "id.verification.name.check.radio.no": "No, the name below does not match my ID",
+  "id.verification.account.name.error": "Please update account name to match the name on your ID.",
  "id.verification.account.name.warning.prefix": "Please Note:",
  "id.verification.account.name.settings": "Account Settings",
+  "id.verification.account.name.label": "Account Name",
  "id.verification.name.label": "Name",
  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
+  "id.verification.account.name.save": "Save and Next",
  "id.verification.review.title": "Review Your Photos",
  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
  "id.verification.review.portrait.label": "Your Portrait",
@@ -342,16 +340,20 @@
  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
  "id.verification.review.error": "{siteName} Support Page",
  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
+  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
  "id.verification.return.dashboard": "Return to Your Dashboard",
  "id.verification.return.course": "Return to Course",
-  "id.verification.return.generic": "Return",
  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
  "id.verification.upload.help.button": "Switch to Upload Mode",
  "id.verification.camera.help.button": "Switch to Camera Mode",
+  "id.verification.choose.mode.title": "Photo Requirements Options",
+  "id.verification.choose.mode.hep.text": "To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.",
+  "id.verification.choose.mode.radio.upload": "Upload photos from my device",
+  "id.verification.choose.mode.radio.camera": "Take pictures using my camera",
+  "id.verification.account.name.managed.alert": "Your profile settings are managed by {managerTitle}, so you are not allowed to update your name. Please contact your {profileDataManager} administrator or {support} for help.",
  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
--- a/src/id-verification/AccessBlocked.jsx
+++ b/src/id-verification/AccessBlocked.jsx
@@ -6,7 +6,7 @@ import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/
 import messages from './IdVerification.messages';
 import { ERROR_REASONS } from './IdVerificationContext';

-const AccessBlocked = ({ error, intl }) => {
+function AccessBlocked({ error, intl }) {
  const handleMessage = () => {
    if (error === ERROR_REASONS.COURSE_ENROLLMENT) {
      return <p>{intl.formatMessage(messages['id.verification.access.blocked.enrollment'])}</p>;
@@ -17,7 +17,7 @@ const AccessBlocked = ({ error, intl }) => {
    return (
      <FormattedMessage
        id="id.verification.access.blocked.denied"
-        defaultMessage="We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}."
+        defaultMessage="You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}."
        description="Text that displays when user is denied from making a request, and to check their email for an activation email."
        values={{
          email: <strong>no-reply@registration.edx.org</strong>,
@@ -39,7 +39,7 @@ const AccessBlocked = ({ error, intl }) => {
      </div>
    </div>
  );
-};
+}

 AccessBlocked.propTypes = {
  intl: intlShape.isRequired,
--- a/src/id-verification/Camera.jsx
+++ b/src/id-verification/Camera.jsx
@@ -175,7 +175,7 @@ class Camera extends React.Component {
    if (predictions.length === 0) {
      this.giveFeedback(predictions.length, [], false);
    }
-  };
+  }

  startDetection() {
    setTimeout(() => {
@@ -262,6 +262,7 @@ class Camera extends React.Component {
    const dataUri = this.cameraPhoto.getDataUri(config);
    this.setState({ dataUri });
    this.props.onImageCapture(dataUri);
+    this.props.setPhotoMode('camera');
  }

  playShutterClick() {
@@ -359,6 +360,7 @@ class Camera extends React.Component {
 Camera.propTypes = {
  intl: intlShape.isRequired,
  onImageCapture: PropTypes.func.isRequired,
+  setPhotoMode: PropTypes.func.isRequired,
  isPortrait: PropTypes.bool.isRequired,
 };

--- a/src/id-verification/CameraHelp.jsx
+++ b/src/id-verification/CameraHelp.jsx
@@ -1,38 +1,56 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import { Collapsible } from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

 import { getConfig } from '@edx/frontend-platform';
 import messages from './IdVerification.messages';
+import IdVerificationContext from './IdVerificationContext';

-const CameraHelp = (props) => (
-  <div>
-    <Collapsible
-      styling="card"
-      title={props.intl.formatMessage(messages['id.verification.camera.help.sight.question'])}
-      className="mb-4 shadow"
-      defaultOpen={props.isOpen}
-    >
-      <p>
-        {props.intl.formatMessage(messages[`id.verification.camera.help.sight.answer.${props.isPortrait ? 'portrait' : 'id'}`])}
-      </p>
-    </Collapsible>
-    <Collapsible
-      styling="card"
-      title={props.intl.formatMessage(messages[`id.verification.camera.help.difficulty.question.${props.isPortrait ? 'portrait' : 'id'}`])}
-      className="mb-4 shadow"
-      defaultOpen={props.isOpen}
-    >
-      <p>
-        {props.intl.formatMessage(
-          messages['id.verification.camera.help.difficulty.answer'],
-          { siteName: getConfig().SITE_NAME },
+function CameraHelp(props) {
+  const { optimizelyExperimentName } = useContext(IdVerificationContext);
+
+  return (
+    <div>
+      { optimizelyExperimentName
+        && (
+        <Collapsible
+          styling="card"
+          title={props.intl.formatMessage(messages['id.verification.camera.help.upload.question'])}
+          className="mb-4 shadow"
+          defaultOpen={props.isOpen}
+        >
+          <p>
+            {props.intl.formatMessage(messages['id.verification.camera.help.upload.answer'])}
+          </p>
+        </Collapsible>
        )}
-      </p>
-    </Collapsible>
-  </div>
-);
+      <Collapsible
+        styling="card"
+        title={props.intl.formatMessage(messages['id.verification.camera.help.sight.question'])}
+        className="mb-4 shadow"
+        defaultOpen={props.isOpen}
+      >
+        <p>
+          {props.intl.formatMessage(messages[`id.verification.camera.help.sight.answer.${props.isPortrait ? 'portrait' : 'id'}`])}
+        </p>
+      </Collapsible>
+      <Collapsible
+        styling="card"
+        title={props.intl.formatMessage(messages[`id.verification.camera.help.difficulty.question.${props.isPortrait ? 'portrait' : 'id'}`])}
+        className="mb-4 shadow"
+        defaultOpen={props.isOpen}
+      >
+        <p>
+          {props.intl.formatMessage(
+            messages['id.verification.camera.help.difficulty.answer'],
+            { siteName: getConfig().SITE_NAME },
+          )}
+        </p>
+      </Collapsible>
+    </div>
+  );
+}

 CameraHelp.propTypes = {
  intl: intlShape.isRequired,
--- a/src/id-verification/CameraHelpWithUpload.jsx
+++ b/src/id-verification/CameraHelpWithUpload.jsx
@@ -10,18 +10,18 @@ import IdVerificationContext from './IdVerificationContext';
 import ImagePreview from './ImagePreview';
 import SupportedMediaTypes from './SupportedMediaTypes';

-const CameraHelpWithUpload = (props) => {
+function CameraHelpWithUpload(props) {
  const { setIdPhotoFile, idPhotoFile, userId } = useContext(IdVerificationContext);
  const [hasUploadedImage, setHasUploadedImage] = useState(false);

-  const setAndTrackIdPhotoFile = (image) => {
+  function setAndTrackIdPhotoFile(image) {
    sendTrackEvent('edx.id_verification.upload_id', {
      category: 'id_verification',
      user_id: userId,
    });
    setHasUploadedImage(true);
    setIdPhotoFile(image);
-  };
+  }

  return (
    <div>
@@ -41,7 +41,7 @@ const CameraHelpWithUpload = (props) => {
      </Collapsible>
    </div>
  );
-};
+}

 CameraHelpWithUpload.propTypes = {
  intl: intlShape.isRequired,
--- a/src/id-verification/CollapsibleImageHelp.jsx
+++ b/src/id-verification/CollapsibleImageHelp.jsx
@@ -2,55 +2,72 @@ import React, { useContext } from 'react';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Button, Collapsible } from '@edx/paragon';
+import { Link } from 'react-router-dom';
+import PropTypes from 'prop-types';

-import IdVerificationContext from './IdVerificationContext';
+import IdVerificationContext, { MEDIA_ACCESS } from './IdVerificationContext';
 import messages from './IdVerification.messages';

-const CollapsibleImageHelp = (props) => {
+function CollapsibleImageHelp(props) {
  const {
-    userId, useCameraForId, setUseCameraForId,
+    userId, shouldUseCamera, setShouldUseCamera, optimizelyExperimentName, mediaAccess,
  } = useContext(IdVerificationContext);

-  const handleClick = () => {
-    const toggleTo = useCameraForId ? 'upload' : 'camera';
+  function handleClick() {
+    const toggleTo = shouldUseCamera ? 'upload' : 'camera';
    const eventName = `edx.id_verification.toggle_to.${toggleTo}`;
    sendTrackEvent(eventName, {
      category: 'id_verification',
      user_id: userId,
    });
-    setUseCameraForId(!useCameraForId);
-  };
+    setShouldUseCamera(!shouldUseCamera);
+  }

-  return (
-    <Collapsible
-      styling="card"
-      title={useCameraForId
-        ? props.intl.formatMessage(messages['id.verification.photo.upload.help.title'])
-        : props.intl.formatMessage(messages['id.verification.photo.camera.help.title'])}
-      className="mb-4 shadow"
-      defaultOpen
-    >
-      <p data-testid="help-text">
-        {useCameraForId
-          ? props.intl.formatMessage(messages['id.verification.photo.upload.help.text'])
-          : props.intl.formatMessage(messages['id.verification.photo.camera.help.text'])}
-      </p>
-      <Button
-        title={useCameraForId ? 'Upload Photo' : 'Take Photo'} // TO-DO: translation
-        data-testid="toggle-button"
-        onClick={handleClick}
-        style={{ marginTop: '0.5rem' }}
+  if (optimizelyExperimentName && mediaAccess !== MEDIA_ACCESS.DENIED && mediaAccess !== MEDIA_ACCESS.UNSUPPORTED) {
+    return (
+      <Collapsible
+        styling="card"
+        title={shouldUseCamera ? props.intl.formatMessage(messages['id.verification.photo.upload.help.title']) : props.intl.formatMessage(messages['id.verification.photo.camera.help.title'])}
+        className="mb-4 shadow"
+        defaultOpen
      >
-        {useCameraForId
-          ? props.intl.formatMessage(messages['id.verification.photo.upload.help.button'])
-          : props.intl.formatMessage(messages['id.verification.photo.camera.help.button'])}
-      </Button>
-    </Collapsible>
-  );
-};
+        <p data-testid="help-text">
+          {shouldUseCamera
+            ? props.intl.formatMessage(messages['id.verification.photo.upload.help.text'])
+            : props.intl.formatMessage(messages['id.verification.photo.camera.help.text'])}
+        </p>
+        { (mediaAccess === MEDIA_ACCESS.PENDING && !shouldUseCamera)
+          ? (
+            // if a user has not enabled camera access yet, and they are trying to switch
+            // to camera mode, direct them to panel that requests camera access
+            <Link
+              to={{ pathname: 'request-camera-access', state: { fromPortraitCapture: props.isPortrait, fromIdCapture: !props.isPortrait } }}
+              className="btn btn-primary"
+              data-testid="access-link"
+            >
+              {props.intl.formatMessage(messages['id.verification.photo.camera.help.button'])}
+            </Link>
+          )
+          : (
+            <Button
+              title={shouldUseCamera ? 'Upload Portrait Photo' : 'Take Portrait Photo'}
+              data-testid="toggle-button"
+              onClick={handleClick}
+              style={{ marginTop: '0.5rem' }}
+            >
+              {shouldUseCamera ? props.intl.formatMessage(messages['id.verification.photo.upload.help.button']) : props.intl.formatMessage(messages['id.verification.photo.camera.help.button'])}
+            </Button>
+          )}
+      </Collapsible>
+    );
+  }
+
+  return null;
+}

 CollapsibleImageHelp.propTypes = {
  intl: intlShape.isRequired,
+  isPortrait: PropTypes.bool.isRequired,
 };

 export default injectIntl(CollapsibleImageHelp);
--- a/src/id-verification/IdVerification.messages.js
+++ b/src/id-verification/IdVerification.messages.js
@@ -11,6 +11,11 @@ const messages = defineMessages({
    defaultMessage: 'support',
    description: 'Website support.',
  },
+  'id.verification.continue.upload': {
+    id: 'id.verification.continue.upload',
+    defaultMessage: 'Continue with Upload',
+    description: 'Button to continue with upload.',
+  },
  'id.verification.example.card.alt': {
    id: 'id.verification.example.card.alt',
    defaultMessage: 'Example of a valid identification card with a full name and photo.',
@@ -396,11 +401,26 @@ const messages = defineMessages({
    defaultMessage: 'Take a Photo of Yourself',
    description: 'Title for the Portrait Photo page if camera access is enabled.',
  },
+  'id.verification.portrait.photo.title.upload': {
+    id: 'id.verification.portrait.photo.title.upload',
+    defaultMessage: 'Upload a Photo of Yourself',
+    description: 'Title for the Portrait Photo page if camera access is disabled.',
+  },
+  'id.verification.portrait.photo.preview.alt': {
+    id: 'id.verification.portrait.photo.preview.alt',
+    defaultMessage: 'Preview of photo of user\'s face.',
+    description: 'Alt text for the portrait photo preview.',
+  },
  'id.verification.portrait.photo.instructions.camera': {
    id: 'id.verification.portrait.photo.instructions.camera',
    defaultMessage: 'When your face is in position, use the Take Photo button below to take your photo.',
    description: 'Instructions to use the camera to take a portrait photo..',
  },
+  'id.verification.portrait.photo.instructions.upload': {
+    id: 'id.verification.portrait.photo.instructions.upload',
+    defaultMessage: 'Please upload a portrait photo. Ensure your entire face fits inside the frame and is well-lit. Supported formats: ',
+    description: 'Instructions for portrait photo upload.',
+  },
  'id.verification.camera.help.sight.question': {
    id: 'id.verification.camera.help.sight.question',
    defaultMessage: 'What if I can\'t see the camera image or if I can\'t see my photo to determine which side is visible?',
@@ -431,6 +451,16 @@ const messages = defineMessages({
    defaultMessage: 'If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.',
    description: 'Confirming what to do if the user has difficult holding their head relative to the camera.',
  },
+  'id.verification.camera.help.upload.question': {
+    id: 'id.verification.camera.help.upload.question',
+    defaultMessage: 'What if I want to upload a photo instead?',
+    description: 'Question on what to do if the user would like to upload a photo instead.',
+  },
+  'id.verification.camera.help.upload.answer': {
+    id: 'id.verification.camera.help.upload.answer',
+    defaultMessage: 'On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.',
+    description: 'Confirming what to do if the user would like to upload a photo.',
+  },
  'id.verification.id.photo.unclear.question': {
    id: 'id.verification.id.photo.unclear.question',
    defaultMessage: 'Is your ID card image not clear or too blurry?',
@@ -491,25 +521,65 @@ const messages = defineMessages({
    defaultMessage: 'The file you have selected is too large. Please try again with a file less than 10MB.',
    description: 'Error message for file upload that is larger than 10MB.',
  },
+  'id.verification.account.name.title': {
+    id: 'id.verification.account.name.title',
+    defaultMessage: 'Account Name Check',
+    description: 'Title for the Account Name Check page.',
+  },
  'id.verification.name.check.title': {
    id: 'id.verification.name.check.title',
    defaultMessage: 'Double-Check Your Name',
    description: 'Title for the page where a user double-checks that their name is correct.',
  },
+  'id.verification.account.name.instructions': {
+    id: 'id.verification.account.name.instructions',
+    defaultMessage: 'The name on your account and the name on your ID must be an exact match. If not, please click "No" to update your account name.',
+    description: 'Text to verify that the account name matches the name on the ID photo.',
+  },
  'id.verification.name.check.instructions': {
    id: 'id.verification.name.check.instructions',
-    defaultMessage: 'Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.',
-    description: 'Text to instruct the user to check that the name displayed on the page matches what is on their photo ID.',
+    defaultMessage: 'Does the name below match the name on your government-issued ID? If not, update the name below to match your goverment-issued ID.',
+    description: 'Text to instruct the user to check that the name displayed on the page matches what is on their government-issued ID.',
  },
  'id.verification.name.check.mismatch.information': {
    id: 'id.verification.name.check.mismatch.information',
-    defaultMessage: 'If the name below does not match your photo ID, your identity verification will be denied.',
-    description: 'Text to inform the user that if the name displayed on the page does not match what is on their photo ID, identity verification will be denied.',
+    defaultMessage: 'If the name below does not match your government-issued ID, your identity verification will be denied.',
+    description: 'Text to inform the user that if the name displayed on the page does not match what is on their government-issued ID, identity verification will be denied.',
  },
-  'id.verification.name.error': {
-    id: 'id.verification.name.error',
-    defaultMessage: 'Please enter your name as it appears on your photo ID.',
-    description: 'Error that shows when the user needs to update their name to match the name on their ID.',
+  'id.verification.account.name.radio.label': {
+    id: 'id.verification.account.name.radio.label',
+    defaultMessage: 'Does the name on your ID match the Account Name below?',
+    description: 'Question to ask the user whether their account name match the name on their ID card.',
+  },
+  'id.verification.name.check.radio.label': {
+    id: 'id.verification.name.check.radio.label',
+    defaultMessage: 'Select an option',
+    description: 'Label for a radio button group where the user needs to choose one of two options.',
+  },
+  'id.verification.account.name.radio.yes': {
+    id: 'id.verification.account.name.radio.yes',
+    defaultMessage: 'Yes',
+    description: 'The radio button that says the account name matches.',
+  },
+  'id.verification.name.check.radio.yes': {
+    id: 'id.verification.name.check.radio.yes',
+    defaultMessage: 'Yes, the name below matches my ID',
+    description: 'Label for a radio button that indicates that the name displayed on the page matches the name on the user\'s ID.',
+  },
+  'id.verification.account.name.radio.no': {
+    id: 'id.verification.account.name.radio.no',
+    defaultMessage: 'No',
+    description: 'The radio button that says the account name does not match.',
+  },
+  'id.verification.name.check.radio.no': {
+    id: 'id.verification.name.check.radio.no',
+    defaultMessage: 'No, the name below does not match my ID',
+    description: 'Label for a radio button that indicates that the name displayed on the page does not match the name on the user\'s ID.',
+  },
+  'id.verification.account.name.error': {
+    id: 'id.verification.account.name.error',
+    defaultMessage: 'Please update account name to match the name on your ID.',
+    description: 'Error that shows when the user needs to update their account name to match the name on their ID.',
  },
  'id.verification.account.name.warning.prefix': {
    id: 'id.verification.account.name.warning.prefix',
@@ -521,6 +591,11 @@ const messages = defineMessages({
    defaultMessage: 'Account Settings',
    description: 'Link to Account Settings.',
  },
+  'id.verification.account.name.label': {
+    id: 'id.verification.account.name.label',
+    defaultMessage: 'Account Name',
+    description: 'Label for account name input.',
+  },
  'id.verification.name.label': {
    id: 'id.verification.name.label',
    defaultMessage: 'Name',
@@ -531,6 +606,11 @@ const messages = defineMessages({
    defaultMessage: 'Photo of your ID to be submitted.',
    description: 'Alt text for the photo of the user\'s ID.',
  },
+  'id.verification.account.name.save': {
+    id: 'id.verification.account.name.save',
+    defaultMessage: 'Save and Next',
+    description: 'Button to save the account name.',
+  },
  'id.verification.review.title': {
    id: 'id.verification.review.title',
    defaultMessage: 'Review Your Photos',
@@ -608,7 +688,7 @@ const messages = defineMessages({
  },
  'id.verification.submitted.text': {
    id: 'id.verification.submitted.text',
-    defaultMessage: 'We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.',
+    defaultMessage: 'We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.',
    description: 'Text confirming that ID verification request has been received.',
  },
  'id.verification.return.dashboard': {
@@ -621,11 +701,6 @@ const messages = defineMessages({
    defaultMessage: 'Return to Course',
    description: 'Return to the course which ID verification was accessed from.',
  },
-  'id.verification.return.generic': {
-    id: 'id.verification.return.generic',
-    defaultMessage: 'Return',
-    description: 'Button to return to the user\'s original location.',
-  },
  'id.verification.photo.upload.help.title': {
    id: 'id.verification.photo.upload.help.title',
    defaultMessage: 'Upload a Photo Instead',
@@ -656,6 +731,26 @@ const messages = defineMessages({
    defaultMessage: 'Switch to Camera Mode',
    description: 'Button used to switch to camera mode.',
  },
+  'id.verification.choose.mode.title': {
+    id: 'id.verification.choose.mode.title',
+    defaultMessage: 'Photo Requirements Options',
+    description: 'Title for section that allows user to choose photo mode.',
+  },
+  'id.verification.choose.mode.help.text': {
+    id: 'id.verification.choose.mode.hep.text',
+    defaultMessage: 'To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.',
+    description: 'Help text for section that allows user to choose photo mode.',
+  },
+  'id.verification.choose.mode.radio.upload': {
+    id: 'id.verification.choose.mode.radio.upload',
+    defaultMessage: 'Upload photos from my device',
+    description: 'Radio button to choose to upload photos.',
+  },
+  'id.verification.choose.mode.radio.camera': {
+    id: 'id.verification.choose.mode.radio.camera',
+    defaultMessage: 'Take pictures using my camera',
+    description: 'Radio button to choose to use camera for photos.',
+  },
 });

 export default messages;
--- a/src/id-verification/IdVerificationContextProvider.jsx
+++ b/src/id-verification/IdVerificationContextProvider.jsx
@@ -1,13 +1,10 @@
-import React, {
-  useState, useContext, useEffect, useMemo,
-} from 'react';
+import React, { useState, useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { AppContext } from '@edx/frontend-platform/react';

 import { getProfileDataManager } from '../account-settings/data/service';
 import PageLoading from '../account-settings/PageLoading';
 import { useAsyncCall } from '../hooks';
-import { IDLE_STATUS, LOADING_STATUS, SUCCESS_STATUS } from '../constants';

 import { getExistingIdVerification, getEnrollments } from './data/service';
 import AccessBlocked from './AccessBlocked';
@@ -15,12 +12,19 @@ import { hasGetUserMediaSupport } from './getUserMediaShim';
 import IdVerificationContext, { MEDIA_ACCESS, ERROR_REASONS, VERIFIED_MODES } from './IdVerificationContext';
 import { VerifiedNameContext } from './VerifiedNameContext';

-const IdVerificationContextProvider = ({ children }) => {
+export default function IdVerificationContextProvider({ children }) {
  const { authenticatedUser } = useContext(AppContext);
-  const { verifiedNameHistoryCallStatus, verifiedName } = useContext(VerifiedNameContext);
+  const { isVerifiedNameHistoryLoading, verifiedName, verifiedNameEnabled } = useContext(VerifiedNameContext);

-  const idVerificationData = useAsyncCall(getExistingIdVerification);
-  const enrollmentsData = useAsyncCall(getEnrollments);
+  // Call verification status endpoint to check whether we can verify.
+  const [existingIdVerification, setExistingIdVerification] = useState(null);
+  const [isIDVerificationLoading, idVerificationData] = useAsyncCall(getExistingIdVerification);
+  const [isEnrollmentsLoading, enrollmentsData] = useAsyncCall(getEnrollments);
+  useEffect(() => {
+    if (idVerificationData) {
+      setExistingIdVerification(idVerificationData);
+    }
+  }, [idVerificationData]);

  const [facePhotoFile, setFacePhotoFile] = useState(null);
  const [idPhotoFile, setIdPhotoFile] = useState(null);
@@ -30,6 +34,36 @@ const IdVerificationContextProvider = ({ children }) => {
    hasGetUserMediaSupport ? MEDIA_ACCESS.PENDING : MEDIA_ACCESS.UNSUPPORTED,
  );

+  const [canVerify, setCanVerify] = useState(true);
+  const [error, setError] = useState('');
+  useEffect(() => {
+    // With verified name we can redo verification multiple times
+    // if not a successful request prevents re-verification
+    if (!verifiedNameEnabled && existingIdVerification && !existingIdVerification.canVerify) {
+      const { status } = existingIdVerification;
+      setCanVerify(false);
+      if (status === 'pending' || status === 'approved') {
+        setError(ERROR_REASONS.EXISTING_REQUEST);
+      } else {
+        setError(ERROR_REASONS.CANNOT_VERIFY);
+      }
+    } else if (verifiedNameEnabled) {
+      setCanVerify(true);
+    }
+  }, [existingIdVerification, verifiedNameEnabled]);
+
+  useEffect(() => {
+    if (!isEnrollmentsLoading && enrollmentsData) {
+      const verifiedEnrollments = enrollmentsData.filter((enrollment) => (
+        VERIFIED_MODES.includes(enrollment.mode)
+      ));
+      if (verifiedEnrollments.length === 0) {
+        setCanVerify(false);
+        setError(ERROR_REASONS.COURSE_ENROLLMENT);
+      }
+    }
+  }, [enrollmentsData]);
+
  const [profileDataManager, setProfileDataManager] = useState(null);
  useEffect(() => {
    // Determine if the user's profile data is managed by a third-party identity provider.
@@ -47,32 +81,18 @@ const IdVerificationContextProvider = ({ children }) => {
    }
  }, [authenticatedUser]);

-  // Default to upload for the ID image
-  const [useCameraForId, setUseCameraForId] = useState(false);
+  const [optimizelyExperimentName, setOptimizelyExperimentName] = useState('');
+  const [shouldUseCamera, setShouldUseCamera] = useState(false);
+
+  // The following are used to keep track of how a user has submitted photos
+  const [portraitPhotoMode, setPortraitPhotoMode] = useState('');
+  const [idPhotoMode, setIdPhotoMode] = useState('');

  // If the user reaches the end of the flow and goes back to retake their photos,
  // this flag ensures that they are directed straight back to the summary panel
  const [reachedSummary, setReachedSummary] = useState(false);

-  let canVerify = true;
-  let error = '';
-  let existingIdVerification;
-
-  if (idVerificationData?.data) {
-    existingIdVerification = idVerificationData.data;
-  }
-
-  if (enrollmentsData.status === SUCCESS_STATUS && enrollmentsData?.data) {
-    const verifiedEnrollments = enrollmentsData.data.filter((enrollment) => (
-      VERIFIED_MODES.includes(enrollment.mode)
-    ));
-    if (verifiedEnrollments.length === 0) {
-      canVerify = false;
-      error = ERROR_REASONS.COURSE_ENROLLMENT;
-    }
-  }
-
-  const contextValue = useMemo(() => ({
+  const contextValue = {
    existingIdVerification,
    facePhotoFile,
    idPhotoFile,
@@ -84,23 +104,32 @@ const IdVerificationContextProvider = ({ children }) => {
    // when determining the context value nameOnAccount.
    nameOnAccount: verifiedName || authenticatedUser.name,
    profileDataManager,
-    useCameraForId,
+    optimizelyExperimentName,
+    shouldUseCamera,
+    portraitPhotoMode,
+    idPhotoMode,
    reachedSummary,
+    setExistingIdVerification,
    setFacePhotoFile,
    setIdPhotoFile,
    setIdPhotoName,
-    setUseCameraForId,
+    setOptimizelyExperimentName,
+    setShouldUseCamera,
+    setPortraitPhotoMode,
+    setIdPhotoMode,
    setReachedSummary,
    tryGetUserMedia: async () => {
      try {
        const stream = await navigator.mediaDevices.getUserMedia({ video: true });
        setMediaAccess(MEDIA_ACCESS.GRANTED);
        setMediaStream(stream);
+        setShouldUseCamera(true);
        // stop the stream, as we are not using it yet
        const tracks = stream.getTracks();
        tracks.forEach(track => track.stop());
      } catch (err) {
        setMediaAccess(MEDIA_ACCESS.DENIED);
+        setShouldUseCamera(false);
      }
    },
    stopUserMedia: () => {
@@ -110,13 +139,10 @@ const IdVerificationContextProvider = ({ children }) => {
        setMediaStream(null);
      }
    },
-  }), [authenticatedUser.name, authenticatedUser.userId, existingIdVerification, facePhotoFile,
-    idPhotoFile, idPhotoName, mediaAccess, mediaStream, profileDataManager, reachedSummary,
-    useCameraForId, verifiedName]);
+  };

-  const loadingStatuses = [IDLE_STATUS, LOADING_STATUS];
-  // If we are waiting for verification status or verified name history endpoint, show spinner.
-  if (loadingStatuses.includes(idVerificationData.status) || loadingStatuses.includes(verifiedNameHistoryCallStatus)) {
+  // If we are waiting for verification status endpoint, show spinner.
+  if (isIDVerificationLoading || isVerifiedNameHistoryLoading) {
    return <PageLoading srMessage="Loading verification status" />;
  }

@@ -129,10 +155,8 @@ const IdVerificationContextProvider = ({ children }) => {
      {children}
    </IdVerificationContext.Provider>
  );
-};
+}

 IdVerificationContextProvider.propTypes = {
  children: PropTypes.node.isRequired,
 };
-
-export default IdVerificationContextProvider;
--- a/src/id-verification/IdVerificationPage.jsx
+++ b/src/id-verification/IdVerificationPage.jsx
@@ -3,10 +3,9 @@ import { connect } from 'react-redux';
 import {
  Route, Switch, Redirect, useRouteMatch, useLocation,
 } from 'react-router-dom';
-import camelCase from 'lodash.camelcase';
 import qs from 'qs';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button, ModalDialog, ActionRow } from '@edx/paragon';
+import { Modal, Button } from '@edx/paragon';
 import { getConfig } from '@edx/frontend-platform';
 import { idVerificationSelector } from './data/selectors';
 import './getUserMediaShim';
@@ -14,6 +13,7 @@ import './getUserMediaShim';
 import IdVerificationContextProvider from './IdVerificationContextProvider';
 import { VerifiedNameContextProvider } from './VerifiedNameContext';
 import ReviewRequirementsPanel from './panels/ReviewRequirementsPanel';
+import ChooseModePanel from './panels/ChooseModePanel';
 import RequestCameraAccessPanel from './panels/RequestCameraAccessPanel';
 import PortraitPhotoContextPanel from './panels/PortraitPhotoContextPanel';
 import TakePortraitPhotoPanel from './panels/TakePortraitPhotoPanel';
@@ -26,22 +26,22 @@ import SubmittedPanel from './panels/SubmittedPanel';
 import messages from './IdVerification.messages';

 // eslint-disable-next-line react/prefer-stateless-function
-const IdVerificationPage = (props) => {
+function IdVerificationPage(props) {
  const { path } = useRouteMatch();
  const { search } = useLocation();

  const [isModalOpen, setIsModalOpen] = useState(false);

-  // Save query params in order to route back to the correct location later
+  // Course run key is passed as a query string
  useEffect(() => {
    if (search) {
-      const parsedQueryParams = qs.parse(search, {
+      const parsed = qs.parse(search, {
        ignoreQueryPrefix: true,
        interpretNumericEntities: true,
      });
-      Object.entries(parsedQueryParams).forEach(([key, value]) => {
-        sessionStorage.setItem(camelCase(key), value);
-      });
+      if (Object.prototype.hasOwnProperty.call(parsed, 'course_id') && parsed.course_id) {
+        sessionStorage.setItem('courseRunKey', parsed.course_id);
+      }
    }
  }, [search]);

@@ -56,6 +56,7 @@ const IdVerificationPage = (props) => {
              <IdVerificationContextProvider>
                <Switch>
                  <Route path={`${path}/review-requirements`} component={ReviewRequirementsPanel} />
+                  <Route path={`${path}/choose-mode`} component={ChooseModePanel} />
                  <Route path={`${path}/request-camera-access`} component={RequestCameraAccessPanel} />
                  <Route path={`${path}/portrait-photo-context`} component={PortraitPhotoContextPanel} />
                  <Route path={`${path}/take-portrait-photo`} component={TakePortraitPhotoPanel} />
@@ -74,20 +75,12 @@ const IdVerificationPage = (props) => {
            </Button>
          </div>
        </div>
-        <ModalDialog
-          isOpen={isModalOpen}
-          title="Id modal"
-          onClose={() => setIsModalOpen(false)}
-          size="lg"
-          hasCloseButton={false}
-        >
-          <ModalDialog.Header>
-            <ModalDialog.Title data-testid="Id-modal">
-              {props.intl.formatMessage(messages['id.verification.privacy.title'])}
-            </ModalDialog.Title>
-          </ModalDialog.Header>
-          <ModalDialog.Body>
-            <div className="p-3">
+
+        <Modal
+          open={isModalOpen}
+          title={props.intl.formatMessage(messages['id.verification.privacy.title'])}
+          body={(
+            <div>
              <h6>
                {props.intl.formatMessage(
                  messages['id.verification.privacy.need.photo.question'],
@@ -108,20 +101,13 @@ const IdVerificationPage = (props) => {
                )}
              </p>
            </div>
-          </ModalDialog.Body>
-          <ModalDialog.Footer className="p-2">
-            <ActionRow>
-              <ModalDialog.CloseButton variant="link">
-                Close
-              </ModalDialog.CloseButton>
-            </ActionRow>
-          </ModalDialog.Footer>
-        </ModalDialog>
-
+          )}
+          onClose={() => setIsModalOpen(false)}
+        />
      </div>
    </>
  );
-};
+}

 IdVerificationPage.propTypes = {
  intl: intlShape.isRequired,
--- a/src/id-verification/ImageFileUpload.jsx
+++ b/src/id-verification/ImageFileUpload.jsx
@@ -5,7 +5,7 @@ import { Alert } from '@edx/paragon';
 import messages from './IdVerification.messages';
 import SupportedMediaTypes from './SupportedMediaTypes';

-const ImageFileUpload = ({ onFileChange, intl }) => {
+export default function ImageFileUpload({ onFileChange, setPhotoMode, intl }) {
  const [error, setError] = useState(null);
  const errorTypes = {
    invalidFileType: 'invalidFileType',
@@ -28,10 +28,11 @@ const ImageFileUpload = ({ onFileChange, intl }) => {
      const fileReader = new FileReader();
      fileReader.addEventListener('load', () => {
        onFileChange(fileReader.result);
+        setPhotoMode('upload');
      });
      fileReader.readAsDataURL(fileObject);
    }
-  }, [errorTypes.fileTooLarge, errorTypes.invalidFileType, onFileChange]);
+  }, []);

  return (
    <>
@@ -54,11 +55,10 @@ const ImageFileUpload = ({ onFileChange, intl }) => {
      )}
    </>
  );
-};
+}

 ImageFileUpload.propTypes = {
  onFileChange: PropTypes.func.isRequired,
+  setPhotoMode: PropTypes.func.isRequired,
  intl: intlShape.isRequired,
 };
-
-export default ImageFileUpload;
--- a/src/id-verification/ImagePreview.jsx
+++ b/src/id-verification/ImagePreview.jsx
@@ -1,13 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';

-const ImagePreview = ({ src, alt, id }) => (
-  <div id={id} className="image-preview">
+export default function ImagePreview({ src, alt, id }) {
+  return (
+    <div id={id} className="image-preview">

-    <img data-hj-suppress style={{ objectFit: 'contain' }} src={src} alt={alt} />
+      <img data-hj-suppress style={{ objectFit: 'contain' }} src={src} alt={alt} />

-  </div>
-);
+    </div>
+  );
+}

 ImagePreview.propTypes = {
  src: PropTypes.string.isRequired,
@@ -18,5 +20,3 @@ ImagePreview.propTypes = {
 ImagePreview.defaultProps = {
  id: undefined,
 };
-
-export default ImagePreview;
--- a/src/id-verification/SupportedMediaTypes.jsx
+++ b/src/id-verification/SupportedMediaTypes.jsx
@@ -1,6 +1,6 @@
 import React from 'react';

-const SupportedMediaTypes = () => {
+export default function SupportedMediaTypes() {
  const SUPPORTED_TYPES = ['.png', '.jpeg', '.jpg', '.bmp', '.webp', '.tiff'];

  const getSupportedTypes = () => SUPPORTED_TYPES.map((type, index) => {
@@ -11,6 +11,4 @@ const SupportedMediaTypes = () => {
  });

  return <span>{getSupportedTypes()}</span>;
-};
-
-export default SupportedMediaTypes;
+}
--- a/src/id-verification/VerifiedNameContext.jsx
+++ b/src/id-verification/VerifiedNameContext.jsx
@@ -1,30 +1,37 @@
-import React, { createContext, useMemo } from 'react';
+import React, { createContext, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';

 import { getVerifiedNameHistory } from '../account-settings/data/service';
 import { getMostRecentApprovedOrPendingVerifiedName } from '../utils';
 import { useAsyncCall } from '../hooks';
-import { SUCCESS_STATUS } from '../constants';

 export const VerifiedNameContext = createContext();

-export const VerifiedNameContextProvider = ({ children }) => {
-  const verifiedNameHistoryData = useAsyncCall(getVerifiedNameHistory);
+export function VerifiedNameContextProvider({ children }) {
+  const [verifiedNameEnabled, setVerifiedNameEnabled] = useState(false);
+  const [verifiedName, setVerifiedName] = useState('');
+  const [isVerifiedNameHistoryLoading, verifiedNameHistory] = useAsyncCall(getVerifiedNameHistory);

-  let verifiedName = '';
-  const { status, data } = verifiedNameHistoryData;
-  if (status === SUCCESS_STATUS && data) {
-    const { results } = data;
-    verifiedName = getMostRecentApprovedOrPendingVerifiedName(results);
-  }
+  useEffect(() => {
+    if (verifiedNameHistory) {
+      const { verified_name_enabled: verifiedNameFeatureEnabled, results } = verifiedNameHistory;
+      setVerifiedNameEnabled(verifiedNameFeatureEnabled);

-  const value = useMemo(() => ({
-    verifiedNameHistoryCallStatus: status,
+      if (verifiedNameFeatureEnabled) {
+        const applicableVerifiedName = getMostRecentApprovedOrPendingVerifiedName(results);
+        setVerifiedName(applicableVerifiedName);
+      }
+    }
+  }, [verifiedNameHistory]);
+
+  const value = {
+    isVerifiedNameHistoryLoading,
+    verifiedNameEnabled,
    verifiedName,
-  }), [status, verifiedName]);
+  };

  return (<VerifiedNameContext.Provider value={value}>{children}</VerifiedNameContext.Provider>);
-};
+}

 VerifiedNameContextProvider.propTypes = {
  children: PropTypes.node.isRequired,
--- a/src/id-verification/_id-verification.scss
+++ b/src/id-verification/_id-verification.scss
@@ -4,8 +4,7 @@
      max-width: 100%;
    }
    .card.accent {
-      border-top-width: 4px;
-      border-top-style: solid;
+      border-top: solid 4px theme-color('warning');
    }
    .image-preview {
      margin-bottom: 1rem;
--- a/src/id-verification/data/service.js
+++ b/src/id-verification/data/service.js
@@ -44,7 +44,7 @@ export async function getEnrollments() {
    const { data } = await getAuthenticatedHttpClient().get(url, requestConfig);
    return data;
  } catch (e) {
-    return {};
+    return [];
  }
 }

@@ -64,6 +64,9 @@ export async function submitIdVerification(verificationData) {
    facePhotoFile: 'face_image',
    idPhotoFile: 'photo_id_image',
    idPhotoName: 'full_name',
+    optimizelyExperimentName: 'experiment_name',
+    portraitPhotoMode: 'portrait_photo_mode',
+    idPhotoMode: 'id_photo_mode',
  };
  const postData = {};
  // Don't include blank/null/undefined values.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Régis Behmo	5f1b6cccea	Merge pull request #565 from regisb/regisb/upgrade-build-header chore: upgrade frontend-build and frontend-component-header	2021-12-20 17:52:25 +01:00
Régis Behmo	4046c263b5	chore: upgrade frontend-build and frontend-component-header Ran: npm install @edx/frontend-component-header@latest npm install @edx/frontend-build@latest	2021-12-20 17:28:48 +01:00