Merge branch 'dev' into fix-code-splitting

pettinarip · pettinarip · commit 826697177c05 · 2022-09-21T10:47:15.000-03:00
diff --git a/src/content/developers/docs/blocks/index.md b/src/content/developers/docs/blocks/index.md
@@ -103,7 +103,7 @@ block_hash: Hash of execution block
 transactions_root: root hash of the transactions in the payload
 ```
 
-The `execution_payload` itself contains the following (notice this is idential to the header except that instead of the root hash of the transactions it includes the actual list of transactions:
+The `execution_payload` itself contains the following (notice this is idential to the header except that instead of the root hash of the transactions it includes the actual list of transactions) :
 
 ```
 parent_hash: hash of the parent block
diff --git a/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md b/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md
diff --git a/src/content/developers/docs/consensus-mechanisms/pow/mining/index.md b/src/content/developers/docs/consensus-mechanisms/pow/mining/index.md
@@ -63,7 +63,7 @@ Watch Austin walk you through mining and the proof-of-work blockchain.
 
 ## The mining algorithm {#mining-algorithm}
 
-Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash). Ethhash was the successor to an original R&D algorithm known as ['Dagger-Hashamoto'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashamoto).
+Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash). Ethhash was the successor to an original R&D algorithm known as ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto).
 
 [More on mining algorithms](/developers/docs/consensus-mechanisms/pow/mining-algorithms/).
 
