Skip to content

Commit

Permalink
Merge pull request #2172 from wackerow/w/en
Browse files Browse the repository at this point in the history
Translation styling adjustments
  • Loading branch information
samajammin authored Jan 6, 2021
2 parents 99f3651 + 0479e41 commit d02d52b
Show file tree
Hide file tree
Showing 16 changed files with 36 additions and 28 deletions.
8 changes: 6 additions & 2 deletions src/components/TutorialMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ const Code = styled.div`
}
`

const AllCapsTranslation = styled(Translation)`
text-transform: uppercase;
`

const TutorialMetadata = ({ tutorial, data }) => {
const intl = useIntl()

Expand Down Expand Up @@ -122,12 +126,12 @@ const TutorialMetadata = ({ tutorial, data }) => {
<FakeLink>
{!isCopied ? (
<Code>
<Translation id="comp-tutorial-metadata-tip-author" />{" "}
<AllCapsTranslation id="comp-tutorial-metadata-tip-author" />{" "}
{frontmatter.address}
</Code>
) : (
<Code>
<Translation id="comp-tutorial-metadata-tip-author" />{" "}
<AllCapsTranslation id="comp-tutorial-metadata-tip-author" />{" "}
{frontmatter.address} <Translation id="copied" />
<Emoji
size={1}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Proof-of-stake comes with a number of improvements to the proof-of-work system:

## Proof-of-stake, staking, and validators {#pos-staking-validators}

Proof-of-stake is the underlying mechanism that activates validators upon receipt of enough stake. For Ethereum, users will need to stake 32ETH to become a validator. Validators are chosen at random to create blocks and are responsible for checking and confirming blocks they don't create. A user's stake is also used as a way to incentivise good validator behaviour. For example, a user can lose a portion of their stake for things like going offline (failing to validate), or their entire stake for deliberate collusion.
Proof-of-stake is the underlying mechanism that activates validators upon receipt of enough stake. For Ethereum, users will need to stake 32 ETH to become a validator. Validators are chosen at random to create blocks and are responsible for checking and confirming blocks they don't create. A user's stake is also used as a way to incentivise good validator behaviour. For example, a user can lose a portion of their stake for things like going offline (failing to validate), or their entire stake for deliberate collusion.

## How does Ethereum's proof-of-stake work? {#how-does-pos-work}

Expand Down
2 changes: 1 addition & 1 deletion src/intl/en/page-about.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"page-about-p-1": "Ever since the launch of ethereum.org, we strive to be transparent about how we operate. This is one of our core values because we believe transparency is crucial to Ethereum's success.",
"page-about-p-2": "We use",
"page-about-p-3": "as our primary project management tool. We organize our tasks in 3 categories:",
"page-about-p-4": " We do our best to keep the community informed what the status is of a specific task.",
"page-about-p-4": "We do our best to keep the community informed what the status is of a specific task.",
"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.",
Expand Down
2 changes: 1 addition & 1 deletion src/intl/en/page-dapps.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"page-dapps-dydx-logo-alt": "dYdX logo",
"page-dapps-editors-choice-dark-forest": "Play against others to conquer planets and try out bleeding-edge Ethereum scaling/privacy technology. Maybe one for those already familiar with Ethereum.",
"page-dapps-editors-choice-description": "A few dapps the ethereum.org team are loving right now. Explore more dapps below.",
"page-dapps-editors-choice-foundation": "Invest in culture. Buy, trade, and sell unique digital artwork and fashion from some incredible artists, musicians, and brands.",
"page-dapps-editors-choice-foundation": "Invest in culture. Buy, trade, and sell unique digital artwork and fashion from some incredible artists, musicians, and brands.",
"page-dapps-editors-choice-header": "Editors' choices",
"page-dapps-editors-choice-pooltogether": "Buy a ticket for the no-loss lottery. Each week, the interest generated from the entire ticket pool is sent to one lucky winner. Get your money back whenever you like.",
"page-dapps-editors-choice-uniswap": "Swap your tokens with ease. A community favourite that allows you to trade tokens with folks across the network.",
Expand Down
2 changes: 1 addition & 1 deletion src/intl/en/page-developers-index.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"page-developers-networks-desc": "An overview of mainnet and the test networks",
"page-developers-networks-link": "Networks",
"page-developers-node-clients-desc": "How blocks and transactions are verified in the network",
"page-developers-node-clients-link": " Nodes and clients",
"page-developers-node-clients-link": "Nodes and clients",
"page-developers-oracle-desc": "Getting off-chain data into your smart contracts",
"page-developers-oracles-link": "Oracles",
"page-developers-play-code": "Play with code",
Expand Down
4 changes: 2 additions & 2 deletions src/intl/en/page-developers-local-environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"page-local-environment-framework-feature-4": "Configuration to connect to Ethereum networks and deploy contracts, whether to a locally running instance, or one of Ethereum's public networks.",
"page-local-environment-framework-feature-5": "Decentralized app distribution - integrations with storage options like IPFS.",
"page-local-environment-framework-features": "These frameworks come with a lot of out-of-the-box functionality, like:",
"page-local-environment-frameworks-desc": " We recommend picking a framework, particularly if you're just getting started. Building a full-fledged dapp requires different pieces of technology. Frameworks include many of the needed features or provide easy plugin systems to pick the tools you desire.",
"page-local-environment-frameworks-desc": "We recommend picking a framework, particularly if you're just getting started. Building a full-fledged dapp requires different pieces of technology. Frameworks include many of the needed features or provide easy plugin systems to pick the tools you desire.",
"page-local-environment-frameworks-title": "Frameworks and pre-made stacks",
"page-local-environment-hardhat-desc": "Hardhat is an Ethereum development environment for professionals.",
"page-local-environment-hardhat-logo-alt": "Hardhat logo",
Expand All @@ -24,7 +24,7 @@
"page-local-environment-setup-meta-desc": "Guide on how to choose your software stack for Ethereum development.",
"page-local-environment-setup-meta-title": "Ethereum local development setup",
"page-local-environment-setup-subtitle": "If you're ready to start building, it's time to choose your stack.",
"page-local-environment-setup-subtitle-2": " Here are the tools and frameworks you can use to help you build your Ethereum application.",
"page-local-environment-setup-subtitle-2": "Here are the tools and frameworks you can use to help you build your Ethereum application.",
"page-local-environment-setup-title": "Set up your local development environment",
"page-local-environment-solidity-template-desc": "A GitHub template for a pre-built setup for your Solidity smart contracts. Includes a Hardhat local network, Waffle for tests, Ethers for wallet implementation, and more.",
"page-local-environment-solidity-template-logo-alt": "Solidity template logo",
Expand Down
4 changes: 2 additions & 2 deletions src/intl/en/page-developers-tutorials.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"comp-tutorial-metadata-tip-author": "TIP AUTHOR",
"comp-tutorial-metadata-tip-author": "Tip author",
"page-tutorial-listing-policy": "article listing policy",
"page-tutorial-new-github": "New to GitHub?",
"page-tutorial-new-github-desc": " Raise an issue – just fill in the requested information and paste your tutorial.",
"page-tutorial-new-github-desc": "Raise an issue – just fill in the requested information and paste your tutorial.",
"page-tutorial-pull-request": "Create a pull request",
"page-tutorial-pull-request-btn": "Create pull request",
"page-tutorial-pull-request-desc-1": "Please follow the",
Expand Down
4 changes: 2 additions & 2 deletions src/intl/en/page-eth2-deposit-contract.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"page-eth2-deposit-contract-meta-title": "Eth2 deposit contract address",
"page-eth2-deposit-contract-read-aloud": "Read address aloud",
"page-eth2-deposit-contract-reveal-address-btn": "Reveal address",
"page-eth2-deposit-contract-staking": " To stake your ETH in Eth2 you must use the dedicated launchpad product and follow the instructions. Sending ETH to the address on this page will not make you a staker and will result in a failed transaction.",
"page-eth2-deposit-contract-staking": "To stake your ETH in Eth2 you must use the dedicated launchpad product and follow the instructions. Sending ETH to the address on this page will not make you a staker and will result in a failed transaction.",
"page-eth2-deposit-contract-staking-check": "Check these sources",
"page-eth2-deposit-contract-staking-check-desc": "We expect there to be a lot of fake addresses and scams out there. To be safe, check the Eth2 staking address you're using against the address on this page. We recommend checking it with other trustworthy sources too.",
"page-eth2-deposit-contract-staking-more-link": "More on staking",
"page-eth2-deposit-contract-stop-reading": "Stop reading",
"page-eth2-deposit-contract-subtitle": " This is the address for the Eth2 staking contract. Use this page to confirm you’re sending funds to the correct address when you stake.",
"page-eth2-deposit-contract-subtitle": "This is the address for the Eth2 staking contract. Use this page to confirm you’re sending funds to the correct address when you stake.",
"page-eth2-deposit-contract-warning": "Check each character carefully.",
"page-eth2-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."
}
6 changes: 3 additions & 3 deletions src/intl/en/page-eth2-get-involved-bug-bounty.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"page-eth2-bug-bounty-points-error": "Error loading data... please refresh.",
"page-eth2-bug-bounty-points-exchange": "Points Exchange",
"page-eth2-bug-bounty-points-loading": "Loading data...",
"page-eth2-bug-bounty-points-payout-desc": " The Ethereum Foundation will pay out the value of USD in ETH or DAI.",
"page-eth2-bug-bounty-points-payout-desc": "The Ethereum Foundation will pay out the value of USD in ETH or DAI.",
"page-eth2-bug-bounty-points-point": "1 point",
"page-eth2-bug-bounty-points-rights-desc": "The Ethereum Foundation reserves the right to change this without prior notice.",
"page-eth2-bug-bounty-points-usd": "2 USD",
Expand Down Expand Up @@ -89,7 +89,7 @@
"page-eth2-bug-bountycard-subheader": "Severity",
"page-eth2-bug-bountycard-subheader-2": "Example",
"page-eth2-bug-bountycard-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-eth2-bug-bountycard-text-1": " Attacker can successfully conduct eclipse attacks on nodes with peer-ids with 4 leading zero bytes",
"page-eth2-bug-bountycard-text-1": "Attacker can successfully conduct eclipse attacks on nodes with peer-ids with 4 leading zero bytes",
"page-eth2-bug-bountycard-text-2": "There is a consensus bug between two clients, but it is difficult or impractical for the attacker to trigger the event.",
"page-eth2-bug-bountycard-text-3": " There is a consensus bug between two clients, and it is trivial for an attacker to trigger the event."
"page-eth2-bug-bountycard-text-3": "There is a consensus bug between two clients, and it is trivial for an attacker to trigger the event."
}
2 changes: 1 addition & 1 deletion src/intl/en/page-eth2-get-involved.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"page-eth2-get-involved-how": "How do you want to get involved?",
"page-eth2-get-involved-how-desc": "The Ethereum community will always benefit from more folks running clients, staking, and bug hunting.",
"page-eth2-get-involved-join": "Join the research",
"page-eth2-get-involved-join-desc": " Like most things with Ethereum, a lot of the research is public. This means you can take part in the discussions or just read through what the Ethereum researchers have to say. ethresear.ch covers more than just the Eth2 upgrades, but there's a large Eth2 focus.",
"page-eth2-get-involved-join-desc": "Like most things with Ethereum, a lot of the research is public. This means you can take part in the discussions or just read through what the Ethereum researchers have to say. ethresear.ch covers more than just the Eth2 upgrades, but there's a large Eth2 focus.",
"page-eth2-get-involved-meta-description": "How to participate in Eth2: run nodes, stake, hunt bugs and more.",
"page-eth2-get-involved-more": "More info",
"page-eth2-get-involved-run-clients": "Run beacon chain clients",
Expand Down
12 changes: 6 additions & 6 deletions src/intl/en/page-eth2-index.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"page-eth2-bug-bounty": "View the bug bounty program",
"page-eth2-clients": "Check out the Eth2 clients",
"page-eth2-deposit-contract-title": "Check the deposit contract address",
"page-eth2-diagram-ethereum-mainnet": " Ethereum mainnet",
"page-eth2-diagram-ethereum-mainnet": "Ethereum mainnet",
"page-eth2-diagram-h2": "How the upgrades fit together",
"page-eth2-diagram-link-1": "More on proof of work",
"page-eth2-diagram-link-2": "More on shard chains",
"page-eth2-diagram-mainnet": "Mainnet",
"page-eth2-diagram-p": " Ethereum mainnet will continue to exist in its current form for a while. This means the Beacon Chain and shard upgrades won't disrupt the network.",
"page-eth2-diagram-p": "Ethereum mainnet will continue to exist in its current form for a while. This means the Beacon Chain and shard upgrades won't disrupt the network.",
"page-eth2-diagram-p-1": "Mainnet will eventually merge with the new system introduced by the Eth2 upgrades.",
"page-eth2-diagram-p-2": "The Beacon Chain will become the conductor of Ethereum, coordinating validators and setting the pace for block creation.",
"page-eth2-diagram-p-3": "At first, it will exist separately from mainnet and manage validators – it will have nothing to do with smart contracts, transactions, or accounts.",
Expand Down Expand Up @@ -153,10 +153,10 @@
"page-eth2-shard-lower": "More on shard chains",
"page-eth2-shard-title": "Shard chains",
"page-eth2-stay-up-to-date": "Stay up to date",
"page-eth2-stay-up-to-date-desc": " Get the latest from the researchers and developers working on the Eth2 upgrades.",
"page-eth2-stay-up-to-date-desc": "Get the latest from the researchers and developers working on the Eth2 upgrades.",
"page-eth2-sustainable-desc": "Ethereum needs to be better for the environment. The technology today requires too much computing power and energy.",
"page-eth2-take-part": "Take part in the research",
"page-eth2-take-part-desc": " Ethereum researchers and enthusiasts alike meet here to discuss research efforts, including everything Eth2.",
"page-eth2-take-part-desc": "Ethereum researchers and enthusiasts alike meet here to discuss research efforts, including everything Eth2.",
"page-eth2-the-upgrades": "The Eth2 upgrades",
"page-eth2-the-upgrades-desc": "Eth2 is a set of upgrades that improve the scalability, security, and sustainability of Ethereum. Although each is being worked on in parallel, they have certain dependencies that determine when they will be deployed.",
"page-eth2-unofficial-roadmap": "This is not the official roadmap. This is how we view what’s happening based on the information out there. But this is technology, things can change in an instant. So please don’t read this as a commitment.",
Expand All @@ -173,9 +173,9 @@
"page-eth2-vision-desc": "To bring Ethereum into the mainstream and serve all of humanity, we have to make Ethereum more scalable, secure, and sustainable.",
"page-eth2-vision-upper": "Eth2 vision",
"page-eth2-what-to-do": "What do you need to do?",
"page-eth2-what-to-do-desc": " If you're a dapp user or ETH holder, you don't need to do anything. If you're a developer or want to start staking, there are ways you can get involved today.",
"page-eth2-what-to-do-desc": "If you're a dapp user or ETH holder, you don't need to do anything. If you're a developer or want to start staking, there are ways you can get involved today.",
"page-eth2-whats-eth2": "What is Eth2?",
"page-eth2-whats-eth2-desc": " Eth2 refers to a set of interconnected upgrades that will make Ethereum more scalable, more secure, and more sustainable. These upgrades are being built by multiple teams from across the Ethereum ecosystem.",
"page-eth2-whats-eth2-desc": "Eth2 refers to a set of interconnected upgrades that will make Ethereum more scalable, more secure, and more sustainable. These upgrades are being built by multiple teams from across the Ethereum ecosystem.",
"page-eth2-whats-ethereum": "Wait, what's Ethereum?",
"page-eth2-whats-new": "What's new in Eth2?"
}
2 changes: 1 addition & 1 deletion src/intl/en/page-eth2-staking.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"page-eth2-staking-image-alt": "Image of the Rhino mascot for the eth2 launchpad.",
"page-eth2-staking-51-desc-1": "Staking makes joining the network as a validator more accessible so it’s likely that there’ll be more validators in the network than exists today. This will make this kind of attack even harder as the cost of an attack will increase.",
"page-eth2-staking-accessibility": "More accessible",
"page-eth2-staking-accessibility-desc": "With easier hardware requirements and the opportunity to pool if you don’t have 32ETH, more people will be able to join the network. This will make Ethereum more decentralized and secure by decreasing the attack surface area.",
"page-eth2-staking-accessibility-desc": "With easier hardware requirements and the opportunity to pool if you don’t have 32 ETH, more people will be able to join the network. This will make Ethereum more decentralized and secure by decreasing the attack surface area.",
"page-eth2-staking-at-stake": "Your ETH is at stake",
"page-eth2-staking-at-stake-desc": "Because you have to stake your ETH in order to validate transactions and create new blocks, you can lose it if you decide to try and cheat the system.",
"page-eth2-staking-benefits": "Benefits of staking to Ethereum",
Expand Down
4 changes: 2 additions & 2 deletions src/intl/en/page-eth2-vision.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"page-eth2-vision-sustainability-subtitle": "Ethereum needs to be greener.",
"page-eth2-vision-The": ". The",
"page-eth2-vision-title": "The Eth2 Vision",
"page-eth2-vision-title-1": "Clogged network",
"page-eth2-vision-title-1": "Clogged network",
"page-eth2-vision-title-2": "Disk space",
"page-eth2-vision-title-3": "Too much energy",
"page-eth2-vision-trilemma-cardtext-1": "The Eth2 upgrades will make Ethereum scalable, secure, and decentralized. Sharding will make Ethereum more scalable by increasing transactions per second while decreasing the power needed to run a node and validate the chain. The beacon chain will make Ethereum secure by co-ordinating validators across shards. And staking will lower the barrier to participation, creating a larger – more decentralized – network.",
Expand All @@ -71,7 +71,7 @@
"page-eth2-vision-upgrade-needs-desc": "The Ethereum protocol that launched in 2015 has had incredible success. But the Ethereum community always expected that a few key upgrades would be necessary to unlock Ethereum's full potential.",
"page-eth2-vision-upgrade-needs-desc-2": "High demand is driving up transaction fees that make Ethereum expensive for the average user. The disk space needed to run an Ethereum client is growing at a fast rate. And the underlying proof-of-work consensus algorithm that keeps Ethereum secure and decentralized has a big environmental impact.",
"page-eth2-vision-upgrade-needs-desc-3": "What is commonly referred to as Eth2 is a set of upgrades that address these problems and more. This set of upgrades was originally called 'Serenity', and they've been an active area of research and development since 2014.",
"page-eth2-vision-upgrade-needs-desc-6": " This means there’s no on-switch for Eth2. Improvements will ship incrementally over time.",
"page-eth2-vision-upgrade-needs-desc-6": "This means there’s no on-switch for Eth2. Improvements will ship incrementally over time.",
"page-eth2-vision-upgrade-needs-serenity": "View a 2015 blog post discussing 'Serenity'",
"page-eth2-vision-uprade-needs-desc-5": "Now that the technology is ready, these upgrades will rearchitect Ethereum to make it more scalable, secure, and sustainable – to make life better for existing users and entice new ones. All while preserving Ethereum's core value of decentralization."
}
Loading

0 comments on commit d02d52b

Please sign in to comment.