reorder translations

src/components/Footer.tsx

@@ -87,11 +87,11 @@ const Footer: React.FC<IProps> = () => {
         },
         {
           to: `/stablecoins/`,
-          text: t("page-stablecoins-title"),
+          text: t("stablecoins"),
         },
         {
           to: `/staking/`,
-          text: t("page-upgrades-get-involved-stake-eth"),
+          text: t("stake-eth"),
         },
       ],
     },

src/components/Nav/index.tsx

@@ -142,11 +142,11 @@ const Nav: React.FC<IProps> = ({ path }) => {
           to: "/dao/",
         },
         {
-          text: t("page-stablecoins-title"),
+          text: t("stablecoins"),
           to: "/stablecoins/",
         },
         {
-          text: t("page-stake-eth"),
+          text: t("stake-eth"),
           to: "/staking/",
         },
         {

src/intl/en/common.json

@@ -236,6 +236,7 @@
   "skip-to-main-content": "Skip to main content",
   "smart-contracts": "Smart contracts",
   "stablecoins": "Stablecoins",
+  "stake-eth": "Stake ETH",
   "staking": "Staking",
   "solo": "Solo staking",
   "saas": "Staking as a service",
@@ -279,5 +280,6 @@
   "decentralized-social-networks": "Decentralized social networks",
   "decentralized-identity": "Decentralized identity",
   "yes": "Yes",
-  "zero-knowledge-proofs": "Zero-knowledge proofs"
+  "zero-knowledge-proofs": "Zero-knowledge proofs",
+  "page-index-meta-title": "Home"
 }

src/intl/en/page-about.json

@@ -21,5 +21,7 @@
   "page-about-p-5": "Tasks that we're implementing.",
   "page-about-p-6": "Tasks we've queued up to implement next.",
   "page-about-p-7": "Recently completed tasks.",
-  "page-about-p-8": "Do you have an idea for how to improve ethereum.org? We'd love to collaborate with you!"
+  "page-about-p-8": "Do you have an idea for how to improve ethereum.org? We'd love to collaborate with you!",
+  "page-what-is-ethereum-energy-consumption-chart-legend": "Annual Energy Consumption in TWh/yr",
+  "page-upgrades-post-merge-banner-governance-ood": "Some content on this page is out-of-date after the merge. Please raise a PR if you would like to contribute."
 }

src/intl/en/page-developers-docs.json

@@ -130,5 +130,9 @@
   "page-calltocontribute-link": "documentation template",
   "page-calltocontribute-link-2": "Discord server",
   "page-calltocontribute-span": "Edit page",
-  "page-calltocontribute-title": "Help us with this page"
+  "page-calltocontribute-title": "Help us with this page",
+  "layer-2-arbitrum-note": "Fraud proofs only for whitelisted users, whitelist not open yet",
+  "layer-2-boba-note": "State validation in development",
+  "layer-2-metis-note": "Fraud proofs in development",
+  "layer-2-optimism-note": "Fault proofs in development"
 }

src/intl/en/page-layer-2.json

@@ -131,5 +131,6 @@
   "layer-2-note": "Note:",
   "layer-2-ecosystem-portal": "Ecosystem Portal",
   "layer-2-token-lists": "Token Lists",
-  "layer-2-explore": "Explore"
+  "layer-2-explore": "Explore",
+  "page-dapps-ready-button": "Go"
 }

src/intl/en/page-stablecoins.json

@@ -144,5 +144,6 @@
   "page-stablecoins-why-stablecoins-body": "ETH, like Bitcoin, has a volatile price because it's new technology. So you may not want to spend it regularly. Stablecoins mirror the value of traditional currencies to give you access to stable money that you can use on Ethereum.",
   "page-stablecoins-more-defi-button": "More on decentralized finance (DeFi)",
   "page-stablecoins-tools-title": "Learn more about stablecoins",
-  "page-stablecoins-tools-stablecoinswtf-description": "Stablecoins.wtf offers a dashboard with historical market data, statistics, and educational content for the most prominent stablecoins."
+  "page-stablecoins-tools-stablecoinswtf-description": "Stablecoins.wtf offers a dashboard with historical market data, statistics, and educational content for the most prominent stablecoins.",
+  "page-dapps-ready-button": "Go"
 }

src/intl/en/page-staking-deposit-contract.json

@@ -23,5 +23,6 @@
   "page-staking-deposit-contract-stop-reading": "Stop reading",
   "page-staking-deposit-contract-subtitle": "This is the address for the Ethereum staking contract. Use this page to confirm you’re sending funds to the correct address when you stake.",
   "page-staking-deposit-contract-warning": "Check each character carefully.",
-  "page-staking-deposit-contract-warning-2": "Sending funds to this address won’t work and won’t make you a staker. You must follow the launchpad instructions."
+  "page-staking-deposit-contract-warning-2": "Sending funds to this address won’t work and won’t make you a staker. You must follow the launchpad instructions.",
+  "page-staking-deposit-contract-title": "Check the deposit contract address"
 }

src/intl/en/page-staking.json

@@ -197,5 +197,6 @@
   "page-staking-join-community": "Join the staker community",
   "page-staking-join-community-desc": "EthStaker is a community for everyone to discuss and learn about staking on Ethereum. Join tens of thousands of members from around the globe for advice, support, and to talk all thing staking.",
   "page-staking-meta-description": "An overview of Ethereum staking: the risks, rewards, requirements, and where to do it.",