diff --git a/src/content/developers/docs/data-structures-and-encoding/patricia-merkle-trie/index.md b/src/content/developers/docs/data-structures-and-encoding/patricia-merkle-trie/index.md
@@ -179,7 +179,7 @@ Now, we build such a trie with the following key/value pairs in the underlying D
     hashE:    [ <17>, [ <>, <>, <>, <>, <>, <>, [ <35>, 'coin' ], <>, <>, <>, <>, <>, <>, <>, <>, <>, 'puppy' ] ]
 ```
 
-When one node is referenced inside another node, what is included is `H(rlp.encode(x))`, where `H(x) = keccak256(x) if len(x) >= 32 else x` and `rlp.encode` is the [RLP](/fundamentals/rlp) encoding function.
+When one node is referenced inside another node, what is included is `H(rlp.encode(x))`, where `H(x) = keccak256(x) if len(x) >= 32 else x` and `rlp.encode` is the [RLP](/developers/docs/data-structures-and-encoding/rlp) encoding function.
 
 Note that when updating a trie, one needs to store the key/value pair `(keccak256(x), x)` in a persistent lookup table _if_ the newly-created node has length >= 32. However, if the node is shorter than that, one does not need to store anything, since the function f(x) = x is reversible.
 
diff --git a/src/content/developers/docs/ides/index.md b/src/content/developers/docs/ides/index.md
@@ -11,22 +11,17 @@ When it comes to setting up an [integrated development environment (IDE)](https:
 
 If you're looking to fiddle with code before you [set up a local development environment](/developers/local-environment/), these web apps are custom-built for Ethereum smart contract development.
 
-**Remix -** **_Web-based IDE with built in static analysis, and a test blockchain virtual machine_**
+**[Remix](https://remix.ethereum.org/)** - **_Web-based IDE with built in static analysis, and a test blockchain virtual machine_**
 
-- [remix.ethereum.org](https://remix.ethereum.org/)
+**[ChainIDE](https://chainide.com/)** - **_A cloud-based multi-chain IDE_**
 
-**EthFiddle -** **_Web-based IDE that lets you write, compile, and debug your smart contract_**
+**[Replit (Solidity Starter)](https://replit.com/@replit/Solidity-starter-beta)** - **_A customizable development environment for Ethereum with hot reloading, error checking, and first-class testnet support_**
 
-- [ethfiddle.com](https://ethfiddle.com/)
-- [Gitter](https://gitter.im/loomnetwork/ethfiddle)
-
-**ChainIDE -** **_A Cloud-Based Multi-Chain IDE_**
+**[Tenderly Sandbox](https://sandbox.tenderly.co/)** - **_A fast prototyping environment where you can write, execute, and debug smart contracts in the browser using Solidity and JavaScript_**
 
-- [chainide.com](https://chainide.com/)
+**[EthFiddle](https://ethfiddle.com/)** - **_Web-based IDE that lets you write, compile, and debug your smart contract_**
 
-**Replit -** **_A customizable development environment for Ethereum with hot reloading, error checking, and first-class testnet support_**
-
-- [Solidity starter](https://replit.com/@replit/Solidity-starter-beta)
+- [Gitter](https://gitter.im/loomnetwork/ethfiddle)
 
 ## Desktop IDEs {#desktop-ides}
 
diff --git a/src/content/developers/docs/nodes-and-clients/index.md b/src/content/developers/docs/nodes-and-clients/index.md
@@ -8,7 +8,7 @@ sidebarDepth: 2
 
 Ethereum is a distributed network of computers (known as nodes) running software that can verify blocks and transaction data. The software application, known as a client, must be run on your computer to turn it into an Ethereum node.
 
-**Note: it is still possible to run an execution client on its own. However, this will no longer be possible after [The Merge](/upgrades/merge). After The Merge, both execution and consensus clients must be run together in order for a user to gain access to the Ethereum network. Some testnets (Kiln, Ropsten, Sepolia, and Goerli) have already been through their versions of The Merge, meaning execution clients alone are already insufficient for accessing those networks unless they are coupled to a consensus client that can keep track of the head of the chain.**
+**Note: it is not possible to run an execution client on its own anymore. After [The Merge](/upgrades/merge), both execution and consensus clients must be run together in order for a user to gain access to the Ethereum network.**
 
 ## Prerequisites {#prerequisites}
 
diff --git a/src/content/developers/docs/web2-vs-web3/index.md b/src/content/developers/docs/web2-vs-web3/index.md
@@ -16,7 +16,7 @@ Many Web3 developers have chosen to build dapps because of Ethereum's inherent d
 - Anyone who is on the network has permission to use the service – or in other words, permission isn't required.
 - No one can block you or deny you access to the service.
 - Payments are built in via the native token, ether (ETH).
-- Ethereum is turing-complete, meaning you can pretty much program anything.
+- Ethereum is turing-complete, meaning you can program pretty much anything.
 
 ## Practical comparisons {#practical-comparisons}
 
diff --git a/src/content/translations/fa/developers/docs/networks/index.md b/src/content/translations/fa/developers/docs/networks/index.md
@@ -73,7 +73,7 @@ sidebar: true
 - [فاست Chainlink](https://faucets.chain.link/)
 - [فاست Paradigm](https://faucet.paradigm.xyz/)
 
-#### Optimisic Kovan {#optimistic-kovan}
+#### Optimistic Kovan {#optimistic-kovan}
 
 یک شبکه‌ی تست برای [Optimism](https://www.optimism.io/).
 
diff --git a/src/content/translations/fr/developers/docs/networks/index.md b/src/content/translations/fr/developers/docs/networks/index.md
@@ -73,7 +73,7 @@ Réseau de test de preuve d'autorité pour ceux qui exécutent des clients OpenE
 - [Robinet Chainlink](https://faucets.chain.link/)
 - [Robinet Paradigm](https://faucet.paradigm.xyz/)
 
-#### Optimisic Kovan {#optimistic-kovan}
+#### Optimistic Kovan {#optimistic-kovan}
 
 Un réseau de test pour [Optimism](https://www.optimism.io/).
 
diff --git a/src/content/translations/id/developers/docs/networks/index.md b/src/content/translations/id/developers/docs/networks/index.md
@@ -73,7 +73,7 @@ Testnet bukti kerja untuk mereka yang menjalankan klien OpenEthereum.
 - [Keran Chainlink](https://faucets.chain.link/)
 - [Keran Paradigm](https://faucet.paradigm.xyz/)
 
-#### Optimisic Kovan {#optimistic-kovan}
+#### Optimistic Kovan {#optimistic-kovan}
 
 Testnet untuk [Optimism](https://www.optimism.io/).
 
diff --git a/src/content/translations/it/developers/docs/data-structures-and-encoding/patricia-merkle-trie/index.md b/src/content/translations/it/developers/docs/data-structures-and-encoding/patricia-merkle-trie/index.md
@@ -179,7 +179,7 @@ Ora, costruiamo un trie di questo tipo con le seguenti coppie chiave/valore nel
     hashE:    [ <17>, [ <>, <>, <>, <>, <>, <>, [ <35>, 'coin' ], <>, <>, <>, <>, <>, <>, <>, <>, <>, 'puppy' ] ]
 ```
 
-Quando in un nodo si fa riferimento a un altro nodo, viene inserito `H(rlp.encode(x))`, dove `H(x) = keccak256(x) if len(x) >= 32 else x` e `rlp.encode` è la funzione di codifica [RLP](/fundamentals/rlp).
+Quando in un nodo si fa riferimento a un altro nodo, viene inserito `H(rlp.encode(x))`, dove `H(x) = keccak256(x) if len(x) >= 32 else x` e `rlp.encode` è la funzione di codifica [RLP](/developers/docs/data-structures-and-encoding/rlp).
 
 Nota che, aggiornando un trie, si deve memorizzare la coppia chiave/valore `(keccak256(x), x)` in una tabella di ricerca persistente _se_ il nodo appena creato ha una lunghezza >= 32. Se invece il nodo è inferiore a questo valore, non è necessario memorizzare nulla, poiché la funzione f(x) = x è reversibile.
 
diff --git a/src/content/translations/ro/developers/docs/layer-2-scaling/index.md b/src/content/translations/ro/developers/docs/layer-2-scaling/index.md
@@ -159,7 +159,7 @@ Canal de stare tic tac toe:
 
 ## Plasma {#plasma}
 
