Minor updates

- Start vocabulary changes
 - Update links on -for-developers page
This commit is contained in:
thephez 2017-11-15 17:25:45 -05:00
parent fbe53a41c4
commit abd191981c
3 changed files with 21 additions and 17 deletions

View file

@ -26,5 +26,6 @@ id: bitcoin-for-developers
<h2 id="micro"><img class="titleicon" src="/img/icons/ico_micro.svg" alt="Icon" />{% translate micro %}</h2> <h2 id="micro"><img class="titleicon" src="/img/icons/ico_micro.svg" alt="Icon" />{% translate micro %}</h2>
<p>{% translate microtext %}</p> <p>{% translate microtext %}</p>
<div class="introlink"><a href="https://bitcoin.org/en/developer-documentation">Developer Documentation {% if page.lang != "en" %}(English){% endif %}</a></div> <div class="introlink"><a href="en/developer-documentation">Developer Documentation {% if page.lang != "en" %}(English){% endif %}</a></div>
<div class="mainbutton"><a href="/{{ page.lang }}/{% translate getting-started url %}"><img src="/img/icons/but_bitcoin.svg" alt="icon">{% translate getstarted layout %}</a></div> <!--<div class="mainbutton"><a href="/{{ page.lang }}/{% translate getting-started url %}"><img src="/img/icons/but_bitcoin.svg" alt="icon">{% translate getstarted layout %}</a></div> -->
<div class="mainbutton"><a href="https://www.dash.org/" target="_blank"><img src="/img/icons/but_bitcoin.svg" alt="icon">{% translate getstarted layout %}</a></div>

View file

@ -14,6 +14,7 @@ voc:
- btc - btc
- confirmation - confirmation
- cryptography - cryptography
- dash
- doublespend - doublespend
- hashrate - hashrate
- mining - mining

View file

