Merge branch 'dev' of github.com:bhargavkakadiya/ethereum-org-website into multi-select-user-persona

Author: bhargavkakadiya

.all-contributorsrc

@@ -8224,7 +8224,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/32320988?v=4",
       "profile": "https://crowdin.com/profile/hiroyukinaito",
       "contributions": [
-        "doc"
+        "doc",
+        "maintenance"
       ]
     },
     {
@@ -11783,6 +11784,42 @@
       "contributions": [
         "maintenance"
       ]
+    },
+    {
+      "login": "colmck",
+      "name": "Colin McKerracher",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73862596?v=4",
+      "profile": "https://github.com/colmck",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "writegr",
+      "name": "writegr",
+      "avatar_url": "https://avatars.githubusercontent.com/u/167099595?v=4",
+      "profile": "https://github.com/writegr",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "richardgreg",
+      "name": "Cardo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35255909?v=4",
+      "profile": "https://github.com/richardgreg",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "shravanandoria",
+      "name": "shravanandoria",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36509067?v=4",
+      "profile": "https://www.linkedin.com/in/shravan-andoria/",
+      "contributions": [
+        "maintenance"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1306,7 +1306,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/vorot93"><img src="https://avatars.githubusercontent.com/u/240364?v=4?s=100" width="100px;" alt="Artem Vorotnikov"/><br /><sub><b>Artem Vorotnikov</b></sub></a><br /><a href="#content-vorot93" title="Content">🖋</a> <a href="#projectManagement-vorot93" title="Project Management">📆</a> <a href="#question-vorot93" title="Answering Questions">💬</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/liam0215"><img src="https://avatars.githubusercontent.com/u/8989334?v=4?s=100" width="100px;" alt="Liam Arzola"/><br /><sub><b>Liam Arzola</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aliam0215" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/srt180"><img src="https://avatars.githubusercontent.com/u/30768686?v=4?s=100" width="100px;" alt="shao"/><br /><sub><b>shao</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=srt180" title="Documentation">📖</a> <a href="#translation-srt180" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/hiroyukinaito"><img src="https://avatars.githubusercontent.com/u/32320988?v=4?s=100" width="100px;" alt="Hiroyuki Naito"/><br /><sub><b>Hiroyuki Naito</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=HiroyukiNaito" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/hiroyukinaito"><img src="https://avatars.githubusercontent.com/u/32320988?v=4?s=100" width="100px;" alt="Hiroyuki Naito"/><br /><sub><b>Hiroyuki Naito</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=HiroyukiNaito" title="Documentation">📖</a> <a href="#maintenance-HiroyukiNaito" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/AlehNat"><img src="https://avatars.githubusercontent.com/u/3587775?v=4?s=100" width="100px;" alt="AlehN"/><br /><sub><b>AlehN</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=AlehNat" title="Documentation">📖</a></td>
     </tr>
     <tr>
@@ -1808,6 +1808,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://croath.com"><img src="https://avatars.githubusercontent.com/u/1398729?v=4?s=100" width="100px;" alt="Croath Liu"/><br /><sub><b>Croath Liu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=croath" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=croath" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/HayattiQ"><img src="https://avatars.githubusercontent.com/u/5105841?v=4?s=100" width="100px;" alt="Hayatti"/><br /><sub><b>Hayatti</b></sub></a><br /><a href="#content-HayattiQ" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AHayattiQ" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/JeffreyJoel"><img src="https://avatars.githubusercontent.com/u/72028836?v=4?s=100" width="100px;" alt="Jeffrey Owoloko"/><br /><sub><b>Jeffrey Owoloko</b></sub></a><br /><a href="#maintenance-JeffreyJoel" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/colmck"><img src="https://avatars.githubusercontent.com/u/73862596?v=4?s=100" width="100px;" alt="Colin McKerracher"/><br /><sub><b>Colin McKerracher</b></sub></a><br /><a href="#maintenance-colmck" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/writegr"><img src="https://avatars.githubusercontent.com/u/167099595?v=4?s=100" width="100px;" alt="writegr"/><br /><sub><b>writegr</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Awritegr" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/richardgreg"><img src="https://avatars.githubusercontent.com/u/35255909?v=4?s=100" width="100px;" alt="Cardo"/><br /><sub><b>Cardo</b></sub></a><br /><a href="#maintenance-richardgreg" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/shravan-andoria/"><img src="https://avatars.githubusercontent.com/u/36509067?v=4?s=100" width="100px;" alt="shravanandoria"/><br /><sub><b>shravanandoria</b></sub></a><br /><a href="#maintenance-shravanandoria" title="Maintenance">🚧</a></td>
     </tr>
   </tbody>
 </table>

public/content/contributing/adding-wallets/index.md

@@ -10,7 +10,7 @@ We want to make sure we show a variety of wallets covering the feature-rich land
 
 Anyone is free to suggest adding a wallet on ethereum.org. If there's a wallet that we have missed, please suggest it!
 
-Anyone is free to suggest a new wallet. Wallets are currently listed on:
+Wallets are currently listed on:
 
 - [ethereum.org/wallets/find-wallet/](/wallets/find-wallet/)
 - [ethereum.org/wallets/](/wallets/)

public/content/contributing/translation-program/translatathon/index.md

@@ -18,10 +18,10 @@ We invite you to join us in breaking down language barriers and making ethereum.
 
 ### When {#when}
 
-- Application period: August 1st - August 15th
-- Translation period: August 16th - August 23rd
-- Evaluation & QA period: August 23rd - August 30th
-- Results announcement: August 31st
+- Application period: August 1st - August 15th, 2023
+- Translation period: August 16th - August 23rd, 2023
+- Evaluation & QA period: August 23rd - August 30th, 2023
+- Results announcement: August 31st, 2023
 
 ### Where {#where}
 
@@ -35,7 +35,7 @@ Office hours, workshops, team formation and FAQ sessions will be hosted on the [
 
 #### Application period {#applications}
 
-The application period will be open from **August 1st** to **August 15th**
+The application period will be open from **August 1st** to **August 15th** 2023.
 
 All participants in the Translatathon are required to apply in order to participate and compete for prizes.
 

public/content/developers/tutorials/run-node-raspberry-pi/index.md

@@ -125,7 +125,7 @@ Geth is preconfigured to report metrics to a Grafana dashboard which can be view
 
 ## Validators {#validators}
 
-A validator can also be optionally added to the consensus client. The validator software allows your node to participate actively in consensus and provides the network with cryptoeconomic security. You get rewarded for this work in ETH. To run a validator, you must first have 32 ETH, which must be deposited into the deposit contract. **This is a long-term commitment - it is not yet possible to withdraw this ETH!**. The deposit can be made by following the step-by-step guide on the [Launchpad](https://launchpad.ethereum.org/). Do this on a desktop/laptop, but do not generate keys — this can be done directly on the Raspberry Pi.
+A validator can also be optionally added to the consensus client. The validator software allows your node to participate actively in consensus and provides the network with cryptoeconomic security. You get rewarded for this work in ETH. To run a validator, you must first have 32 ETH, which must be deposited into the deposit contract. The deposit can be made by following the step-by-step guide on the [Launchpad](https://launchpad.ethereum.org/). Do this on a desktop/laptop, but do not generate keys — this can be done directly on the Raspberry Pi.
 
 Open a terminal on the Raspberry Pi and run the following command to generate the deposit keys:
 
@@ -135,6 +135,8 @@ sudo apt-get install staking-deposit-cli
 cd && deposit new-mnemonic --num_validators 1
 ```
 
+(Or download the [staking-deposit-cli](https://github.com/ethereum/staking-deposit-cli) to run on an airgapped machine, and run the `deposit new-mnemnonic` command)
+
 Keep the mnemonic phrase safe! The command above generated two files in the node's keystore: the validator keys and a deposit data file. The deposit data needs to be uploaded into the launchpad, so it must be copied from the Raspberry Pi to the desktop/laptop. This can be done using an ssh connection or any other copy/paste method.
 
 Once the deposit data file is available on the computer running the launchpad, it can be dragged and dropped onto the `+` on the launchpad screen. Follow the instructions on the screen to send a transaction to the deposit contract.

public/content/enterprise/index.md

@@ -125,7 +125,7 @@ Here are some of the enterprise applications that have been built on top of the
 - [Fabrica](https://www.fabrica.land/) _a platform for digitizing real estate assets, enabling DeFi borrowing and property trading 
 - [Fasset](https://www.fasset.com/) _a platform for supporting sustainable infrastructure_
 - [Nori](https://nori.com/) _open source market infrastructure to allow for carbon removal projects to measure and monetize their activity_
-- [Propy](https://propy.com/) _a platform to to automate residential real estate transactions with smart contracts_
+- [Propy](https://propy.com/) _a platform to automate residential real estate transactions with smart contracts_
 - [RealT](https://realt.co/) _investors around the globe can buy into the US real estate market through fully-compliant, fractional, tokenized ownership_
 - [Rubey](https://www.rubey.be/) _a platform that tokenizes high-end art to make it accessible to retail investors_
 - [Swarm](https://swarm.com/) _a platform focused on the digitization and trading of real-world assets in a regulatory compliant manner_
@@ -171,7 +171,7 @@ Here are some of the enterprise applications that have been built on top of the
 
 ### Entertainment, NFTs, and Loyalty
 
-- [Adidas Virtual Gear](https://www.adidas.com/metaverse) _a virtal gear NFT collection_
+- [Adidas Virtual Gear](https://www.adidas.com/metaverse) _a virtual gear NFT collection_
 - [The British Museum's Sandbox](https://decrypt.co/150405/british-museum-enter-metaverse-via-sandbox) _an NFT collection_
 - [Fruitlab](https://fruitlab.com/) _a platform for gamers to earn from watching, sharing and playing online games_
 - [Nike Swoosh](https://www.swoosh.nike/) _an NFT platform_

public/content/governance/index.md

@@ -2,7 +2,6 @@
 title: Ethereum Governance
 description: An introduction to how decisions about Ethereum are made.
 lang: en
-postMergeBannerTranslation: page-upgrades-post-merge-banner-governance-ood
 ---
 
 # Introduction to Ethereum governance {#introduction}

public/content/privacy-policy/index.md

@@ -109,15 +109,15 @@ We may use this information as well as other information you voluntarily provide
 
 We may process the data by name in order to record your reservation as you have requested, to contact you in case of a question or problem and to ensure correct payment.
 
-The legal basis for the data processing for this purpose lies in the fulfilment of an agreement in accordance with Art. 6 Par. 1 lit. b GDPR.
+The legal basis for the data processing for this purpose lies in the fulfillment of an agreement in accordance with Art. 6 Par. 1 lit. b GDPR.
 
 **4. Other parties who have access to information we collect**
 
 With the exception of the provider(s) of our Websites, we do not make your personal data available to third parties unless you have expressly consented to it, if we are legally obligated to, or if this is necessary to enforce our rights concerning a contractual relationship.
 
 Personal data collected via the Websites may be passed on to and/or accessed by the Website service provider(s). The Websites may be hosted on servers in the US. The transfer of data is for the purpose of providing and maintaining the functionality of our Websites. This is our legitimate interest in the sense of Art. 6 Par. 1 lit f GDPR.
 
-If you pay by credit card through the Websites, we may forward your credit card information to the credit card issuer and the credit card acquirer. If you choose to pay by credit card, you may be asked to provide all the necessary information. The legal basis for passing on the data lies in the fulfilment of an agreement in the sense of Art. 6 Par. Lit. b GDPR.
+If you pay by credit card through the Websites, we may forward your credit card information to the credit card issuer and the credit card acquirer. If you choose to pay by credit card, you may be asked to provide all the necessary information. The legal basis for passing on the data lies in the fulfillment of an agreement in the sense of Art. 6 Par. Lit. b GDPR.
 
 **5. International transfer of personal data**
 

public/content/social-networks/index.md

@@ -25,7 +25,7 @@ Many decentralized social networks exist as alternatives to established social m
 
 Decentralized social networks are a class of [decentralized applications (dapps)](/dapps/)—applications powered by [smart contracts](/glossary/#smart-contract) deployed on the blockchain. The contract code serves as the backend for these apps and defines their business logic.
 
-Traditional social media platforms rely on databases to store user information, program code, and other forms of data. But this creates single points-of-failure and introduces significant risk. For instance, Facebook's servers infamously [went offline for hours](https://www.npr.org/2021/10/05/1043211171/facebook-instagram-whatsapp-outage-business-impact) last year, cutting off users from the platform.
+Traditional social media platforms rely on databases to store user information, program code, and other forms of data. But this creates single points-of-failure and introduces significant risk. For instance, Facebook's servers infamously [went offline for hours](https://www.npr.org/2021/10/05/1043211171/facebook-instagram-whatsapp-outage-business-impact) in October 2021, cutting off users from the platform.
 
 Decentralized social networks exist on a [peer-to-peer network](/glossary/#peer-to-peer-network) comprising thousands of nodes around the globe. Even if some nodes fail, the network will run uninterrupted, making applications resistant to failures and outages.
 

public/content/translations/cs/governance/index.md

@@ -2,7 +2,6 @@
 title: Kdo řídí Ethereum
 description: Úvod do rozhodování o Ethereu.
 lang: cs
-postMergeBannerTranslation: page-upgrades-post-merge-banner-governance-ood
 ---
 
 # Úvod do správy Etherea {#introduction}