-Un lanț „plasma” este un blockchain separat care este ancorat pe lanțul principal Ethereum și utilizează dovezi de fraudă (cum ar fi rollup-urile [Optimisic](#optimistic-rollups)) pentru a arbitra disputele.
+Un lanț „plasma” este un blockchain separat care este ancorat pe lanțul principal Ethereum și utilizează dovezi de fraudă (cum ar fi rollup-urile [Optimistic](#optimistic-rollups)) pentru a arbitra disputele.
 
 | Avantaje                                                                                                                                                             | Dezavantaje                                                                                                                                                                                        |
 | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
diff --git a/src/content/translations/ro/developers/docs/networks/index.md b/src/content/translations/ro/developers/docs/networks/index.md
@@ -73,7 +73,7 @@ Un testnet bazat pe dovada-autorității pentru cei care rulează clienții Open
 - [Chainlink faucet](https://faucets.chain.link/)
 - [Paradigm faucet](https://faucet.paradigm.xyz/)
 
-#### Optimisic Kovan {#optimistic-kovan}
+#### Optimistic Kovan {#optimistic-kovan}
 
 A testnet for [Optimism](https://www.optimism.io/).
 
diff --git a/src/content/translations/zh/developers/docs/data-structures-and-encoding/patricia-merkle-trie/index.md b/src/content/translations/zh/developers/docs/data-structures-and-encoding/patricia-merkle-trie/index.md
@@ -179,7 +179,7 @@ sidebarDepth: 2
     hashE:    [ <17>, [ <>, <>, <>, <>, <>, <>, [ <35>, 'coin' ], <>, <>, <>, <>, <>, <>, <>, <>, <>, 'puppy' ] ]
 ```
 
-当一个节点在另一个节点中被引用时，包含的是 `H(rlp.encode(x))`，其中 `H(x) = keccak256(x) if len(x) > > = 32 else x` 和 `rlp.encode` 是[递归长度前缀](/fundamentals/rlp)编码函数。
+当一个节点在另一个节点中被引用时，包含的是 `H(rlp.encode(x))`，其中 `H(x) = keccak256(x) if len(x) > > = 32 else x` 和 `rlp.encode` 是[递归长度前缀](/developers/docs/data-structures-and-encoding/rlp)编码函数。
 
 请注意，更新前缀树时，*如果*新创建节点的长度 >= 32，则需要将键/值对 `(keccak256(x), x)` 存储在一个持久的查询表中。 然而，如果节点比这短，则不需要存储任何数据，因为函数 f(x) = x 是可逆的。
 
diff --git a/src/intl/en/page-what-is-ethereum.json b/src/intl/en/page-what-is-ethereum.json
@@ -61,7 +61,7 @@
   "page-what-is-ethereum-slide-4-desc-1": "Play to earn games (where players are actually rewarded for playing the games) have recently emerged and are transforming the gaming industry. Traditionally, it is often prohibited to trade or transfer in-game assets to other players for real money. This forces players to use black market websites that are often a security risk. Blockchain gaming embraces the in-game economy and promotes such behavior in a trusted manner.",
   "page-what-is-ethereum-slide-4-desc-2": "Moreover, players are incentivized by being able to trade in-game tokens for real money and thus being truly rewarded for their play time.",
   "page-what-is-ethereum-meet-ether-title": "Meet ether, Ethereum's cryptocurrency",
-  "page-what-is-ethereum-meet-ether-desc-1": "Ethereum has a native cryptocurrency called ether (ETH). It is purely digital, and you can send it to anyone anywhere in the world instantly. The supply of ETH isn’t controlled by any government or company - it is decentralized and completely transparent. New coins (also commonly called tokens) are created only by miners and stakers who maintain the network.",
+  "page-what-is-ethereum-meet-ether-desc-1": "Ethereum has a native cryptocurrency called ether (ETH). It is purely digital, and you can send it to anyone anywhere in the world instantly. The supply of ETH isn’t controlled by any government or company - it is decentralized and completely transparent. New coins (also commonly called tokens) are issued only to stakers who secure the network.",
   "page-what-is-ethereum-meet-ether-desc-2": "Every action on the Ethereum network requires a certain amount of computational power. This fee is paid in the form of ether. This means you need at least a small amount of ETH to use the network.",
   "page-what-is-ethereum-what-is-ether": "What is ether?",
   "page-what-is-ethereum-get-eth": "Get ETH",
diff --git a/src/scripts/crowdin-import.ts b/src/scripts/crowdin-import.ts
@@ -77,7 +77,7 @@ const USER_SELECTION: UserSelectionObject = {
   tr: [],
   uk: [],
   vi: [],
-  zh: [2, 3, 4, 5, 6, 7, 10, 14, 15, 16],
+  zh: [],
   "zh-tw": [],
 }
 
diff --git a/static/.well-known/matrix/server b/static/.well-known/matrix/server
@@ -0,0 +1,3 @@
+{
+    "m.server": "matrix.ethereum.org:8448"
+}
