From bacd2678c371b70433b198d36483a5e826aae0c8 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 29 Nov 2024 15:52:28 -0330
Subject: [PATCH 1/2] chore: Rename  to stable

---
 .circleci/config.yml                          | 40 +++++++++----------
 .circleci/scripts/check_mmi_trigger.sh        |  2 +-
 .../scripts/release-create-release-pr.sh      |  2 +-
 .github/CONTRIBUTING.md                       |  2 +-
 .github/workflows/close-bug-report.yml        |  2 +-
 .github/workflows/codeql-analysis.yml         |  2 +-
 .github/workflows/create-bug-report.yml       |  2 +-
 .github/workflows/main.yml                    |  2 +-
 .../trigger-metamask-institutional-e2e-ci.yml |  6 +--
 development/generate-rc-commits.js            |  4 +-
 .../{master-sync.js => stable-sync.js}        | 22 +++++-----
 docs/QA_Guide.md                              |  2 +-
 docs/publishing.md                            |  8 ++--
 docs/translating-guide.md                     |  2 +-
 package.json                                  |  4 +-
 .../upgrade-testing/upgrade-testing.md        | 12 +++---
 16 files changed, 57 insertions(+), 57 deletions(-)
 rename development/{master-sync.js => stable-sync.js} (81%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83c5643400a4..2553c6d4f5de 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,12 +45,12 @@ rc_branch_only: &rc_branch_only
       only:
         - /^Version-v(\d+)[.](\d+)[.](\d+)/
 
-main_master_rc_only: &main_master_rc_only
+main_stable_rc_only: &main_stable_rc_only
   filters:
     branches:
       only:
         - main
-        - master
+        - stable
         - /^Version-v(\d+)[.](\d+)[.](\d+)/
 
 aliases:
@@ -124,7 +124,7 @@ workflows:
           filters:
             branches:
               ignore:
-                - master
+                - stable
       - test-deps-audit:
           requires:
             - prep-deps
@@ -174,7 +174,7 @@ workflows:
           requires:
             - prep-deps
       - prep-build-test-flask-mv2:
-          <<: *main_master_rc_only
+          <<: *main_stable_rc_only
           requires:
             - prep-deps
       - prep-build-test-mmi:
@@ -202,7 +202,7 @@ workflows:
           requires:
             - prep-deps
       - test-e2e-chrome-webpack:
-          <<: *main_master_rc_only
+          <<: *main_stable_rc_only
           requires:
             - prep-build-test-webpack
             - get-changed-files-with-git-diff
@@ -211,7 +211,7 @@ workflows:
             - prep-build-test
             - get-changed-files-with-git-diff
       - test-e2e-firefox:
-          <<: *main_master_rc_only
+          <<: *main_stable_rc_only
           requires:
             - prep-build-test-mv2
             - get-changed-files-with-git-diff
@@ -231,7 +231,7 @@ workflows:
             - prep-build-test-flask
             - get-changed-files-with-git-diff
       - test-e2e-firefox-flask:
-          <<: *main_master_rc_only
+          <<: *main_stable_rc_only
           requires:
             - prep-build-test-flask-mv2
       - test-e2e-chrome-mmi:
@@ -339,7 +339,7 @@ workflows:
       - job-publish-release:
           filters:
             branches:
-              only: master
+              only: stable
           requires:
             - prep-deps
             - prep-build
@@ -407,7 +407,7 @@ jobs:
           condition:
             not:
               matches:
-                pattern: /^master$/
+                pattern: /^stable$/
                 value: << pipeline.git.branch >>
           steps:
             - run:
@@ -481,7 +481,7 @@ jobs:
 
   # This job is used for the e2e quality gate.
   # It must be run before any job which uses the run-all.js script.
-  # The job is skipped in main, master or RC branches.
+  # The job is skipped in main, stable or RC branches.
   get-changed-files-with-git-diff:
     executor: node-browsers-small
     steps:
@@ -562,7 +562,7 @@ jobs:
           condition:
             not:
               matches:
-                pattern: /^master$/
+                pattern: /^stable$/
                 value: << pipeline.git.branch >>
           steps:
             - run:
@@ -571,7 +571,7 @@ jobs:
       - when:
           condition:
             matches:
-              pattern: /^master$/
+              pattern: /^stable$/
               value: << pipeline.git.branch >>
           steps:
             - run:
@@ -599,7 +599,7 @@ jobs:
           condition:
             not:
               matches:
-                pattern: /^master$/
+                pattern: /^stable$/
                 value: << pipeline.git.branch >>
           steps:
             - run:
@@ -608,7 +608,7 @@ jobs:
       - when:
           condition:
             matches:
-              pattern: /^master$/
+              pattern: /^stable$/
               value: << pipeline.git.branch >>
           steps:
             - run:
@@ -642,7 +642,7 @@ jobs:
           condition:
             not:
               matches:
-                pattern: /^master$/
+                pattern: /^stable$/
                 value: << pipeline.git.branch >>
           steps:
             - run:
@@ -651,7 +651,7 @@ jobs:
       - when:
           condition:
             matches:
-              pattern: /^master$/
+              pattern: /^stable$/
               value: << pipeline.git.branch >>
           steps:
             - run:
@@ -686,7 +686,7 @@ jobs:
           condition:
             not:
               matches:
-                pattern: /^master$/
+                pattern: /^stable$/
                 value: << pipeline.git.branch >>
           steps:
             - run:
@@ -695,7 +695,7 @@ jobs:
       - when:
           condition:
             matches:
-              pattern: /^master$/
+              pattern: /^stable$/
               value: << pipeline.git.branch >>
           steps:
             - run:
@@ -727,7 +727,7 @@ jobs:
           condition:
             not:
               matches:
-                pattern: /^master$/
+                pattern: /^stable$/
                 value: << pipeline.git.branch >>
           steps:
             - run:
@@ -736,7 +736,7 @@ jobs:
       - when:
           condition:
             matches:
-              pattern: /^master$/
+              pattern: /^stable$/
               value: << pipeline.git.branch >>
           steps:
             - run:
diff --git a/.circleci/scripts/check_mmi_trigger.sh b/.circleci/scripts/check_mmi_trigger.sh
index b2a5ca13734d..46ae1dca53c6 100755
--- a/.circleci/scripts/check_mmi_trigger.sh
+++ b/.circleci/scripts/check_mmi_trigger.sh
@@ -9,7 +9,7 @@ if [ -z "$CIRCLE_PULL_REQUEST" ] || [ -z "$GITHUB_TOKEN" ]; then
   exit 0
 fi
 
-if [[ $CIRCLE_BRANCH = 'main' || $CIRCLE_BRANCH = 'master' || $CIRCLE_BRANCH =~ ^Version-v[0-9.]* ]]; then
+if [[ $CIRCLE_BRANCH = 'main' || $CIRCLE_BRANCH = 'stable' || $CIRCLE_BRANCH =~ ^Version-v[0-9.]* ]]; then
   echo "Long-running branch detected, running MMI tests."
   echo "run_mmi_tests=true" > mmi_trigger.env
   exit 0
diff --git a/.circleci/scripts/release-create-release-pr.sh b/.circleci/scripts/release-create-release-pr.sh
index 9aa5d39bdb2d..9f47e7dffd31 100755
--- a/.circleci/scripts/release-create-release-pr.sh
+++ b/.circleci/scripts/release-create-release-pr.sh
@@ -26,7 +26,7 @@ function install_github_cli ()
 }
 
 version="${CIRCLE_BRANCH/Version-v/}"