@ -801,40 +801,42 @@ en:
help: "Meet the communities" help: "Meet the communities"
helptxt: "You can join Bitcoin <a href=\"#community#\">communities</a> and talk with other Bitcoin enthusiasts. You can learn more about Bitcoin every day, give help to new users and get involved in interesting projects." helptxt: "You can join Bitcoin <a href=\"#community#\">communities</a> and talk with other Bitcoin enthusiasts. You can learn more about Bitcoin every day, give help to new users and get involved in interesting projects."
vocabulary: vocabulary:
title: "Vocabulary - Bitcoin" title: "Vocabulary - Dash"
pagetitle: "Some Bitcoin words you might hear" pagetitle: "Some Dash words you might hear"
summary: "Bitcoin provides a new approach to payments and, as such, there are some new words that might become a part of your vocabulary. Don't worry, even the humble television created new words!" summary: "Dash provides a new approach to payments and, as such, there are some new words that might become a part of your vocabulary. Don't worry, even the humble television created new words!"
table: "Table of contents" table: "Table of contents"
address: "Address" address: "Address"
addresstxt: "A Bitcoin address is <b>similar to a physical address or an email</b>. It is the only information you need to provide for someone to pay you with Bitcoin. An important difference, however, is that each address should only be used for a single transaction." addresstxt: "A Dash address is <b>similar to a physical address or an email</b>. It is the only information you need to provide for someone to pay you with Dash. An important difference, however, is that each address should only be used for a single transaction."
bit: "Bit" bit: "Bit"
bittxt: "Bit is a common unit used to designate a sub-unit of a bitcoin - 1,000,000 bits is equal to 1 bitcoin (BTC or B⃦). This unit is usually more convenient for pricing tips, goods and services." bittxt: "Bit is a common unit used to designate a sub-unit of a bitcoin - 1,000,000 bits is equal to 1 bitcoin (BTC or B⃦). This unit is usually more convenient for pricing tips, goods and services."
bitcoin: "Bitcoin" bitcoin: "Bitcoin"
bitcointxt: "Bitcoin - with capitalization, is used when describing the concept of Bitcoin, or the entire network itself. e.g. \"I was learning about the Bitcoin protocol today.\"<br>bitcoin - without capitalization, is used to describe bitcoins as a unit of account. e.g. \"I sent ten bitcoins today.\"; it is also often abbreviated BTC or XBT." bitcointxt: "Bitcoin - with capitalization, is used when describing the concept of Bitcoin, or the entire network itself. e.g. \"I was learning about the Bitcoin protocol today.\"<br>bitcoin - without capitalization, is used to describe bitcoins as a unit of account. e.g. \"I sent ten bitcoins today.\"; it is also often abbreviated BTC or XBT."
blockchain: "Block Chain" blockchain: "Block Chain"
blockchaintxt: "The block chain is a <b>public record of Bitcoin transactions</b> in chronological order. The block chain is shared between all Bitcoin users. It is used to verify the permanence of Bitcoin transactions and to prevent <a href=\"#[vocabulary.doublespend]\">double spending</a>." blockchaintxt: "The block chain is a <b>public record of Dash transactions</b> in chronological order. The block chain is shared between all Dash users. It is used to verify the permanence of Dash transactions and to prevent <a href=\"#[vocabulary.doublespend]\">double spending</a>."
block: "Block" block: "Block"
blocktxt: "A block is a <b>record in the block chain that contains and confirms many waiting transactions</b>. Roughly every 10 minutes, on average, a new block including transactions is appended to the <a href=\"#[vocabulary.blockchain]\">block chain</a> through <a href=\"#[vocabulary.mining]\">mining</a>." blocktxt: "A block is a <b>record in the block chain that contains and confirms many waiting transactions</b>. Roughly every 2.5 minutes, on average, a new block including transactions is appended to the <a href=\"#[vocabulary.blockchain]\">block chain</a> through <a href=\"#[vocabulary.mining]\">mining</a>."
btc: "BTC" btc: "BTC"
btctxt: "BTC is a common unit used to designate one bitcoin (B⃦)." btctxt: "BTC is a common unit used to designate one bitcoin (B⃦)."
confirmation: "Confirmation" confirmation: "Confirmation"
confirmationtxt: "Confirmation means that a transaction has been <b>processed by the network and is highly unlikely to be reversed</b>. Transactions receive a confirmation when they are included in a <a href=\"#vocabulary##[vocabulary.block]\">block</a> and for each subsequent block. Even a single confirmation can be considered secure for low value transactions, although for larger amounts like 1000 US$, it makes sense to wait for 6 confirmations or more. Each confirmation <i>exponentially</i> decreases the risk of a reversed transaction." confirmationtxt: "Confirmation means that a transaction has been <b>processed by the network and is highly unlikely to be reversed</b>. Transactions receive a confirmation when they are included in a <a href=\"#vocabulary##[vocabulary.block]\">block</a> and for each subsequent block. Even a single confirmation can be considered secure for low value transactions, although for larger amounts like 1000 US$, it makes sense to wait for 6 confirmations or more. Each confirmation <i>exponentially</i> decreases the risk of a reversed transaction."
cryptography: "Cryptography" cryptography: "Cryptography"
cryptographytxt: "Cryptography is the branch of mathematics that lets us create <b>mathematical proofs that provide high levels of security</b>. Online commerce and banking already uses cryptography. In the case of Bitcoin, cryptography is used to make it impossible for anybody to spend funds from another user's wallet or to corrupt the <a href=\"#[vocabulary.blockchain]\">block chain</a>. It can also be used to encrypt a wallet, so that it cannot be used without a password." cryptographytxt: "Cryptography is the branch of mathematics that lets us create <b>mathematical proofs that provide high levels of security</b>. Online commerce and banking already uses cryptography. In the case of Dash, cryptography is used to make it impossible for anybody to spend funds from another user's wallet or to corrupt the <a href=\"#[vocabulary.blockchain]\">block chain</a>. It can also be used to encrypt a wallet, so that it cannot be used without a password."
dash: "Dash"
dashtxt: "Dash - with capitalization, is used when describing the concept of Dash, or the entire network itself. e.g. \"I was learning about the Dash protocol today.\"<br>dash - without capitalization, is used to describe dash as a unit of account. e.g. \"I sent ten dash today.\"; it is also often abbreviated <????>."
doublespend: "Double Spend" doublespend: "Double Spend"
doublespendtxt: "If a malicious user tries to <b>spend their bitcoins to two different recipients at the same time</b>, this is double spending. Bitcoin <a href=\"#[vocabulary.mining]\">mining</a> and the <a href=\"#[vocabulary.blockchain]\">block chain</a> are there to create a consensus on the network about which of the two transactions will confirm and be considered valid." doublespendtxt: "If a malicious user tries to <b>spend their bitcoins to two different recipients at the same time</b>, this is double spending. Dash <a href=\"#[vocabulary.mining]\">mining</a> and the <a href=\"#[vocabulary.blockchain]\">block chain</a> are there to create a consensus on the network about which of the two transactions will confirm and be considered valid."
hashrate: "Hash Rate" hashrate: "Hash Rate"
hashratetxt: "The hash rate is the <b>measuring unit of the processing power of the Bitcoin network</b>. The Bitcoin network must make intensive mathematical operations for security purposes. When the network reached a hash rate of 10 Th/s, it meant it could make 10 trillion calculations per second." hashratetxt: "The hash rate is the <b>measuring unit of the processing power of the Dash network</b>. The Dash network must make intensive mathematical operations for security purposes. When the network reached a hash rate of 10 Th/s, it meant it could make 10 trillion calculations per second."
mining: "Mining" mining: "Mining"
miningtxt: "Bitcoin mining is the process of <b>making computer hardware do mathematical calculations for the Bitcoin network to confirm transactions</b> and increase security. As a reward for their services, Bitcoin miners can collect transaction fees for the transactions they confirm, along with newly created bitcoins. Mining is a specialized and competitive market where the rewards are divided up according to how much calculation is done. Not all Bitcoin users do Bitcoin mining, and it is not an easy way to make money." miningtxt: "Dash mining is the process of <b>making computer hardware do mathematical calculations for the Dash network to confirm transactions</b> and increase security. As a reward for their services, Dash miners can collect transaction fees for the transactions they confirm, along with newly created bitcoins. Mining is a specialized and competitive market where the rewards are divided up according to how much calculation is done. Not all Dash users do Dash mining, and it is not an easy way to make money."
p2p: "P2P" p2p: "P2P"
p2ptxt: "Peer-to-peer refers to <b>systems that work like an organized collective</b> by allowing each individual to interact directly with the others. In the case of Bitcoin, the network is built in such a way that each user is broadcasting the transactions of other users. And, crucially, no bank is required as a third party." p2ptxt: "Peer-to-peer refers to <b>systems that work like an organized collective</b> by allowing each individual to interact directly with the others. In the case of Dash, the network is built in such a way that each user is broadcasting the transactions of other users. And, crucially, no bank is required as a third party."
privatekey: "Private Key" privatekey: "Private Key"
privatekeytxt: "A private key is a <b>secret piece of data that proves your right to spend bitcoins from a specific wallet</b> through a cryptographic <a href=\"#[vocabulary.signature]\">signature</a>. Your private key(s) are stored in your computer if you use a software wallet; they are stored on some remote servers if you use a web wallet. Private keys must never be revealed as they allow you to spend bitcoins for their respective Bitcoin wallet." privatekeytxt: "A private key is a <b>secret piece of data that proves your right to spend bitcoins from a specific wallet</b> through a cryptographic <a href=\"#[vocabulary.signature]\">signature</a>. Your private key(s) are stored in your computer if you use a software wallet; they are stored on some remote servers if you use a web wallet. Private keys must never be revealed as they allow you to spend bitcoins for their respective Dash wallet."
signature: "Signature" signature: "Signature"
signaturetxt: "A <a href=\"#[vocabulary.cryptography]\">cryptographic</a> signature is <b>a mathematical mechanism that allows someone to prove ownership</b>. In the case of Bitcoin, a <a href=\"#[vocabulary.wallet]\">Bitcoin wallet</a> and its <a href=\"#[vocabulary.privatekey]\">private key(s)</a> are linked by some mathematical magic. When your Bitcoin software signs a transaction with the appropriate private key, the whole network can see that the signature matches the bitcoins being spent. However, there is no way for the world to guess your private key to steal your hard-earned bitcoins." signaturetxt: "A <a href=\"#[vocabulary.cryptography]\">cryptographic</a> signature is <b>a mathematical mechanism that allows someone to prove ownership</b>. In the case of Dash, a <a href=\"#[vocabulary.wallet]\">Dash wallet</a> and its <a href=\"#[vocabulary.privatekey]\">private key(s)</a> are linked by some mathematical magic. When your Dash software signs a transaction with the appropriate private key, the whole network can see that the signature matches the bitcoins being spent. However, there is no way for the world to guess your private key to steal your hard-earned bitcoins."
wallet: "Wallet" wallet: "Wallet"
wallettxt: "A Bitcoin wallet is loosely <b>the equivalent of a physical wallet on the Bitcoin network</b>. The wallet actually contains your <a href=\"#[vocabulary.privatekey]\">private key(s)</a> which allow you to spend the bitcoins allocated to it in the <a href=\"#[vocabulary.blockchain]\">block chain</a>. Each Bitcoin wallet can show you the total balance of all bitcoins it controls and lets you pay a specific amount to a specific person, just like a real wallet. This is different to credit cards where you are charged by the merchant." wallettxt: "A Dash wallet is loosely <b>the equivalent of a physical wallet on the Dash network</b>. The wallet actually contains your <a href=\"#[vocabulary.privatekey]\">private key(s)</a> which allow you to spend the bitcoins allocated to it in the <a href=\"#[vocabulary.blockchain]\">block chain</a>. Each Dash wallet can show you the total balance of all bitcoins it controls and lets you pay a specific amount to a specific person, just like a real wallet. This is different to credit cards where you are charged by the merchant."
you-need-to-know: you-need-to-know:
title: "Some things you need to know - Bitcoin" title: "Some things you need to know - Bitcoin"
pagetitle: "Some things you need to know" pagetitle: "Some things you need to know"
@ -892,7 +894,7 @@ en:
banner-translate: "Translations for this language are outdated. <a href=\"https://github.com/bitcoin-dot-org/bitcoin.org#translation\">Click here to help translate bitcoin.org in your language</a>." banner-translate: "Translations for this language are outdated. <a href=\"https://github.com/bitcoin-dot-org/bitcoin.org#translation\">Click here to help translate bitcoin.org in your language</a>."
footer: "Released under the <a href=\"http://opensource.org/licenses/mit-license.php\" target=\"_blank\">MIT license</a>" footer: "Released under the <a href=\"http://opensource.org/licenses/mit-license.php\" target=\"_blank\">MIT license</a>"
sponsor: "A community website sponsored by" sponsor: "A community website sponsored by"
getstarted: "Get started with Bitcoin" getstarted: "Get started with Dash"
bitcoin-core: "Bitcoin Core" bitcoin-core: "Bitcoin Core"
donation-banner-text: "Bitcoin.org is a community funded project, donations are appreciated and used to improve the website." donation-banner-text: "Bitcoin.org is a community funded project, donations are appreciated and used to improve the website."
donation-banner-toggle-button: "Bitcoin.org needs your support!" donation-banner-toggle-button: "Bitcoin.org needs your support!"