diff --git a/.github/workflows/webapp-ci.yml b/.github/workflows/webapp-ci.yml
index 67bb02708a8..6bd49d3f834 100644
--- a/.github/workflows/webapp-ci.yml
+++ b/.github/workflows/webapp-ci.yml
@@ -41,18 +41,10 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: ci/setup
         uses: ./.github/actions/webapp-setup
-      - name: ci/lint
+      - name: ci/i18n-extract
         working-directory: webapp/channels
         run: |
-          cp src/i18n/en.json /tmp/en.json
-          mkdir -p /tmp/fake-mobile-dir/assets/base/i18n/
-          echo '{}' > /tmp/fake-mobile-dir/assets/base/i18n/en.json
-          npm run mmjstool -- i18n extract-webapp --webapp-dir ./src --mobile-dir /tmp/fake-mobile-dir
-          diff /tmp/en.json src/i18n/en.json
-          # Address weblate behavior which does not remove whole translation item when translation string is set to empty
-          npm run mmjstool -- i18n clean-empty --webapp-dir ./src --mobile-dir /tmp/fake-mobile-dir --check
-          npm run mmjstool -- i18n check-empty-src --webapp-dir ./src --mobile-dir /tmp/fake-mobile-dir
-          rm -rf tmp
+          npm run i18n-extract:check
 
   check-types:
     needs: check-lint
diff --git a/e2e-tests/cypress/package-lock.json b/e2e-tests/cypress/package-lock.json
index 08aee13e696..96ba04cb05d 100644
--- a/e2e-tests/cypress/package-lock.json
+++ b/e2e-tests/cypress/package-lock.json
@@ -93,7 +93,6 @@
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -1071,7 +1070,6 @@
       "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1114,6 +1112,7 @@
       "integrity": "sha512-N4ntErOlKvcbTt01rr5wj3y55xnIdx1ymrfIr8C2WnM1Y9glFgWaGDEULJIazOX3XM9NRzhfJ6zZnQ1sBNWU+w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
@@ -1150,7 +1149,6 @@
       "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/parser": "^7.28.0",
         "@babel/types": "^7.28.0",
@@ -1168,7 +1166,6 @@
       "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.27.2",
         "@babel/helper-validator-option": "^7.27.1",
@@ -1186,7 +1183,6 @@
       "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1197,7 +1193,6 @@
       "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/traverse": "^7.27.1",
         "@babel/types": "^7.27.1"
@@ -1212,7 +1207,6 @@
       "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.27.1",
         "@babel/helper-validator-identifier": "^7.27.1",
@@ -1231,7 +1225,6 @@
       "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1252,7 +1245,6 @@
       "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1263,7 +1255,6 @@
       "integrity": "sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/template": "^7.27.2",
         "@babel/types": "^7.28.2"
@@ -1278,7 +1269,6 @@
       "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/types": "^7.28.0"
       },
@@ -1305,7 +1295,6 @@
       "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/parser": "^7.27.2",
@@ -1321,7 +1310,6 @@
       "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.0",
@@ -1341,7 +1329,6 @@
       "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
         "@babel/helper-validator-identifier": "^7.27.1"
@@ -1813,7 +1800,6 @@
       "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -1825,7 +1811,6 @@
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -1836,7 +1821,6 @@
       "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
@@ -1847,8 +1831,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
       "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.30",
@@ -1856,7 +1839,6 @@
       "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -1884,6 +1866,7 @@
       "integrity": "sha512-2795KUkp2EkuJ9NVohPkJmrgKunt6OZiLyo8zUoIWPJjxQ0upjiWJz/KenABx38v8+QfpSEN8tZSBN3lsZCueg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "typescript": "^4.3.0 || ^5.0.0"
       },
@@ -2866,7 +2849,6 @@
       "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -2878,7 +2860,6 @@
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -3179,6 +3160,7 @@
       "integrity": "sha512-pUXGCuHnnKw6PyYq93lLRiZm3vjuslIy7tus1lIQTYVK9bL8XBgJnCWm8a0KcTtHC84Yya1Q6rtll+duSMj0dg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.39.1",
         "@typescript-eslint/types": "8.39.1",
@@ -3397,7 +3379,6 @@
       "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.13.2",
         "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
@@ -3408,24 +3389,21 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
       "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
       "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
       "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.13.2",
@@ -3433,7 +3411,6 @@
       "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.13.2",
         "@webassemblyjs/helper-api-error": "1.13.2",
@@ -3445,8 +3422,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
       "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.14.1",
@@ -3454,7 +3430,6 @@
       "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -3468,7 +3443,6 @@
       "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -3479,7 +3453,6 @@
       "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
@@ -3489,8 +3462,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
       "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.14.1",
@@ -3498,7 +3470,6 @@
       "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -3516,7 +3487,6 @@
       "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
@@ -3531,7 +3501,6 @@
       "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -3545,7 +3514,6 @@
       "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-api-error": "1.13.2",
@@ -3561,7 +3529,6 @@
       "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
@@ -3572,16 +3539,14 @@
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true,
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/accepts": {
       "version": "2.0.0",
@@ -3603,6 +3568,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3616,7 +3582,6 @@
       "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.13.0"
       },
@@ -3671,7 +3636,6 @@
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -3690,7 +3654,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -3707,8 +3670,7 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/ally.js": {
       "version": "1.4.1",
@@ -4340,8 +4302,7 @@
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/byte-length": {
       "version": "1.0.2",
@@ -4462,8 +4423,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "CC-BY-4.0",
-      "peer": true
+      "license": "CC-BY-4.0"
     },
     "node_modules/caseless": {
       "version": "0.12.0",
@@ -4558,7 +4518,6 @@
       "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.0"
       }
@@ -4848,8 +4807,7 @@
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/cookie": {
       "version": "0.7.2",
@@ -4935,6 +4893,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@cypress/request": "^3.0.9",
         "@cypress/xvfb": "^1.2.4",
@@ -5423,8 +5382,7 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.200.tgz",
       "integrity": "sha512-rFCxROw7aOe4uPTfIAx+rXv9cEcGx+buAF4npnhtTqCJk5KDFRnh3+KYj7rdVh6lsFt5/aPs+Irj9rZ33WMA7w==",
       "dev": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
@@ -5473,6 +5431,7 @@
       "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-colors": "^4.1.1",
         "strip-ansi": "^6.0.1"
@@ -5603,8 +5562,7 @@
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
       "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
@@ -5702,6 +5660,7 @@
       "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -5903,6 +5862,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -6535,8 +6495,7 @@
           "url": "https://opencollective.com/fastify"
         }
       ],
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/fast-xml-parser": {
       "version": "5.2.5",
@@ -6916,7 +6875,6 @@
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -7083,8 +7041,7 @@
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "peer": true
+      "license": "BSD-2-Clause"
     },
     "node_modules/glob/node_modules/minimatch": {
       "version": "10.0.3",
@@ -8046,7 +8003,6 @@
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -8062,7 +8018,6 @@
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8079,6 +8034,7 @@
       "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "jiti": "lib/jiti-cli.mjs"
       }
@@ -8116,7 +8072,6 @@
       "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -8136,8 +8091,7 @@
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
@@ -8173,7 +8127,6 @@
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -8449,7 +8402,6 @@
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.11.5"
       }
@@ -8652,7 +8604,6 @@
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -8874,6 +8825,7 @@
       "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "browser-stdout": "^1.3.1",
         "chokidar": "^4.0.1",
@@ -9417,8 +9369,7 @@
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/node-ensure": {
       "version": "0.0.0",
@@ -9432,8 +9383,7 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
       "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/notp": {
       "version": "2.0.3",
@@ -10619,7 +10569,6 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10852,7 +10801,6 @@
       "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -10891,7 +10839,6 @@
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -10904,8 +10851,7 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "6.3.1",
@@ -10972,6 +10918,7 @@
       "integrity": "sha512-b0IrY3b1gVMsWvJppCf19g1p3JSnS0hQi6xu4Hi40CIhf0Lx8pQHcvBL+xunShpmOiQzg1NOia812NAWdSaShw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@servie/events": "^1.0.0",
         "byte-length": "^1.0.2",
@@ -11229,7 +11176,6 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11240,7 +11186,6 @@
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -11659,7 +11604,6 @@
       "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.14.0",
@@ -11679,7 +11623,6 @@
       "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
@@ -11714,8 +11657,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/thirty-two": {
       "version": "0.0.2",
@@ -12038,6 +11980,7 @@
       "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -12106,6 +12049,7 @@
       "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.41.0",
         "@typescript-eslint/types": "8.41.0",
@@ -12394,7 +12338,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "escalade": "^3.2.0",
         "picocolors": "^1.1.1"
@@ -12513,7 +12456,6 @@
       "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -12528,7 +12470,6 @@
       "integrity": "sha512-rHY3vHXRbkSfhG6fH8zYQdth/BtDgXXuR2pHF++1f/EBkI8zkgM5XWfsC3BvOoW9pr1CvZ1qQCxhCEsbNgT50g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.8",
@@ -12578,7 +12519,6 @@
       "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.13.0"
       }
@@ -12589,7 +12529,6 @@
       "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -12604,7 +12543,6 @@
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -12615,7 +12553,6 @@
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -12629,7 +12566,6 @@
       "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -12906,8 +12842,7 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/yargs": {
       "version": "17.7.2",
diff --git a/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_popovers_spec.js b/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_popovers_spec.js
index 27bbb892e77..e188633515d 100644
--- a/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_popovers_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_popovers_spec.js
@@ -50,7 +50,7 @@ describe('Verify Accessibility Support in Popovers', () => {
                 {ariaLabel: 'People & Body', header: 'People & Body'},
                 {ariaLabel: 'Animals & Nature', header: 'Animals & Nature'},
                 {ariaLabel: 'Food & Drink', header: 'Food & Drink'},
-                {ariaLabel: 'Travel Places', header: 'Travel Places'},
+                {ariaLabel: 'Travel & Places', header: 'Travel & Places'},
                 {ariaLabel: 'Activities', header: 'Activities'},
                 {ariaLabel: 'Objects', header: 'Objects'},
                 {ariaLabel: 'Symbols', header: 'Symbols'},
diff --git a/e2e-tests/cypress/tests/integration/channels/account_settings/profile/email_spec.ts b/e2e-tests/cypress/tests/integration/channels/account_settings/profile/email_spec.ts
index 4339ae49753..3891822871d 100644
--- a/e2e-tests/cypress/tests/integration/channels/account_settings/profile/email_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/account_settings/profile/email_spec.ts
@@ -85,7 +85,7 @@ describe('Profile > Profile Settings > Email', () => {
         cy.get('#primaryEmail').should('be.visible').click().blur();
 
         // * Check that the correct error message is shown.
-        cy.get('#error_primaryEmail').should('be.visible').should('have.text', 'Please enter a valid email address');
+        cy.get('#error_primaryEmail').should('be.visible').should('have.text', 'Please enter a valid email address.');
     });
 
     it('MM-T2067 email address already taken error', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_1_spec.ts b/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_1_spec.ts
index 8f3b02e29a3..6f4061bb835 100644
--- a/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_1_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_1_spec.ts
@@ -61,7 +61,7 @@ describe('Authentication', () => {
 
         cy.get('#input_name').clear().type(`test${getRandomId()}`);
 
-        cy.findByText('Create Account').click();
+        cy.findByText('Create account').click();
 
         // * Make sure account was created successfully and we are at the select team page
         cy.findByText('Teams you can join:', {timeout: TIMEOUTS.ONE_MIN}).should('be.visible');
@@ -113,7 +113,7 @@ describe('Authentication', () => {
 
         cy.get('#input_name').clear().type(`test${getRandomId()}`);
 
-        cy.findByText('Create Account').click();
+        cy.findByText('Create account').click();
 
         // * Make sure account was not created successfully
         cy.get('.AlertBanner__title').scrollIntoView().should('be.visible');
@@ -146,7 +146,7 @@ describe('Authentication', () => {
 
             cy.get('#input_name').clear().type(username);
 
-            cy.findByText('Create Account').click();
+            cy.findByText('Create account').click();
 
             // * Make sure account was created successfully and we are on the team joining page
             cy.findByText('Teams you can join:', {timeout: TIMEOUTS.ONE_MIN}).should('be.visible');
diff --git a/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_2_spec.ts b/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_2_spec.ts
index 9a3d2064d56..7198829b4f8 100644
--- a/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_2_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_2_spec.ts
@@ -61,14 +61,14 @@ describe('Authentication', () => {
 
         cy.get('#input_password-input').clear().type('less');
 
-        cy.findByText('Create Account').click();
+        cy.findByText('Create account').click();
 
         // * Assert the error is what is expected;
         cy.findByText('Your password must be 7-72 characters long.').should('be.visible');
 
         cy.get('#input_password-input').clear().type('greaterthan7');
 
-        cy.findByText('Create Account').click();
+        cy.findByText('Create account').click();
 
         // * Assert that we are not shown an MFA screen and instead a Teams You Can join page
         cy.findByText('Teams you can join:', {timeout: TIMEOUTS.ONE_MIN}).should('be.visible');
@@ -114,7 +114,7 @@ describe('Authentication', () => {
 
         ['NOLOWERCASE123!', 'noupppercase123!', 'NoNumber!', 'NoSymbol123'].forEach((option) => {
             cy.get('#input_password-input').clear().type(option);
-            cy.findByText('Create Account').click();
+            cy.findByText('Create account').click();
 
             // * Assert the error is what is expected;
             cy.findByText('Your password must be 5-72 characters long and include both lowercase and uppercase letters, numbers, and special characters.').should('be.visible');
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_input_fields_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_input_fields_spec.ts
index 365b59a755f..09455c0e342 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_input_fields_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_input_fields_spec.ts
@@ -49,7 +49,7 @@ describe('Verify Accessibility Support in different input fields', () => {
 
         // * Verify Accessibility Support in Add or Invite People input field
         cy.get('.users-emails-input__control').should('be.visible').within(() => {
-            cy.get('input').should('have.attr', 'aria-label', 'Add or Invite People').and('have.attr', 'aria-autocomplete', 'list');
+            cy.get('input').should('have.attr', 'aria-label', 'Invite People').and('have.attr', 'aria-autocomplete', 'list');
             cy.get('.users-emails-input__placeholder').should('have.text', 'Enter a name or email address');
         });
 
@@ -58,7 +58,7 @@ describe('Verify Accessibility Support in different input fields', () => {
 
         // * Verify Accessibility Support in Invite People input field
         cy.get('.users-emails-input__control').should('be.visible').within(() => {
-            cy.get('input').should('have.attr', 'aria-label', 'Add or Invite People').and('have.attr', 'aria-autocomplete', 'list');
+            cy.get('input').should('have.attr', 'aria-label', 'Invite People').and('have.attr', 'aria-autocomplete', 'list');
             cy.get('.users-emails-input__placeholder').should('have.text', 'Enter a name or email address');
         });
 
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/auth_sso/authentication_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/auth_sso/authentication_spec.ts
index 00b914f9d26..22b2701697b 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/auth_sso/authentication_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/auth_sso/authentication_spec.ts
@@ -58,7 +58,7 @@ describe('Authentication', () => {
 
         cy.get('#input_name').clear().type(`Test${getRandomId()}`);
 
-        cy.findByText('Create Account').click();
+        cy.findByText('Create account').click();
 
         // * Make sure account was not created successfully
         cy.get('.AlertBanner__title').scrollIntoView().should('be.visible');
diff --git a/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/gm_header_spec.js b/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/gm_header_spec.js
index 3bb9e501647..4a211564899 100644
--- a/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/gm_header_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/gm_header_spec.js
@@ -61,7 +61,7 @@ describe('Multi-user group header', () => {
         cy.get('#editChannelHeaderModalLabel').should('be.visible').wait(TIMEOUTS.ONE_SEC);
 
         // # Add the header in the modal
-        cy.findByPlaceholderText('Edit the Channel Header...').should('be.visible').type(`${header}{enter}`);
+        cy.findByPlaceholderText('Enter the Channel Header').should('be.visible').type(`${header}{enter}`);
 
         // # Wait for modal to disappear
         cy.waitUntil(() => cy.get('#editChannelHeaderModalLabel').should('not.be.visible'));
diff --git a/e2e-tests/cypress/tests/integration/channels/onboarding/existing_email_adress_spec.js b/e2e-tests/cypress/tests/integration/channels/onboarding/existing_email_adress_spec.js
index 6849be8aaa5..c0c74a79c75 100644
--- a/e2e-tests/cypress/tests/integration/channels/onboarding/existing_email_adress_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/onboarding/existing_email_adress_spec.js
@@ -32,7 +32,7 @@ function signupWithEmail(name, pw) {
     cy.get('#input_password-input').type(pw);
 
     // # Click on Create Account button
-    cy.findByText('Create Account').click();
+    cy.findByText('Create account').click();
 }
 
 describe('Cloud Onboarding', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/onboarding/login_page_link_account_creation_spec.js b/e2e-tests/cypress/tests/integration/channels/onboarding/login_page_link_account_creation_spec.js
index 19e79f25459..14f55a8f762 100644
--- a/e2e-tests/cypress/tests/integration/channels/onboarding/login_page_link_account_creation_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/onboarding/login_page_link_account_creation_spec.js
@@ -71,7 +71,7 @@ describe('Onboarding', () => {
         cy.get('#input_email').should('be.focused').and('be.visible').type(email);
         cy.get('#input_name').should('be.visible').type(username);
         cy.get('#input_password-input').should('be.visible').type(password);
-        cy.findByText('Create Account').click();
+        cy.findByText('Create account').click();
 
         cy.findByText('You’re almost done!').should('be.visible');
 
diff --git a/e2e-tests/cypress/tests/integration/channels/onboarding/use_team_invite_link_to_sign_up_spec.js b/e2e-tests/cypress/tests/integration/channels/onboarding/use_team_invite_link_to_sign_up_spec.js
index ea10dd6eb64..92eb39043d5 100644
--- a/e2e-tests/cypress/tests/integration/channels/onboarding/use_team_invite_link_to_sign_up_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/onboarding/use_team_invite_link_to_sign_up_spec.js
@@ -71,8 +71,8 @@ describe('Onboarding', () => {
         cy.get('#input_name').should('be.visible').type(username);
         cy.get('#input_password-input').should('be.visible').type(password);
 
-        // # Attempt to create an account by clicking on the 'Create Account' button
-        cy.findByText('Create Account').click();
+        // # Attempt to create an account by clicking on the 'Create account' button
+        cy.findByText('Create account').click();
 
         cy.wait(TIMEOUTS.HALF_SEC);
 
diff --git a/e2e-tests/cypress/tests/integration/channels/signin_authentication/forgot_password_spec.js b/e2e-tests/cypress/tests/integration/channels/signin_authentication/forgot_password_spec.js
index c53c510b088..ea0037c59e3 100644
--- a/e2e-tests/cypress/tests/integration/channels/signin_authentication/forgot_password_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/signin_authentication/forgot_password_spec.js
@@ -91,7 +91,7 @@ describe('Signin/Authentication', () => {
             cy.url().should('contain', '/login?extra=password_change');
 
             // * Should show that the password is updated successfully
-            cy.get('.AlertBanner.success').should('be.visible').and('have.text', ' Password updated successfully');
+            cy.get('.AlertBanner.success').should('be.visible').and('have.text', 'Password updated successfully');
 
             // # Type email and new password, then click login button
             cy.get('#input_loginId').should('be.visible').type(testUser.username);
diff --git a/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js b/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js
index f79a019a9fb..9512f2bf3c1 100644
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js
@@ -85,7 +85,7 @@ describe('Team Settings', () => {
             cy.get('.InviteAs').findByTestId('inviteMembersLink').click();
         }
 
-        cy.findByRole('combobox', {name: 'Add or Invite People'}).type(email, {force: true}).wait(TIMEOUTS.HALF_SEC).type('{enter}', {force: true});
+        cy.findByRole('combobox', {name: 'Invite People'}).type(email, {force: true}).wait(TIMEOUTS.HALF_SEC).type('{enter}', {force: true});
         cy.findByTestId('inviteButton').click();
 
         // # Wait for a while to ensure that email notification is sent and logout from sysadmin account
@@ -115,7 +115,7 @@ describe('Team Settings', () => {
         cy.get('#input_password-input').type(password);
 
         // # Attempt to create an account by clicking on the 'Create Account' button
-        cy.findByText('Create Account').click();
+        cy.findByText('Create account').click();
 
         // # Close the onboarding tutorial
         cy.uiCloseOnboardingTaskList();
diff --git a/e2e-tests/cypress/tests/integration/channels/team_settings/join_closed_team_with_not_allowed_email_spec.js b/e2e-tests/cypress/tests/integration/channels/team_settings/join_closed_team_with_not_allowed_email_spec.js
index 0e5096cff4f..976ad356bc3 100644
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/join_closed_team_with_not_allowed_email_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/join_closed_team_with_not_allowed_email_spec.js
@@ -87,8 +87,8 @@ describe('Team Settings', () => {
             cy.get('#input_name').type(username);
             cy.get('#input_password-input').type(password);
 
-            // # Attempt to create an account by clicking on the 'Create Account' button
-            cy.findByText('Create Account').click();
+            // # Attempt to create an account by clicking on the 'Create account' button
+            cy.findByText('Create account').click();
 
             // * Assert that the expected error message from creating an account with an email not from the allowed email domain exists and is visible
             cy.findByText(errorMessage).should('be.visible');
diff --git a/e2e-tests/cypress/tests/support/ui/compliance_export.js b/e2e-tests/cypress/tests/support/ui/compliance_export.js
index 75a9a5f74fe..9dac1d1676e 100644
--- a/e2e-tests/cypress/tests/support/ui/compliance_export.js
+++ b/e2e-tests/cypress/tests/support/ui/compliance_export.js
@@ -6,7 +6,7 @@ import * as TIMEOUTS from '../../fixtures/timeouts';
 Cypress.Commands.add('uiEnableComplianceExport', (exportFormat = 'csv') => {
     // * Verify that the page is loaded
     cy.findByText('Enable Compliance Export:').should('be.visible');
-    cy.findByText('Compliance Export time:').should('be.visible');
+    cy.findByText('Compliance Export Time:').should('be.visible');
     cy.findByText('Export Format:').should('be.visible');
 
     // # Enable compliance export
diff --git a/e2e-tests/cypress/tests/utils/admin_console.js b/e2e-tests/cypress/tests/utils/admin_console.js
index b18c0ffc406..d990cb0c25e 100644
--- a/e2e-tests/cypress/tests/utils/admin_console.js
+++ b/e2e-tests/cypress/tests/utils/admin_console.js
@@ -241,7 +241,7 @@ export const adminConsoleNavigation = [
     },
     {
         type: ['team', 'e20', 'cloud_enterprise'],
-        header: 'Email Authentication',
+        header: 'Email',
         sidebar: 'Email',
         url: 'admin_console/authentication/email',
     },
diff --git a/webapp/Makefile b/webapp/Makefile
index a01f59d0602..f2ae6d22ae9 100644
--- a/webapp/Makefile
+++ b/webapp/Makefile
@@ -63,6 +63,18 @@ check-types: node_modules ## Checks TS file for TypeScript confirmity
 
 	npm run check-types
 
+.PHONY: i18n-extract
+i18n-extract: node_modules ## Extracts i18n messages from code to en.json
+	@echo Extracting i18n messages
+
+	npm run i18n-extract
+
+.PHONY: i18n-extract-check
+i18n-extract-check: node_modules ## Checks if en.json is in sync with code
+	@echo Checking i18n message sync
+
+	npm run i18n-extract:check
+
 .PHONY: dist
 dist: node_modules ## Builds all web app packages
 	@echo Packaging Mattermost Web App
diff --git a/webapp/channels/.eslintrc.json b/webapp/channels/.eslintrc.json
index 793badea192..0505b4e282b 100644
--- a/webapp/channels/.eslintrc.json
+++ b/webapp/channels/.eslintrc.json
@@ -8,7 +8,10 @@
     "no-only-tests"
   ],
   "settings": {
-    "import/resolver": "webpack"
+    "import/resolver": "webpack",
+    "formatjs": {
+      "additionalFunctionNames": ["localizeMessage", "defineMessage"]
+    }
   },
   "rules": {
     "react/prop-types": [
@@ -32,7 +35,16 @@
     "react/style-prop-object": [2, {
       "allow": ["Timestamp"]
     }],
+    "formatjs/enforce-default-message": 2,
+    "formatjs/enforce-id": 2,
+    "formatjs/enforce-placeholders": 2,
+    "formatjs/no-invalid-icu": 2,
+    "formatjs/no-multiple-plurals": 1,
     "formatjs/no-multiple-whitespaces": 2,
+    "formatjs/no-literal-string-in-jsx": 1,
+    "formatjs/prefer-formatted-message": 1,
+    "formatjs/no-useless-message": 1,
+    "formatjs/prefer-pound-in-plural": 0,
     "react/jsx-fragments": ["error", "syntax"]
   },
   "overrides": [
diff --git a/webapp/channels/.gitignore b/webapp/channels/.gitignore
index c1c7faa7e23..f9f49334830 100644
--- a/webapp/channels/.gitignore
+++ b/webapp/channels/.gitignore
@@ -24,3 +24,6 @@ Session.vim
 *~
 .eslintcache
 .stylelintcache
+
+# i18n temporary check file
+.i18n-check.tmp.json
diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index b1ca6c63b74..746555ffa37 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -99,7 +99,6 @@
     "@deanwhillier/jest-matchmedia-mock": "1.2.0",
     "@mattermost/calls-common": "0.27.0",
     "@mattermost/eslint-plugin": "*",
-    "@mattermost/mmjstool": "github:mattermost/mattermost-utilities#7b63833d208d482ba4a1c12230bb3e68dd9c5e5e",
     "@stylistic/stylelint-plugin": "3.1.2",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.8.0",
@@ -188,10 +187,8 @@
     "test-ci": "cross-env TZ=Etc/UTC LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 jest --ci --maxWorkers=100% --forceExit --detectOpenHandles --logHeapUsage --coverage",
     "clean": "rm -rf dist node_modules .eslintcache .stylelintcache tsconfig.tsbuildinfo",
     "stats": "cross-env NODE_ENV=production webpack --profile --json > webpack_stats.json",
-    "mmjstool": "mmjstool",
-    "i18n-extract": "npm run mmjstool -- i18n extract-webapp --webapp-dir ./src",
-    "i18n-clean-empty": "npm run mmjstool -- i18n clean-empty --webapp-dir ./src",
-    "i18n-check-empty-src": "npm run mmjstool -- i18n check-empty-src --webapp-dir ./src",
+    "i18n-extract": "formatjs extract 'src/**/*.{js,jsx,ts,tsx}' --additional-function-names localizeMessage --ignore 'src/**/*.d.ts' --ignore 'src/**/*.test.{js,jsx,ts,tsx}' --out-file src/i18n/en.json --format scripts/formatter.js --id-interpolation-pattern '[sha512:contenthash:base64:6]' --preserve-whitespace",
+    "i18n-extract:check": "npm run i18n-extract -- --throws --out-file .i18n-check.tmp.json && diff src/i18n/en.json .i18n-check.tmp.json && rm -f .i18n-check.tmp.json || (rm -f .i18n-check.tmp.json && echo '\nen.json is out of sync with code. \nTo update: npm run i18n-extract' && exit 1)",
     "check-types": "tsc -b",
     "make-emojis": "node --experimental-json-modules build/emoji/make_emojis.mjs"
   }
diff --git a/webapp/channels/scripts/formatter.js b/webapp/channels/scripts/formatter.js
new file mode 100644
index 00000000000..c7f170a612c
--- /dev/null
+++ b/webapp/channels/scripts/formatter.js
@@ -0,0 +1,45 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+/**
+ * Custom formatjs formatter matching mmjstool's behavior
+ *
+ * Based on formatjs simple formatter with case-insensitive sorting
+ * to match mmjstool's sortJson({ignoreCase: true})
+ */
+
+/**
+ * Format function - extract defaultMessage from message objects
+ * Same as formatjs simple formatter
+ */
+module.exports.format = (msgs) => {
+    return Object.keys(msgs).reduce((all, k) => {
+        all[k] = msgs[k].defaultMessage;
+        return all;
+    }, {});
+};
+
+/**
+ * Compile function - pass through (identity)
+ * Same as formatjs simple formatter
+ */
+module.exports.compile = (msgs) => msgs;
+
+/**
+ * Custom comparator for case-insensitive alphabetical sorting
+ * with underscore before dot (to match existing en.json ordering)
+ */
+module.exports.compareMessages = (el1, el2) => {
+    // Normalize keys: replace _ with a character that sorts before .
+    // Use \x00 (null char) which sorts before all printable characters
+    const key1 = el1.key.toLowerCase().replace(/_/g, '\x00');
+    const key2 = el2.key.toLowerCase().replace(/_/g, '\x00');
+
+    if (key1 < key2) {
+        return -1;
+    }
+    if (key1 > key2) {
+        return 1;
+    }
+    return 0;
+};
diff --git a/webapp/channels/src/actions/apps.ts b/webapp/channels/src/actions/apps.ts
index 1ebf45504fd..bd2b495cfa5 100644
--- a/webapp/channels/src/actions/apps.ts
+++ b/webapp/channels/src/actions/apps.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import type {IntlShape} from 'react-intl';
 import type {AnyAction} from 'redux';
 
 import type {AppCallResponse, AppForm, AppCallRequest, AppContext, AppBinding} from '@mattermost/types/apps';
@@ -76,7 +77,7 @@ export function handleBindingClick<Res=unknown>(binding: AppBinding, context: Ap
     };
 }
 
-export function doAppSubmit<Res=unknown>(inCall: AppCallRequest, intl: any): ThunkActionFunc<Promise<DoAppCallResult<Res>>> {
+export function doAppSubmit<Res=unknown>(inCall: AppCallRequest, intl: IntlShape): ThunkActionFunc<Promise<DoAppCallResult<Res>>> {
     return async () => {
         try {
             const call: AppCallRequest = {
@@ -98,7 +99,7 @@ export function doAppSubmit<Res=unknown>(inCall: AppCallRequest, intl: any): Thu
                 if (!res.form?.submit) {
                     const errMsg = intl.formatMessage({
                         id: 'apps.error.responses.form.no_form',
-                        defaultMessage: 'Response type is `form`, but no valid form was included in response.',
+                        defaultMessage: 'Response type is `form`, but no form was included in response.',
                     });
                     return {error: makeCallErrorResponse(errMsg)};
                 }
@@ -153,7 +154,7 @@ export function doAppFetchForm<Res=unknown>(call: AppCallRequest, intl: any): Th
                 if (!res.form?.submit) {
                     const errMsg = intl.formatMessage({
                         id: 'apps.error.responses.form.no_form',
-                        defaultMessage: 'Response type is `form`, but no valid form was included in response.',
+                        defaultMessage: 'Response type is `form`, but no form was included in response.',
                     });
                     return {error: makeCallErrorResponse(errMsg)};
                 }
diff --git a/webapp/channels/src/actions/command.test.js b/webapp/channels/src/actions/command.test.js
index 2aa719a0f15..17111484722 100644
--- a/webapp/channels/src/actions/command.test.js
+++ b/webapp/channels/src/actions/command.test.js
@@ -168,7 +168,7 @@ describe('executeCommand', () => {
 
             expect(result).toEqual({
                 error: {
-                    message: 'Keyboard shortcuts are not supported on your device',
+                    message: 'Keyboard shortcuts are not supported on your device.',
                 },
             });
         });
diff --git a/webapp/channels/src/actions/command.ts b/webapp/channels/src/actions/command.ts
index 446ebcea2df..54a7c4b4d5d 100644
--- a/webapp/channels/src/actions/command.ts
+++ b/webapp/channels/src/actions/command.ts
@@ -25,14 +25,14 @@ import KeyboardShortcutsModal from 'components/keyboard_shortcuts/keyboard_short
 import LeaveChannelModal from 'components/leave_channel_modal';
 import MarketplaceModal from 'components/plugin_marketplace/marketplace_modal';
 import {AppCommandParser} from 'components/suggestion/command_provider/app_command_parser/app_command_parser';
-import {intlShim} from 'components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies';
 import UserSettingsModal from 'components/user_settings/modal';
 
 import {getHistory} from 'utils/browser_history';
 import {Constants, ModalIdentifiers} from 'utils/constants';
+import {getIntl} from 'utils/i18n';
 import {isUrlSafe, getSiteURL} from 'utils/url';
 import * as UserAgent from 'utils/user_agent';
-import {localizeMessage, getUserIdFromChannelName} from 'utils/utils';
+import {getUserIdFromChannelName} from 'utils/utils';
 
 import type {ActionFuncAsync} from 'types/store';
 
@@ -47,6 +47,7 @@ export type ExecuteCommandReturnType = {
 
 export function executeCommand(message: string, args: CommandArgs): ActionFuncAsync<ExecuteCommandReturnType> {
     return async (dispatch, getState) => {
+        const intl = getIntl();
         const state = getState();
 
         let msg = message;
@@ -64,7 +65,7 @@ export function executeCommand(message: string, args: CommandArgs): ActionFuncAs
             return {data: {frontendHandled: true}};
         case '/shortcuts':
             if (UserAgent.isMobile()) {
-                const error = {message: localizeMessage({id: 'create_post.shortcutsNotSupported', defaultMessage: 'Keyboard shortcuts are not supported on your device'})};
+                const error = {message: intl.formatMessage({id: 'create_post.shortcutsNotSupported', defaultMessage: 'Keyboard shortcuts are not supported on your device.'})};
                 return {error};
             }
 
@@ -118,12 +119,12 @@ export function executeCommand(message: string, args: CommandArgs): ActionFuncAs
         case '/marketplace':
             // check if user has permissions to access the read plugins
             if (!haveICurrentTeamPermission(state, Permissions.SYSCONSOLE_WRITE_PLUGINS)) {
-                return {error: {message: localizeMessage({id: 'marketplace_command.no_permission', defaultMessage: 'You do not have the appropriate permissions to access the marketplace.'})}};
+                return {error: {message: intl.formatMessage({id: 'marketplace_command.no_permission', defaultMessage: 'You do not have the appropriate permissions to access the marketplace.'})}};
             }
 
             // check config to see if marketplace is enabled
             if (!isMarketplaceEnabled(state)) {
-                return {error: {message: localizeMessage({id: 'marketplace_command.disabled', defaultMessage: 'The marketplace is disabled. Please contact your System Administrator for details.'})}};
+                return {error: {message: intl.formatMessage({id: 'marketplace_command.disabled', defaultMessage: 'The marketplace is disabled. Please contact your System Administrator for details.'})}};
             }
 
             dispatch(openModal({modalId: ModalIdentifiers.PLUGIN_MARKETPLACE, dialogType: MarketplaceModal}));
@@ -139,7 +140,7 @@ export function executeCommand(message: string, args: CommandArgs): ActionFuncAs
             const createErrorMessage = (errMessage: string) => {
                 return {error: {message: errMessage}};
             };
-            const parser = new AppCommandParser({dispatch, getState: getGlobalState} as any, intlShim, args.channel_id, args.team_id, args.root_id);
+            const parser = new AppCommandParser({dispatch, getState: getGlobalState} as any, intl, args.channel_id, args.team_id, args.root_id);
             if (parser.isAppCommand(msg)) {
                 try {
                     const {creq, errorMessage} = await parser.composeCommandSubmitCall(msg);
@@ -147,11 +148,11 @@ export function executeCommand(message: string, args: CommandArgs): ActionFuncAs
                         return createErrorMessage(errorMessage!);
                     }
 
-                    const res = await dispatch(doAppSubmit(creq, intlShim));
+                    const res = await dispatch(doAppSubmit(creq, intl));
 
                     if (res.error) {
                         const errorResponse = res.error;
-                        return createErrorMessage(errorResponse.text || intlShim.formatMessage({
+                        return createErrorMessage(errorResponse.text || intl.formatMessage({
                             id: 'apps.error.unknown',
                             defaultMessage: 'Unknown error occurred.',
                         }));
@@ -172,7 +173,7 @@ export function executeCommand(message: string, args: CommandArgs): ActionFuncAs
                     case AppCallResponseTypes.NAVIGATE:
                         return {data: {appResponse: callResp}};
                     default:
-                        return createErrorMessage(intlShim.formatMessage(
+                        return createErrorMessage(intl.formatMessage(
                             {
                                 id: 'apps.error.responses.unknown_type',
                                 defaultMessage: 'App response type not supported. Response type: {type}.',
@@ -183,7 +184,7 @@ export function executeCommand(message: string, args: CommandArgs): ActionFuncAs
                         ));
                     }
                 } catch (err: any) {
-                    const message = err.message || intlShim.formatMessage({
+                    const message = err.message || intl.formatMessage({
                         id: 'apps.error.unknown',
                         defaultMessage: 'Unknown error occurred.',
                     });
diff --git a/webapp/channels/src/actions/invite_actions.ts b/webapp/channels/src/actions/invite_actions.ts
index 669c74fdb3a..5d97852aea6 100644
--- a/webapp/channels/src/actions/invite_actions.ts
+++ b/webapp/channels/src/actions/invite_actions.ts
@@ -121,6 +121,7 @@ export function sendMembersInvites(teamId: string, users: UserProfile[], emails:
                             email,
                             reason: defineMessage({
                                 id: 'admin.environment.smtp.smtpFailure',
+                                // eslint-disable-next-line formatjs/enforce-placeholders -- a placeholder provided via messageWithLink when path is set
                                 defaultMessage: 'SMTP is not configured in System Console. Can be configured <a>here</a>.',
                             }),
                             path: ConsolePages.SMTP,
@@ -229,6 +230,7 @@ export async function sendGuestInviteForUser(
             user,
             reason: defineMessage({
                 id: 'invite.guests.new-member',
+                // eslint-disable-next-line formatjs/enforce-placeholders -- count provided via values property, consumed by FormattedMessage in result_table
                 defaultMessage: 'This guest has been added to the team and {count, plural, one {channel} other {channels}}.',
                 values: {
                     count: channels.length,
@@ -301,6 +303,7 @@ export function sendGuestsInvites(
                                 email: res.email,
                                 reason: defineMessage({
                                     id: 'admin.environment.smtp.smtpFailure',
+                                    // eslint-disable-next-line formatjs/enforce-placeholders -- a placeholder provided via messageWithLink when path is set
                                     defaultMessage: 'SMTP is not configured in System Console. Can be configured <a>here</a>.',
                                 }),
                                 path: ConsolePages.SMTP,
@@ -445,6 +448,7 @@ export function sendMembersInvitesToChannels(
                                 email,
                                 reason: defineMessage({
                                     id: 'admin.environment.smtp.smtpFailure',
+                                    // eslint-disable-next-line formatjs/enforce-placeholders -- a placeholder provided via messageWithLink when path is set
                                     defaultMessage: 'SMTP is not configured in System Console. Can be configured <a>here</a>.',
                                 }),
                                 path: ConsolePages.SMTP,
diff --git a/webapp/channels/src/actions/marketplace.ts b/webapp/channels/src/actions/marketplace.ts
index 234c6b8bc29..1ad62d948b3 100644
--- a/webapp/channels/src/actions/marketplace.ts
+++ b/webapp/channels/src/actions/marketplace.ts
@@ -12,11 +12,11 @@ import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 
 import {getFilter, getPlugin} from 'selectors/views/marketplace';
 
-import {intlShim} from 'components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies';
 import type {DoAppCallResult} from 'components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies';
 
 import {createCallContext, createCallRequest} from 'utils/apps';
 import {ActionTypes} from 'utils/constants';
+import {getIntl} from 'utils/i18n';
 
 import type {ActionFuncAsync, ThunkActionFunc} from 'types/store';
 
@@ -125,6 +125,7 @@ export function installPlugin(id: string): ThunkActionFunc<void> {
 // On success, it also requests the current state of the apps to reflect the newly installed app.
 export function installApp(id: string): ThunkActionFunc<Promise<boolean>> {
     return async (dispatch, getState) => {
+        const intl = getIntl();
         dispatch({
             type: ActionTypes.INSTALLING_MARKETPLACE_ITEM,
             id,
@@ -155,7 +156,7 @@ export function installApp(id: string): ThunkActionFunc<Promise<boolean>> {
 
         const creq = createCallRequest(call, context, expand, values);
 
-        const res = await dispatch(doAppSubmit(creq, intlShim)) as DoAppCallResult;
+        const res = await dispatch(doAppSubmit(creq, intl)) as DoAppCallResult;
 
         if (res.error) {
             const errorResponse = res.error;
diff --git a/webapp/channels/src/actions/notification_actions.tsx b/webapp/channels/src/actions/notification_actions.tsx
index 9dd7d1a78a5..f883152c717 100644
--- a/webapp/channels/src/actions/notification_actions.tsx
+++ b/webapp/channels/src/actions/notification_actions.tsx
@@ -190,7 +190,7 @@ const getNotificationTitle = (channel: Pick<Channel, 'type' | 'display_name'>, m
     }
 
     if (isCrtReply) {
-        title = Utils.localizeAndFormatMessage({id: 'notification.crt', defaultMessage: 'Reply in {title}'}, {title});
+        title = Utils.localizeMessage({id: 'notification.crt', defaultMessage: 'Reply in {title}'}, {title});
     }
 
     return title;
diff --git a/webapp/channels/src/components/about_build_modal/about_build_modal.tsx b/webapp/channels/src/components/about_build_modal/about_build_modal.tsx
index e5082e774e4..bcdf4440379 100644
--- a/webapp/channels/src/components/about_build_modal/about_build_modal.tsx
+++ b/webapp/channels/src/components/about_build_modal/about_build_modal.tsx
@@ -136,16 +136,20 @@ export default function AboutBuildModal(props: Props) {
             learnMore = (
                 <div>
                     <FormattedMessage
-                        id='about.enterpriseEditionLearn'
-                        defaultMessage='Learn more about Mattermost {planName} at '
-                        values={{planName: skuName}}
+                        id='about.planNameLearn'
+                        defaultMessage='Learn more about Mattermost {planName} at {link}'
+                        values={{
+                            planName: skuName,
+                            link: (
+                                <ExternalLink
+                                    location='about_build_modal'
+                                    href='https://mattermost.com/'
+                                >
+                                    {'mattermost.com'}
+                                </ExternalLink>
+                            ),
+                        }}
                     />
-                    <ExternalLink
-                        location='about_build_modal'
-                        href='https://mattermost.com/'
-                    >
-                        {'mattermost.com'}
-                    </ExternalLink>
                 </div>
             );
             licensee = (
@@ -162,14 +166,18 @@ export default function AboutBuildModal(props: Props) {
                 <div>
                     <FormattedMessage
                         id='about.enterpriseEditionLearn'
-                        defaultMessage='Learn more about Enterprise Edition at '
+                        defaultMessage='Learn more about Enterprise Edition at {link}'
+                        values={{
+                            link: (
+                                <ExternalLink
+                                    location='about_build_modal'
+                                    href='https://mattermost.com/'
+                                >
+                                    {'mattermost.com'}
+                                </ExternalLink>
+                            ),
+                        }}
                     />
-                    <ExternalLink
-                        location='about_build_modal'
-                        href='https://mattermost.com/'
-                    >
-                        {'mattermost.com'}
-                    </ExternalLink>
                 </div>
             );
         }
diff --git a/webapp/channels/src/components/access_problem/index.tsx b/webapp/channels/src/components/access_problem/index.tsx
index bcb6f1c8a3c..cdc6c078834 100644
--- a/webapp/channels/src/components/access_problem/index.tsx
+++ b/webapp/channels/src/components/access_problem/index.tsx
@@ -36,10 +36,10 @@ const AccessProblem = ({
         <div className='AccessProblem__body'>
             <AccessProblemSVG/>
             <div className='AccessProblem__title'>
-                {formatMessage({id: 'login.contact_admin.title'})}
+                {formatMessage({id: 'login.contact_admin.title', defaultMessage: 'Contact your workspace admin'})}
             </div>
             <div className='AccessProblem__description'>
-                {formatMessage({id: 'login.contact_admin.detail'})}
+                {formatMessage({id: 'login.contact_admin.detail', defaultMessage: "To access your team's workspace, contact your workspace admin. If you've been invited already, check your email inbox for a Mattermost workspace invite."})}
             </div>
         </div>
     );
diff --git a/webapp/channels/src/components/actions_menu/actions_menu_tutorial_tip.tsx b/webapp/channels/src/components/actions_menu/actions_menu_tutorial_tip.tsx
index c112024f1d8..47a6af7510b 100644
--- a/webapp/channels/src/components/actions_menu/actions_menu_tutorial_tip.tsx
+++ b/webapp/channels/src/components/actions_menu/actions_menu_tutorial_tip.tsx
@@ -24,7 +24,7 @@ const title = (
 const screen = (
     <FormattedMessage
         id='post_info.actions.tutorialTip'
-        defaultMessage='Message actions that are provided\nthrough apps, integrations or plugins\nhave moved to this menu item.'
+        defaultMessage={'Message actions that are provided\nthrough apps, integrations or plugins\nhave moved to this menu item.'}
     />
 );
 const nextBtn = (
diff --git a/webapp/channels/src/components/add_users_to_group_modal/add_users_to_group_modal.tsx b/webapp/channels/src/components/add_users_to_group_modal/add_users_to_group_modal.tsx
index e3b1c34802a..bbf17ea818a 100644
--- a/webapp/channels/src/components/add_users_to_group_modal/add_users_to_group_modal.tsx
+++ b/webapp/channels/src/components/add_users_to_group_modal/add_users_to_group_modal.tsx
@@ -118,6 +118,7 @@ const AddUsersToGroupModal = (props: Props) => {
                         >
                             <FormattedMessage
                                 id='user_groups_modal.addPeopleTitle'
+                                // eslint-disable-next-line formatjs/enforce-placeholders -- group provided via titleValue memoized value
                                 defaultMessage='Add people to {group}'
                                 values={titleValue}
                             />
diff --git a/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap b/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
index f5102a89c97..3ce013d2b4c 100644
--- a/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
+++ b/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
@@ -221,7 +221,7 @@ exports[`components/admin_console/add_users_to_team_modal/AddUsersToTeamModal sh
       perPage={50}
       placeholderText={
         Object {
-          "defaultMessage": "Search and add members",
+          "defaultMessage": "Search for people",
           "id": "multiselect.placeholder",
         }
       }
@@ -463,7 +463,7 @@ exports[`components/admin_console/add_users_to_team_modal/AddUsersToTeamModal sh
       perPage={50}
       placeholderText={
         Object {
-          "defaultMessage": "Search and add members",
+          "defaultMessage": "Search for people",
           "id": "multiselect.placeholder",
         }
       }
diff --git a/webapp/channels/src/components/add_users_to_team_modal/add_users_to_team_modal.tsx b/webapp/channels/src/components/add_users_to_team_modal/add_users_to_team_modal.tsx
index 52395437422..5152c12dc37 100644
--- a/webapp/channels/src/components/add_users_to_team_modal/add_users_to_team_modal.tsx
+++ b/webapp/channels/src/components/add_users_to_team_modal/add_users_to_team_modal.tsx
@@ -262,7 +262,7 @@ export class AddUsersToTeamModal extends React.PureComponent<Props, State> {
                         buttonSubmitLoadingText={buttonSubmitLoadingText}
                         saving={this.state.saving}
                         loading={this.state.loading}
-                        placeholderText={defineMessage({id: 'multiselect.placeholder', defaultMessage: 'Search and add members'})}
+                        placeholderText={defineMessage({id: 'multiselect.placeholder', defaultMessage: 'Search for people'})}
                     />
                 </Modal.Body>
             </Modal>
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.tsx.snap
index a10fd55962c..39786163195 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`components/DatabaseSettings should match snapshot 1`] = `
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Database Settings"
+        defaultMessage="Database"
         id="admin.database.title"
       />
     </AdminHeader>
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap
index 51a48a1e0a8..5e8b8c6a84a 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap
@@ -335,6 +335,7 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
         helpText={
           <Memo(MemoizedFormattedMessage)
             defaultMessage="This purges the channels index and re-indexes all channels in the database, from oldest to newest. Channel autocomplete is available during indexing but search results may be incomplete until the indexing job is complete.
+
 <b>Note- Please ensure no other indexing job is in progress in the table above.</b>"
             id="admin.elasticsearch.rebuildChannelsIndex.helpText"
             values={
@@ -365,7 +366,7 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
       <RequestButton
         buttonText={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Purge Index"
+            defaultMessage="Purge Indexes"
             id="admin.elasticsearch.purgeIndexesButton"
           />
         }
@@ -827,6 +828,7 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
         helpText={
           <Memo(MemoizedFormattedMessage)
             defaultMessage="This purges the channels index and re-indexes all channels in the database, from oldest to newest. Channel autocomplete is available during indexing but search results may be incomplete until the indexing job is complete.
+
 <b>Note- Please ensure no other indexing job is in progress in the table above.</b>"
             id="admin.elasticsearch.rebuildChannelsIndex.helpText"
             values={
@@ -857,7 +859,7 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
       <RequestButton
         buttonText={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Purge Index"
+            defaultMessage="Purge Indexes"
             id="admin.elasticsearch.purgeIndexesButton"
           />
         }
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.tsx.snap
index ba2d74dd9c7..8bc6cb6cd24 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.tsx.snap
@@ -108,7 +108,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
               "value": "csv",
             },
             Object {
-              "text": "GlobalRelay EML",
+              "text": "Global Relay EML",
               "value": "globalrelay",
             },
           ]
@@ -270,7 +270,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
               "value": "csv",
             },
             Object {
-              "text": "GlobalRelay EML",
+              "text": "Global Relay EML",
               "value": "globalrelay",
             },
           ]
@@ -546,7 +546,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
               "value": "csv",
             },
             Object {
-              "text": "GlobalRelay EML",
+              "text": "Global Relay EML",
               "value": "globalrelay",
             },
           ]
@@ -708,7 +708,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
               "value": "csv",
             },
             Object {
-              "text": "GlobalRelay EML",
+              "text": "Global Relay EML",
               "value": "globalrelay",
             },
           ]
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap
index 2faf80fd9c9..edec14c2fe9 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap
@@ -148,14 +148,14 @@ exports[`components/PushSettings should match snapshot, licensed 1`] = `
       <AdminTextSetting
         helpText={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance."
+            defaultMessage="The maximum number of users that can be mentioned using @here, @all, or @channel. Above this limit, mentions and typing indicators are disabled, and users will see a system message if they try to use them."
             id="admin.team.maxNotificationsPerChannelDescription"
           />
         }
         id="maxNotificationsPerChannel"
         label={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Max Notifications Per Channel:"
+            defaultMessage="Large Channel Notification Threshold:"
             id="admin.team.maxNotificationsPerChannelTitle"
           />
         }
@@ -279,14 +279,14 @@ exports[`components/PushSettings should match snapshot, unlicensed 1`] = `
       <AdminTextSetting
         helpText={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance."
+            defaultMessage="The maximum number of users that can be mentioned using @here, @all, or @channel. Above this limit, mentions and typing indicators are disabled, and users will see a system message if they try to use them."
             id="admin.team.maxNotificationsPerChannelDescription"
           />
         }
         id="maxNotificationsPerChannel"
         label={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Max Notifications Per Channel:"
+            defaultMessage="Large Channel Notification Threshold:"
             id="admin.team.maxNotificationsPerChannelTitle"
           />
         }
diff --git a/webapp/channels/src/components/admin_console/access_control/modals/job_details/searchable_sync_job_channel_list.tsx b/webapp/channels/src/components/admin_console/access_control/modals/job_details/searchable_sync_job_channel_list.tsx
index aea9ffaa976..3469382aecb 100644
--- a/webapp/channels/src/components/admin_console/access_control/modals/job_details/searchable_sync_job_channel_list.tsx
+++ b/webapp/channels/src/components/admin_console/access_control/modals/job_details/searchable_sync_job_channel_list.tsx
@@ -173,7 +173,7 @@ const SearchableSyncJobChannelList = (props: Props) => {
             <FormattedMessage
                 id='more_channels.noMore'
                 tagName='strong'
-                defaultMessage='No results for {text}'
+                defaultMessage='No results for "{text}"'
                 values={{text: channelSearchValue}}
             />
         );
@@ -254,7 +254,7 @@ const SearchableSyncJobChannelList = (props: Props) => {
                 clearable={true}
                 onClear={handleClear}
                 value={channelSearchValue}
-                aria-label={props.intl.formatMessage({id: 'filtered_channels_list.search', defaultMessage: 'Search Channels'})}
+                aria-label={props.intl.formatMessage({id: 'filtered_channels_list.search', defaultMessage: 'Search channels'})}
             />
         </div>
     );
@@ -306,7 +306,7 @@ const messages = defineMessages({
     },
     noMore: {
         id: 'more_channels.noMore',
-        defaultMessage: 'No results for {text}',
+        defaultMessage: 'No results for "{text}"',
     },
 });
 
diff --git a/webapp/channels/src/components/admin_console/admin_definition.tsx b/webapp/channels/src/components/admin_console/admin_definition.tsx
index 15e554cb555..1690dc7c9ce 100644
--- a/webapp/channels/src/components/admin_console/admin_definition.tsx
+++ b/webapp/channels/src/components/admin_console/admin_definition.tsx
@@ -680,12 +680,12 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'bool',
                                     key: 'AccessControlSettings.EnableAttributeBasedAccessControl',
                                     label: defineMessage({id: 'admin.accesscontrol.enableTitle', defaultMessage: 'Allow attribute based access controls on this server'}),
-                                    help_text: defineMessage({id: 'admin.accesscontrol.enableDesc', defaultMessage: 'Allow access restrictions based on user attributes using custom access policies. To effectively use this feature, you must define user attributes in the {userAttributes} section.'}),
+                                    help_text: defineMessage({id: 'admin.accesscontrol.enableDesc', defaultMessage: 'Allow access restrictions based on user attributes using custom access policies. To effectively use this feature, you must define user attributes in the {userAttributes} section.'}), // eslint-disable-line formatjs/enforce-placeholders -- userAttributes provided via help_text_values
                                     help_text_values: {
                                         userAttributes: (
                                             <a href='../system_attributes/user_attributes'>
                                                 <FormattedMessage
-                                                    id='admin.system_properties.user_properties.title'
+                                                    id='admin.accesscontrol.user_properties.link.label'
                                                     defaultMessage='User Attributes'
                                                 />
                                             </a>
@@ -736,7 +736,7 @@ const AdminDefinition: AdminDefinitionType = {
                 ),
                 schema: {
                     id: 'AttributeBasedAccessControl',
-                    name: defineMessage({id: 'admin.accesscontrol.title', defaultMessage: 'Attribute-Based Access (Beta)'}),
+                    name: defineMessage({id: 'admin.accesscontrol.title', defaultMessage: 'Attribute-Based Access'}),
                     settings: [
                         {
                             type: 'custom',
@@ -773,14 +773,14 @@ const AdminDefinition: AdminDefinitionType = {
                     settings: [
                         {
                             type: 'banner',
-                            label: defineMessage({id: 'admin.rate.noteDescription', defaultMessage: 'Changing properties in this section will require a server restart before taking effect.'}),
+                            label: defineMessage({id: 'admin.info_banner.restart_required.desc', defaultMessage: 'Changing properties in this section will require a server restart before taking effect.'}),
                             banner_type: 'info',
                         },
                         {
                             type: 'text',
                             key: 'ServiceSettings.SiteURL',
                             label: defineMessage({id: 'admin.service.siteURL', defaultMessage: 'Site URL:'}),
-                            help_text: defineMessage({id: 'admin.service.siteURLDescription', defaultMessage: 'The URL that users will use to access Mattermost. Standard ports, such as 80 and 443, can be omitted, but non-standard ports are required. For example: http://example.com:8065. This setting is required. Mattermost may be hosted at a subpath. For example: http://example.com:8065/company/mattermost. A restart is required before the server will work correctly.'}),
+                            help_text: defineMessage({id: 'admin.service.siteURLDescription', defaultMessage: 'The URL that users will use to access Mattermost. Standard ports, such as 80 and 443, can be omitted, but non-standard ports are required. For example: http://example.com:8065. This setting is required.\n \nMattermost may be hosted at a subpath. For example: http://example.com:8065/company/mattermost. A restart is required before the server will work correctly.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             help_text_markdown: true,
                             placeholder: defineMessage({id: 'admin.service.siteURLExample', defaultMessage: 'E.g.: "http://example.com:8065"'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.WEB_SERVER)),
@@ -791,7 +791,7 @@ const AdminDefinition: AdminDefinitionType = {
                             action: testSiteURL,
                             label: defineMessage({id: 'admin.service.testSiteURL', defaultMessage: 'Test Live URL'}),
                             loading: defineMessage({id: 'admin.service.testSiteURLTesting', defaultMessage: 'Testing...'}),
-                            error_message: defineMessage({id: 'admin.service.testSiteURLFail', defaultMessage: 'Test unsuccessful: {error}'}),
+                            error_message: defineMessage({id: 'admin.service.testSiteURLFail', defaultMessage: 'Test unsuccessful: {error}'}), // eslint-disable-line formatjs/enforce-placeholders -- error provided at runtime
                             success_message: defineMessage({id: 'admin.service.testSiteURLSuccess', defaultMessage: 'Test successful. This is a valid URL.'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.WEB_SERVER)),
                         },
@@ -808,7 +808,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'ServiceSettings.Forward80To443',
                             label: defineMessage({id: 'admin.service.forward80To443', defaultMessage: 'Forward port 80 to 443:'}),
                             help_text: defineMessage({id: 'admin.service.forward80To443Description', defaultMessage: 'Forwards all insecure traffic from port 80 to secure port 443. Not recommended when using a proxy server.'}),
-                            disabled_help_text: defineMessage({id: 'admin.service.forward80To443Description.disabled', defaultMessage: 'Forwards all insecure traffic from port 80 to secure port 443. Not recommended when using a proxy server. This setting cannot be enabled until your server is [listening](#ServiceSettings.ListenAddress) on port 443.'}),
+                            disabled_help_text: defineMessage({id: 'admin.service.forward80To443Description.disabled', defaultMessage: 'Forwards all insecure traffic from port 80 to secure port 443. Not recommended when using a proxy server.\n \nThis setting cannot be enabled until your server is [listening](#ServiceSettings.ListenAddress) on port 443.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             disabled_help_text_markdown: true,
                             isDisabled: it.any(
                                 it.cloudLicensed,
@@ -858,7 +858,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'ServiceSettings.UseLetsEncrypt',
                             label: defineMessage({id: 'admin.service.useLetsEncrypt', defaultMessage: 'Use Let\'s Encrypt:'}),
                             help_text: defineMessage({id: 'admin.service.useLetsEncryptDescription', defaultMessage: 'Enable the automatic retrieval of certificates from Let\'s Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.'}),
-                            disabled_help_text: defineMessage({id: 'admin.service.useLetsEncryptDescription.disabled', defaultMessage: "Enable the automatic retrieval of certificates from Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains. This setting cannot be enabled unless the [Forward port 80 to 443](#ServiceSettings.Forward80To443) setting is set to true."}),
+                            disabled_help_text: defineMessage({id: 'admin.service.useLetsEncryptDescription.disabled', defaultMessage: "Enable the automatic retrieval of certificates from Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.\n \nThis setting cannot be enabled unless the [Forward port 80 to 443](#ServiceSettings.Forward80To443) setting is set to true."}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             disabled_help_text_markdown: true,
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.WEB_SERVER)),
@@ -928,7 +928,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'ServiceSettings.ManagedResourcePaths',
                             label: defineMessage({id: 'admin.service.managedResourcePaths', defaultMessage: 'Managed Resource Paths:'}),
-                            help_text: defineMessage({id: 'admin.service.managedResourcePathsDescription', defaultMessage: 'A comma-separated list of paths on the Mattermost server that are managed by another service. See <link>here</link> for more information.'}),
+                            help_text: defineMessage({id: 'admin.service.managedResourcePathsDescription', defaultMessage: 'A comma-separated list of paths on the Mattermost server that are managed by another service. See <link>here</link> for more information.'}), // eslint-disable-line formatjs/enforce-placeholders -- link provided via help_text_values
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -947,7 +947,7 @@ const AdminDefinition: AdminDefinitionType = {
                             action: reloadConfig,
                             key: 'ReloadConfigButton',
                             label: defineMessage({id: 'admin.reload.button', defaultMessage: 'Reload Configuration From Disk'}),
-                            help_text: defineMessage({id: 'admin.reload.reloadDescription', defaultMessage: 'Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired configuration and using the {featureName} feature to load the new settings while the server is running. The administrator should then use the {recycleDatabaseConnections} feature to recycle the database connections based on the new settings.'}),
+                            help_text: defineMessage({id: 'admin.reload.reloadDescription', defaultMessage: 'Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired configuration and using the {featureName} feature to load the new settings while the server is running. The administrator should then use the {recycleDatabaseConnections} feature to recycle the database connections based on the new settings.'}), // eslint-disable-line formatjs/enforce-placeholders -- featureName, recycleDatabaseConnections provided via help_text_values
                             help_text_values: {
                                 featureName: (
                                     <b>
@@ -968,7 +968,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     </a>
                                 ),
                             },
-                            error_message: defineMessage({id: 'admin.reload.reloadFail', defaultMessage: 'Reload unsuccessful: {error}'}),
+                            error_message: defineMessage({id: 'admin.reload.reloadFail', defaultMessage: 'Reload unsuccessful: {error}'}), // eslint-disable-line formatjs/enforce-placeholders -- error provided at runtime
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.WEB_SERVER)),
                         },
                         {
@@ -977,7 +977,7 @@ const AdminDefinition: AdminDefinitionType = {
                             action: invalidateAllCaches,
                             label: defineMessage({id: 'admin.purge.button', defaultMessage: 'Purge All Caches'}),
                             help_text: defineMessage({id: 'admin.purge.purgeDescription', defaultMessage: 'This will purge all the in-memory caches for things like sessions, accounts, channels, etc. Deployments using High Availability will attempt to purge all the servers in the cluster. Purging the caches may adversely impact performance.'}),
-                            error_message: defineMessage({id: 'admin.purge.purgeFail', defaultMessage: 'Purging unsuccessful: {error}'}),
+                            error_message: defineMessage({id: 'admin.purge.purgeFail', defaultMessage: 'Purging unsuccessful: {error}'}), // eslint-disable-line formatjs/enforce-placeholders -- error provided at runtime
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.WEB_SERVER)),
                         },
                     ],
@@ -1028,7 +1028,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'dropdown',
                             key: 'FileSettings.DriverName',
                             label: defineMessage({id: 'admin.image.storeTitle', defaultMessage: 'File Storage System:'}),
-                            help_text: defineMessage({id: 'admin.image.storeDescription', defaultMessage: 'Storage system where files and image attachments are saved. Selecting "Amazon S3" enables fields to enter your Amazon credentials and bucket details. Selecting "Local File System" enables the field to specify a local file directory.'}),
+                            help_text: defineMessage({id: 'admin.image.storeDescription', defaultMessage: 'Storage system where files and image attachments are saved.\n \nSelecting "Amazon S3" enables fields to enter your Amazon credentials and bucket details.\n \nSelecting "Local File System" enables the field to specify a local file directory.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             help_text_markdown: true,
                             options: [
                                 {
@@ -1067,7 +1067,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'FileSettings.ExtractContent',
                             label: defineMessage({id: 'admin.image.extractContentTitle', defaultMessage: 'Enable document search by content:'}),
-                            help_text: defineMessage({id: 'admin.image.extractContentDescription', defaultMessage: 'When enabled, supported document types are searchable by their content. Search results for existing documents may be incomplete <link>until a data migration is executed</link>.'}),
+                            help_text: defineMessage({id: 'admin.image.extractContentDescription', defaultMessage: 'When enabled, supported document types are searchable by their content. Search results for existing documents may be incomplete <link>until a data migration is executed</link>.'}), // eslint-disable-line formatjs/enforce-placeholders -- link provided via help_text_values
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -1087,7 +1087,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'FileSettings.ArchiveRecursion',
                             label: defineMessage({id: 'admin.image.archiveRecursionTitle', defaultMessage: 'Enable searching content of documents within ZIP files:'}),
-                            help_text: defineMessage({id: 'admin.image.archiveRecursionDescription', defaultMessage: 'When enabled, content of documents within ZIP files will be returned in search results. This may have an impact on server performance for large files. '}),
+                            help_text: defineMessage({id: 'admin.image.archiveRecursionDescription', defaultMessage: 'When enabled, content of documents within ZIP files will be returned in search results. This may have an impact on server performance for large files.'}),
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.FILE_STORAGE)),
                                 it.configIsFalse('FileSettings', 'ExtractContent'),
@@ -1109,7 +1109,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'FileSettings.AmazonS3PathPrefix',
                             label: defineMessage({id: 'admin.image.amazonS3PathPrefixTitle', defaultMessage: 'Amazon S3 Path Prefix:'}),
                             help_text: defineMessage({id: 'admin.image.amazonS3PathPrefixDescription', defaultMessage: 'Prefix you selected for your S3 bucket in AWS.'}),
-                            placeholder: defineMessage({id: 'admin.image.amazonS3PathPrefixExample', defaultMessage: 'E.g.: "subdir1/" or you can leave it .'}),
+                            placeholder: defineMessage({id: 'admin.image.amazonS3PathPrefixExample', defaultMessage: 'E.g.: "subdir1" or you can leave it empty.'}),
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.FILE_STORAGE)),
                                 it.not(it.stateEquals('FileSettings.DriverName', FILE_STORAGE_DRIVER_S3)),
@@ -1130,7 +1130,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'FileSettings.AmazonS3AccessKeyId',
                             label: defineMessage({id: 'admin.image.amazonS3IdTitle', defaultMessage: 'Amazon S3 Access Key ID:'}),
-                            help_text: defineMessage({id: 'admin.image.amazonS3IdDescription', defaultMessage: '(Optional) Only required if you do not want to authenticate to S3 using an <link>IAM role</link>. Enter the Access Key ID provided by your Amazon EC2 administrator.'}),
+                            help_text: defineMessage({id: 'admin.image.amazonS3IdDescription', defaultMessage: '(Optional) Only required if you do not want to authenticate to S3 using an <link>IAM role</link>. Enter the Access Key ID provided by your Amazon EC2 administrator.'}), // eslint-disable-line formatjs/enforce-placeholders -- link provided via help_text_values
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -1184,7 +1184,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'FileSettings.AmazonS3SSE',
                             label: defineMessage({id: 'admin.image.amazonS3SSETitle', defaultMessage: 'Enable Server-Side Encryption for Amazon S3:'}),
-                            help_text: defineMessage({id: 'admin.image.amazonS3SSEDescription', defaultMessage: 'When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.image.amazonS3SSEDescription', defaultMessage: 'When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- link provided via help_text_values
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -1229,7 +1229,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'TestS3Connection',
                             label: defineMessage({id: 'admin.s3.connectionS3Test', defaultMessage: 'Test Connection'}),
                             loading: defineMessage({id: 'admin.s3.testing', defaultMessage: 'Testing...'}),
-                            error_message: defineMessage({id: 'admin.s3.s3Fail', defaultMessage: 'Connection unsuccessful: {error}'}),
+                            error_message: defineMessage({id: 'admin.s3.s3Fail', defaultMessage: 'Connection unsuccessful: {error}'}), // eslint-disable-line formatjs/enforce-placeholders -- error provided at runtime
                             success_message: defineMessage({id: 'admin.s3.s3Success', defaultMessage: 'Connection was successful'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.FILE_STORAGE)),
                         },
@@ -1284,7 +1284,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'FileSettings.ExportAmazonS3AccessKeyId',
                             label: defineMessage({id: 'admin.image.amazonS3IdTitle', defaultMessage: 'Amazon S3 Access Key ID:'}),
-                            help_text: defineMessage({id: 'admin.image.amazonS3IdDescription', defaultMessage: '(Optional) Only required if you do not want to authenticate to S3 using an <link>IAM role</link>. Enter the Access Key ID provided by your Amazon EC2 administrator.'}),
+                            help_text: defineMessage({id: 'admin.image.amazonS3IdDescription', defaultMessage: '(Optional) Only required if you do not want to authenticate to S3 using an <link>IAM role</link>. Enter the Access Key ID provided by your Amazon EC2 administrator.'}), // eslint-disable-line formatjs/enforce-placeholders -- link provided via help_text_values
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -1320,7 +1320,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'FileSettings.ExportAmazonS3Bucket',
                             label: defineMessage({id: 'admin.image.amazonS3BucketTitle', defaultMessage: 'Amazon S3 Bucket:'}),
                             help_text: defineMessage({id: 'admin.image.amazonS3BucketDescription', defaultMessage: 'Name you selected for your S3 bucket in AWS.'}),
-                            placeholder: defineMessage({id: 'admin.image.amazonS3BucketExample', defaultMessage: 'E.g.: "mattermost-export"'}),
+                            placeholder: defineMessage({id: 'admin.image.amazonS3BucketExampleExport', defaultMessage: 'E.g.: "mattermost-export"'}),
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.FILE_STORAGE)),
                                 it.stateEquals('FileSettings.DedicatedExportStore', false),
@@ -1332,7 +1332,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'FileSettings.ExportAmazonS3PathPrefix',
                             label: defineMessage({id: 'admin.image.amazonS3PathPrefixTitle', defaultMessage: 'Amazon S3 Path Prefix:'}),
                             help_text: defineMessage({id: 'admin.image.amazonS3PathPrefixDescription', defaultMessage: 'Prefix you selected for your S3 bucket in AWS.'}),
-                            placeholder: defineMessage({id: 'admin.image.amazonS3PathPrefixExample', defaultMessage: 'E.g.: "subdir1/" or you can leave it .'}),
+                            placeholder: defineMessage({id: 'admin.image.amazonS3PathPrefixExample', defaultMessage: 'E.g.: "subdir1" or you can leave it empty.'}),
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.FILE_STORAGE)),
                                 it.stateEquals('FileSettings.DedicatedExportStore', false),
@@ -1389,7 +1389,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'FileSettings.ExportAmazonS3SSE',
                             label: defineMessage({id: 'admin.image.amazonS3SSETitle', defaultMessage: 'Enable Server-Side Encryption for Amazon S3:'}),
-                            help_text: defineMessage({id: 'admin.image.amazonS3SSEDescription', defaultMessage: 'When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.image.amazonS3SSEDescription', defaultMessage: 'When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- link provided via help_text_values
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -1424,7 +1424,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'TestS3Connection',
                             label: defineMessage({id: 'admin.s3.connectionS3Test', defaultMessage: 'Test Connection'}),
                             loading: defineMessage({id: 'admin.s3.testing', defaultMessage: 'Testing...'}),
-                            error_message: defineMessage({id: 'admin.s3.s3Fail', defaultMessage: 'Connection unsuccessful: {error}'}),
+                            error_message: defineMessage({id: 'admin.s3.s3Fail', defaultMessage: 'Connection unsuccessful: {error}'}), // eslint-disable-line formatjs/enforce-placeholders -- error provided at runtime
                             success_message: defineMessage({id: 'admin.s3.s3Success', defaultMessage: 'Connection was successful'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.FILE_STORAGE)),
                             isHidden: it.any(it.stateEquals('FileSettings.ExportDriverName', 'NONE'), it.stateEquals('FileSettings.DedicatedExportStore', false)),
@@ -1454,7 +1454,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'dropdown',
                             key: 'ImageProxySettings.ImageProxyType',
                             label: defineMessage({id: 'admin.image.proxyType', defaultMessage: 'Image Proxy Type:'}),
-                            help_text: defineMessage({id: 'admin.image.proxyTypeDescription', defaultMessage: 'Configure an image proxy to load all Markdown images through a proxy. The image proxy prevents users from making insecure image requests, provides caching for increased performance, and automates image adjustments such as resizing. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.image.proxyTypeDescription', defaultMessage: 'Configure an image proxy to load all Markdown images through a proxy. The image proxy prevents users from making insecure image requests, provides caching for increased performance, and automates image adjustments such as resizing. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -1589,7 +1589,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'TestSmtpConnection',
                             label: defineMessage({id: 'admin.environment.smtp.connectionSmtpTest', defaultMessage: 'Test Connection'}),
                             loading: defineMessage({id: 'admin.environment.smtp.testing', defaultMessage: 'Testing...'}),
-                            error_message: defineMessage({id: 'admin.environment.smtp.smtpFail', defaultMessage: 'Connection unsuccessful: {error}'}),
+                            error_message: defineMessage({id: 'admin.environment.smtp.smtpFail', defaultMessage: 'Connection unsuccessful: {error}'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             success_message: defineMessage({id: 'admin.environment.smtp.smtpSuccess', defaultMessage: 'No errors were reported while sending an email. Please check your inbox to make sure.'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.SMTP)),
                         },
@@ -1667,7 +1667,7 @@ const AdminDefinition: AdminDefinitionType = {
                     settings: [
                         {
                             type: 'banner',
-                            label: defineMessage({id: 'admin.rate.noteDescription', defaultMessage: 'Changing properties in this section will require a server restart before taking effect.'}),
+                            label: defineMessage({id: 'admin.info_banner.restart_required.desc', defaultMessage: 'Changing properties in this section will require a server restart before taking effect.'}),
                             banner_type: 'info',
                         },
                         {
@@ -1747,7 +1747,7 @@ const AdminDefinition: AdminDefinitionType = {
                     settings: [
                         {
                             type: 'banner',
-                            label: defineMessage({id: 'admin.rate.noteDescription', defaultMessage: 'Changing properties other than Site URL in this section will require a server restart before taking effect.'}),
+                            label: defineMessage({id: 'admin.rate.noteDescription', defaultMessage: 'Changing properties in this section will require a server restart before taking effect.'}),
                             banner_type: 'info',
                         },
                         {
@@ -1785,7 +1785,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'RateLimitSettings.MemoryStoreSize',
                             label: defineMessage({id: 'admin.rate.memoryTitle', defaultMessage: 'Memory Store Size:'}),
                             placeholder: defineMessage({id: 'admin.rate.memoryExample', defaultMessage: 'E.g.: "10000"'}),
-                            help_text: defineMessage({id: 'admin.rate.memoryDescription', defaultMessage: 'Maximum number of users sessions connected to the system as determined by "Vary rate limit by remote address" and "Vary rate limit by HTTP header".'}),
+                            help_text: defineMessage({id: 'admin.rate.memoryDescription', defaultMessage: 'Maximum number of users sessions connected to the system as determined by "Vary rate limit by remote address" and "Vary rate limit by HTTP header" settings below.'}),
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.RATE_LIMITING)),
                                 it.stateEquals('RateLimitSettings.Enable', false),
@@ -1805,7 +1805,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'RateLimitSettings.VaryByUser',
                             label: defineMessage({id: 'admin.rate.varyByUser', defaultMessage: 'Vary rate limit by user:'}),
-                            help_text: defineMessage({id: 'admin.rate.varyByUserDescription', defaultMessage: 'When true, rate limit API access by user athentication token.'}),
+                            help_text: defineMessage({id: 'admin.rate.varyByUserDescription', defaultMessage: 'When true, rate limit API access by user authentication token.'}),
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.ENVIRONMENT.RATE_LIMITING)),
                                 it.stateEquals('RateLimitSettings.Enable', false),
@@ -1908,7 +1908,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'LogSettings.EnableWebhookDebugging',
                             label: defineMessage({id: 'admin.log.enableWebhookDebugging', defaultMessage: 'Enable Webhook Debugging:'}),
-                            help_text: defineMessage({id: 'admin.log.enableWebhookDebuggingDescription', defaultMessage: 'When true, sends webhook debug messages to the server logs. To also output the request body of incoming webhooks, set {boldedLogLevel} to "DEBUG".'}),
+                            help_text: defineMessage({id: 'admin.log.enableWebhookDebuggingDescription', defaultMessage: 'When true, sends webhook debug messages to the server logs. To also output the request body of incoming webhooks, set {boldedLogLevel} to "DEBUG".'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 boldedLogLevel: (
                                     <strong>
@@ -1925,7 +1925,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'LogSettings.EnableDiagnostics',
                             label: defineMessage({id: 'admin.log.enableDiagnostics', defaultMessage: 'Enable Diagnostics and Error Reporting:'}),
-                            help_text: defineMessage({id: 'admin.log.enableDiagnosticsDescription', defaultMessage: 'Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <link>privacy policy</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.log.enableDiagnosticsDescription', defaultMessage: 'Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <link>privacy policy</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -1946,7 +1946,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'longtext',
                             key: 'LogSettings.AdvancedLoggingJSON',
                             label: defineMessage({id: 'admin.log.AdvancedLoggingJSONTitle', defaultMessage: 'Advanced Logging:'}),
-                            help_text: defineMessage({id: 'admin.log.AdvancedLoggingJSONDescription', defaultMessage: 'The JSON configuration for Advanced Logging. Please see <link>documentation</link> to learn more about Advanced Logging and the JSON format it uses.'}),
+                            help_text: defineMessage({id: 'admin.log.AdvancedLoggingJSONDescription', defaultMessage: 'The JSON configuration for Advanced Logging. Please see <link>documentation</link> to learn more about Advanced Logging and the JSON format it uses.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -2014,7 +2014,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'MetricsSettings.Enable',
                             label: defineMessage({id: 'admin.metrics.enableTitle', defaultMessage: 'Enable Performance Monitoring:'}),
-                            help_text: defineMessage({id: 'admin.metrics.enableDescription', defaultMessage: 'When true, Mattermost will enable performance monitoring collection and profiling. Please see <link>documentation</link> to learn more about configuring performance monitoring for Mattermost.'}),
+                            help_text: defineMessage({id: 'admin.metrics.enableDescription', defaultMessage: 'When true, Mattermost will enable performance monitoring collection and profiling. Please see <link>documentation</link> to learn more about configuring performance monitoring for Mattermost.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -2032,7 +2032,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'MetricsSettings.EnableClientMetrics',
                             label: defineMessage({id: 'admin.metrics.enableClientMetricsTitle', defaultMessage: 'Enable Client Performance Monitoring:'}),
-                            help_text: defineMessage({id: 'admin.metrics.enableClientMetricsDescription', defaultMessage: 'When true, Mattermost will enable performance monitoring collection for web and desktop app users. Please see <link>documentation</link> to learn more about configuring performance monitoring for Mattermost.'}),
+                            help_text: defineMessage({id: 'admin.metrics.enableClientMetricsDescription', defaultMessage: 'When true, Mattermost will enable performance monitoring collection for web and desktop app users. Please see <link>documentation</link> to learn more about configuring performance monitoring for Mattermost.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -2107,7 +2107,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'ServiceSettings.AllowedUntrustedInternalConnections',
                             label: defineMessage({id: 'admin.service.internalConnectionsTitle', defaultMessage: 'Allow untrusted internal connections to: '}),
                             placeholder: defineMessage({id: 'admin.service.internalConnectionsEx', defaultMessage: 'webhooks.internal.example.com 127.0.0.1 10.0.16.0/28'}),
-                            help_text: defineMessage({id: 'admin.service.internalConnectionsDesc', defaultMessage: 'A whitelist of local network addresses that can be requested by the Mattermost server on behalf of a client. Care should be used when configuring this setting to prevent unintended access to your local network. See <link>documentation</link> to learn more. Changing this requires a server restart before taking effect.'}),
+                            help_text: defineMessage({id: 'admin.service.internalConnectionsDesc', defaultMessage: 'A whitelist of local network addresses that can be requested by the Mattermost server on behalf of a client. Care should be used when configuring this setting to prevent unintended access to your local network. See <link>documentation</link> to learn more. Changing this requires a server restart before taking effect.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -2162,7 +2162,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'bool',
                                     key: 'NativeAppSettings.MobileEnableSecureFilePreview',
                                     label: defineMessage({id: 'admin.mobileSecurity.secureFilePreviewTitle', defaultMessage: 'Enable Secure File Preview Mode:'}),
-                                    help_text: defineMessage({id: 'admin.mobileSecurity.secureFilePreviewDescription', defaultMessage: "Prevents file downloads, previews, and sharing for most file types, even if {mobileAllowDownloads} is enabled. Allows in-app previews for PDFs, videos, and images only. Files are stored temporarily in the app's cache and cannot be exported or shared."}),
+                                    help_text: defineMessage({id: 'admin.mobileSecurity.secureFilePreviewDescription', defaultMessage: "Prevents file downloads, previews, and sharing for most file types, even if {mobileAllowDownloads} is enabled. Allows in-app previews for PDFs, videos, and images only. Files are stored temporarily in the app's cache and cannot be exported or shared."}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         mobileAllowDownloads: (
                                             <a href='../site_config/file_sharing_downloads'>
@@ -2374,7 +2374,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'SupportSettings.TermsOfServiceLink',
                             label: defineMessage({id: 'admin.support.termsTitle', defaultMessage: 'Terms of Use Link:'}),
-                            help_text: defineMessage({id: 'admin.support.termsDesc', defaultMessage: 'Link to the terms under which users may use your online service. By default, this includes the "Mattermost Conditions of Use (End Users)" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.'}),
+                            help_text: defineMessage({id: 'admin.support.termsDesc', defaultMessage: 'Link to the terms under which users may use your online service. By default, this includes the "Mattermost Acceptable Use Policy" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Acceptable Use Policy for Mattermost software.'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.SITE.CUSTOMIZATION)),
                             isHidden: it.configIsTrue('ExperimentalSettings', 'RestrictSystemAdmin'),
                         },
@@ -2603,7 +2603,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'dropdown',
                             key: 'TeamSettings.RestrictDirectMessage',
                             label: defineMessage({id: 'admin.team.restrictDirectMessage', defaultMessage: 'Enable users to open Direct Message channels with:'}),
-                            help_text: defineMessage({id: 'admin.team.restrictDirectMessageDesc', defaultMessage: '"Any user on the Mattermost server" enables users to open a Direct Message channel with any user on the server, even if they are not on any teams together. "Any member of the team" limits the ability in the Direct Messages "More" menu to only open Direct Message channels with users who are in the same team.'}),
+                            help_text: defineMessage({id: 'admin.team.restrictDirectMessageDesc', defaultMessage: "'Any user on the Mattermost server' enables users to open a Direct Message channel with any user on the server, even if they are not on any teams together. 'Any member of the team' limits the ability in the Direct Messages 'More' menu to only open Direct Message channels with users who are in the same team."}),
                             options: [
                                 {
                                     value: 'any',
@@ -2641,7 +2641,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'TeamSettings.LockTeammateNameDisplay',
                             label: defineMessage({id: 'admin.lockTeammateNameDisplay', defaultMessage: 'Lock Teammate Name Display for all users: '}),
-                            help_text: defineMessage({id: 'admin.lockTeammateNameDisplayHelpText', defaultMessage: 'When true, disables users\' ability to change settings under <strong>Account Menu > Account Settings > Display > Teammate Name Display</strong>.'}),
+                            help_text: defineMessage({id: 'admin.lockTeammateNameDisplayHelpText', defaultMessage: "When true, disables users' ability to change settings under <strong>Settings > Display > Teammate Name Display</strong>."}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 strong: (msg: string) => <strong>{msg}</strong>,
                             },
@@ -2756,7 +2756,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'dropdown',
                             key: 'EmailSettings.EmailNotificationContentsType',
                             label: defineMessage({id: 'admin.environment.notifications.contents.label', defaultMessage: 'Email Notification Contents:'}),
-                            help_text: defineMessage({id: 'admin.environment.notifications.contents.help', defaultMessage: '**Send full message contents** - Sender name and channel are included in email notifications. **Send generic description with only sender name** - Only the name of the person who sent the message, with no information about channel name or message contents are included in email notifications. Typically used for compliance reasons if Mattermost contains confidential information and policy dictates it cannot be stored in email.'}),
+                            help_text: defineMessage({id: 'admin.environment.notifications.contents.help', defaultMessage: '**Send full message contents** - Sender name and channel are included in email notifications.\n  **Send generic description with only sender name** - Only the name of the person who sent the message, with no information about channel name or message contents are included in email notifications. Typically used for compliance reasons if Mattermost contains confidential information and policy dictates it cannot be stored in email.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             help_text_markdown: true,
                             options: [
                                 {
@@ -2831,7 +2831,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'dropdown',
                             key: 'EmailSettings.PushNotificationContents',
                             label: defineMessage({id: 'admin.environment.notifications.pushContents.label', defaultMessage: 'Push Notification Contents:'}),
-                            help_text: defineMessage({id: 'admin.environment.notifications.pushContents.help', defaultMessage: "**Generic description with only sender name** - Includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents. **Generic description with sender and channel names** - Includes the name of the person who sent the message and the channel it was sent in, but not the message contents. **Full message content sent in the notification payload** - Includes the message contents in the push notification payload that is relayed through Apple's Push Notification Service (APNS) or Google's Firebase Cloud Messaging (FCM). It is **highly recommended** this option only be used with an \"https\" protocol to encrypt the connection and protect confidential information sent in messages."}),
+                            help_text: defineMessage({id: 'admin.environment.notifications.pushContents.help', defaultMessage: '**Generic description with only sender name** - Includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.\n **Generic description with sender and channel names** - Includes the name of the person who sent the message and the channel it was sent in, but not the message contents.\n **Full message content sent in the notification payload** - Includes the message contents in the push notification payload that is relayed through Apple\'s Push Notification Service (APNS) or Google\'s Firebase Cloud Messaging (FCM). It is **highly recommended** this option only be used with an "https" protocol to encrypt the connection and protect confidential information sent in messages.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             help_text_markdown: true,
                             options: [
                                 {
@@ -2854,7 +2854,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'dropdown',
                             key: 'EmailSettings.PushNotificationContents',
                             label: defineMessage({id: 'admin.environment.notifications.pushContents.label', defaultMessage: 'Push Notification Contents:'}),
-                            help_text: defineMessage({id: 'admin.environment.notifications.pushContents.withIdLoaded.help', defaultMessage: "**Generic description with only sender name** - Includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents. **Generic description with sender and channel names** - Includes the name of the person who sent the message and the channel it was sent in, but not the message contents. **Full message content sent in the notification payload** - Includes the message contents in the push notification payload that is relayed through Apple's Push Notification Service (APNS) or Google's Firebase Cloud Messaging (FCM). It is **highly recommended** this option only be used with an \"https\" protocol to encrypt the connection and protect confidential information sent in messages. **Full message content fetched from the server on receipt** - The notification payload relayed through APNS or FCM contains no message content, instead it contains a unique message ID used to fetch message content from the server when a push notification is received by a device. If the server cannot be reached, a generic notification will be displayed."}),
+                            help_text: defineMessage({id: 'admin.environment.notifications.pushContents.withIdLoaded.help', defaultMessage: "**Generic description with only sender name** - Includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.\n **Generic description with sender and channel names** - Includes the name of the person who sent the message and the channel it was sent in, but not the message contents.\n **Full message content sent in the notification payload** - Includes the message contents in the push notification payload that is relayed through Apple's Push Notification Service (APNS) or Google's Firebase Cloud Messaging (FCM). It is **highly recommended** this option only be used with an \"https\" protocol to encrypt the connection and protect confidential information sent in messages.\n**Full message content fetched from the server on receipt** - The notification payload relayed through APNS or FCM contains no message content, instead it contains a unique message ID used to fetch message content from the server when a push notification is received by a device. If the server cannot be reached, a generic notification will be displayed."}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             help_text_markdown: true,
                             options: [
                                 {
@@ -3022,7 +3022,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'dropdown',
                                     key: 'ServiceSettings.CollapsedThreads',
                                     label: defineMessage({id: 'admin.experimental.collapsedThreads.title', defaultMessage: 'Threaded Discussions'}),
-                                    help_text: defineMessage({id: 'admin.experimental.collapsedThreads.desc', defaultMessage: 'When enabled (default off), users must enable Threaded Discussions in Settings. When disabled, users cannot access Threaded Discussions. Please review our <linkKnownIssues>documentation for known issues</linkKnownIssues> and help provide feedback in our <linkCommunityChannel>Community Channel</linkCommunityChannel>.'}),
+                                    help_text: defineMessage({id: 'admin.experimental.collapsedThreads.desc', defaultMessage: 'When enabled (default off), users have the option to enable Threaded Discussions in Account Settings. When enabled (default on), users see Threaded Discussions by default and have the option to disable it in Account Settings. When always on, users are required to use Threaded Discussions and cannot disable it.'}),
                                     help_text_values: {
                                         linkKnownIssues: (msg: string) => (
                                             <ExternalLink
@@ -3096,7 +3096,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'bool',
                                     key: 'ServiceSettings.PostPriority',
                                     label: defineMessage({id: 'admin.posts.postPriority.title', defaultMessage: 'Message Priority'}),
-                                    help_text: defineMessage({id: 'admin.posts.postPriority.desc', defaultMessage: 'When enabled, users can configure a visual indicator to communicate messages that are important or urgent. Learn more about message priority in our <link>documentation</link>.'}),
+                                    help_text: defineMessage({id: 'admin.posts.postPriority.desc', defaultMessage: 'When enabled, users can configure a visual indicator to communicate messages that are important or urgent. Learn more about message priority in our <link>documentation</link>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3114,7 +3114,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'bool',
                                     key: 'ServiceSettings.AllowPersistentNotifications',
                                     label: defineMessage({id: 'admin.posts.persistentNotifications.title', defaultMessage: 'Persistent Notifications'}),
-                                    help_text: defineMessage({id: 'admin.posts.persistentNotifications.desc', defaultMessage: 'When enabled, users can trigger repeating notifications for the recipients of urgent messages. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}),
+                                    help_text: defineMessage({id: 'admin.posts.persistentNotifications.desc', defaultMessage: 'When enabled, users can trigger repeating notifications for the recipients of urgent messages. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3133,7 +3133,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'number',
                                     key: 'ServiceSettings.PersistentNotificationMaxRecipients',
                                     label: defineMessage({id: 'admin.posts.persistentNotificationsMaxRecipients.title', defaultMessage: 'Maximum number of recipients for persistent notifications'}),
-                                    help_text: defineMessage({id: 'admin.posts.persistentNotificationsMaxRecipients.desc', defaultMessage: 'Configure the maximum number of recipients to which users may send persistent notifications. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}),
+                                    help_text: defineMessage({id: 'admin.posts.persistentNotificationsMaxRecipients.desc', defaultMessage: 'Configure the maximum number of recipients to which users may send persistent notifications. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3155,7 +3155,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'number',
                                     key: 'ServiceSettings.PersistentNotificationIntervalMinutes',
                                     label: defineMessage({id: 'admin.posts.persistentNotificationsInterval.title', defaultMessage: 'Frequency of persistent notifications'}),
-                                    help_text: defineMessage({id: 'admin.posts.persistentNotificationsInterval.desc', defaultMessage: 'Configure the number of minutes between repeated notifications for urgent messages send with persistent notifications. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}),
+                                    help_text: defineMessage({id: 'admin.posts.persistentNotificationsInterval.desc', defaultMessage: 'Configure the number of minutes between repeated notifications for urgent messages send with persistent notifications. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3172,13 +3172,13 @@ const AdminDefinition: AdminDefinitionType = {
                                         it.configIsFalse('ServiceSettings', 'PostPriority'),
                                         it.configIsFalse('ServiceSettings', 'AllowPersistentNotifications'),
                                     ),
-                                    validate: validators.minValue(2, defineMessage({id: 'admin.posts.persistentNotificationsInterval.minValue', defaultMessage: 'Frequency cannot not be set to less than 2 minutes'})),
+                                    validate: validators.minValue(2, defineMessage({id: 'admin.posts.persistentNotificationsInterval.minValue', defaultMessage: 'Frequency must be at least two minutes'})),
                                 },
                                 {
                                     type: 'number',
                                     key: 'ServiceSettings.PersistentNotificationMaxCount',
                                     label: defineMessage({id: 'admin.posts.persistentNotificationsMaxCount.title', defaultMessage: 'Total number of persistent notification per post'}),
-                                    help_text: defineMessage({id: 'admin.posts.persistentNotificationsMaxCount.desc', defaultMessage: 'Configure the maximum number of times users may receive persistent notifications. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}),
+                                    help_text: defineMessage({id: 'admin.posts.persistentNotificationsMaxCount.desc', defaultMessage: 'Configure the maximum number of times users may receive persistent notifications. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3200,7 +3200,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'bool',
                                     key: 'ServiceSettings.AllowPersistentNotificationsForGuests',
                                     label: defineMessage({id: 'admin.posts.persistentNotificationsGuests.title', defaultMessage: 'Allow guests to send persistent notifications'}),
-                                    help_text: defineMessage({id: 'admin.posts.persistentNotificationsGuests.desc', defaultMessage: 'Whether a guest is able to require persistent notifications. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}),
+                                    help_text: defineMessage({id: 'admin.posts.persistentNotificationsGuests.desc', defaultMessage: 'Whether a guest is able to require persistent notifications. Learn more about message priority and persistent notifications in our <link>documentation</link>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3358,7 +3358,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'bool',
                                     key: 'ServiceSettings.EnablePermalinkPreviews',
                                     label: defineMessage({id: 'admin.customization.enablePermalinkPreviewsTitle', defaultMessage: 'Enable message link previews:'}),
-                                    help_text: defineMessage({id: 'admin.customization.enablePermalinkPreviewsDesc', defaultMessage: 'When enabled, links to Mattermost messages will generate a preview for any users that have access to the original message. Please review our <link>documentation</link> for details.'}),
+                                    help_text: defineMessage({id: 'admin.customization.enablePermalinkPreviewsDesc', defaultMessage: 'When enabled, links to Mattermost messages will generate a preview for any users that have access to the original message. Please review our <link>documentation</link> for details.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3376,21 +3376,21 @@ const AdminDefinition: AdminDefinitionType = {
                                     type: 'bool',
                                     key: 'ServiceSettings.EnableSVGs',
                                     label: defineMessage({id: 'admin.customization.enableSVGsTitle', defaultMessage: 'Enable SVGs:'}),
-                                    help_text: defineMessage({id: 'admin.customization.enableSVGsDesc', defaultMessage: 'Enable previews for SVG file attachments and allow them to appear in messages. Enabling SVGs is not recommended in environments where not all users are trusted.'}),
+                                    help_text: defineMessage({id: 'admin.customization.enableSVGsDesc', defaultMessage: 'Enable previews for SVG file attachments and allow them to appear in messages.\n\nEnabling SVGs is not recommended in environments where not all users are trusted.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                                     isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.SITE.POSTS)),
                                 },
                                 {
                                     type: 'bool',
                                     key: 'ServiceSettings.EnableLatex',
                                     label: defineMessage({id: 'admin.customization.enableLatexTitle', defaultMessage: 'Enable Latex Rendering:'}),
-                                    help_text: defineMessage({id: 'admin.customization.enableLatexDesc', defaultMessage: 'Enable rendering of Latex in code blocks. If false, Latex code will be highlighted only. Enabling Latex is not recommended in environments where not all users are trusted.'}),
+                                    help_text: defineMessage({id: 'admin.customization.enableLatexDesc', defaultMessage: 'Enable rendering of Latex in code blocks. If false, Latex code will be highlighted only.\n\nEnabling Latex is not recommended in environments where not all users are trusted.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                                     isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.SITE.POSTS)),
                                 },
                                 {
                                     type: 'bool',
                                     key: 'ServiceSettings.EnableInlineLatex',
                                     label: defineMessage({id: 'admin.customization.enableInlineLatexTitle', defaultMessage: 'Enable Inline Latex Rendering:'}),
-                                    help_text: defineMessage({id: 'admin.customization.enableInlineLatexDesc', defaultMessage: 'Enable rendering of inline Latex code. If false, Latex can only be rendered in a code block using syntax highlighting. Please review our <link>documentation</link> for details about text formatting.'}),
+                                    help_text: defineMessage({id: 'admin.customization.enableInlineLatexDesc', defaultMessage: 'Enable rendering of inline Latex code. If false, Latex can only be rendered in a code block using syntax highlighting. Please review our <link>documentation</link> for details about text formatting.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3418,7 +3418,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     key: 'ServiceSettings.GoogleDeveloperKey',
                                     label: defineMessage({id: 'admin.service.googleTitle', defaultMessage: 'Google API Key:'}),
                                     placeholder: defineMessage({id: 'admin.service.googleExample', defaultMessage: 'E.g.: "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"'}),
-                                    help_text: defineMessage({id: 'admin.service.googleDescription', defaultMessage: 'Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <link>Google Developers Tutorial</link> for instructions on how to obtain a key and add YouTube Data API v3 as a service to your key.'}),
+                                    help_text: defineMessage({id: 'admin.service.googleDescription', defaultMessage: 'Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <link>Google Developers Tutorial</link> for instructions on how to obtain a key and add YouTube Data API v3 as a service to your key.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         link: (msg: string) => (
                                             <ExternalLink
@@ -3443,7 +3443,7 @@ const AdminDefinition: AdminDefinitionType = {
                                 {
                                     type: 'number',
                                     key: 'DisplaySettings.MaxMarkdownNodes',
-                                    label: defineMessage({id: 'admin.customization.maxMarkdownNodesTitle', defaultMessage: 'Max Markdown Nodes:'}),
+                                    label: defineMessage({id: 'admin.customization.maxMarkdownNodesTitle', defaultMessage: 'Maximum Markdown Nodes:'}),
                                     help_text: defineMessage({id: 'admin.customization.maxMarkdownNodesDesc', defaultMessage: 'When rendering Markdown text in the mobile app, controls the maximum number of Markdown elements (eg. emojis, links, table cells, etc) that can be in a single piece of text. If set to 0, a default limit will be used.'}),
                                     isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.SITE.POSTS)),
                                 },
@@ -3499,7 +3499,7 @@ const AdminDefinition: AdminDefinitionType = {
                 isHidden: it.any(it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.SITE.POSTS)), it.configIsFalse('FeatureFlags', 'MoveThreadsEnabled'), it.not(it.licensed)),
                 schema: {
                     id: 'WranglerSettings',
-                    name: defineMessage({id: 'admin.site.move_thread', defaultMessage: 'Move Thread (Beta)'}),
+                    name: defineMessage({id: 'admin.site.move_thread', defaultMessage: 'Move Thread'}),
                     settings: [
                         {
                             type: 'roles',
@@ -3531,7 +3531,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'WranglerSettings.MoveThreadToAnotherTeamEnable',
                             label: defineMessage({id: 'admin.experimental.moveThreadToAnotherTeamEnable.title', defaultMessage: 'Enable Moving Threads To Different Teams'}),
-                            help_text: defineMessage({id: 'admin.experimental.moveThreadToAnotherTeamEnable.desc', defaultMessage: 'Control whether Wrangler is permitted to move message threads from one team to another or not.'}),
+                            help_text: defineMessage({id: 'admin.experimental.moveThreadToAnotherTeamEnable.desc', defaultMessage: 'Control whether move thread is permitted to move message threads from one team to another or not.'}),
                             help_text_markdown: false,
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
                         },
@@ -3539,7 +3539,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'WranglerSettings.MoveThreadFromPrivateChannelEnable',
                             label: defineMessage({id: 'admin.experimental.moveThreadFromPrivateChannelEnable.title', defaultMessage: 'Enable Moving Threads From Private Channels'}),
-                            help_text: defineMessage({id: 'admin.experimental.moveThreadFromPrivateChannelEnable.desc', defaultMessage: 'Control whether Wrangler is permitted to move message threads from private channels or not.'}),
+                            help_text: defineMessage({id: 'admin.experimental.moveThreadFromPrivateChannelEnable.desc', defaultMessage: 'Control whether move thread is permitted to move message threads from private channels or not.'}),
                             help_text_markdown: false,
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
                         },
@@ -3547,7 +3547,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'WranglerSettings.MoveThreadFromDirectMessageChannelEnable',
                             label: defineMessage({id: 'admin.experimental.moveThreadFromDirectMessageChannelEnable.title', defaultMessage: 'Enable Moving Threads From Direct Message Channels'}),
-                            help_text: defineMessage({id: 'admin.experimental.moveThreadFromDirectMessageChannelEnable.desc', defaultMessage: 'Control whether Wrangler is permitted to move message threads from direct message channels or not.'}),
+                            help_text: defineMessage({id: 'admin.experimental.moveThreadFromDirectMessageChannelEnable.desc', defaultMessage: 'Control whether move thread is permitted to move message threads from direct message channels or not.'}),
                             help_text_markdown: false,
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
                         },
@@ -3555,7 +3555,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'WranglerSettings.MoveThreadFromGroupMessageChannelEnable',
                             label: defineMessage({id: 'admin.experimental.moveThreadFromGroupMessageChannelEnable.title', defaultMessage: 'Enable Moving Threads From Group Message Channels'}),
-                            help_text: defineMessage({id: 'admin.experimental.moveThreadFromGroupMessageChannelEnable.desc', defaultMessage: 'Control whether Wrangler is permitted to move message threads from group message channels or not.'}),
+                            help_text: defineMessage({id: 'admin.experimental.moveThreadFromGroupMessageChannelEnable.desc', defaultMessage: 'Control whether move thread is permitted to move message threads from group message channels or not.'}),
                             help_text_markdown: false,
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
                         },
@@ -3638,7 +3638,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'AnnouncementSettings.AdminNoticesEnabled',
                             label: defineMessage({id: 'admin.notices.enableAdminNoticesTitle', defaultMessage: 'Enable Admin Notices: '}),
-                            help_text: defineMessage({id: 'admin.notices.enableAdminNoticesDescription', defaultMessage: 'When enabled, System Admins will receive notices about available server upgrades and relevant system administration features. <link>Learn more about notices</link> in our documentation.'}),
+                            help_text: defineMessage({id: 'admin.notices.enableAdminNoticesDescription', defaultMessage: 'When enabled, System Admins will receive notices about available server upgrades and relevant system administration features. <link>Learn more about notices</link> in our documentation.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -3656,7 +3656,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'AnnouncementSettings.UserNoticesEnabled',
                             label: defineMessage({id: 'admin.notices.enableEndUserNoticesTitle', defaultMessage: 'Enable End User Notices: '}),
-                            help_text: defineMessage({id: 'admin.notices.enableEndUserNoticesDescription', defaultMessage: 'When enabled, all users will receive notices about available client upgrades and relevant end user features to improve user experience. <link>Learn more about notices</link> in our documentation.'}),
+                            help_text: defineMessage({id: 'admin.notices.enableEndUserNoticesDescription', defaultMessage: 'When enabled, all users will receive notices about available client upgrades and relevant end user features to improve user experience. <link>Learn more about notices</link> in our documentation.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -3737,18 +3737,6 @@ const AdminDefinition: AdminDefinitionType = {
                             help_text: defineMessage({id: 'admin.team.userCreationDescription', defaultMessage: 'When false, the ability to create accounts is disabled, and selecting Create Account displays an error. Applies to Email, OpenID Connect, and OAuth 2.0 user account authentication.'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.SIGNUP)),
                         },
-                        {
-                            type: 'text',
-                            key: 'TeamSettings.RestrictCreationToDomains',
-                            label: defineMessage({id: 'admin.team.restrictTitle', defaultMessage: 'Restrict new system and team members to specified email domains:'}),
-                            help_text: defineMessage({id: 'admin.team.restrictDescription', defaultMessage: 'New user accounts are restricted to the above specified email domain (e.g. "mattermost.com") or list of comma-separated domains (e.g. "corp.mattermost.com, mattermost.com"). New teams can only be created by users from the above domain(s). This setting only affects email login for users.'}),
-                            placeholder: defineMessage({id: 'admin.team.restrictExample', defaultMessage: 'E.g.: "corp.mattermost.com, mattermost.com"'}),
-                            isHidden: it.all(
-                                it.licensed,
-                                it.not(it.licensedForSku('starter')),
-                            ),
-                            isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.SIGNUP)),
-                        },
                         {
                             type: 'text',
                             key: 'TeamSettings.RestrictCreationToDomains',
@@ -3782,7 +3770,7 @@ const AdminDefinition: AdminDefinitionType = {
                             action: invalidateAllEmailInvites,
                             label: defineMessage({id: 'admin.team.invalidateEmailInvitesTitle', defaultMessage: 'Invalidate pending email invites'}),
                             help_text: defineMessage({id: 'admin.team.invalidateEmailInvitesDescription', defaultMessage: 'This will invalidate active email invitations that have not been accepted by the user. By default email invitations expire after 48 hours.'}),
-                            error_message: defineMessage({id: 'admin.team.invalidateEmailInvitesFail', defaultMessage: 'Unable to invalidate pending email invites: {error}'}),
+                            error_message: defineMessage({id: 'admin.team.invalidateEmailInvitesFail', defaultMessage: 'Unable to invalidate pending email invites: {error}'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             success_message: defineMessage({id: 'admin.team.invalidateEmailInvitesSuccess', defaultMessage: 'Pending email invitations invalidated successfully'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.SIGNUP)),
                         },
@@ -3850,7 +3838,7 @@ const AdminDefinition: AdminDefinitionType = {
                     settings: [
                         {
                             type: 'banner',
-                            label: defineMessage({id: 'admin.mfa.bannerDesc', defaultMessage: '<link>Multi-factor authentication</link> is available for accounts with AD/LDAP or email login. If other login methods are used, MFA should be configured with the authentication provider.'}),
+                            label: defineMessage({id: 'admin.mfa.bannerDesc', defaultMessage: '<link>Multi-factor authentication</link> is available for accounts with AD/LDAP or email login. If other login methods are used, MFA should be configured with the authentication provider.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             label_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -3867,14 +3855,14 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.EnableMultifactorAuthentication',
                             label: defineMessage({id: 'admin.service.mfaTitle', defaultMessage: 'Enable Multi-factor Authentication:'}),
-                            help_text: defineMessage({id: 'admin.service.mfaDesc', defaultMessage: 'When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.'}),
+                            help_text: defineMessage({id: 'admin.service.mfaDesc', defaultMessage: 'When true, users with AD/LDAP or email login can add multi-factor authentication to their account using an authenticator app.'}),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.MFA)),
                         },
                         {
                             type: 'bool',
                             key: 'ServiceSettings.EnforceMultifactorAuthentication',
                             label: defineMessage({id: 'admin.service.enforceMfaTitle', defaultMessage: 'Enforce Multi-factor Authentication:'}),
-                            help_text: defineMessage({id: 'admin.service.enforceMfaDesc', defaultMessage: 'When true, <link>multi-factor authentication</link> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.\n \nIf your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.'}),
+                            help_text: defineMessage({id: 'admin.service.enforceMfaDesc', defaultMessage: 'When true, <link>multi-factor authentication</link> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.\n \nIf your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -3943,7 +3931,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'SamlSettings.Enable',
                             label: defineMessage({id: 'admin.saml.enableTitle', defaultMessage: 'Enable Login With SAML 2.0:'}),
-                            help_text: defineMessage({id: 'admin.saml.enableDescription', defaultMessage: 'When true, Mattermost allows login using SAML 2.0. Please see <link>documentation</link> to learn more about configuring SAML for Mattermost.'}),
+                            help_text: defineMessage({id: 'admin.saml.enableDescription', defaultMessage: 'When true, Mattermost allows login using SAML 2.0. Please see <link>documentation</link> to learn more about configuring SAML for Mattermost.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -3961,7 +3949,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'SamlSettings.EnableSyncWithLdap',
                             label: defineMessage({id: 'admin.saml.enableSyncWithLdapTitle', defaultMessage: 'Enable Synchronizing SAML Accounts With AD/LDAP:'}),
-                            help_text: defineMessage({id: 'admin.saml.enableSyncWithLdapDescription', defaultMessage: 'When true, Mattermost periodically synchronizes SAML user attributes, including user deactivation and removal, from AD/LDAP. Enable and configure synchronization settings at <strong>Authentication > AD/LDAP</strong>. When false, user attributes are updated from SAML during user login. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.saml.enableSyncWithLdapDescription', defaultMessage: 'When true, Mattermost periodically synchronizes SAML user attributes, including user deactivation and removal, from AD/LDAP. Enable and configure synchronization settings at <strong>Authentication > AD/LDAP</strong>. When false, user attributes are updated from SAML during user login. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -3995,7 +3983,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'SamlSettings.EnableSyncWithLdapIncludeAuth',
                             label: defineMessage({id: 'admin.saml.enableSyncWithLdapIncludeAuthTitle', defaultMessage: 'Override SAML bind data with AD/LDAP information:'}),
-                            help_text: defineMessage({id: 'admin.saml.enableSyncWithLdapIncludeAuthDescription', defaultMessage: 'When true, Mattermost will override the SAML ID attribute with the AD/LDAP ID attribute if configured or override the SAML Email attribute with the AD/LDAP Email attribute if SAML ID attribute is not present. This will allow you automatically migrate users from Email binding to ID binding to prevent creation of new users when an email address changes for a user. Moving from true to false, will remove the override from happening. <strong>Note:</strong> SAML IDs must match the LDAP IDs to prevent disabling of user accounts. Please review <link>documentation</link> for more information.'}),
+                            help_text: defineMessage({id: 'admin.saml.enableSyncWithLdapIncludeAuthDescription', defaultMessage: 'When true, Mattermost will override the SAML ID attribute with the AD/LDAP ID attribute if configured or override the SAML Email attribute with the AD/LDAP Email attribute if SAML ID attribute is not present. This will allow you automatically migrate users from Email binding to ID binding to prevent creation of new users when an email address changes for a user. Moving from true to false, will remove the override from happening. <strong>Note:</strong> SAML IDs must match the LDAP IDs to prevent disabling of user accounts. Please review <link>documentation</link> for more information.'}), // eslint-disable-line formatjs/no-multiple-whitespaces, formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -4018,7 +4006,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'SamlSettings.IdpMetadataURL',
                             label: defineMessage({id: 'admin.saml.idpMetadataUrlTitle', defaultMessage: 'Identity Provider Metadata URL:'}),
-                            help_text: defineMessage({id: 'admin.saml.idpMetadataUrlDesc', defaultMessage: 'The Metadata URL for the Identity Provider you use for SAML requests'}),
+                            help_text: defineMessage({id: 'admin.saml.idpMetadataUrlDesc', defaultMessage: 'The URL where Mattermost sends a request to obtain metadata'}),
                             placeholder: defineMessage({id: 'admin.saml.idpMetadataUrlEx', defaultMessage: 'E.g.: "https://idp.example.org/SAML2/saml/metadata"'}),
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.SAML)),
@@ -4099,7 +4087,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'SamlSettings.AssertionConsumerServiceURL',
                             label: defineMessage({id: 'admin.saml.assertionConsumerServiceURLTitle', defaultMessage: 'Service Provider Login URL:'}),
                             help_text: defineMessage({id: 'admin.saml.assertionConsumerServiceURLPopulatedDesc', defaultMessage: 'This field is also known as the Assertion Consumer Service URL.'}),
-                            placeholder: defineMessage({id: 'admin.saml.assertionConsumerServiceURLEx', defaultMessage: 'E.g.: "<urlChunk>your-mattermost-url</urlChunk>"'}),
+                            placeholder: defineMessage({id: 'admin.saml.assertionConsumerServiceURLEx', defaultMessage: 'E.g.: "<urlChunk>your-mattermost-url</urlChunk>"'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             placeholder_values: {
                                 urlChunk: (chunk: string) => `https://'<${chunk}>'/login/sso/saml`,
                             },
@@ -4121,7 +4109,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'SamlSettings.ServiceProviderIdentifier',
                             label: defineMessage({id: 'admin.saml.serviceProviderIdentifierTitle', defaultMessage: 'Service Provider Identifier:'}),
                             help_text: defineMessage({id: 'admin.saml.serviceProviderIdentifierDesc', defaultMessage: 'The unique identifier for the Service Provider, usually the same as Service Provider Login URL. In ADFS, this MUST match the Relying Party Identifier.'}),
-                            placeholder: defineMessage({id: 'admin.saml.serviceProviderIdentifierEx', defaultMessage: 'E.g.: "<urlChunk>your-mattermost-url</urlChunk>"'}),
+                            placeholder: defineMessage({id: 'admin.saml.serviceProviderIdentifierEx', defaultMessage: 'E.g.: "<urlChunk>your-mattermost-url</urlChunk>"'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             placeholder_values: {
                                 urlChunk: (chunk: string) => `https://'<${chunk}>'/login/sso/saml`,
                             },
@@ -4275,7 +4263,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'SamlSettings.GuestAttribute',
                             label: defineMessage({id: 'admin.saml.guestAttrTitle', defaultMessage: 'Guest Attribute:'}),
                             placeholder: defineMessage({id: 'admin.saml.guestAttrEx', defaultMessage: 'E.g.: "usertype=Guest" or "isGuest=true"'}),
-                            help_text: defineMessage({id: 'admin.saml.guestAttrDesc', defaultMessage: '(Optional) Requires Guest Access to be enabled before being applied. The attribute in the SAML Assertion that will be used to apply a guest role to users in Mattermost. Guests are prevented from accessing teams or channels upon logging in until they are assigned a team and at least one channel. Note: If this attribute is removed/changed from your guest user in SAML and the user is still active, they will not be promoted to a member and will retain their Guest role. Guests can be promoted in **System Console > User Management**. Existing members that are identified by this attribute as a guest will be demoted from a member to a guest when they are asked to login next. The next login is based upon Session lengths set in **System Console > Session Lengths**. It is highly recommend to manually demote users to guests in **System Console > User Management ** to ensure access is restricted immediately.'}),
+                            help_text: defineMessage({id: 'admin.saml.guestAttrDesc', defaultMessage: '(Optional) Requires Guest Access to be enabled before being applied. The attribute in the SAML Assertion that will be used to apply a guest role to users in Mattermost. Guests are prevented from accessing teams or channels upon logging in until they are assigned a team and at least one channel.\n \nNote: If this attribute is removed/changed from your guest user in SAML and the user is still active, they will not be promoted to a member and will retain their Guest role. Guests can be promoted in **System Console > User Management**.\n \n \nExisting members that are identified by this attribute as a guest will be demoted from a member to a guest when they are asked to login next. The next login is based upon Session lengths set in **System Console > Session Lengths**. It is highly recommend to manually demote users to guests in **System Console > User Management ** to ensure access is restricted immediately.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             help_text_markdown: true,
                             isDisabled: it.any(
                                 it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.SAML)),
@@ -4297,7 +4285,7 @@ const AdminDefinition: AdminDefinitionType = {
                             key: 'SamlSettings.AdminAttribute',
                             label: defineMessage({id: 'admin.saml.adminAttrTitle', defaultMessage: 'Admin Attribute:'}),
                             placeholder: defineMessage({id: 'admin.saml.adminAttrEx', defaultMessage: 'E.g.: "usertype=Admin" or "isAdmin=true"'}),
-                            help_text: defineMessage({id: 'admin.saml.adminAttrDesc', defaultMessage: '(Optional) The attribute in the SAML Assertion for designating System Admins. The users selected by the query will have access to your Mattermost server as System Admins. By default, System Admins have complete access to the Mattermost System Console. Existing members that are identified by this attribute will be promoted from member to System Admin upon next login. The next login is based upon Session lengths set in **System Console > Session Lengths.** It is highly recommend to manually demote users to members in **System Console > User Management** to ensure access is restricted immediately. Note: If this filter is removed/changed, System Admins that were promoted via this filter will be demoted to members and will not retain access to the System Console. When this filter is not in use, System Admins can be manually promoted/demoted in **System Console > User Management**.'}),
+                            help_text: defineMessage({id: 'admin.saml.adminAttrDesc', defaultMessage: '(Optional) The attribute in the SAML Assertion for designating System Admins. The users selected by the query will have access to your Mattermost server as System Admins. By default, System Admins have complete access to the Mattermost System Console.\n \nExisting members that are identified by this attribute will be promoted from member to System Admin upon next login. The next login is based upon Session lengths set in **System Console > Session Lengths**. It is highly recommend to manually demote users to members in **System Console > User Management** to ensure access is restricted immediately.\n \nNote: If this filter is removed/changed, System Admins that were promoted via this filter will be demoted to members and will not retain access to the System Console. When this filter is not in use, System Admins can be manually promoted/demoted in **System Console > User Management**.'}), // eslint-disable-line formatjs/no-multiple-whitespaces
                             help_text_markdown: true,
                             isDisabled: it.any(
                                 it.not(it.isSystemAdmin),
@@ -4486,7 +4474,7 @@ const AdminDefinition: AdminDefinitionType = {
                                 {
                                     value: Constants.GITLAB_SERVICE,
                                     display_name: defineMessage({id: 'admin.oauth.gitlab', defaultMessage: 'GitLab'}),
-                                    help_text: defineMessage({id: 'admin.gitlab.EnableMarkdownDesc', defaultMessage: '1. Log in to your GitLab account and go to Profile Settings -> Applications.\n2. Enter Redirect URIs "<loginUrlChunk>your-mattermost-url</loginUrlChunk>" (example: http://localhost:8065/login/gitlab/complete) and "<signupUrlChunk>your-mattermost-url</signupUrlChunk>".\n3. Then use "Application Secret Key" and "Application ID" fields from GitLab to complete the options below.\n4. Complete the Endpoint URLs below.'}),
+                                    help_text: defineMessage({id: 'admin.gitlab.EnableMarkdownDesc', defaultMessage: '1. Log in to your GitLab account and go to Profile Settings -> Applications.\n2. Enter Redirect URIs "<loginUrlChunk>your-mattermost-url</loginUrlChunk>" (example: http://localhost:8065/login/gitlab/complete) and "<signupUrlChunk>your-mattermost-url</signupUrlChunk>".\n3. Then use "Application Secret Key" and "Application ID" fields from GitLab to complete the options below.\n4. Complete the Endpoint URLs below.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         loginUrlChunk: (chunk: string) => `<${chunk}>/login/gitlab/complete`,
                                         signupUrlChunk: (chunk: string) => `<${chunk}>/signup/gitlab/complete`,
@@ -4497,7 +4485,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     value: Constants.GOOGLE_SERVICE,
                                     display_name: defineMessage({id: 'admin.oauth.google', defaultMessage: 'Google Apps'}),
                                     isHidden: it.all(it.not(it.licensedForFeature('GoogleOAuth')), it.not(it.cloudLicensed)),
-                                    help_text: defineMessage({id: 'admin.google.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand sidebar and enter "Mattermost - your-company-name" as the <strong>Project Name</strong>, then click <strong>Create</strong>.\n3. Click the <strong>OAuth consent screen</strong> header and enter "Mattermost" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.\n4. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n5. Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>"your-mattermost-url/signup/google/complete"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.'}),
+                                    help_text: defineMessage({id: 'admin.google.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter "Mattermost - your-company-name" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>"your-mattermost-url/signup/google/complete"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_markdown: false,
                                     help_text_values: {
                                         linkLogin: (msg: string) => (
@@ -4531,7 +4519,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     value: Constants.OFFICE365_SERVICE,
                                     display_name: defineMessage({id: 'admin.oauth.office365', defaultMessage: 'Entra ID'}),
                                     isHidden: it.all(it.not(it.licensedForFeature('Office365OAuth')), it.not(it.cloudLicensed)),
-                                    help_text: defineMessage({id: 'admin.office365.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter "Mattermost - your-company-name" as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter "your-mattermost-url/signup/office365/complete" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.'}),
+                                    help_text: defineMessage({id: 'admin.office365.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter "Mattermost - your-company-name" as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter "your-mattermost-url/signup/office365/complete" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_markdown: false,
                                     help_text_values: {
                                         linkLogin: (msg: string) => (
@@ -4825,7 +4813,7 @@ const AdminDefinition: AdminDefinitionType = {
                                 {
                                     value: Constants.GITLAB_SERVICE,
                                     display_name: defineMessage({id: 'admin.openid.gitlab', defaultMessage: 'GitLab'}),
-                                    help_text: defineMessage({id: 'admin.gitlab.EnableMarkdownDesc', defaultMessage: '1. Log in to your GitLab account and go to Profile Settings -> Applications.\n2. Enter Redirect URIs "<loginUrlChunk>your-mattermost-url</loginUrlChunk>" (example: http://localhost:8065/login/gitlab/complete) and "<signupUrlChunk>your-mattermost-url</signupUrlChunk>".\n3. Then use "Application Secret Key" and "Application ID" fields from GitLab to complete the options below.\n4. Complete the Endpoint URLs below.'}),
+                                    help_text: defineMessage({id: 'admin.gitlab.EnableMarkdownDesc', defaultMessage: '1. Log in to your GitLab account and go to Profile Settings -> Applications.\n2. Enter Redirect URIs "<loginUrlChunk>your-mattermost-url</loginUrlChunk>" (example: http://localhost:8065/login/gitlab/complete) and "<signupUrlChunk>your-mattermost-url</signupUrlChunk>".\n3. Then use "Application Secret Key" and "Application ID" fields from GitLab to complete the options below.\n4. Complete the Endpoint URLs below.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_values: {
                                         loginUrlChunk: (chunk: string) => `<${chunk}>/login/gitlab/complete`,
                                         signupUrlChunk: (chunk: string) => `<${chunk}>/signup/gitlab/complete`,
@@ -4835,7 +4823,7 @@ const AdminDefinition: AdminDefinitionType = {
                                 {
                                     value: Constants.GOOGLE_SERVICE,
                                     display_name: defineMessage({id: 'admin.openid.google', defaultMessage: 'Google Apps'}),
-                                    help_text: defineMessage({id: 'admin.google.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com]</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter "Mattermost - your-company-name" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>"your-mattermost-url/signup/google/complete"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.'}),
+                                    help_text: defineMessage({id: 'admin.google.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter "Mattermost - your-company-name" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>"your-mattermost-url/signup/google/complete"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_markdown: false,
                                     help_text_values: {
                                         linkLogin: (msg: string) => (
@@ -4868,7 +4856,7 @@ const AdminDefinition: AdminDefinitionType = {
                                 {
                                     value: Constants.OFFICE365_SERVICE,
                                     display_name: defineMessage({id: 'admin.openid.office365', defaultMessage: 'Entra ID'}),
-                                    help_text: defineMessage({id: 'admin.office365.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter "Mattermost - your-company-name" as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter "your-mattermost-url/signup/office365/complete" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.'}),
+                                    help_text: defineMessage({id: 'admin.office365.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter "Mattermost - your-company-name" as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter "your-mattermost-url/signup/office365/complete" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                                     help_text_markdown: false,
                                     help_text_values: {
                                         linkLogin: (msg: string) => (
@@ -4935,7 +4923,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'GitLabSettings.Id',
                             label: defineMessage({id: 'admin.openid.clientIdTitle', defaultMessage: 'Client ID:'}),
-                            help_text: defineMessage({id: 'admin.openid.clientIdDescription', defaultMessage: 'Obtaining the Client ID differs across providers. Please check you provider\'s documentation'}),
+                            help_text: defineMessage({id: 'admin.openid.clientIdDescription', defaultMessage: 'Obtaining the Client ID differs across providers. Please check you provider\'s documentation.'}),
                             placeholder: defineMessage({id: 'admin.gitlab.clientIdExample', defaultMessage: 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'}),
                             isHidden: it.not(it.stateEquals('openidType', Constants.GITLAB_SERVICE)),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.OPENID)),
@@ -4944,8 +4932,8 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'GitLabSettings.Secret',
                             label: defineMessage({id: 'admin.openid.clientSecretTitle', defaultMessage: 'Client Secret:'}),
-                            help_text: defineMessage({id: 'admin.openid.clientSecretDescription', defaultMessage: 'Obtaining the Client Secret differs across providers. Please check you provider\'s documentation'}),
-                            placeholder: defineMessage({id: 'admin.gitlab.clientSecretExample', defaultMessage: 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx442pnqMxQY"'}),
+                            help_text: defineMessage({id: 'admin.openid.clientSecretDescription', defaultMessage: 'Obtaining the Client Secret differs across providers. Please check you provider\'s documentation.'}),
+                            placeholder: defineMessage({id: 'admin.gitlab.clientSecretExample', defaultMessage: 'E.g.: "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'}),
                             isHidden: it.not(it.stateEquals('openidType', Constants.GITLAB_SERVICE)),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.OPENID)),
                         },
@@ -4963,7 +4951,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'GoogleSettings.Id',
                             label: defineMessage({id: 'admin.openid.clientIdTitle', defaultMessage: 'Client ID:'}),
-                            help_text: defineMessage({id: 'admin.openid.clientIdDescription', defaultMessage: 'Obtaining the Client ID differs across providers. Please check you provider\'s documentation'}),
+                            help_text: defineMessage({id: 'admin.openid.clientIdDescription', defaultMessage: 'Obtaining the Client ID differs across providers. Please check you provider\'s documentation.'}),
                             placeholder: defineMessage({id: 'admin.google.clientIdExample', defaultMessage: 'E.g.: "7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com"'}),
                             isHidden: it.not(it.stateEquals('openidType', Constants.GOOGLE_SERVICE)),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.OPENID)),
@@ -4972,7 +4960,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'GoogleSettings.Secret',
                             label: defineMessage({id: 'admin.openid.clientSecretTitle', defaultMessage: 'Client Secret:'}),
-                            help_text: defineMessage({id: 'admin.openid.clientSecretDescription', defaultMessage: 'Obtaining the Client Secret differs across providers. Please check you provider\'s documentation'}),
+                            help_text: defineMessage({id: 'admin.openid.clientSecretDescription', defaultMessage: 'Obtaining the Client Secret differs across providers. Please check you provider\'s documentation.'}),
                             placeholder: defineMessage({id: 'admin.google.clientSecretExample', defaultMessage: 'E.g.: "H8sz0Az-dDs2p15-7QzD231"'}),
                             isHidden: it.not(it.stateEquals('openidType', Constants.GOOGLE_SERVICE)),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.OPENID)),
@@ -5005,7 +4993,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'Office365Settings.Id',
                             label: defineMessage({id: 'admin.openid.clientIdTitle', defaultMessage: 'Client ID:'}),
-                            help_text: defineMessage({id: 'admin.openid.clientIdDescription', defaultMessage: 'Obtaining the Client ID differs across providers. Please check you provider\'s documentation'}),
+                            help_text: defineMessage({id: 'admin.openid.clientIdDescription', defaultMessage: 'Obtaining the Client ID differs across providers. Please check you provider\'s documentation.'}),
                             placeholder: defineMessage({id: 'admin.office365.clientIdExample', defaultMessage: 'E.g.: "adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq"'}),
                             isHidden: it.not(it.stateEquals('openidType', Constants.OFFICE365_SERVICE)),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.OPENID)),
@@ -5014,7 +5002,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'Office365Settings.Secret',
                             label: defineMessage({id: 'admin.openid.clientSecretTitle', defaultMessage: 'Client Secret:'}),
-                            help_text: defineMessage({id: 'admin.openid.clientSecretDescription', defaultMessage: 'Obtaining the Client Secret differs across providers. Please check you provider\'s documentation'}),
+                            help_text: defineMessage({id: 'admin.openid.clientSecretDescription', defaultMessage: 'Obtaining the Client Secret differs across providers. Please check you provider\'s documentation.'}),
                             placeholder: defineMessage({id: 'admin.office365.clientSecretExample', defaultMessage: 'E.g.: "shAieM47sNBfgl20f8ci294"'}),
                             isHidden: it.not(it.stateEquals('openidType', Constants.OFFICE365_SERVICE)),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.OPENID)),
@@ -5052,7 +5040,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'OpenIdSettings.Id',
                             label: defineMessage({id: 'admin.openid.clientIdTitle', defaultMessage: 'Client ID:'}),
-                            help_text: defineMessage({id: 'admin.openid.clientIdDescription', defaultMessage: 'Obtaining the Client ID differs across providers. Please check you provider\'s documentation'}),
+                            help_text: defineMessage({id: 'admin.openid.clientIdDescription', defaultMessage: 'Obtaining the Client ID differs across providers. Please check you provider\'s documentation.'}),
                             placeholder: defineMessage({id: 'admin.openid.clientIdExample', defaultMessage: 'E.g.: "adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq"'}),
                             isHidden: it.any(it.not(it.stateEquals('openidType', Constants.OPENID_SERVICE)), it.licensedForCloudStarter),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.OPENID)),
@@ -5061,7 +5049,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'OpenIdSettings.Secret',
                             label: defineMessage({id: 'admin.openid.clientSecretTitle', defaultMessage: 'Client Secret:'}),
-                            help_text: defineMessage({id: 'admin.openid.clientSecretDescription', defaultMessage: 'Obtaining the Client Secret differs across providers. Please check you provider\'s documentation'}),
+                            help_text: defineMessage({id: 'admin.openid.clientSecretDescription', defaultMessage: 'Obtaining the Client Secret differs across providers. Please check you provider\'s documentation.'}),
                             placeholder: defineMessage({id: 'admin.openid.clientSecretExample', defaultMessage: 'E.g.: "H8sz0Az-dDs2p15-7QzD231"'}),
                             isHidden: it.any(it.not(it.stateEquals('openidType', Constants.OPENID_SERVICE)), it.licensedForCloudStarter),
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.OPENID)),
@@ -5179,7 +5167,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'GuestAccountsSettings.EnforceMultifactorAuthentication',
                             label: defineMessage({id: 'admin.guest_access.mfaTitle', defaultMessage: 'Enforce Multi-factor Authentication: '}),
-                            help_text: defineMessage({id: 'admin.guest_access.mfaDescription', defaultMessage: 'When true, <link>multi-factor authentication</link> for guests is required for login. New guest users will be required to configure MFA on signup. Logged in guest users without MFA configured are redirected to the MFA setup page until configuration is complete.\n \nIf your system has guest users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.'}),
+                            help_text: defineMessage({id: 'admin.guest_access.mfaDescription', defaultMessage: 'When true, <link>multi-factor authentication</link> for guests is required for login. New guest users will be required to configure MFA on signup. Logged in guest users without MFA configured are redirected to the MFA setup page until configuration is complete.\n \nIf your system has guest users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -5286,7 +5274,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.EnableIncomingWebhooks',
                             label: defineMessage({id: 'admin.service.webhooksTitle', defaultMessage: 'Enable Incoming Webhooks: '}),
-                            help_text: defineMessage({id: 'admin.service.webhooksDescription', defaultMessage: 'When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.service.webhooksDescription', defaultMessage: 'When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -5304,7 +5292,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.EnableOutgoingWebhooks',
                             label: defineMessage({id: 'admin.service.outWebhooksTitle', defaultMessage: 'Enable Outgoing Webhooks: '}),
-                            help_text: defineMessage({id: 'admin.service.outWebhooksDesc', defaultMessage: 'When true, outgoing webhooks will be allowed. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.service.outWebhooksDesc', defaultMessage: 'When true, outgoing webhooks will be allowed. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -5322,7 +5310,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.EnableOutgoingOAuthConnections',
                             label: defineMessage({id: 'admin.service.outgoingOAuthConnectionsTitle', defaultMessage: 'Enable Outgoing OAuth Connections: '}),
-                            help_text: defineMessage({id: 'admin.service.outgoingOAuthConnectionsDesc', defaultMessage: 'When true, outgoing webhooks and slash commands will use set up oauth connections to authenticate with third party services. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.service.outgoingOAuthConnectionsDesc', defaultMessage: 'When true, outgoing webhooks and slash commands will use set up oauth connections to authenticate with third party services. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (text: string) => (
                                     <a href='https://mattermost.com/pl/outgoing-oauth-connections'>{text}</a>
@@ -5335,7 +5323,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.EnableCommands',
                             label: defineMessage({id: 'admin.service.cmdsTitle', defaultMessage: 'Enable Custom Slash Commands: '}),
-                            help_text: defineMessage({id: 'admin.service.cmdsDesc', defaultMessage: 'When true, custom slash commands will be allowed. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.service.cmdsDesc', defaultMessage: 'When true, custom slash commands will be allowed. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -5353,7 +5341,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.EnableOAuthServiceProvider',
                             label: defineMessage({id: 'admin.oauth.providerTitle', defaultMessage: 'Enable OAuth 2.0 Service Provider: '}),
-                            help_text: defineMessage({id: 'admin.oauth.providerDescription', defaultMessage: 'When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.oauth.providerDescription', defaultMessage: 'When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -5384,7 +5372,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'number',
                             key: 'ServiceSettings.OutgoingIntegrationRequestsTimeout',
                             label: defineMessage({id: 'admin.service.integrationRequestTitle', defaultMessage: 'Integration request timeout: '}),
-                            help_text: defineMessage({id: 'admin.service.integrationRequestDesc', defaultMessage: 'The number of seconds to wait for Integration requests. That includes <slashCommands>Slash Commands</slashCommands>, <outgoingWebhooks>Outgoing Webhooks</outgoingWebhooks>, <interactiveMessages>Interactive Messages</interactiveMessages> and <interactiveDialogs>Interactive Dialogs</interactiveDialogs>.'}),
+                            help_text: defineMessage({id: 'admin.service.integrationRequestDesc', defaultMessage: 'The number of seconds to wait for Integration requests. That includes <slashCommands>Slash Commands</slashCommands>, <outgoingWebhooks>Outgoing Webhooks</outgoingWebhooks>, <interactiveMessages>Interactive Messages</interactiveMessages> and <interactiveDialogs>Interactive Dialogs</interactiveDialogs>.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 slashCommands: (msg: string) => (
                                     <ExternalLink
@@ -5439,8 +5427,8 @@ const AdminDefinition: AdminDefinitionType = {
                         {
                             type: 'bool',
                             key: 'ServiceSettings.EnableUserAccessTokens',
-                            label: defineMessage({id: 'admin.service.userAccessTokensTitle', defaultMessage: 'Enable User Access Tokens: '}),
-                            help_text: defineMessage({id: 'admin.service.userAccessTokensDescription', defaultMessage: 'When true, users can create <link>user access tokens</link> for integrations in <strong>Account Menu > Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.\n\n To manage who can create personal access tokens or to search users by token ID, go to the <strong>User Management > Users</strong> page.'}),
+                            label: defineMessage({id: 'admin.service.userAccessTokensTitle', defaultMessage: 'Enable Personal Access Tokens:'}),
+                            help_text: defineMessage({id: 'admin.service.userAccessTokensDescription', defaultMessage: 'When true, users can create <link>personal access tokens</link> for integrations in <strong>Profile > Security</strong>. They can be used to authenticate against the API and give full access to the account.\n\n To manage who can create personal access tokens or to search users by token ID, go to <strong>System Console > User Management > Users</strong>.'}), // eslint-disable-line formatjs/no-multiple-whitespaces, formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -5472,7 +5460,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.EnableBotAccountCreation',
                             label: defineMessage({id: 'admin.service.enableBotTitle', defaultMessage: 'Enable Bot Account Creation: '}),
-                            help_text: defineMessage({id: 'admin.service.enableBotAccountCreation', defaultMessage: 'When true, System Admins can create bot accounts for integrations in <linkBots>Integrations > Bot Accounts</linkBots>. Bot accounts are similar to user accounts except they cannot be used to log in. See <linkDocumentation>documentation</linkDocumentation> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.service.enableBotAccountCreation', defaultMessage: 'When true, System Admins can create bot accounts for integrations in <linkBots>Integrations > Bot Accounts</linkBots>. Bot accounts are similar to user accounts except they cannot be used to log in. See <linkDocumentation>documentation</linkDocumentation> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: false,
                             help_text_values: {
                                 siteURL: getSiteURL(),
@@ -5499,7 +5487,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.DisableBotsWhenOwnerIsDeactivated',
                             label: defineMessage({id: 'admin.service.disableBotOwnerDeactivatedTitle', defaultMessage: 'Disable bot accounts when owner is deactivated:'}),
-                            help_text: defineMessage({id: 'admin.service.disableBotWhenOwnerIsDeactivated', defaultMessage: 'When a user is deactivated, disables all bot accounts managed by the user. To re-enable bot accounts, go to [Integrations > Bot Accounts]({siteURL}/_redirect/integrations/bots).'}),
+                            help_text: defineMessage({id: 'admin.service.disableBotWhenOwnerIsDeactivated', defaultMessage: 'When a user is deactivated, disables all bot accounts managed by the user. To re-enable bot accounts, go to [Integrations > Bot Accounts]({siteURL}/_redirect/integrations/bots).'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: true,
                             help_text_values: {siteURL: getSiteURL()},
                             isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.INTEGRATIONS.BOT_ACCOUNTS)),
@@ -5732,7 +5720,7 @@ const AdminDefinition: AdminDefinitionType = {
                     settings: [
                         {
                             type: 'banner',
-                            label: defineMessage({id: 'admin.compliance.newComplianceExportBanner', defaultMessage: 'This feature is replaced by a new <link>Compliance Export</link> feature, and will be removed in a future release. We recommend migrating to the new system.'}),
+                            label: defineMessage({id: 'admin.compliance.newComplianceExportBanner', defaultMessage: 'This feature is replaced by a new <link>Compliance Export</link> feature, and will be removed in a future release. We recommend migrating to the new system.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             label_values: {
                                 link: (msg: string) => (
                                     <Link to='/admin_console/compliance/export'>
@@ -5747,7 +5735,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ComplianceSettings.Enable',
                             label: defineMessage({id: 'admin.compliance.enableTitle', defaultMessage: 'Enable Compliance Reporting:'}),
-                            help_text: defineMessage({id: 'admin.compliance.enableDesc', defaultMessage: 'When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.compliance.enableDesc', defaultMessage: 'When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
@@ -5804,7 +5792,7 @@ const AdminDefinition: AdminDefinitionType = {
                     settings: [
                         {
                             type: 'banner',
-                            label: defineMessage({id: 'admin.rate.noteDescription', defaultMessage: 'Changing properties in this section will require a server restart before taking effect.'}),
+                            label: defineMessage({id: 'admin.info_banner.restart_required.desc', defaultMessage: 'Changing properties in this section will require a server restart before taking effect.'}),
                             banner_type: 'info',
                         },
                         {
@@ -5885,7 +5873,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'longtext',
                             key: 'ExperimentalAuditSettings.AdvancedLoggingJSON',
                             label: defineMessage({id: 'admin.log.AdvancedLoggingJSONTitle', defaultMessage: 'Advanced Logging:'}),
-                            help_text: defineMessage({id: 'admin.log.AdvancedLoggingJSONDescription', defaultMessage: 'The JSON configuration for Advanced Audit Logging. Please see <link>documentation</link> to learn more about Advanced Logging and the JSON format it uses.'}),
+                            help_text: defineMessage({id: 'admin.log.AdvancedAuditLoggingJSONDescription', defaultMessage: 'The JSON configuration for Advanced Audit Logging. Please see <link>documentation</link> to learn more about Advanced Logging and the JSON format it uses.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_markdown: false,
                             help_text_values: {
                                 link: (msg: string) => (
@@ -6020,7 +6008,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.ExperimentalEnableAuthenticationTransfer',
                             label: defineMessage({id: 'admin.experimental.experimentalEnableAuthenticationTransfer.title', defaultMessage: 'Allow Authentication Transfer:'}),
-                            help_text: defineMessage({id: 'admin.experimental.experimentalEnableAuthenticationTransfer.desc', defaultMessage: 'When true, users can change their sign-in method to any that is enabled on the server, any via Account Settings or the APIs. When false, Users cannot change their sign-in method, regardless of which authentication options are enabled.'}),
+                            help_text: defineMessage({id: 'admin.experimental.experimentalEnableAuthenticationTransfer.desc', defaultMessage: 'When true, users can change their sign-in method to any that is enabled on the server, either via their Profile or the APIs. When false, Users cannot change their sign-in method, regardless of which authentication options are enabled.'}),
                             help_text_markdown: false,
                             isHidden: it.any( // documented as E20 and higher, but only E10 in the code
                                 it.not(it.licensed),
@@ -6115,7 +6103,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'bool',
                             key: 'ServiceSettings.ExperimentalEnableHardenedMode',
                             label: defineMessage({id: 'admin.experimental.experimentalEnableHardenedMode.title', defaultMessage: 'Enable Hardened Mode:'}),
-                            help_text: defineMessage({id: 'admin.experimental.experimentalEnableHardenedMode.desc', defaultMessage: 'Enables a hardened mode for Mattermost that makes user experience trade-offs in the interest of security. See <link>documentation</link> to learn more.'}),
+                            help_text: defineMessage({id: 'admin.experimental.experimentalEnableHardenedMode.desc', defaultMessage: 'Enables a hardened mode for Mattermost that makes user experience trade-offs in the interest of security. See <link>documentation</link> to learn more.'}), // eslint-disable-line formatjs/enforce-placeholders -- placeholders provided
                             help_text_values: {
                                 link: (msg: string) => (
                                     <ExternalLink
diff --git a/webapp/channels/src/components/admin_console/admin_definition_constants.tsx b/webapp/channels/src/components/admin_console/admin_definition_constants.tsx
index e75c9e81f67..16f7ce6ee76 100644
--- a/webapp/channels/src/components/admin_console/admin_definition_constants.tsx
+++ b/webapp/channels/src/components/admin_console/admin_definition_constants.tsx
@@ -25,7 +25,7 @@ const SECTION_TLS = (
     <tr>
         <td>
             <FormattedMessage
-                id='admin.connectionSecurityTls'
+                id='admin.connectionSecurityTls.title'
                 defaultMessage='TLS'
             />
         </td>
diff --git a/webapp/channels/src/components/admin_console/admin_definition_helpers.tsx b/webapp/channels/src/components/admin_console/admin_definition_helpers.tsx
index 826a1cee38a..9617bcbc180 100644
--- a/webapp/channels/src/components/admin_console/admin_definition_helpers.tsx
+++ b/webapp/channels/src/components/admin_console/admin_definition_helpers.tsx
@@ -113,6 +113,7 @@ export const getRestrictedIndicator = (displayBlocked = false, minimumPlanRequir
             minimumPlanRequiredForFeature={minimumPlanRequiredForFeature}
             tooltipMessageBlocked={defineMessage({
                 id: 'admin.sidebar.restricted_indicator.tooltip.message.blocked',
+                // eslint-disable-next-line formatjs/enforce-placeholders -- Placeholders provided in RestrictedIndicator
                 defaultMessage: 'This is {article} {minimumPlanRequiredForFeature} feature, available with an upgrade or free {trialLength}-day trial',
             })}
         />
diff --git a/webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx b/webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx
index 42e70400331..dab19ceefdd 100644
--- a/webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx
+++ b/webapp/channels/src/components/admin_console/admin_definition_ldap_wizard.tsx
@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+/* eslint-disable formatjs/enforce-placeholders -- Admin wizard uses help_text_values for placeholders, which ESLint cannot statically analyze */
+
 import React from 'react';
 import {FormattedMessage, defineMessage} from 'react-intl';
 
diff --git a/webapp/channels/src/components/admin_console/admin_navbar_dropdown/admin_navbar_dropdown.tsx b/webapp/channels/src/components/admin_console/admin_navbar_dropdown/admin_navbar_dropdown.tsx
index 70a2bd2c96f..1ef70d840cc 100644
--- a/webapp/channels/src/components/admin_console/admin_navbar_dropdown/admin_navbar_dropdown.tsx
+++ b/webapp/channels/src/components/admin_console/admin_navbar_dropdown/admin_navbar_dropdown.tsx
@@ -107,7 +107,7 @@ class AdminNavbarDropdown extends React.PureComponent<Props> {
                 <Menu.Group>
                     <Menu.ItemExternalLink
                         url={adminGuideLink}
-                        text={formatMessage({id: 'admin.nav.administratorsGuide', defaultMessage: 'Administrator Guide'})}
+                        text={formatMessage({id: 'admin.nav.administratorsGuide', defaultMessage: "Administrator's Guide"})}
                     />
                     <Menu.ItemExternalLink
                         url={'https://forum.mattermost.com/t/how-to-use-the-troubleshooting-forum/150'}
diff --git a/webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap b/webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap
index d209b283d65..05340bbf9bf 100644
--- a/webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap
@@ -1100,7 +1100,7 @@ exports[`components/AdminSidebar should match snapshot 1`] = `
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
@@ -2187,7 +2187,7 @@ exports[`components/AdminSidebar should match snapshot with license with enterpr
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
@@ -3261,7 +3261,7 @@ exports[`components/AdminSidebar should match snapshot with license with enterpr
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
@@ -4246,7 +4246,7 @@ exports[`components/AdminSidebar should match snapshot with license with profess
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
@@ -5220,7 +5220,7 @@ exports[`components/AdminSidebar should match snapshot with workspace optimizati
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
@@ -6233,7 +6233,7 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
@@ -7207,7 +7207,7 @@ exports[`components/AdminSidebar should match snapshot, render plugins without a
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
@@ -8082,7 +8082,7 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
@@ -9067,7 +9067,7 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
               name="experimental/feature_flags"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Features Flags"
+                  defaultMessage="Feature Flags"
                   id="admin.feature_flags.title"
                 />
               }
diff --git a/webapp/channels/src/components/admin_console/billing/billing_history_modal.tsx b/webapp/channels/src/components/admin_console/billing/billing_history_modal.tsx
index c43870afa05..8559e219637 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_history_modal.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_history_modal.tsx
@@ -61,7 +61,7 @@ export default function BillingHistoryModal(props: BillingHistoryModalProps) {
             dialogClassName='a11y__modal'
         >
             <Modal.Header closeButton={true}>
-                <Modal.Title className='CloudBillingHistoryModal__title'>{formatMessage({id: 'cloud_billing_history_modal.title', defaultMessage: 'Unpaid Invoice(s)'})}</Modal.Title>
+                <Modal.Title className='CloudBillingHistoryModal__title'>{formatMessage({id: 'cloud_billing_history_modal.title', defaultMessage: 'Invoice(s)'})}</Modal.Title>
             </Modal.Header>
             <Modal.Body>
                 <BillingHistoryTable invoices={invoiceListToRecordList(props.invoices)}/>
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/cloud_trial_banner.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/cloud_trial_banner.tsx
index adce1b1f7cb..fa2614eb55d 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/cloud_trial_banner.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/cloud_trial_banner.tsx
@@ -70,7 +70,7 @@ const CloudTrialBanner = ({trialEndDate}: Props): JSX.Element | null => {
             title={(
                 <FormattedMessage
                     id='admin.subscription.cloudTrialCard.upgradeTitle'
-                    defaultMessage='Upgrade to one of our paid plans to keep your workspace '
+                    defaultMessage='Upgrade to one of our paid plans to keep your workspace'
                 />
             )}
             message={(
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/limits.test.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/limits.test.tsx
index cd1c7f4ca8d..b6775d0ec78 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/limits.test.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/limits.test.tsx
@@ -105,7 +105,7 @@ describe('Limits', () => {
         const state = setupState(defaultOptions);
 
         renderWithContext(<Limits/>, state);
-        screen.getByText('Message History');
+        screen.getByText('Message history');
         screen.getByText(/of 10K/);
     });
 
@@ -113,7 +113,7 @@ describe('Limits', () => {
         const state = setupState(defaultOptions);
 
         renderWithContext(<Limits/>, state);
-        screen.getByText('File Storage');
+        screen.getByText('File storage');
         screen.getByText(/of 1GB/);
     });
 
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/limits.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/limits.tsx
index c8b1a0852fa..5c87b841a12 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/limits.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/limits.tsx
@@ -68,7 +68,7 @@ const Limits = (): JSX.Element | null => {
                         name={(
                             <FormattedMessage
                                 id='workspace_limits.file_storage'
-                                defaultMessage='File Storage'
+                                defaultMessage='File storage'
                             />
                         )}
                         status={(
@@ -92,13 +92,13 @@ const Limits = (): JSX.Element | null => {
                         name={
                             <FormattedMessage
                                 id='workspace_limits.message_history'
-                                defaultMessage='Message History'
+                                defaultMessage='Message history'
                             />
                         }
                         status={
                             <FormattedMessage
                                 id='workspace_limits.message_history.usage'
-                                defaultMessage='{actual} of {limit} ({percent}%)'
+                                defaultMessage='{actual} of {limit} messages ({percent}%)'
                                 values={{
                                     actual: `${Math.floor(usage.messages.history / 1000)}K`,
                                     limit: `${Math.floor(cloudLimits.messages.history / 1000)}K`,
@@ -150,7 +150,7 @@ const Limits = (): JSX.Element | null => {
                         >
                             {intl.formatMessage({
                                 id: 'admin.license.trialCard.contactSales',
-                                defaultMessage: 'Contact sales',
+                                defaultMessage: 'Contact Sales',
                             })}
                         </button>
                     </>
diff --git a/webapp/channels/src/components/admin_console/billing/billing_summary/billing_summary.tsx b/webapp/channels/src/components/admin_console/billing/billing_summary/billing_summary.tsx
index 21c5e5a863d..8cf19eb289d 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_summary/billing_summary.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_summary/billing_summary.tsx
@@ -82,7 +82,7 @@ export const FreeTrial = ({daysLeftOnTrial}: FreeTrialProps) => {
                 {daysLeftOnTrial > TrialPeriodDays.TRIAL_1_DAY &&
                     <FormattedMessage
                         id='admin.billing.subscription.freeTrial.title'
-                        defaultMessage={'You\'re currently on a free trial'}
+                        defaultMessage="You're currently on a free trial"
                     />
                 }
                 {(daysLeftOnTrial === TrialPeriodDays.TRIAL_1_DAY || daysLeftOnTrial === TrialPeriodDays.TRIAL_0_DAYS) &&
@@ -96,21 +96,21 @@ export const FreeTrial = ({daysLeftOnTrial}: FreeTrialProps) => {
                 {daysLeftOnTrial > TrialPeriodDays.TRIAL_WARNING_THRESHOLD &&
                     <FormattedMessage
                         id='admin.billing.subscription.freeTrial.description'
-                        defaultMessage='Your free trial will expire in {daysLeftOnTrial} days. Contact sales to continue after the trial ends.'
+                        defaultMessage='Your free trial will expire in {daysLeftOnTrial} days. Contact Sales to continue after the trial ends.'
                         values={{daysLeftOnTrial}}
                     />
                 }
                 {(daysLeftOnTrial > TrialPeriodDays.TRIAL_1_DAY && daysLeftOnTrial <= TrialPeriodDays.TRIAL_WARNING_THRESHOLD) &&
                     <FormattedMessage
                         id='admin.billing.subscription.freeTrial.lessThan3Days.description'
-                        defaultMessage='Your free trial will end in {daysLeftOnTrial, number} {daysLeftOnTrial, plural, one {day} other {days}}. Contact sales to continue enjoying the benefits of Cloud Professional.'
+                        defaultMessage='Your free trial will end in {daysLeftOnTrial, number} {daysLeftOnTrial, plural, one {day} other {days}}. Contact Sales to continue enjoying the benefits of Cloud Professional.'
                         values={{daysLeftOnTrial}}
                     />
                 }
                 {(daysLeftOnTrial === TrialPeriodDays.TRIAL_1_DAY || daysLeftOnTrial === TrialPeriodDays.TRIAL_0_DAYS) &&
                     <FormattedMessage
                         id='admin.billing.subscription.freeTrial.lastDay.description'
-                        defaultMessage='Your free trial has ended. Add payment information to continue enjoying the benefits of Cloud Professional.'
+                        defaultMessage='Your free trial has ended. Contact Sales to continue enjoying the benefits of Cloud Professional.'
                     />
                 }
             </div>
diff --git a/webapp/channels/src/components/admin_console/billing/plan_details/feature_list.tsx b/webapp/channels/src/components/admin_console/billing/plan_details/feature_list.tsx
index 19ad8becd8a..3d15558f198 100644
--- a/webapp/channels/src/components/admin_console/billing/plan_details/feature_list.tsx
+++ b/webapp/channels/src/components/admin_console/billing/plan_details/feature_list.tsx
@@ -32,7 +32,7 @@ const FeatureList = (props: FeatureListProps) => {
         intl.formatMessage(
             {
                 id: 'admin.billing.subscription.planDetails.features.limitedFileStorage',
-                defaultMessage: 'Limited to {limit} File Storage',
+                defaultMessage: 'Limited to {limit} file storage',
             },
             {
 
diff --git a/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.tsx b/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.tsx
index 5622dc1118a..d3d1f08632a 100644
--- a/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.tsx
+++ b/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.tsx
@@ -27,7 +27,7 @@ const AttributeHelpText = memo(({attributeKey, attributeName, attributeType}: At
     <div className='help-text-container'>
         {attributeKey === 'ldap' && (
             <FormattedMessage
-                id='admin.customProfileAttribDesc'
+                id='admin.customProfileAttribDesc.ldap'
                 defaultMessage='(Optional) The attribute in the AD/LDAP server used to populate the {name} of users in Mattermost. When set, users cannot edit their {name}, since it is synchronized with the LDAP server. When left blank, users can set their {name} in <strong>Account Menu > Account Settings > Profile</strong>.'
                 values={{
                     name: attributeName,
@@ -37,7 +37,7 @@ const AttributeHelpText = memo(({attributeKey, attributeName, attributeType}: At
         )}
         {attributeKey === 'saml' && (
             <FormattedMessage
-                id='admin.customProfileAttribDesc'
+                id='admin.customProfileAttribDesc.saml'
                 defaultMessage='(Optional) The attribute in the SAML Assertion that will be used to populate the {name} of users in Mattermost.'
                 values={{
                     name: attributeName,
@@ -49,10 +49,6 @@ const AttributeHelpText = memo(({attributeKey, attributeName, attributeType}: At
                 <FormattedMessage
                     id='admin.customProfileAttribWarning'
                     defaultMessage='(Warning) This attribute will be converted to a TEXT attribute, if the field is set to synchronize.'
-                    values={{
-                        name: attributeName,
-                        strong: (msg) => <strong>{msg}</strong>,
-                    }}
                 />
             </div>
         )}
@@ -132,7 +128,7 @@ const CustomProfileAttributes: React.FC<Props> = (props: Props): JSX.Element | n
                 subtitle={
                     <FormattedMessage
                         id='admin.customProfileAttributes.subtitle'
-                        defaultMessage='You can add or remove custom profile attributes by going to the <link>system properties page</link>.'
+                        defaultMessage='You can add or remove custom profile attributes by going to the <link>user attributes page</link>.'
                         values={{
                             link: (msg) => (
                                 <Link
diff --git a/webapp/channels/src/components/admin_console/custom_terms_of_service_settings/custom_terms_of_service_settings.tsx b/webapp/channels/src/components/admin_console/custom_terms_of_service_settings/custom_terms_of_service_settings.tsx
index 289a5dac464..28bd9085f7a 100644
--- a/webapp/channels/src/components/admin_console/custom_terms_of_service_settings/custom_terms_of_service_settings.tsx
+++ b/webapp/channels/src/components/admin_console/custom_terms_of_service_settings/custom_terms_of_service_settings.tsx
@@ -51,7 +51,7 @@ export const messages = defineMessages({
     enableTermsOfServiceTitle: {id: 'admin.support.enableTermsOfServiceTitle', defaultMessage: 'Enable Custom Terms of Service'},
     termsOfServiceTextTitle: {id: 'admin.support.termsOfServiceTextTitle', defaultMessage: 'Custom Terms of Service Text'},
     termsOfServiceTextHelp: {id: 'admin.support.termsOfServiceTextHelp', defaultMessage: 'Text that will appear in your custom Terms of Service. Supports Markdown-formatted text.'},
-    termsOfServiceReAcceptanceTitle: {id: 'admin.support.termsOfServiceReAcceptanceTitle', defaultMessage: 'Re-Acceptance Period:'},
+    termsOfServiceReAcceptanceTitle: {id: 'admin.support.termsOfServiceReAcceptanceTitle', defaultMessage: 'Re-Acceptance Period'},
     termsOfServiceReAcceptanceHelp: {id: 'admin.support.termsOfServiceReAcceptanceHelp', defaultMessage: 'The number of days before Terms of Service acceptance expires, and the terms must be re-accepted.'},
     enableTermsOfServiceHelp: {id: 'admin.support.enableTermsOfServiceHelp', defaultMessage: 'When true, new users must accept the terms of service before accessing any Mattermost teams on desktop, web or mobile. Existing users must accept them after login or a page refresh. To update terms of service link displayed in account creation and login pages, go to <a>Site Configuration > Customization</a>'},
 });
diff --git a/webapp/channels/src/components/admin_console/database_settings.tsx b/webapp/channels/src/components/admin_console/database_settings.tsx
index d7b1067951f..d4cb5eef43b 100644
--- a/webapp/channels/src/components/admin_console/database_settings.tsx
+++ b/webapp/channels/src/components/admin_console/database_settings.tsx
@@ -44,7 +44,7 @@ interface State extends BaseState {
 }
 
 const messages = defineMessages({
-    title: {id: 'admin.database.title', defaultMessage: 'Database Settings'},
+    title: {id: 'admin.database.title', defaultMessage: 'Database'},
     recycleDescription: {id: 'admin.recycle.recycleDescription', defaultMessage: 'Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired configuration and using the {reloadConfiguration} feature to load the new settings while the server is running. The administrator should then use {featureName} feature to recycle the database connections based on the new settings.'},
     featureName: {id: 'admin.recycle.recycleDescription.featureName', defaultMessage: 'Recycle Database Connections'},
     reloadConfiguration: {id: 'admin.recycle.recycleDescription.reloadConfiguration', defaultMessage: 'Environment > Web Server > Reload Configuration from Disk'},
@@ -187,6 +187,7 @@ export default class DatabaseSettings extends OLDAdminSettings<Props, State> {
                     showSuccessMessage={false}
                     errorMessage={defineMessage({
                         id: 'admin.recycle.reloadFail',
+                        // eslint-disable-next-line formatjs/enforce-placeholders -- error provided by RequestButton
                         defaultMessage: 'Recycling unsuccessful: {error}',
                     })}
                     includeDetailedError={true}
diff --git a/webapp/channels/src/components/admin_console/elasticsearch_settings.tsx b/webapp/channels/src/components/admin_console/elasticsearch_settings.tsx
index 1bf248d975c..4df1cbb96c0 100644
--- a/webapp/channels/src/components/admin_console/elasticsearch_settings.tsx
+++ b/webapp/channels/src/components/admin_console/elasticsearch_settings.tsx
@@ -65,18 +65,18 @@ export const messages = defineMessages({
     bulkIndexingTitle: {id: 'admin.elasticsearch.bulkIndexingTitle', defaultMessage: 'Bulk Indexing:'},
     help: {id: 'admin.elasticsearch.createJob.help', defaultMessage: 'All users, channels and posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.'},
     rebuildChannelsIndexTitle: {id: 'admin.elasticsearch.rebuildChannelsIndexTitle', defaultMessage: 'Rebuild Channels Index'},
-    rebuildChannelIndexHelpText: {id: 'admin.elasticsearch.rebuildChannelsIndex.helpText', defaultMessage: 'This purges the channels index and re-indexes all channels in the database, from oldest to newest. Channel autocomplete is available during indexing but search results may be incomplete until the indexing job is complete.\n<b>Note- Please ensure no other indexing job is in progress in the table above.</b>'},
+    rebuildChannelIndexHelpText: {id: 'admin.elasticsearch.rebuildChannelsIndex.helpText', defaultMessage: 'This purges the channels index and re-indexes all channels in the database, from oldest to newest. Channel autocomplete is available during indexing but search results may be incomplete until the indexing job is complete.\n\n<b>Note- Please ensure no other indexing job is in progress in the table above.</b>'}, // eslint-disable-line formatjs/no-multiple-whitespaces
     rebuildChannelsIndexButtonText: {id: 'admin.elasticsearch.rebuildChannelsIndex.title', defaultMessage: 'Rebuild Channels Index'},
     purgeIndexesHelpText: {id: 'admin.elasticsearch.purgeIndexesHelpText', defaultMessage: 'Purging will entirely remove the indexes on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing database is rebuilt.'},
-    purgeIndexesButton: {id: 'admin.elasticsearch.purgeIndexesButton', defaultMessage: 'Purge Index'},
+    purgeIndexesButton: {id: 'admin.elasticsearch.purgeIndexesButton', defaultMessage: 'Purge Indexes'},
     label: {id: 'admin.elasticsearch.purgeIndexesButton.label', defaultMessage: 'Purge Indexes:'},
     enableSearchingTitle: {id: 'admin.elasticsearch.enableSearchingTitle', defaultMessage: 'Enable Elasticsearch for search queries:'},
     enableSearchingDescription: {id: 'admin.elasticsearch.enableSearchingDescription', defaultMessage: 'Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.'},
 });
 
 export const searchableStrings: Array<string|MessageDescriptor|[MessageDescriptor, {[key: string]: any}]> = [
-    [messages.connectionUrlDescription, {documentationLink: ''}],
-    [messages.enableIndexingDescription, {documentationLink: ''}],
+    [messages.connectionUrlDescription, {link: (msg: string) => msg}],
+    [messages.enableIndexingDescription, {link: (msg: string) => msg}],
     messages.title,
     messages.enableIndexingTitle,
     messages.connectionUrlTitle,
@@ -456,6 +456,7 @@ export default class ElasticsearchSettings extends OLDAdminSettings<Props, State
                     })}
                     errorMessage={defineMessage({
                         id: 'admin.elasticsearch.rebuildIndexSuccessfully.error',
+                        // eslint-disable-next-line formatjs/enforce-placeholders -- error provided by RequestButton
                         defaultMessage: 'Failed to trigger channels index rebuild job: {error}',
                     })}
                     disabled={!this.state.canPurgeAndIndex || this.props.isDisabled!}
@@ -472,6 +473,7 @@ export default class ElasticsearchSettings extends OLDAdminSettings<Props, State
                     })}
                     errorMessage={defineMessage({
                         id: 'admin.elasticsearch.purgeIndexesButton.error',
+                        // eslint-disable-next-line formatjs/enforce-placeholders -- error provided by RequestButton
                         defaultMessage: 'Failed to purge indexes: {error}',
                     })}
                     disabled={this.props.isDisabled || !this.state.canPurgeAndIndex}
diff --git a/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.test.tsx b/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.test.tsx
index 072daac3928..a61220b866d 100644
--- a/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.test.tsx
+++ b/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.test.tsx
@@ -58,7 +58,7 @@ describe('components/feature_discovery', () => {
 
             expect(screen.getByRole('button', {name: 'Start trial'})).toBeInTheDocument();
             await userEvent.click(screen.getByRole('button', {name: 'Start trial'}));
-            await userEvent.click(screen.getByText('Mattermost Software and Services License Agreement'));
+            await userEvent.click(screen.getByText('Mattermost Software Evaluation Agreement'));
 
             //cloud option
             expect(screen.queryByRole('button', {name: 'Try free for 30 days'})).not.toBeInTheDocument();
@@ -68,7 +68,7 @@ describe('components/feature_discovery', () => {
             expect(featureLink).toBeInTheDocument();
             expect(featureLink).toHaveAttribute('href', 'https://test.mattermost.com/secondary/?utm_source=mattermost&utm_medium=in-product&utm_content=feature_discovery&uid=&sid=&edition=team&server_version=');
             expect(featureLink).toHaveTextContent('Learn more');
-            expect(screen.getByText('Mattermost Software and Services License Agreement')).toHaveAttribute('href', 'https://mattermost.com/pl/software-and-services-license-agreement?utm_source=mattermost&utm_medium=in-product&utm_content=feature_discovery&uid=&sid=&edition=team&server_version=');
+            expect(screen.getByText('Mattermost Software Evaluation Agreement')).toHaveAttribute('href', 'https://mattermost.com/pl/software-and-services-license-agreement?utm_source=mattermost&utm_medium=in-product&utm_content=feature_discovery&uid=&sid=&edition=team&server_version=');
             expect(screen.getByText('Privacy Policy')).toHaveAttribute('href', AboutLinks.PRIVACY_POLICY + '?utm_source=mattermost&utm_medium=in-product&utm_content=feature_discovery&uid=&sid=&edition=team&server_version=');
 
             expect(getPrevTrialLicense).toHaveBeenCalled();
diff --git a/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.tsx b/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.tsx
index 6a62855f2e3..d5b78984bdb 100644
--- a/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.tsx
+++ b/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.tsx
@@ -167,7 +167,7 @@ export default class FeatureDiscovery extends React.PureComponent<Props, State>
 
                     <FormattedMessage
                         id='admin.feature_discovery.trial-request.accept-terms'
-                        defaultMessage='By clicking <highlight>Start trial</highlight>, I agree to the <linkEvaluation>Mattermost Software and Services License Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy> and receiving product emails.'
+                        defaultMessage='By clicking <highlight>Start trial</highlight>, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy> and receiving product emails.'
                         values={{
                             highlight: (msg: React.ReactNode) => (
                                 <strong>{msg}</strong>
diff --git a/webapp/channels/src/components/admin_console/feature_discovery/features/auto_translation.tsx b/webapp/channels/src/components/admin_console/feature_discovery/features/auto_translation.tsx
index 01ce27c2add..ee52e3fb052 100644
--- a/webapp/channels/src/components/admin_console/feature_discovery/features/auto_translation.tsx
+++ b/webapp/channels/src/components/admin_console/feature_discovery/features/auto_translation.tsx
@@ -31,6 +31,7 @@ const AutoTranslationFeatureDiscovery: React.FC = () => {
                         })}
                         copy={defineMessage({
                             id: 'admin.auto_translation_feature_discovery.copy',
+                            // eslint-disable-next-line formatjs/enforce-placeholders -- values spread onto FormattedMessage in FeatureDiscovery
                             defaultMessage: 'Effortlessly collaborate across languages with auto-translation. Messages in shared channels are instantly translated based on each user’s language preference—no extra steps required.{br}<strong>Only available in Enterprise Advanced.</strong>',
                             values: {strong: (msg: string) => <strong>{msg}</strong>, br: <br/>},
                         })}
diff --git a/webapp/channels/src/components/admin_console/feature_flags.tsx b/webapp/channels/src/components/admin_console/feature_flags.tsx
index 7563c19a559..6e30c61c12b 100644
--- a/webapp/channels/src/components/admin_console/feature_flags.tsx
+++ b/webapp/channels/src/components/admin_console/feature_flags.tsx
@@ -13,7 +13,7 @@ type Props = {
 };
 
 export const messages = defineMessages({
-    title: {id: 'admin.feature_flags.title', defaultMessage: 'Features Flags'},
+    title: {id: 'admin.feature_flags.title', defaultMessage: 'Feature Flags'},
 });
 
 const FeatureFlags: React.FC<Props> = (props: Props) => {
@@ -40,7 +40,7 @@ const FeatureFlags: React.FC<Props> = (props: Props) => {
                         <div className='banner__content'>
                             <FormattedMessage
                                 id='admin.feature_flags.introBanner'
-                                defaultMessage={'Feature flag values displayed here show the status of features enabled on this server. The values here are used only for troubleshooting by the Mattermost support team.'}
+                                defaultMessage={'The following feature flag values show the status of features enabled on this instance. The values are used for debugging purposes by the Mattermost support team.'}
                             />
                         </div>
                     </div>
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/group_details.tsx b/webapp/channels/src/components/admin_console/group_settings/group_details/group_details.tsx
index d4803835543..e79ba559f38 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/group_details.tsx
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/group_details.tsx
@@ -479,7 +479,7 @@ class GroupDetails extends React.PureComponent<Props, State> {
                     serverError = (
                         <FormattedMessage
                             id='admin.group_settings.group_detail.invalidOrReservedMentionNameError'
-                            defaultMessage='Only letters (a-z), numbers(0-9), periods, dashes and underscores are allowed.'
+                            defaultMessage='Only letters (a-z), numbers (0-9), periods, dashes and underscores are allowed.'
                         />
                     );
                 } else if (
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/group_profile_and_settings.tsx b/webapp/channels/src/components/admin_console/group_settings/group_details/group_profile_and_settings.tsx
index 3dbe8a1db0f..7c2c301ca8b 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/group_profile_and_settings.tsx
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/group_profile_and_settings.tsx
@@ -36,7 +36,7 @@ const GroupSettingsToggle = ({
         title={
             <FormattedMessage
                 id='admin.team_settings.team_details.groupDetailsToggle'
-                defaultMessage='Enable Group Mention'
+                defaultMessage='Enable Group Mentions'
             />
         }
         subTitle={
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_settings.tsx b/webapp/channels/src/components/admin_console/group_settings/group_settings.tsx
index cd5cc1230c7..b360ee58a74 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_settings.tsx
+++ b/webapp/channels/src/components/admin_console/group_settings/group_settings.tsx
@@ -51,6 +51,7 @@ const GroupSettings = ({isDisabled}: Props) => {
                     <AdminPanel
                         id='ldap_groups'
                         title={defineMessage({id: 'admin.group_settings.ldapGroupsTitle', defaultMessage: 'AD/LDAP Groups'})}
+                        // eslint-disable-next-line formatjs/enforce-placeholders -- placeholders via subtitleValues
                         subtitle={defineMessage({id: 'admin.group_settings.ldapGroupsDescription', defaultMessage: 'Connect AD/LDAP and create groups in Mattermost. To get started, configure group attributes on the <link>AD/LDAP</link> configuration page.'})}
                         subtitleValues={{
                             link: (msg: React.ReactNode) => (
diff --git a/webapp/channels/src/components/admin_console/ip_filtering/edit_section/edit_section_no_filters_panel.tsx b/webapp/channels/src/components/admin_console/ip_filtering/edit_section/edit_section_no_filters_panel.tsx
index 40e3f0b651c..c65cc890ca5 100644
--- a/webapp/channels/src/components/admin_console/ip_filtering/edit_section/edit_section_no_filters_panel.tsx
+++ b/webapp/channels/src/components/admin_console/ip_filtering/edit_section/edit_section_no_filters_panel.tsx
@@ -27,7 +27,7 @@ const NoFiltersPanel = ({setShowAddModal}: NoFiltersPanelProps) => (
         <div className='Subtitle'>
             <FormattedMessage
                 id='admin.ip_filtering.any_ip_can_access_add_filter'
-                defaultMessage='Any IP can access your workspace. To limit access to selected IP Addresses, <add>Add a filter</add>'
+                defaultMessage='Any IP can access your workspace. To limit access to selected IP Addresses, <add>Add a filter</add>.'
                 values={{
                     add: (msg) => (
                         <div
diff --git a/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx b/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx
index 9b9f94d5a0a..1c34f39d06e 100644
--- a/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx
@@ -342,7 +342,7 @@ const TrialBanner = ({
                 <p className='upgrade-legal-terms'>
                     <FormattedMessage
                         id='admin.license.upgrade-and-trial-request.accept-terms-initial-part'
-                        defaultMessage='By selecting <strong>Upgrade Server And Start trial</strong>, I agree to the <linkEvaluation>Mattermost Software and Services License Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy>, and receiving product emails. '
+                        defaultMessage='By selecting <strong>Upgrade Server And Start trial</strong>, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy>, and receiving product emails. '
                         values={{
                             strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
                             linkEvaluation: (msg: React.ReactNode) => (
diff --git a/webapp/channels/src/components/admin_console/localization/auto_translation.tsx b/webapp/channels/src/components/admin_console/localization/auto_translation.tsx
index 6f5e798572e..1b01ce8123a 100644
--- a/webapp/channels/src/components/admin_console/localization/auto_translation.tsx
+++ b/webapp/channels/src/components/admin_console/localization/auto_translation.tsx
@@ -112,6 +112,7 @@ export default function AutoTranslation(props: SystemConsoleCustomSettingsCompon
                     helpText={
                         <FormattedMessage
                             id='admin.site.localization.autoTranslationProviderDescription'
+                            // eslint-disable-next-line formatjs/enforce-placeholders -- values provided by providerHelpTextValues
                             defaultMessage='<strong>NOTE:</strong> If using external translation services (e.g., cloud based),{br}message data may be processed outside of your environment.'
                             values={providerHelpTextValues}
                         />
diff --git a/webapp/channels/src/components/admin_console/message_export_settings.tsx b/webapp/channels/src/components/admin_console/message_export_settings.tsx
index cdf47519356..3ed095dd43f 100644
--- a/webapp/channels/src/components/admin_console/message_export_settings.tsx
+++ b/webapp/channels/src/components/admin_console/message_export_settings.tsx
@@ -193,7 +193,7 @@ export class MessageExportSettings extends OLDAdminSettings<BaseProps & WrappedC
         const exportFormatOptions = [
             {value: exportFormats.EXPORT_FORMAT_ACTIANCE, text: this.props.intl.formatMessage({id: 'admin.complianceExport.exportFormat.actiance', defaultMessage: 'Actiance XML'})},
             {value: exportFormats.EXPORT_FORMAT_CSV, text: this.props.intl.formatMessage({id: 'admin.complianceExport.exportFormat.csv', defaultMessage: 'CSV'})},
-            {value: exportFormats.EXPORT_FORMAT_GLOBALRELAY, text: this.props.intl.formatMessage({id: 'admin.complianceExport.exportFormat.globalrelay', defaultMessage: 'GlobalRelay EML'})},
+            {value: exportFormats.EXPORT_FORMAT_GLOBALRELAY, text: this.props.intl.formatMessage({id: 'admin.complianceExport.exportFormat.globalrelay', defaultMessage: 'Global Relay EML'})},
         ];
 
         // if the export format is globalrelay, the user needs to set some additional parameters
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap
index 1988a6f5ae7..f92518e8cb9 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap
@@ -76,7 +76,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_schemes
         }
         subtitle={
           Object {
-            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>",
+            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>.",
             "id": "admin.permissions.teamOverrideSchemesBannerText",
           }
         }
@@ -203,7 +203,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_schemes
         }
         subtitle={
           Object {
-            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>",
+            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>.",
             "id": "admin.permissions.teamOverrideSchemesBannerText",
           }
         }
@@ -309,7 +309,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_schemes
         }
         subtitle={
           Object {
-            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>",
+            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>.",
             "id": "admin.permissions.teamOverrideSchemesBannerText",
           }
         }
@@ -454,7 +454,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_schemes
         }
         subtitle={
           Object {
-            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>",
+            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>.",
             "id": "admin.permissions.teamOverrideSchemesBannerText",
           }
         }
@@ -598,7 +598,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_schemes
         }
         subtitle={
           Object {
-            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>",
+            "defaultMessage": "Use when specific teams need permission exceptions to the <link>System Scheme</link>.",
             "id": "admin.permissions.teamOverrideSchemesBannerText",
           }
         }
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_row.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_row.tsx
index cc6791be3bd..ecfbc90f4ea 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_row.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_row.tsx
@@ -46,7 +46,7 @@ const PermissionRow = ({
     if (permissionRolesStrings[id]) {
         description = (
             <FormattedMessage
-                id={permissionRolesStrings[id].description.id}
+                {...permissionRolesStrings[id].description}
                 values={additionalValues}
             />
         );
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_schemes_settings.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_schemes_settings.tsx
index 11d7229d693..4aae57563b9 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_schemes_settings.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_schemes_settings.tsx
@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+/* eslint-disable formatjs/enforce-placeholders -- link placeholders provided by admin panel components */
+
 import React from 'react';
 import {type MessageDescriptor} from 'react-intl';
 import {FormattedMessage, defineMessage, defineMessages} from 'react-intl';
@@ -53,7 +55,7 @@ const messages = defineMessages({
     systemSchemeBannerText: {id: 'admin.permissions.systemSchemeBannerText', defaultMessage: 'Set the default permissions inherited by all teams unless a <link>Team Override Scheme</link> is applied.'},
     systemSchemeBannerButton: {id: 'admin.permissions.systemSchemeBannerButton', defaultMessage: 'Edit Scheme'},
     teamOverrideSchemesTitle: {id: 'admin.permissions.teamOverrideSchemesTitle', defaultMessage: 'Team Override Schemes'},
-    teamOverrideSchemesBannerText: {id: 'admin.permissions.teamOverrideSchemesBannerText', defaultMessage: 'Use when specific teams need permission exceptions to the <link>System Scheme</link>'},
+    teamOverrideSchemesBannerText: {id: 'admin.permissions.teamOverrideSchemesBannerText', defaultMessage: 'Use when specific teams need permission exceptions to the <link>System Scheme</link>.'},
     teamOverrideSchemesNewButton: {id: 'admin.permissions.teamOverrideSchemesNewButton', defaultMessage: 'New Team Override Scheme'},
 });
 
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap
index 8800cf284aa..c8ca4098ee3 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap
@@ -175,7 +175,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         >
           <span>
             <MemoizedFormattedMessage
-              defaultMessage="Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link>is applied in specific teams."
+              defaultMessage="Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link> is applied in specific teams."
               id="admin.permissions.systemScheme.introBanner"
               values={
                 Object {
@@ -523,7 +523,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         >
           <span>
             <MemoizedFormattedMessage
-              defaultMessage="Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link>is applied in specific teams."
+              defaultMessage="Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link> is applied in specific teams."
               id="admin.permissions.systemScheme.introBanner"
               values={
                 Object {
@@ -872,7 +872,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         >
           <span>
             <MemoizedFormattedMessage
-              defaultMessage="Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link>is applied in specific teams."
+              defaultMessage="Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link> is applied in specific teams."
               id="admin.permissions.systemScheme.introBanner"
               values={
                 Object {
@@ -1221,7 +1221,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         >
           <span>
             <MemoizedFormattedMessage
-              defaultMessage="Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link>is applied in specific teams."
+              defaultMessage="Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link> is applied in specific teams."
               id="admin.permissions.systemScheme.introBanner"
               values={
                 Object {
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings.tsx
index 3e91ae011ba..9e6a7728c42 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings.tsx
@@ -405,7 +405,7 @@ class PermissionSystemSchemeSettings extends React.PureComponent<Props, State> {
                                 <span>
                                     <FormattedMessage
                                         id='admin.permissions.systemScheme.introBanner'
-                                        defaultMessage='Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link>is applied in specific teams.'
+                                        defaultMessage='Configure the default permissions for Team Admins, Channel Admins and other members. This scheme is inherited by all teams unless a <link>Team Override Scheme</link> is applied in specific teams.'
                                         values={{
                                             link: (msg: React.ReactNode) => (
                                                 <ExternalLink
diff --git a/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap b/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
index b87a187a330..67021ed5537 100644
--- a/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`components/PluginManagement should match snapshot 1`] = `
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -270,7 +270,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Marketp
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -529,7 +529,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Plugins
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -605,7 +605,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Remote
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -864,7 +864,7 @@ exports[`components/PluginManagement should match snapshot when \`Require Signat
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -1125,7 +1125,7 @@ exports[`components/PluginManagement should match snapshot, No installed plugins
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -1388,7 +1388,7 @@ exports[`components/PluginManagement should match snapshot, allow insecure URL e
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -1647,7 +1647,7 @@ exports[`components/PluginManagement should match snapshot, disabled 1`] = `
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -1730,11 +1730,12 @@ exports[`components/PluginManagement should match snapshot, disabled 1`] = `
           <SettingSet
             helpText={
               <Memo(MemoizedFormattedMessage)
-                defaultMessage="To enable plugins, set **Enable Plugins** to true. See <link>documentation</link> to learn more."
+                defaultMessage="To enable plugins, set <strong>Enable Plugins</strong> to true. See <link>documentation</link> to learn more."
                 id="admin.plugin.uploadAndPluginDisabledDesc"
                 values={
                   Object {
                     "link": [Function],
+                    "strong": [Function],
                   }
                 }
               />
@@ -1890,7 +1891,7 @@ exports[`components/PluginManagement should match snapshot, text entered into th
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -2149,7 +2150,7 @@ exports[`components/PluginManagement should match snapshot, upload disabled 1`]
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -2415,7 +2416,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -2737,7 +2738,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -3027,7 +3028,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -3317,7 +3318,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
@@ -3607,7 +3608,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
   >
     <AdminHeader>
       <MemoizedFormattedMessage
-        defaultMessage="Management"
+        defaultMessage="Plugin Management"
         id="admin.plugin.management.title"
       />
     </AdminHeader>
diff --git a/webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx b/webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx
index 34ffe0fdf17..bc5ce96146b 100644
--- a/webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx
+++ b/webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx
@@ -189,7 +189,7 @@ type PluginItemProps = {
 };
 
 const messages = defineMessages({
-    title: {id: 'admin.plugin.management.title', defaultMessage: 'Management'},
+    title: {id: 'admin.plugin.management.title', defaultMessage: 'Plugin Management'},
     enable: {id: 'admin.plugins.settings.enable', defaultMessage: 'Enable Plugins: '},
     enableDesc: {id: 'admin.plugins.settings.enableDesc', defaultMessage: 'When true, enables plugins on your Mattermost server. Use plugins to integrate with third-party systems, extend functionality, or customize the user interface of your Mattermost server. See <link>documentation</link> to learn more.'},
     uploadTitle: {id: 'admin.plugin.uploadTitle', defaultMessage: 'Upload Plugin: '},
@@ -1073,7 +1073,7 @@ class PluginManagement extends OLDAdminSettings<Props, State> {
             uploadHelpText = (
                 <FormattedMessage
                     id='admin.plugin.uploadAndPluginDisabledDesc'
-                    defaultMessage='To enable plugins, set **Enable Plugins** to true. See <link>documentation</link> to learn more.'
+                    defaultMessage='To enable plugins, set <strong>Enable Plugins</strong> to true. See <link>documentation</link> to learn more.'
                     values={{
                         link: (msg: React.ReactNode) => (
                             <ExternalLink
@@ -1083,6 +1083,7 @@ class PluginManagement extends OLDAdminSettings<Props, State> {
                                 {msg}
                             </ExternalLink>
                         ),
+                        strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
                     }}
                 />
             );
diff --git a/webapp/channels/src/components/admin_console/push_settings.tsx b/webapp/channels/src/components/admin_console/push_settings.tsx
index 078070e424f..a2aee49217d 100644
--- a/webapp/channels/src/components/admin_console/push_settings.tsx
+++ b/webapp/channels/src/components/admin_console/push_settings.tsx
@@ -389,14 +389,14 @@ class PushSettings extends OLDAdminSettings<Props, State> {
                     label={
                         <FormattedMessage
                             id='admin.team.maxNotificationsPerChannelTitle'
-                            defaultMessage='Max Notifications Per Channel:'
+                            defaultMessage='Large Channel Notification Threshold:'
                         />
                     }
                     placeholder={defineMessage({id: 'admin.team.maxNotificationsPerChannelExample', defaultMessage: 'E.g.: "1000"'})}
                     helpText={
                         <FormattedMessage
                             id='admin.team.maxNotificationsPerChannelDescription'
-                            defaultMessage='Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.'
+                            defaultMessage='The maximum number of users that can be mentioned using @here, @all, or @channel. Above this limit, mentions and typing indicators are disabled, and users will see a system message if they try to use them.'
                         />
                     }
                     value={this.state.maxNotificationsPerChannel}
diff --git a/webapp/channels/src/components/admin_console/request_button/request_button.tsx b/webapp/channels/src/components/admin_console/request_button/request_button.tsx
index d1ecc37efef..80ec0df22e8 100644
--- a/webapp/channels/src/components/admin_console/request_button/request_button.tsx
+++ b/webapp/channels/src/components/admin_console/request_button/request_button.tsx
@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+/* eslint-disable formatjs/enforce-placeholders -- Admin request button uses runtime injection for error placeholder */
+
 import React from 'react';
 import type {MessageDescriptor} from 'react-intl';
 import {FormattedMessage, defineMessage} from 'react-intl';
diff --git a/webapp/channels/src/components/admin_console/session_length_settings.tsx b/webapp/channels/src/components/admin_console/session_length_settings.tsx
index dd27c2c509b..d5184694afd 100644
--- a/webapp/channels/src/components/admin_console/session_length_settings.tsx
+++ b/webapp/channels/src/components/admin_console/session_length_settings.tsx
@@ -39,14 +39,14 @@ const messages = defineMessages({
     extendSessionLengthActivity_label: {id: 'admin.service.extendSessionLengthActivity.label', defaultMessage: 'Extend session length with activity: '},
     extendSessionLengthActivity_helpText: {id: 'admin.service.extendSessionLengthActivity.helpText', defaultMessage: 'When true, sessions will be automatically extended when the user is active in their Mattermost client. Users sessions will only expire if they are not active in their Mattermost client for the entire duration of the session lengths defined in the fields below. When false, sessions will not extend with activity in Mattermost. User sessions will immediately expire at the end of the session length or idle timeouts defined below. '},
     terminateSessionsOnPasswordChange_label: {id: 'admin.service.terminateSessionsOnPasswordChange.label', defaultMessage: 'Terminate Sessions on Password Change: '},
-    terminateSessionsOnPasswordChange_helpText: {id: 'admin.service.terminateSessionsOnPasswordChange.helpText', defaultMessage: 'When true, all sessions of a user will expire if their password is changed by themselves or an administrator.'},
+    terminateSessionsOnPasswordChange_helpText: {id: 'admin.service.terminateSessionsOnPasswordChange.helpText', defaultMessage: 'When true, all sessions of a user will expire if their password is changed by themselves or an administrator. If password change is initiated by user, their current session is not terminated.'},
     webSessionHours: {id: 'admin.service.webSessionHours', defaultMessage: 'Session Length AD/LDAP and Email (hours):'},
     mobileSessionHours: {id: 'admin.service.mobileSessionHours', defaultMessage: 'Session Length Mobile (hours):'},
     ssoSessionHours: {id: 'admin.service.ssoSessionHours', defaultMessage: 'Session Length SSO (hours):'},
     sessionCache: {id: 'admin.service.sessionCache', defaultMessage: 'Session Cache (minutes):'},
     sessionCacheDesc: {id: 'admin.service.sessionCacheDesc', defaultMessage: 'The number of minutes to cache a session in memory:'},
     sessionHoursEx: {id: 'admin.service.sessionHoursEx', defaultMessage: 'E.g.: "720"'},
-    sessionIdleTimeoutDesc: {id: 'admin.service.sessionIdleTimeoutDesc', defaultMessage: "The number of minutes from the last time a user was active on the system to the expiry of the user's session. Once expired, the user will need to log in to continue. Minimum is 5 minutes, and 0 is unlimited. Applies to the desktop app and browsers. For mobile apps, use an EMM provider to lock the app when not in use. In High Availability mode, enable IP hash load balancing for reliable timeout measurement."},
+    sessionIdleTimeoutDesc: {id: 'admin.service.sessionIdleTimeoutDesc', defaultMessage: "The number of minutes from the last time a user was active on the system to the expiry of the user's session. Once expired, the user will need to log in to continue. Minimum is 5 minutes, and 0 is unlimited.\n \nApplies to the desktop app and browsers. For mobile apps, use an EMM provider to lock the app when not in use. In High Availability mode, enable IP hash load balancing for reliable timeout measurement."}, // eslint-disable-line formatjs/no-multiple-whitespaces
 });
 
 export const searchableStrings = [
diff --git a/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap b/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
index 0260f7827f8..a8546e3677f 100644
--- a/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
@@ -180,7 +180,7 @@ exports[`admin_console/add_users_to_role_modal search should not include bot use
       perPage={50}
       placeholderText={
         Object {
-          "defaultMessage": "Search and add members",
+          "defaultMessage": "Search for people",
           "id": "multiselect.placeholder",
         }
       }
@@ -332,7 +332,7 @@ exports[`admin_console/add_users_to_role_modal should exclude user 1`] = `
       perPage={50}
       placeholderText={
         Object {
-          "defaultMessage": "Search and add members",
+          "defaultMessage": "Search for people",
           "id": "multiselect.placeholder",
         }
       }
@@ -528,7 +528,7 @@ exports[`admin_console/add_users_to_role_modal should have single passed value 1
       perPage={50}
       placeholderText={
         Object {
-          "defaultMessage": "Search and add members",
+          "defaultMessage": "Search for people",
           "id": "multiselect.placeholder",
         }
       }
@@ -765,7 +765,7 @@ exports[`admin_console/add_users_to_role_modal should include additional user 1`
       perPage={50}
       placeholderText={
         Object {
-          "defaultMessage": "Search and add members",
+          "defaultMessage": "Search for people",
           "id": "multiselect.placeholder",
         }
       }
@@ -1002,7 +1002,7 @@ exports[`admin_console/add_users_to_role_modal should include additional user 2`
       perPage={50}
       placeholderText={
         Object {
-          "defaultMessage": "Search and add members",
+          "defaultMessage": "Search for people",
           "id": "multiselect.placeholder",
         }
       }
@@ -1198,7 +1198,7 @@ exports[`admin_console/add_users_to_role_modal should not include bot user 1`] =
       perPage={50}
       placeholderText={
         Object {
-          "defaultMessage": "Search and add members",
+          "defaultMessage": "Search for people",
           "id": "multiselect.placeholder",
         }
       }
diff --git a/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/add_users_to_role_modal.tsx b/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/add_users_to_role_modal.tsx
index c8d47a6aa27..a28edf8170a 100644
--- a/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/add_users_to_role_modal.tsx
+++ b/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/add_users_to_role_modal.tsx
@@ -271,7 +271,7 @@ export class AddUsersToRoleModal extends React.PureComponent<Props, State> {
                         buttonSubmitLoadingText={buttonSubmitLoadingText}
                         saving={this.state.saving}
                         loading={this.state.loading}
-                        placeholderText={defineMessage({id: 'multiselect.placeholder', defaultMessage: 'Search and add members'})}
+                        placeholderText={defineMessage({id: 'multiselect.placeholder', defaultMessage: 'Search for people'})}
                     />
                 </Modal.Body>
             </Modal>
diff --git a/webapp/channels/src/components/admin_console/system_user_detail/system_user_detail.tsx b/webapp/channels/src/components/admin_console/system_user_detail/system_user_detail.tsx
index c01ffc45a46..01995ae78d4 100644
--- a/webapp/channels/src/components/admin_console/system_user_detail/system_user_detail.tsx
+++ b/webapp/channels/src/components/admin_console/system_user_detail/system_user_detail.tsx
@@ -868,7 +868,7 @@ export class SystemUserDetail extends PureComponent<Props, State> {
                                         <WithTooltip
                                             title={defineMessage({
                                                 id: 'generic.enterprise_feature',
-                                                defaultMessage: 'Enterprise feature',
+                                                defaultMessage: 'Enterprise Feature',
                                             })}
                                             hint={defineMessage({
                                                 id: 'admin.user_item.manageSettings.disabled_tooltip',
@@ -976,7 +976,7 @@ export class SystemUserDetail extends PureComponent<Props, State> {
                     message={
                         <div>
                             <FormattedMessage
-                                id='deactivate_member_modal.desc'
+                                id='deactivate_member_modal.desc_with_confirmation'
                                 defaultMessage='This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?'
                                 values={{
                                     username: this.state.user?.username ?? '',
diff --git a/webapp/channels/src/components/admin_console/system_user_detail/team_list/team_row.tsx b/webapp/channels/src/components/admin_console/system_user_detail/team_list/team_row.tsx
index ad3756f3737..85f20592e5d 100644
--- a/webapp/channels/src/components/admin_console/system_user_detail/team_list/team_row.tsx
+++ b/webapp/channels/src/components/admin_console/system_user_detail/team_list/team_row.tsx
@@ -30,7 +30,7 @@ export default class TeamRow extends React.PureComponent<Props> {
             return (
                 <FormattedMessage
                     id={'admin.systemUserDetail.teamList.teamType.groupSync'}
-                    defaultMessage={'Group sync'}
+                    defaultMessage={'Group Sync'}
                 />
             );
         }
@@ -38,14 +38,14 @@ export default class TeamRow extends React.PureComponent<Props> {
             return (
                 <FormattedMessage
                     id={'admin.systemUserDetail.teamList.teamType.anyoneCanJoin'}
-                    defaultMessage={'Anyone can join'}
+                    defaultMessage={'Anyone Can Join'}
                 />
             );
         }
         return (
             <FormattedMessage
                 id={'admin.systemUserDetail.teamList.teamType.inviteOnly'}
-                defaultMessage={'Invite only'}
+                defaultMessage={'Invite Only'}
             />
         );
     };
diff --git a/webapp/channels/src/components/admin_console/system_users/system_users_list_actions/deactivate_member_modal.tsx b/webapp/channels/src/components/admin_console/system_users/system_users_list_actions/deactivate_member_modal.tsx
index 64d4059bc74..4907f9e6726 100644
--- a/webapp/channels/src/components/admin_console/system_users/system_users_list_actions/deactivate_member_modal.tsx
+++ b/webapp/channels/src/components/admin_console/system_users/system_users_list_actions/deactivate_member_modal.tsx
@@ -52,7 +52,7 @@ export default function DeactivateMemberModal({user, onExited, onSuccess, onErro
     const defaultMessage = (
         <FormattedMessage
             id='deactivate_member_modal.desc'
-            defaultMessage='This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system.\n'
+            defaultMessage={'This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system.\n'}
             values={{
                 username: user.username,
             }}
@@ -107,7 +107,6 @@ export default function DeactivateMemberModal({user, onExited, onSuccess, onErro
                                     id='deactivate_member_modal.desc.for_users_with_bot_accounts3'
                                     defaultMessage='Bot accounts they manage will be disabled along with their integrations. To enable them again, go to <linkBots>Integrations > Bot Accounts</linkBots>. <linkDocumentation>Learn more about bot accounts</linkDocumentation>.'
                                     values={{
-                                        siteURL,
                                         linkBots: (msg: React.ReactNode) => (
                                             <a
                                                 href={`${siteURL}/_redirect/integrations/bots`}
diff --git a/webapp/channels/src/components/admin_console/system_users/system_users_list_actions/index.tsx b/webapp/channels/src/components/admin_console/system_users/system_users_list_actions/index.tsx
index 58c3b3c0339..7f557ea07cd 100644
--- a/webapp/channels/src/components/admin_console/system_users/system_users_list_actions/index.tsx
+++ b/webapp/channels/src/components/admin_console/system_users/system_users_list_actions/index.tsx
@@ -328,7 +328,7 @@ export function SystemUsersListAction({user, currentUser, tableId, rowIndex, onE
         return managedByLDAP ? {
             trailingElements: formatMessage({
                 id: 'admin.system_users.list.actions.menu.managedByLdap',
-                defaultMessage: 'Managed by LDAP',
+                defaultMessage: '(Managed by LDAP)',
             }),
         } : {};
     };
@@ -524,7 +524,7 @@ export function SystemUsersListAction({user, currentUser, tableId, rowIndex, onE
                         labels={
                             <FormattedMessage
                                 id='admin.system_users.list.actions.menu.removeSessions'
-                                defaultMessage='Remove sessions'
+                                defaultMessage='Revoke sessions'
                             />
                         }
                         onClick={handleRemoveSessionsClick}
diff --git a/webapp/channels/src/components/admin_console/system_users/utils/index.tsx b/webapp/channels/src/components/admin_console/system_users/utils/index.tsx
index 829c754c669..0ed1215f53e 100644
--- a/webapp/channels/src/components/admin_console/system_users/utils/index.tsx
+++ b/webapp/channels/src/components/admin_console/system_users/utils/index.tsx
@@ -164,7 +164,7 @@ export function getDefaultSelectedTeam(teamId: Team['id'] | string, label?: stri
             label: (
                 <FormattedMessage
                     id='admin.system_users.filters.team.allTeams'
-                    defaultMessage='All Teams'
+                    defaultMessage='All teams'
                 />
             ),
         };
@@ -174,7 +174,7 @@ export function getDefaultSelectedTeam(teamId: Team['id'] | string, label?: stri
             label: (
                 <FormattedMessage
                     id='admin.system_users.filters.team.noTeams'
-                    defaultMessage='No Teams'
+                    defaultMessage='No teams'
                 />
             ),
         };
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_access_control_policy.tsx b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_access_control_policy.tsx
index 6bfbeebdd8e..0c477d644d6 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_access_control_policy.tsx
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_access_control_policy.tsx
@@ -135,7 +135,7 @@ export const ChannelAccessControl: React.FC<Props> = (props: Props): JSX.Element
     return (
         <AdminPanelWithButton
             id='channel_access_control_with_policy'
-            title={defineMessage({id: 'admin.channel_settings.channel_detail.access_control_policy_title', defaultMessage: 'Access Policy'})}
+            title={defineMessage({id: 'admin.channel_settings.channel_detail.access_control_policy_title', defaultMessage: 'Access policy'})}
             subtitle={defineMessage({id: 'admin.channel_settings.channel_detail.policy_following', defaultMessage: 'This channel is currently using the following access policy.'})}
             buttonText={defineMessage({id: 'admin.channel_settings.channel_detail.remove_policy', defaultMessage: 'Remove all'})}
             onButtonClick={() => {
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/errors.tsx b/webapp/channels/src/components/admin_console/team_channel_settings/errors.tsx
index 8782554621d..a37da23ddc0 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/errors.tsx
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/errors.tsx
@@ -65,7 +65,7 @@ export const UsersWillBeRemovedError = ({users, total, scope, scopeId}: UsersWil
     let error = (
         <FormattedMessage
             id='admin.team_channel_settings.users_will_be_removed'
-            defaultMessage='{amount, number} {amount, plural, one {User} other {Users}} will be removed from this team. They are not in groups linked to this team.'
+            defaultMessage='{amount, number} {amount, plural, one {user} other {users}} will be removed from this team. They are not in groups linked to this team.'
             values={{amount: total}}
         />
     );
diff --git a/webapp/channels/src/components/advanced_create_post/prewritten_chips.tsx b/webapp/channels/src/components/advanced_create_post/prewritten_chips.tsx
index 2cbfdb9823e..d2f6e932d05 100644
--- a/webapp/channels/src/components/advanced_create_post/prewritten_chips.tsx
+++ b/webapp/channels/src/components/advanced_create_post/prewritten_chips.tsx
@@ -132,6 +132,7 @@ const PrewrittenChips = ({channelId, currentUserId, prefillMessage}: Props) => {
                 event: 'prefilled_message_selected_dm_hey',
                 message: defineMessage({
                     id: 'create_post.prewritten.tip.dm_hey_message',
+                    // eslint-disable-next-line formatjs/enforce-placeholders -- username provided when message is formatted
                     defaultMessage: ':wave: Hey @{username}',
                 }),
                 display: defineMessage({
diff --git a/webapp/channels/src/components/advanced_text_editor/priority_labels/index.tsx b/webapp/channels/src/components/advanced_text_editor/priority_labels/index.tsx
index e8d9f5df4f6..1e3ec2d3dbb 100644
--- a/webapp/channels/src/components/advanced_text_editor/priority_labels/index.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/priority_labels/index.tsx
@@ -79,7 +79,7 @@ function PriorityLabels({
                 <WithTooltip
                     title={intl.formatMessage({
                         id: 'post_priority.remove',
-                        defaultMessage: 'Remove {priority}',
+                        defaultMessage: 'Remove {priority} label',
                     }, {priority})}
                 >
                     <button
@@ -90,7 +90,7 @@ function PriorityLabels({
                         <span className='sr-only'>
                             <FormattedMessage
                                 id={'post_priority.remove'}
-                                defaultMessage={'Remove {priority}'}
+                                defaultMessage={'Remove {priority} label'}
                                 values={{priority}}
                             />
                         </span>
diff --git a/webapp/channels/src/components/advanced_text_editor/rewrite_menu.tsx b/webapp/channels/src/components/advanced_text_editor/rewrite_menu.tsx
index 6f56f150351..2d55e505ca3 100644
--- a/webapp/channels/src/components/advanced_text_editor/rewrite_menu.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/rewrite_menu.tsx
@@ -118,7 +118,7 @@ export default function RewriteMenu({
             placeholderText = prompt;
         } else if (draftMessage.trim()) {
             placeholderText = formatMessage({
-                id: 'texteditor.rewrite.rewriting',
+                id: 'texteditor.rewrite.placeholder.rewriting',
                 defaultMessage: 'Rewriting...',
             });
         }
diff --git a/webapp/channels/src/components/advanced_text_editor/send_button/scheduled_post_custom_time_modal/scheduled_post_custom_time_modal.tsx b/webapp/channels/src/components/advanced_text_editor/send_button/scheduled_post_custom_time_modal/scheduled_post_custom_time_modal.tsx
index 31b7f8c018c..e1d889e9f56 100644
--- a/webapp/channels/src/components/advanced_text_editor/send_button/scheduled_post_custom_time_modal/scheduled_post_custom_time_modal.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/send_button/scheduled_post_custom_time_modal/scheduled_post_custom_time_modal.tsx
@@ -95,7 +95,7 @@ export default function ScheduledPostCustomTimeModal({channelId, onExited, onCon
             confirmButtonText={
                 <FormattedMessage
                     id='schedule_post.custom_time_modal.confirm_button_text'
-                    defaultMessage='Confirm'
+                    defaultMessage='Schedule'
                 />
             }
             cancelButtonText={
diff --git a/webapp/channels/src/components/advanced_text_editor/send_button/send_post_options/core_menu_options.tsx b/webapp/channels/src/components/advanced_text_editor/send_button/send_post_options/core_menu_options.tsx
index 5e8941bfd7d..95f869bb531 100644
--- a/webapp/channels/src/components/advanced_text_editor/send_button/send_post_options/core_menu_options.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/send_button/send_post_options/core_menu_options.tsx
@@ -70,7 +70,7 @@ function CoreMenuOptions({handleOnSelect, channelId}: Props) {
         const teammateTimeDisplay = (
             <FormattedMessage
                 id='create_post_button.option.schedule_message.options.teammate_user_hour'
-                defaultMessage="{time} {user}'s time"
+                defaultMessage='{time} {user}’s time'
                 values={{
                     user: (
                         <span className='userDisplayName'>
diff --git a/webapp/channels/src/components/advanced_text_editor/send_button/send_post_options/index.tsx b/webapp/channels/src/components/advanced_text_editor/send_button/send_post_options/index.tsx
index aa6453ae13b..a99e57db7b2 100644
--- a/webapp/channels/src/components/advanced_text_editor/send_button/send_post_options/index.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/send_button/send_post_options/index.tsx
@@ -97,7 +97,7 @@ export function SendPostOptions({disabled, onSelect, channelId}: Props) {
                 labels={
                     <FormattedMessage
                         id='create_post_button.option.schedule_message.options.header'
-                        defaultMessage='Scheduled message'
+                        defaultMessage='Schedule message'
                     />
                 }
             />
diff --git a/webapp/channels/src/components/analytics/system_analytics/system_analytics.test.tsx b/webapp/channels/src/components/analytics/system_analytics/system_analytics.test.tsx
index 85d6d5b2358..477947e8e87 100644
--- a/webapp/channels/src/components/analytics/system_analytics/system_analytics.test.tsx
+++ b/webapp/channels/src/components/analytics/system_analytics/system_analytics.test.tsx
@@ -100,15 +100,13 @@ describe('components/analytics/system_analytics/system_analytics.tsx', () => {
     });
 
     test('plugins data', async () => {
-        const totalPlaybooksID = 'total_playbooks';
-        const totalPlaybookRunsID = 'total_playbook_runs';
         const playbooksStats = {
             playbook_count: {
                 id: 'total_playbooks',
                 icon: 'fa-book',
                 name:
     <FormattedMessage
-        id={totalPlaybooksID}
+        id='total_playbooks'
         defaultMessage='Total Playbooks'
     />,
                 value: 45,
@@ -118,7 +116,7 @@ describe('components/analytics/system_analytics/system_analytics.tsx', () => {
                 icon: 'fa-list-alt',
                 name:
     <FormattedMessage
-        id={totalPlaybookRunsID}
+        id='total_playbook_runs'
         defaultMessage='Total Runs'
     />,
                 value: 45,
diff --git a/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx b/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
index e34adc32f5f..78a16ff7941 100644
--- a/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
+++ b/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
@@ -220,7 +220,7 @@ const ConfigurationAnnouncementBar = (props: Props) => {
                                 src={warningIcon}
                             />
                             <FormattedMessage
-                                id={AnnouncementBarMessages.LICENSE_PAST_GRACE}
+                                id='announcement_bar.error.past_grace'
                                 defaultMessage='{licenseSku} license is expired and some features may be disabled. Please contact your System Administrator for details.'
                                 values={{
                                     licenseSku: getSkuDisplayName(props.license.SkuShortName, props.license.IsGovSku === 'true'),
@@ -237,8 +237,8 @@ const ConfigurationAnnouncementBar = (props: Props) => {
             props.config?.EnablePreviewModeBanner === 'true'
     ) {
         const emailMessage = formatMessage({
-            id: AnnouncementBarMessages.PREVIEW_MODE,
-            defaultMessage: 'Preview Mode: Email notifications have not been configured',
+            id: 'announcement_bar.error.preview_mode',
+            defaultMessage: 'Preview Mode: Email notifications have not been configured.',
         });
 
         return (
diff --git a/webapp/channels/src/components/announcement_bar/payment_announcement_bar/index.tsx b/webapp/channels/src/components/announcement_bar/payment_announcement_bar/index.tsx
index f770a911e2c..2d7b7b00d4c 100644
--- a/webapp/channels/src/components/announcement_bar/payment_announcement_bar/index.tsx
+++ b/webapp/channels/src/components/announcement_bar/payment_announcement_bar/index.tsx
@@ -88,6 +88,6 @@ export default function PaymentAnnouncementBar() {
 const messages = defineMessages({
     updatePaymentInfo: {
         id: 'admin.billing.subscription.updatePaymentInfo',
-        defaultMessage: 'Update payment info',
+        defaultMessage: 'Update Payment Information',
     },
 });
diff --git a/webapp/channels/src/components/apps_form/apps_form_container.tsx b/webapp/channels/src/components/apps_form/apps_form_container.tsx
index 856a3ddfe5e..b2c5430f378 100644
--- a/webapp/channels/src/components/apps_form/apps_form_container.tsx
+++ b/webapp/channels/src/components/apps_form/apps_form_container.tsx
@@ -56,7 +56,7 @@ class AppsFormContainer extends React.PureComponent<Props, State> {
             return {error: makeCallErrorResponse(makeErrorMsg(errMsg))};
         }
         if (!form.submit) {
-            const errMsg = this.props.intl.formatMessage({id: 'apps.error.form.no_submit', defaultMessage: '`submit` is not defined'});
+            const errMsg = this.props.intl.formatMessage({id: 'apps.error.form.no_submit', defaultMessage: '`submit` is not defined.'});
             return {error: makeCallErrorResponse(makeErrorMsg(errMsg))};
         }
         if (!this.props.appContext) {
@@ -170,7 +170,7 @@ class AppsFormContainer extends React.PureComponent<Props, State> {
         const makeErrorMsg = (message: string) => intl.formatMessage(
             {
                 id: 'apps.error.form.refresh',
-                defaultMessage: 'There has been an error fetching the select fields. Contact the app developer. Details: {details}',
+                defaultMessage: 'There has been an error updating the modal. Contact the app developer. Details: {details}',
             },
             {details: message},
         );
diff --git a/webapp/channels/src/components/channel_header/__snapshots__/channel_header.test.tsx.snap b/webapp/channels/src/components/channel_header/__snapshots__/channel_header.test.tsx.snap
index 8d7abed969f..34471948992 100644
--- a/webapp/channels/src/components/channel_header/__snapshots__/channel_header.test.tsx.snap
+++ b/webapp/channels/src/components/channel_header/__snapshots__/channel_header.test.tsx.snap
@@ -94,7 +94,7 @@ exports[`components/ChannelHeader should match snapshot with last active display
                 className="last-active__text"
               >
                 <MemoizedFormattedMessage
-                  defaultMessage="Active {timestamp}"
+                  defaultMessage="Last online {timestamp}"
                   id="channel_header.lastActive"
                   values={
                     Object {
@@ -1709,7 +1709,7 @@ exports[`components/ChannelHeader should render properly when custom status is e
                 className="last-active__text"
               >
                 <MemoizedFormattedMessage
-                  defaultMessage="Active {timestamp}"
+                  defaultMessage="Last online {timestamp}"
                   id="channel_header.lastActive"
                   values={
                     Object {
@@ -1963,7 +1963,7 @@ exports[`components/ChannelHeader should render properly when custom status is s
                 className="last-active__text"
               >
                 <MemoizedFormattedMessage
-                  defaultMessage="Active {timestamp}"
+                  defaultMessage="Last online {timestamp}"
                   id="channel_header.lastActive"
                   values={
                     Object {
diff --git a/webapp/channels/src/components/channel_header/channel_header.tsx b/webapp/channels/src/components/channel_header/channel_header.tsx
index 747185761e0..daaad15b638 100644
--- a/webapp/channels/src/components/channel_header/channel_header.tsx
+++ b/webapp/channels/src/components/channel_header/channel_header.tsx
@@ -202,7 +202,7 @@ class ChannelHeader extends React.PureComponent<Props> {
                         <span className='last-active__text'>
                             <FormattedMessage
                                 id='channel_header.lastActive'
-                                defaultMessage='Active {timestamp}'
+                                defaultMessage='Last online {timestamp}'
                                 values={{
                                     timestamp: (
                                         <Timestamp
diff --git a/webapp/channels/src/components/channel_header/channel_info_button.tsx b/webapp/channels/src/components/channel_header/channel_info_button.tsx
index 044dfbfd2cc..6331c20d094 100644
--- a/webapp/channels/src/components/channel_header/channel_info_button.tsx
+++ b/webapp/channels/src/components/channel_header/channel_info_button.tsx
@@ -52,7 +52,7 @@ const ChannelInfoButton = ({channel}: Props) => {
 
     let tooltip;
     if (buttonActive) {
-        tooltip = intl.formatMessage({id: 'channel_header.closeChannelInfo', defaultMessage: 'Close info'});
+        tooltip = intl.formatMessage({id: 'channel_header.closeChannelInfo', defaultMessage: 'Close Info'});
     } else {
         tooltip = intl.formatMessage({id: 'channel_header.openChannelInfo', defaultMessage: 'View Info'});
     }
diff --git a/webapp/channels/src/components/channel_invite_modal/team_warning_banner/team_warning_banner.tsx b/webapp/channels/src/components/channel_invite_modal/team_warning_banner/team_warning_banner.tsx
index eea1550d79a..9afc59c7d46 100644
--- a/webapp/channels/src/components/channel_invite_modal/team_warning_banner/team_warning_banner.tsx
+++ b/webapp/channels/src/components/channel_invite_modal/team_warning_banner/team_warning_banner.tsx
@@ -96,7 +96,7 @@ const TeamWarningBanner = (props: Props) => {
             formatMessage(
                 {
                     id: 'channel_invite.invite_team_members.guests.message',
-                    defaultMessage: '{count, plural, =1 {{firstUser} is a guest user and needs} other {{users} are guest users and need}} to first be invited to the team before you can add them to the channel. Once they\'ve joined the team, you can add them to this channel.',
+                    defaultMessage: "{count, plural, =1 {{firstUser} is a guest user and needs} other {{users} are guest users and need}} to first be invited to the team before you can add them to the channel. Once they've joined the team, you can add them to this channel.",
                 },
                 {
                     count: guests.length,
@@ -107,7 +107,6 @@ const TeamWarningBanner = (props: Props) => {
                             mentionName={firstName}
                         />
                     ),
-                    team: (<strong>{team?.display_name}</strong>),
                 },
             )
         );
diff --git a/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.tsx b/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.tsx
index 9c0e70b7515..09bdc7d3eb1 100644
--- a/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.tsx
+++ b/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.tsx
@@ -138,7 +138,7 @@ export default function ChannelNotificationsModal(props: Props) {
                 }
                 description={formatMessage({
                     id: 'channel_notifications.muteChannelDesc',
-                    defaultMessage: 'Turns off notifications for this channel. You\'ll still see badges if you\'re mentioned.',
+                    defaultMessage: 'Turns off notifications for this channel. You’ll still see badges if you’re mentioned.',
                 })}
                 inputFieldValue={settings.mark_unread === 'mention'}
                 inputFieldData={utils.MuteChannelInputFieldData}
@@ -193,7 +193,7 @@ export default function ChannelNotificationsModal(props: Props) {
                     inputFieldTitle={
                         <FormattedMessage
                             id='channel_notifications.checkbox.threadsReplyTitle'
-                            defaultMessage="Notify me about replies to threads I\'m following"
+                            defaultMessage='Notify me about replies to threads I’m following'
                         />
                     }
                     handleChange={(e) => handleChange({desktop_threads: e ? 'all' : 'mention'})}
@@ -262,7 +262,7 @@ export default function ChannelNotificationsModal(props: Props) {
                             inputFieldTitle={
                                 <FormattedMessage
                                     id='channel_notifications.checkbox.threadsReplyTitle'
-                                    defaultMessage="Notify me about replies to threads I\'m following"
+                                    defaultMessage='Notify me about replies to threads I’m following'
                                 />
                             }
                             inputFieldValue={settings.push_threads === 'all'}
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_access_rules_confirm_modal.tsx b/webapp/channels/src/components/channel_settings_modal/channel_access_rules_confirm_modal.tsx
index 4b0f02f28f5..5ad4b6be98a 100644
--- a/webapp/channels/src/components/channel_settings_modal/channel_access_rules_confirm_modal.tsx
+++ b/webapp/channels/src/components/channel_settings_modal/channel_access_rules_confirm_modal.tsx
@@ -136,10 +136,15 @@ function ChannelAccessRulesConfirmModal({
         return null;
     }
 
-    const modalTitle = (
+    const modalTitle = willShowActivityWarning ? (
         <FormattedMessage
-            id={willShowActivityWarning ? 'channel_settings.access_rules.confirm_modal.title_with_warning' : 'channel_settings.access_rules.confirm_modal.title'}
-            defaultMessage={willShowActivityWarning ? 'Review membership impact' : 'Save and apply rules'}
+            id={'channel_settings.access_rules.confirm_modal.title_with_warning'}
+            defaultMessage={'Review membership impact'}
+        />
+    ) : (
+        <FormattedMessage
+            id={'channel_settings.access_rules.confirm_modal.title'}
+            defaultMessage={'Save and apply rules'}
         />
     );
 
@@ -192,10 +197,15 @@ function ChannelAccessRulesConfirmModal({
                             );
                         }
 
-                        return (
+                        return autoSyncEnabled ? (
                             <FormattedMessage
-                                id={autoSyncEnabled ? 'channel_settings.access_rules.confirm_modal.save_and_apply' : 'channel_settings.access_rules.confirm_modal.save'}
-                                defaultMessage={autoSyncEnabled ? 'Save and apply' : 'Save'}
+                                id={'channel_settings.access_rules.confirm_modal.save_and_apply'}
+                                defaultMessage={'Save and apply'}
+                            />
+                        ) : (
+                            <FormattedMessage
+                                id={'channel_settings.access_rules.confirm_modal.save'}
+                                defaultMessage={'Save'}
                             />
                         );
                     })()}
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_activity_warning_modal.test.tsx b/webapp/channels/src/components/channel_settings_modal/channel_activity_warning_modal.test.tsx
index a05ad1f5dbc..52ad2e369a6 100644
--- a/webapp/channels/src/components/channel_settings_modal/channel_activity_warning_modal.test.tsx
+++ b/webapp/channels/src/components/channel_settings_modal/channel_activity_warning_modal.test.tsx
@@ -27,7 +27,7 @@ describe('ChannelActivityWarningModal', () => {
         );
 
         expect(screen.getByText('Exposing channel history')).toBeInTheDocument();
-        expect(screen.getByText(/Everyone who gains access to this channel/)).toBeInTheDocument();
+        expect(screen.getByText(/Modifying access rules may allow new users/)).toBeInTheDocument();
         expect(screen.getByText(/I acknowledge this change will expose/)).toBeInTheDocument();
     });
 
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_activity_warning_modal.tsx b/webapp/channels/src/components/channel_settings_modal/channel_activity_warning_modal.tsx
index ab010247b8c..82bd59cd398 100644
--- a/webapp/channels/src/components/channel_settings_modal/channel_activity_warning_modal.tsx
+++ b/webapp/channels/src/components/channel_settings_modal/channel_activity_warning_modal.tsx
@@ -75,7 +75,7 @@ const ChannelActivityWarningModal: React.FC<Props> = ({
                     <div className='warning-description'>
                         <FormattedMessage
                             id='channel_settings.activity_warning.exposing_history_description'
-                            defaultMessage='Everyone who gains access to this channel can view the entire message history, including messages that were sent under stricter access rules.'
+                            defaultMessage='Modifying access rules may allow new users to view the entire message history, including messages sent before this change.'
                         />
                     </div>
                 </div>
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_settings_archive_tab.test.tsx b/webapp/channels/src/components/channel_settings_modal/channel_settings_archive_tab.test.tsx
index 0b6cd021d24..0672f56d27c 100644
--- a/webapp/channels/src/components/channel_settings_modal/channel_settings_archive_tab.test.tsx
+++ b/webapp/channels/src/components/channel_settings_modal/channel_settings_archive_tab.test.tsx
@@ -155,7 +155,7 @@ describe('ChannelSettingsArchiveTab', () => {
         // Use the within function to scope the query to just the modal content
         const modalBody = screen.getByTestId('archiveChannelConfirmModal').querySelector('#confirmModalBody');
         expect(modalBody).toBeInTheDocument();
-        expect(modalBody).toHaveTextContent(/Archiving a channel removes it from the user interface/);
+        expect(modalBody).toHaveTextContent(/This will archive the channel from the team/);
     });
 
     it('should call deleteChannel which handles channel ID validation', async () => {
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_settings_archive_tab.tsx b/webapp/channels/src/components/channel_settings_modal/channel_settings_archive_tab.tsx
index 7c4d5ebcda3..47eea23c2c1 100644
--- a/webapp/channels/src/components/channel_settings_modal/channel_settings_archive_tab.tsx
+++ b/webapp/channels/src/components/channel_settings_modal/channel_settings_archive_tab.tsx
@@ -66,7 +66,7 @@ function ChannelSettingsArchiveTab({
                             <p>
                                 <FormattedMessage
                                     id='deleteChannelModal.canViewArchivedChannelsWarning'
-                                    defaultMessage="Archiving a channel removes it from the user interface, but doesn't permanently delete the channel. New messages can't be posted to archived channels."
+                                    defaultMessage='This will archive the channel from the team. Channel contents will still be accessible by channel members.'
                                 />
                             </p>
                             <p>
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_settings_info_tab.tsx b/webapp/channels/src/components/channel_settings_modal/channel_settings_info_tab.tsx
index 4635b3c49ce..32aa9078c5e 100644
--- a/webapp/channels/src/components/channel_settings_modal/channel_settings_info_tab.tsx
+++ b/webapp/channels/src/components/channel_settings_modal/channel_settings_info_tab.tsx
@@ -394,7 +394,7 @@ function ChannelSettingsInfoTab({
                 onChange={handlePurposeChange}
                 createMessage={formatMessage({
                     id: 'channel_settings_modal.purpose.placeholder',
-                    defaultMessage: 'Enter a purpose for this channel',
+                    defaultMessage: 'Enter a purpose for this channel (optional)',
                 })}
                 maxLength={Constants.MAX_CHANNELPURPOSE_LENGTH}
                 preview={shouldShowPreviewPurpose}
@@ -408,7 +408,7 @@ function ChannelSettingsInfoTab({
                 hasError={channelPurpose.length > Constants.MAX_CHANNELPURPOSE_LENGTH}
                 errorMessage={channelPurpose.length > Constants.MAX_CHANNELPURPOSE_LENGTH ? formatMessage({
                     id: 'channel_settings.error_purpose_length',
-                    defaultMessage: 'The channel purpose exceeds the maximum character limit of {maxLength} characters.',
+                    defaultMessage: 'The text entered exceeds the character limit. The channel purpose is limited to {maxLength} characters.',
                 }, {
                     maxLength: Constants.MAX_CHANNELPURPOSE_LENGTH,
                 }) : undefined
@@ -426,7 +426,7 @@ function ChannelSettingsInfoTab({
                 onChange={handleHeaderChange}
                 createMessage={formatMessage({
                     id: 'channel_settings_modal.header.placeholder',
-                    defaultMessage: 'Enter a header description or important links',
+                    defaultMessage: 'Enter a header for this channel',
                 })}
                 maxLength={HEADER_MAX_LENGTH}
                 preview={shouldShowPreviewHeader}
@@ -440,7 +440,7 @@ function ChannelSettingsInfoTab({
                 hasError={channelHeader.length > HEADER_MAX_LENGTH}
                 errorMessage={channelHeader.length > HEADER_MAX_LENGTH ? formatMessage({
                     id: 'edit_channel_header_modal.error',
-                    defaultMessage: 'The channel header exceeds the maximum character limit of {maxLength} characters.',
+                    defaultMessage: 'The text entered exceeds the character limit. The channel header is limited to {maxLength} characters.',
                 }, {
                     maxLength: HEADER_MAX_LENGTH,
                 }) : undefined
diff --git a/webapp/channels/src/components/channel_view/channel_view.tsx b/webapp/channels/src/components/channel_view/channel_view.tsx
index 1fb7e3134fa..ee32ccd4d5e 100644
--- a/webapp/channels/src/components/channel_view/channel_view.tsx
+++ b/webapp/channels/src/components/channel_view/channel_view.tsx
@@ -179,9 +179,6 @@ export default class ChannelView extends React.PureComponent<Props, State> {
                         <FormattedMessage
                             id='channelView.noSharedTeam'
                             defaultMessage='You no longer have any teams in common with this user. New messages cannot be posted.'
-                            values={{
-                                b: (chunks) => <b>{chunks}</b>,
-                            }}
                         />
                         <button
                             className='btn btn-primary channel-archived__close-btn'
diff --git a/webapp/channels/src/components/claim/components/email_to_oauth.tsx b/webapp/channels/src/components/claim/components/email_to_oauth.tsx
index 0bcc38f110a..f8e035979c5 100644
--- a/webapp/channels/src/components/claim/components/email_to_oauth.tsx
+++ b/webapp/channels/src/components/claim/components/email_to_oauth.tsx
@@ -77,6 +77,7 @@ const EmailToOAuth = (props: Props) => {
             <LoginMfa
                 loginId={props.email}
                 password={password}
+                // eslint-disable-next-line formatjs/enforce-placeholders -- uiType provided when message is formatted at component level
                 title={formatMessage({id: 'claim.email_to_oauth.title', defaultMessage: 'Switch Email/Password Account to {uiType}'})}
                 onSubmit={submit}
             />
diff --git a/webapp/channels/src/components/cloud_invoice_preview/index.tsx b/webapp/channels/src/components/cloud_invoice_preview/index.tsx
index f2e7bc95f1e..25b5058f4dd 100644
--- a/webapp/channels/src/components/cloud_invoice_preview/index.tsx
+++ b/webapp/channels/src/components/cloud_invoice_preview/index.tsx
@@ -53,6 +53,7 @@ function CloudInvoicePreview(props: Props) {
                 <div className={'subtitle'}>
                     <FormattedMessage
                         id='cloud.invoice_pdf_preview.download'
+                        defaultMessage='<downloadLink>Download</downloadLink> this page for your records'
                         values={{
                             downloadLink: (msg) => (
                                 <ExternalLink
diff --git a/webapp/channels/src/components/cloud_usage_modal/lhs_nearing_limit_modal.tsx b/webapp/channels/src/components/cloud_usage_modal/lhs_nearing_limit_modal.tsx
index c060c5fbfa0..d8d6c885134 100644
--- a/webapp/channels/src/components/cloud_usage_modal/lhs_nearing_limit_modal.tsx
+++ b/webapp/channels/src/components/cloud_usage_modal/lhs_nearing_limit_modal.tsx
@@ -48,6 +48,7 @@ export default function LHSNearingLimitsModal() {
     const highestLimit = useGetHighestThresholdCloudLimit(usage, limits);
     let title: Message = defineMessage({
         id: 'workspace_limits.modals.informational.title',
+        // eslint-disable-next-line formatjs/enforce-placeholders -- planName provided via values property
         defaultMessage: '{planName} limits',
         values: {
             planName: product?.name,
@@ -56,6 +57,7 @@ export default function LHSNearingLimitsModal() {
 
     let description: Message = defineMessage({
         id: 'workspace_limits.modals.informational.description.freeLimits',
+        // eslint-disable-next-line formatjs/enforce-placeholders -- planName, messages, storage provided via values property
         defaultMessage: '{planName} is restricted to {messages} message history and {storage} file storage.',
         values: {
             planName: product?.name,
diff --git a/webapp/channels/src/components/common/hooks/useShowAdminLimitReached.ts b/webapp/channels/src/components/common/hooks/useShowAdminLimitReached.ts
index cd33d1ea2e3..ef5c36a0389 100644
--- a/webapp/channels/src/components/common/hooks/useShowAdminLimitReached.ts
+++ b/webapp/channels/src/components/common/hooks/useShowAdminLimitReached.ts
@@ -42,6 +42,7 @@ export default function useShowAdminLimitReached() {
         const modalProps: any = {
             title: defineMessage({
                 id: 'workspace_limits.modals.limits_reached.title',
+                // eslint-disable-next-line formatjs/enforce-placeholders -- limitName provided via values property
                 defaultMessage: '{limitName} limit reached',
                 values: {
                     limitName: intl.formatMessage({
diff --git a/webapp/channels/src/components/common/svg_images_components/saved_messages_svg.tsx b/webapp/channels/src/components/common/svg_images_components/saved_messages_svg.tsx
index 52f059e3ca5..05d0b19ec15 100644
--- a/webapp/channels/src/components/common/svg_images_components/saved_messages_svg.tsx
+++ b/webapp/channels/src/components/common/svg_images_components/saved_messages_svg.tsx
@@ -14,7 +14,7 @@ export function SavedMessagesSVG(props: React.HTMLAttributes<HTMLSpanElement>) {
                 viewBox='0 0 97 87'
                 fill='none'
                 role='img'
-                aria-label={formatMessage({id: 'generic_icons.flag', defaultMessage: 'Flag Icon'})}
+                aria-label={formatMessage({id: 'generic_icons.flag', defaultMessage: 'Save Icon'})}
             >
                 <g clipPath='url(#clip0_4210_81120)'>
                     <path
diff --git a/webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap b/webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap
index 4ceeaee9ae9..2c638e06281 100644
--- a/webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap
+++ b/webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap
@@ -127,7 +127,7 @@ exports[`component/create_user_groups_modal should match snapshot with back butt
       >
         <legend>
           <MemoizedFormattedMessage
-            defaultMessage="Add People"
+            defaultMessage="Add people"
             id="user_groups_modal.addPeople"
           />
         </legend>
@@ -271,7 +271,7 @@ exports[`component/create_user_groups_modal should match snapshot without back b
       >
         <legend>
           <MemoizedFormattedMessage
-            defaultMessage="Add People"
+            defaultMessage="Add people"
             id="user_groups_modal.addPeople"
           />
         </legend>
diff --git a/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx b/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx
index 7bf8720a2bd..994b351a18e 100644
--- a/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx
+++ b/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx
@@ -305,7 +305,7 @@ export class CreateUserGroupsModal extends React.PureComponent<Props, State> {
                             <legend>
                                 <FormattedMessage
                                     id='user_groups_modal.addPeople'
-                                    defaultMessage='Add People'
+                                    defaultMessage='Add people'
                                 />
                             </legend>
                             <div className='group-add-user'>
diff --git a/webapp/channels/src/components/dot_menu/dot_menu.tsx b/webapp/channels/src/components/dot_menu/dot_menu.tsx
index a9a53362a0b..db37c32233f 100644
--- a/webapp/channels/src/components/dot_menu/dot_menu.tsx
+++ b/webapp/channels/src/components/dot_menu/dot_menu.tsx
@@ -544,21 +544,21 @@ export class DotMenuClass extends React.PureComponent<Props, State> {
         const saveFlag = (
             <FormattedMessage
                 id='rhs_root.mobile.flag'
-                defaultMessage='Save'
+                defaultMessage='Save Message'
             />
         );
 
         const pinPost = (
             <FormattedMessage
                 id='post_info.pin'
-                defaultMessage='Pin'
+                defaultMessage='Pin to Channel'
             />
         );
 
         const unPinPost = (
             <FormattedMessage
                 id='post_info.unpin'
-                defaultMessage='Unpin'
+                defaultMessage='Unpin from Channel'
             />
         );
 
diff --git a/webapp/channels/src/components/drafts/drafts_link/drafts_link.tsx b/webapp/channels/src/components/drafts/drafts_link/drafts_link.tsx
index 3a14b0d50dd..6cc66da85e9 100644
--- a/webapp/channels/src/components/drafts/drafts_link/drafts_link.tsx
+++ b/webapp/channels/src/components/drafts/drafts_link/drafts_link.tsx
@@ -97,7 +97,7 @@ function DraftsLink() {
         return (
             <FormattedMessage
                 id='drafts.tooltipText'
-                defaultMessage=''
+                defaultMessage='{draftCount, plural, =0 {} =1 {1 Draft} other {{draftCount} Drafts}} <br></br> {scheduledPostCount, plural, =0 {} other {{scheduledPostCount} Scheduled}}'
                 values={{
                     draftCount,
                     scheduledPostCount: teamScheduledPostCount,
diff --git a/webapp/channels/src/components/edit_channel_purpose_modal/__snapshots__/edit_channel_purpose_modal.test.tsx.snap b/webapp/channels/src/components/edit_channel_purpose_modal/__snapshots__/edit_channel_purpose_modal.test.tsx.snap
index 5b8ac444aa0..0ffd8354c27 100644
--- a/webapp/channels/src/components/edit_channel_purpose_modal/__snapshots__/edit_channel_purpose_modal.test.tsx.snap
+++ b/webapp/channels/src/components/edit_channel_purpose_modal/__snapshots__/edit_channel_purpose_modal.test.tsx.snap
@@ -399,7 +399,7 @@ exports[`comoponents/EditChannelPurposeModal should match for private channel 1`
   >
     <p>
       <MemoizedFormattedMessage
-        defaultMessage="This text appears in the \\\\\\"View Info\\\\\\" modal of the private channel."
+        defaultMessage="This text appears in the \\"View Info\\" modal of the private channel."
         id="edit_channel_private_purpose_modal.body"
       />
     </p>
diff --git a/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx b/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
index 2fc1f29800f..3749b913d70 100644
--- a/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
+++ b/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
@@ -150,7 +150,7 @@ export class EditChannelPurposeModal extends React.PureComponent<Props, State> {
             channelPurposeModal = (
                 <FormattedMessage
                     id='edit_channel_private_purpose_modal.body'
-                    defaultMessage='This text appears in the \"View Info\" modal of the private channel.'
+                    defaultMessage='This text appears in the "View Info" modal of the private channel.'
                 />
             );
         }
diff --git a/webapp/channels/src/components/emoji/add_emoji/__snapshots__/add_emoji.test.tsx.snap b/webapp/channels/src/components/emoji/add_emoji/__snapshots__/add_emoji.test.tsx.snap
index d8b5c1c8d57..93ef96dbf92 100644
--- a/webapp/channels/src/components/emoji/add_emoji/__snapshots__/add_emoji.test.tsx.snap
+++ b/webapp/channels/src/components/emoji/add_emoji/__snapshots__/add_emoji.test.tsx.snap
@@ -52,7 +52,7 @@ exports[`components/emoji/components/AddEmoji should match snapshot 1`] = `
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Name your emoji. The name can be up to 64 characters, and can contain lowercase letters, numbers, and the symbols '-' and '_'."
+              defaultMessage="Specify an emoji name that's up to 64 characters. It can contain lowercase letters, numbers, and the symbols '-', '+' and '_'."
               id="add_emoji.name.help"
             />
           </div>
@@ -97,7 +97,7 @@ exports[`components/emoji/components/AddEmoji should match snapshot 1`] = `
               className="form__help"
             >
               <MemoizedFormattedMessage
-                defaultMessage="Specify a .gif, .png, or .jpg file of up to 64 KB for your emoji. The dimensions can be up to 128 pixels by 128 pixels."
+                defaultMessage="Specify a .gif, .png, or .jpg file for your emoji. The file can be up to 512 KiB. The dimensions are resized automatically to 128 pixels by 128 pixels while maintaining the aspect ratio."
                 id="add_emoji.image.help"
               />
             </div>
@@ -196,7 +196,7 @@ exports[`components/emoji/components/AddEmoji should select a file and match sna
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Name your emoji. The name can be up to 64 characters, and can contain lowercase letters, numbers, and the symbols '-' and '_'."
+              defaultMessage="Specify an emoji name that's up to 64 characters. It can contain lowercase letters, numbers, and the symbols '-', '+' and '_'."
               id="add_emoji.name.help"
             />
           </div>
@@ -244,7 +244,7 @@ exports[`components/emoji/components/AddEmoji should select a file and match sna
               className="form__help"
             >
               <MemoizedFormattedMessage
-                defaultMessage="Specify a .gif, .png, or .jpg file of up to 64 KB for your emoji. The dimensions can be up to 128 pixels by 128 pixels."
+                defaultMessage="Specify a .gif, .png, or .jpg file for your emoji. The file can be up to 512 KiB. The dimensions are resized automatically to 128 pixels by 128 pixels while maintaining the aspect ratio."
                 id="add_emoji.image.help"
               />
             </div>
@@ -376,7 +376,7 @@ exports[`components/emoji/components/AddEmoji should update emoji name and match
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Name your emoji. The name can be up to 64 characters, and can contain lowercase letters, numbers, and the symbols '-' and '_'."
+              defaultMessage="Specify an emoji name that's up to 64 characters. It can contain lowercase letters, numbers, and the symbols '-', '+' and '_'."
               id="add_emoji.name.help"
             />
           </div>
@@ -421,7 +421,7 @@ exports[`components/emoji/components/AddEmoji should update emoji name and match
               className="form__help"
             >
               <MemoizedFormattedMessage
-                defaultMessage="Specify a .gif, .png, or .jpg file of up to 64 KB for your emoji. The dimensions can be up to 128 pixels by 128 pixels."
+                defaultMessage="Specify a .gif, .png, or .jpg file for your emoji. The file can be up to 512 KiB. The dimensions are resized automatically to 128 pixels by 128 pixels while maintaining the aspect ratio."
                 id="add_emoji.image.help"
               />
             </div>
diff --git a/webapp/channels/src/components/emoji/add_emoji/add_emoji.tsx b/webapp/channels/src/components/emoji/add_emoji/add_emoji.tsx
index 788a72cd34b..ec5450b72ab 100644
--- a/webapp/channels/src/components/emoji/add_emoji/add_emoji.tsx
+++ b/webapp/channels/src/components/emoji/add_emoji/add_emoji.tsx
@@ -173,7 +173,7 @@ export default class AddEmoji extends React.PureComponent<AddEmojiProps, AddEmoj
                 error: (
                     <FormattedMessage
                         id='add_emoji.imageTooLarge'
-                        defaultMessage='Unable to create emoji. Image must be less than 1 MB in size.'
+                        defaultMessage='Unable to create emoji. Image must be less than 512 KiB in size.'
                     />
                 ),
             });
@@ -326,7 +326,7 @@ export default class AddEmoji extends React.PureComponent<AddEmojiProps, AddEmoj
                                 <div className='form__help'>
                                     <FormattedMessage
                                         id='add_emoji.name.help'
-                                        defaultMessage="Name your emoji. The name can be up to 64 characters, and can contain lowercase letters, numbers, and the symbols '-' and '_'."
+                                        defaultMessage="Specify an emoji name that's up to 64 characters. It can contain lowercase letters, numbers, and the symbols '-', '+' and '_'."
                                     />
                                 </div>
                             </div>
@@ -362,7 +362,7 @@ export default class AddEmoji extends React.PureComponent<AddEmojiProps, AddEmoj
                                     <div className='form__help'>
                                         <FormattedMessage
                                             id='add_emoji.image.help'
-                                            defaultMessage='Specify a .gif, .png, or .jpg file of up to 64 KB for your emoji. The dimensions can be up to 128 pixels by 128 pixels.'
+                                            defaultMessage='Specify a .gif, .png, or .jpg file for your emoji. The file can be up to 512 KiB. The dimensions are resized automatically to 128 pixels by 128 pixels while maintaining the aspect ratio.'
                                         />
                                     </div>
                                 </div>
diff --git a/webapp/channels/src/components/emoji_picker/components/emoji_picker_category_row.tsx b/webapp/channels/src/components/emoji_picker/components/emoji_picker_category_row.tsx
index fc758faeb58..9565b00dd16 100644
--- a/webapp/channels/src/components/emoji_picker/components/emoji_picker_category_row.tsx
+++ b/webapp/channels/src/components/emoji_picker/components/emoji_picker_category_row.tsx
@@ -7,7 +7,7 @@ import {FormattedMessage} from 'react-intl';
 
 import type {EmojiCategory} from '@mattermost/types/emojis';
 
-import {emojiCategories} from '../constants';
+import {EMOJI_CATEGORIES} from '../constants';
 
 interface Props {
     categoryName: EmojiCategory;
@@ -15,7 +15,7 @@ interface Props {
 }
 
 function EmojiPickerCategoryRow({categoryName, style}: Props) {
-    const category = emojiCategories[categoryName];
+    const category = EMOJI_CATEGORIES[categoryName];
 
     return (
         <div
diff --git a/webapp/channels/src/components/emoji_picker/constants/index.ts b/webapp/channels/src/components/emoji_picker/constants/index.ts
index b15f043547c..c2fc031c597 100644
--- a/webapp/channels/src/components/emoji_picker/constants/index.ts
+++ b/webapp/channels/src/components/emoji_picker/constants/index.ts
@@ -5,21 +5,19 @@ import {defineMessage} from 'react-intl';
 
 import type {EmojiCategory} from '@mattermost/types/emojis';
 
-import * as Emoji from 'utils/emoji';
+import type {Categories} from '../types';
 
-import type {Category, Categories} from '../types';
+export const RECENT: EmojiCategory = 'recent' as const;
+export const SEARCH_RESULTS: EmojiCategory = 'searchResults' as const;
+export const SMILEY_EMOTION: EmojiCategory = 'smileys-emotion' as const;
+export const CUSTOM: EmojiCategory = 'custom' as const;
 
-export const RECENT = 'recent';
-export const SEARCH_RESULTS = 'searchResults';
-export const SMILEY_EMOTION = 'smileys-emotion';
-export const CUSTOM = 'custom';
-
-export const emojiCategories = {
+export const EMOJI_CATEGORIES: Categories = {
     recent: {
         name: 'recent',
         label: defineMessage({
             id: 'emoji_picker.recent',
-            defaultMessage: 'Recent',
+            defaultMessage: 'Recently Used',
         }),
         iconClassName: 'icon-clock-outline',
     },
@@ -111,19 +109,15 @@ export const emojiCategories = {
         }),
         iconClassName: 'icon-emoticon-custom-outline',
     },
-} satisfies Record<EmojiCategory, Category>;
+} as const;
 
-export const RECENT_EMOJI_CATEGORY: Pick<Categories, 'recent'> = {recent: emojiCategories.recent};
-export const SEARCH_EMOJI_CATEGORY: Pick<Categories, typeof SEARCH_RESULTS> = {searchResults: emojiCategories.searchResults};
+const {recent, searchResults, ...standardCategories} = EMOJI_CATEGORIES;
 
-export const CATEGORIES: Categories = Emoji.CategoryNames.
-    filter((category) => !(category === 'recent' || category === 'searchResults')).
-    reduce((previousCategory, currentCategory) => {
-        return {
-            ...previousCategory,
-            [currentCategory]: emojiCategories[currentCategory as EmojiCategory],
-        };
-    }, {} as Categories);
+export const RECENT_EMOJI_CATEGORY: Pick<Categories, typeof RECENT> = {recent};
+export const SEARCH_EMOJI_CATEGORY: Pick<Categories, typeof SEARCH_RESULTS> = {searchResults};
+
+// TODO CATEGORIES doesn't contain 'recent' or 'searchResults' as it's type claims
+export const CATEGORIES = standardCategories as Categories;
 
 export const EMOJI_PER_ROW = 9; // needs to match variable `$emoji-per-row` in _variables.scss
 export const ITEM_HEIGHT = 36; //as per .emoji-picker__item height in _emoticons.scss
diff --git a/webapp/channels/src/components/emoji_picker/emoji_picker.test.tsx b/webapp/channels/src/components/emoji_picker/emoji_picker.test.tsx
index eb3c6fcc9c3..86fe9a42972 100644
--- a/webapp/channels/src/components/emoji_picker/emoji_picker.test.tsx
+++ b/webapp/channels/src/components/emoji_picker/emoji_picker.test.tsx
@@ -64,7 +64,7 @@ describe('components/emoji_picker/EmojiPicker', () => {
             <EmojiPicker {...props}/>,
         );
 
-        expect(screen.queryByLabelText('Recent')).not.toBeNull();
+        expect(screen.queryByLabelText('Recently Used')).not.toBeNull();
     });
 
     test('First emoji should be selected on search', () => {
diff --git a/webapp/channels/src/components/emoji_picker/types/index.ts b/webapp/channels/src/components/emoji_picker/types/index.ts
index 6be32984c80..bfe120e4690 100644
--- a/webapp/channels/src/components/emoji_picker/types/index.ts
+++ b/webapp/channels/src/components/emoji_picker/types/index.ts
@@ -18,6 +18,7 @@ export type Category = {
 };
 
 export type Categories = Record<EmojiCategory, Category>;
+export type ListedCategories = Omit<Categories, 'recent' | 'searchResults'> & Partial<Pick<Categories, 'recent'>>;
 
 export type CategoryOrEmojiRow = CategoryHeaderRow | EmojiRow;
 
diff --git a/webapp/channels/src/components/feature_restricted_modal/feature_restricted_modal.tsx b/webapp/channels/src/components/feature_restricted_modal/feature_restricted_modal.tsx
index b2c0ae4f3c2..19f2e4938cf 100644
--- a/webapp/channels/src/components/feature_restricted_modal/feature_restricted_modal.tsx
+++ b/webapp/channels/src/components/feature_restricted_modal/feature_restricted_modal.tsx
@@ -71,7 +71,7 @@ const FeatureRestrictedModal = ({
     const [notifyAdminBtnText, notifyAdmin, notifyRequestStatus] = useNotifyAdmin({
         ctaText: formatMessage({
             id: 'feature_restricted_modal.button.notify',
-            defaultMessage: 'Notify Admin',
+            defaultMessage: 'Notify admin',
         }),
     }, {
         required_feature: feature || '',
@@ -152,7 +152,7 @@ const FeatureRestrictedModal = ({
                     <p className='FeatureRestrictedModal__terms'>
                         <FormattedMessage
                             id='feature_restricted_modal.agreement'
-                            defaultMessage='By selecting <highlight>Try free for {trialLength} days</highlight>, I agree to the <linkEvaluation>Mattermost Software and Services License Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy>, and receiving product emails.'
+                            defaultMessage='By selecting <highlight>Try free for {trialLength} days</highlight>, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy>, and receiving product emails.'
                             values={{
                                 trialLength: FREEMIUM_TO_ENTERPRISE_TRIAL_LENGTH_DAYS,
                                 highlight: (msg: React.ReactNode) => (
diff --git a/webapp/channels/src/components/flag_message_modal/flag_post_modal.test.tsx b/webapp/channels/src/components/flag_message_modal/flag_post_modal.test.tsx
index a35e1568612..d5a576b280d 100644
--- a/webapp/channels/src/components/flag_message_modal/flag_post_modal.test.tsx
+++ b/webapp/channels/src/components/flag_message_modal/flag_post_modal.test.tsx
@@ -56,7 +56,7 @@ describe('components/FlagPostModal', () => {
             baseState,
         );
 
-        await userEvent.click(screen.getByText('Select a reason for flagging'));
+        await userEvent.click(screen.getByText('Select a reason'));
 
         expect(screen.getByText('Reason 1')).toBeVisible();
         expect(screen.getByText('Reason 2')).toBeVisible();
@@ -107,7 +107,7 @@ describe('components/FlagPostModal', () => {
         );
 
         // Select a reason
-        await userEvent.click(screen.getByText('Select a reason for flagging'));
+        await userEvent.click(screen.getByText('Select a reason'));
         await userEvent.click(screen.getByText('Reason 1'));
 
         // Add a comment
diff --git a/webapp/channels/src/components/flag_message_modal/flag_post_modal.tsx b/webapp/channels/src/components/flag_message_modal/flag_post_modal.tsx
index c64ca3c343b..7e59dd57219 100644
--- a/webapp/channels/src/components/flag_message_modal/flag_post_modal.tsx
+++ b/webapp/channels/src/components/flag_message_modal/flag_post_modal.tsx
@@ -54,11 +54,11 @@ export default function FlagPostModal({postId, onExited}: Props) {
     const [showCommentPreview, setShowCommentPreview] = React.useState<boolean>(false);
 
     const label = formatMessage({id: 'flag_message_modal.heading', defaultMessage: 'Flag message'});
-    const subHeading = formatMessage({id: 'flag_message_modal.subheading', defaultMessage: 'Flagged messages will be sent to Content Reviewers for review'});
+    const subHeading = formatMessage({id: 'flag_message_modal.subheading', defaultMessage: 'Flagged messages will be sent to Content Reviewers for review.'});
     const submitButtonText = formatMessage({id: 'generic.submit', defaultMessage: 'Submit'});
     const requiredCommentSectionTitle = formatMessage({id: 'flag_message_modal.required_comment.title', defaultMessage: 'Comment (required)'});
     const optionalCommentSectionTitle = formatMessage({id: 'flag_message_modal.optional_comment.title', defaultMessage: 'Comment (optional)'});
-    const reasonSelectPlaceholder = formatMessage({id: 'flag_message_modal.reason_select.placeholder', defaultMessage: 'Select a reason for flagging'});
+    const reasonSelectPlaceholder = formatMessage({id: 'flag_message_modal.reason_select.placeholder', defaultMessage: 'Select a reason'});
     const commentPlaceholder = formatMessage({id: 'flag_message_modal.comment.placeholder', defaultMessage: 'Describe your concern...'});
 
     const post = useSelector((state: GlobalState) => getPost(state, postId));
diff --git a/webapp/channels/src/components/forward_post_modal/index.tsx b/webapp/channels/src/components/forward_post_modal/index.tsx
index b0fc926e1f4..d2102c0207d 100644
--- a/webapp/channels/src/components/forward_post_modal/index.tsx
+++ b/webapp/channels/src/components/forward_post_modal/index.tsx
@@ -162,7 +162,6 @@ const ForwardPostModal = ({onExited, post}: Props) => {
                     defaultMessage='This message is from a private conversation and can only be shared with {participants}'
                     values={{
                         participants: <FormattedList value={participants}/>,
-                        strong: (x: React.ReactNode) => <strong>{x}</strong>,
                     }}
                 />
             );
diff --git a/webapp/channels/src/components/integrations/__snapshots__/abstract_command.test.tsx.snap b/webapp/channels/src/components/integrations/__snapshots__/abstract_command.test.tsx.snap
index d70e6f18bde..01878c0385a 100644
--- a/webapp/channels/src/components/integrations/__snapshots__/abstract_command.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/__snapshots__/abstract_command.test.tsx.snap
@@ -282,7 +282,7 @@ exports[`components/integrations/AbstractCommand should match snapshot 1`] = `
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="(Optional) Specify the name to use when posting responses for this slash command. Usernames can be up to 22 characters, and contain lowercase letters, numbers, and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, your Mattermost username is used."
+              defaultMessage="(Optional) Specify the name to use when posting responses for this slash command. Usernames can be up to 22 characters, and contain lowercase letters, numbers, and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, your Mattermost username is used."
               id="add_command.username.help"
             />
           </div>
@@ -765,7 +765,7 @@ exports[`components/integrations/AbstractCommand should match snapshot when head
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="(Optional) Specify the name to use when posting responses for this slash command. Usernames can be up to 22 characters, and contain lowercase letters, numbers, and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, your Mattermost username is used."
+              defaultMessage="(Optional) Specify the name to use when posting responses for this slash command. Usernames can be up to 22 characters, and contain lowercase letters, numbers, and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, your Mattermost username is used."
               id="add_command.username.help"
             />
           </div>
@@ -1243,7 +1243,7 @@ exports[`components/integrations/AbstractCommand should match snapshot, displays
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="(Optional) Specify the name to use when posting responses for this slash command. Usernames can be up to 22 characters, and contain lowercase letters, numbers, and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, your Mattermost username is used."
+              defaultMessage="(Optional) Specify the name to use when posting responses for this slash command. Usernames can be up to 22 characters, and contain lowercase letters, numbers, and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, your Mattermost username is used."
               id="add_command.username.help"
             />
           </div>
diff --git a/webapp/channels/src/components/integrations/__snapshots__/abstract_incoming_hook.test.tsx.snap b/webapp/channels/src/components/integrations/__snapshots__/abstract_incoming_hook.test.tsx.snap
index 4adfbfe6b3e..09935c5917a 100644
--- a/webapp/channels/src/components/integrations/__snapshots__/abstract_incoming_hook.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/__snapshots__/abstract_incoming_hook.test.tsx.snap
@@ -181,7 +181,7 @@ exports[`components/integrations/AbstractIncomingWebhook should call action func
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, the name specified by the webhook creator is used."
+              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, the name specified by the webhook creator is used."
               id="add_incoming_webhook.username.help"
             />
           </div>
@@ -446,7 +446,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot 1
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, the name specified by the webhook creator is used."
+              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, the name specified by the webhook creator is used."
               id="add_incoming_webhook.username.help"
             />
           </div>
@@ -711,7 +711,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot w
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, the name specified by the webhook creator is used."
+              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, the name specified by the webhook creator is used."
               id="add_incoming_webhook.username.help"
             />
           </div>
@@ -976,7 +976,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot,
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, the name specified by the webhook creator is used."
+              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, the name specified by the webhook creator is used."
               id="add_incoming_webhook.username.help"
             />
           </div>
@@ -1244,7 +1244,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot,
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, the name specified by the webhook creator is used."
+              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, the name specified by the webhook creator is used."
               id="add_incoming_webhook.username.help"
             />
           </div>
@@ -1708,7 +1708,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot,
             className="form__help"
           >
             <MemoizedFormattedMessage
-              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\\\\\"-\\\\\\", \\\\\\"_\\\\\\", and \\\\\\".\\\\\\". If left blank, the name specified by the webhook creator is used."
+              defaultMessage="Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \\"-\\", \\"_\\", and \\".\\". If left blank, the name specified by the webhook creator is used."
               id="add_incoming_webhook.username.help"
             />
           </div>
diff --git a/webapp/channels/src/components/integrations/__snapshots__/abstract_oauth_app.test.tsx.snap b/webapp/channels/src/components/integrations/__snapshots__/abstract_oauth_app.test.tsx.snap
index 0d17d874fc2..5960d3829cd 100644
--- a/webapp/channels/src/components/integrations/__snapshots__/abstract_oauth_app.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/__snapshots__/abstract_oauth_app.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`components/integrations/AbstractOAuthApp should match snapshot 1`] = `
       to="/test/integrations/oauth2-apps"
     >
       <MemoizedFormattedMessage
-        defaultMessage="Installed OAuth2 Apps"
+        defaultMessage="OAuth 2.0 Applications"
         id="installed_oauth_apps.header"
       />
     </Link>
@@ -375,7 +375,7 @@ exports[`components/integrations/AbstractOAuthApp should match snapshot, display
       to="/test/integrations/oauth2-apps"
     >
       <MemoizedFormattedMessage
-        defaultMessage="Installed OAuth2 Apps"
+        defaultMessage="OAuth 2.0 Applications"
         id="installed_oauth_apps.header"
       />
     </Link>
diff --git a/webapp/channels/src/components/integrations/abstract_command.tsx b/webapp/channels/src/components/integrations/abstract_command.tsx
index 1bb42993917..aea2ddf2a9f 100644
--- a/webapp/channels/src/components/integrations/abstract_command.tsx
+++ b/webapp/channels/src/components/integrations/abstract_command.tsx
@@ -609,7 +609,7 @@ export default class AbstractCommand extends React.PureComponent<Props, State> {
                                 <div className='form__help'>
                                     <FormattedMessage
                                         id='add_command.username.help'
-                                        defaultMessage='(Optional) Specify the name to use when posting responses for this slash command. Usernames can be up to 22 characters, and contain lowercase letters, numbers, and the symbols \"-\", \"_\", and \".\". If left blank, your Mattermost username is used.'
+                                        defaultMessage='(Optional) Specify the name to use when posting responses for this slash command. Usernames can be up to 22 characters, and contain lowercase letters, numbers, and the symbols "-", "_", and ".". If left blank, your Mattermost username is used.'
                                     />
                                 </div>
                             </div>
diff --git a/webapp/channels/src/components/integrations/abstract_incoming_webhook.tsx b/webapp/channels/src/components/integrations/abstract_incoming_webhook.tsx
index e0f60aebba5..91f07009caf 100644
--- a/webapp/channels/src/components/integrations/abstract_incoming_webhook.tsx
+++ b/webapp/channels/src/components/integrations/abstract_incoming_webhook.tsx
@@ -335,7 +335,7 @@ export default class AbstractIncomingWebhook extends PureComponent<Props, State>
                                     <div className='form__help'>
                                         <FormattedMessage
                                             id='add_incoming_webhook.username.help'
-                                            defaultMessage='Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \"-\", \"_\", and \".\". If left blank, the name specified by the webhook creator is used.'
+                                            defaultMessage='Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols "-", "_", and ".". If left blank, the name specified by the webhook creator is used.'
                                         />
                                     </div>
                                 </div>
diff --git a/webapp/channels/src/components/integrations/abstract_oauth_app.tsx b/webapp/channels/src/components/integrations/abstract_oauth_app.tsx
index 19c89ceda0d..7dffb62f745 100644
--- a/webapp/channels/src/components/integrations/abstract_oauth_app.tsx
+++ b/webapp/channels/src/components/integrations/abstract_oauth_app.tsx
@@ -375,7 +375,7 @@ export default class AbstractOAuthApp extends React.PureComponent<Props, State>
                     <Link to={`/${this.props.team.name}/integrations/oauth2-apps`}>
                         <FormattedMessage
                             id='installed_oauth_apps.header'
-                            defaultMessage='Installed OAuth2 Apps'
+                            defaultMessage='OAuth 2.0 Applications'
                         />
                     </Link>
                     <FormattedMessage
diff --git a/webapp/channels/src/components/integrations/abstract_outgoing_webhook.tsx b/webapp/channels/src/components/integrations/abstract_outgoing_webhook.tsx
index 72db32fcb8f..30c9f81c493 100644
--- a/webapp/channels/src/components/integrations/abstract_outgoing_webhook.tsx
+++ b/webapp/channels/src/components/integrations/abstract_outgoing_webhook.tsx
@@ -541,7 +541,7 @@ export default class AbstractOutgoingWebhook extends React.PureComponent<Props,
                                     <div className='form__help'>
                                         <FormattedMessage
                                             id='add_outgoing_webhook.username.help'
-                                            defaultMessage='Specify the username this integration will post as. Usernames can be up to 22 characters, and contain lowercase letters, numbers and the symbols \"-\", \"_\", and \".\". If left blank, the name specified by the webhook creator is used.'
+                                            defaultMessage='Specify the username this integration will post as. Usernames can be up to 22 characters, and contain lowercase letters, numbers and the symbols "-", "_", and ".". If left blank, the name specified by the webhook creator is used.'
                                         />
                                     </div>
                                 </div>
diff --git a/webapp/channels/src/components/integrations/add_command/add_command.tsx b/webapp/channels/src/components/integrations/add_command/add_command.tsx
index c268b4c695e..756dd970779 100644
--- a/webapp/channels/src/components/integrations/add_command/add_command.tsx
+++ b/webapp/channels/src/components/integrations/add_command/add_command.tsx
@@ -3,7 +3,6 @@
 
 import React, {useState} from 'react';
 import {useIntl} from 'react-intl';
-import type {MessageDescriptor} from 'react-intl';
 import {useHistory} from 'react-router-dom';
 
 import type {Command} from '@mattermost/types/integrations';
@@ -32,9 +31,9 @@ export type Props = {
 const AddCommand = ({team, actions}: Props) => {
     const history = useHistory();
     const {formatMessage} = useIntl();
-    const headerMessage = formatMessage({id: ('integrations.add'), defaultMessage: 'Add'}) as MessageDescriptor;
-    const footerMessage = formatMessage({id: ('add_command.save'), defaultMessage: 'Save'}) as MessageDescriptor;
-    const loadingMessage = formatMessage({id: ('add_command.saving'), defaultMessage: 'Saving...'}) as MessageDescriptor;
+    const headerMessage = formatMessage({id: 'integrations.add', defaultMessage: 'Add'});
+    const footerMessage = formatMessage({id: 'add_command.save', defaultMessage: 'Save'});
+    const loadingMessage = formatMessage({id: 'add_command.saving', defaultMessage: 'Saving...'});
     const [serverError, setServerError] = useState('');
 
     const addCommand = async (command: Command) => {
diff --git a/webapp/channels/src/components/integrations/bots/bots.tsx b/webapp/channels/src/components/integrations/bots/bots.tsx
index 340bed7305b..298e518d0e6 100644
--- a/webapp/channels/src/components/integrations/bots/bots.tsx
+++ b/webapp/channels/src/components/integrations/bots/bots.tsx
@@ -237,6 +237,7 @@ export default class Bots extends React.PureComponent<Props, State> {
                 emptyTextSearch={
                     <FormattedMessage
                         id='bots.emptySearch'
+                        // eslint-disable-next-line formatjs/enforce-placeholders -- searchTerm provided by BackstageList
                         defaultMessage='No bot accounts match <b>{searchTerm}</b>'
                         values={{
                             b: (chunks) => <b>{chunks}</b>,
diff --git a/webapp/channels/src/components/integrations/confirm_integration/__snapshots__/confirm_integration.test.tsx.snap b/webapp/channels/src/components/integrations/confirm_integration/__snapshots__/confirm_integration.test.tsx.snap
index aa8c2e94236..8ba93d23cd9 100644
--- a/webapp/channels/src/components/integrations/confirm_integration/__snapshots__/confirm_integration.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/confirm_integration/__snapshots__/confirm_integration.test.tsx.snap
@@ -206,7 +206,7 @@ exports[`components/integrations/ConfirmIntegration should match snapshot, oauth
       key="add_oauth_app.doneHelp"
     >
       <MemoizedFormattedMessage
-        defaultMessage="Your OAuth 2.0 application is set up. Please use the following Client ID and Client Secret when requesting authorization for your application (details at <link>oAuth 2 Applications</link>)."
+        defaultMessage="Your OAuth 2.0 application is set up. Please use the following Client ID and Client Secret when requesting authorization for your application (details at <link>oAuth 2.0 Applications</link>)."
         id="add_oauth_app.doneHelp"
         values={
           Object {
@@ -399,7 +399,7 @@ exports[`components/integrations/ConfirmIntegration should match snapshot, outgo
       to="/team_test/integrations/outgoing-oauth2-connections"
     >
       <MemoizedFormattedMessage
-        defaultMessage="Outgoing OAuth 2.0 Connections"
+        defaultMessage="Outgoing OAuth Connections"
         id="installed_outgoing_oauth_connections.header"
       />
     </Link>
@@ -450,12 +450,11 @@ exports[`components/integrations/ConfirmIntegration should match snapshot, outgo
       />
       <br />
       <MemoizedFormattedMessage
-        defaultMessage="<b>Client Secret</b>: \\\\*\\\\*\\\\*\\\\*\\\\*\\\\*\\\\*\\\\*"
+        defaultMessage="<b>Client Secret</b>: ********"
         id="add_outgoing_oauth_connection.clientSecret"
         values={
           Object {
             "b": [Function],
-            "secret": "",
           }
         }
       />
diff --git a/webapp/channels/src/components/integrations/confirm_integration/confirm_integration.tsx b/webapp/channels/src/components/integrations/confirm_integration/confirm_integration.tsx
index c16dc464c5b..50b62119903 100644
--- a/webapp/channels/src/components/integrations/confirm_integration/confirm_integration.tsx
+++ b/webapp/channels/src/components/integrations/confirm_integration/confirm_integration.tsx
@@ -208,7 +208,7 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
                 <p key='add_oauth_app.doneHelp'>
                     <FormattedMessage
                         id='add_oauth_app.doneHelp.public'
-                        defaultMessage='Your OAuth 2.0 public client application is set up. Please use the following Client ID when requesting authorization for your application. Public clients must use PKCE for authorization (details at <link>oAuth 2 Applications</link>).'
+                        defaultMessage='Your OAuth 2.0 public client application is set up. Please use the following Client ID when requesting authorization for your application. Public clients must use PKCE for authorization (details at <link>oAuth 2.0 Applications</link>).'
                         values={{
                             link: (msg) => (
                                 <ExternalLink
@@ -227,7 +227,7 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
                 <p key='add_oauth_app.doneHelp'>
                     <FormattedMessage
                         id='add_oauth_app.doneHelp'
-                        defaultMessage='Your OAuth 2.0 application is set up. Please use the following Client ID and Client Secret when requesting authorization for your application (details at <link>oAuth 2 Applications</link>).'
+                        defaultMessage='Your OAuth 2.0 application is set up. Please use the following Client ID and Client Secret when requesting authorization for your application (details at <link>oAuth 2.0 Applications</link>).'
                         values={{
                             link: (msg) => (
                                 <ExternalLink
@@ -300,14 +300,13 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
         );
     } else if (type === Constants.Integrations.OUTGOING_OAUTH_CONNECTIONS && outgoingOAuthConnection) {
         const clientId = outgoingOAuthConnection.client_id;
-        const clientSecret = outgoingOAuthConnection.client_secret;
         const username = outgoingOAuthConnection.credentials_username;
         const password = outgoingOAuthConnection.credentials_password;
 
         headerText = (
             <FormattedMessage
                 id='installed_outgoing_oauth_connections.header'
-                defaultMessage='Outgoing OAuth 2.0 Connections'
+                defaultMessage='Outgoing OAuth Connections'
             />
         );
 
@@ -343,9 +342,8 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
                 <br/>
                 <FormattedMessage
                     id='add_outgoing_oauth_connection.clientSecret'
-                    defaultMessage='<b>Client Secret</b>: \*\*\*\*\*\*\*\*'
+                    defaultMessage='<b>Client Secret</b>: ********'
                     values={{
-                        secret: clientSecret,
                         b: (chunks) => <b>{chunks}</b>,
                     }}
                 />
@@ -417,10 +415,10 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
             <p>
                 <FormattedMessage
                     id='bots.manage.created.text'
-                    defaultMessage='Your bot account **{botname}** has been created successfully. Please use the following access token to connect to the bot (see [documentation](https://mattermost.com/pl/default-bot-accounts) for further details).'
+                    defaultMessage='Your bot account <strong>{botname}</strong> has been created successfully. Please use the following access token to connect to the bot (see <link>documentation</link> for further details).'
                     values={{
                         botname: bot.display_name || bot.username,
-                        b: (msg) => <b>{msg}</b>,
+                        strong: (msg) => <b>{msg}</b>,
                         link: (msg) => (
                             <ExternalLink
                                 href='https://mattermost.com/pl/default-bot-accounts'
diff --git a/webapp/channels/src/components/integrations/installed_commands/installed_commands.tsx b/webapp/channels/src/components/integrations/installed_commands/installed_commands.tsx
index 18342f91d83..163e212f2e6 100644
--- a/webapp/channels/src/components/integrations/installed_commands/installed_commands.tsx
+++ b/webapp/channels/src/components/integrations/installed_commands/installed_commands.tsx
@@ -88,7 +88,7 @@ export default class InstalledCommands extends React.PureComponent<Props> {
                 header={
                     <FormattedMessage
                         id='installed_commands.header'
-                        defaultMessage='Installed Slash Commands'
+                        defaultMessage='Slash Commands'
                     />
                 }
                 addText={
@@ -102,12 +102,13 @@ export default class InstalledCommands extends React.PureComponent<Props> {
                 emptyText={
                     <FormattedMessage
                         id='installed_commands.empty'
-                        defaultMessage='No slash commands found'
+                        defaultMessage='No commands found'
                     />
                 }
                 emptyTextSearch={
                     <FormattedMessage
                         id='installed_commands.search.empty'
+                        // eslint-disable-next-line formatjs/enforce-placeholders -- searchTerm provided by BackstageList
                         defaultMessage='No slash commands match <b>{searchTerm}</b>'
                         values={{
                             b: (chunks) => <b>{chunks}</b>,
diff --git a/webapp/channels/src/components/integrations/installed_incoming_webhooks/installed_incoming_webhooks.tsx b/webapp/channels/src/components/integrations/installed_incoming_webhooks/installed_incoming_webhooks.tsx
index e4b329835b3..137c3cb57e5 100644
--- a/webapp/channels/src/components/integrations/installed_incoming_webhooks/installed_incoming_webhooks.tsx
+++ b/webapp/channels/src/components/integrations/installed_incoming_webhooks/installed_incoming_webhooks.tsx
@@ -124,7 +124,7 @@ export default class InstalledIncomingWebhooks extends React.PureComponent<Props
                 header={
                     <FormattedMessage
                         id='installed_incoming_webhooks.header'
-                        defaultMessage='Installed Incoming Webhooks'
+                        defaultMessage='Incoming Webhooks'
                     />
                 }
                 addText={
@@ -144,7 +144,11 @@ export default class InstalledIncomingWebhooks extends React.PureComponent<Props
                 emptyTextSearch={
                     <FormattedMessage
                         id='installed_incoming_webhooks.emptySearch'
-                        defaultMessage='No incoming webhooks match {searchTerm}'
+                        // eslint-disable-next-line formatjs/enforce-placeholders -- searchTerm provided by BackstageList
+                        defaultMessage='No incoming webhooks match <strong>{searchTerm}</strong>'
+                        values={{
+                            strong: (chunks) => <strong>{chunks}</strong>,
+                        }}
                     />
                 }
                 helpText={
diff --git a/webapp/channels/src/components/integrations/installed_oauth_apps/__snapshots__/installed_oauth_apps.test.tsx.snap b/webapp/channels/src/components/integrations/installed_oauth_apps/__snapshots__/installed_oauth_apps.test.tsx.snap
index c4c70f1f908..9254d5ae4ca 100644
--- a/webapp/channels/src/components/integrations/installed_oauth_apps/__snapshots__/installed_oauth_apps.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/installed_oauth_apps/__snapshots__/installed_oauth_apps.test.tsx.snap
@@ -13,8 +13,13 @@ exports[`components/integrations/InstalledOAuthApps should match snapshot 1`] =
   }
   emptyTextSearch={
     <Memo(MemoizedFormattedMessage)
-      defaultMessage="No OAuth 2.0 Applications match {searchTerm}"
+      defaultMessage="No OAuth 2.0 Applications match <strong>{searchTerm}</strong>"
       id="installed_oauth_apps.emptySearch"
+      values={
+        Object {
+          "strong": [Function],
+        }
+      }
     />
   }
   header={
diff --git a/webapp/channels/src/components/integrations/installed_oauth_apps/installed_oauth_apps.tsx b/webapp/channels/src/components/integrations/installed_oauth_apps/installed_oauth_apps.tsx
index 37c117e25ee..137229490dc 100644
--- a/webapp/channels/src/components/integrations/installed_oauth_apps/installed_oauth_apps.tsx
+++ b/webapp/channels/src/components/integrations/installed_oauth_apps/installed_oauth_apps.tsx
@@ -184,7 +184,13 @@ export default class InstalledOAuthApps extends React.PureComponent<Props, State
                 emptyTextSearch={
                     <FormattedMessage
                         id='installed_oauth_apps.emptySearch'
-                        defaultMessage='No OAuth 2.0 Applications match {searchTerm}'
+
+                        // searchTerm injected internally
+                        // eslint-disable-next-line formatjs/enforce-placeholders
+                        defaultMessage='No OAuth 2.0 Applications match <strong>{searchTerm}</strong>'
+                        values={{
+                            strong: (chunks) => <strong>{chunks}</strong>,
+                        }}
                     />
                 }
                 searchPlaceholder={localizeMessage({id: 'installed_oauth_apps.search', defaultMessage: 'Search OAuth 2.0 Applications'})}
diff --git a/webapp/channels/src/components/integrations/installed_outgoing_webhooks/__snapshots__/installed_outgoing_webhooks.test.tsx.snap b/webapp/channels/src/components/integrations/installed_outgoing_webhooks/__snapshots__/installed_outgoing_webhooks.test.tsx.snap
index b44d149ed3d..be857981ef4 100644
--- a/webapp/channels/src/components/integrations/installed_outgoing_webhooks/__snapshots__/installed_outgoing_webhooks.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/installed_outgoing_webhooks/__snapshots__/installed_outgoing_webhooks.test.tsx.snap
@@ -252,7 +252,7 @@ exports[`components/integrations/InstalledOutgoingWebhooks should match snapshot
   }
   header={
     <Memo(MemoizedFormattedMessage)
-      defaultMessage="Installed Outgoing Webhooks"
+      defaultMessage="Outgoing Webhooks"
       id="installed_outgoing_webhooks.header"
     />
   }
diff --git a/webapp/channels/src/components/integrations/installed_outgoing_webhooks/installed_outgoing_webhooks.tsx b/webapp/channels/src/components/integrations/installed_outgoing_webhooks/installed_outgoing_webhooks.tsx
index 38fee6525ae..0da6ca38461 100644
--- a/webapp/channels/src/components/integrations/installed_outgoing_webhooks/installed_outgoing_webhooks.tsx
+++ b/webapp/channels/src/components/integrations/installed_outgoing_webhooks/installed_outgoing_webhooks.tsx
@@ -162,7 +162,7 @@ export default class InstalledOutgoingWebhooks extends React.PureComponent<Props
                 header={
                     <FormattedMessage
                         id='installed_outgoing_webhooks.header'
-                        defaultMessage='Installed Outgoing Webhooks'
+                        defaultMessage='Outgoing Webhooks'
                     />
                 }
                 addText={
@@ -186,6 +186,9 @@ export default class InstalledOutgoingWebhooks extends React.PureComponent<Props
                 emptyTextSearch={
                     <FormattedMessage
                         id='installed_outgoing_webhooks.search.empty'
+
+                        // searchTerm provided by BackstageList
+                        // eslint-disable-next-line formatjs/enforce-placeholders
                         defaultMessage='No outgoing webhooks match <b>{searchTerm}</b>'
                         values={{
                             b: (chunks) => <b>{chunks}</b>,
diff --git a/webapp/channels/src/components/integrations/integrations.tsx b/webapp/channels/src/components/integrations/integrations.tsx
index e9e6ee6876f..910feff65ed 100644
--- a/webapp/channels/src/components/integrations/integrations.tsx
+++ b/webapp/channels/src/components/integrations/integrations.tsx
@@ -120,7 +120,7 @@ export default class Integrations extends React.PureComponent <Props> {
                         description={
                             <FormattedMessage
                                 id='integrations.command.description'
-                                defaultMessage='Slash commands send events to an external integration'
+                                defaultMessage='Slash commands send events to external integrations'
                             />
                         }
                         link={'/' + this.props.team.name + '/integrations/commands'}
@@ -147,7 +147,7 @@ export default class Integrations extends React.PureComponent <Props> {
                         description={
                             <FormattedMessage
                                 id='integrations.oauthApps.description'
-                                defaultMessage='Auth 2.0 allows external applications to make authorized requests to the Mattermost API'
+                                defaultMessage='OAuth 2.0 allows external applications to make authorized requests to the Mattermost API'
                             />
                         }
                         link={'/' + this.props.team.name + '/integrations/oauth2-apps'}
diff --git a/webapp/channels/src/components/integrations/outgoing_oauth_connections/installed_outgoing_oauth_connections.tsx b/webapp/channels/src/components/integrations/outgoing_oauth_connections/installed_outgoing_oauth_connections.tsx
index 6f6781446ab..86eaa6486e3 100644
--- a/webapp/channels/src/components/integrations/outgoing_oauth_connections/installed_outgoing_oauth_connections.tsx
+++ b/webapp/channels/src/components/integrations/outgoing_oauth_connections/installed_outgoing_oauth_connections.tsx
@@ -131,6 +131,7 @@ const InstalledOutgoingOAuthConnections = (props: Props) => {
             emptyTextSearch={
                 <FormattedMessage
                     id='installed_outgoing_oauth_connections.emptySearch'
+                    // eslint-disable-next-line formatjs/enforce-placeholders -- searchTerm provided by BackstageList
                     defaultMessage='No Outgoing OAuth Connections match {searchTerm}'
                 />
             }
diff --git a/webapp/channels/src/components/interactive_dialog/interactive_dialog.tsx b/webapp/channels/src/components/interactive_dialog/interactive_dialog.tsx
index 3b294d0de4e..b63c7bffbcf 100644
--- a/webapp/channels/src/components/interactive_dialog/interactive_dialog.tsx
+++ b/webapp/channels/src/components/interactive_dialog/interactive_dialog.tsx
@@ -74,8 +74,7 @@ export default class InteractiveDialog extends React.PureComponent<Props, State>
                 if (error) {
                     errors[elem.name] = (
                         <FormattedMessage
-                            id={error.id}
-                            defaultMessage={error.defaultMessage}
+                            {...error}
                             values={error.values}
                         />
                     );
diff --git a/webapp/channels/src/components/intl_provider/intl_provider.tsx b/webapp/channels/src/components/intl_provider/intl_provider.tsx
index 9f8ec2b3c29..0d040a981a2 100644
--- a/webapp/channels/src/components/intl_provider/intl_provider.tsx
+++ b/webapp/channels/src/components/intl_provider/intl_provider.tsx
@@ -1,15 +1,16 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {useEffect} from 'react';
 import type {ReactNode} from 'react';
-import {IntlProvider as BaseIntlProvider} from 'react-intl';
+import {IntlProvider as BaseIntlProvider, useIntl} from 'react-intl';
 import type {IntlConfig} from 'react-intl';
 
 import {Client4} from 'mattermost-redux/client';
 import {setLocalizeFunction} from 'mattermost-redux/utils/i18n_utils';
 
 import * as I18n from 'i18n/i18n';
+import {setIntl} from 'utils/i18n';
 import {localizeMessage} from 'utils/utils';
 
 type Props = {
@@ -21,6 +22,20 @@ type Props = {
     };
 };
 
+/**
+ * Captures the intl instance from BaseIntlProvider and stores it
+ * so that getIntl() can return the same instance.
+ */
+function IntlCapture() {
+    const intl = useIntl();
+
+    useEffect(() => {
+        setIntl(intl);
+    }, [intl]);
+
+    return null;
+}
+
 export default class IntlProvider extends React.PureComponent<Props> {
     componentDidMount() {
         // Pass localization function back to mattermost-redux
@@ -68,6 +83,7 @@ export default class IntlProvider extends React.PureComponent<Props> {
                 textComponent='span'
                 wrapRichTextChunksInFragment={false}
             >
+                <IntlCapture/>
                 {this.props.children}
             </BaseIntlProvider>
         );
diff --git a/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts.ts b/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts.ts
index 65f4d0c4108..d093716cf0f 100644
--- a/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts.ts
+++ b/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts.ts
@@ -316,21 +316,21 @@ export const KEYBOARD_SHORTCUTS = {
     msgMarkdownCode: defineMessages({
         default: {
             id: 'shortcuts.msgs.markdown.code',
-            defaultMessage: 'Code',
+            defaultMessage: 'Code:\tCtrl|Alt|C',
         },
         mac: {
             id: 'shortcuts.msgs.markdown.code.mac',
-            defaultMessage: 'Code',
+            defaultMessage: 'Code:\t⌘|⌥|C',
         },
     }),
     msgMarkdownStrike: defineMessages({
         default: {
             id: 'shortcuts.msgs.markdown.strike',
-            defaultMessage: 'Strikethrough:\tCtrl|Shift|X',
+            defaultMessage: 'Strikethrough:\tShift|Alt|X',
         },
         mac: {
             id: 'shortcuts.msgs.markdown.strike.mac',
-            defaultMessage: 'Strikethrough:\t⌘|Shift|X',
+            defaultMessage: 'Strikethrough:\tShift|⌥|X',
         },
     }),
     msgMarkdownH3: defineMessages({
@@ -346,31 +346,31 @@ export const KEYBOARD_SHORTCUTS = {
     msgMarkdownQuote: defineMessages({
         default: {
             id: 'shortcuts.msgs.markdown.quote',
-            defaultMessage: 'Quote',
+            defaultMessage: 'Quote:\tShift|Alt|9',
         },
         mac: {
             id: 'shortcuts.msgs.markdown.quote.mac',
-            defaultMessage: 'Quote',
+            defaultMessage: 'Quote:\tShift|⌥|9',
         },
     }),
     msgMarkdownOl: defineMessages({
         default: {
             id: 'shortcuts.msgs.markdown.ordered',
-            defaultMessage: 'Numbered List',
+            defaultMessage: 'Numbered List:\tShift|Alt|7',
         },
         mac: {
             id: 'shortcuts.msgs.markdown.ordered.mac',
-            defaultMessage: 'Numbered List',
+            defaultMessage: 'Numbered List:\tShift|⌥|7',
         },
     }),
     msgMarkdownUl: defineMessages({
         default: {
             id: 'shortcuts.msgs.markdown.unordered',
-            defaultMessage: 'Bulleted List',
+            defaultMessage: 'Bulleted List\tShift|Alt|8',
         },
         mac: {
             id: 'shortcuts.msgs.markdown.unordered.mac',
-            defaultMessage: 'Bulleted List',
+            defaultMessage: 'Bulleted List:\tShift|⌥|8',
         },
     }),
     msgShowFormatting: defineMessages({
@@ -396,11 +396,11 @@ export const KEYBOARD_SHORTCUTS = {
     msgShowEmojiPicker: defineMessages({
         default: {
             id: 'shortcuts.msgs.markdown.emoji',
-            defaultMessage: 'Emoji / Gif picker:\tCtrl|Shift|E',
+            defaultMessage: 'Emoji / Gif picker:\tCtrl|Alt|E',
         },
         mac: {
             id: 'shortcuts.msgs.markdown.emoji.mac',
-            defaultMessage: 'Emoji / Gif picker:\t⌘|Shift|E',
+            defaultMessage: 'Emoji / Gif picker:\t⌘|⌥|E',
         },
     }),
     msgMarkdownPreview: defineMessages({
@@ -410,7 +410,7 @@ export const KEYBOARD_SHORTCUTS = {
         },
         mac: {
             id: 'shortcuts.msgs.markdown.preview.mac',
-            defaultMessage: 'Show/Hide Preview:\t⌘|Shift|P',
+            defaultMessage: 'Show/Hide Preview:\t⌘|⌥|P',
         },
     }),
     msgMarkdownItalic: defineMessages({
diff --git a/webapp/channels/src/components/latex_block/latex_block.tsx b/webapp/channels/src/components/latex_block/latex_block.tsx
index 836f70ee74e..f1cd8fd5025 100644
--- a/webapp/channels/src/components/latex_block/latex_block.tsx
+++ b/webapp/channels/src/components/latex_block/latex_block.tsx
@@ -62,7 +62,7 @@ const LatexBlock = ({
             >
                 <FormattedMessage
                     id='katex.error'
-                    defaultMessage={'Couldn\'t compile your Latex code. Please review the syntax and try again.'}
+                    defaultMessage="Couldn't compile your Latex code. Please review the syntax and try again."
                 />
             </div>
         );
diff --git a/webapp/channels/src/components/latex_inline/latex_inline.tsx b/webapp/channels/src/components/latex_inline/latex_inline.tsx
index 7ed814a49bb..305aa8d742e 100644
--- a/webapp/channels/src/components/latex_inline/latex_inline.tsx
+++ b/webapp/channels/src/components/latex_inline/latex_inline.tsx
@@ -58,7 +58,7 @@ const LatexInline = ({content, enableInlineLatex}: Props) => {
             >
                 <FormattedMessage
                     id='katex.error'
-                    defaultMessage='Could not compile your Latex code. Please review the syntax and try again.'
+                    defaultMessage="Couldn't compile your Latex code. Please review the syntax and try again."
                 />
             </span>
         );
diff --git a/webapp/channels/src/components/leave_team_modal/leave_team_modal.tsx b/webapp/channels/src/components/leave_team_modal/leave_team_modal.tsx
index ebacb84f66a..50f4dd8cfb3 100644
--- a/webapp/channels/src/components/leave_team_modal/leave_team_modal.tsx
+++ b/webapp/channels/src/components/leave_team_modal/leave_team_modal.tsx
@@ -83,7 +83,7 @@ export default class LeaveTeamModal extends React.PureComponent<Props, State> {
                 modalMessage = (
                     <FormattedMessage
                         id='leave_team_modal_guest.description'
-                        defaultMessage='<strong>You will be removed from {num_of_public_channels} public {num_of_public_channels,plural,one {channel} other {channels}} and {num_of_private_channels} private {num_of_private_channels,plural,one {channel} other {channels}} on this team.</strong> You won&apos;t be able to rejoin it without an invitation from another team member. Are you sure?'
+                        defaultMessage="<strong>You will be removed from {num_of_public_channels} public {num_of_public_channels,plural,one {channel} other {channels}} and {num_of_private_channels} private {num_of_private_channels,plural,one {channel} other {channels}} on this team.</strong> You won't be able to rejoin it without an invitation from another team member. Are you sure?"
                         values={{
                             num_of_public_channels: numOfPublicChannels,
                             num_of_private_channels: numOfPrivateChannels,
@@ -95,7 +95,7 @@ export default class LeaveTeamModal extends React.PureComponent<Props, State> {
                 modalMessage = (
                     <FormattedMessage
                         id='leave_team_modal_guest_only_private.description'
-                        defaultMessage='<strong>You will be removed from {num_of_private_channels} private {num_of_private_channels,plural,one {channel} other {channels}} on this team.</strong> You won&apos;t be able to rejoin it without an invitation from another team member. Are you sure?'
+                        defaultMessage="<strong>You will be removed from {num_of_private_channels} private {num_of_private_channels,plural,one {channel} other {channels}} on this team.</strong> You won't be able to rejoin it without an invitation from another team member. Are you sure?"
                         values={{
                             num_of_private_channels: numOfPrivateChannels,
                             strong: (chunks: React.ReactNode) => <strong>{chunks}</strong>,
@@ -106,7 +106,7 @@ export default class LeaveTeamModal extends React.PureComponent<Props, State> {
                 modalMessage = (
                     <FormattedMessage
                         id='leave_team_modal_guest_only_public.description'
-                        defaultMessage='<strong>You will be removed from {num_of_public_channels} public {num_of_public_channels,plural,one {channel} other {channels}} on this team.</strong> You won&apos;t be able to rejoin it without an invitation from another team member. Are you sure?'
+                        defaultMessage="<strong>You will be removed from {num_of_public_channels} public {num_of_public_channels,plural,one {channel} other {channels}} on this team.</strong> You won't be able to rejoin it without an invitation from another team member. Are you sure?"
                         values={{
                             num_of_public_channels: numOfPublicChannels,
                             strong: (chunks: React.ReactNode) => <strong>{chunks}</strong>,
@@ -118,7 +118,7 @@ export default class LeaveTeamModal extends React.PureComponent<Props, State> {
             modalMessage = (
                 <FormattedMessage
                     id='leave_team_modal.description'
-                    defaultMessage='<strong>You will be removed from {num_of_public_channels} public {num_of_public_channels,plural,one {channel} other {channels}} and {num_of_private_channels} private {num_of_private_channels,plural,one {channel} other {channels}} on this team.</strong> If the team is private you won&apos;t be able to rejoin it without an invitation from another team member. Are you sure?'
+                    defaultMessage="<strong>You will be removed from {num_of_public_channels} public {num_of_public_channels,plural,one {channel} other {channels}} and {num_of_private_channels} private {num_of_private_channels,plural,one {channel} other {channels}} on this team.</strong> If the team is private you won't be able to rejoin it without an invitation from another team member. Are you sure?"
                     values={{
                         num_of_public_channels: numOfPublicChannels,
                         num_of_private_channels: numOfPrivateChannels,
@@ -130,7 +130,7 @@ export default class LeaveTeamModal extends React.PureComponent<Props, State> {
             modalMessage = (
                 <FormattedMessage
                     id='leave_team_modal_private.description'
-                    defaultMessage='<strong>You will be removed from {num_of_private_channels} private {num_of_private_channels,plural,one {channel} other {channels}} on this team.</strong> If the team is private you won&apos;t be able to rejoin it without an invitation from another team member. Are you sure?'
+                    defaultMessage="<strong>You will be removed from {num_of_private_channels} private {num_of_private_channels,plural,one {channel} other {channels}} on this team.</strong> If the team is private you won't be able to rejoin it without an invitation from another team member. Are you sure?"
                     values={{
                         num_of_private_channels: numOfPrivateChannels,
                         strong: (chunks: React.ReactNode) => <strong>{chunks}</strong>,
diff --git a/webapp/channels/src/components/login/__snapshots__/login_mfa.test.tsx.snap b/webapp/channels/src/components/login/__snapshots__/login_mfa.test.tsx.snap
index e24bd985b0c..0ba11e87079 100644
--- a/webapp/channels/src/components/login/__snapshots__/login_mfa.test.tsx.snap
+++ b/webapp/channels/src/components/login/__snapshots__/login_mfa.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`components/login/LoginMfa should match snapshot 1`] = `
         inputSize="large"
         name="token"
         onChange={[Function]}
-        placeholder="Enter MFA Token"
+        placeholder="MFA Token"
         type="text"
         value=""
       />
diff --git a/webapp/channels/src/components/login/login.tsx b/webapp/channels/src/components/login/login.tsx
index 54477b96c89..f44c9185e01 100644
--- a/webapp/channels/src/components/login/login.tsx
+++ b/webapp/channels/src/components/login/login.tsx
@@ -48,7 +48,6 @@ import PasswordInput from 'components/widgets/inputs/password_input/password_inp
 import Constants from 'utils/constants';
 import DesktopApp from 'utils/desktop_api';
 import {isEmbedded} from 'utils/embed';
-import {t} from 'utils/i18n';
 import {DesktopNotificationSounds} from 'utils/notification_sounds';
 import {showNotification} from 'utils/notifications';
 import {isDesktopApp} from 'utils/user_agent';
@@ -372,7 +371,7 @@ const Login = ({onCustomizeHeader}: LoginProps) => {
                 mode = 'danger';
                 title = formatMessage({
                     id: 'login.get_terms_error',
-                    defaultMessage: 'Unable to load terms of service. If this issue persists, contact your System Administrator.',
+                    defaultMessage: 'Unable to load terms of use. If this issue persists, contact your System Administrator.',
                 });
                 break;
 
@@ -610,33 +609,42 @@ const Login = ({onCustomizeHeader}: LoginProps) => {
         currentLoginId = currentLoginId.trim().toLowerCase();
 
         if (!currentLoginId) {
-            t('login.noEmail');
-            t('login.noEmailLdapUsername');
-            t('login.noEmailUsername');
-            t('login.noEmailUsernameLdapUsername');
-            t('login.noLdapUsername');
-            t('login.noUsername');
-            t('login.noUsernameLdapUsername');
+            const ldapUsername = LdapLoginFieldName || formatMessage({id: 'login.ldapUsernameLower', defaultMessage: 'AD/LDAP username'});
 
-            // it's slightly weird to be constructing the message ID, but it's a bit nicer than triply nested if statements
-            let msgId = 'login.no';
-            if (enableSignInWithEmail) {
-                msgId += 'Email';
-            }
-            if (enableSignInWithUsername) {
-                msgId += 'Username';
-            }
-            if (ldapEnabled) {
-                msgId += 'LdapUsername';
+            let title;
+
+            // 3 methods, 2 methods, 1 method - Keep in mind order of cases.
+            switch (true) {
+            // three login methods enabled
+            case enableSignInWithEmail && enableSignInWithUsername && ldapEnabled:
+                title = formatMessage({id: 'login.noEmailUsernameLdapUsername', defaultMessage: 'Please enter your email, username or {ldapUsername}'}, {ldapUsername});
+                break;
+
+            // two login methods enabled
+            case enableSignInWithEmail && enableSignInWithUsername:
+                title = formatMessage({id: 'login.noEmailUsername', defaultMessage: 'Please enter your email or username'});
+                break;
+            case enableSignInWithEmail && ldapEnabled:
+                title = formatMessage({id: 'login.noEmailLdapUsername', defaultMessage: 'Please enter your email or {ldapUsername}'}, {ldapUsername});
+                break;
+            case enableSignInWithUsername && ldapEnabled:
+                title = formatMessage({id: 'login.noUsernameLdapUsername', defaultMessage: 'Please enter your username or {ldapUsername}'}, {ldapUsername});
+                break;
+
+            // one login method enabled
+            case enableSignInWithEmail:
+                title = formatMessage({id: 'login.noEmail', defaultMessage: 'Please enter your email'});
+                break;
+            case ldapEnabled:
+                title = formatMessage({id: 'login.noLdapUsername', defaultMessage: 'Please enter your {ldapUsername}'}, {ldapUsername});
+                break;
+            case enableSignInWithUsername:
+            default:
+                title = formatMessage({id: 'login.noUsername', defaultMessage: 'Please enter your username'});
+                break;
             }
 
-            setAlertBanner({
-                mode: 'danger',
-                title: formatMessage(
-                    {id: msgId},
-                    {ldapUsername: LdapLoginFieldName || formatMessage({id: 'login.ldapUsernameLower', defaultMessage: 'AD/LDAP username'})},
-                ),
-            });
+            setAlertBanner({mode: 'danger', title});
             setHasError(true);
             setIsWaiting(false);
 
diff --git a/webapp/channels/src/components/login/login_mfa.tsx b/webapp/channels/src/components/login/login_mfa.tsx
index bd2a4906ea9..81a2b14a55e 100644
--- a/webapp/channels/src/components/login/login_mfa.tsx
+++ b/webapp/channels/src/components/login/login_mfa.tsx
@@ -60,7 +60,7 @@ const LoginMfa = ({loginId, password, title, subtitle, onSubmit}: LoginMfaProps)
                         inputSize={SIZE.LARGE}
                         value={token}
                         onChange={handleInputOnChange}
-                        placeholder={formatMessage({id: 'login_mfa.token', defaultMessage: 'Enter MFA Token'})}
+                        placeholder={formatMessage({id: 'login_mfa.token', defaultMessage: 'MFA Token'})}
                         autoFocus={true}
                         disabled={saving}
                     />
diff --git a/webapp/channels/src/components/mfa/setup/__snapshots__/setup.test.tsx.snap b/webapp/channels/src/components/mfa/setup/__snapshots__/setup.test.tsx.snap
index 756f88f38cc..3955bca306b 100644
--- a/webapp/channels/src/components/mfa/setup/__snapshots__/setup.test.tsx.snap
+++ b/webapp/channels/src/components/mfa/setup/__snapshots__/setup.test.tsx.snap
@@ -57,11 +57,6 @@ exports[`components/mfa/setup should match snapshot without required text 1`] =
       <MemoizedFormattedMessage
         defaultMessage="2. Enter the code generated by the authenticator app in the field below."
         id="mfa.setup.step3_code"
-        values={
-          Object {
-            "strong": [Function],
-          }
-        }
       />
     </p>
     <p>
diff --git a/webapp/channels/src/components/mfa/setup/setup.tsx b/webapp/channels/src/components/mfa/setup/setup.tsx
index 8055263a3af..827aa82d4ee 100644
--- a/webapp/channels/src/components/mfa/setup/setup.tsx
+++ b/webapp/channels/src/components/mfa/setup/setup.tsx
@@ -211,9 +211,6 @@ export default class Setup extends React.PureComponent<Props, State> {
                         <FormattedMessage
                             id='mfa.setup.step3_code'
                             defaultMessage='2. Enter the code generated by the authenticator app in the field below.'
-                            values={{
-                                strong: (chunks: React.ReactNode) => <strong>{chunks}</strong>,
-                            }}
                         />
                     </p>
                     <p>
diff --git a/webapp/channels/src/components/more_direct_channels/list/list.tsx b/webapp/channels/src/components/more_direct_channels/list/list.tsx
index 53772e34dfc..26a16b77ea3 100644
--- a/webapp/channels/src/components/more_direct_channels/list/list.tsx
+++ b/webapp/channels/src/components/more_direct_channels/list/list.tsx
@@ -166,7 +166,7 @@ const List = React.forwardRef((props: Props, ref?: React.Ref<MultiSelect<OptionV
             loading={props.loading}
             users={props.users}
             totalCount={props.totalCount}
-            placeholderText={intl.formatMessage({id: 'multiselect.placeholder', defaultMessage: 'Search and add members'})}
+            placeholderText={intl.formatMessage({id: 'multiselect.placeholder', defaultMessage: 'Search for people'})}
         />
     );
 });
diff --git a/webapp/channels/src/components/onboarding_tasklist/__snapshots__/onboarding_tasklist_completed.test.tsx.snap b/webapp/channels/src/components/onboarding_tasklist/__snapshots__/onboarding_tasklist_completed.test.tsx.snap
index 9d41e532632..4c3b701f237 100644
--- a/webapp/channels/src/components/onboarding_tasklist/__snapshots__/onboarding_tasklist_completed.test.tsx.snap
+++ b/webapp/channels/src/components/onboarding_tasklist/__snapshots__/onboarding_tasklist_completed.test.tsx.snap
@@ -57,7 +57,7 @@ exports[`components/onboarding_tasklist/onboarding_tasklist_completed.tsx should
       >
         <span>
           <MemoizedFormattedMessage
-            defaultMessage="Now that you’re all set up, <link>download our apps.</link>!"
+            defaultMessage="Now that you’re all set up, <link>download our apps.</link>"
             id="onboardingTask.checklist.downloads"
             values={
               Object {
@@ -72,7 +72,7 @@ exports[`components/onboarding_tasklist/onboarding_tasklist_completed.tsx should
       >
         <span>
           <MemoizedFormattedMessage
-            defaultMessage="By clicking “Start trial”, I agree to the <linkEvaluation>Mattermost Software and Services License Agreement</linkEvaluation>, <linkPrivacy>privacy policy</linkPrivacy> and receiving product emails."
+            defaultMessage="By clicking “Start trial”, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement</linkEvaluation>, <linkPrivacy>privacy policy</linkPrivacy> and receiving product emails."
             id="onboardingTask.checklist.disclaimer"
             values={
               Object {
diff --git a/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist.tsx b/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist.tsx
index e31bf7deca0..b4b6e07e75c 100644
--- a/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist.tsx
+++ b/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist.tsx
@@ -298,7 +298,7 @@ const OnBoardingTaskList = (): JSX.Element | null => {
                             >
                                 <FormattedMessage
                                     id='onboardingTask.checklist.dismiss_link'
-                                    defaultMessage="No thanks, I'll figure it out myself"
+                                    defaultMessage='No thanks, I’ll figure it out myself'
                                 />
                             </span>
                         </>
diff --git a/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist_completed.tsx b/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist_completed.tsx
index 52ab0937663..7d3c9c37365 100644
--- a/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist_completed.tsx
+++ b/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist_completed.tsx
@@ -216,7 +216,7 @@ const Completed = (props: Props): JSX.Element => {
                         <span>
                             <FormattedMessage
                                 id='onboardingTask.checklist.downloads'
-                                defaultMessage='Now that you’re all set up, <link>download our apps.</link>!'
+                                defaultMessage='Now that you’re all set up, <link>download our apps.</link>'
                                 values={{
                                     link: (msg: React.ReactNode) => (
                                         <ExternalLink
@@ -234,7 +234,7 @@ const Completed = (props: Props): JSX.Element => {
                         <span>
                             <FormattedMessage
                                 id='onboardingTask.checklist.disclaimer'
-                                defaultMessage='By clicking “Start trial”, I agree to the <linkEvaluation>Mattermost Software and Services License Agreement</linkEvaluation>, <linkPrivacy>privacy policy</linkPrivacy> and receiving product emails.'
+                                defaultMessage='By clicking “Start trial”, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement</linkEvaluation>, <linkPrivacy>privacy policy</linkPrivacy> and receiving product emails.'
                                 values={{
                                     linkEvaluation: (msg: React.ReactNode) => (
                                         <ExternalLink
diff --git a/webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/__snapshots__/marketplace_item_plugin.test.tsx.snap b/webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/__snapshots__/marketplace_item_plugin.test.tsx.snap
index c84f4b89d7d..ef80ea8ef32 100644
--- a/webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/__snapshots__/marketplace_item_plugin.test.tsx.snap
+++ b/webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/__snapshots__/marketplace_item_plugin.test.tsx.snap
@@ -844,7 +844,7 @@ exports[`components/MarketplaceItemPlugin UpdateConfirmationModal should add ext
     Array [
       <p>
         <Memo(MemoizedFormattedMessage)
-          defaultMessage="Are you sure you want to update the pluginName plugin to 1.0.0?"
+          defaultMessage="Are you sure you want to update the {name} plugin to {version}?"
           id="marketplace_modal.list.update_confirmation.message.intro"
           values={
             Object {
@@ -905,7 +905,7 @@ exports[`components/MarketplaceItemPlugin UpdateConfirmationModal should add ext
     Array [
       <p>
         <Memo(MemoizedFormattedMessage)
-          defaultMessage="Are you sure you want to update the pluginName plugin to 1.0.0?"
+          defaultMessage="Are you sure you want to update the {name} plugin to {version}?"
           id="marketplace_modal.list.update_confirmation.message.intro"
           values={
             Object {
@@ -917,7 +917,7 @@ exports[`components/MarketplaceItemPlugin UpdateConfirmationModal should add ext
       </p>,
       <p>
         <Memo(MemoizedFormattedMessage)
-          defaultMessage="You currently have 0.0.1 installed."
+          defaultMessage="You currently have {installedVersion} installed."
           id="marketplace_modal.list.update_confirmation.message.current"
           values={
             Object {
@@ -962,7 +962,7 @@ exports[`components/MarketplaceItemPlugin UpdateConfirmationModal should render
     Array [
       <p>
         <Memo(MemoizedFormattedMessage)
-          defaultMessage="Are you sure you want to update the pluginName plugin to 0.0.2?"
+          defaultMessage="Are you sure you want to update the {name} plugin to {version}?"
           id="marketplace_modal.list.update_confirmation.message.intro"
           values={
             Object {
@@ -974,7 +974,7 @@ exports[`components/MarketplaceItemPlugin UpdateConfirmationModal should render
       </p>,
       <p>
         <Memo(MemoizedFormattedMessage)
-          defaultMessage="You currently have 0.0.1 installed."
+          defaultMessage="You currently have {installedVersion} installed."
           id="marketplace_modal.list.update_confirmation.message.current"
           values={
             Object {
diff --git a/webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/marketplace_item_plugin.tsx b/webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/marketplace_item_plugin.tsx
index 0639753ef39..94b18159022 100644
--- a/webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/marketplace_item_plugin.tsx
+++ b/webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/marketplace_item_plugin.tsx
@@ -121,7 +121,7 @@ export const UpdateConfirmationModal = ({show, name, version, installedVersion,
         <p key='intro'>
             <FormattedMessage
                 id='marketplace_modal.list.update_confirmation.message.intro'
-                defaultMessage={`Are you sure you want to update the ${name} plugin to ${version}?`}
+                defaultMessage={'Are you sure you want to update the {name} plugin to {version}?'}
                 values={{name, version}}
             />
         </p>
@@ -151,7 +151,7 @@ export const UpdateConfirmationModal = ({show, name, version, installedVersion,
             <p key='current'>
                 <FormattedMessage
                     id='marketplace_modal.list.update_confirmation.message.current'
-                    defaultMessage={`You currently have ${installedVersion} installed.`}
+                    defaultMessage={'You currently have {installedVersion} installed.'}
                     values={{installedVersion}}
                 />
             </p>,
diff --git a/webapp/channels/src/components/post_markdown/system_message_helpers.tsx b/webapp/channels/src/components/post_markdown/system_message_helpers.tsx
index fa19601c7c9..80d6540972d 100644
--- a/webapp/channels/src/components/post_markdown/system_message_helpers.tsx
+++ b/webapp/channels/src/components/post_markdown/system_message_helpers.tsx
@@ -78,7 +78,7 @@ function renderLeaveChannelMessage(post: Post): ReactNode {
     return (
         <FormattedMessage
             id='api.channel.leave.left'
-            defaultMessage='{username} has left the channel.'
+            defaultMessage='{username} left the channel.'
             values={{username}}
         />
     );
@@ -164,7 +164,7 @@ function renderAddToTeamMessage(post: Post): ReactNode {
     return (
         <FormattedMessage
             id='api.team.add_member.added'
-            defaultMessage='{addedUsername} added to the team by {username}.'
+            defaultMessage='{addedUsername} added to the team by {username}'
             values={{
                 username,
                 addedUsername,
@@ -344,7 +344,7 @@ function renderChannelDeletedMessage(post: Post): ReactNode {
     return (
         <FormattedMessage
             id='api.channel.delete_channel.archived'
-            defaultMessage='{username} has archived the channel.'
+            defaultMessage='{username} archived the channel.'
             values={{username}}
         />
     );
@@ -360,7 +360,7 @@ function renderChannelUnarchivedMessage(post: Post): ReactNode {
     return (
         <FormattedMessage
             id='api.channel.restore_channel.unarchived'
-            defaultMessage='{username} has unarchived the channel.'
+            defaultMessage='{username} unarchived the channel.'
             values={{username}}
         />
     );
diff --git a/webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.test.tsx b/webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.test.tsx
index 9bf6d8f102b..399ab07c39a 100644
--- a/webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.test.tsx
+++ b/webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.test.tsx
@@ -125,7 +125,7 @@ describe('components/post_view/ChannelIntroMessages', () => {
             expect(screen.queryByText('Any member can join and read this channel.')).not.toBeInTheDocument();
 
             // there are no profiles in the dom, channel type is GM_CHANNEL, teammate text should be displayed
-            expect(screen.getByText('This is the start of your group message history with these teammates. ', {exact: false})).toBeInTheDocument();
+            expect(screen.getByText('This is the start of your group message history with these teammates.', {exact: false})).toBeInTheDocument();
 
             expect(screen.getByText('This is the start of your', {exact: false})).toHaveClass('channel-intro__text');
         });
diff --git a/webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.tsx b/webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.tsx
index 7ef9c7e737f..14a0e6dc862 100644
--- a/webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.tsx
+++ b/webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.tsx
@@ -228,7 +228,7 @@ function createGMIntroMessage(
             <p className='channel-intro__text'>
                 <FormattedMessage
                     id='intro_messages.group_message'
-                    defaultMessage='This is the start of your group message history with these teammates. Messages and files shared here are not shown to people outside this area.'
+                    defaultMessage='This is the start of your group message history with these teammates. '
                 />
             </p>
         </div>
@@ -530,7 +530,6 @@ function createStandardIntroMessage(
     locale: string,
     creatorName: string,
 ) {
-    const uiName = channel.display_name;
     let memberMessage;
     let teamInviteLink = null;
     const channelIsArchived = channel.delete_at !== 0;
@@ -577,7 +576,7 @@ function createStandardIntroMessage(
                 <FormattedMessage
                     id='intro_messages.noCreatorPrivate'
                     defaultMessage='Private channel created on {date}.'
-                    values={{name: (uiName), date}}
+                    values={{date}}
                 />
             );
         } else if (channel.type === Constants.OPEN_CHANNEL) {
@@ -585,7 +584,7 @@ function createStandardIntroMessage(
                 <FormattedMessage
                     id='intro_messages.noCreator'
                     defaultMessage='Public channel created on {date}.'
-                    values={{name: (uiName), date}}
+                    values={{date}}
                 />
             );
         }
@@ -596,7 +595,6 @@ function createStandardIntroMessage(
                     id='intro_messages.creatorPrivate'
                     defaultMessage='Private channel created by {creator} on {date}.'
                     values={{
-                        name: (uiName),
                         creator: (creatorName),
                         date,
                     }}
@@ -610,7 +608,6 @@ function createStandardIntroMessage(
                     id='intro_messages.creator'
                     defaultMessage='Public channel created by {creator} on {date}.'
                     values={{
-                        name: (uiName),
                         creator: (creatorName),
                         date,
                     }}
@@ -755,7 +752,7 @@ function createNotificationPreferencesButton(channel: Channel, currentUser: User
         <ToggleModalButton
             id='channelIntroNotificationPreferencesButton'
             modalId={ModalIdentifiers.CHANNEL_NOTIFICATIONS}
-            ariaLabel={Utils.localizeMessage({id: 'intro_messages.notificationPreferences', defaultMessage: 'Notification Preferences'})}
+            ariaLabel={Utils.localizeMessage({id: 'intro_messages.notificationPreferences', defaultMessage: 'Notifications'})}
             className={'action-button'}
             dialogType={ChannelNotificationsModal}
             dialogProps={{channel, currentUser, focusOriginElement: 'channelIntroNotificationPreferencesButton'}}
diff --git a/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx b/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx
index 1be670d9de8..d4ecb0bc6b8 100644
--- a/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx
+++ b/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx
@@ -28,10 +28,10 @@ const PostEditedIndicator = ({postId, isMilitaryTime, timeZone, editedAt = 0, po
     let date;
     switch (true) {
     case isSameDay(editedDate):
-        date = formatMessage({id: 'datetime.today', defaultMessage: 'today '});
+        date = formatMessage({id: 'datetime.today', defaultMessage: 'today'});
         break;
     case isYesterday(editedDate):
-        date = formatMessage({id: 'datetime.yesterday', defaultMessage: 'yesterday '});
+        date = formatMessage({id: 'datetime.yesterday', defaultMessage: 'yesterday'});
         break;
     case isWithinLastWeek(editedDate):
         date = formatDate(editedDate, {weekday: 'long'});
diff --git a/webapp/channels/src/components/post_view/post_flag_icon/__snapshots__/post_flag_icon.test.tsx.snap b/webapp/channels/src/components/post_view/post_flag_icon/__snapshots__/post_flag_icon.test.tsx.snap
index edebdf1dda9..4d1a7a67c55 100644
--- a/webapp/channels/src/components/post_view/post_flag_icon/__snapshots__/post_flag_icon.test.tsx.snap
+++ b/webapp/channels/src/components/post_view/post_flag_icon/__snapshots__/post_flag_icon.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`components/post_view/PostFlagIcon should match snapshot 1`] = `
   }
 >
   <button
-    aria-label="save"
+    aria-label="save message"
     className="post-menu__item"
     id="CENTER_flagIcon_post_id"
     onClick={[Function]}
diff --git a/webapp/channels/src/components/post_view/post_flag_icon/post_flag_icon.tsx b/webapp/channels/src/components/post_view/post_flag_icon/post_flag_icon.tsx
index 9ea1264f645..eef4e781261 100644
--- a/webapp/channels/src/components/post_view/post_flag_icon/post_flag_icon.tsx
+++ b/webapp/channels/src/components/post_view/post_flag_icon/post_flag_icon.tsx
@@ -100,7 +100,7 @@ const PostFlagIcon = ({
             <button
                 ref={buttonRef}
                 id={`${location}_flagIcon_${postId}`}
-                aria-label={isFlagged ? intl.formatMessage({id: 'flag_post.unflag', defaultMessage: 'Remove from Saved'}).toLowerCase() : intl.formatMessage({id: 'flag_post.flag', defaultMessage: 'Save'}).toLowerCase()}
+                aria-label={isFlagged ? intl.formatMessage({id: 'flag_post.unflag', defaultMessage: 'Remove from Saved'}).toLowerCase() : intl.formatMessage({id: 'flag_post.flag', defaultMessage: 'Save Message'}).toLowerCase()}
                 className='post-menu__item'
                 onClick={handlePress}
             >
diff --git a/webapp/channels/src/components/post_view/post_list_row/__snapshots__/post_list_row.test.tsx.snap b/webapp/channels/src/components/post_view/post_list_row/__snapshots__/post_list_row.test.tsx.snap
index ab5902a9e54..fe033d3f1c5 100644
--- a/webapp/channels/src/components/post_view/post_list_row/__snapshots__/post_list_row.test.tsx.snap
+++ b/webapp/channels/src/components/post_view/post_list_row/__snapshots__/post_list_row.test.tsx.snap
@@ -66,7 +66,7 @@ exports[`components/post_view/post_list_row should render manual load messages t
   onClick={[MockFunction]}
 >
   <MemoizedFormattedMessage
-    defaultMessage="Load More Messages"
+    defaultMessage="Load more messages"
     id="posts_view.loadMore"
   />
 </button>
diff --git a/webapp/channels/src/components/post_view/post_list_row/post_list_row.tsx b/webapp/channels/src/components/post_view/post_list_row/post_list_row.tsx
index ef01466ed05..47b032b040d 100644
--- a/webapp/channels/src/components/post_view/post_list_row/post_list_row.tsx
+++ b/webapp/channels/src/components/post_view/post_list_row/post_list_row.tsx
@@ -138,7 +138,7 @@ export default class PostListRow extends React.PureComponent<PostListRowProps> {
                 >
                     <FormattedMessage
                         id='posts_view.loadMore'
-                        defaultMessage='Load More Messages'
+                        defaultMessage='Load more messages'
                     />
                 </button>
             );
diff --git a/webapp/channels/src/components/preparing_workspace/plugins.tsx b/webapp/channels/src/components/preparing_workspace/plugins.tsx
index 51e12f764f7..6eb6ce279a7 100644
--- a/webapp/channels/src/components/preparing_workspace/plugins.tsx
+++ b/webapp/channels/src/components/preparing_workspace/plugins.tsx
@@ -105,7 +105,7 @@ const Plugins = (props: Props) => {
                                     checked: props.options.gitlab,
                                     tooltip: formatMessage({
                                         id: 'onboarding_wizard.plugins.gitlab.tooltip',
-                                        defaultMessage: 'GitLab tooltip',
+                                        defaultMessage: 'Subscribe to repositories, stay up-to-date with reviews, assignments and more',
                                     }),
                                 },
                                 {
@@ -119,7 +119,7 @@ const Plugins = (props: Props) => {
                                     checked: props.options.jira,
                                     tooltip: formatMessage({
                                         id: 'onboarding_wizard.plugins.jira.tooltip',
-                                        defaultMessage: 'Jira tooltip',
+                                        defaultMessage: 'Create Jira tickets from messages in Mattermost, get notified of important updates in Jira',
                                     }),
                                 },
                                 {
@@ -133,7 +133,7 @@ const Plugins = (props: Props) => {
                                     checked: props.options.zoom,
                                     tooltip: formatMessage({
                                         id: 'onboarding_wizard.plugins.zoom.tooltip',
-                                        defaultMessage: 'Zoom tooltip',
+                                        defaultMessage: 'Start Zoom audio and video conferencing calls in Mattermost with a single click',
                                     }),
                                 },
                                 {
@@ -147,7 +147,7 @@ const Plugins = (props: Props) => {
                                     checked: props.options.servicenow,
                                     tooltip: formatMessage({
                                         id: 'onboarding_wizard.plugins.servicenow.tooltip',
-                                        defaultMessage: 'ServiceNow tooltip',
+                                        defaultMessage: 'This plugin serves as an integration between Mattermost and ServiceNow.',
                                     }),
                                 },
                             ]}
diff --git a/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/index.tsx b/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/index.tsx
index dc88c02d5db..8221aaeb23e 100644
--- a/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/index.tsx
+++ b/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/index.tsx
@@ -102,7 +102,7 @@ const CallButton = ({
         defaultMessage: 'Call with {user} is ongoing',
     }, {user: fullname || username},
     ) : formatMessage({
-        id: 'webapp.mattermost.feature.start_call',
+        id: 'user_profile.call.start',
         defaultMessage: 'Start Call',
     });
     const callButton = (
diff --git a/webapp/channels/src/components/remove_flagged_message_confirmation_modal/remove_flagged_message_confirmation_modal.tsx b/webapp/channels/src/components/remove_flagged_message_confirmation_modal/remove_flagged_message_confirmation_modal.tsx
index 0720d5901b0..566bdf662e5 100644
--- a/webapp/channels/src/components/remove_flagged_message_confirmation_modal/remove_flagged_message_confirmation_modal.tsx
+++ b/webapp/channels/src/components/remove_flagged_message_confirmation_modal/remove_flagged_message_confirmation_modal.tsx
@@ -63,7 +63,6 @@ export default function KeepRemoveFlaggedMessageConfirmationModal({action, onExi
         id: 'keep_remove_flag_content_modal.action_remove.body',
         defaultMessage: 'You are about to remove a message authored by {flaggedPostAuthor} posed in the {flaggedPostChannel} channel and flagged for review by {reportingUser}.',
     }, {
-        br: <br/>,
         flaggedPostChannel: flaggedPostChannel?.display_name,
         reportingUser: <AtMention mentionName={reportingUser?.username || ''}/>,
         flaggedPostAuthor: <AtMention mentionName={flaggedPostAuthor?.username || ''}/>,
@@ -72,7 +71,6 @@ export default function KeepRemoveFlaggedMessageConfirmationModal({action, onExi
         id: 'keep_remove_flag_content_modal.action_keep.body',
         defaultMessage: 'You are about to keep a flagged message authored by {flaggedPostAuthor} posed in the {flaggedPostChannel} channel and flagged for review by {reportingUser}.',
     }, {
-        br: <br/>,
         flaggedPostChannel: flaggedPostChannel?.display_name,
         reportingUser: <AtMention mentionName={reportingUser?.username || ''}/>,
         flaggedPostAuthor: <AtMention mentionName={flaggedPostAuthor?.username || ''}/>,
diff --git a/webapp/channels/src/components/rhs_card_header/rhs_card_header.tsx b/webapp/channels/src/components/rhs_card_header/rhs_card_header.tsx
index 5f943bf9fce..825de19000a 100644
--- a/webapp/channels/src/components/rhs_card_header/rhs_card_header.tsx
+++ b/webapp/channels/src/components/rhs_card_header/rhs_card_header.tsx
@@ -142,7 +142,7 @@ class RhsCardHeader extends React.PureComponent<Props> {
                     {back}
                     <FormattedMessage
                         id='search_header.title5'
-                        defaultMessage='Extra information'
+                        defaultMessage='Extra Information'
                     />
                 </span>
                 <div className='pull-right'>
diff --git a/webapp/channels/src/components/rhs_plugin_popout/rhs_plugin_popout.tsx b/webapp/channels/src/components/rhs_plugin_popout/rhs_plugin_popout.tsx
index 8db88d88126..f7d4716c0e3 100644
--- a/webapp/channels/src/components/rhs_plugin_popout/rhs_plugin_popout.tsx
+++ b/webapp/channels/src/components/rhs_plugin_popout/rhs_plugin_popout.tsx
@@ -16,6 +16,7 @@ import type {GlobalState} from 'types/store';
 
 export const RHS_PLUGIN_TITLE = defineMessage({
     id: 'rhs_plugin_popout.title',
+    // eslint-disable-next-line formatjs/enforce-placeholders -- provided later
     defaultMessage: '{pluginDisplayName} - {serverName}',
 });
 
diff --git a/webapp/channels/src/components/search_results/search_results.tsx b/webapp/channels/src/components/search_results/search_results.tsx
index 4e6ad44e6a8..be7544de08e 100644
--- a/webapp/channels/src/components/search_results/search_results.tsx
+++ b/webapp/channels/src/components/search_results/search_results.tsx
@@ -201,7 +201,7 @@ const SearchResults: React.FC<Props> = (props: Props): JSX.Element => {
     } else if (isCard) {
         titleDescriptor = defineMessage({
             id: 'search_header.title5',
-            defaultMessage: 'Extra information',
+            defaultMessage: 'Extra Information',
         });
     } else if (!searchTerms && noResults && noFileResults) {
         titleDescriptor = defineMessage({
@@ -236,7 +236,7 @@ const SearchResults: React.FC<Props> = (props: Props): JSX.Element => {
         contentItems = (
             <div className='sidebar--right__subheader a11y__section'>
                 <div className='sidebar--right__loading'>
-                    <LoadingWrapper text={defineMessage({id: 'search_header.loading', defaultMessage: 'Searching'})}/>
+                    <LoadingWrapper text={defineMessage({id: 'search_header.loading', defaultMessage: 'Searching...'})}/>
                 </div>
             </div>
         );
diff --git a/webapp/channels/src/components/searchable_channel_list.tsx b/webapp/channels/src/components/searchable_channel_list.tsx
index 2f028795603..e348af02114 100644
--- a/webapp/channels/src/components/searchable_channel_list.tsx
+++ b/webapp/channels/src/components/searchable_channel_list.tsx
@@ -289,7 +289,7 @@ export class SearchableChannelList extends React.PureComponent<Props, State> {
                 <FormattedMessage
                     id='more_channels.noMore'
                     tagName='strong'
-                    defaultMessage='No results for {text}'
+                    defaultMessage='No results for "{text}"'
                     values={{text: this.state.channelSearchValue}}
                 />
             );
@@ -439,7 +439,7 @@ export class SearchableChannelList extends React.PureComponent<Props, State> {
                     clearable={true}
                     onClear={this.handleClear}
                     value={this.state.channelSearchValue}
-                    aria-label={this.props.intl.formatMessage({id: 'filtered_channels_list.search', defaultMessage: 'Search Channels'})}
+                    aria-label={this.props.intl.formatMessage({id: 'filtered_channels_list.search.label', defaultMessage: 'Search Channels'})}
                 />
             </div>
         );
@@ -646,7 +646,7 @@ const messages = defineMessages({
     },
     noMore: {
         id: 'more_channels.noMore',
-        defaultMessage: 'No results for {text}',
+        defaultMessage: 'No results for "{text}"',
     },
 });
 
diff --git a/webapp/channels/src/components/select_team/components/__snapshots__/select_team_item.test.tsx.snap b/webapp/channels/src/components/select_team/components/__snapshots__/select_team_item.test.tsx.snap
index 32023fe783f..bbc97ee1d1a 100644
--- a/webapp/channels/src/components/select_team/components/__snapshots__/select_team_item.test.tsx.snap
+++ b/webapp/channels/src/components/select_team/components/__snapshots__/select_team_item.test.tsx.snap
@@ -40,7 +40,7 @@ exports[`components/select_team/components/SelectTeamItem should match snapshot,
     </span>
     <i
       className="fa fa-lock light"
-      title="Private team"
+      title="Private Team"
     />
     <span
       className="fa fa-angle-right right signup-team__icon"
@@ -66,7 +66,7 @@ exports[`components/select_team/components/SelectTeamItem should match snapshot,
     </span>
     <i
       className="fa fa-lock light"
-      title="Private team"
+      title="Private Team"
     />
   </a>
 </div>
diff --git a/webapp/channels/src/components/select_team/components/select_team_item.tsx b/webapp/channels/src/components/select_team/components/select_team_item.tsx
index e4ccd101c3f..3b6553ccd49 100644
--- a/webapp/channels/src/components/select_team/components/select_team_item.tsx
+++ b/webapp/channels/src/components/select_team/components/select_team_item.tsx
@@ -79,7 +79,7 @@ const SelectTeamItem = ({
                 {!team.allow_open_invite &&
                     <i
                         className='fa fa-lock light'
-                        title={intl.formatMessage({id: 'select_team.private.icon', defaultMessage: 'Private team'})}
+                        title={intl.formatMessage({id: 'select_team.private.icon', defaultMessage: 'Private Team'})}
                     />}
                 {canJoin && icon}
             </a>
diff --git a/webapp/channels/src/components/sidebar/__snapshots__/invite_members_button.test.tsx.snap b/webapp/channels/src/components/sidebar/__snapshots__/invite_members_button.test.tsx.snap
index f0653e0522b..85b9ca8566f 100644
--- a/webapp/channels/src/components/sidebar/__snapshots__/invite_members_button.test.tsx.snap
+++ b/webapp/channels/src/components/sidebar/__snapshots__/invite_members_button.test.tsx.snap
@@ -53,7 +53,7 @@ exports[`components/sidebar/invite_members_button should match snapshot 1`] = `
             onClick={[Function]}
           >
             <div
-              aria-label="Invite Members"
+              aria-label="Invite Users"
               className="SidebarChannelNavigator__inviteMembersLhsButton"
             >
               <i
diff --git a/webapp/channels/src/components/sidebar/channel_navigator/channel_navigator.tsx b/webapp/channels/src/components/sidebar/channel_navigator/channel_navigator.tsx
index 80a2d648d83..38f977ef28e 100644
--- a/webapp/channels/src/components/sidebar/channel_navigator/channel_navigator.tsx
+++ b/webapp/channels/src/components/sidebar/channel_navigator/channel_navigator.tsx
@@ -91,7 +91,7 @@ class ChannelNavigator extends React.PureComponent<Props> {
                 <button
                     className={'SidebarChannelNavigator_jumpToButton'}
                     onClick={this.openQuickSwitcher}
-                    aria-label={this.props.intl.formatMessage({id: 'sidebar_left.channel_navigator.channelSwitcherLabel', defaultMessage: 'Channel Switcher'})}
+                    aria-label={this.props.intl.formatMessage({id: 'sidebar_left.channel_navigator.channelSwitcherLabel', defaultMessage: 'Find Channels'})}
                     aria-haspopup='dialog'
                     data-testid='SidebarChannelNavigatorButton'
                     id='SidebarChannelNavigatorButton'
diff --git a/webapp/channels/src/components/sidebar/invite_members_button.tsx b/webapp/channels/src/components/sidebar/invite_members_button.tsx
index e891139cb20..62dc9b91167 100644
--- a/webapp/channels/src/components/sidebar/invite_members_button.tsx
+++ b/webapp/channels/src/components/sidebar/invite_members_button.tsx
@@ -41,7 +41,7 @@ const InviteMembersButton = (props: Props): JSX.Element | null => {
             >
                 <div
                     className='SidebarChannelNavigator__inviteMembersLhsButton'
-                    aria-label={intl.formatMessage({id: 'sidebar_left.sidebar_channel_navigator.inviteUsers', defaultMessage: 'Invite Members'})}
+                    aria-label={intl.formatMessage({id: 'sidebar_left.sidebar_channel_navigator.inviteUsers', defaultMessage: 'Invite Users'})}
                 >
                     <i
                         className='icon-plus-box'
diff --git a/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category.test.tsx.snap b/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category.test.tsx.snap
index 062441b202c..398146e1d11 100644
--- a/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category.test.tsx.snap
+++ b/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category.test.tsx.snap
@@ -288,7 +288,7 @@ exports[`components/sidebar/sidebar_category should match snapshot when sorting
     <WithTooltip
       title={
         <React.Fragment>
-          Create new direct message
+          Write a direct message
           <Memo(KeyboardShortcutSequence)
             hideDescription={true}
             isInsideTooltip={true}
@@ -309,7 +309,7 @@ exports[`components/sidebar/sidebar_category should match snapshot when sorting
       }
     >
       <button
-        aria-label="Create new direct message"
+        aria-label="Write a direct message"
         className="SidebarChannelGroupHeader_addButton"
         id="newDirectMessageButton"
         onClick={[Function]}
@@ -396,7 +396,7 @@ exports[`components/sidebar/sidebar_category should match snapshot when the cate
     <WithTooltip
       title={
         <React.Fragment>
-          Create new direct message
+          Write a direct message
           <Memo(KeyboardShortcutSequence)
             hideDescription={true}
             isInsideTooltip={true}
@@ -417,7 +417,7 @@ exports[`components/sidebar/sidebar_category should match snapshot when the cate
       }
     >
       <button
-        aria-label="Create new direct message"
+        aria-label="Write a direct message"
         className="SidebarChannelGroupHeader_addButton"
         id="newDirectMessageButton"
         onClick={[Function]}
diff --git a/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category_sorting_menu.test.tsx.snap b/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category_sorting_menu.test.tsx.snap
index 7650279dafa..d3f6b60d253 100644
--- a/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category_sorting_menu.test.tsx.snap
+++ b/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category_sorting_menu.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`components/sidebar/sidebar_category/sidebar_category_sorting_menu shoul
     }
     menuButton={
       Object {
-        "aria-label": "Category options",
+        "aria-label": "category_name category options",
         "children": <DotsVerticalIcon
           size={16}
         />,
@@ -25,7 +25,7 @@ exports[`components/sidebar/sidebar_category/sidebar_category_sorting_menu shoul
     menuButtonTooltip={
       Object {
         "class": "hidden-xs",
-        "text": "Category options",
+        "text": "category_name category options",
       }
     }
   >
@@ -74,7 +74,7 @@ exports[`components/sidebar/sidebar_category/sidebar_category_sorting_menu shoul
         id="sortByMostRecent-category_id"
         labels={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Recent Activity"
+            defaultMessage="Recent activity"
             id="sidebar.sortedByRecencyLabel"
           />
         }
diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category.tsx b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category.tsx
index b377b41c7a4..401725c2679 100644
--- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category.tsx
@@ -258,7 +258,7 @@ export default class SidebarCategory extends React.PureComponent<Props, State> {
 
             categoryMenu = <SidebarCategoryMenu category={category}/>;
         } else if (category.type === CategoryTypes.DIRECT_MESSAGES) {
-            const addHelpLabel = localizeMessage({id: 'sidebar.createDirectMessage', defaultMessage: 'Create new direct message'});
+            const addHelpLabel = localizeMessage({id: 'sidebar.createDirectMessage', defaultMessage: 'Write a direct message'});
 
             categoryMenu = (
                 <>
diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/__snapshots__/index.test.tsx.snap b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/__snapshots__/index.test.tsx.snap
index 5e373f2c4c9..667308dac9c 100644
--- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/__snapshots__/index.test.tsx.snap
+++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/__snapshots__/index.test.tsx.snap
@@ -106,7 +106,7 @@ exports[`components/sidebar/sidebar_category/sidebar_category_menu should match
       id="sortByMostRecent-test_category_id"
       labels={
         <Memo(MemoizedFormattedMessage)
-          defaultMessage="Recent Activity"
+          defaultMessage="Recent activity"
           id="sidebar.sortedByRecencyLabel"
         />
       }
diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/index.tsx b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/index.tsx
index b305f907afd..bb96458494a 100644
--- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/index.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/index.tsx
@@ -158,7 +158,7 @@ const SidebarCategoryMenu = ({
         sortChannelsSelectedValue = (
             <FormattedMessage
                 id='user.settings.sidebar.recent'
-                defaultMessage='Recent Activity'
+                defaultMessage='Recent activity'
             />
         );
         sortChannelsIcon = <ClockOutlineIcon size={18}/>;
@@ -199,7 +199,7 @@ const SidebarCategoryMenu = ({
                 labels={(
                     <FormattedMessage
                         id='sidebar.sortedByRecencyLabel'
-                        defaultMessage='Recent Activity'
+                        defaultMessage='Recent activity'
                     />
                 )}
                 onClick={() => handleSortChannels(CategorySorting.Recency)}
diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/sidebar_category_generic_menu.tsx b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/sidebar_category_generic_menu.tsx
index 3e4baf33406..7f211349b88 100644
--- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/sidebar_category_generic_menu.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/sidebar_category_generic_menu.tsx
@@ -44,12 +44,12 @@ const SidebarCategoryGenericMenu = ({
             <Menu.Container
                 menuButton={{
                     id: `SidebarCategoryMenu-Button-${id}`,
-                    'aria-label': formatMessage({id: 'sidebar_left.sidebar_category_menu.editCategory', defaultMessage: 'Category options'}, {name}),
+                    'aria-label': formatMessage({id: 'sidebar_left.sidebar_category_menu.editCategory', defaultMessage: '{name} category options'}, {name}),
                     class: 'SidebarMenu_menuButton',
                     children: <DotsVerticalIcon size={16}/>,
                 }}
                 menuButtonTooltip={{
-                    text: formatMessage({id: 'sidebar_left.sidebar_category_menu.editCategory', defaultMessage: 'Category options'}, {name}),
+                    text: formatMessage({id: 'sidebar_left.sidebar_category_menu.editCategory', defaultMessage: '{name} category options'}, {name}),
                     class: 'hidden-xs',
                 }}
                 menu={{
diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_sorting_menu.tsx b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_sorting_menu.tsx
index 20c13639f17..146b243bc90 100644
--- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_sorting_menu.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_sorting_menu.tsx
@@ -53,7 +53,7 @@ const SidebarCategorySortingMenu = ({
     let sortDirectMessagesSelectedValue = (
         <FormattedMessage
             id='user.settings.sidebar.recent'
-            defaultMessage='Recent Activity'
+            defaultMessage='Recent activity'
         />
     );
     if (category.sorting === CategorySorting.Alphabetical) {
@@ -100,7 +100,7 @@ const SidebarCategorySortingMenu = ({
                 labels={(
                     <FormattedMessage
                         id='sidebar.sortedByRecencyLabel'
-                        defaultMessage='Recent Activity'
+                        defaultMessage='Recent activity'
                     />
                 )}
                 onClick={() => handleSortDirectMessages(CategorySorting.Recency)}
@@ -190,12 +190,12 @@ const SidebarCategorySortingMenu = ({
             <Menu.Container
                 menuButton={{
                     id: `SidebarCategorySortingMenu-Button-${category.id}`,
-                    'aria-label': formatMessage({id: 'sidebar_left.sidebar_category_menu.editCategory', defaultMessage: 'Category options'}, {name: category.display_name}),
+                    'aria-label': formatMessage({id: 'sidebar_left.sidebar_category_menu.editCategory', defaultMessage: '{name} category options'}, {name: category.display_name}),
                     class: 'SidebarMenu_menuButton sortingMenu',
                     children: <DotsVerticalIcon size={16}/>,
                 }}
                 menuButtonTooltip={{
-                    text: formatMessage({id: 'sidebar_left.sidebar_category_menu.editCategory', defaultMessage: 'Category options'}, {name: category.display_name}),
+                    text: formatMessage({id: 'sidebar_left.sidebar_category_menu.editCategory', defaultMessage: '{name} category options'}, {name: category.display_name}),
                     class: 'hidden-xs',
                 }}
                 menu={{
diff --git a/webapp/channels/src/components/sidebar/sidebar_header/sidebar_team_menu.tsx b/webapp/channels/src/components/sidebar/sidebar_header/sidebar_team_menu.tsx
index 1e26ff0616c..2645ff84446 100644
--- a/webapp/channels/src/components/sidebar/sidebar_header/sidebar_team_menu.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar_header/sidebar_team_menu.tsx
@@ -443,7 +443,7 @@ function RestrictedIndicatorForCreateTeam({isFreeTrial}: {isFreeTrial: boolean})
             })}
             messageAdminPostTrial={formatMessage({
                 id: 'navbar_dropdown.create.modal.messageAdminPostTrial',
-                defaultMessage: "Multiple teams allow for context-specific spaces that are more attuned to your and your teams' needs. Upgrade to the Professional plan to create unlimited teams.",
+                defaultMessage: 'Multiple teams allow for context-specific spaces that are more attuned to your and your teams’ needs. Upgrade to the Professional plan to create unlimited teams.',
             })}
             titleEndUser={formatMessage({
                 id: 'navbar_dropdown.create.modal.titleEndUser',
@@ -451,7 +451,7 @@ function RestrictedIndicatorForCreateTeam({isFreeTrial}: {isFreeTrial: boolean})
             })}
             messageEndUser={formatMessage({
                 id: 'navbar_dropdown.create.modal.messageEndUser',
-                defaultMessage: "Multiple teams allow for context-specific spaces that are more attuned to your teams' needs.",
+                defaultMessage: 'Multiple teams allow for context-specific spaces that are more attuned to your teams’ needs.',
             })}
         />
     );
diff --git a/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap b/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
index 96654e54b5c..7a9d3bea7a4 100644
--- a/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
+++ b/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
@@ -151,7 +151,7 @@ exports[`components/signup/Signup should match snapshot for all signup options e
               data-testid="signup-body-card-form-password-input"
               disabled={false}
               error=""
-              info="Must be 5-72 characters long."
+              info="Your password must be 5-72 characters long."
               inputSize="large"
               onChange={[Function]}
               value=""
@@ -317,7 +317,7 @@ exports[`components/signup/Signup should match snapshot for all signup options e
               data-testid="signup-body-card-form-password-input"
               disabled={false}
               error=""
-              info="Must be 5-72 characters long."
+              info="Your password must be 5-72 characters long."
               inputSize="large"
               onChange={[Function]}
               value=""
diff --git a/webapp/channels/src/components/start_trial_form_modal/index.tsx b/webapp/channels/src/components/start_trial_form_modal/index.tsx
index 1f6a772524e..2163d51c08d 100644
--- a/webapp/channels/src/components/start_trial_form_modal/index.tsx
+++ b/webapp/channels/src/components/start_trial_form_modal/index.tsx
@@ -65,7 +65,7 @@ defineMessages({
     },
     TWO_THOUSAND_FIVE_HUNDRED_AND_UP: {
         id: 'TWO_THOUSAND_FIVE_HUNDRED_AND_UP',
-        defaultMessage: '2501+',
+        defaultMessage: '2501-5000',
     },
 });
 
diff --git a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.test.ts b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.test.ts
index 7934b2deb28..ebc04c87667 100644
--- a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.test.ts
+++ b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.test.ts
@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import type {IntlShape} from 'react-intl';
+
 import mockStore from 'tests/test_store';
 
 import {
@@ -66,7 +68,7 @@ describe('AppCommandParser', () => {
     let parser: AppCommandParser;
     beforeEach(async () => {
         const store = await makeStore(testBindings);
-        parser = new AppCommandParser(store as any, intl, 'current_channel_id', 'team_id', 'root_id');
+        parser = new AppCommandParser(store as any, intl as IntlShape, 'current_channel_id', 'team_id', 'root_id');
     });
 
     type Variant = {
diff --git a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.ts b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.ts
index 694b95369f4..d4aeb2e2f12 100644
--- a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.ts
+++ b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.ts
@@ -3,6 +3,7 @@
 
 /* eslint-disable max-lines */
 
+import type {IntlShape} from 'react-intl';
 import type {Store} from 'redux';
 
 import {Constants} from 'utils/constants';
@@ -59,7 +60,7 @@ import type {
     AutocompleteStaticSelect,
     Channel,
     ExtendedAutocompleteSuggestion,
-    intlShim} from './app_command_parser_dependencies';
+} from './app_command_parser_dependencies';
 
 export enum ParseState {
     Start = 'Start',
@@ -96,8 +97,6 @@ interface FormsCache {
     getSubmittableForm: (location: string, binding: AppBinding) => Promise<{form?: AppForm; error?: string} | undefined>;
 }
 
-type Intl = typeof intlShim;
-
 const getCommandBindings = makeAppBindingsSelector(AppBindingLocations.COMMAND);
 const getRHSCommandBindings = makeRHSAppBindingSelector(AppBindingLocations.COMMAND);
 
@@ -115,7 +114,7 @@ export class ParsedCommand {
     values: {[name: string]: string | string[]} = {};
     location = '';
     error = '';
-    intl: Intl;
+    intl: IntlShape;
 
     constructor(command: string, formsCache: FormsCache, intl: any) {
         this.command = command;
@@ -866,9 +865,9 @@ export class AppCommandParser {
     private channelID: string;
     private teamID: string;
     private rootPostID?: string;
-    private intl: Intl;
+    private intl: IntlShape;
 
-    constructor(store: Store|null, intl: Intl, channelID: string, teamID = '', rootPostID = '') {
+    constructor(store: Store|null, intl: IntlShape, channelID: string, teamID = '', rootPostID = '') {
         this.store = store || getStore();
         this.channelID = channelID;
         this.rootPostID = rootPostID;
diff --git a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies.ts b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies.ts
index 7a1949ca16d..2a24436dadc 100644
--- a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies.ts
+++ b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies.ts
@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import type {IntlShape} from 'react-intl';
+
 import type {Channel} from '@mattermost/types/channels';
 import type {AutocompleteSuggestion} from '@mattermost/types/integrations';
 import type {UserProfile} from '@mattermost/types/users';
@@ -10,7 +12,6 @@ import reduxStore from 'stores/redux_store';
 
 import {Constants} from 'utils/constants';
 import {isMac} from 'utils/user_agent';
-import {localizeAndFormatMessage} from 'utils/utils';
 
 import type {ParsedCommand} from './app_command_parser';
 
@@ -113,14 +114,8 @@ export const displayError = (err: string, channelID: string, rootID?: string) =>
     reduxStore.dispatch(sendEphemeralPost(err, channelID, rootID));
 };
 
-// Shim of mobile-version intl
-export const intlShim = {
-    formatMessage: (config: {id: string; defaultMessage?: string}, values?: {[name: string]: any}) => {
-        return localizeAndFormatMessage(config, values);
-    },
-};
-
-export const errorMessage = (intl: typeof intlShim, error: string, _command: string, _position: number): string => { // eslint-disable-line @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const errorMessage = (intl: IntlShape, error: string, _command: string, _position: number): string => {
     return intl.formatMessage({
         id: 'apps.error.parser',
         defaultMessage: 'Parsing error: {error}',
diff --git a/webapp/channels/src/components/suggestion/command_provider/app_provider.tsx b/webapp/channels/src/components/suggestion/command_provider/app_provider.tsx
index 125ea7b7106..3dc46247b10 100644
--- a/webapp/channels/src/components/suggestion/command_provider/app_provider.tsx
+++ b/webapp/channels/src/components/suggestion/command_provider/app_provider.tsx
@@ -11,11 +11,12 @@ import {openAppsModal} from 'actions/apps';
 import globalStore from 'stores/redux_store';
 
 import {Constants} from 'utils/constants';
+import {getIntl} from 'utils/i18n';
 
 import type {GlobalState} from 'types/store';
 
 import {AppCommandParser} from './app_command_parser/app_command_parser';
-import {COMMAND_SUGGESTION_CHANNEL, COMMAND_SUGGESTION_USER, intlShim} from './app_command_parser/app_command_parser_dependencies';
+import {COMMAND_SUGGESTION_CHANNEL, COMMAND_SUGGESTION_USER} from './app_command_parser/app_command_parser_dependencies';
 import type {AutocompleteSuggestion, Channel, UserProfile} from './app_command_parser/app_command_parser_dependencies';
 import {CommandSuggestion} from './command_provider';
 
@@ -41,7 +42,7 @@ export default class AppCommandProvider extends Provider {
         super();
 
         this.store = globalStore;
-        this.appCommandParser = new AppCommandParser(this.store as any, intlShim, props.channelId, props.teamId, props.rootId);
+        this.appCommandParser = new AppCommandParser(this.store as any, getIntl(), props.channelId, props.teamId, props.rootId);
         this.triggerCharacter = '/';
     }
 
diff --git a/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx b/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx
index dd7c2ab9a39..2ad723ed99f 100644
--- a/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx
+++ b/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx
@@ -16,13 +16,13 @@ import globalStore from 'stores/redux_store';
 import usePrefixedIds from 'components/common/hooks/usePrefixedIds';
 
 import {Constants} from 'utils/constants';
+import {getIntl} from 'utils/i18n';
 import * as UserAgent from 'utils/user_agent';
 
 import type {GlobalState} from 'types/store';
 
 import {AppCommandParser} from './app_command_parser/app_command_parser';
 import type {ExtendedAutocompleteSuggestion} from './app_command_parser/app_command_parser_dependencies';
-import {intlShim} from './app_command_parser/app_command_parser_dependencies';
 
 import Provider from '../provider';
 import type {ResultsCallback} from '../provider';
@@ -117,7 +117,7 @@ export default class CommandProvider extends Provider {
 
         this.store = globalStore;
         this.props = props;
-        this.appCommandParser = new AppCommandParser(this.store as any, intlShim, props.channelId, props.teamId, props.rootId);
+        this.appCommandParser = new AppCommandParser(this.store as any, getIntl(), props.channelId, props.teamId, props.rootId);
         this.triggerCharacter = '/';
     }
 
diff --git a/webapp/channels/src/components/suggestion/suggestion_list.tsx b/webapp/channels/src/components/suggestion/suggestion_list.tsx
index 5ab9b7b345b..1b6c2fff1fd 100644
--- a/webapp/channels/src/components/suggestion/suggestion_list.tsx
+++ b/webapp/channels/src/components/suggestion/suggestion_list.tsx
@@ -147,21 +147,6 @@ export default class SuggestionList extends React.PureComponent<Props> {
         };
     }
 
-    renderDivider(type: string) {
-        const id = type ? 'suggestion.' + type : 'suggestion.default';
-        return (
-            <li
-                key={type + '-divider'}
-                className='suggestion-list__divider'
-                role='separator'
-            >
-                <h2>
-                    <FormattedMessage id={id}/>
-                </h2>
-            </li>
-        );
-    }
-
     renderNoResults() {
         return (
             <ul
diff --git a/webapp/channels/src/components/team_settings/team_access_tab/open_invite.tsx b/webapp/channels/src/components/team_settings/team_access_tab/open_invite.tsx
index 27cb7eab86e..35b4ae04ce5 100644
--- a/webapp/channels/src/components/team_settings/team_access_tab/open_invite.tsx
+++ b/webapp/channels/src/components/team_settings/team_access_tab/open_invite.tsx
@@ -43,7 +43,7 @@ const OpenInvite = ({isGroupConstrained, allowOpenInvite, setAllowOpenInvite}: P
                 })}
                 description={formatMessage({
                     id: 'general_tab.openInviteDesc',
-                    defaultMessage: 'When enabled, a link to this team will be included on the landing page allowing anyone with an account to join this team. Changing this setting will create a new invitation link and invalidate the previous link.',
+                    defaultMessage: "When allowed, a link to this team will be included on the landing page allowing anyone with an account to join this team. Changing from 'Yes' to 'No' will regenerate the invitation code, create a new invitation link and invalidate the previous link.",
                 })}
                 descriptionAboveContent={true}
                 content={groupConstrainedContent}
@@ -69,7 +69,7 @@ const OpenInvite = ({isGroupConstrained, allowOpenInvite, setAllowOpenInvite}: P
             })}
             description={formatMessage({
                 id: 'general_tab.openInviteDesc',
-                defaultMessage: 'When enabled, a link to this team will be included on the landing page allowing anyone with an account to join this team. Changing this setting will create a new invitation link and invalidate the previous link.',
+                defaultMessage: "When allowed, a link to this team will be included on the landing page allowing anyone with an account to join this team. Changing from 'Yes' to 'No' will regenerate the invitation code, create a new invitation link and invalidate the previous link.",
             })}
             descriptionAboveContent={true}
         />
diff --git a/webapp/channels/src/components/team_settings/team_access_tab/team_access_tab.tsx b/webapp/channels/src/components/team_settings/team_access_tab/team_access_tab.tsx
index b70786041ef..96cd7a44822 100644
--- a/webapp/channels/src/components/team_settings/team_access_tab/team_access_tab.tsx
+++ b/webapp/channels/src/components/team_settings/team_access_tab/team_access_tab.tsx
@@ -117,7 +117,7 @@ const AccessTab = ({closeModal, collapseModal, hasChangeTabError, hasChanges, se
                                     className='fa fa-angle-left'
                                     aria-label={formatMessage({
                                         id: 'generic_icons.collapse',
-                                        defaultMessage: 'Collapes Icon',
+                                        defaultMessage: 'Collapse Icon',
                                     })}
                                     onClick={collapseModalHandler}
                                 />
@@ -131,15 +131,14 @@ const AccessTab = ({closeModal, collapseModal, hasChangeTabError, hasChanges, se
                         aria-labelledby='accessButton'
                         role='tabpanel'
                     >
-                        {team.group_constrained ?
-                            undefined :
+                        {!team.group_constrained && (
                             <AllowedDomainsSelect
                                 allowedDomains={allowedDomains}
                                 setAllowedDomains={setAllowedDomains}
                                 setHasChanges={setHasChanges}
                                 setSaveChangesPanelState={setSaveChangesPanelState}
                             />
-                        }
+                        )}
                         <div className='divider-light'/>
                         <OpenInvite
                             isGroupConstrained={team.group_constrained}
@@ -147,18 +146,18 @@ const AccessTab = ({closeModal, collapseModal, hasChangeTabError, hasChanges, se
                             setAllowOpenInvite={updateOpenInvite}
                         />
                         <div className='divider-light'/>
-                        {team.group_constrained ?
-                            undefined :
+                        {!team.group_constrained && (
                             <InviteSectionInput regenerateTeamInviteId={actions.regenerateTeamInviteId}/>
-                        }
-                        {hasChanges ?
+                        )}
+                        {hasChanges && (
                             <SaveChangesPanel
                                 handleCancel={handleCancel}
                                 handleSubmit={handleSaveChanges}
                                 handleClose={handleClose}
                                 tabChangeError={hasChangeTabError}
                                 state={saveChangesPanelState}
-                            /> : undefined}
+                            />
+                        )}
                     </div>
                 </>
             }
diff --git a/webapp/channels/src/components/team_settings/team_info_tab/team_info_tab.tsx b/webapp/channels/src/components/team_settings/team_info_tab/team_info_tab.tsx
index af23865de8a..373202d2f38 100644
--- a/webapp/channels/src/components/team_settings/team_info_tab/team_info_tab.tsx
+++ b/webapp/channels/src/components/team_settings/team_info_tab/team_info_tab.tsx
@@ -192,7 +192,7 @@ const InfoTab = ({team, hasChanges, maxFileSize, closeModal, collapseModal, hasC
                             className='fa fa-angle-left'
                             aria-label={formatMessage({
                                 id: 'generic_icons.collapse',
-                                defaultMessage: 'Collapes Icon',
+                                defaultMessage: 'Collapse Icon',
                             })}
                             onClick={handleCollapseModal}
                         />
@@ -226,14 +226,15 @@ const InfoTab = ({team, hasChanges, maxFileSize, closeModal, collapseModal, hasC
                     teamName={team.display_name ?? team.name}
                     clientError={imageClientError}
                 />
-                {hasChanges ?
+                {hasChanges && (
                     <SaveChangesPanel
                         handleCancel={handleCancel}
                         handleSubmit={handleSaveChanges}
                         handleClose={handleClose}
                         tabChangeError={hasChangeTabError}
                         state={saveChangesPanelState}
-                    /> : undefined}
+                    />
+                )}
             </div>
         </>
     );
diff --git a/webapp/channels/src/components/thread_popout/thread_popout.tsx b/webapp/channels/src/components/thread_popout/thread_popout.tsx
index 0eb22859e15..6dc1910530e 100644
--- a/webapp/channels/src/components/thread_popout/thread_popout.tsx
+++ b/webapp/channels/src/components/thread_popout/thread_popout.tsx
@@ -37,10 +37,12 @@ import type {GlobalState} from 'types/store';
 
 const THREAD_POPOUT_TITLE = defineMessage({
     id: 'thread_popout.title',
+    // eslint-disable-next-line formatjs/enforce-placeholders -- provided later
     defaultMessage: 'Thread - {channelName} - {teamName} - {serverName}',
 });
 const THREAD_POPOUT_TITLE_DM = defineMessage({
     id: 'thread_popout.title.dm',
+    // eslint-disable-next-line formatjs/enforce-placeholders -- provided later
     defaultMessage: 'Thread - {channelName} - {serverName}',
 });
 export function getThreadPopoutTitle(channel?: Channel) {
diff --git a/webapp/channels/src/components/threading/channel_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap b/webapp/channels/src/components/threading/channel_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap
index 5e614325b02..be2ca7225d2 100644
--- a/webapp/channels/src/components/threading/channel_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap
+++ b/webapp/channels/src/components/threading/channel_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap
@@ -536,7 +536,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
     <WithTooltip
       title={
         <Memo(MemoizedFormattedMessage)
-          defaultMessage="{newReplies, plural, =0 {no unread messages} =1 {one unread message} other {# unread messages}}"
+          defaultMessage="{newReplies, plural, =0 {No unread messages} =1 {One unread message} other {# unread messages}}"
           id="threading.numNewMessages"
           values={
             Object {
diff --git a/webapp/channels/src/components/threading/channel_threads/thread_footer/thread_footer.tsx b/webapp/channels/src/components/threading/channel_threads/thread_footer/thread_footer.tsx
index 65f9d95ee8f..2a38ea811cf 100644
--- a/webapp/channels/src/components/threading/channel_threads/thread_footer/thread_footer.tsx
+++ b/webapp/channels/src/components/threading/channel_threads/thread_footer/thread_footer.tsx
@@ -91,7 +91,7 @@ function ThreadFooter({
                     title={
                         <FormattedMessage
                             id='threading.numNewMessages'
-                            defaultMessage='{newReplies, plural, =0 {no unread messages} =1 {one unread message} other {# unread messages}}'
+                            defaultMessage='{newReplies, plural, =0 {No unread messages} =1 {One unread message} other {# unread messages}}'
                             values={{newReplies: thread.unread_replies}}
                         />
                     }
diff --git a/webapp/channels/src/components/three_days_left_trial_modal/three_days_left_trial_modal.tsx b/webapp/channels/src/components/three_days_left_trial_modal/three_days_left_trial_modal.tsx
index 2098c93f31e..d5c4d2f0ff4 100644
--- a/webapp/channels/src/components/three_days_left_trial_modal/three_days_left_trial_modal.tsx
+++ b/webapp/channels/src/components/three_days_left_trial_modal/three_days_left_trial_modal.tsx
@@ -58,8 +58,8 @@ function ThreeDaysLeftTrialModal(props: Props): JSX.Element | null {
     const steps: ThreeDaysLeftTrialCardProps[] = useMemo(() => [
         {
             id: 'useSso',
-            title: formatMessage({id: 'three_days_left_trial.modal.useSsoTitle', defaultMessage: 'Single Sign on (with OpenID, SAML, Google, 0365)'}),
-            description: formatMessage({id: 'three_days_left_trial.modal.useSsoDescription', defaultMessage: 'Collaborate with users outside of your organization while tightly controlling their access to channels and team members.'}),
+            title: formatMessage({id: 'three_days_left_trial.modal.useSsoTitle', defaultMessage: 'Use SSO (with OpenID, SAML, Google, O365)'}),
+            description: formatMessage({id: 'three_days_left_trial.modal.useSsoDescription', defaultMessage: 'Sign on quickly and easily with our SSO feature that works with OpenID, SAML, Google, and O365.'}),
             svgWrapperClassName: 'guestAccessSvg',
             svgElement: (
                 <GuestAccessSvg
diff --git a/webapp/channels/src/components/toast/toast.tsx b/webapp/channels/src/components/toast/toast.tsx
index 4ba8e3d49cb..02bf0f3a3a4 100644
--- a/webapp/channels/src/components/toast/toast.tsx
+++ b/webapp/channels/src/components/toast/toast.tsx
@@ -77,7 +77,7 @@ export default function Toast({
                         <div className='tooltip__shortcut--txt'>
                             <FormattedMessage
                                 id='general_button.esc'
-                                defaultMessage='esc'
+                                defaultMessage='Esc'
                             />
                         </div>
                     </>
diff --git a/webapp/channels/src/components/user_list_row_with_error/user_list_row_with_error.tsx b/webapp/channels/src/components/user_list_row_with_error/user_list_row_with_error.tsx
index 9720405224d..0dbb0e945c7 100644
--- a/webapp/channels/src/components/user_list_row_with_error/user_list_row_with_error.tsx
+++ b/webapp/channels/src/components/user_list_row_with_error/user_list_row_with_error.tsx
@@ -90,9 +90,9 @@ export default class UserListRowWithError extends React.PureComponent<Props, Sta
             email = (
                 <FormattedMessage
                     id='admin.user_item.email_title'
-                    defaultMessage='<b>Email:</b> {email}'
+                    defaultMessage='<strong>Email:</strong> {email}'
                     values={{
-                        b: (values: React.ReactNode) => <b>{values}</b>,
+                        strong: (values: React.ReactNode) => <strong>{values}</strong>,
                         email: this.props.user.email,
                     }}
                 />
diff --git a/webapp/channels/src/components/user_settings/display/__snapshots__/user_settings_display.test.tsx.snap b/webapp/channels/src/components/user_settings/display/__snapshots__/user_settings_display.test.tsx.snap
index 7a5dc8a2ce1..034a6b9d35e 100644
--- a/webapp/channels/src/components/user_settings/display/__snapshots__/user_settings_display.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/display/__snapshots__/user_settings_display.test.tsx.snap
@@ -99,7 +99,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -493,7 +493,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -957,7 +957,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -1281,7 +1281,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -1675,7 +1675,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -1999,7 +1999,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -2305,7 +2305,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -2699,7 +2699,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -3111,7 +3111,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -3435,7 +3435,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -3759,7 +3759,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -4095,7 +4095,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -4419,7 +4419,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
@@ -4743,7 +4743,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should not show la
         section="availabilityStatus"
         title={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Show user availability on posts"
+            defaultMessage="Show online availability on profile images"
             id="user.settings.display.availabilityStatusOnPostsTitle"
           />
         }
diff --git a/webapp/channels/src/components/user_settings/display/manage_timezones/manage_timezones.tsx b/webapp/channels/src/components/user_settings/display/manage_timezones/manage_timezones.tsx
index f3f50af9faa..abb7e91fa93 100644
--- a/webapp/channels/src/components/user_settings/display/manage_timezones/manage_timezones.tsx
+++ b/webapp/channels/src/components/user_settings/display/manage_timezones/manage_timezones.tsx
@@ -259,7 +259,7 @@ export default class ManageTimezones extends React.PureComponent<Props, State> {
                 <br/>
                 <FormattedMessage
                     id='user.settings.timezones.promote'
-                    defaultMessage='Select the time zone used for timestamps in the user interface and email notifications.'
+                    defaultMessage='Select the timezone used for timestamps in the user interface and email notifications.'
                 />
             </div>,
         );
diff --git a/webapp/channels/src/components/user_settings/display/render_emoticons_as_emoji/__snapshots__/render_emoticons_as_emoji.test.tsx.snap b/webapp/channels/src/components/user_settings/display/render_emoticons_as_emoji/__snapshots__/render_emoticons_as_emoji.test.tsx.snap
index 5e0ff676e54..02d2728e544 100644
--- a/webapp/channels/src/components/user_settings/display/render_emoticons_as_emoji/__snapshots__/render_emoticons_as_emoji.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/display/render_emoticons_as_emoji/__snapshots__/render_emoticons_as_emoji.test.tsx.snap
@@ -60,7 +60,7 @@ exports[`components/user_settings/display/render_emoticons_as_emoji/render_emoti
             <div
               class="mt-5"
             >
-              When enabled, text emoticons in messages will be rendered as emojis (For example :D as 😄)
+              When enabled, text emoticons in messages will automatically be rendered as emojis (For example :D as 😄)
             </div>
           </fieldset>
         </div>
diff --git a/webapp/channels/src/components/user_settings/display/render_emoticons_as_emoji/render_emoticons_as_emoji.tsx b/webapp/channels/src/components/user_settings/display/render_emoticons_as_emoji/render_emoticons_as_emoji.tsx
index d27e42dfa9b..c848f79dc63 100644
--- a/webapp/channels/src/components/user_settings/display/render_emoticons_as_emoji/render_emoticons_as_emoji.tsx
+++ b/webapp/channels/src/components/user_settings/display/render_emoticons_as_emoji/render_emoticons_as_emoji.tsx
@@ -107,7 +107,7 @@ const RenderEmoticonsAsEmoji: React.FC<Props> = ({user, renderEmoticonsAsEmoji,
             <div className='mt-5'>
                 <FormattedMessage
                     id='user.settings.display.renderEmoticonsAsEmojiDesc'
-                    defaultMessage='When enabled, text emoticons in messages will be rendered as emojis (For example :D as 😄)'
+                    defaultMessage='When enabled, text emoticons in messages will automatically be rendered as emojis (For example :D as 😄)'
                 />
             </div>
         </fieldset>
diff --git a/webapp/channels/src/components/user_settings/display/user_settings_display.tsx b/webapp/channels/src/components/user_settings/display/user_settings_display.tsx
index 6a4959ebf74..64ac5a472a1 100644
--- a/webapp/channels/src/components/user_settings/display/user_settings_display.tsx
+++ b/webapp/channels/src/components/user_settings/display/user_settings_display.tsx
@@ -827,7 +827,7 @@ export default class UserSettingsDisplay extends React.PureComponent<Props, Stat
             defaultDisplay: 'true',
             title: defineMessage({
                 id: 'user.settings.display.availabilityStatusOnPostsTitle',
-                defaultMessage: 'Show user availability on posts',
+                defaultMessage: 'Show online availability on profile images',
             }),
             firstOption: {
                 value: 'true',
@@ -1129,7 +1129,7 @@ export default class UserSettingsDisplay extends React.PureComponent<Props, Stat
                 },
                 description: defineMessage({
                     id: 'user.settings.display.oneClickReactionsOnPostsDescription',
-                    defaultMessage: 'When enabled, you can react in one-click with recently used reactions when hovering over a message.',
+                    defaultMessage: 'When enabled, you can react quickly with recently used reactions when hovering over a message.',
                 }),
             });
         }
diff --git a/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/__snapshots__/custom_theme_chooser.test.tsx.snap b/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/__snapshots__/custom_theme_chooser.test.tsx.snap
index 2125b4d5d8f..9645b6012c3 100644
--- a/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/__snapshots__/custom_theme_chooser.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/__snapshots__/custom_theme_chooser.test.tsx.snap
@@ -571,7 +571,7 @@ exports[`components/user_settings/display/CustomThemeChooser should match, init
         htmlFor="pasteBox"
       >
         <MemoizedFormattedMessage
-          defaultMessage="Copy to share or paste theme colors here:"
+          defaultMessage="Copy and paste to share theme colors:"
           id="user.settings.custom_theme.copyPaste"
         />
       </label>
diff --git a/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx b/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx
index 09ee355d542..415b56f050d 100644
--- a/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx
+++ b/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx
@@ -419,7 +419,7 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
                 >
                     <FormattedMessage
                         id='user.settings.custom_theme.copyPaste'
-                        defaultMessage='Copy to share or paste theme colors here:'
+                        defaultMessage='Copy and paste to share theme colors:'
                     />
                 </label>
                 <textarea
diff --git a/webapp/channels/src/components/user_settings/general/user_settings_general.tsx b/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
index eac5a09e718..58ac52d4170 100644
--- a/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
+++ b/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
@@ -65,7 +65,7 @@ const holders = defineMessages({
     },
     validImage: {
         id: 'user.settings.general.validImage',
-        defaultMessage: 'Only BMP, JPG, JPEG, or PNG images may be used for profile pictures',
+        defaultMessage: 'Only BMP, JPG or PNG images may be used for profile pictures',
     },
     imageTooLarge: {
         id: 'user.settings.general.imageTooLarge',
@@ -746,7 +746,7 @@ export class UserSettingsGeneralTab extends PureComponent<Props, State> {
                         <div className='setting-list__hint pb-3'>
                             <FormattedMessage
                                 id='user.settings.general.emailGoogleCantUpdate'
-                                defaultMessage='Login occurs through Google Apps. Email cannot be updated. Email address used for notifications is {email}.'
+                                defaultMessage='Login occurs through Google. Email cannot be updated. Email address used for notifications is {email}.'
                                 values={{
                                     email: this.state.originalEmail,
                                 }}
@@ -863,7 +863,7 @@ export class UserSettingsGeneralTab extends PureComponent<Props, State> {
             describe = (
                 <FormattedMessage
                     id='user.settings.general.loginGoogle'
-                    defaultMessage='Login done through Google Apps ({email})'
+                    defaultMessage='Login done through Google ({email})'
                     values={{
                         email: this.state.originalEmail,
                     }}
@@ -1794,7 +1794,7 @@ export class UserSettingsGeneralTab extends PureComponent<Props, State> {
                     text={
                         <FormattedMessage
                             id='user.settings.modal.profile'
-                            defaultMessage='Profile'
+                            defaultMessage='Profile Settings'
                         />
                     }
                 />
@@ -1804,7 +1804,7 @@ export class UserSettingsGeneralTab extends PureComponent<Props, State> {
                         text={
                             <FormattedMessage
                                 id='user.settings.modal.profile'
-                                defaultMessage='Profile'
+                                defaultMessage='Profile Settings'
                             />
                         }
                     />
diff --git a/webapp/channels/src/components/user_settings/modal/user_settings_modal.tsx b/webapp/channels/src/components/user_settings/modal/user_settings_modal.tsx
index f874335faad..9940ec278e2 100644
--- a/webapp/channels/src/components/user_settings/modal/user_settings_modal.tsx
+++ b/webapp/channels/src/components/user_settings/modal/user_settings_modal.tsx
@@ -292,7 +292,7 @@ class UserSettingsModal extends React.PureComponent<Props, State> {
         return [
             {
                 name: 'profile',
-                uiName: formatMessage({id: 'user.settings.modal.profile', defaultMessage: 'Profile'}),
+                uiName: formatMessage({id: 'user.settings.modal.profile', defaultMessage: 'Profile Settings'}),
                 icon: 'icon icon-settings-outline',
                 iconTitle: formatMessage({id: 'user.settings.profile.icon', defaultMessage: 'Profile Settings Icon'}),
             },
@@ -324,7 +324,7 @@ class UserSettingsModal extends React.PureComponent<Props, State> {
         let modalTitle: string;
         if (this.props.adminMode && this.props.user) {
             modalTitle = formatMessage(
-                {id: 'userSettings.adminMode.modal_header', defaultMessage: "{userDisplayName}'s Settings"},
+                {id: 'userSettings.adminMode.modal_header', defaultMessage: "Manage {userDisplayName}'s Settings"},
                 {userDisplayName: getDisplayName(this.props.user)},
             );
         } else if (this.props.isContentProductSettings) {
diff --git a/webapp/channels/src/components/widgets/icons/flag_icon.tsx b/webapp/channels/src/components/widgets/icons/flag_icon.tsx
index ae3ab0f313b..1842e22d29c 100644
--- a/webapp/channels/src/components/widgets/icons/flag_icon.tsx
+++ b/webapp/channels/src/components/widgets/icons/flag_icon.tsx
@@ -13,7 +13,7 @@ export default function FlagIcon(props: React.HTMLAttributes<HTMLSpanElement>) {
                 height='16px'
                 viewBox='0 0 16 16'
                 role='img'
-                aria-label={formatMessage({id: 'generic_icons.flag', defaultMessage: 'Flag Icon'})}
+                aria-label={formatMessage({id: 'generic_icons.flag', defaultMessage: 'Save Icon'})}
             >
                 <path d='M11.744 12.5L8 10.862L4.256 12.5V2.74405H11.744V12.5ZM11.744 1.25005H4.256C3.836 1.25005 3.476 1.40005 3.176 1.70005C2.888 1.98805 2.744 2.33605 2.744 2.74405V14.75L8 12.5L13.256 14.75V2.74405C13.256 2.33605 13.106 1.98805 12.806 1.70005C12.518 1.40005 12.164 1.25005 11.744 1.25005Z'/>
             </svg>
diff --git a/webapp/channels/src/components/widgets/icons/flag_icon_filled.tsx b/webapp/channels/src/components/widgets/icons/flag_icon_filled.tsx
index 56fc69a2a26..35d86b2e56a 100644
--- a/webapp/channels/src/components/widgets/icons/flag_icon_filled.tsx
+++ b/webapp/channels/src/components/widgets/icons/flag_icon_filled.tsx
@@ -13,7 +13,7 @@ export default function FlagIconFilled(props: React.HTMLAttributes<HTMLSpanEleme
                 height='15px'
                 viewBox='0 0 12 15'
                 role='img'
-                aria-label={formatMessage({id: 'generic_icons.flagged', defaultMessage: 'Flagged Icon'})}
+                aria-label={formatMessage({id: 'generic_icons.flagged', defaultMessage: 'Saved Icon'})}
             >
                 <g
                     stroke='none'
diff --git a/webapp/channels/src/components/widgets/loading/loading_spinner.test.tsx b/webapp/channels/src/components/widgets/loading/loading_spinner.test.tsx
index 0fef414d020..b9b3f0bfd2d 100644
--- a/webapp/channels/src/components/widgets/loading/loading_spinner.test.tsx
+++ b/webapp/channels/src/components/widgets/loading/loading_spinner.test.tsx
@@ -26,6 +26,7 @@ describe('components/widgets/loadingLoadingSpinner', () => {
         renderWithContext(
             <LoadingSpinner
                 text={
+                    // eslint-disable-next-line formatjs/enforce-default-message -- test uses dynamic ID
                     <FormattedMessage id={messageId}/>
                 }
             />,
diff --git a/webapp/channels/src/components/widgets/menu/menu_items/useWords.tsx b/webapp/channels/src/components/widgets/menu/menu_items/useWords.tsx
index 7624dc94fd1..3ea08a89005 100644
--- a/webapp/channels/src/components/widgets/menu/menu_items/useWords.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu_items/useWords.tsx
@@ -88,6 +88,8 @@ export default function useWords(highestLimit: LimitSummary | false, isAdminUser
     case LimitTypes.messageHistory: {
         let description = defineMessage({
             id: 'workspace_limits.menu_limit.warn.messages_history',
+
+            // eslint-disable-next-line formatjs/enforce-placeholders -- limit, callToAction provided
             defaultMessage: 'You\'re getting closer to the free {limit} message limit. <a>{callToAction}</a>',
         });
         values.limit = intl.formatNumber(highestLimit.limit);
@@ -95,12 +97,16 @@ export default function useWords(highestLimit: LimitSummary | false, isAdminUser
             if (isAdminUser) {
                 description = defineMessage({
                     id: 'workspace_limits.menu_limit.critical.messages_history',
-                    defaultMessage: 'You\'re close to hitting the free {limit} message history limit <a>{callToAction}</a>',
+
+                    // eslint-disable-next-line formatjs/enforce-placeholders -- limit, callToAction provided
+                    defaultMessage: 'You’re close to hitting the free {limit} message history limit <a>{callToAction}</a>',
                 });
             } else {
                 description = defineMessage({
                     id: 'workspace_limits.menu_limit.critical.messages_history_non_admin',
-                    defaultMessage: 'You\'re almost at the message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>',
+
+                    // eslint-disable-next-line formatjs/enforce-placeholders -- callToAction provided
+                    defaultMessage: 'You’re almost at the message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>',
                 });
             }
         }
@@ -108,13 +114,17 @@ export default function useWords(highestLimit: LimitSummary | false, isAdminUser
             if (isAdminUser) {
                 description = defineMessage({
                     id: 'workspace_limits.menu_limit.reached.messages_history',
-                    defaultMessage: 'You\'ve reached the free message history limit. You can only view up to the last {limit} messages in your history. <a>{callToAction}</a>',
+
+                    // eslint-disable-next-line formatjs/enforce-placeholders -- limit, callToAction provided
+                    defaultMessage: 'You’ve reached the free message history limit. You can only view up to the last {limit} messages in your history. <a>{callToAction}</a>',
                 });
                 values.limit = inK(highestLimit.limit);
             } else {
                 description = defineMessage({
                     id: 'workspace_limits.menu_limit.reached.messages_history_non_admin',
-                    defaultMessage: 'You\'ve reached your message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>',
+
+                    // eslint-disable-next-line formatjs/enforce-placeholders -- callToAction provided
+                    defaultMessage: 'You’ve reached your message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>',
                 });
             }
         }
@@ -122,13 +132,17 @@ export default function useWords(highestLimit: LimitSummary | false, isAdminUser
             if (isAdminUser) {
                 description = defineMessage({
                     id: 'workspace_limits.menu_limit.over.messages_history',
-                    defaultMessage: 'You\'re over the free message history limit. You can only view up to the last {limit} messages in your history. <a>{callToAction}</a>',
+
+                    // eslint-disable-next-line formatjs/enforce-placeholders -- limit, callToAction provided
+                    defaultMessage: 'You’re over the free message history limit. You can only view up to the last {limit} messages in your history. <a>{callToAction}</a>',
                 });
                 values.limit = inK(highestLimit.limit);
             } else {
                 description = defineMessage({
                     id: 'workspace_limits.menu_limit.over.messages_history_non_admin',
-                    defaultMessage: 'You\'re over your message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>',
+
+                    // eslint-disable-next-line formatjs/enforce-placeholders -- callToAction provided
+                    defaultMessage: 'You’re over your message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>',
                 });
             }
         }
@@ -147,25 +161,33 @@ export default function useWords(highestLimit: LimitSummary | false, isAdminUser
     case LimitTypes.fileStorage: {
         let description = defineMessage({
             id: 'workspace_limits.menu_limit.warn.files_storage',
-            defaultMessage: 'You\'re getting closer to the {limit} file storage limit. <a>{callToAction}</a>',
+
+            // eslint-disable-next-line formatjs/enforce-placeholders -- limit, callToAction provided
+            defaultMessage: 'You’re getting closer to the {limit} file storage limit. <a>{callToAction}</a>',
         });
         values.limit = asGBString(highestLimit.limit, intl.formatNumber);
         if (usageRatio >= limitThresholds.danger) {
             description = defineMessage({
                 id: 'workspace_limits.menu_limit.critical.files_storage',
-                defaultMessage: 'You\'re getting closer to the {limit} file storage limit. <a>{callToAction}</a>',
+
+                // eslint-disable-next-line formatjs/enforce-placeholders -- limit, callToAction provided
+                defaultMessage: 'You’re getting closer to the {limit} file storage limit. <a>{callToAction}</a>',
             });
         }
         if (usageRatio >= limitThresholds.reached) {
             description = defineMessage({
                 id: 'workspace_limits.menu_limit.reached.files_storage',
-                defaultMessage: 'You\'ve reached the {limit} file storage limit. You can only access the most recent {limit} worth of files. <a>{callToAction}</a>',
+
+                // eslint-disable-next-line formatjs/enforce-placeholders -- limit, callToAction provided
+                defaultMessage: 'You’ve reached the {limit} file storage limit. You can only access the most recent {limit} worth of files. <a>{callToAction}</a>',
             });
         }
         if (usageRatio >= limitThresholds.exceeded) {
             description = defineMessage({
                 id: 'workspace_limits.menu_limit.over.files_storage',
-                defaultMessage: 'You\'re over the {limit} file storage limit. You can only access the most recent {limit} worth of files. <a>{callToAction}</a>',
+
+                // eslint-disable-next-line formatjs/enforce-placeholders -- limit, callToAction provided
+                defaultMessage: 'You’re over the {limit} file storage limit. You can only access the most recent {limit} worth of files. <a>{callToAction}</a>',
             });
         }
 
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 4810f2a3f75..c37698d7f57 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -6,7 +6,7 @@
   "about.date": "Build Date:",
   "about.dbversion": "Database Schema Version:",
   "about.desktopVersion": "Desktop Version:",
-  "about.enterpriseEditionLearn": "Learn more about Mattermost {planName} at ",
+  "about.enterpriseEditionLearn": "Learn more about Enterprise Edition at {link}",
   "about.enterpriseEditionSst": "High trust messaging for the enterprise",
   "about.enterpriseEditionSt": "Modern communication from behind your firewall.",
   "about.hash": "Build Hash:",
@@ -14,6 +14,7 @@
   "about.licensed": "Licensed to:",
   "about.loadmetric": "Load Metric:",
   "about.notice": "Mattermost is made possible by the open source software used in our <linkServer>server</linkServer>, <linkDesktop>desktop</linkDesktop> and <linkMobile>mobile</linkMobile> apps.",
+  "about.planNameLearn": "Learn more about Mattermost {planName} at {link}",
   "about.privacy": "Privacy Policy",
   "about.serverDisconnected": "disconnected",
   "about.serverHostname": "Hostname:",
@@ -43,12 +44,12 @@
   "accessibility.button.Search": "Search",
   "accessibility.button.strike": "strike through",
   "accessibility.sections.centerContent": "message list main region",
-  "accessibility.sections.centerFooter": "message input complimentary region",
+  "accessibility.sections.centerFooter": "message input complementary region",
   "accessibility.sections.channelHeader": "channel header region",
   "accessibility.sections.lhsList": "channel sidebar region",
   "accessibility.sections.lhsNavigator": "channel navigator region",
-  "accessibility.sections.rhs": "{regionTitle} complimentary region",
-  "accessibility.sections.rhsContent": "message details complimentary region",
+  "accessibility.sections.rhs": "{regionTitle} complementary region",
+  "accessibility.sections.rhsContent": "message details complementary region",
   "accessibility.sidebar.types.mention": "mention",
   "accessibility.sidebar.types.mentions": "mentions",
   "accessibility.sidebar.types.private": "private channel",
@@ -68,14 +69,14 @@
   "activity_log.moreInfo": "More info",
   "activity_log.os": "OS: {os}",
   "activity_log.sessionId": "Session ID: {id}",
-  "activity_log.sessionsDescription": "Sessions are created when you log in through a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. To end the session sooner, use the 'Log Out' button.",
+  "activity_log.sessionsDescription": "Sessions are created when you log in through a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the system administrator. To end the session sooner, use the 'Log Out' button.",
   "add_command.autocomplete": "Autocomplete",
-  "add_command.autocomplete.help": "(Optional) Show your slash command on the autocomplete list when someone types / in the input box.",
+  "add_command.autocomplete.help": "(Optional) Show your slash command on the autocomplete list when someone types \"/\" in the input box.",
   "add_command.autocompleteDescription": "Autocomplete Description",
   "add_command.autocompleteDescription.help": "(Optional) Describe your slash command for the autocomplete list.",
   "add_command.autocompleteDescription.placeholder": "Example: \"Returns search results for patient records\"",
   "add_command.autocompleteHint": "Autocomplete Hint",
-  "add_command.autocompleteHint.help": "(Optional) Specify the arguments associated with your slash command.",
+  "add_command.autocompleteHint.help": "(Optional) Specify the arguments associated with your slash command. These are displayed as help on the autocomplete list.",
   "add_command.autocompleteHint.placeholder": "Example: [Patient Name]",
   "add_command.cancel": "Cancel",
   "add_command.description": "Description",
@@ -122,7 +123,7 @@
   "add_emoji.imageTooLarge": "Unable to create emoji. Image must be less than 512 KiB in size.",
   "add_emoji.name": "Name",
   "add_emoji.name.help": "Specify an emoji name that's up to 64 characters. It can contain lowercase letters, numbers, and the symbols '-', '+' and '_'.",
-  "add_emoji.nameInvalid": "An emoji's name can only contain lowercase letters, numbers, and the symbols '-' and '_'.",
+  "add_emoji.nameInvalid": "An emoji's name can only contain lowercase letters, numbers, and the symbols '-', '+' and '_'.",
   "add_emoji.nameRequired": "A name is required for the emoji",
   "add_emoji.nameTaken": "This name is already in use by a system emoji. Please choose another name.",
   "add_emoji.preview": "Preview",
@@ -148,21 +149,21 @@
   "add_incoming_webhook.saving": "Saving...",
   "add_incoming_webhook.url": "<b>URL</b>: {url}",
   "add_incoming_webhook.username": "Username",
-  "add_incoming_webhook.username.help": "Specify the username this integration will post as. Usernames must be in lowercase, be up to 22 characters, and can contain numbers and the symbols \"-\", \"_\", and \".\" . If left blank, the name specified by the webhook creator is used.",
-  "add_oauth_app.callbackUrls.help": "Specify the URIs to which the service redirects users after accepting or denying them authorization to your application, and handles authorization codes or access tokens. It must start with http:// or https://.",
-  "add_oauth_app.callbackUrlsRequired": "One or more callback URLs are required",
+  "add_incoming_webhook.username.help": "Specify the username this integration will post as. Usernames can be up to 22 characters, and can contain lowercase letters, numbers and the symbols \"-\", \"_\", and \".\". If left blank, the name specified by the webhook creator is used.",
+  "add_oauth_app.callbackUrls.help": "The redirect URIs to which the service will redirect users after accepting or denying authorization of your application, and which will handle authorization codes or access tokens. Must be a valid URL and start with http:// or https://.",
+  "add_oauth_app.callbackUrlsRequired": "One or more callback URLs are required.",
   "add_oauth_app.clientId": "<b>Client ID</b>: {id}",
   "add_oauth_app.clientSecret": "<b>Client Secret</b>: {secret}",
   "add_oauth_app.description.help": "Describe your OAuth 2.0 application.",
   "add_oauth_app.descriptionRequired": "Description for the OAuth 2.0 application is required.",
   "add_oauth_app.doneHelp": "Your OAuth 2.0 application is set up. Please use the following Client ID and Client Secret when requesting authorization for your application (details at <link>oAuth 2.0 Applications</link>).",
-  "add_oauth_app.doneHelp.public": "Your OAuth 2.0 public client application is set up. Please use the following Client ID when requesting authorization for your application. Public clients must use PKCE for authorization (details at <link>oAuth 2 Applications</link>).",
+  "add_oauth_app.doneHelp.public": "Your OAuth 2.0 public client application is set up. Please use the following Client ID when requesting authorization for your application. Public clients must use PKCE for authorization (details at <link>oAuth 2.0 Applications</link>).",
   "add_oauth_app.doneUrlHelp": "Here are your authorized redirect URLs.",
   "add_oauth_app.header": "Add",
-  "add_oauth_app.homepage.help": "This is the URL for the homepage of the OAuth 2.0 application. Depending on your server configuration, use HTTP or HTTPS in your URL.",
+  "add_oauth_app.homepage.help": "This is the URL for the homepage of the OAuth 2.0 application. Depending on your server configuration, use HTTP or HTTPS in the URL.",
   "add_oauth_app.homepageRequired": "Homepage for the OAuth 2.0 application is required.",
-  "add_oauth_app.icon.help": "(Optional) Specify the URL of the image for your OAuth 2.0 application. Use either HTTP or HTTPS in the URL.",
-  "add_oauth_app.name.help": "Specify the display name of your OAuth 2.0 application. You can use up to 64 characters.",
+  "add_oauth_app.icon.help": "(Optional) The URL of the image used for your OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL.",
+  "add_oauth_app.name.help": "Specify the display name, of up to 64 characters, for your OAuth 2.0 application.",
   "add_oauth_app.nameRequired": "Name for the OAuth 2.0 application is required.",
   "add_oauth_app.public.help": "If true, the OAuth 2.0 application is a public client (no client secret). Public clients must use PKCE for authorization. If false, the application is a confidential client with a client secret. This setting cannot be changed after the application is created.",
   "add_oauth_app.trusted.help": "If true, the OAuth 2.0 application is considered trusted by the Mattermost server and does not require the user to accept authorization. If false, a window opens to ask the user to accept or deny the authorization.",
@@ -180,7 +181,7 @@
   "add_outgoing_oauth_connection.client_secret.label": "Client Secret",
   "add_outgoing_oauth_connection.client_secret.required": "Client Secret for the OAuth connection is required.",
   "add_outgoing_oauth_connection.clientId": "<b>Client ID</b>: {id}",
-  "add_outgoing_oauth_connection.clientSecret": "<b>Client Secret</b>: \\*\\*\\*\\*\\*\\*\\*\\*",
+  "add_outgoing_oauth_connection.clientSecret": "<b>Client Secret</b>: ********",
   "add_outgoing_oauth_connection.confirm_save": "Save Outgoing OAuth Connection",
   "add_outgoing_oauth_connection.connected": "Connected to \"{connectionName}\"",
   "add_outgoing_oauth_connection.documentation_link": "Get help with <link>configuring outgoing OAuth connections</link>.",
@@ -206,7 +207,7 @@
   "add_outgoing_oauth_connection.validating": "Validating...",
   "add_outgoing_oauth_connection.validation_error": "Connection not validated. Please check the server logs for details or <link>try again</link>.",
   "add_outgoing_webhook.callbackUrls": "Callback URLs (One Per Line)",
-  "add_outgoing_webhook.callbackUrls.help": "Specify the URL that messages will be sent to. If the URL is private, add it as a {link}.",
+  "add_outgoing_webhook.callbackUrls.help": "Specify the URL that the messages will be sent to. If the URL is private, add it as a {link}.",
   "add_outgoing_webhook.callbackUrls.helpLinkText": "trusted internal connection",
   "add_outgoing_webhook.callbackUrlsRequired": "One or more callback URLs are required",
   "add_outgoing_webhook.cancel": "Cancel",
@@ -219,8 +220,8 @@
   "add_outgoing_webhook.description": "Description",
   "add_outgoing_webhook.description.help": "Describe your outgoing webhook.",
   "add_outgoing_webhook.displayName": "Title",
-  "add_outgoing_webhook.displayName.help": "Specify a title for the webhook settings page. The title can contain up to 64 characters.",
-  "add_outgoing_webhook.doneHelp": "Your outgoing webhook is set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (details at  <link>Outgoing Webhooks</link>).",
+  "add_outgoing_webhook.displayName.help": "Specify a title, of up to 64 characters, for the webhook settings page.",
+  "add_outgoing_webhook.doneHelp": "Your outgoing webhook is set up. The following token will be sent in the outgoing payload. Please use it to verify that the request came from your Mattermost team (details at <link>Outgoing Webhooks</link>).",
   "add_outgoing_webhook.header": "Outgoing Webhooks",
   "add_outgoing_webhook.icon_url": "Profile Picture",
   "add_outgoing_webhook.icon_url.help": "Enter the URL of a .png or .jpg file for this integration to use as the profile picture when posting. The file should be at least 128 pixels by 128 pixels. If left blank, the profile picture specified by the webhook creator is used.",
@@ -354,9 +355,10 @@
   "admin.access_control.table_editor.values.create_placeholder": "Type to create value",
   "admin.access_control.table_editor.values.select_values": "Select values...",
   "admin.access_control.testResults": "Access Rule Test Results",
-  "admin.accesscontrol.enableDesc": "Allow access restrictions based on user attributes using custom access policies. To effectively use this feature, you must define user attributes (properties) in the {userAttributes} section.",
-  "admin.accesscontrol.enableTitle": "Allow attribute based access controls on this servers",
+  "admin.accesscontrol.enableDesc": "Allow access restrictions based on user attributes using custom access policies. To effectively use this feature, you must define user attributes in the {userAttributes} section.",
+  "admin.accesscontrol.enableTitle": "Allow attribute based access controls on this server",
   "admin.accesscontrol.title": "Attribute-Based Access",
+  "admin.accesscontrol.user_properties.link.label": "User Attributes",
   "admin.advance.cluster": "High Availability",
   "admin.advance.metrics": "Performance Monitoring",
   "admin.announcement_banner_feature_discovery.copy": "Create announcement banners to notify all members of important information.",
@@ -386,7 +388,7 @@
   "admin.audit_logging_experimental.file_name.title": "File Name",
   "admin.auditlogging.title": "Audit Logging",
   "admin.audits.reload": "Reload User Activity Logs",
-  "admin.authentication.email": "Email Authentication",
+  "admin.authentication.email": "Email",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.guest_access": "Guest Access",
   "admin.authentication.ldap": "AD/LDAP",
@@ -429,14 +431,14 @@
   "admin.billing.history.date": "Date",
   "admin.billing.history.description": "Description",
   "admin.billing.history.fractionalAndRatedSeats": "{fractionalSeats} metered seats, {fullSeats} seats at full rate, {partialSeats} seats with partial charges",
-  "admin.billing.history.fractionalSeats": "{fractionalUsers} seats",
+  "admin.billing.history.fractionalSeats": "{fractionalSeats} seats",
   "admin.billing.history.noBillingHistory": "In the future, this is where your billing history will show.",
   "admin.billing.history.onPremSeats": "{num} seats",
   "admin.billing.history.pageInfo": "{startRecord} - {endRecord} of {totalRecords}",
   "admin.billing.history.paid": "Paid",
   "admin.billing.history.paymentFailed": "Payment failed",
   "admin.billing.history.pending": "Pending",
-  "admin.billing.history.seatsAndRates": "{fullUsers} seats at full rate, {partialUsers} seats with partial charges",
+  "admin.billing.history.seatsAndRates": "{fullSeats} seats at full rate, {partialSeats} seats with partial charges",
   "admin.billing.history.seeHowBillingWorks": "See how billing works",
   "admin.billing.history.status": "Status",
   "admin.billing.history.title": "Billing History",
@@ -498,7 +500,7 @@
   "admin.billing.subscription.planDetails.productName.unknown": "Unknown product",
   "admin.billing.subscription.planDetails.subheader": "Plan details",
   "admin.billing.subscription.planDetails.userCount": "{userCount} users",
-  "admin.billing.subscription.privateCloudCard.cloudEnterprise.description": "At Mattermost, we work with you and your organization to meet your needs throughout the product. If you’re considering a wider rollout, talk to us.",
+  "admin.billing.subscription.privateCloudCard.cloudEnterprise.description": "At Mattermost, we work with you and your organization to meet your needs throughout the product. If you're considering a wider rollout, talk to us.",
   "admin.billing.subscription.privateCloudCard.cloudEnterprise.title": "Looking to rollout Mattermost for your entire organization? ",
   "admin.billing.subscription.privateCloudCard.cloudFree.description": "Optimize your processes with Guest Accounts, Office365 suite integrations, GitLab SSO and advanced permissions.",
   "admin.billing.subscription.privateCloudCard.cloudFree.title": "Upgrade to Cloud Professional",
@@ -656,11 +658,11 @@
   "admin.channelSettings.channelDetail.channelName": "Name",
   "admin.channelSettings.channelDetail.channelTeam": "Team",
   "admin.cluster.ClusterName": "Cluster Name:",
-  "admin.cluster.ClusterNameDesc": "The cluster to join by name. Only nodes with the same cluster name will join together.  This is to support Blue-Green deployments or staging pointing to the same database.",
+  "admin.cluster.ClusterNameDesc": "The cluster to join by name. Only nodes with the same cluster name will join together. This is to support Blue-Green deployments or staging pointing to the same database.",
   "admin.cluster.ClusterNameEx": "E.g.: \"Production\" or \"Staging\"",
   "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see <link>documentation</link> to learn more about configuring High Availability for Mattermost.",
   "admin.cluster.EnableGossipCompression": "Enable Gossip compression:",
-  "admin.cluster.EnableGossipCompressionDesc": "When true, all communication through the gossip protocol will be compresssed. It is recommended to keep this flag disabled.",
+  "admin.cluster.EnableGossipCompressionDesc": "When true, all communication through the gossip protocol will be compressed. It is recommended to keep this flag disabled.",
   "admin.cluster.EnableGossipEncryption": "Enable Gossip encryption:",
   "admin.cluster.EnableGossipEncryptionDesc": "When true, all communication through the gossip protocol will be encrypted.",
   "admin.cluster.enableTitle": "Enable High Availability Mode:",
@@ -730,21 +732,21 @@
   "admin.complianceExport.exportFormatDetail.intro": "Format of the compliance export. Corresponds to the system that you want to import the data into.",
   "admin.complianceExport.exportJobStartTime.description": "Set the start time of the daily scheduled compliance export job. Choose a time when fewer people are using your system. Must be a 24-hour time stamp in the form HH:MM.",
   "admin.complianceExport.exportJobStartTime.example": "E.g.: \"02:00\"",
-  "admin.complianceExport.exportJobStartTime.title": "Compliance Export time:",
+  "admin.complianceExport.exportJobStartTime.title": "Compliance Export Time:",
   "admin.complianceExport.globalRelayCustomerType.a10.description": "A10/Type 10",
   "admin.complianceExport.globalRelayCustomerType.a9.description": "A9/Type 9",
   "admin.complianceExport.globalRelayCustomerType.custom.description": "Custom",
-  "admin.complianceExport.globalRelayCustomerType.description": "Type of Global Relay customer account your organization has.",
-  "admin.complianceExport.globalRelayCustomerType.title": "Global Relay Customer Account:",
+  "admin.complianceExport.globalRelayCustomerType.description": "The type of GlobalRelay customer account that your organization has.",
+  "admin.complianceExport.globalRelayCustomerType.title": "Customer Type:",
   "admin.complianceExport.globalRelayCustomSMTPPort.description": "The SMTP server port that will receive your Global Relay EML.",
   "admin.complianceExport.globalRelayCustomSMTPPort.example": "E.g.: \"25\"",
   "admin.complianceExport.globalRelayCustomSMTPPort.title": "SMTP Server Port:",
   "admin.complianceExport.globalRelayCustomSMTPServerName.description": "The SMTP server name that will receive your Global Relay EML.",
   "admin.complianceExport.globalRelayCustomSMTPServerName.example": "E.g.: \"feeds.globalrelay.com\"",
   "admin.complianceExport.globalRelayCustomSMTPServerName.title": "SMTP Server Name:",
-  "admin.complianceExport.globalRelayEmailAddress.description": "The email address your Global Relay server monitors for incoming compliance exports.",
+  "admin.complianceExport.globalRelayEmailAddress.description": "The email address that your GlobalRelay server monitors for incoming Compliance Exports.",
   "admin.complianceExport.globalRelayEmailAddress.example": "E.g.: \"globalrelay@mattermost.com\"",
-  "admin.complianceExport.globalRelayEmailAddress.title": "Global Relay Email Address:",
+  "admin.complianceExport.globalRelayEmailAddress.title": "Email Address:",
   "admin.complianceExport.globalRelaySMTPPassword.description": "The password that is used to authenticate against the GlobalRelay SMTP server.",
   "admin.complianceExport.globalRelaySMTPPassword.example": "E.g.: \"globalRelayPassword\"",
   "admin.complianceExport.globalRelaySMTPPassword.title": "SMTP Password:",
@@ -761,7 +763,8 @@
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.",
   "admin.connectionSecurityTitle": "Connection Security:",
-  "admin.connectionSecurityTls": "TLS",
+  "admin.connectionSecurityTls": "TLS (Recommended)",
+  "admin.connectionSecurityTls.title": "TLS",
   "admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.",
   "admin.content_flagging.enableTitle": "Enable content flagging",
   "admin.contentFlagging.additionalSettings.description": "Configure how you want the flagging to behave",
@@ -772,10 +775,10 @@
   "admin.contentFlagging.additionalSettings.title": "Additional Settings",
   "admin.contentFlagging.notificationSettings.author": "Author",
   "admin.contentFlagging.notificationSettings.description": "Choose who receives notifications from the System bot when content is flagged and reviewed",
-  "admin.contentFlagging.notificationSettings.notifyOnDismissal": "Notify on dismissal:",
-  "admin.contentFlagging.notificationSettings.notifyOnFlag": "Notify when content is flagged:",
-  "admin.contentFlagging.notificationSettings.notifyOnRemoval": "Notify when content is removed:",
-  "admin.contentFlagging.notificationSettings.notifyOnReviewerAssigned": "Notify when a reviewer is assigned:",
+  "admin.contentFlagging.notificationSettings.notifyOnDismissal": "Notify when flag is dismissed",
+  "admin.contentFlagging.notificationSettings.notifyOnFlag": "Notify when content is flagged",
+  "admin.contentFlagging.notificationSettings.notifyOnRemoval": "Notify when content is removed",
+  "admin.contentFlagging.notificationSettings.notifyOnReviewerAssigned": "Notify when a reviewer is assigned",
   "admin.contentFlagging.notificationSettings.reporter": "Reporter",
   "admin.contentFlagging.notificationSettings.reviewers": "Reviewer(s)",
   "admin.contentFlagging.notificationSettings.title": "Notification Settings",
@@ -783,7 +786,7 @@
   "admin.contentFlagging.reviewerSettings.additionalReviewers.helpText": "If enabled, system administrators will be sent flagged posts for review from every team that they are a part of. Team administrators will only be sent flagged posts for review from their respective teams.",
   "admin.contentFlagging.reviewerSettings.additionalReviewers.systemAdmins": "System Administrators",
   "admin.contentFlagging.reviewerSettings.additionalReviewers.teamAdmins": "Team Administrators",
-  "admin.contentFlagging.reviewerSettings.commonReviewers": "Reviewers",
+  "admin.contentFlagging.reviewerSettings.commonReviewers": "Reviewers:",
   "admin.contentFlagging.reviewerSettings.description": "Define who should review content in your environment",
   "admin.contentFlagging.reviewerSettings.disableAll": "Disable for all teams",
   "admin.contentFlagging.reviewerSettings.header.enabled": "Enabled",
@@ -848,7 +851,8 @@
   "admin.customization.uniqueEmojiReactionLimitPerPost.minValue": "Cannot decrease the limit below 0.",
   "admin.customization.uniqueEmojiReactionLimitPerPostDesc": "The number of unique emoji reactions that can be added to a post. Increasing this limit could lead to poor client performance. Maximum is 500.",
   "admin.customization.uniqueEmojiReactionLimitPerPostPlaceholder": "E.g.: 25",
-  "admin.customProfileAttribDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the {name} of users in Mattermost.",
+  "admin.customProfileAttribDesc.ldap": "(Optional) The attribute in the AD/LDAP server used to populate the {name} of users in Mattermost. When set, users cannot edit their {name}, since it is synchronized with the LDAP server. When left blank, users can set their {name} in <strong>Account Menu > Account Settings > Profile</strong>.",
+  "admin.customProfileAttribDesc.saml": "(Optional) The attribute in the SAML Assertion that will be used to populate the {name} of users in Mattermost.",
   "admin.customProfileAttributes.subtitle": "You can add or remove custom profile attributes by going to the <link>user attributes page</link>.",
   "admin.customProfileAttributes.title": "Custom profile attributes sync",
   "admin.customProfileAttribWarning": "(Warning) This attribute will be converted to a TEXT attribute, if the field is set to synchronize.",
@@ -909,12 +913,12 @@
   "admin.data_retention.retention_years": "{count} {count, plural, one {year} other {years}}",
   "admin.data_retention.settings.title": "Data Retention Policies",
   "admin.data_retention.title": "Data Retention Policy",
-  "admin.database.migrations_table.help_text": "The list of schema migrations applied to your data store.",
+  "admin.database.migrations_table.help_text": "All applied migrations.",
   "admin.database.migrations_table.name": "Name",
-  "admin.database.migrations_table.title": "Applied Schema Migrations",
+  "admin.database.migrations_table.title": "Schema Migrations:",
   "admin.database.migrations_table.version": "Version",
-  "admin.database.search_backend.help_text": "Shows the currently active backend used for search. Values can be none, database, elasticsearch, bleve etc.",
-  "admin.database.search_backend.title": "Active Search Backend",
+  "admin.database.search_backend.help_text": "Shows the currently active backend used for search. Values can be none, database, elasticsearch.",
+  "admin.database.search_backend.title": "Active Search Backend:",
   "admin.database.title": "Database",
   "admin.developer.title": "Developer Settings",
   "admin.elasticsearch.backendDescription": "The type of the search backend.",
@@ -931,7 +935,7 @@
   "admin.elasticsearch.clientKeyDescription": "(Optional) The key for the client certificate in the PEM format.",
   "admin.elasticsearch.clientKeyExample": "E.g.: \"./elasticsearch/client-key.pem\"",
   "admin.elasticsearch.clientKeyTitle": "Client Certificate Key path:",
-  "admin.elasticsearch.connectionUrlDescription": "The address of the Elasticsearch server. {documentationLink}",
+  "admin.elasticsearch.connectionUrlDescription": "The address of the Elasticsearch server. <link>Please see documentation with server setup instructions.</link>",
   "admin.elasticsearch.connectionUrlExample": "E.g.: \"https://elasticsearch.example.org:9200\"",
   "admin.elasticsearch.connectionUrlTitle": "Server Connection Address:",
   "admin.elasticsearch.createJob.help": "All users, channels and posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.",
@@ -939,7 +943,7 @@
   "admin.elasticsearch.elasticsearch_test_button": "Test Connection",
   "admin.elasticsearch.enableAutocompleteDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all autocompletion queries on users and channels using the latest index. Autocompletion results may be incomplete until a bulk index of the existing users and channels database is finished. When false, database autocomplete is used.",
   "admin.elasticsearch.enableAutocompleteTitle": "Enable Elasticsearch for autocomplete queries:",
-  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. <link>Learn more about Elasticsearch in our documentation.</link>",
   "admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
   "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
   "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
@@ -958,7 +962,7 @@
   "admin.elasticsearch.rebuildChannelsIndex.helpText": "This purges the channels index and re-indexes all channels in the database, from oldest to newest. Channel autocomplete is available during indexing but search results may be incomplete until the indexing job is complete.\n\n<b>Note- Please ensure no other indexing job is in progress in the table above.</b>",
   "admin.elasticsearch.rebuildChannelsIndex.title": "Rebuild Channels Index",
   "admin.elasticsearch.rebuildChannelsIndexTitle": "Rebuild Channels Index",
-  "admin.elasticsearch.rebuildIndexSuccessfully.error": "Failed to trigger channels index rebuild job.",
+  "admin.elasticsearch.rebuildIndexSuccessfully.error": "Failed to trigger channels index rebuild job: {error}",
   "admin.elasticsearch.rebuildIndexSuccessfully.success": "Channels index rebuild job triggered successfully.",
   "admin.elasticsearch.skipTLSVerificationDescription": "When true, Mattermost will not require the Elasticsearch certificate to be signed by a trusted Certificate Authority.",
   "admin.elasticsearch.skipTLSVerificationTitle": "Skip TLS Verification:",
@@ -972,16 +976,16 @@
   "admin.elasticsearch.usernameTitle": "Server Username:",
   "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <linkTerms>Terms of Service</linkTerms> and <linkPrivacy>Privacy Policy</linkPrivacy>.",
   "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
-  "admin.email.allowEmailSignInTitle": "Enable sign-in with email: ",
+  "admin.email.allowEmailSignInTitle": "Enable sign-in with email:",
   "admin.email.allowSignupDescription": "When true, Mattermost allows account creation using email and password. This value should be false only when you want to limit sign up to a single sign-on service like AD/LDAP, SAML or GitLab.",
-  "admin.email.allowSignupTitle": "Enable account creation with email: ",
+  "admin.email.allowSignupTitle": "Enable account creation with email:",
   "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.",
-  "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
+  "admin.email.allowUsernameSignInTitle": "Enable sign-in with username:",
   "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <link>Enterprise App Store</link>.",
   "admin.email.mhpns": "Use HPNS connection with uptime SLA to send notifications to iOS and Android apps",
-  "admin.email.mhpnsHelp": "Download <linkIOS>Mattermost iOS app</linkIOS> from iTunes. Download <linkAndroid>Mattermost Android app</linkAndroid> from Google Play. Learn more about <linkHPNS>HPNS</linkHPNS>.",
+  "admin.email.mhpnsHelp": "Download <linkIOS>Mattermost iOS app</linkIOS> from iTunes. Download <linkAndroid>Mattermost Android app</linkAndroid> from Google Play. Learn more about the <linkHPNS>Mattermost Hosted Push Notification Service</linkHPNS>.",
   "admin.email.mtpns": "Use TPNS connection to send notifications to iOS and Android apps",
-  "admin.email.mtpnsHelp": "Download <linkIOS>Mattermost iOS app</linkIOS> from iTunes. Download <linkAndroid>Mattermost Android app</linkAndroid> from Google Play. Learn more about <linkHPNS>TPNS</linkHPNS>.",
+  "admin.email.mtpnsHelp": "Download <linkIOS>Mattermost iOS app</linkIOS> from iTunes. Download <linkAndroid>Mattermost Android app</linkAndroid> from Google Play. Learn more about the <linkHPNS>Mattermost Hosted Push Notification Service</linkHPNS>.",
   "admin.email.pushOff": "Do not send push notifications",
   "admin.email.pushOffHelp": "Please see <link>documentation on push notifications</link> to learn more about setup options.",
   "admin.email.pushServerEx": "E.g.: \"https://push-test.mattermost.com\"",
@@ -1151,11 +1155,11 @@
   "admin.experimental.PermittedMoveThreadRoles.desc": "Choose who is allowed to move threads to other channels based on roles. (Other permissions below still apply).",
   "admin.experimental.PermittedMoveThreadRoles.title": "Permitted Roles",
   "admin.experimental.samlSettingsLoginButtonBorderColor.desc": "Specify the color of the SAML login button border for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
-  "admin.experimental.samlSettingsLoginButtonBorderColor.title": "SAML login Button Border Color:",
+  "admin.experimental.samlSettingsLoginButtonBorderColor.title": "SAML Login Button Border Color:",
   "admin.experimental.samlSettingsLoginButtonColor.desc": "Specify the color of the SAML login button for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
   "admin.experimental.samlSettingsLoginButtonColor.title": "SAML Login Button Color:",
   "admin.experimental.samlSettingsLoginButtonTextColor.desc": "Specify the color of the SAML login button text for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
-  "admin.experimental.samlSettingsLoginButtonTextColor.title": "SAML login Button Text Color:",
+  "admin.experimental.samlSettingsLoginButtonTextColor.title": "SAML Login Button Text Color:",
   "admin.experimental.threadAutoFollow.desc": "This setting must be enabled in order to enable Threaded Discussions. When enabled, threads a user starts, participates in, or is mentioned in are automatically followed. A new `Threads` table is added in the database that tracks threads and thread participants, and a `ThreadMembership` table tracks followed threads for each user and the read or unread state of each followed thread. When false, all backend operations to support Threaded Discussions are disabled.",
   "admin.experimental.threadAutoFollow.title": "Automatically Follow Threads",
   "admin.experimental.timeBetweenUserTypingUpdatesMilliseconds.desc": "The number of milliseconds to wait between emitting user typing websocket events.",
@@ -1165,7 +1169,7 @@
   "admin.experimental.useChannelInEmailNotifications.title": "Use Channel Name in Email Notifications:",
   "admin.experimental.UsersStatusAndProfileFetchingPollIntervalMilliseconds.desc": "The number of milliseconds to wait between fetching user statuses and profiles periodically.",
   "admin.experimental.UsersStatusAndProfileFetchingPollIntervalMilliseconds.title": "User's Status and Profile Fetching Poll Interval:",
-  "admin.experimental.userStatusAwayTimeout.desc": "This setting defines the number of seconds after which the user’s status indicator changes to \"Away\", when they are away from Mattermost.",
+  "admin.experimental.userStatusAwayTimeout.desc": "This setting defines the number of seconds after which the user's status indicator changes to \"Away\", when they are away from Mattermost.",
   "admin.experimental.userStatusAwayTimeout.example": "E.g.: \"300\"",
   "admin.experimental.userStatusAwayTimeout.title": "User Status Away Timeout:",
   "admin.experimental.youtubeReferrerPolicy.desc": "When true, the referrer policy for embedded YouTube videos will be set to \"strict-origin-when-cross-origin\" which resolves issues where YouTube video previews display as unavailable, while balancing the need to protect user privacy with some degree of referral data to support web functionalities, like analytics, logging, and third-party integrations. When false, the referrer policy will be set to \"no-referrer\" which enhances user privacy by not disclosing the source URL, but limits the ability to track user engagement and traffic sources in analytics tools.",
@@ -1178,7 +1182,7 @@
   "admin.feature_discovery.contact_sales": "Contact sales",
   "admin.feature_discovery.learn_more": "Learn more",
   "admin.feature_discovery.trial-request.accept-terms": "By clicking <highlight>Start trial</highlight>, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy> and receiving product emails.",
-  "admin.feature_discovery.trial-request.error": "Trial license could not be retrieved. Visit <link>https://mattermost.com/trial</link> to request a license.",
+  "admin.feature_discovery.trial-request.error": "Trial license could not be retrieved. Visit <link>{trialInfoLink}</link> to request a license.",
   "admin.feature_flags.flag": "Flag",
   "admin.feature_flags.flag_value": "Value",
   "admin.feature_flags.introBanner": "The following feature flag values show the status of features enabled on this instance. The values are used for debugging purposes by the Mattermost support team.",
@@ -1203,8 +1207,8 @@
   "admin.general.localization.availableLocalesTitle": "Available Languages:",
   "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
   "admin.general.localization.clientLocaleTitle": "Default Client Language:",
-  "admin.general.localization.enableExperimentalLocalesDescription": "When true, it allows users to select experimental (e.g. in progress) languages",
-  "admin.general.localization.enableExperimentalLocalesTitle": "Enable Experimental Locales",
+  "admin.general.localization.enableExperimentalLocalesDescription": "When true, it allows users to select experimental (e.g., in progress) languages.",
+  "admin.general.localization.enableExperimentalLocalesTitle": "Enable Experimental Locales:",
   "admin.general.localization.serverLocaleDescription": "Default language for system messages.",
   "admin.general.localization.serverLocaleTitle": "Default Server Language:",
   "admin.general.log": "Logging",
@@ -1218,8 +1222,8 @@
   "admin.gitlab.clientSecretExample": "E.g.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.gitlab.clientSecretTitle": "Application Secret Key:",
   "admin.gitlab.discoveryEndpointDesc": "The URL of the discovery document for OpenID Connect with GitLab.",
-  "admin.gitlab.EnableMarkdownDesc": "1. Log in to your GitLab account and go to Profile Settings -> Applications.\n2. Enter Redirect URIs \"'<your-mattermost-url>'/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"'<your-mattermost-url>'/signup/gitlab/complete\".\n3. Then use \"Application Secret Key\" and \"Application ID\" fields from GitLab to complete the options below.\n4. Complete the Endpoint URLs below.",
-  "admin.gitlab.siteUrl": "GitLab Site URL: ",
+  "admin.gitlab.EnableMarkdownDesc": "1. Log in to your GitLab account and go to Profile Settings -> Applications.\n2. Enter Redirect URIs \"<loginUrlChunk>your-mattermost-url</loginUrlChunk>\" (example: http://localhost:8065/login/gitlab/complete) and \"<signupUrlChunk>your-mattermost-url</signupUrlChunk>\".\n3. Then use \"Application Secret Key\" and \"Application ID\" fields from GitLab to complete the options below.\n4. Complete the Endpoint URLs below.",
+  "admin.gitlab.siteUrl": "GitLab Site URL:",
   "admin.gitlab.siteUrlDescription": "Enter the URL of your GitLab instance, e.g. https://example.com:3000. If your GitLab instance is not set up with SSL, start the URL with http:// instead of https://.",
   "admin.gitlab.siteUrlExample": "E.g.: https://",
   "admin.gitlab.tokenTitle": "Token Endpoint:",
@@ -1232,7 +1236,7 @@
   "admin.google.clientSecretExample": "E.g.: \"H8sz0Az-dDs2p15-7QzD231\"",
   "admin.google.clientSecretTitle": "Client Secret:",
   "admin.google.discoveryEndpointDesc": "The URL of the discovery document for OpenID Connect with Google.",
-  "admin.google.EnableMarkdownDesc": "1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter \"Mattermost - your-company-name\" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>\"your-mattermost-url/signup/google/complete\"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create<strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkApi>Google People API</linkApi> and click <strong>Enable</strong>.",
+  "admin.google.EnableMarkdownDesc": "1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter \"Mattermost - your-company-name\" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>\"your-mattermost-url/signup/google/complete\"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.",
   "admin.google.tokenTitle": "Token Endpoint:",
   "admin.google.userTitle": "User API Endpoint:",
   "admin.group_settings.filters.isConfigured": "Is Configured",
@@ -1322,6 +1326,7 @@
   "admin.guest_access.whitelistedDomainsTitle": "Whitelisted Guest Domains:",
   "admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.",
   "admin.image.amazonS3BucketExample": "E.g.: \"mattermost-media\"",
+  "admin.image.amazonS3BucketExampleExport": "E.g.: \"mattermost-export\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
   "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to \"s3.amazonaws.com\".",
   "admin.image.amazonS3EndpointExample": "E.g.: \"s3.amazonaws.com\"",
@@ -1332,7 +1337,7 @@
   "admin.image.amazonS3PathPrefixDescription": "Prefix you selected for your S3 bucket in AWS.",
   "admin.image.amazonS3PathPrefixExample": "E.g.: \"subdir1\" or you can leave it empty.",
   "admin.image.amazonS3PathPrefixTitle": "Amazon S3 Path Prefix:",
-  "admin.image.amazonS3RegionDescription": "AWS region you selected when creating your S3 bucket. If no region is set, Mattermost attempts to get the appropriate region from AWS, or sets it to 'us-east-1' if none found.",
+  "admin.image.amazonS3RegionDescription": "AWS region you selected when creating your S3 bucket. If no region is set, Mattermost attempts to get the appropriate region from AWS, or sets it to \"us-east-1\" if none found.",
   "admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
   "admin.image.amazonS3SecretDescription": "(Optional) The secret access key associated with your Amazon S3 Access Key ID.",
@@ -1376,6 +1381,7 @@
   "admin.image.storeDescription": "Storage system where files and image attachments are saved.\n \nSelecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.\n \nSelecting \"Local File System\" enables the field to specify a local file directory.",
   "admin.image.storeLocal": "Local File System",
   "admin.image.storeTitle": "File Storage System:",
+  "admin.info_banner.restart_required.desc": "Changing properties in this section will require a server restart before taking effect.",
   "admin.integrations.botAccounts": "Bot Accounts",
   "admin.integrations.botAccounts.title": "Bot Accounts",
   "admin.integrations.cors": "CORS",
@@ -1398,7 +1404,7 @@
   "admin.intune.tenantIdDescription": "The Microsoft Entra ID (Azure AD) Tenant ID (also called the Directory ID).\nThis is the globally unique identifier that represents your organization in Microsoft Entra ID.\nMattermost uses this ID to validate tokens issued for Intune MAM.",
   "admin.intune.tenantIdPlaceholder": "E.g.: \"12345678-1234-1234-1234-123456789012\"",
   "admin.intune.tenantIdTitle": "Tenant ID:",
-  "admin.ip_filtering.add_filter": "Add a filter",
+  "admin.ip_filtering.add_filter": "Add Filter",
   "admin.ip_filtering.add_ip_filter": "Add IP Filter",
   "admin.ip_filtering.add_your_ip": "Add your IP address",
   "admin.ip_filtering.allow_following_range": "Allow the following range of IP Addresses",
@@ -1477,8 +1483,8 @@
   "admin.ldap.adminFilterFilterDescHover": "The users selected by the query will have access to your Mattermost server as System Admins. By default, System Admins have complete access to the Mattermost System Console. Existing members that are identified by this attribute will be promoted from member to System Admin upon next login. The next login is based upon Session lengths set in System Console > Session Lengths. It is highly recommend to manually demote users to members in System Console > User Management to ensure access is restricted immediately.\n \nNote: If this filter is removed/changed, System Admins that were promoted via this filter will be demoted to members and will not retain access to the System Console. When this filter is not in use, System Admins can be manually promoted/demoted in System Console > User Management.",
   "admin.ldap.adminFilterTitle": "Admin Filter:",
   "admin.ldap.attributeTestFailed": "Attribute test failed{showError, select, true {: {error}} other {}}",
-  "admin.ldap.attributeTestSuccess": "Attribute test successful: {countReturned, number} result{countReturned, plural, one {} other {s}} found out of {totalCount} user{totalCount, plural, one {} other {s}} returned by the user filter",
-  "admin.ldap.attributeTestWarning": "The attribute was not found in any of the {totalCount} user{totalCount, plural, one {} other {s}} returned by the user filter",
+  "admin.ldap.attributeTestSuccess": "Attribute test successful: {countReturned, number} {countReturned, plural, one {result} other {results}} found out of {totalCount} {totalCount, plural, one {user} other {users}} returned by the user filter",
+  "admin.ldap.attributeTestWarning": "The attribute was not found in any of the {totalCount} {totalCount, plural, one {user} other {users}} returned by the user filter",
   "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for user and group objects in the AD/LDAP tree.",
   "admin.ldap.baseEx": "E.g.: \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "Base DN:",
@@ -1491,21 +1497,21 @@
   "admin.ldap.emailAttrDesc": "The attribute in the AD/LDAP server used to populate the email address field in Mattermost.",
   "admin.ldap.emailAttrEx": "E.g.: \"mail\" or \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "Email Attribute:",
-  "admin.ldap.enableAdminFilterTitle": "Enable Admin Filter",
+  "admin.ldap.enableAdminFilterTitle": "Enable Admin Filter:",
   "admin.ldap.enableDesc": "When true, Mattermost allows login using AD/LDAP",
   "admin.ldap.enableSyncDesc": "When true, Mattermost periodically synchronizes users from AD/LDAP. When false, user attributes are updated from AD/LDAP during user login only.",
   "admin.ldap.enableSyncTitle": "Enable Synchronization with AD/LDAP:",
   "admin.ldap.enableTitle": "Enable sign-in with AD/LDAP:",
   "admin.ldap.filterTestFailed": "Filter test failed{showTestValue, select, true {. Value used: {testValue}} other {}}{showError, select, true {: {error}} other {}}",
-  "admin.ldap.filterTestSuccess": "Filter test successful: {countReturned, number} result{countReturned, plural, one {} other {s}} found{showTestValue, select, true {. Value used: {testValue}} other {}}",
+  "admin.ldap.filterTestSuccess": "Filter test successful: {countReturned, number} {countReturned, plural, one {result} other {results}} found{showTestValue, select, true {. Value used: {testValue}} other {}}",
   "admin.ldap.filterTestWarning": "Filter test successful but no results found. Your filter may be too restrictive.{showTestValue, select, true { Value used: {testValue}} other {}}",
   "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the AD/LDAP server used to populate the first name of users in Mattermost.",
   "admin.ldap.firstnameAttrDescHover": "When set, users cannot edit their first name, since it is synchronized with the LDAP server. When left blank, users can set their first name in Account Menu > Account Settings > Profile.",
   "admin.ldap.firstnameAttrEx": "E.g.: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "First Name Attribute:",
   "admin.ldap.groupAttributeTestFailed": "Group attribute test failed{showError, select, true {: {error}} other {}}",
-  "admin.ldap.groupAttributeTestSuccess": "Group attribute test successful: {countReturned, number} result{countReturned, plural, one {} other {s}} found out of {totalCount} group{totalCount, plural, one {} other {s}} returned by the group filter",
-  "admin.ldap.groupAttributeTestWarning": "The group attribute was not found in any of the {totalCount} group{totalCount, plural, one {} other {s}} returned by the group filter",
+  "admin.ldap.groupAttributeTestSuccess": "Group attribute test successful: {countReturned, number} {countReturned, plural, one {result} other {results}} found out of {totalCount} {totalCount, plural, one {group} other {groups}} returned by the group filter",
+  "admin.ldap.groupAttributeTestWarning": "The group attribute was not found in any of the {totalCount} {totalCount, plural, one {group} other {groups}} returned by the group filter",
   "admin.ldap.groupDisplayNameAttributeDesc": "The attribute in the AD/LDAP server used to populate the group display names.",
   "admin.ldap.groupDisplayNameAttributeEx": "E.g.: \"cn\"",
   "admin.ldap.groupDisplayNameAttributeTitle": "Group Display Name Attribute:",
@@ -1588,7 +1594,7 @@
   "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes):",
   "admin.ldap.syncNowHelpText": "Initiates an AD/LDAP synchronization immediately. See the table below for status of each synchronization. Please review \"System Console > Logs\" and <link>documentation</link> to troubleshoot errors.",
   "admin.ldap.testAttributesFailure": "We failed to find some attributes: {error}",
-  "admin.ldap.testAttributesPartialFailure": "{failedCount, number} of {totalCount, number} attribute test{totalCount, plural, one {} other {s}} failed. Check the highlighted fields for details.",
+  "admin.ldap.testAttributesPartialFailure": "{failedCount, number} of {totalCount, number} attribute {totalCount, plural, one {test} other {tests}} failed. Check the highlighted fields for details.",
   "admin.ldap.testAttributesSuccess": "Test Successful",
   "admin.ldap.testAttributesTitle": "Test Attributes",
   "admin.ldap.testConnectionFailure": "Test Connection Failure: {error}",
@@ -1596,11 +1602,11 @@
   "admin.ldap.testConnectionTitle": "Test Connection",
   "admin.ldap.testFiltersFailure": "We failed to apply some filters: {error}",
   "admin.ldap.testFiltersHelpText": "**Note**: This test is similar in scope to an LDAP sync and may take time depending on the size of the LDAP Server, hardware, or network conditions.",
-  "admin.ldap.testFiltersPartialFailure": "{failedCount, number} of {totalCount, number} filter test{totalCount, plural, one {} other {s}} failed. Check the highlighted fields for details.",
+  "admin.ldap.testFiltersPartialFailure": "{failedCount, number} of {totalCount, number} filter {totalCount, plural, one {test} other {tests}} failed. Check the highlighted fields for details.",
   "admin.ldap.testFiltersSuccess": "Test Successful",
   "admin.ldap.testFiltersTitle": "Test Filters",
   "admin.ldap.testGroupAttributesFailure": "We failed to find some attributes: {error}",
-  "admin.ldap.testGroupAttributesPartialFailure": "{failedCount, number} of {totalCount, number} group attribute test{totalCount, plural, one {} other {s}} failed. Check the highlighted fields for details.",
+  "admin.ldap.testGroupAttributesPartialFailure": "{failedCount, number} of {totalCount, number} group attribute {totalCount, plural, one {test} other {tests}} failed. Check the highlighted fields for details.",
   "admin.ldap.testGroupAttributesSuccess": "Test Successful",
   "admin.ldap.testGroupAttributesTitle": "Test Group Attributes",
   "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. Please review \"System Console > Logs\" and <link>documentation</link> to troubleshoot errors.",
@@ -1608,7 +1614,7 @@
   "admin.ldap.uploading.privateKey": "Uploading Private Key...",
   "admin.ldap.userFilterDisc": "(Optional) Enter an AD/LDAP filter to use when searching for user objects. When blank, defaults to the ID Attribute.\nFor Active Directory, the query to filter out disabled users is\n(&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterDiscHover": "Only the users selected by the query will be able to access Mattermost.",
-  "admin.ldap.userFilterEx": "E.g.: \"(objectClass=user)\"",
+  "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "User Filter:",
   "admin.ldap.usernameAttrDesc": "The attribute in the AD/LDAP server used to populate the username field in Mattermost.",
   "admin.ldap.usernameAttrDescHover": "This may be the same as the Login ID Attribute.",
@@ -1626,7 +1632,7 @@
   "admin.license.enterprise.upgrade.eeLicenseLink": "Enterprise Edition License",
   "admin.license.enterprise.upgrading": "Upgrading {percentage}%",
   "admin.license.enterpriseEdition.add.seats": "+ Add seats",
-  "admin.license.enterprisePlanSubtitle": "We’re here to work with you and your needs. Contact us today to get more seats on your plan.",
+  "admin.license.enterprisePlanSubtitle": "We're here to work with you and your needs. Contact us today to get more seats on your plan.",
   "admin.license.enterprisePlanTitle": "Need to increase your headcount?",
   "admin.license.enterpriseToAdvancedAdvantage.adLdapGroupSync": "AD/LDAP group sync",
   "admin.license.enterpriseToAdvancedAdvantage.advancedCompliance": "Advanced compliance",
@@ -1638,7 +1644,7 @@
   "admin.license.entryEdition.subtitle": "Entry offers Enterprise Advanced capabilities {limitsLink} designed to support evaluation.",
   "admin.license.entryPlanSubtitle": "Purchase a plan to unlock full access, or <link>start a trial</link> to remove limits while you evaluate Enterprise Advanced.",
   "admin.license.entryPlanTitle": "Get access to full message history, AI-powered coordination, and secure workflow continuity",
-  "admin.license.freeEdition.subtitle": "This is an unlicensed server and does not have commercial support. Purchase a Professional, Enterprise, or Enterprise Advanced plan to unlock paid features.",
+  "admin.license.freeEdition.subtitle": "Purchase Professional or Enterprise to unlock enterprise features.",
   "admin.license.freeEdition.title": "Free",
   "admin.license.haveALicense": "Have a license?",
   "admin.license.key": "License Key: ",
@@ -1681,7 +1687,7 @@
   "admin.license.upgradeAdvantage.andMore": "And more...",
   "admin.license.upgradeAdvantage.highAvailability": "High Availability",
   "admin.license.upgradeTitle": "Purchase one of our plans to unlock more features",
-  "admin.license.upgradeToEnterprise": "Upgrade to the Enterprise plan",
+  "admin.license.upgradeToEnterprise": "Upgrade to Enterprise",
   "admin.license.upgradeToEnterpriseAdvanced": "Upgrade to Enterprise Advanced",
   "admin.license.upload-modal.file": "File",
   "admin.license.upload-modal.subtitle": "Upload a license key for Mattermost Enterprise Edition to upgrade this server. ",
@@ -1708,16 +1714,17 @@
   "admin.licenseSettings.teamEdition.teamEditionRightPanel.upgradedRestart": "You have upgraded your binary to mattermost enterprise, please restart the server to start using the new binary. You can do it right here:",
   "admin.lockTeammateNameDisplay": "Lock Teammate Name Display for all users: ",
   "admin.lockTeammateNameDisplayHelpText": "When true, disables users' ability to change settings under <strong>Settings > Display > Teammate Name Display</strong>.",
+  "admin.log.AdvancedAuditLoggingJSONDescription": "The JSON configuration for Advanced Audit Logging. Please see <link>documentation</link> to learn more about Advanced Logging and the JSON format it uses.",
   "admin.log.AdvancedLoggingJSONDescription": "The JSON configuration for Advanced Logging. Please see <link>documentation</link> to learn more about Advanced Logging and the JSON format it uses.",
   "admin.log.AdvancedLoggingJSONPlaceholder": "Enter your JSON configuration",
   "admin.log.AdvancedLoggingJSONTitle": "Advanced Logging:",
-  "admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option.  If true, server writes messages to the standard output stream (stdout). Changing this setting requires a server restart before taking effect.",
+  "admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option. If true, server writes messages to the standard output stream (stdout). Changing this setting requires a server restart before taking effect.",
   "admin.log.consoleJsonTitle": "Output console logs as JSON:",
   "admin.log.consoleTitle": "Output logs to console: ",
   "admin.log.enableDiagnostics": "Enable Diagnostics and Error Reporting:",
   "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <link>privacy policy</link> to learn more.",
   "admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
-  "admin.log.enableWebhookDebuggingDescription": "When true, sends webhook debug messages to the server logs. To also output the request body of incoming webhooks, set {boldedLogLevel} to 'DEBUG'.",
+  "admin.log.enableWebhookDebuggingDescription": "When true, sends webhook debug messages to the server logs. To also output the request body of incoming webhooks, set {boldedLogLevel} to \"DEBUG\".",
   "admin.log.fileDescription": "Typically set to true in production. When true, logged events are written to the mattermost.log file in the directory specified in the File Log Directory field. The logs are rotated at 100 MB and archived to a file in the same directory, and given a name with a datestamp and serial number. For example, mattermost.2017-03-31.001. Changing this setting requires a server restart before taking effect.",
   "admin.log.fileJsonTitle": "Output file logs as JSON:",
   "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
@@ -1734,18 +1741,18 @@
   "admin.log.locationDescription": "The location of the log files. If blank, they are stored in the ./logs directory. The path that you set must exist and Mattermost must have write permissions in it. Changing this setting requires a server restart before taking effect.",
   "admin.log.locationPlaceholder": "Enter your file location",
   "admin.log.locationTitle": "File Log Directory:",
-  "admin.log.logLevel": "Level",
+  "admin.log.logLevel": "Log Level",
   "admin.logs.Alllevels": "All levels",
   "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to User Management > Users and paste the ID into the search filter.",
   "admin.logs.caller": "Caller",
   "admin.logs.Debug": "Debug",
   "admin.logs.DownloadLogs": "Download Logs",
   "admin.logs.Error": "Error",
-  "admin.logs.fullEvent": "Full log event",
+  "admin.logs.fullEvent": "Full Log event",
   "admin.logs.Info": "Info",
   "admin.logs.logFormatJson": "JSON",
   "admin.logs.logFormatPlain": "Plain text",
-  "admin.logs.logFormatTitle": "Log display format:",
+  "admin.logs.logFormatTitle": "Log Format:",
   "admin.logs.next": "Next",
   "admin.logs.options": "Options",
   "admin.logs.prev": "Previous",
@@ -1801,7 +1808,7 @@
   "admin.mobileSecurity.screenCaptureTitle": "Prevent Screen Capture:",
   "admin.mobileSecurity.sections.general.description": "Configure device security features for the mobile app.",
   "admin.mobileSecurity.sections.intune.description": "Configure Microsoft Intune Mobile Application Management (MAM) for App Protection Policies.",
-  "admin.mobileSecurity.secureFilePreviewDescription": "Prevents file downloads, previews, and sharing for most file types, even if {mobileAllowDownloads} is enabled. Allows in-app previews for PDFs, videos, and images only. Files are stored temporarily in the app’s cache and cannot be exported or shared.",
+  "admin.mobileSecurity.secureFilePreviewDescription": "Prevents file downloads, previews, and sharing for most file types, even if {mobileAllowDownloads} is enabled. Allows in-app previews for PDFs, videos, and images only. Files are stored temporarily in the app's cache and cannot be exported or shared.",
   "admin.mobileSecurity.secureFilePreviewTitle": "Enable Secure File Preview Mode:",
   "admin.mobileSecurity.title": "Mobile Security",
   "admin.nav.administratorsGuide": "Administrator's Guide",
@@ -1817,7 +1824,7 @@
   "admin.oauth.dcrTitle": "Enable OAuth 2.0 Dynamic Client Registration: ",
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
-  "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
+  "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider.",
   "admin.oauth.office365": "Entra ID",
   "admin.oauth.openid": "OpenID Connect (Other)",
   "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <link>documentation</link> to learn more.",
@@ -1833,7 +1840,7 @@
   "admin.office365.directoryIdExample": "E.g.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
   "admin.office365.directoryIdTitle": "Directory (tenant) ID:",
   "admin.office365.discoveryEndpointDesc": "The URL of the discovery document for OpenID Connect with Entra ID.",
-  "admin.office365.EnableMarkdownDesc": "1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter <Mattermost - your-company-name> as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter \"your-mattermost-url/signup/office365/complete\" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.",
+  "admin.office365.EnableMarkdownDesc": "1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter \"Mattermost - your-company-name\" as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter \"your-mattermost-url/signup/office365/complete\" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.",
   "admin.office365.tokenTitle": "Token Endpoint:",
   "admin.office365.userTitle": "User API Endpoint:",
   "admin.openid_custom_feature_discovery.copy": "Use OpenID Connect for authentication and single sign-on (SSO) with any service that supports the OIDC specification such as Apple, Okta, OneLogin, and more.",
@@ -1843,13 +1850,13 @@
   "admin.openid.buttonColorDesc": "Specify the color of the OpenID login button for white labeling purposes. Use a hex code with a #-sign before the code.",
   "admin.openid.buttonColorTitle": "Button Color:",
   "admin.openid.buttonTextDesc": "The text that will show on the login button.",
-  "admin.openid.buttonTextEx": "Custom Button Text",
+  "admin.openid.buttonTextEx": "Custom Button Name",
   "admin.openid.buttonTextTitle": "Button Name:",
   "admin.openid.clientIdDescription": "Obtaining the Client ID differs across providers. Please check you provider's documentation.",
   "admin.openid.clientIdExample": "E.g.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
   "admin.openid.clientIdTitle": "Client ID:",
   "admin.openid.clientSecretDescription": "Obtaining the Client Secret differs across providers. Please check you provider's documentation.",
-  "admin.openid.clientSecretExample": "E.g.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
+  "admin.openid.clientSecretExample": "E.g.: \"H8sz0Az-dDs2p15-7QzD231\"",
   "admin.openid.clientSecretTitle": "Client Secret:",
   "admin.openid.discovery.placeholder": "https://id.mydomain.com/.well-known/openid-configuration",
   "admin.openid.discoveryEndpointDesc": "Enter the URL of the discovery document of the OpenID Connect provider you want to connect with.",
@@ -1870,7 +1877,7 @@
   "admin.password.minimumLengthDescription": "Minimum number of characters required for a valid password. Must be a whole number greater than or equal to {min} and less than or equal to {max}.",
   "admin.password.minimumLengthExample": "E.g.: \"5\"",
   "admin.password.number": "At least one number",
-  "admin.password.preview": "Error message preview",
+  "admin.password.preview": "Error message preview:",
   "admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "At least one uppercase letter",
   "admin.permissions.group.convert_private_channel_to_public.description": "Convert private channels to public",
@@ -1991,13 +1998,13 @@
   "admin.permissions.permission.edit_post.name": "Edit Own Posts",
   "admin.permissions.permission.import_team.description": "Import team",
   "admin.permissions.permission.import_team.name": "Import team",
-  "admin.permissions.permission.invite_guest.description": "Invite guests to teams and send guest email invites.",
+  "admin.permissions.permission.invite_guest.description": "Invite guests to channels and send guest email invites.",
   "admin.permissions.permission.invite_guest.name": "Invite guests",
   "admin.permissions.permission.list_team_channels.description": "List team channels",
   "admin.permissions.permission.list_team_channels.name": "List team channels",
   "admin.permissions.permission.list_users_without_team.description": "List users without team",
   "admin.permissions.permission.list_users_without_team.name": "List users without team",
-  "admin.permissions.permission.manage_channel_access_rules.description": "Configure attribute-based access control rules for channels.",
+  "admin.permissions.permission.manage_channel_access_rules.description": "Configure attribute-based access control policy for channels.",
   "admin.permissions.permission.manage_channel_access_rules.name": "Manage Channel Access Control Policy",
   "admin.permissions.permission.manage_channel_roles.description": "Manage channel roles",
   "admin.permissions.permission.manage_channel_roles.name": "Manage channel roles",
@@ -2008,7 +2015,7 @@
   "admin.permissions.permission.manage_jobs.description": "Manage jobs",
   "admin.permissions.permission.manage_jobs.name": "Manage jobs",
   "admin.permissions.permission.manage_oauth.description": "Create, edit and delete OAuth 2.0 application tokens.",
-  "admin.permissions.permission.manage_oauth.name": "Manage Others'",
+  "admin.permissions.permission.manage_oauth.name": "Manage OAuth Applications",
   "admin.permissions.permission.manage_others_incoming_webhooks.description": "Create, edit, and delete incoming webhooks owned by other users.",
   "admin.permissions.permission.manage_others_incoming_webhooks.name": "Manage Others'",
   "admin.permissions.permission.manage_others_outgoing_webhooks.description": "Create, edit, and delete outgoing webhooks owned by other users.",
@@ -2175,7 +2182,7 @@
   "admin.permissions.sysconsole_section_reporting_team_statistics.name": "Team Statistics",
   "admin.permissions.sysconsole_section_reporting.description": "Review site statistics, team statistics and server logs.",
   "admin.permissions.sysconsole_section_reporting.name": "Reporting",
-  "admin.permissions.sysconsole_section_site_announcement_banner.name": "System-wide Notifications",
+  "admin.permissions.sysconsole_section_site_announcement_banner.name": "Announcement Banner",
   "admin.permissions.sysconsole_section_site_customization.name": "Customization",
   "admin.permissions.sysconsole_section_site_emoji.name": "Emoji",
   "admin.permissions.sysconsole_section_site_file_sharing_and_downloads.name": "File Sharing and Downloads",
@@ -2190,7 +2197,7 @@
   "admin.permissions.sysconsole_section_user_management_channels.name": "Channels",
   "admin.permissions.sysconsole_section_user_management_groups.name": "Groups",
   "admin.permissions.sysconsole_section_user_management_permissions.name": "Permissions",
-  "admin.permissions.sysconsole_section_user_management_system_roles.description": "Setting \"No Access\" restricts the System Console interface only. The underlying API endpoints are accessible to all users in a read-only state for basic product functionality.",
+  "admin.permissions.sysconsole_section_user_management_system_roles.description": "Restricts the System Console interface only. The underlying API endpoints are accessible to all users in a read-only state for basic product functionality.",
   "admin.permissions.sysconsole_section_user_management_system_roles.name": "Delegated Granular Administration",
   "admin.permissions.sysconsole_section_user_management_teams.name": "Teams",
   "admin.permissions.sysconsole_section_user_management_users.description": "Cannot reset admin passwords",
@@ -2237,9 +2244,9 @@
   "admin.permissions.systemSchemeBannerText": "Set the default permissions inherited by all teams unless a <link>Team Override Scheme</link> is applied.",
   "admin.permissions.systemSchemeBannerTitle": "System Scheme",
   "admin.permissions.teamOverrideSchemesBannerText": "Use when specific teams need permission exceptions to the <link>System Scheme</link>.",
-  "admin.permissions.teamOverrideSchemesInProgress": "Migration job in progress: Team Override Schemes are not available until the job server completes the permissions migration. Learn more in the {documentationLink}.",
+  "admin.permissions.teamOverrideSchemesInProgress": "Migration job in progress: Team Override Schemes are not available until the job server completes the permissions migration. Learn more in the <link>documentation</link>.",
   "admin.permissions.teamOverrideSchemesNewButton": "New Team Override Scheme",
-  "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Migration job on hold: Team Override Schemes are not available until the job server can execute the permissions migration. The job will be automatically started when the job server is enabled. Learn more in the {documentationLink}.",
+  "admin.permissions.teamOverrideSchemesNoJobsEnabled": "Migration job on hold: Team Override Schemes are not available until the job server can execute the permissions migration. The job will be automatically started when the job server is enabled. Learn more in the <link>documentation</link>.",
   "admin.permissions.teamOverrideSchemesNoSchemes": "No team override schemes created.",
   "admin.permissions.teamOverrideSchemesTitle": "Team Override Schemes",
   "admin.permissions.teamScheme": "Team Scheme",
@@ -2307,7 +2314,7 @@
   "admin.plugin.version_title": "Version",
   "admin.plugins.pluginManagement": "Plugin Management",
   "admin.plugins.settings.automaticPrepackagedPlugins": "Enable Automatic Prepackaged Plugins:",
-  "admin.plugins.settings.automaticPrepackagedPluginsDesc": "When true, the server will detect previously enabled plugins on the server and will automatically install them.",
+  "admin.plugins.settings.automaticPrepackagedPluginsDesc": "When true, automatically installs any prepackaged plugin found to be enabled in the server configuration.",
   "admin.plugins.settings.enable": "Enable Plugins: ",
   "admin.plugins.settings.enableDesc": "When true, enables plugins on your Mattermost server. Use plugins to integrate with third-party systems, extend functionality, or customize the user interface of your Mattermost server. See <link>documentation</link> to learn more.",
   "admin.plugins.settings.enableMarketplace": "Enable Marketplace:",
@@ -2360,14 +2367,14 @@
   "admin.posts.sections.priority.description": "Set message priority and repeating notifications for urgent delivery.",
   "admin.posts.sections.threads.description": "Configure threaded discussions and auto-follow defaults.",
   "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators and the System Roles with read/write access to Compliance, Billing, or User Management.",
-  "admin.privacy.showEmailTitle": "Show Email Address: ",
+  "admin.privacy.showEmailTitle": "Show Email Address:",
   "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
-  "admin.privacy.showFullNameTitle": "Show Full Name: ",
+  "admin.privacy.showFullNameTitle": "Show Full Name:",
   "admin.purge.button": "Purge All Caches",
   "admin.purge.purgeDescription": "This will purge all the in-memory caches for things like sessions, accounts, channels, etc. Deployments using High Availability will attempt to purge all the servers in the cluster. Purging the caches may adversely impact performance.",
   "admin.purge.purgeFail": "Purging unsuccessful: {error}",
-  "admin.rate.enableLimiterDescription": "When true, APIs are throttled at rates specified below.\n \nRate limiting prevents server overload from too many requests. This is useful to prevent third-party applications or malicous attacks from impacting your server.",
-  "admin.rate.enableLimiterTitle": "Enable Rate Limiting: ",
+  "admin.rate.enableLimiterDescription": "When true, APIs are throttled at rates specified below. Rate limiting prevents server overload from too many requests. This is useful to prevent third-party applications or malicous attacks from impacting your server.",
+  "admin.rate.enableLimiterTitle": "Enable Rate Limiting:",
   "admin.rate.httpHeaderDescription": "When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring NGINX set to \"X-Real-IP\", when configuring AmazonELB set to \"X-Forwarded-For\").",
   "admin.rate.httpHeaderExample": "E.g.: \"X-Real-IP\", \"X-Forwarded-For\"",
   "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header:",
@@ -2382,9 +2389,9 @@
   "admin.rate.queriesExample": "E.g.: \"10\"",
   "admin.rate.queriesTitle": "Maximum Queries per Second:",
   "admin.rate.remoteDescription": "When true, rate limit API access by IP address.",
-  "admin.rate.remoteTitle": "Vary rate limit by remote address: ",
+  "admin.rate.remoteTitle": "Vary rate limit by remote address:",
   "admin.rate.title": "Rate Limiting",
-  "admin.rate.varyByUser": "Vary rate limit by user: ",
+  "admin.rate.varyByUser": "Vary rate limit by user:",
   "admin.rate.varyByUserDescription": "When true, rate limit API access by user authentication token.",
   "admin.recycle.button": "Recycle Database Connections",
   "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the {reloadConfiguration} feature to load the new settings while the server is running. The administrator should then use {featureName} feature to recycle the database connections based on the new settings.",
@@ -2396,9 +2403,9 @@
   "admin.reload.reloadDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the {featureName} feature to load the new settings while the server is running. The administrator should then use the {recycleDatabaseConnections} feature to recycle the database connections based on the new settings.",
   "admin.reload.reloadDescription.featureName": "Reload Configuration from Disk",
   "admin.reload.reloadDescription.recycleDatabaseConnections": "Environment > Database > Recycle Database Connections",
-  "admin.reload.reloadFail": "Reloading unsuccessful: {error}",
+  "admin.reload.reloadFail": "Reload unsuccessful: {error}",
   "admin.reporting.workspace_optimization.access.description": "Web server configuration may be affecting access to your Mattermost workspace.",
-  "admin.reporting.workspace_optimization.access.descriptionOk": "Access to your workspace seems available!",
+  "admin.reporting.workspace_optimization.access.descriptionOk": "Your web server configuration is passing a live URL test!",
   "admin.reporting.workspace_optimization.access.site_url.cta": "Configure web server",
   "admin.reporting.workspace_optimization.access.site_url.description": "Your web server settings aren't passing a live URL test which means your workspace may not be accessible to users. We recommend updating your web server settings.",
   "admin.reporting.workspace_optimization.access.site_url.title": "Misconfigured web server",
@@ -2407,7 +2414,7 @@
   "admin.reporting.workspace_optimization.chip_suggestions": "Suggestions: {count}",
   "admin.reporting.workspace_optimization.chip_warnings": "Warnings: {count}",
   "admin.reporting.workspace_optimization.configuration.description": "You have configuration issues to resolve",
-  "admin.reporting.workspace_optimization.configuration.descriptionOk": "You seem to have good configuration for SSL and Session Lengths!",
+  "admin.reporting.workspace_optimization.configuration.descriptionOk": "You've successfully configured SSL and Session Lengths!",
   "admin.reporting.workspace_optimization.configuration.file_storage.cta": "Config file storage",
   "admin.reporting.workspace_optimization.configuration.file_storage.description": "Check your file storage settings to ensure your Mattermost workspace has access to the configured file storage.",
   "admin.reporting.workspace_optimization.configuration.file_storage.title": "File storage access is faulty.",
@@ -2423,7 +2430,7 @@
   "admin.reporting.workspace_optimization.cta.startTrial": "Start trial",
   "admin.reporting.workspace_optimization.cta.upgradeLicense": "Contact sales",
   "admin.reporting.workspace_optimization.data_privacy.description": "Get better insight and control over your data.",
-  "admin.reporting.workspace_optimization.data_privacy.descriptionOk": "You seem to be using data retention and compliance features!",
+  "admin.reporting.workspace_optimization.data_privacy.descriptionOk": "You've enabled data retention and compliance features!",
   "admin.reporting.workspace_optimization.data_privacy.retention.cta": "Try data retention",
   "admin.reporting.workspace_optimization.data_privacy.retention.description": "Organizations in highly regulated industries require more control and insight with their data. We recommend enabling Data Retention and Compliance features.",
   "admin.reporting.workspace_optimization.data_privacy.retention.title": "Become more data aware",
@@ -2451,21 +2458,21 @@
   "admin.reporting.workspace_optimization.updates.server_version.update_type.minor": "Minor",
   "admin.reporting.workspace_optimization.updates.server_version.update_type.patch": "Patch",
   "admin.reporting.workspace_optimization.updates.title": "Server updates",
-  "admin.requestButton.loading": " Loading...",
+  "admin.requestButton.loading": "Loading...",
   "admin.requestButton.requestFailure": "Test Failure: {error}",
   "admin.requestButton.requestSuccess": "Test Successful",
-  "admin.reset_email.currentPassword": "Current Password",
+  "admin.reset_email.currentPassword": "Current password",
   "admin.reset_email.enterCurrentPassword": "Enter current password",
   "admin.reset_email.enterNewEmail": "Enter new email address",
   "admin.reset_email.missing_current_password": "Please enter your current password.",
-  "admin.reset_email.newEmail": "New Email",
+  "admin.reset_email.newEmail": "New email",
   "admin.reset_email.titleResetFor": "Update email for {name}",
   "admin.reset_email.update": "Update",
   "admin.reset_password.currentPassword": "Current password",
   "admin.reset_password.enterCurrentPassword": "Enter current password",
   "admin.reset_password.enterNewPassword": "Enter new password",
   "admin.reset_password.missing_current": "Please enter your current password.",
-  "admin.reset_password.newPassword": "New Password",
+  "admin.reset_password.newPassword": "New password",
   "admin.reset_password.reset": "Reset",
   "admin.reset_password.titleResetFor": "Reset password for {name}",
   "admin.reset_password.titleSwitchFor": "Switch account to Email/Password for {name}",
@@ -2479,11 +2486,11 @@
   "admin.saml.adminAttrDesc": "(Optional) The attribute in the SAML Assertion for designating System Admins. The users selected by the query will have access to your Mattermost server as System Admins. By default, System Admins have complete access to the Mattermost System Console.\n \nExisting members that are identified by this attribute will be promoted from member to System Admin upon next login. The next login is based upon Session lengths set in **System Console > Session Lengths**. It is highly recommend to manually demote users to members in **System Console > User Management** to ensure access is restricted immediately.\n \nNote: If this filter is removed/changed, System Admins that were promoted via this filter will be demoted to members and will not retain access to the System Console. When this filter is not in use, System Admins can be manually promoted/demoted in **System Console > User Management**.",
   "admin.saml.adminAttrEx": "E.g.: \"usertype=Admin\" or \"isAdmin=true\"",
   "admin.saml.adminAttrTitle": "Admin Attribute:",
-  "admin.saml.assertionConsumerServiceURLEx": "E.g.: \"https://'<your-mattermost-url>'/login/sso/saml\"",
+  "admin.saml.assertionConsumerServiceURLEx": "E.g.: \"<urlChunk>your-mattermost-url</urlChunk>\"",
   "admin.saml.assertionConsumerServiceURLPopulatedDesc": "This field is also known as the Assertion Consumer Service URL.",
   "admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:",
-  "admin.saml.canonicalAlgorithmDescription.c14": "Specify the Canonicalization algorithm (Canonical XML 1.1).  Please see more information provided at http://www.w3.org/2006/12/xml-c14n11",
-  "admin.saml.canonicalAlgorithmDescription.exc": "Specify the Canonicalization algorithm (Exclusive XML Canonicalization 1.0).  Please see more information provided at http://www.w3.org/2001/10/xml-exc-c14n#",
+  "admin.saml.canonicalAlgorithmDescription.c14": "Specify the Canonicalization algorithm (Canonical XML 1.1). Please see more information provided at http://www.w3.org/2006/12/xml-c14n11",
+  "admin.saml.canonicalAlgorithmDescription.exc": "Specify the Canonicalization algorithm (Exclusive XML Canonicalization 1.0). Please see more information provided at http://www.w3.org/2001/10/xml-exc-c14n#",
   "admin.saml.canonicalAlgorithmDisplay.n10": "Exclusive XML Canonicalization 1.0 (omit comments)",
   "admin.saml.canonicalAlgorithmDisplay.n11": "Canonical XML 1.1 (omit comments)",
   "admin.saml.canonicalAlgorithmTitle": "Canonicalization Algorithm",
@@ -2493,7 +2500,7 @@
   "admin.saml.enableAdminAttrTitle": "Enable Admin Attribute:",
   "admin.saml.enableDescription": "When true, Mattermost allows login using SAML 2.0. Please see <link>documentation</link> to learn more about configuring SAML for Mattermost.",
   "admin.saml.enableSyncWithLdapDescription": "When true, Mattermost periodically synchronizes SAML user attributes, including user deactivation and removal, from AD/LDAP. Enable and configure synchronization settings at <strong>Authentication > AD/LDAP</strong>. When false, user attributes are updated from SAML during user login. See <link>documentation</link> to learn more.",
-  "admin.saml.enableSyncWithLdapIncludeAuthDescription": "When true, Mattermost will override the SAML ID attribute with the AD/LDAP ID attribute if configured or override the SAML Email attribute with the AD/LDAP Email attribute if SAML ID attribute is not present.  This will allow you automatically migrate users from Email binding to ID binding to prevent creation of new users when an email address changes for a user. Moving from true to false, will remove the override from happening.\n \n<strong>Note:</strong> SAML IDs must match the LDAP IDs to prevent disabling of user accounts.  Please review <link>documentation</link> for more information.",
+  "admin.saml.enableSyncWithLdapIncludeAuthDescription": "When true, Mattermost will override the SAML ID attribute with the AD/LDAP ID attribute if configured or override the SAML Email attribute with the AD/LDAP Email attribute if SAML ID attribute is not present. This will allow you automatically migrate users from Email binding to ID binding to prevent creation of new users when an email address changes for a user. Moving from true to false, will remove the override from happening. <strong>Note:</strong> SAML IDs must match the LDAP IDs to prevent disabling of user accounts. Please review <link>documentation</link> for more information.",
   "admin.saml.enableSyncWithLdapIncludeAuthTitle": "Override SAML bind data with AD/LDAP information:",
   "admin.saml.enableSyncWithLdapTitle": "Enable Synchronizing SAML Accounts With AD/LDAP:",
   "admin.saml.enableTitle": "Enable Login With SAML 2.0:",
@@ -2504,8 +2511,8 @@
   "admin.saml.firstnameAttrTitle": "First Name Attribute:",
   "admin.saml.getSamlMetadataFromIDPFail": "SAML Metadata URL did not connect and pull data successfully",
   "admin.saml.getSamlMetadataFromIDPFetching": "Fetching...",
-  "admin.saml.getSamlMetadataFromIDPSuccess": "SAML Metadata retrieved successfully. Two fields and one certificate have been updated",
-  "admin.saml.getSamlMetadataFromIDPUrl": "Get SAML Metadata From IdP",
+  "admin.saml.getSamlMetadataFromIDPSuccess": "SAML Metadata retrieved successfully. Two fields below have been updated",
+  "admin.saml.getSamlMetadataFromIDPUrl": "Get SAML Metadata from IdP",
   "admin.saml.guestAttrDesc": "(Optional) Requires Guest Access to be enabled before being applied. The attribute in the SAML Assertion that will be used to apply a guest role to users in Mattermost. Guests are prevented from accessing teams or channels upon logging in until they are assigned a team and at least one channel.\n \nNote: If this attribute is removed/changed from your guest user in SAML and the user is still active, they will not be promoted to a member and will retain their Guest role. Guests can be promoted in **System Console > User Management**.\n \n \nExisting members that are identified by this attribute as a guest will be demoted from a member to a guest when they are asked to login next. The next login is based upon Session lengths set in **System Console > Session Lengths**. It is highly recommend to manually demote users to guests in **System Console > User Management ** to ensure access is restricted immediately.",
   "admin.saml.guestAttrEx": "E.g.: \"usertype=Guest\" or \"isGuest=true\"",
   "admin.saml.guestAttrTitle": "Guest Attribute:",
@@ -2525,7 +2532,7 @@
   "admin.saml.idpUrlEx": "E.g.: \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
   "admin.saml.ignoreGuestsLdapSyncDesc": "When true, Mattermost will ignore Guest Users who are identified by the Guest Attribute, when synchronizing with AD/LDAP for user deactivation and removal and Guest deactivation will need to be managed manually via System Console > Users.",
-  "admin.saml.ignoreGuestsLdapSyncTitle": "Ignore Guest Users when  Synchronizing with AD/LDAP",
+  "admin.saml.ignoreGuestsLdapSyncTitle": "Ignore Guest Users when Synchronizing with AD/LDAP",
   "admin.saml.lastnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the last name of users in Mattermost.",
   "admin.saml.lastnameAttrEx": "E.g.: \"LastName\"",
   "admin.saml.lastnameAttrTitle": "Last Name Attribute:",
@@ -2553,7 +2560,7 @@
   "admin.saml.removing.certificate": "Removing Certificate...",
   "admin.saml.removing.privKey": "Removing Private Key...",
   "admin.saml.serviceProviderIdentifierDesc": "The unique identifier for the Service Provider, usually the same as Service Provider Login URL. In ADFS, this MUST match the Relying Party Identifier.",
-  "admin.saml.serviceProviderIdentifierEx": "E.g.: \"https://'<your-mattermost-url>'/login/sso/saml\"",
+  "admin.saml.serviceProviderIdentifierEx": "E.g.: \"<urlChunk>your-mattermost-url</urlChunk>\"",
   "admin.saml.serviceProviderIdentifierTitle": "Service Provider Identifier:",
   "admin.saml.signatureAlgorithmDescription.sha1": "Specify the Signature algorithm used to sign the request (RSAwithSHA1). Please see more information provided at http://www.w3.org/2000/09/xmldsig#rsa-sha1",
   "admin.saml.signatureAlgorithmDescription.sha256": "Specify the Signature algorithm used to sign the request (RSAwithSHA256). Please see more information provided at http://www.w3.org/2001/04/xmldsig-more#rsa-sha256 [section 6.4.2 RSA (PKCS#1 v1.5)]",
@@ -2649,7 +2656,7 @@
   "admin.server_logs.CopyLog": "Copy log",
   "admin.server_logs.DataCopied": "Data copied",
   "admin.server_logs.LogEvent": "Log Event",
-  "admin.service.attemptDescription": "Number of login attempts allowed before a user is locked out and required to reset their password via email.",
+  "admin.service.attemptDescription": "Login attempts allowed before user is locked out and required to reset password via email.",
   "admin.service.attemptExample": "E.g.: \"10\"",
   "admin.service.attemptTitle": "Maximum Login Attempts:",
   "admin.service.cmdsDesc": "When true, custom slash commands will be allowed. See <link>documentation</link> to learn more.",
@@ -2707,7 +2714,7 @@
   "admin.service.minimumHashtagLengthTitle": "Minimum Hashtag Length:",
   "admin.service.mobileSessionHours": "Session Length Mobile (hours):",
   "admin.service.mobileSessionHoursDesc": "The number of hours from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
-  "admin.service.mobileSessionHoursDesc.extendLength": "Set the number of hours from the last activity in Mattermost to the expiry of the user’s session on mobile. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.mobileSessionHoursDesc.extendLength": "Set the number of hours from the last activity in Mattermost to the expiry of the user's session on mobile. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
   "admin.service.outgoingOAuthConnectionsDesc": "When true, outgoing webhooks and slash commands will use set up oauth connections to authenticate with third party services. See <link>documentation</link> to learn more.",
   "admin.service.outgoingOAuthConnectionsTitle": "Enable Outgoing OAuth Connections: ",
   "admin.service.outWebhooksDesc": "When true, outgoing webhooks will be allowed. See <link>documentation</link> to learn more.",
@@ -2719,7 +2726,7 @@
   "admin.service.readTimeout": "Read Timeout:",
   "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.sessionCache": "Session Cache (minutes):",
-  "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.",
+  "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory:",
   "admin.service.sessionHoursEx": "E.g.: \"720\"",
   "admin.service.sessionIdleTimeout": "Session Idle Timeout (minutes):",
   "admin.service.sessionIdleTimeoutDesc": "The number of minutes from the last time a user was active on the system to the expiry of the user's session. Once expired, the user will need to log in to continue. Minimum is 5 minutes, and 0 is unlimited.\n \nApplies to the desktop app and browsers. For mobile apps, use an EMM provider to lock the app when not in use. In High Availability mode, enable IP hash load balancing for reliable timeout measurement.",
@@ -2730,11 +2737,11 @@
   "admin.service.siteURLExample": "E.g.: \"http://example.com:8065\"",
   "admin.service.ssoSessionHours": "Session Length SSO (hours):",
   "admin.service.ssoSessionHoursDesc": "The number of hours from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
-  "admin.service.ssoSessionHoursDesc.extendLength": "Set the number of hours from the last activity in Mattermost to the expiry of the user’s session for SSO authentication, such as SAML, GitLab and OAuth 2.0. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
-  "admin.service.terminateSessionsOnPasswordChange.helpText": "When true, all sessions of a user will expire if their password is changed by themselves or an administrator. If password change is initiated by user, their current session is not terminated",
+  "admin.service.ssoSessionHoursDesc.extendLength": "Set the number of hours from the last activity in Mattermost to the expiry of the user's session for SSO authentication, such as SAML, GitLab and OAuth 2.0. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.terminateSessionsOnPasswordChange.helpText": "When true, all sessions of a user will expire if their password is changed by themselves or an administrator. If password change is initiated by user, their current session is not terminated.",
   "admin.service.terminateSessionsOnPasswordChange.label": "Terminate Sessions on Password Change: ",
   "admin.service.testingDescription": "When true, /test slash command is enabled to load test accounts, data and text formatting. Changing this requires a server restart before taking effect.",
-  "admin.service.testingTitle": "Enable Testing Commands: ",
+  "admin.service.testingTitle": "Enable Testing Commands:",
   "admin.service.testSiteURL": "Test Live URL",
   "admin.service.testSiteURLFail": "Test unsuccessful: {error}",
   "admin.service.testSiteURLSuccess": "Test successful. This is a valid URL.",
@@ -2746,13 +2753,13 @@
   "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Enable the automatic retrieval of certificates from Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.useLetsEncryptDescription.disabled": "Enable the automatic retrieval of certificates from Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.\n \nThis setting cannot be enabled unless the [Forward port 80 to 443](#ServiceSettings.Forward80To443) setting is set to true.",
-  "admin.service.userAccessTokensDescription": "When true, users can create <link>user access tokens</link> for integrations in <strong>Profile > Security</strong>. They can be used to authenticate against the API and give full access to the account.\n\n To manage who can create personal access tokens or to search users by token ID, go to <strong>System Console > User Management > Users</strong>.",
-  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
+  "admin.service.userAccessTokensDescription": "When true, users can create <link>personal access tokens</link> for integrations in <strong>Profile > Security</strong>. They can be used to authenticate against the API and give full access to the account.\n\n To manage who can create personal access tokens or to search users by token ID, go to <strong>System Console > User Management > Users</strong>.",
+  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens:",
   "admin.service.webhooksDescription": "When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See <link>documentation</link> to learn more.",
   "admin.service.webhooksTitle": "Enable Incoming Webhooks: ",
   "admin.service.webSessionHours": "Session Length AD/LDAP and Email (hours):",
   "admin.service.webSessionHoursDesc": "The number of hours from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
-  "admin.service.webSessionHoursDesc.extendLength": "Set the number of hours from the last activity in Mattermost to the expiry of the user’s session when using email and AD/LDAP authentication. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.webSessionHoursDesc.extendLength": "Set the number of hours from the last activity in Mattermost to the expiry of the user's session when using email and AD/LDAP authentication. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
   "admin.service.writeTimeout": "Write Timeout:",
   "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
   "admin.sessionLengths.title": "Session Lengths",
@@ -2804,7 +2811,7 @@
   "admin.sidebar.metrics": "Performance Monitoring",
   "admin.sidebar.mfa": "MFA",
   "admin.sidebar.mobileSecurity": "Mobile Security",
-  "admin.sidebar.move_thread": "Move thread (Beta)",
+  "admin.sidebar.move_thread": "Move Thread (Beta)",
   "admin.sidebar.notices": "Notices",
   "admin.sidebar.notifications": "Notifications",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -2857,15 +2864,15 @@
   "admin.site.localization.enableAutoTranslationTitle": "Auto-translation",
   "admin.site.localization.languages.description": "Choose which languages should be the defaults",
   "admin.site.localization.languages.title": "Languages",
-  "admin.site.move_thread": "Move thread",
+  "admin.site.move_thread": "Move Thread",
   "admin.site.notices": "Notices",
   "admin.site.posts": "Posts",
   "admin.site.public_links": "Public Links",
   "admin.site.usersAndTeams": "Users and Teams",
-  "admin.sql.connMaxIdleTimeDescription": "Maximum idle time (in milliseconds) for a connection to the database.",
+  "admin.sql.connMaxIdleTimeDescription": "Maximum idle time for a connection to the database in milliseconds.",
   "admin.sql.connMaxIdleTimeExample": "E.g.: \"300000\"",
   "admin.sql.connMaxIdleTimeTitle": "Maximum Connection Idle Time:",
-  "admin.sql.connMaxLifetimeDescription": "Maximum lifetime (in milliseconds) for a connection to the database.",
+  "admin.sql.connMaxLifetimeDescription": "Maximum lifetime for a connection to the database in milliseconds.",
   "admin.sql.connMaxLifetimeExample": "E.g.: \"3600000\"",
   "admin.sql.connMaxLifetimeTitle": "Maximum Connection Lifetime:",
   "admin.sql.dataSource": "Data Source:",
@@ -2894,7 +2901,7 @@
   "admin.support.enableAskCommunityDesc": "When true, \"Ask the community\" link appears on the Mattermost user interface and Help Menu, which allows users to join the Mattermost Community to ask questions and help others troubleshoot issues. When false, the link is hidden from users.",
   "admin.support.enableAskCommunityTitle": "Enable Ask Community Link:",
   "admin.support.enableTermsOfServiceHelp": "When true, new users must accept the terms of service before accessing any Mattermost teams on desktop, web or mobile. Existing users must accept them after login or a page refresh. To update terms of service link displayed in account creation and login pages, go to <a>Site Configuration > Customization</a>",
-  "admin.support.enableTermsOfServiceTitle": "Enable Custom Terms of Service:",
+  "admin.support.enableTermsOfServiceTitle": "Enable Custom Terms of Service",
   "admin.support.forgotPasswordDesc": "The URL for the Forgot Password link on the Mattermost login page. If this field is empty the Forgot Password link takes users to the Password Reset page.",
   "admin.support.forgotPasswordTitle": "Forgot Password Custom Link:",
   "admin.support.helpDesc": "The URL for the Help link on the Mattermost login page, sign-up pages, and Help Menu. If this field is empty, the Help link is hidden from users.",
@@ -2919,9 +2926,9 @@
   "admin.support.reportAProblemTypeTitle": "Report a Problem:",
   "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Acceptable Use Policy\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Acceptable Use Policy for Mattermost software.",
   "admin.support.termsOfServiceReAcceptanceHelp": "The number of days before Terms of Service acceptance expires, and the terms must be re-accepted.",
-  "admin.support.termsOfServiceReAcceptanceTitle": "Re-Acceptance Period:",
+  "admin.support.termsOfServiceReAcceptanceTitle": "Re-Acceptance Period",
   "admin.support.termsOfServiceTextHelp": "Text that will appear in your custom Terms of Service. Supports Markdown-formatted text.",
-  "admin.support.termsOfServiceTextTitle": "Custom Terms of Service Text:",
+  "admin.support.termsOfServiceTextTitle": "Custom Terms of Service Text",
   "admin.support.termsOfServiceTitle": "Custom Terms of Service",
   "admin.support.termsTitle": "Terms of Use Link:",
   "admin.system_properties.confirm.delete.button": "Delete",
@@ -2996,10 +3003,10 @@
   "admin.system_users.filters.status.any": "Any",
   "admin.system_users.filters.status.deactive": "Deactivated users",
   "admin.system_users.filters.status.title": "Status",
-  "admin.system_users.filters.team.allTeams": "All Teams",
+  "admin.system_users.filters.team.allTeams": "All teams",
   "admin.system_users.filters.team.errorLoading": "Error while loading teams",
   "admin.system_users.filters.team.errorSearching": "Error while searching teams",
-  "admin.system_users.filters.team.noTeams": "No Teams",
+  "admin.system_users.filters.team.noTeams": "No teams",
   "admin.system_users.filters.team.title": "Team",
   "admin.system_users.filtersMenu": "Filters ({count})",
   "admin.system_users.filtersPopover.apply": "Apply",
@@ -3060,9 +3067,9 @@
   "admin.team_channel_settings.channel_users_will_be_removed": "{amount, number} {amount, plural, one {User} other {Users}} will be removed from this channel. They are not in groups linked to this channel.",
   "admin.team_channel_settings.convertAndRemoveConfirmModal.cancel": "No, cancel",
   "admin.team_channel_settings.convertAndRemoveConfirmModal.toPrivateConfirm": "Yes, convert channel to private and remove {amount, number} {amount, plural, one {user} other {users}}",
-  "admin.team_channel_settings.convertAndRemoveConfirmModal.toPrivateTitle": "Convert channel to a private and remove {amount, number} {amount, plural, one {user} other {users}}?",
+  "admin.team_channel_settings.convertAndRemoveConfirmModal.toPrivateTitle": "Convert channel to private and remove {amount, number} {amount, plural, one {user} other {users}}?",
   "admin.team_channel_settings.convertAndRemoveConfirmModal.toPublicConfirm": "Yes, convert channel to public and remove {amount, number} {amount, plural, one {user} other {users}}",
-  "admin.team_channel_settings.convertAndRemoveConfirmModal.toPublicTitle": "Convert channel to public and remove {amount, number} {amount, plural, one {user} other {users}}",
+  "admin.team_channel_settings.convertAndRemoveConfirmModal.toPublicTitle": "Convert channel to public and remove {amount, number} {amount, plural, one {user} other {users}}?",
   "admin.team_channel_settings.convertConfirmModal.cancel": "No, cancel",
   "admin.team_channel_settings.convertConfirmModal.toPrivateConfirm": "Yes, convert to private channel",
   "admin.team_channel_settings.convertConfirmModal.toPrivateMessageFirstLine": "When you convert {displayName} to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.",
@@ -3161,7 +3168,7 @@
   "admin.team.emailInvitationsTitle": "Enable Email Invitations: ",
   "admin.team.enableJoinLeaveMessageDescription": "Choose the default configuration of system messages displayed when users join or leave channels. Users can override this default by configuring Join/Leave messages in Account Settings > Advanced.",
   "admin.team.enableJoinLeaveMessageTitle": "Enable join/leave messages by default:",
-  "admin.team.invalidateEmailInvitesDescription": "This will invalidate active email invitations that have not been accepted by the user.  By default email invitations expire after 48 hours.",
+  "admin.team.invalidateEmailInvitesDescription": "This will invalidate active email invitations that have not been accepted by the user. By default email invitations expire after 48 hours.",
   "admin.team.invalidateEmailInvitesFail": "Unable to invalidate pending email invites: {error}",
   "admin.team.invalidateEmailInvitesSuccess": "Pending email invitations invalidated successfully",
   "admin.team.invalidateEmailInvitesTitle": "Invalidate pending email invites",
@@ -3185,7 +3192,6 @@
   "admin.team.removeBrandImage": "Remove brand image",
   "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
   "admin.team.restrict_direct_message_team": "Any member of the team",
-  "admin.team.restrictDescription": "New user accounts are restricted to the above specified email domain (e.g. \"mattermost.com\") or list of comma-separated domains (e.g. \"corp.mattermost.com, mattermost.com\"). New teams can only be created by users from the above domain(s). This setting affects email login for users.",
   "admin.team.restrictDirectMessage": "Enable users to open Direct Message channels with:",
   "admin.team.restrictDirectMessageDesc": "'Any user on the Mattermost server' enables users to open a Direct Message channel with any user on the server, even if they are not on any teams together. 'Any member of the team' limits the ability in the Direct Messages 'More' menu to only open Direct Message channels with users who are in the same team.",
   "admin.team.restrictExample": "E.g.: \"corp.mattermost.com, mattermost.com\"",
@@ -3295,6 +3301,7 @@
   "adminConsole.list.table.rowsCount.20": "20",
   "adminConsole.list.table.rowsCount.50": "50",
   "adminConsole.list.table.rowsCount.show(rowsPerPage)": "rows per page",
+  "advanced_create_post.doNotDisturbWarning": "{displayName} is set to <b>Do Not Disturb</b>",
   "advanced_text_editor.remote_user_hour": "The time for {user} is {time}",
   "advanced_textbox.max_length_error": "Text exceeds the maximum character limit of {maxLength} characters.",
   "advanced_textbox.min_length_error": "Text must be at least {minLength} characters.",
@@ -3422,7 +3429,7 @@
   "apps.error.lookup.error_preparing_request": "Error preparing lookup request: {errorMessage}",
   "apps.error.malformed_binding": "This binding is not properly formed. Contact the App developer.",
   "apps.error.parser": "Parsing error: {error}",
-  "apps.error.parser.empty_value": "empty values are not allowed",
+  "apps.error.parser.empty_value": "Empty values are not allowed",
   "apps.error.parser.execute_non_leaf": "You must select a subcommand.",
   "apps.error.parser.missing_binding": "Missing command bindings.",
   "apps.error.parser.missing_field_value": "Field value is missing.",
@@ -3643,7 +3650,7 @@
   "channel_bookmarks.create.error.generic_save": "There was an error trying to save the bookmark.",
   "channel_bookmarks.create.error.invalid_url": "Please enter a valid link. Could not parse: {link}.",
   "channel_bookmarks.create.error.invalid_url.continue_anyway": "Could not find: {url}. Please enter a valid link, or <Confirm>continue anyway</Confirm>.",
-  "channel_bookmarks.create.error.invalid_url.continuing_anyway": "This may not be a valid link: {url}.",
+  "channel_bookmarks.create.error.invalid_url.continuing_anyway": "This may not be a valid link: {link}.",
   "channel_bookmarks.create.file_input.edit": "Edit",
   "channel_bookmarks.create.file_input.label": "Attachment",
   "channel_bookmarks.create.link_info": "Add a link to any post, file, or any external link",
@@ -3664,7 +3671,7 @@
   "channel_header.closeChannelInfo": "Close Info",
   "channel_header.delete": "Archive Channel",
   "channel_header.directchannel": "{displayName} (you) Channel Menu",
-  "channel_header.directchannel.you": "{displayname} (you) ",
+  "channel_header.directchannel.you": "{displayName} (you) ",
   "channel_header.flagged": "Saved messages",
   "channel_header.groupMessageHasGuests": "This group message has guests",
   "channel_header.headerText.addNewButton": "Add a channel header",
@@ -3685,7 +3692,6 @@
   "channel_header.unmute": "Unmute Channel",
   "channel_header.unmuteConversation": "Unmute",
   "channel_header.userHelpGuide": "Help",
-  "channel_header.viewMembers": "View Members",
   "channel_info_rhs.about_area_id": "ID:",
   "channel_info_rhs.about_area.add_channel_header": "Add a channel header",
   "channel_info_rhs.about_area.add_channel_purpose": "Add a channel purpose",
@@ -3836,7 +3842,11 @@
   "channel_settings.access_rules.confirm_modal.no_users": "No users in this category",
   "channel_settings.access_rules.confirm_modal.question": "Are you sure you want to save and apply the access rules?",
   "channel_settings.access_rules.confirm_modal.restricted_tab": "Restricted ({count})",
+  "channel_settings.access_rules.confirm_modal.save": "Save",
+  "channel_settings.access_rules.confirm_modal.save_and_apply": "Save and apply",
   "channel_settings.access_rules.confirm_modal.saving": "Saving...",
+  "channel_settings.access_rules.confirm_modal.title": "Save and apply rules",
+  "channel_settings.access_rules.confirm_modal.title_with_warning": "Review membership impact",
   "channel_settings.access_rules.confirm_modal.view_users": "View users",
   "channel_settings.access_rules.error.back_to_editing": "Back to editing",
   "channel_settings.access_rules.error.no_current_user": "Cannot validate access rules: current user not found",
@@ -3861,7 +3871,7 @@
   "channel_settings.error_display_name_required": "Channel name is required",
   "channel_settings.error_purpose_length": "The text entered exceeds the character limit. The channel purpose is limited to {maxLength} characters.",
   "channel_settings.header.label": "Channel Header",
-  "channel_settings.modal.archiveTitle": "Archive Channel?",
+  "channel_settings.modal.archiveTitle": "Archive channel?",
   "channel_settings.modal.confirmArchive": "Confirm",
   "channel_settings.modal.title": "Channel Settings",
   "channel_settings.purpose.description": "Describe how this channel should be used.",
@@ -4042,9 +4052,9 @@
   "combined_system_message.removed_from_team.one_you": "You were **removed from the team**.",
   "combined_system_message.removed_from_team.two": "{firstUser} and {secondUser} were **removed from the team**.",
   "combined_system_message.you": "You",
-  "commercial_support_modal.description": "If you're experiencing issues, <a>submit a support ticket</a>. To help with troubleshooting, it's recommended to download the Support Packet below that includes more details about your Mattermost environment.",
+  "commercial_support_modal.description": "If you're experiencing issues, <supportLink>submit a support ticket</supportLink>. To help with troubleshooting, it's recommended to download the Support Packet below that includes more details about your Mattermost environment.",
   "commercial_support_modal.download_contents": "Select your Support Packet contents to download",
-  "commercial_support_modal.warning.banner": "Before downloading the Support Packet, set <strong>Output Logs to File</strong> to <strong>true</strong> and set <strong>File Log Level</strong> to <strong>DEBUG</strong> <a>here</a>.",
+  "commercial_support_modal.warning.banner": "Before downloading the Support Packet, set <strong>Output Logs to File</strong> to <strong>true</strong> and set <strong>File Log Level</strong> to <strong>DEBUG</strong> <debugLink>here</debugLink>.",
   "commercial_support.download_support_packet": "Download Support Packet",
   "commercial_support.title": "Commercial Support",
   "confirm_modal.cancel": "Cancel",
@@ -4127,8 +4137,8 @@
   "create_team.team_url.teamUrl": "Team URL",
   "create_team.team_url.unavailable": "This URL is taken or unavailable. Please try another.",
   "create_team.team_url.webAddress": "Choose the web address of your new team:",
-  "createComment.threadFromArchivedChannelMessage": "You are viewing a thread from an <b>archived channel</b>. New messages cannot be posted.",
-  "createComment.threadFromDeactivatedUserMessage": "You are viewing an archived channel with a <b>deactivated user</b>. New messages cannot be posted.",
+  "createComment.threadFromArchivedChannelMessage": "You are viewing a thread from an <strong>archived channel</strong>. New messages cannot be posted.",
+  "createComment.threadFromDeactivatedUserMessage": "You are viewing an archived channel with a <strong>deactivated user</strong>. New messages cannot be posted.",
   "custom_emoji.header": "Custom Emoji",
   "custom_status.expiry_dropdown.choose_date_and_time": "Choose date and time",
   "custom_status.expiry_dropdown.clear_after": "Clear after",
@@ -4151,7 +4161,7 @@
   "custom_status.suggestions.recent_title": "RECENT",
   "custom_status.suggestions.title": "SUGGESTIONS",
   "custom_status.suggestions.working_from_home": "Working from home",
-  "data_spillage_report_post.reporting_comment.placeholder": "No comment.",
+  "data_spillage_report_post.reporting_comment.placeholder": "No comment",
   "data_spillage_report_post.title": "{user} flagged a message for review",
   "data_spillage_report.keep_message.button_text": "Keep message",
   "data_spillage_report.remove_message.button_text": "Remove message",
@@ -4165,6 +4175,7 @@
   "datetime.yesterday": "yesterday",
   "deactivate_member_modal.deactivate": "Deactivate",
   "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system.\n",
+  "deactivate_member_modal.desc_with_confirmation": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
   "deactivate_member_modal.desc.confirm": "Are you sure you want to deactivate {username}?",
   "deactivate_member_modal.desc.for_users_with_bot_accounts1": "This action deactivates {username}",
   "deactivate_member_modal.desc.for_users_with_bot_accounts2": "They will be logged out and not have access to any teams or channels on this system.",
@@ -4189,7 +4200,7 @@
   "delete_post.warning": "This message has {count, number} {count, plural, one {comment} other {comments}} on it.",
   "delete_success_modal.button_text": "Go to mattermost.com",
   "deleteChannelModal.canViewArchivedChannelsWarning": "This will archive the channel from the team. Channel contents will still be accessible by channel members.",
-  "deleteChannelModal.confirmArchive": "Are you sure you wish to archive the <b>{display_name}</b> channel?",
+  "deleteChannelModal.confirmArchive": "Are you sure you wish to archive the <strong>{display_name}</strong> channel?",
   "demote_to_user_modal.demote": "Demote",
   "demote_to_user_modal.desc": "This action demotes the user {username} to a guest. It will restrict the user's ability to join public channels and interact with users outside of the channels they are currently members of. Are you sure you want to demote user {username} to guest?",
   "demote_to_user_modal.title": "Demote User {username} to Guest",
@@ -4242,7 +4253,7 @@
   "edit_channel_header_modal.cancel": "Cancel",
   "edit_channel_header_modal.description": "Edit the text appearing next to the channel name in the header.",
   "edit_channel_header_modal.error": "The text entered exceeds the character limit. The channel header is limited to {maxLength} characters.",
-  "edit_channel_header_modal.placeholder": "Edit the Channel Header...",
+  "edit_channel_header_modal.placeholder": "Enter the Channel Header",
   "edit_channel_header_modal.previewHeader": "Edit",
   "edit_channel_header_modal.save": "Save",
   "edit_channel_header_modal.title": "Edit Header for {channel}",
@@ -4290,9 +4301,9 @@
   "emoji_list.delete.confirm.button": "Delete",
   "emoji_list.delete.confirm.msg": "This action permanently deletes the custom emoji. Are you sure you want to delete it?",
   "emoji_list.delete.confirm.title": "Delete Custom Emoji",
-  "emoji_list.empty": "No Custom Emoji Found",
+  "emoji_list.empty": "No custom emoji found",
   "emoji_list.header": "Custom Emoji",
-  "emoji_list.help": "Custom emoji are available to everyone on your server. Type \":\" followed by two characters in a message box to bring up the emoji selection menu.",
+  "emoji_list.help": "Custom emoji are available to everyone on your server. Type ':' followed by two characters in a message box to bring up the emoji selection menu.",
   "emoji_list.help2": "Tip: If you add #, ##, or ### as the first character on a new line containing emoji, you can use larger sized emoji. To try it out, send a message such as: '# :smile:'.",
   "emoji_list.image": "Image",
   "emoji_list.name": "Name",
@@ -4318,7 +4329,7 @@
   "emoji_picker.skin_tone_icons": "Skin tone icons",
   "emoji_picker.smileys-emotion": "Smileys & Emotion",
   "emoji_picker.symbols": "Symbols",
-  "emoji_picker.travel-places": "Travel Places",
+  "emoji_picker.travel-places": "Travel & Places",
   "emoji_skin_item.emoji_aria_label": "{skinName} emoji",
   "emoji_skin.close": "Close skin tones",
   "emoji_skin.dark_skin_tone": "Dark skin tone",
@@ -4335,7 +4346,7 @@
   "error.channel_not_found.title": "Channel Not Found",
   "error.channelNotFound.guest_link": "Back",
   "error.channelNotFound.link": "Back to {defaultChannelName}",
-  "error.generic.link": "Back to {siteName}",
+  "error.generic.link": "Back to Mattermost",
   "error.generic.link_login": "Back to Login Page",
   "error.generic.message": "An error has occurred.",
   "error.generic.siteLink": "Back to {siteName}",
@@ -4427,6 +4438,7 @@
   "file_upload.zeroBytesFile": "You are uploading an empty file: {filename}",
   "file_upload.zeroBytesFiles": "You are uploading empty files: {filenames}",
   "filtered_channels_list.search": "Search channels",
+  "filtered_channels_list.search.label": "Search Channels",
   "filtered_user_list.countTotal": "{count, number} {count, plural, one {member} other {members}} of {total, number} total",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, one {member} other {members}} of {total, number} total",
   "filtered_user_list.next": "Next",
@@ -4568,7 +4580,7 @@
   "get_app.rememberMyPreference": "Remember my preference",
   "get_app.systemDialogMessage": "View in Desktop App",
   "get_app.systemDialogMessageMobile": "View in App",
-  "get_link.clipboard": " Link copied",
+  "get_link.clipboard": "Copied",
   "get_link.close": "Close",
   "get_link.copy": "Copy Link",
   "get_public_link_modal.help": "The link below allows anyone to see this file without being registered on this server.",
@@ -4617,7 +4629,7 @@
   "installed_incoming_webhooks.add": "Add Incoming Webhook",
   "installed_incoming_webhooks.delete.confirm": "This action permanently deletes the incoming webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_incoming_webhooks.empty": "No incoming webhooks found",
-  "installed_incoming_webhooks.emptySearch": "No incoming webhooks match **{searchTerm}**",
+  "installed_incoming_webhooks.emptySearch": "No incoming webhooks match <strong>{searchTerm}</strong>",
   "installed_incoming_webhooks.header": "Incoming Webhooks",
   "installed_incoming_webhooks.help": "Use incoming webhooks to connect external tools to Mattermost. {buildYourOwn} or visit the {appDirectory} to find self-hosted, third-party apps and integrations.",
   "installed_incoming_webhooks.help.appDirectory": "App Directory",
@@ -4653,7 +4665,7 @@
   "installed_oauth_apps.dynamically_registered": "Dynamically Registered: ",
   "installed_oauth_apps.dynamically_registered.yes": "Yes",
   "installed_oauth_apps.empty": "No OAuth 2.0 Applications found",
-  "installed_oauth_apps.emptySearch": "No OAuth 2.0 Applications match **{searchTerm}**",
+  "installed_oauth_apps.emptySearch": "No OAuth 2.0 Applications match <strong>{searchTerm}</strong>",
   "installed_oauth_apps.header": "OAuth 2.0 Applications",
   "installed_oauth_apps.help": "Create {oauthApplications} to securely integrate bots and third-party apps with Mattermost. Visit the {appDirectory} to find available self-hosted apps.",
   "installed_oauth_apps.help.appDirectory": "App Directory",
@@ -4724,7 +4736,7 @@
   "interactive_dialog.error.bad_date_format": "Date field must be in YYYY-MM-DD format",
   "interactive_dialog.error.bad_datetime_format": "DateTime field must be in YYYY-MM-DDTHH:mm:ssZ format",
   "interactive_dialog.error.bad_email": "Must be a valid email address.",
-  "interactive_dialog.error.bad_format": "Date field must be in YYYY-MM-DD format",
+  "interactive_dialog.error.bad_format": "Invalid date format",
   "interactive_dialog.error.bad_number": "Must be a number.",
   "interactive_dialog.error.bad_url": "URL must include http:// or https://.",
   "interactive_dialog.error.invalid_option": "Must be a valid option",
@@ -4768,7 +4780,7 @@
   "invitation_modal.guests.users_emails_input.valid_email": "Invite **{email}** as a guest",
   "invitation_modal.invite_members.exceeded_max_add_members_batch": "No more than **{text}** people can be invited at once",
   "invitation_modal.invite.more": "Invite More People",
-  "invitation_modal.members.search_and_add.title": "Add or Invite People",
+  "invitation_modal.members.search_and_add.title": "Invite People",
   "invitation_modal.members.search-and-add.placeholder-email-disabled": "Add members",
   "invitation_modal.members.users_emails_input.no_user_found_matching": "No one found matching **{text}**. Enter their email to invite them.",
   "invitation_modal.members.users_emails_input.no_user_found_matching-email-disabled": "No one found matching **{text}**",
@@ -4872,7 +4884,7 @@
   "licensingPage.overageUsersBanner.noticeDescription": "Notify your Customer Success Manager on your next true-up check. <a></a>",
   "licensingPage.overageUsersBanner.noticeTitle": "Your workspace user count has exceeded your licensed seat count by {seats, number} {seats, plural, one {seat} other {seats}}",
   "licensingPage.overageUsersBanner.text": "(Only visible to admins) The user count exceeds the number of licensed seats by {seats, number} {seats, plural, one {seat} other {seats}}. Purchase more seats to stay compliant.",
-  "link_preview.image_preview": "Show Image preview",
+  "link_preview.image_preview": "Show image preview",
   "link_preview.remove_link_preview": "Remove link preview",
   "list_modal.paginatorCount": "{startCount, number} - {endCount, number} of {total, number} total",
   "loading_screen.loading": "Loading",
@@ -4884,7 +4896,7 @@
   "login_mfa.token": "MFA Token",
   "login.cardtitle": "Log in",
   "login.cardtitle.external": "Log in with one of the following:",
-  "login.changed": " Sign-in method changed successfully",
+  "login.changed": "Sign-in method changed successfully",
   "login.contact_admin.detail": "To access your team's workspace, contact your workspace admin. If you've been invited already, check your email inbox for a Mattermost workspace invite.",
   "login.contact_admin.title": "Contact your workspace admin",
   "login.createTeam": "Create a team",
@@ -4897,7 +4909,7 @@
   "login.google": "Google",
   "login.invalidCredentials": "The email/username or password is invalid.",
   "login.invalidPassword": "Your password is incorrect.",
-  "login.ldapCreate": " Enter your AD/LDAP username and password to create an account.",
+  "login.ldapCreate": "Enter your AD/LDAP username and password to create an account.",
   "login.ldapUsername": "AD/LDAP Username",
   "login.ldapUsernameLower": "AD/LDAP username",
   "login.logIn": "Log in",
@@ -4917,7 +4929,7 @@
   "login.openid": "Open ID",
   "login.or": "or log in with",
   "login.pageTitle": "Log in - {siteName}",
-  "login.passwordChanged": " Password updated successfully",
+  "login.passwordChanged": "Password updated successfully",
   "login.placeholderOr": " or ",
   "login.saml": "SAML",
   "login.session_expired": "Your session has expired. Please log in again.",
@@ -4930,12 +4942,12 @@
   "login.title": "Log in to your account",
   "login.username": "Username",
   "login.userNotFound": "We couldn't find an account matching your login credentials.",
-  "login.verified": " Email Verified",
+  "login.verified": "Email Verified",
   "manage_channel_groups_modal.search_placeholder": "Search groups",
   "manage_team_groups_modal.search_placeholder": "Search groups",
   "mark_all_threads_as_read_modal.confirm": "Mark all as read",
   "mark_all_threads_as_read_modal.description": "All your threads will be marked as read, with unread and mention badges cleared. Do you want to continue?",
-  "mark_all_threads_as_read_modal.title": "Mark all your threads as read?",
+  "mark_all_threads_as_read_modal.title": "Mark all your threads as read",
   "mark_as_read_confirm_modal.body": "Are you sure you want to mark {numChannels} channels as read?",
   "mark_as_read_confirm_modal.confirm": "Mark as read",
   "mark_as_read_confirm_modal.header": "Mark as read",
@@ -5068,7 +5080,7 @@
   "multiselect.list.resultsAvailable": "{count, plural, one {# result found} other {# results found}} for your search.",
   "multiselect.loading": "Loading...",
   "multiselect.maxGroupMembers": "No more than 256 members can be added to a group at once.",
-  "multiselect.maxPeople": "Use ↑↓ to browse, ↵ to select. You can't add more than 7 people. Please <a>create a channel</a> to include more people. ",
+  "multiselect.maxPeople": "Use ↑↓ to browse, ↵ to select. You can't add more than {num} people. Please <a>create a channel</a> to include more people.",
   "multiselect.numGroupsRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {group} other {groups}}. ",
   "multiselect.numMembers": "{memberOptions, number} of {totalCount, number} members",
   "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
@@ -5165,7 +5177,7 @@
   "notify_admin_to_upgrade_cta.notify-admin.notify": "Notify your admin",
   "notify_admin_to_upgrade_cta.notify-admin.notifying": "Notifying...",
   "notify_all.confirm": "Confirm",
-  "notify_all.title.confirm": "Confirm Sending Notifications to Entire Channel",
+  "notify_all.title.confirm": "Confirm sending notifications to entire channel",
   "notify_all.title.confirm_groups": "Confirm sending notifications to groups",
   "notify_here.question": "By using <b>@here</b> you are about to send notifications to at least <b>{totalMembers} other people</b>. Are you sure you want to do this?",
   "notifyAll.question": "By using <b>@all</b> or <b>@channel</b> you are about to send notifications to <b>{totalMembers} people</b>. Are you sure you want to do this?",
@@ -5216,7 +5228,7 @@
   "onboarding_wizard.submit_error.generic": "Something went wrong. Please try again.",
   "onboardingTask.checklist.completed_subtitle": "We hope Mattermost is more familiar now.",
   "onboardingTask.checklist.completed_title": "Well done. You’ve completed all of the tasks!",
-  "onboardingTask.checklist.disclaimer": "By clicking “Start trial”, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement,</linkEvaluation> <linkPrivacy>privacy policy,</linkPrivacy> and receiving product emails.",
+  "onboardingTask.checklist.disclaimer": "By clicking “Start trial”, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement</linkEvaluation>, <linkPrivacy>privacy policy</linkPrivacy> and receiving product emails.",
   "onboardingTask.checklist.dismiss_link": "No thanks, I’ll figure it out myself",
   "onboardingTask.checklist.downloads": "Now that you’re all set up, <link>download our apps.</link>",
   "onboardingTask.checklist.higher_security_features": "Interested in our higher-security features?",
@@ -5314,7 +5326,7 @@
   "post_info.actions.noActions.first_line": "No Actions currently",
   "post_info.actions.noActions.second_line": "configured for this server",
   "post_info.actions.tooltip.actions": "Actions",
-  "post_info.actions.tutorialTip": "Message actions that are provided\nthrough apps, integrations or plugins\n have moved to this menu item.",
+  "post_info.actions.tutorialTip": "Message actions that are provided\nthrough apps, integrations or plugins\nhave moved to this menu item.",
   "post_info.actions.tutorialTip.title": "Actions for messages",
   "post_info.actions.visitMarketplace": "Visit the Marketplace",
   "post_info.ai_generated.by_user": "Message posted by @{username}",
@@ -5423,7 +5435,7 @@
   "postlist.toast.scrollToLatest": "Jump to new messages",
   "postlist.toast.scrollToUnread": "Jump to unreads",
   "postlist.toast.searchHint": "Tip: Try {searchShortcut} to search this channel",
-  "posts_view.loadMore": "Load More messages",
+  "posts_view.loadMore": "Load more messages",
   "posts_view.newMsg": "New Messages",
   "postypes.custom_open_pricing_modal_post_renderer.membersThatRequested": "Members that requested ",
   "pricing_modal.btn.tooltip": "Only visible to system admins",
@@ -5638,7 +5650,6 @@
   "setting_item_min.edit": "Edit",
   "setting_picture.cancel": "Cancel",
   "setting_picture.help.profile": "Upload a picture in BMP, JPG, JPEG, or PNG format. Maximum file size: {max}",
-  "setting_picture.help.profile.example": "Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}",
   "setting_picture.remove": "Remove This Icon",
   "setting_picture.remove_image": "Remove image",
   "setting_picture.remove_profile_picture": "Remove Profile Picture",
@@ -5651,7 +5662,7 @@
   "shared_channel_indicator.tooltip_with_names.few": "Shared with: {organizations}",
   "shared_channel_indicator.tooltip_with_names.many": "Shared with: {organizations} and {count, number} {count, plural, one {other} other {others}}",
   "shared_user_indicator.aria_label": "shared user",
-  "shared_user_indicator.tooltip": "From a trusted organization",
+  "shared_user_indicator.tooltip": "From trusted organizations",
   "shared_user_indicator.tooltip_with_names": "From: {remoteNames}",
   "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
   "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
@@ -5774,7 +5785,7 @@
   "shortcuts.team_nav.switcher.mac": "Navigate to a specific team:\t⌘|⌥|[1-9]",
   "sidebar_left.add_channel_dropdown.browseChannels": "Browse channels",
   "sidebar_left.add_channel_dropdown.createNewChannel": "Create new channel",
-  "sidebar_left.addChannelsCta": "Add channels",
+  "sidebar_left.addChannelsCta": "Add Channels",
   "sidebar_left.channel_filter.filterByUnread": "Filter by unread",
   "sidebar_left.channel_filter.filterUnreadAria": "unreads filter",
   "sidebar_left.channel_filter.showAllChannels": "Show all channels",
@@ -5875,7 +5886,7 @@
   "signup_user_completed.cardtitle": "Create your account",
   "signup_user_completed.cardtitle.external": "Create your account with one of the following:",
   "signup_user_completed.chooseUser": "Choose a Username",
-  "signup_user_completed.create": "Create Account",
+  "signup_user_completed.create": "Create account",
   "signup_user_completed.emailIs": "You'll use this address to sign in to {siteName}.",
   "signup_user_completed.emailLabel": "Email address",
   "signup_user_completed.failed_update_user_state": "Please clear your cache and try to log in.",
@@ -5901,7 +5912,6 @@
   "single_image_view.copy_link_tooltip": "Copy link",
   "single_image_view.download_tooltip": "Download",
   "slash_commands.header": "Slash Commands",
-  "someting.string": "defaultString",
   "start_cloud_trial.modal.enter_trial_email.input.label": "Enter business email",
   "start_cloud_trial.modal.enter_trial_email.input.placeholder": "name@companyname.com",
   "start_trial_form_modal.failureModal.subtitle": "There was an issue processing your trial request.",
@@ -5912,7 +5922,7 @@
   "start_trial_form.disclaimer": "By selecting Start trial, I agree to the <agreement>Mattermost Software Evaluation Agreement</agreement>, <privacypolicy>Privacy Policy</privacypolicy>, and receiving product emails.",
   "start_trial_form.email": "Business Email",
   "start_trial_form.invalid_business_email": "Please enter a valid business email address.",
-  "start_trial_form.modal_body": "Just a few quick items to help us tailor your trial experience",
+  "start_trial_form.modal_body": "Just a few quick items to help us tailor your trial experience.",
   "start_trial_form.modal_btn.start": "Start trial",
   "start_trial_form.modal_title": "Start Trial",
   "start_trial_form.name": "Name",
@@ -5959,7 +5969,7 @@
   "system_notice.adminVisible": "Only visible to System Admins",
   "system_notice.adminVisible.icon": "Only visible to System Admins Icon",
   "system_notice.dont_show": "Don't Show Again",
-  "system_notice.remind_me": "Remind me Later",
+  "system_notice.remind_me": "Remind Me Later",
   "system_policy_indicator.base_message": "This {resourceType} has system-level access {policyText} applied",
   "system_policy_indicator.description_with_policies": "This {resourceType} has system-level access policies applied: {policyList}. Any custom access rules you set here will be applied in addition to this policy.",
   "system_policy_indicator.more_policies": "{count} more",
@@ -6002,9 +6012,6 @@
   "terms_of_service.agreeButton": "I Agree",
   "terms_of_service.api_error": "Unable to complete the request. If this issue persists, contact your System Administrator.",
   "terms_of_service.disagreeButton": "I Disagree",
-  "test.description": "Formatted description",
-  "test1": "Help Text",
-  "test2": "Button Text",
   "textbox.bold": "**bold**",
   "textbox.edit": "Edit message",
   "textbox.help": "Help",
@@ -6022,6 +6029,7 @@
   "texteditor.rewrite.improveWriting": "Improve writing",
   "texteditor.rewrite.menu": "Rewrite Options",
   "texteditor.rewrite.nextPrompt": "What would you like AI to do next?",
+  "texteditor.rewrite.placeholder.rewriting": "Rewriting...",
   "texteditor.rewrite.prompt": "Ask AI to edit message...",
   "texteditor.rewrite.regenerate": "Regenerate",
   "texteditor.rewrite.rewriting": "Rewriting",
@@ -6179,6 +6187,7 @@
   "user_profile.account.post_was_created": "This post was created by an integration from @{username}",
   "user_profile.add_user_to_channel": "Add to a Channel",
   "user_profile.call.ongoing": "Call with {user} is ongoing",
+  "user_profile.call.start": "Start Call",
   "user_profile.close": "Close user profile popover",
   "user_profile.custom_status": "Status",
   "user_profile.custom_status.set_status": "Set a status",
@@ -6266,7 +6275,7 @@
   "user.settings.display.channeldisplaymode": "Select the width of the center channel.",
   "user.settings.display.channelDisplayTitle": "Channel Display",
   "user.settings.display.clickToReply": "Click to open threads",
-  "user.settings.display.clickToReplyDescription": "When enabled, click anywhere on a message to open the reply thread",
+  "user.settings.display.clickToReplyDescription": "When enabled, click anywhere on a message to open the reply thread.",
   "user.settings.display.clockDisplay": "Clock Display",
   "user.settings.display.collapseDesc": "Set whether previews of image links and image attachment thumbnails show as expanded or collapsed by default. This setting can also be controlled using the slash commands /expand and /collapse.",
   "user.settings.display.collapseDisplay": "Default Appearance of Image Previews",
@@ -6375,7 +6384,7 @@
   "user.settings.general.usernameInfo": "Pick something easy for teammates to recognize and recall.",
   "user.settings.general.usernameReserved": "This username is reserved, please choose a new one.",
   "user.settings.general.usernameRestrictions": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'.",
-  "user.settings.general.validEmail": "Please enter a valid email address",
+  "user.settings.general.validEmail": "Please enter a valid email address.",
   "user.settings.general.validImage": "Only BMP, JPG or PNG images may be used for profile pictures",
   "user.settings.general.validUrl": "Please enter a valid url.",
   "user.settings.languages.change": "Change interface language",
@@ -6671,7 +6680,7 @@
   "version_bar.refresh": "Refresh the app now",
   "view_image_popover.download": "Download",
   "view_image_popover.publicLink": "Get a public link",
-  "view_image.loading": "Loading ",
+  "view_image.loading": "Loading",
   "view_image.zoom_in": "Zoom In",
   "view_image.zoom_out": "Zoom Out",
   "view_image.zoom_reset": "Reset Zoom",
@@ -6718,21 +6727,21 @@
   "workspace_limits.file_storage.short.usage": "{actual} / {limit}",
   "workspace_limits.file_storage.usage": "{actual} of {limit} ({percent}%)",
   "workspace_limits.menu_limit.critical.files_storage": "You’re getting closer to the {limit} file storage limit. <a>{callToAction}</a>",
-  "workspace_limits.menu_limit.critical.messages_history": "You’re close to hitting the free {limit} message history limit. <a>{callToAction}</a>",
-  "workspace_limits.menu_limit.critical.messages_history_non_admin": "You're almost at the message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>",
+  "workspace_limits.menu_limit.critical.messages_history": "You’re close to hitting the free {limit} message history limit <a>{callToAction}</a>",
+  "workspace_limits.menu_limit.critical.messages_history_non_admin": "You’re almost at the message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>",
   "workspace_limits.menu_limit.file_storage": "File storage limit",
   "workspace_limits.menu_limit.messages": "Total messages",
   "workspace_limits.menu_limit.notify_admin": "Notify admin",
   "workspace_limits.menu_limit.over.files_storage": "You’re over the {limit} file storage limit. You can only access the most recent {limit} worth of files. <a>{callToAction}</a>",
   "workspace_limits.menu_limit.over.messages_history": "You’re over the free message history limit. You can only view up to the last {limit} messages in your history. <a>{callToAction}</a>",
-  "workspace_limits.menu_limit.over.messages_history_non_admin": "You're over your message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>",
+  "workspace_limits.menu_limit.over.messages_history_non_admin": "You’re over your message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>",
   "workspace_limits.menu_limit.reached.files_storage": "You’ve reached the {limit} file storage limit. You can only access the most recent {limit} worth of files. <a>{callToAction}</a>",
   "workspace_limits.menu_limit.reached.messages_history": "You’ve reached the free message history limit. You can only view up to the last {limit} messages in your history. <a>{callToAction}</a>",
-  "workspace_limits.menu_limit.reached.messages_history_non_admin": "You've reached your message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>",
+  "workspace_limits.menu_limit.reached.messages_history_non_admin": "You’ve reached your message limit. Your admin can upgrade your plan for unlimited messages. <a>{callToAction}</a>",
   "workspace_limits.menu_limit.view_plans": "View plans",
   "workspace_limits.menu_limit.view_upgrade_options": "View upgrade options.",
   "workspace_limits.menu_limit.warn.files_storage": "You’re getting closer to the {limit} file storage limit. <a>{callToAction}</a>",
-  "workspace_limits.menu_limit.warn.messages_history": "You’re getting closer to the free {limit} message limit. <a>{callToAction}</a>",
+  "workspace_limits.menu_limit.warn.messages_history": "You're getting closer to the free {limit} message limit. <a>{callToAction}</a>",
   "workspace_limits.message_history": "Message history",
   "workspace_limits.message_history.locked.description.admin": "Full access to message history is included in <a>paid plans</a>",
   "workspace_limits.message_history.locked.title.admin": "Limited history is displayed",
diff --git a/webapp/channels/src/packages/mattermost-redux/src/utils/integration_utils.ts b/webapp/channels/src/packages/mattermost-redux/src/utils/integration_utils.ts
index a11a0926121..e7adfc7e4df 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/utils/integration_utils.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/utils/integration_utils.ts
@@ -69,8 +69,10 @@ export function checkDialogElementForError(elem: DialogElement, value: any): Dia
         if (value && value.length < elem.min_length) {
             return defineMessage({
                 id: 'interactive_dialog.error.too_short',
+
+                // minLength provided by InteractiveDialog
+                // eslint-disable-next-line formatjs/enforce-placeholders
                 defaultMessage: 'Minimum input length is {minLength}.',
-                values: {minLength: elem.min_length},
             });
         }
 
diff --git a/webapp/channels/src/plugins/pluggable/error_boundary.tsx b/webapp/channels/src/plugins/pluggable/error_boundary.tsx
index 45b93e52e94..8443b38781a 100644
--- a/webapp/channels/src/plugins/pluggable/error_boundary.tsx
+++ b/webapp/channels/src/plugins/pluggable/error_boundary.tsx
@@ -70,9 +70,6 @@ export default class PluggableErrorBoundary extends React.PureComponent<Props, S
                         <FormattedMessage
                             id='pluggable.errorRefresh'
                             defaultMessage='Refresh?'
-                            values={{
-                                pluginId: this.props.pluginId,
-                            }}
                         />
                     </a>
                 </WrapperDiv>
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index 7942e91eedf..0d08aba7e07 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -2157,7 +2157,7 @@ export const searchFilesHintOptions = [{searchTerm: 'From:', message: defineMess
     {searchTerm: 'On:', message: defineMessage({id: 'search_files_list_option.on', defaultMessage: 'Files on a date'})},
     {searchTerm: 'Before:', message: defineMessage({id: 'search_files_list_option.before', defaultMessage: 'Files before a date'})},
     {searchTerm: 'After:', message: defineMessage({id: 'search_files_list_option.after', defaultMessage: 'Files after a date'})},
-    {searchTerm: 'Ext:', message: defineMessage({id: 'search_files_list_option.ext', defaultMessage: 'Files with a extension'})},
+    {searchTerm: 'Ext:', message: defineMessage({id: 'search_files_list_option.ext', defaultMessage: 'Files with an extension'})},
     {searchTerm: '-', message: defineMessage({id: 'search_files_list_option.exclude', defaultMessage: 'Exclude search terms'}), additionalDisplay: '—'},
     {searchTerm: '""', message: defineMessage({id: 'search_files_list_option.phrases', defaultMessage: 'Files with phrases'})},
 ];
diff --git a/webapp/channels/src/utils/i18n.tsx b/webapp/channels/src/utils/i18n.tsx
index abe731aa540..39c378b7b36 100644
--- a/webapp/channels/src/utils/i18n.tsx
+++ b/webapp/channels/src/utils/i18n.tsx
@@ -9,10 +9,33 @@ import store from 'stores/redux_store';
 
 const cache = createIntlCache();
 
-// getIntl returns an instance of IntlShape for the current locale.
-// Prefer `useIntl` and `FormattedMessage` and only use this selectively when
-// outside of React components.
+// Stores the intl instance from IntlProvider for reuse
+let intlInstance: IntlShape | null = null;
+
+/**
+ * Sets the intl instance from IntlProvider.
+ * This allows getIntl() to return the same instance that React components use.
+ */
+export function setIntl(intl: IntlShape): void {
+    intlInstance = intl;
+}
+
+/**
+ * Returns the IntlShape instance for the current locale.
+ * Prefer `useIntl` and `FormattedMessage` and only use this selectively when
+ * outside of React components.
+ *
+ * This returns the same instance that IntlProvider creates, ensuring consistency
+ * and avoiding duplicate translation loading.
+ */
 export function getIntl(): IntlShape {
+    // Return the IntlProvider's instance if available (normal case)
+    if (intlInstance) {
+        return intlInstance;
+    }
+
+    // Fallback: create an instance if IntlProvider hasn't mounted yet
+    // This can happen during early initialization or in tests
     const state = store.getState();
     const locale = getCurrentLocale(state);
 
@@ -55,13 +78,6 @@ export function getMonthLong(locale: string): 'short' | 'long' {
     return 'long';
 }
 
-/**
- * @deprecated Use react-intl methods such as formatMessage, FormattedMessage, defineMessage, defineMessages.
- */
-export function t(v: string): string {
-    return v;
-}
-
 export interface Message {
     id: string;
     defaultMessage: string;
diff --git a/webapp/channels/src/utils/password.tsx b/webapp/channels/src/utils/password.tsx
index 4dc249f8077..dd190d35af2 100644
--- a/webapp/channels/src/utils/password.tsx
+++ b/webapp/channels/src/utils/password.tsx
@@ -10,7 +10,7 @@ import type {PasswordConfig} from 'mattermost-redux/selectors/entities/general';
 import Constants from 'utils/constants';
 
 export function isValidPassword(password: string, passwordConfig: PasswordConfig, intl?: IntlShape) {
-    let errorId = passwordErrors.passwordError.id;
+    let errorId: keyof typeof passwordErrors = 'passwordError';
     let valid = true;
     const minimumLength = passwordConfig.minimumLength || Constants.MIN_PASSWORD_LENGTH;
 
@@ -23,7 +23,7 @@ export function isValidPassword(password: string, passwordConfig: PasswordConfig
             valid = false;
         }
 
-        errorId += 'Lowercase';
+        errorId = `${errorId}Lowercase`;
     }
 
     if (passwordConfig.requireUppercase) {
@@ -31,7 +31,7 @@ export function isValidPassword(password: string, passwordConfig: PasswordConfig
             valid = false;
         }
 
-        errorId += 'Uppercase';
+        errorId = `${errorId}Uppercase`;
     }
 
     if (passwordConfig.requireNumber) {
@@ -39,7 +39,7 @@ export function isValidPassword(password: string, passwordConfig: PasswordConfig
             valid = false;
         }
 
-        errorId += 'Number';
+        errorId = `${errorId}Number`;
     }
 
     if (passwordConfig.requireSymbol) {
@@ -47,17 +47,14 @@ export function isValidPassword(password: string, passwordConfig: PasswordConfig
             valid = false;
         }
 
-        errorId += 'Symbol';
+        errorId = `${errorId}Symbol`;
     }
 
     let error;
     if (!valid) {
+        const passwordErrorMessage = passwordErrors[errorId];
         error = intl ? (
-            intl.formatMessage(
-                {
-                    id: errorId,
-                    defaultMessage: 'Must be {min}-{max} characters long.',
-                },
+            intl.formatMessage(passwordErrorMessage,
                 {
                     min: minimumLength,
                     max: Constants.MAX_PASSWORD_LENGTH,
@@ -65,8 +62,7 @@ export function isValidPassword(password: string, passwordConfig: PasswordConfig
             )
         ) : (
             <FormattedMessage
-                id={errorId}
-                defaultMessage='Must be {min}-{max} characters long.'
+                {...passwordErrorMessage}
                 values={{
                     min: minimumLength,
                     max: Constants.MAX_PASSWORD_LENGTH,
diff --git a/webapp/channels/src/utils/url.tsx b/webapp/channels/src/utils/url.tsx
index f589fdd9bd2..cb10c8b301e 100644
--- a/webapp/channels/src/utils/url.tsx
+++ b/webapp/channels/src/utils/url.tsx
@@ -143,7 +143,7 @@ export function validateChannelUrl(url: string, intl?: IntlShape): Array<React.R
             errors.push(formattedError(
                 defineMessage({
                     id: 'change_url.longer',
-                    defaultMessage: 'URLs must have at least 2 characters.',
+                    defaultMessage: 'URLs must have at least 1 character.',
                 }),
                 intl,
             ));
diff --git a/webapp/channels/src/utils/utils.tsx b/webapp/channels/src/utils/utils.tsx
index 18a6a952128..a7fd8aa5644 100644
--- a/webapp/channels/src/utils/utils.tsx
+++ b/webapp/channels/src/utils/utils.tsx
@@ -9,6 +9,7 @@ import isNil from 'lodash/isNil';
 import moment from 'moment';
 import React from 'react';
 import type {LinkHTMLAttributes} from 'react';
+import type {MessageDescriptor} from 'react-intl';
 
 import type {Channel} from '@mattermost/types/channels';
 import type {Address} from '@mattermost/types/cloud';
@@ -47,7 +48,6 @@ import {displayUsername} from 'mattermost-redux/utils/user_utils';
 
 import {searchForTerm} from 'actions/post_actions';
 import {addUserToTeam} from 'actions/team_actions';
-import {getCurrentLocale, getTranslations} from 'selectors/i18n';
 import store from 'stores/redux_store';
 
 import {focusPost} from 'components/permalink_view/actions';
@@ -57,6 +57,7 @@ import {getHistory} from 'utils/browser_history';
 import Constants, {FileTypes, ValidationErrors, A11yCustomEventTypes, AdvancedTextEditorTextboxIds} from 'utils/constants';
 import type {A11yFocusEventDetail} from 'utils/constants';
 import DesktopApp from 'utils/desktop_api';
+import {getIntl} from 'utils/i18n';
 import * as Keyboard from 'utils/keyboard';
 import {FOCUS_REPLY_POST, isPopoutWindow, sendToParent} from 'utils/popouts/popout_windows';
 import * as UserAgent from 'utils/user_agent';
@@ -1233,35 +1234,34 @@ export function clearFileInput(elm: HTMLInputElement) {
 }
 
 /**
- * @deprecated Use react-intl instead, only place its usage can be justified is in the redux actions
+ * @deprecated Prefer using react-intl's `useIntl` hook or `FormattedMessage` component within React components.
+ * This function is mainly for use in Redux actions, utilities, and other non-React contexts.
+ *
+ * @param descriptor - Message descriptor with id, defaultMessage, and optional description
+ * @param values - Optional values for placeholder interpolation
+ * @returns The localized string with interpolated values
+ *
+ * @example
+ * // Simple message
+ * localizeMessage({
+ *   id: 'example.message',
+ *   defaultMessage: 'This is an example message',
+ *   description: 'An example message shown in the help section'
+ * })
+ *
+ * @example
+ * // Message with interpolation
+ * localizeMessage({
+ *   id: 'welcome.message',
+ *   defaultMessage: 'Welcome, {username}!',
+ *   description: 'Welcome message with username'
+ * }, {username: 'John'})
  */
-export function localizeMessage({id, defaultMessage}: {id: string; defaultMessage?: string}) {
-    const state = store.getState();
-
-    const locale = getCurrentLocale(state);
-    const translations = getTranslations(state, locale);
-
-    if (!translations || !(id in translations)) {
-        return defaultMessage || id;
-    }
-
-    return translations[id];
-}
-
-/**
- * @deprecated If possible, use intl.formatMessage instead. If you have to use this, remember to mark the id using `t`
- */
-export function localizeAndFormatMessage(descriptor: {id: string; defaultMessage?: string}, template: { [name: string]: any } | undefined) {
-    const base = localizeMessage(descriptor);
-
-    if (!template) {
-        return base;
-    }
-
-    return base.replace(/{[\w]+}/g, (match) => {
-        const key = match.substr(1, match.length - 2);
-        return template[key] || match;
-    });
+export function localizeMessage(descriptor: MessageDescriptor, values?: Record<string, any>): string;
+export function localizeMessage(descriptor: {id: string; defaultMessage?: string; description?: string}, values?: Record<string, any>): string;
+export function localizeMessage(descriptor: MessageDescriptor | {id: string; defaultMessage?: string; description?: string}, values?: Record<string, any>): string {
+    const intl = getIntl();
+    return intl.formatMessage(descriptor as MessageDescriptor, values);
 }
 
 export function mod(a: number, b: number): number {
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 6d8058ff23c..be83666abf6 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -23,6 +23,7 @@
         "@babel/preset-env": "7.21.5",
         "@babel/preset-react": "7.18.6",
         "@babel/preset-typescript": "7.21.5",
+        "@formatjs/cli": "6.7.4",
         "@types/node": "20.19.18",
         "babel-loader": "9.1.2",
         "babel-plugin-formatjs": "10.5.1",
@@ -34,7 +35,7 @@
         "css-loader": "6.7.3",
         "eslint": "8.57.0",
         "eslint-import-resolver-webpack": "0.13.8",
-        "eslint-plugin-formatjs": "4.12.2",
+        "eslint-plugin-formatjs": "4.13.3",
         "eslint-plugin-react": "7.34.0",
         "eslint-plugin-react-hooks": "4.6.0",
         "mini-css-extract-plugin": "2.7.5",
@@ -150,7 +151,6 @@
         "@deanwhillier/jest-matchmedia-mock": "1.2.0",
         "@mattermost/calls-common": "0.27.0",
         "@mattermost/eslint-plugin": "*",
-        "@mattermost/mmjstool": "github:mattermost/mattermost-utilities#7b63833d208d482ba4a1c12230bb3e68dd9c5e5e",
         "@stylistic/stylelint-plugin": "3.1.2",
         "@testing-library/dom": "10.4.1",
         "@testing-library/jest-dom": "6.8.0",
@@ -235,7 +235,6 @@
           "url": "https://opencollective.com/csstools"
         }
       ],
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -258,7 +257,6 @@
           "url": "https://opencollective.com/csstools"
         }
       ],
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -555,8 +553,7 @@
     "channels/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "peer": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "channels/node_modules/react-transition-group": {
       "version": "4.4.5",
@@ -695,7 +692,6 @@
       "version": "7.22.0",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.0.tgz",
       "integrity": "sha512-D58mjF+Y+89UfbMJpV57UTCg+JRQIFgvROPfH7mmIfBcoFVMkwiiiJyzPyW3onN9kg9noDg7MVyI+Yt64bnfQQ==",
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.21.4",
@@ -2263,7 +2259,6 @@
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.5.tgz",
       "integrity": "sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@babel/helper-compilation-targets": "^7.21.5",
@@ -2499,6 +2494,7 @@
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.26.0.tgz",
       "integrity": "sha512-YXHu5lN8kJCb1LOb9PgV6pvak43X2h4HvRApcN5SdWeaItQOzfn1hgP6jasD6KWQyJDBxrVmA9o9OivlnNJK/w==",
+      "peer": true,
       "dependencies": {
         "core-js-pure": "^3.30.2",
         "regenerator-runtime": "^0.14.0"
@@ -2510,7 +2506,8 @@
     "node_modules/@babel/runtime-corejs3/node_modules/regenerator-runtime": {
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "peer": true
     },
     "node_modules/@babel/template": {
       "version": "7.27.2",
@@ -2749,7 +2746,6 @@
       "version": "11.14.0",
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
       "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -2820,9 +2816,9 @@
       "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg=="
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
       "dependencies": {
         "eslint-visitor-keys": "^3.4.3"
       },
@@ -2947,6 +2943,51 @@
       "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
       "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="
     },
+    "node_modules/@formatjs/cli": {
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-6.7.4.tgz",
+      "integrity": "sha512-k6uqdeZDAjDd7iKKQ8yFYizFpbi5Y9H9NkV+hoIhmxaMSGvWRnRusQJaIQ+2rI14MH6knW6fx7tnO15C+ijDiw==",
+      "dev": true,
+      "bin": {
+        "formatjs": "bin/formatjs"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "peerDependencies": {
+        "@glimmer/syntax": "^0.95.0",
+        "@vue/compiler-core": "^3.5.12",
+        "content-tag": "^3.0.0",
+        "ember-template-recast": "^6.1.5",
+        "vue": "^3.5.12"
+      },
+      "peerDependenciesMeta": {
+        "@glimmer/env": {
+          "optional": true
+        },
+        "@glimmer/reference": {
+          "optional": true
+        },
+        "@glimmer/syntax": {
+          "optional": true
+        },
+        "@glimmer/validator": {
+          "optional": true
+        },
+        "@vue/compiler-core": {
+          "optional": true
+        },
+        "content-tag": {
+          "optional": true
+        },
+        "ember-template-recast": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@formatjs/ecma402-abstract": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.15.0.tgz",
@@ -4843,7 +4884,6 @@
       "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.13.tgz",
       "integrity": "sha512-LTATglVUPGkPf15zX1wTMlZ0+AU7cGEGF6ekVF1crA8eHUWsGjrYTB+Ht4E3HTrCok8weQG+K01rJndCp/l4XA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/core": "^0.16.13"
@@ -4883,7 +4923,6 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.13.tgz",
       "integrity": "sha512-8Z1k96ZFxlhK2bgrY1JNWNwvaBeI/bciLM0yDOni2+aZwfIIiC7Y6PeWHTAvjHNjphz+XCt01WQmOYWCn0ML6g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.13"
@@ -4897,7 +4936,6 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.13.tgz",
       "integrity": "sha512-PvLrfa8vkej3qinlebyhLpksJgCF5aiysDMSVhOZqwH5nQLLtDE9WYbnsofGw4r0VVpyw3H/ANCIzYTyCtP9Cg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.13"
@@ -4924,7 +4962,6 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.13.tgz",
       "integrity": "sha512-xW+9BtEvoIkkH/Wde9ql4nAFbYLkVINhpgAE7VcBUsuuB34WUbcBl/taOuUYQrPEFQJ4jfXiAJZ2H/rvKjCVnQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.13",
@@ -4971,7 +5008,6 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.13.tgz",
       "integrity": "sha512-WEl2tPVYwzYL8OKme6Go2xqiWgKsgxlMwyHabdAU4tXaRwOCnOI7v4021gCcBb9zn/oWwguHuKHmK30Fw2Z/PA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.13"
@@ -5105,7 +5141,6 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.13.tgz",
       "integrity": "sha512-qoqtN8LDknm3fJm9nuPygJv30O3vGhSBD2TxrsCnhtOsxKAqVPJtFVdGd/qVuZ8nqQANQmTlfqTiK9mVWQ7MiQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.13"
@@ -5119,7 +5154,6 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.13.tgz",
       "integrity": "sha512-Ev+Jjmj1nHYw897z9C3R9dYsPv7S2/nxdgfFb/h8hOwK0Ovd1k/+yYS46A0uj/JCKK0pQk8wOslYBkPwdnLorw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.13"
@@ -5136,7 +5170,6 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.13.tgz",
       "integrity": "sha512-05POQaEJVucjTiSGMoH68ZiELc7QqpIpuQlZ2JBbhCV+WCbPFUBcGSmE7w4Jd0E2GvCho/NoMODLwgcVGQA97A==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.13"
@@ -5409,8 +5442,7 @@
       "version": "0.1.52",
       "resolved": "https://registry.npmjs.org/@mattermost/compass-icons/-/compass-icons-0.1.52.tgz",
       "integrity": "sha512-/AJXvmmASA8/yY41SaeIb5iibrSMRSk768heO9JQW+gwCEN/pC4rTT/cxAMZCUj4AXhWhxme87zmL3lm4tkGlQ==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@mattermost/components": {
       "resolved": "platform/components",
@@ -5420,137 +5452,6 @@
       "resolved": "platform/eslint-plugin",
       "link": true
     },
-    "node_modules/@mattermost/mmjstool": {
-      "name": "mmjstool",
-      "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#7b63833d208d482ba4a1c12230bb3e68dd9c5e5e",
-      "integrity": "sha512-rO/erucxfGQLYeDulzTmbVAk89tA29eBsrXblZDKfot9/kBeevum4DXelQQPZbwziEo6ykmOAByNalmZglF8Hw==",
-      "dev": true,
-      "dependencies": {
-        "estree-walk": "^2.2.0",
-        "filehound": "^1.17.5",
-        "sort-json": "^2.0.0",
-        "webpack-cli": "^4.9.1",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "mmjstool": "bin/mmjstool"
-      }
-    },
-    "node_modules/@mattermost/mmjstool/node_modules/@webpack-cli/configtest": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
-      "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x",
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@mattermost/mmjstool/node_modules/@webpack-cli/info": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
-      "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
-      "dev": true,
-      "dependencies": {
-        "envinfo": "^7.7.3"
-      },
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@mattermost/mmjstool/node_modules/@webpack-cli/serve": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
-      "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mattermost/mmjstool/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@mattermost/mmjstool/node_modules/interpret": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@mattermost/mmjstool/node_modules/rechoir": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.9.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@mattermost/mmjstool/node_modules/webpack-cli": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
-      "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.2.0",
-        "@webpack-cli/info": "^1.5.0",
-        "@webpack-cli/serve": "^1.7.0",
-        "colorette": "^2.0.14",
-        "commander": "^7.0.0",
-        "cross-spawn": "^7.0.3",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^2.2.0",
-        "rechoir": "^0.7.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
-        "@webpack-cli/migrate": {
-          "optional": true
-        },
-        "webpack-bundle-analyzer": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@mattermost/types": {
       "resolved": "platform/types",
       "link": true
@@ -6526,7 +6427,6 @@
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -7112,7 +7012,6 @@
       "version": "18.2.64",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.64.tgz",
       "integrity": "sha512-MlmPvHgjj2p3vZaxbQgFUQFvD8QiZwACfGqEdDSWou5yISWxDQ4/74nCAwsUiX7UFLKZz3BbVSPj+YxeoGGCfg==",
-      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -7161,7 +7060,6 @@
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.25.tgz",
       "integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -7345,7 +7243,6 @@
       "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.32.tgz",
       "integrity": "sha512-DqVpl8R0vbhVSop4120UHtGrFmHuPeoDwF4hDT0kPJTY8ty0SI38RV3VhCMsWigMUXG+kCXu7vMRqMFNy6eQgA==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "@types/hoist-non-react-statics": "*",
         "@types/react": "*",
@@ -7458,6 +7355,32 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
@@ -7587,7 +7510,6 @@
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
       "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "7.18.0",
         "@typescript-eslint/types": "7.18.0",
@@ -7748,173 +7670,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
-      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.18.0",
-        "@typescript-eslint/utils": "7.18.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
-      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
-      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
-      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
-      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/typescript-estree": "7.18.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
-      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@typescript-eslint/types": {
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
@@ -7957,9 +7712,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -8538,10 +8293,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
-      "peer": true,
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -8603,7 +8357,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -9898,12 +9651,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
     "node_modules/bmp-js": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz",
@@ -10097,7 +9844,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001669",
         "electron-to-chromium": "^1.5.41",
@@ -10618,8 +10364,7 @@
     "node_modules/classnames": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
-      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==",
-      "peer": true
+      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
     },
     "node_modules/clean-css": {
       "version": "5.3.3",
@@ -11080,6 +10825,7 @@
       "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.38.1.tgz",
       "integrity": "sha512-BY8Etc1FZqdw1glX0XNOq2FDwfrg/VGqoZOZCdaL+UmdaqDwQwYXkMJT4t6In+zfEfOJDcM9T0KdbBeJg8KKCQ==",
       "hasInstallScript": true,
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -11611,7 +11357,6 @@
       "version": "2.29.3",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
       "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==",
-      "peer": true,
       "engines": {
         "node": ">=0.11"
       },
@@ -11981,15 +11726,6 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/detect-indent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
-      "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/detect-libc": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
@@ -12412,7 +12148,6 @@
       "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
       "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "array.prototype.flat": "^1.2.3",
         "cheerio": "^1.0.0-rc.3",
@@ -12477,12 +12212,6 @@
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "dev": true
     },
-    "node_modules/err-code": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha512-CJAN+O0/yA1CKfRn9SXOGctSpEM7DCon/r/5r2eXFMY2zCCJBasFhcM5I+1kh3Ap11FsQCX+vGHceNPvpWKhoA==",
-      "dev": true
-    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -12718,7 +12447,6 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
       "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -12873,13 +12601,13 @@
       }
     },
     "node_modules/eslint-plugin-formatjs": {
-      "version": "4.12.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.12.2.tgz",
-      "integrity": "sha512-b4iEsi0Y3zy7J6xjxlhrIaDFJa27OiLwardvCRBRHALoZs8rNJ0oQIW6ymUgELLEMeFuEMAd2837M+n5SHJutg==",
+      "version": "4.13.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.13.3.tgz",
+      "integrity": "sha512-4j3IVwaLEXblnvH2/ZIOZwc9zaaZf2+zyn/b8oLJRt6kMCTu2rIs4UsIxy5nBRYZzsBSh7k34JJ5/ngGtJ3kYw==",
       "dev": true,
       "dependencies": {
-        "@formatjs/icu-messageformat-parser": "2.7.6",
-        "@formatjs/ts-transformer": "3.13.12",
+        "@formatjs/icu-messageformat-parser": "2.7.8",
+        "@formatjs/ts-transformer": "3.13.14",
         "@types/eslint": "7 || 8",
         "@types/picomatch": "^2.3.0",
         "@typescript-eslint/utils": "^6.18.1",
@@ -12895,9 +12623,9 @@
       }
     },
     "node_modules/eslint-plugin-formatjs/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.18.2.tgz",
-      "integrity": "sha512-+QoPW4csYALsQIl8GbN14igZzDbuwzcpWrku9nyMXlaqAlwRBgl5V+p0vWMGFqHOw37czNXaP/lEk4wbLgcmtA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
       "dev": true,
       "dependencies": {
         "@formatjs/intl-localematcher": "0.5.4",
@@ -12905,23 +12633,23 @@
       }
     },
     "node_modules/eslint-plugin-formatjs/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.7.6",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.6.tgz",
-      "integrity": "sha512-etVau26po9+eewJKYoiBKP6743I1br0/Ie00Pb/S/PtmYfmjTcOn2YCh2yNkSZI12h6Rg+BOgQYborXk46BvkA==",
+      "version": "2.7.8",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
+      "integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
       "dev": true,
       "dependencies": {
-        "@formatjs/ecma402-abstract": "1.18.2",
-        "@formatjs/icu-skeleton-parser": "1.8.0",
+        "@formatjs/ecma402-abstract": "2.0.0",
+        "@formatjs/icu-skeleton-parser": "1.8.2",
         "tslib": "^2.4.0"
       }
     },
     "node_modules/eslint-plugin-formatjs/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.0.tgz",
-      "integrity": "sha512-QWLAYvM0n8hv7Nq5BEs4LKIjevpVpbGLAJgOaYzg9wABEoX1j0JO1q2/jVkO6CVlq0dbsxZCngS5aXbysYueqA==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
+      "integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
       "dev": true,
       "dependencies": {
-        "@formatjs/ecma402-abstract": "1.18.2",
+        "@formatjs/ecma402-abstract": "2.0.0",
         "tslib": "^2.4.0"
       }
     },
@@ -12935,12 +12663,12 @@
       }
     },
     "node_modules/eslint-plugin-formatjs/node_modules/@formatjs/ts-transformer": {
-      "version": "3.13.12",
-      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.13.12.tgz",
-      "integrity": "sha512-uf1+DgbsCrzHAg7uIf0QlzpIkHYxRSRig5iJa9FaoUNIDZzNEE2oW/uLLLq7I9Z2FLIPhbmgq8hbW40FoQv+Fg==",
+      "version": "3.13.14",
+      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.13.14.tgz",
+      "integrity": "sha512-TP/R54lxQ9Drzzimxrrt6yBT/xBofTgYl5wSTpyKe3Aq9vIBVcFmS6EOqycj0X34KGu3EpDPGO0ng8ZQZGLIFg==",
       "dev": true,
       "dependencies": {
-        "@formatjs/icu-messageformat-parser": "2.7.6",
+        "@formatjs/icu-messageformat-parser": "2.7.8",
         "@types/json-stable-stringify": "^1.0.32",
         "@types/node": "14 || 16 || 17",
         "chalk": "^4.0.0",
@@ -13137,7 +12865,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.0.tgz",
       "integrity": "sha512-MeVXdReleBTdkz/bvcQMSnCXGi+c9kvy51IpinjnJgutl3YTHWsDdke7Z1ufZpGfDG8xduBDKyjtB9JH1eBKIQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "array-includes": "^3.1.7",
         "array.prototype.findlast": "^1.2.4",
@@ -13170,7 +12897,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
       "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -13382,15 +13108,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/estree-walk": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/estree-walk/-/estree-walk-2.2.0.tgz",
-      "integrity": "sha512-6gUr3kGNVEfL6pcIiGBrSkhoEQPkv8laQy1lUDpaxT4AvlBxf/UYSueOEb6Wq1cG5Ct6xQSkFCHoJcZlijpUAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -14054,17 +13771,6 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/file-js": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/file-js/-/file-js-0.3.0.tgz",
-      "integrity": "sha512-nZlX1pxpV6Mt8BghM3Z150bpsCT1zqil97UryusstZLSs9caYAe0Wph2UKPC3awfM2Dq4ri1Sv99KuK4EIImlA==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.4.7",
-        "minimatch": "^3.0.3",
-        "proper-lockfile": "^1.2.0"
-      }
-    },
     "node_modules/file-type": {
       "version": "12.4.2",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
@@ -14074,41 +13780,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/filehound": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/filehound/-/filehound-1.17.6.tgz",
-      "integrity": "sha512-5q4zjFkI8W2zLmvbvyvI//K882IpEj6sMNXPUQlk5H6W4Wh3OSSylEAIEmMLELP9G7ileYjTKPXOn0YzzS55Lg==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.7.2",
-        "file-js": "0.3.0",
-        "lodash": "^4.17.21",
-        "minimatch": "^5.0.0",
-        "moment": "^2.29.1",
-        "unit-compare": "^1.0.1"
-      }
-    },
-    "node_modules/filehound/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/filehound/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/filename-reserved-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
@@ -16914,7 +16585,6 @@
       "resolved": "https://registry.npmjs.org/jest/-/jest-30.1.3.tgz",
       "integrity": "sha512-Ry+p2+NLk6u8Agh5yVqELfUJvRfV51hhVBRIB5yZPY7mU0DGBmOuFG5GebZbMbm86cdQNK0fhJuDX8/1YorISQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@jest/core": "30.1.3",
         "@jest/types": "30.0.5",
@@ -19483,7 +19153,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
       "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.3",
@@ -20705,12 +20374,13 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "node_modules/json-stable-stringify": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
-      "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz",
+      "integrity": "sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
         "isarray": "^2.0.5",
         "jsonify": "^0.0.1",
         "object-keys": "^1.1.1"
@@ -20992,8 +20662,7 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "peer": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
@@ -21495,8 +21164,7 @@
     "node_modules/monaco-editor": {
       "version": "0.52.2",
       "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.2.tgz",
-      "integrity": "sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==",
-      "peer": true
+      "integrity": "sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ=="
     },
     "node_modules/monaco-editor-webpack-plugin": {
       "version": "7.1.0",
@@ -23105,7 +22773,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.1.1",
@@ -23243,7 +22910,6 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
       "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -23406,18 +23072,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/proper-lockfile": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz",
-      "integrity": "sha512-YNjxtCoY3A+lohlLXWCYrHDhUdfU3MMnuC+ADhloDvJo586LKW23dPrjxGvRGuus05Amcf0cQy6vrjjtbJhWpw==",
-      "dev": true,
-      "dependencies": {
-        "err-code": "^1.0.0",
-        "extend": "^3.0.0",
-        "graceful-fs": "^4.1.2",
-        "retry": "^0.10.0"
-      }
-    },
     "node_modules/proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -23651,7 +23305,6 @@
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
       "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -23750,7 +23403,6 @@
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
       "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.0"
@@ -24162,8 +23814,7 @@
     "node_modules/redux": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
-      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "peer": true
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
     },
     "node_modules/redux-batched-actions": {
       "version": "0.5.0",
@@ -24548,15 +24199,6 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha512-ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -24595,7 +24237,6 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
       "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
       "dev": true,
-      "peer": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -25016,7 +24657,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -25395,8 +25035,7 @@
     "node_modules/shallow-equals": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shallow-equals/-/shallow-equals-1.0.0.tgz",
-      "integrity": "sha512-xd/FKcdmfmMbyYCca3QTVEJtqUOGuajNzvAX6nt8dXILwjAIEkfHc4hI8/JMGApAmb7VeULO0Q30NTxnbH/15g==",
-      "peer": true
+      "integrity": "sha512-xd/FKcdmfmMbyYCca3QTVEJtqUOGuajNzvAX6nt8dXILwjAIEkfHc4hI8/JMGApAmb7VeULO0Q30NTxnbH/15g=="
     },
     "node_modules/shallowequal": {
       "version": "1.1.0",
@@ -25601,29 +25240,6 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/sort-json": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/sort-json/-/sort-json-2.0.1.tgz",
-      "integrity": "sha512-s8cs2bcsQCzo/P2T/uoU6Js4dS/jnX8+4xunziNoq9qmSpZNCrRIAIvp4avsz0ST18HycV4z/7myJ7jsHWB2XQ==",
-      "dev": true,
-      "dependencies": {
-        "detect-indent": "^5.0.0",
-        "detect-newline": "^2.1.0",
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "sort-json": "app/cmd.js"
-      }
-    },
-    "node_modules/sort-json/node_modules/detect-newline": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -26239,7 +25855,6 @@
           "url": "https://github.com/sponsors/stylelint"
         }
       ],
-      "peer": true,
       "dependencies": {
         "@csstools/css-parser-algorithms": "^3.0.1",
         "@csstools/css-tokenizer": "^3.0.1",
@@ -26403,7 +26018,6 @@
           "url": "https://opencollective.com/csstools"
         }
       ],
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -26426,7 +26040,6 @@
           "url": "https://opencollective.com/csstools"
         }
       ],
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -27170,7 +26783,6 @@
       "version": "6.3.7",
       "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz",
       "integrity": "sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==",
-      "peer": true,
       "dependencies": {
         "@popperjs/core": "^2.9.0"
       }
@@ -27370,8 +26982,7 @@
     "node_modules/tslib": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
-      "peer": true
+      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA=="
     },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
@@ -27511,7 +27122,6 @@
       "version": "5.6.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
       "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -27676,15 +27286,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/unit-compare": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unit-compare/-/unit-compare-1.0.1.tgz",
-      "integrity": "sha512-AeLMQr8gcen2WOTwV0Gvi1nKKbY4Mms79MoltZ6hrZV/VANgE/YQly3jtWZJA/fa9m4ajhynq3XMqh5rOyZclA==",
-      "dev": true,
-      "dependencies": {
-        "moment": "^2.14.1"
-      }
-    },
     "node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
@@ -27972,7 +27573,6 @@
       "version": "5.95.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
       "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
-      "peer": true,
       "dependencies": {
         "@types/estree": "^1.0.5",
         "@webassemblyjs/ast": "^1.12.1",
@@ -28019,7 +27619,6 @@
       "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
       "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
         "@webpack-cli/configtest": "^2.1.1",
diff --git a/webapp/package.json b/webapp/package.json
index 4f5da637b7a..a2fb7b51333 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -16,6 +16,8 @@
     "check": "npm run check --workspaces --if-present",
     "fix": "npm run fix --workspaces --if-present",
     "check-types": "npm run check-types --workspaces --if-present",
+    "i18n-extract": "npm run i18n-extract --workspaces --if-present",
+    "i18n-extract:check": "npm run i18n-extract:check --workspaces --if-present",
     "clean": "npm run clean --workspaces --if-present",
     "gen-lang-imports": "node scripts/gen_lang_imports.mjs"
   },
@@ -28,6 +30,7 @@
     "@babel/preset-env": "7.21.5",
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.21.5",
+    "@formatjs/cli": "6.7.4",
     "@types/node": "20.19.18",
     "babel-loader": "9.1.2",
     "babel-plugin-formatjs": "10.5.1",
@@ -39,7 +42,7 @@
     "css-loader": "6.7.3",
     "eslint": "8.57.0",
     "eslint-import-resolver-webpack": "0.13.8",
-    "eslint-plugin-formatjs": "4.12.2",
+    "eslint-plugin-formatjs": "4.13.3",
     "eslint-plugin-react": "7.34.0",
     "eslint-plugin-react-hooks": "4.6.0",
     "mini-css-extract-plugin": "2.7.5",