-base_branch='master'
+base_branch='stable'
 
 if [[ -n "${CI_PULL_REQUEST:-}" ]]
 then
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 41d6433db7d7..77639fc65fd1 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -18,7 +18,7 @@ When you're done with your project / bugfix / feature and ready to submit a PR,
 - [ ] **Meet the spec**: Make sure the PR adds functionality that matches the issue you're closing. This is especially important for bounties: sometimes design or implementation details are included in the conversation, so read carefully!
 - [ ] **Close the issue**: If this PR closes an open issue, fill out the "Related issues" section with `Fixes: #$ISSUE_NUMBER`. Ex. For closing issue 418, include the line `Fixes: #418`. If it doesn't close the issue but addresses it partially, just include a reference to the issue number, like `#418`.
 - [ ] **Keep it simple**: Try not to include multiple features in a single PR, and don't make extraneous changes outside the scope of your contribution. All those touched files make things harder to review ;)
-- [ ] **PR against `main`**: Submit your PR against the `main` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `master` for production. If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `master` branch, but this PR will receive tighter scrutiny before merging.
+- [ ] **PR against `main`**: Submit your PR against the `main` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `stable` for production. If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `stable` branch, but this PR will receive tighter scrutiny before merging.
 - [ ] **Get reviewed by MetaMask Internal Developers**: All PRs require 2 approvals from MetaMask Internal Developers before merging.
 - [ ] **Ensure the PR is correctly labeled.**: More detail about PR labels can be found [here](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md).
 - [ ] **PR Titles**: Must adhere to the [Conventional Commits specification](https://www.conventionalcommits.org)
diff --git a/.github/workflows/close-bug-report.yml b/.github/workflows/close-bug-report.yml
index 46dcd0a9e9ff..8ea6600c516b 100644
--- a/.github/workflows/close-bug-report.yml
+++ b/.github/workflows/close-bug-report.yml
@@ -3,7 +3,7 @@ name: Close release bug report issue when release branch gets merged
 on:
   pull_request:
     branches:
-      - master
+      - stable
     types:
       - closed
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a4b5bef7c9e7..3320a22ea469 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main, Version-v*, cla-signatures, master, snaps ]
+    branches: [ main, Version-v*, cla-signatures, stable, snaps ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ main ]
diff --git a/.github/workflows/create-bug-report.yml b/.github/workflows/create-bug-report.yml
index c5164af00c02..7f55bd4da6c9 100644
--- a/.github/workflows/create-bug-report.yml
+++ b/.github/workflows/create-bug-report.yml
@@ -23,7 +23,7 @@ jobs:
           payload=$(cat <<EOF
           {
             "title": "v${{ env.version }} Bug Report",
-            "body": "**What is this bug report issue for?**\n\n1. This issue is used to track release dates on this [Github Project board](https://github.com/orgs/MetaMask/projects/86/views/1), which content then gets pulled into our metrics system.\n\n2. This issue is also used by our Zapier automations, to determine if automated notifications shall be sent on Slack for release \`${{ env.version }}\`. Notifications will only be sent as long as this issue is open.\n\n**Who created and/or closed this issue?**\n\n- This issue was automatically created by a GitHub action upon the creation of the release branch \`Version-v${{ env.version }}\`, indicating the release was cut.\n\n- This issue gets automatically closed by another GitHub action, once the \`Version-v${{ env.version }}\` branch merges into \`master\`, indicating the release is prepared for store submission.",
+            "body": "**What is this bug report issue for?**\n\n1. This issue is used to track release dates on this [Github Project board](https://github.com/orgs/MetaMask/projects/86/views/1), which content then gets pulled into our metrics system.\n\n2. This issue is also used by our Zapier automations, to determine if automated notifications shall be sent on Slack for release \`${{ env.version }}\`. Notifications will only be sent as long as this issue is open.\n\n**Who created and/or closed this issue?**\n\n- This issue was automatically created by a GitHub action upon the creation of the release branch \`Version-v${{ env.version }}\`, indicating the release was cut.\n\n- This issue gets automatically closed by another GitHub action, once the \`Version-v${{ env.version }}\` branch merges into \`stable\`, indicating the release is prepared for store submission.",
             "labels": ["type-bug", "team-extension-platform", "regression-RC-${{ env.version }}"]
           }
           EOF
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2554557b9c35..31494b4f42c8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - master
+      - stable
   pull_request:
     types:
       - opened
diff --git a/.github/workflows/trigger-metamask-institutional-e2e-ci.yml b/.github/workflows/trigger-metamask-institutional-e2e-ci.yml
index 3701c04241ad..32c76e5a2593 100644
--- a/.github/workflows/trigger-metamask-institutional-e2e-ci.yml
+++ b/.github/workflows/trigger-metamask-institutional-e2e-ci.yml
@@ -2,9 +2,9 @@ name: Trigger MetaMask Institutional E2E CI
 
 on:
   push:
-    branches: [ Version-v*, master ]
+    branches: [ Version-v*, stable ]
   pull_request:
-    branches: [ Version-v*, master ]
+    branches: [ Version-v*, stable ]
     types:
       - opened
       - reopened
@@ -14,7 +14,7 @@ on:
 jobs:
   trigger-mmi-e2e-ci:
     runs-on: ubuntu-latest
-    if: ${{ (!github.event.pull_request.draft && (startsWith(github.head_ref, 'Version-v') || github.head_ref == 'master')) || (!github.event.pull_request) }}
+    if: ${{ (!github.event.pull_request.draft && (startsWith(github.head_ref, 'Version-v') || github.head_ref == 'stable')) || (!github.event.pull_request) }}
     steps:
       - name: Trigger MetaMask Institutional E2E CI
         env:
diff --git a/development/generate-rc-commits.js b/development/generate-rc-commits.js
index 8b91ec0ff4f1..ca4e3790456e 100644
--- a/development/generate-rc-commits.js
+++ b/development/generate-rc-commits.js
@@ -121,13 +121,13 @@ async function filterCommitsByTeam(branchA, branchB, authorTeams) {
         ? `https://github.com/MetaMask/metamask-extension/pull/${prMatch[1]}`
         : '';
 
-      // Check if the commit message is unique and exclude 'Changelog' or 'Merge pull request' or 'master-sync' in the message
+      // Check if the commit message is unique and exclude 'Changelog' or 'Merge pull request' or 'stable-sync' in the message
       if (
         !seenMessages.has(message) &&
         prMatch &&
         !message.includes('changelog') &&
         !message.includes('Merge pull request') &&
-        !message.includes('master-sync')
+        !message.includes('stable-sync')
       ) {
         const labels = await getPRLabels(
           'MetaMask',
diff --git a/development/master-sync.js b/development/stable-sync.js
similarity index 81%
rename from development/master-sync.js
rename to development/stable-sync.js
index dc1d474eaebe..2fbc0b1d70af 100644
--- a/development/master-sync.js
+++ b/development/stable-sync.js
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 // USAGE:
-// Simply run `yarn master-sync` from any branch.
-// This will create/update a local master-sync branch
-// and get it in the state needed for a master-sync PR
+// Simply run `yarn stable-sync` from any branch.
+// This will create/update a local stable-sync branch
+// and get it in the state needed for a stable-sync PR
 // Once the script successfully completes, you just
 // need to push the branch to the remote repo. This will
 // likely require a `git push --force`
@@ -12,7 +12,7 @@ const { promisify } = require('util');
 const exec = promisify(require('child_process').exec);
 
 async function runGitCommands() {
-  const branchName = 'master-sync';
+  const branchName = 'stable-sync';
 
   try {
     try {
@@ -47,8 +47,8 @@ async function runGitCommands() {
     await exec('git fetch');
     console.log('Executed: git fetch');
 
-    await exec('git reset --hard origin/master');
-    console.log('Executed: git reset --hard origin/master');
+    await exec('git reset --hard origin/stable');
+    console.log('Executed: git reset --hard origin/stable');
 
     try {
       await exec('git merge origin/main');
@@ -76,11 +76,11 @@ async function runGitCommands() {
     await exec('git checkout origin/main -- .');
     console.log('Executed: git checkout origin/main -- .');
 
-    await exec('git checkout origin/master -- CHANGELOG.md');
-    console.log('Executed: git checkout origin/master -- CHANGELOG.md');
+    await exec('git checkout origin/stable -- CHANGELOG.md');
+    console.log('Executed: git checkout origin/stable -- CHANGELOG.md');
 
     const { stdout: packageJsonContent } = await exec(
-      'git show origin/master:package.json',
+      'git show origin/stable:package.json',
     );
     const packageJson = JSON.parse(packageJsonContent);
     const packageVersion = packageJson.version;
@@ -91,10 +91,10 @@ async function runGitCommands() {
     await exec('git add .');
     console.log('Executed: git add .');
 
-    await exec('git commit -m "Merge origin/main into master-sync"');
+    await exec('git commit -m "Merge origin/main into stable-sync"');
     console.log('Executed: git commit');
 
-    console.log('Your local master-sync branch is now ready to become a PR.');
+    console.log('Your local stable-sync branch is now ready to become a PR.');
     console.log('You likely now need to do `git push --force`');
   } catch (error) {
     console.error(`Error: ${error.message}`);
diff --git a/docs/QA_Guide.md b/docs/QA_Guide.md
index a615d5f605a0..4efe4e754c36 100644
--- a/docs/QA_Guide.md
+++ b/docs/QA_Guide.md
@@ -46,4 +46,4 @@ Steps to mark a full pass of QA complete.
 * Copy public key to clipboard
 * Export private key
 
-* Explore changes in master, target features that have been changed and break.
+* Explore changes in stable, target features that have been changed and break.
diff --git a/docs/publishing.md b/docs/publishing.md
index 5915f1873a88..589933d97820 100644
--- a/docs/publishing.md
+++ b/docs/publishing.md
@@ -30,9 +30,9 @@ In the case that a new release has sensitive changes that cannot be fully verifi
 
 ## Building
 
-While we develop on the `main` branch, our production version is maintained on the `master` branch.
+While we develop on the `main` branch, our production version is maintained on the `stable` branch.
 
-With each pull request, the @MetaMaskBot will comment with a build of that new pull request, so after bumping the version on `main`, open a pull request against `master`, and once the pull request is reviewed and merged, you can download those builds for publication.
+With each pull request, the @MetaMaskBot will comment with a build of that new pull request, so after bumping the version on `main`, open a pull request against `stable`, and once the pull request is reviewed and merged, you can download those builds for publication.
 
 ## Publishing
 
@@ -51,6 +51,6 @@ For this reason, when an urgent change is needed in production, its pull request
 
 - Describe it as a hotfix.
 - Use a hotfix tag.
-- Should be proposed against the `master` branch.
+- Should be proposed against the `stable` branch.
 
-The version and changelog bump should then be made off the `master` branch, and then merged to `main` to bring the two branches back into sync. Further time can be saved by incorporating the version/changelog bump into the PR against `master`, since we rely on @MetaMaskBot to run tests before merging.
+The version and changelog bump should then be made off the `stable` branch, and then merged to `main` to bring the two branches back into sync. Further time can be saved by incorporating the version/changelog bump into the PR against `stable`, since we rely on @MetaMaskBot to run tests before merging.
diff --git a/docs/translating-guide.md b/docs/translating-guide.md
index 07a37c948f35..bad94886fc19 100644
--- a/docs/translating-guide.md
+++ b/docs/translating-guide.md
@@ -10,7 +10,7 @@ The MetaMask browser extension supports new translations added in the form of ne
 - Inside that folder there should be a `messages.json`.
 - An easy way to start your translation is to first **make a copy** of `app/_locales/en/messages.json` (the English translation), and then **translate the `message` key** for each in-app message.
 - **The `description` key** is just to add context for what the translation is about, it **does not need to be translated**.
-- Add the language to the [locales index](https://github.com/MetaMask/metamask-extension/blob/master/app/_locales/index.json) `app/_locales/index.json`
+- Add the language to the [locales index](https://github.com/MetaMask/metamask-extension/blob/s/app/_locales/index.json) `app/_locales/index.json`
 
 
 That's it! When MetaMask is loaded on a computer with that language set as the system language, they will see your translation instead of the default one.
diff --git a/package.json b/package.json
index 803853059703..b26b09cdbd72 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "announce": "node development/announcer.js",
     "storybook": "storybook dev -p 6006 -c .storybook",
     "storybook:build": "storybook build -c .storybook -o storybook-build",
-    "storybook:deploy": "storybook-to-ghpages --existing-output-dir storybook-build --remote storybook --branch master",
+    "storybook:deploy": "storybook-to-ghpages --existing-output-dir storybook-build --remote storybook --branch stable",
     "update-changelog": "auto-changelog update",
     "generate:migration": "./development/generate-migration.sh",
     "lavamoat:build": "lavamoat development/build/index.js --policy lavamoat/build-system/policy.json --policyOverride lavamoat/build-system/policy-override.json",
@@ -125,7 +125,7 @@
     "audit": "yarn npm audit --recursive --environment production --severity moderate --ignore '@metamask/types (deprecation)'",
     "download-builds": "tsx .devcontainer/download-builds.ts prep-build",
     "download-builds:test": "tsx .devcontainer/download-builds.ts prep-build-test",
-    "master-sync": "node development/master-sync.js",
+    "stable-sync": "node development/stable-sync.js",
     "update-mock-cdn": "node test/e2e/mock-cdn/update-mock-cdn-files.js",
     "attributions:check": "./development/attributions-check.sh",
     "attributions:generate": "./development/generate-attributions.sh",
diff --git a/test/manual-scenarios/upgrade-testing/upgrade-testing.md b/test/manual-scenarios/upgrade-testing/upgrade-testing.md
index 13880f13694b..413abc3c5851 100644
--- a/test/manual-scenarios/upgrade-testing/upgrade-testing.md
+++ b/test/manual-scenarios/upgrade-testing/upgrade-testing.md
@@ -1,14 +1,14 @@
-# MetaMask Extension Upgrade Testing from Master to Release Branch
+# MetaMask Extension Upgrade Testing from Stable to Release Branch
 
 ## Feature: Validate Functionality Post-Upgrade
 
-To ensure MetaMask extension's upgrade process is seamless and retains user data and functionality, we need to validate the transition from the previously shipped version (master branch) to the upcoming release (release branch).
+To ensure MetaMask extension's upgrade process is seamless and retains user data and functionality, we need to validate the transition from the previously shipped version (stable branch) to the upcoming release (release branch).
 
 ## Scenario: Validate Upgrade Retains Data and Functionality
 
-### Pre-Upgrade Actions on Master Branch
+### Pre-Upgrade Actions on Stable Branch
 
-- **Given** the user checks out the master branch, runs `yarn` and `yarn start` to build locally, and has loaded the MetaMask extension. For instructions on how to load extension on Chrome and Firefox, check the guidelines [here for Chrome](https://github.com/MetaMask/metamask-extension/blob/main/docs/add-to-chrome.md) and [here for Firefox](https://github.com/MetaMask/metamask-extension/blob/main/docs/add-to-firefox.md).
+- **Given** the user checks out the stable branch, runs `yarn` and `yarn start` to build locally, and has loaded the MetaMask extension. For instructions on how to load extension on Chrome and Firefox, check the guidelines [here for Chrome](https://github.com/MetaMask/metamask-extension/blob/main/docs/add-to-chrome.md) and [here for Firefox](https://github.com/MetaMask/metamask-extension/blob/main/docs/add-to-firefox.md).
 - **And** the user has successfully onboarded.
 - **And** the user creates two accounts.
 - **And** the user sends a transaction between these accounts.
@@ -16,7 +16,7 @@ To ensure MetaMask extension's upgrade process is seamless and retains user data
 
 ### Upgrade Actions
 
-1. **When** the user stops the previous `yarn start` in the console from the master branch.
+1. **When** the user stops the previous `yarn start` in the console from the stable branch.
 2. **And** uses `git checkout` to switch to the release branch.
 3. **And** updates dependencies and restarts extension using `yarn` and `yarn start`.
 4. **Then** the user should see a reload button on extension management page.
@@ -33,6 +33,6 @@ To ensure MetaMask extension's upgrade process is seamless and retains user data
 
 ### Expected Outcome
 
-After upgrading from the master branch to the release branch, the MetaMask extension should:
+After upgrading from the stable branch to the release branch, the MetaMask extension should:
 - Retain all user data including accounts, transactions, and imported tokens.
 - Maintain full functionality, enabling the user to continue using extension without any issues.
\ No newline at end of file

From 296ac6b1cdde56bd15cafbae804d12956a1c25fe Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 2 Dec 2024 10:57:10 -0330
Subject: [PATCH 2/2] Update docs/translating-guide.md

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 docs/translating-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/translating-guide.md b/docs/translating-guide.md
index bad94886fc19..8062e94ff123 100644
--- a/docs/translating-guide.md
+++ b/docs/translating-guide.md
@@ -10,7 +10,7 @@ The MetaMask browser extension supports new translations added in the form of ne
 - Inside that folder there should be a `messages.json`.
 - An easy way to start your translation is to first **make a copy** of `app/_locales/en/messages.json` (the English translation), and then **translate the `message` key** for each in-app message.
 - **The `description` key** is just to add context for what the translation is about, it **does not need to be translated**.
-- Add the language to the [locales index](https://github.com/MetaMask/metamask-extension/blob/s/app/_locales/index.json) `app/_locales/index.json`
+- Add the language to the [locales index](https://github.com/MetaMask/metamask-extension/blob/main/app/_locales/index.json) `app/_locales/index.json`
 
 
 That's it! When MetaMask is loaded on a computer with that language set as the system language, they will see your translation instead of the default one.