-  "page-staking-meta-title": "Ethereum staking"
+  "page-staking-meta-title": "Ethereum staking",
+  "page-upgrades-merge-btn": "More on The Merge"
 }

src/intl/en/page-upgrades-get-involved-bug-bounty.json

@@ -99,5 +99,6 @@
   "page-upgrades-bug-bounty-card-text": "Attacker can sometimes put a node in a state that causes it to drop one out of every one hundred attestations made by a validator",
   "page-upgrades-bug-bounty-card-text-1": "Attacker can successfully conduct eclipse attacks on nodes with peer-ids with 4 leading zero bytes",
   "page-upgrades-bug-bounty-card-text-2": "Attacker can successfully partition large parts of the network, and it is trivial for an attacker to trigger the vulnerability",
-  "page-upgrades-bug-bounty-card-text-3": "Attacker can successfully conduct remote code execution in a majority client, and it is trivial for an attacker to trigger the vulnerability"
+  "page-upgrades-bug-bounty-card-text-3": "Attacker can successfully conduct remote code execution in a majority client, and it is trivial for an attacker to trigger the vulnerability",
+  "page-upgrades-question-title": "Frequently asked questions"
 }

src/intl/en/page-upgrades-get-involved.json

@@ -47,5 +47,7 @@
   "page-upgrades-get-involved-written-net": "Written in .NET",
   "page-upgrades-get-involved-written-nim": "Written in Nim",
   "page-upgrades-get-involved-written-python": "Written in Python",
-  "page-upgrades-get-involved-written-rust": "Written in Rust"
+  "page-upgrades-get-involved-written-rust": "Written in Rust",
+  "page-upgrades-get-involved": "Get involved in upgrading Ethereum",
+  "page-upgrades-get-involved-2": "Get involved"
 }

src/intl/en/page-upgrades-index.json

@@ -206,5 +206,6 @@
   "page-upgrades-whats-next-history": "Learn about previous Ethereum upgrades",
   "page-upgrades-whats-ethereum": "Wait, what's Ethereum?",
   "page-upgrades-whats-new": "What's next for Ethereum?",
-  "page-upgrades-security-link": "More on security and scam prevention"
+  "page-upgrades-security-link": "More on security and scam prevention",
+  "page-staking-deposit-contract-staking-more-link": "More on staking"
 }

src/intl/en/page-upgrades.json

@@ -9,5 +9,9 @@
   "page-upgrades-merge-banner-developers-landing": "Some docs have a banner indicating they are out-of-date. Updates coming soon.",
   "page-upgrades-post-merge-banner-tutorial-ood": "This tutorial is out of date after the merge and may not work. Please raise a PR if you would like to contribute.",
   "page-upgrades-post-merge-banner-tutorial-light-node-ood": "This tutorial is out of date after the merge. Light nodes do not currently work on proof-of-stake, but are expected to ship soon.",
-  "page-upgrades-post-merge-banner-governance-ood": "Some content on this page is out-of-date after the merge. Please raise a PR if you would like to contribute."
+  "page-upgrades-post-merge-banner-governance-ood": "Some content on this page is out-of-date after the merge. Please raise a PR if you would like to contribute.",
+  "page-upgrades-upgrades-guide": "Guide to Ethereum upgrades",
+  "page-upgrades-upgrades-docking": "The Merge",
+  "page-upgrades-shard-title": "Sharding",
+  "page-upgrades-upgrades-beacon-chain": "The Beacon Chain"
 }

src/pages/bug-bounty.tsx

@@ -863,7 +863,7 @@ export const query = graphql`
     locales: allLocale(
       filter: {
         language: { in: $languagesToFetch }
-        ns: { in: ["page-upgrades-index", "common"] }
+        ns: { in: ["page-upgrades-get-involved-bug-bounty", "common"] }
       }
     ) {
       edges {

src/pages/contributing/translation-program/contributors.tsx

@@ -155,7 +155,11 @@ export const query = graphql`
       filter: {
         language: { in: $languagesToFetch }
         ns: {
-          in: ["page-contributing-translation-program-contributors", "common"]
+          in: [
+            "page-contributing-translation-program-contributors"
+            "page-languages"
+            "common"
+          ]
         }
       }
     ) {

src/pages/upgrades/vision.tsx

@@ -325,7 +325,7 @@ export const query = graphql`
     locales: allLocale(
       filter: {
         language: { in: $languagesToFetch }
-        ns: { in: ["page-upgrades-vision", "common"] }
+        ns: { in: ["page-upgrades-vision", "page-upgrades-index", "common"] }
       }
     ) {
       edges {

src/templates/static.tsx

@@ -239,7 +239,10 @@ const StaticPage = ({
 export const staticPageQuery = graphql`
   query StaticPage($languagesToFetch: [String!]!, $relativePath: String) {
     locales: allLocale(
-      filter: { language: { in: $languagesToFetch }, ns: { in: ["common"] } }
+      filter: {
+        language: { in: $languagesToFetch }
+        ns: { in: ["page-about", "page-community", "common"] }
+      }
     ) {
       edges {
         node {

src/templates/upgrade.tsx

@@ -416,7 +416,10 @@ const UpgradePage = ({
 export const upgradePageQuery = graphql`
   query UpgradePage($languagesToFetch: [String!]!, $relativePath: String) {
     locales: allLocale(
-      filter: { language: { in: $languagesToFetch }, ns: { in: ["common"] } }
+      filter: {
+        language: { in: $languagesToFetch }
+        ns: { in: ["page-upgrades", "page-upgrades-index", "common"] }
+      }
     ) {
       edges {
         node {