diff --git a/README.md b/README.md index 9aba0646..f5624962 100644 --- a/README.md +++ b/README.md @@ -29,13 +29,12 @@ Installing dependencies on older Ubuntu and Debian distributions 1. Begin, Run ./_contrib/translate (ISO 639-1 language code) (language name) to create your language. Ex : ./_contrib/translate fr "Français" 2. Texts, Open .html files in the appropriate folder and in _layouts and translate all human readable english dialogs (without touching the html tags and the page id). -3. Links, Update the name of each .html file so that it reflects your language and update the links in the .html files accordingly. -4. Sitemap, Add links to your translated pages in _config.yml under their equivalent english version. -5. Images, Update the few images that contain text with any vector image editing software like Inkscape. -6. Languages, Make sure that the languages are listed in alphabetical order in _config.yml -7. Post, Remove pages that use _posts such as "version-history" and "news". Those are not meant to be translated yet. -8. Press, Remove "press coverage" and "interviewees" in the Press center. The rest can be translated. -9. Preview, Check that texts that are limited in size display nicely. For example, right side buttons and some titles have height or width restrictions. You can preview your work without building the website. Just visit the existing english page, open the javascript console of your browser (CTRL + SHIFT + J on Google Chrome) and copy the following command to make the page editable : document.body.contentEditable=true . This will allow you to edit and preview the page in your browser like a document. +3. Links, Update the name of each .html file so that it reflects your language. Add translated links to your pages in _config.yml. +4. Images, Update the few images that contain text with any vector image editing software like Inkscape. +5. Languages, Make sure that the languages are listed in alphabetical order in _config.yml +6. Post, Remove pages that use _posts such as "version-history" and "news". Those are not meant to be translated yet. +7. Press, Remove "press coverage" and "interviewees" in the Press center. The rest can be translated. +8. Preview, Check that texts that are limited in size display nicely. For example, right side buttons and some titles have height or width restrictions. You can preview your work without building the website. Just visit the existing english page, open the javascript console of your browser (CTRL + SHIFT + J on Google Chrome) and copy the following command to make the page editable : document.body.contentEditable=true . This will allow you to edit and preview the page in your browser like a document. ### Update diff --git a/_config.yml b/_config.yml index 4599339d..d2e967a5 100644 --- a/_config.yml +++ b/_config.yml @@ -6,78 +6,133 @@ langs: fr: Français en: English es: Español - + section: index: en: - fr: es: + fr: about: en: about - fr: a-propos es: acerca-de + fr: a-propos bitcoin-for-developers: en: bitcoin-for-developers - fr: bitcoin-pour-developpeurs es: bitcoin-para-desarrolladores + fr: bitcoin-pour-developpeurs bitcoin-for-enthusiasts: en: bitcoin-for-enthusiasts - fr: bitcoin-pour-passionnes es: bitcoin-para-entusiastas + fr: bitcoin-pour-passionnes bitcoin-for-individuals: en: bitcoin-for-individuals - fr: bitcoin-pour-particuliers es: bitcoin-para-personas + fr: bitcoin-pour-particuliers bitcoin-for-businesses: en: bitcoin-for-businesses - fr: bitcoin-pour-entreprises es: bitcoin-para-empresas + fr: bitcoin-pour-entreprises bitcoin-for-press: en: bitcoin-for-press choose-your-wallet: en: choose-your-wallet - fr: choisir-votre-porte-monnaie es: elige-tu-monedero + fr: choisir-votre-porte-monnaie community: en: community - fr: communaute es: comunidad + fr: communaute development: en: development - fr: developpement es: desarrollo + fr: developpement download: en: download - fr: telecharger es: descargar + fr: telecharger foundation: en: foundation - fr: fondation es: fundacion + fr: fondation how-it-works: en: how-it-works - fr: comment-ca-marche es: como-funciona + fr: comment-ca-marche resources: en: resources - fr: ressources es: recursos + fr: ressources secure-your-wallet: en: secure-your-wallet support-bitcoin: en: support-bitcoin - fr: supporter-bitcoin es: apoya-bitcoin + fr: supporter-bitcoin version-history: en: version-history vocabulary: en: vocabulary - fr: vocabulaire es: vocabulario + fr: vocabulaire you-need-to-know: en: you-need-to-know - fr: vous-devez-savoir es: debes-saber + fr: vous-devez-savoir + +vocabulary: + address: + en: address + es: direccion + fr: adresse + block-chain: + en: blockchain + es: cadena-de-bloques + fr: chaine-de-bloc + block: + en: block + es: bloque + fr: bloc + btc: + en: btc + es: btc + fr: btc + confirmation: + en: confirmation + es: confirmacion + fr: confirmation + cryptography: + en: cryptography + es: criptografia + fr: cryptographie + double-spend: + en: double-spend + es: doble-gasto + fr: double-depense + hash-rate: + en: hash-rate + es: velocidad-de-hash + fr: taux-de-hash + mining: + en: mining + es: mineria + fr: minage + p2p: + en: p2p + es: p2p + fr: p2p + private-key: + en: private-key + es: llave-privada + fr: cle-privee + signature: + en: signature + es: firma + fr: signature + wallet: + en: wallet + es: monedero + fr: porte-monnaie + safe: false auto: false diff --git a/_contrib/translate b/_contrib/translate index e3b11347..58cf0174 100755 --- a/_contrib/translate +++ b/_contrib/translate @@ -8,10 +8,7 @@ fi cp -R en ${1} cp _layouts/base-en.html _layouts/base-${1}.html sed -i "s_layout: base-en_layout: base-${1}_g" ${1}/*.html -sed -i "s_href=\"/en/_href=\"/${1}/_g" ${1}/*.html -sed -i "s_src=\"/en/_src=\"/${1}/_g" ${1}/*.html -sed -i "s_href=\"/en/_href=\"/${1}/_g" _layouts/base-${1}.html -sed -i "s_src=\"/en/_src=\"/${1}/_g" _layouts/base-${1}.html +sed -i "s_lang: en_lang: ${1}_g" ${1}/*.html sed -i "s_lang: en_lang: ${1}_g" _layouts/base-${1}.html sed -i "s/ALERT_CLASS_en/ALERT_CLASS_${1}/g" _layouts/base-${1}.html sed -i "s/ALERT_en/ALERT_${1}/g" _layouts/base-${1}.html diff --git a/_layouts/base-en.html b/_layouts/base-en.html index adb2232a..b5e0990e 100644 --- a/_layouts/base-en.html +++ b/_layouts/base-en.html @@ -1,31 +1,24 @@ --- lang: en menufor: -- text: Individuals - url: bitcoin-for-individuals -- text: Businesses - url: bitcoin-for-businesses -- text: Developers - url: bitcoin-for-developers -- text: Enthusiasts - url: bitcoin-for-enthusiasts -- text: Press - url: bitcoin-for-press + bitcoin-for-individuals: Individuals + bitcoin-for-businesses: Businesses + bitcoin-for-developers: Developers + bitcoin-for-enthusiasts: Enthusiasts + bitcoin-for-press: Press menu: -- text: How it works - url: how-it-works -- text: Vocabulary - url: vocabulary -- text: Resources - url: resources -- text: Community - url: community -- text: Development - url: development -- text: Foundation - url: foundation -- text: About - url: about + how-it-works: How it works + vocabulary: Vocabulary + resources: Resources + community: Community + development: Development + foundation: Foundation + about: About +button: + wallet: Choose your wallet + know: You need to know + support: Support Bitcoin +footer: © Bitcoin Project 2009–2013 Released under the MIT license --- @@ -65,13 +58,13 @@ menu: @@ -81,16 +74,16 @@ menu:
- Choose your walletChoose your wallet + {{page.button.wallet}}{{page.button.wallet}}
- You need to knowYou need to know + {{page.button.know}}{{page.button.know}}
- Support BitcoinSupport Bitcoin + {{page.button.support}}{{page.button.support}}
- + diff --git a/_layouts/base-es.html b/_layouts/base-es.html index 86df2ffa..1e313db8 100644 --- a/_layouts/base-es.html +++ b/_layouts/base-es.html @@ -1,29 +1,23 @@ --- lang: es menufor: -- text: Personas - url: bitcoin-para-personas -- text: Empresas - url: bitcoin-para-empresas -- text: Desarrolladores - url: bitcoin-para-desarrolladores -- text: Entusiastas - url: bitcoin-para-entusiastas + bitcoin-for-individuals: Personas + bitcoin-for-businesses: Empresas + bitcoin-for-developers: Desarrolladores + bitcoin-for-enthusiasts: Entusiastas menu: -- text: Como funciona - url: como-funciona -- text: Vocabulario - url: vocabulario -- text: Recursos - url: recursos -- text: Comunidad - url: comunidad -- text: Desarrollo - url: desarrollo -- text: Fundación - url: fundacion -- text: Acerca de - url: acerca-de + how-it-works: Como funciona + vocabulary: Vocabulario + resources: Recursos + community: Comunidad + development: Desarrollo + foundation: Fundación + about: Acerca de +button: + wallet: Elige tu monedero + know: Debes saber + support: Apoya Bitcoin +footer: © Bitcoin Project 2009–2013 Publicado bajo la licencia MIT --- @@ -63,13 +57,13 @@ menu: @@ -79,16 +73,16 @@ menu:
- Elige tu monederoElige tu monedero + {{page.button.wallet}}{{page.button.wallet}}
- Debes saberDebes saber + {{page.button.know}}{{page.button.know}}
- Apoya BitcoinApoya Bitcoin + {{page.button.support}}{{page.button.support}}
- + diff --git a/_layouts/base-fr.html b/_layouts/base-fr.html index 27666916..ab8cdd62 100644 --- a/_layouts/base-fr.html +++ b/_layouts/base-fr.html @@ -1,29 +1,23 @@ --- lang: fr menufor: -- text: Particuliers - url: bitcoin-pour-particuliers -- text: Entreprises - url: bitcoin-pour-entreprises -- text: Développeurs - url: bitcoin-pour-developpeurs -- text: Passionnés - url: bitcoin-pour-passionnes + bitcoin-for-individuals: Particuliers + bitcoin-for-businesses: Entreprises + bitcoin-for-developers: Développeurs + bitcoin-for-enthusiasts: Passionnés menu: -- text: Comment ça marche - url: comment-ca-marche -- text: Vocabulaire - url: vocabulaire -- text: Ressources - url: ressources -- text: Communauté - url: communaute -- text: Développement - url: developpement -- text: Fondation - url: fondation -- text: À propos - url: a-propos + how-it-works: Comment ça marche + vocabulary: Vocabulaire + resources: Ressources + community: Communauté + development: Développement + foundation: Fondation + about: À propos +button: + wallet: Choisissez votre porte-monnaie + know: Vous devez savoir + support: Supporter Bitcoin +footer: © Bitcoin Project 2009–2013 Publié sous la licence MIT --- @@ -63,13 +57,13 @@ menu: @@ -79,16 +73,16 @@ menu:
- Choisissez votre porte-monnaieChoisissez votre porte-monnaie + {{page.button.wallet}}{{page.button.wallet}}
- Vous devez savoirVous devez savoir + {{page.button.know}}{{page.button.know}}
- Supporter BitcoinSupporter Bitcoin + {{page.button.support}}{{page.button.support}}
- + diff --git a/en/about.html b/en/about.html index 0ba18a0b..50889f80 100755 --- a/en/about.html +++ b/en/about.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: about title: About - Bitcoin diff --git a/en/bitcoin-for-businesses.html b/en/bitcoin-for-businesses.html index 13cfe6e0..242029a4 100755 --- a/en/bitcoin-for-businesses.html +++ b/en/bitcoin-for-businesses.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: bitcoin-for-businesses title: Bitcoin for Businesses - Bitcoin diff --git a/en/bitcoin-for-developers.html b/en/bitcoin-for-developers.html index 1357f542..6febe67e 100755 --- a/en/bitcoin-for-developers.html +++ b/en/bitcoin-for-developers.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: bitcoin-for-developers title: Bitcoin for Developers - Bitcoin diff --git a/en/bitcoin-for-enthusiasts.html b/en/bitcoin-for-enthusiasts.html index 6a19238c..128c6c3a 100755 --- a/en/bitcoin-for-enthusiasts.html +++ b/en/bitcoin-for-enthusiasts.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: bitcoin-for-enthusiasts title: Bitcoin for Enthusiasts diff --git a/en/bitcoin-for-individuals.html b/en/bitcoin-for-individuals.html index acda101e..b4a83936 100755 --- a/en/bitcoin-for-individuals.html +++ b/en/bitcoin-for-individuals.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: bitcoin-for-individuals title: Bitcoin for Individuals - Bitcoin @@ -16,10 +17,10 @@ title: Bitcoin for Individuals - Bitcoin

Just like with email, you don't need to force your family to use the same software or the same service providers. Just let them stick to their own favorites. No problem there; they are all compatible as they use the same open technology. The Bitcoin network never sleeps, even on holidays!

SecureSecure transactions

-

Bitcoin transactions are secured by military grade cryptography. Nobody can make a payment on your behalf or charge you money without having a copy of your wallet. So as long as you take the required steps to protect your wallet, Bitcoin provides a nice level of protection against many types of fraud.

+

Bitcoin transactions are secured by military grade cryptography. Nobody can make a payment on your behalf or charge you money without having a copy of your wallet. So as long as you take the required steps to protect your wallet, Bitcoin provides a nice level of protection against many types of fraud.

FreeAlmost free to use

Bitcoin allows you to send and receive payments for free. Except for special cases like very tiny micro-payments, there is no enforced fee. You can, however, choose to pay a small voluntary fee to increase your transaction priority and to remunerate the people who operate the Bitcoin network.

AnonymousPseudo-anonymous online payments

-

Anonymous payments are a part of our everyday lives - most real life purchases are done without the requirement to provide proper identification. Bitcoin now introduces the same freedom to the online world. It allows you to buy services or make donations without the hassle of being passed under x-ray. However, you should note that full anonymity requires special efforts.

+

Anonymous payments are a part of our everyday lives - most real life purchases are done without the requirement to provide proper identification. Bitcoin now introduces the same freedom to the online world. It allows you to buy services or make donations without the hassle of being passed under x-ray. However, you should note that full anonymity requires special efforts.

diff --git a/en/bitcoin-for-press.html b/en/bitcoin-for-press.html index 6fced0fd..8ed62461 100755 --- a/en/bitcoin-for-press.html +++ b/en/bitcoin-for-press.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: bitcoin-for-press title: Bitcoin Press Center - Bitcoin @@ -189,7 +190,7 @@ mode: wide
Is Bitcoin secure?
-

The Bitcoin technology - the protocol and the cryptography - has a strong security track record. Bitcoin’s vulnerability is in user error. Bitcoin wallet files that store the necessary private keys can be accidentally deleted, lost, stolen, or compromised. Consequently, users need to employ security practices to protect their money or use service providers that offer good levels of security and insurance. As more people have adopted Bitcoin, more service providers have appeared to make it easier, safer, and more convenient to use and safely secure bitcoins. Bitcoins are not covered by insurance schemes or depositor insurance like the FDIC, but users' wallets could be with a service provider that offers that provision.

+

The Bitcoin technology - the protocol and the cryptography - has a strong security track record. Bitcoin's vulnerability is in user error. Bitcoin wallet files that store the necessary private keys can be accidentally deleted, lost, stolen, or compromised. Consequently, users need to employ security practices to protect their money or use service providers that offer good levels of security and insurance. As more people have adopted Bitcoin, more service providers have appeared to make it easier, safer, and more convenient to use and safely secure bitcoins. Bitcoins are not covered by insurance schemes or depositor insurance like the FDIC, but users' wallets could be with a service provider that offers that provision.

diff --git a/en/choose-your-wallet.html b/en/choose-your-wallet.html index 3f19bca5..467d7330 100755 --- a/en/choose-your-wallet.html +++ b/en/choose-your-wallet.html @@ -1,15 +1,16 @@ --- +lang: en layout: base-en id: choose-your-wallet title: Choose your wallet - Bitcoin ---

Choose your wallet

-

Your Bitcoin wallet is what allows you to transact with the world. It gives you ownership of Bitcoin addresses that you can use to receive coins from other users and then lets you send those coins onwards. Just like email, you can receive bitcoins when you are offline, and all wallets are compatible with each other. Before you start with Bitcoin, be sure to read what you need to know first.

+

Your Bitcoin wallet is what allows you to transact with the world. It gives you ownership of Bitcoin addresses that you can use to receive coins from other users and then lets you send those coins onwards. Just like email, you can receive bitcoins when you are offline, and all wallets are compatible with each other. Before you start with Bitcoin, be sure to read what you need to know first.

Get started fast and easy

If you are new to Bitcoin, these wallets are a good place to begin.

diff --git a/en/community.html b/en/community.html index a73f0f52..b1ed308c 100644 --- a/en/community.html +++ b/en/community.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: community title: Community - Bitcoin diff --git a/en/development.html b/en/development.html index 2dd8fb0d..27d64827 100755 --- a/en/development.html +++ b/en/development.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: development title: Development - Bitcoin diff --git a/en/download.html b/en/download.html index 2360f1a4..3adbf5e2 100755 --- a/en/download.html +++ b/en/download.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: download title: Download - Bitcoin diff --git a/en/foundation.html b/en/foundation.html index dd02b8b1..44391759 100755 --- a/en/foundation.html +++ b/en/foundation.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: foundation title: Bitcoin Foundation diff --git a/en/how-it-works.html b/en/how-it-works.html index 64e0da09..dd75550e 100755 --- a/en/how-it-works.html +++ b/en/how-it-works.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: how-it-works title: How does Bitcoin work? - Bitcoin @@ -8,20 +9,20 @@ title: How does Bitcoin work? - Bitcoin

OK, this is a question that often causes confusion. Here's a quick explanation!

The basics for a new user

-

As a new user, you only need to choose a wallet that you will install on your computer or on your mobile phone. Once you have your wallet installed, it will generate your first Bitcoin address and you can create more whenever you need one. You can disclose one of your Bitcoin addresses to your friends so that they can pay you or vice versa, you can pay your friends if they give you their addresses. In fact, this is pretty similar to how email works. So all that is left to do at this point is to get some bitcoins and to keep them safe. In order to start using Bitcoin, you are not required to understand the technical details.

+

As a new user, you only need to choose a wallet that you will install on your computer or on your mobile phone. Once you have your wallet installed, it will generate your first Bitcoin address and you can create more whenever you need one. You can disclose one of your Bitcoin addresses to your friends so that they can pay you or vice versa, you can pay your friends if they give you their addresses. In fact, this is pretty similar to how email works. So all that is left to do at this point is to get some bitcoins and to keep them safe. In order to start using Bitcoin, you are not required to understand the technical details.

However, if you want to know more, keep reading!

-


Bitcoin overview

+


Bitcoin overview

Balances - block chain

-

The block chain is a shared public transaction log on which the entire Bitcoin network relies. All confirmed transactions are included in the block chain with no exception. This way, new transactions can be verified to be spending bitcoins that are actually owned by the spender. The integrity and the chronological order of the block chain are enforced with cryptography.

+

The block chain is a shared public transaction log on which the entire Bitcoin network relies. All confirmed transactions are included in the block chain with no exception. This way, new transactions can be verified to be spending bitcoins that are actually owned by the spender. The integrity and the chronological order of the block chain are enforced with cryptography.

Transactions - private keys

-

A transaction is a transfer of value between Bitcoin addresses that gets included in the block chain. Bitcoin wallets keep a secret piece of data called a private key for each Bitcoin address. Private keys are used to sign transactions, providing a mathematical proof that they have come from the owner of the addresses. The signature also prevents the transaction from being altered by anybody once it has been issued. All transactions are broadcast between users and confirmed by the network in the following minutes, through a process called mining.

+

A transaction is a transfer of value between Bitcoin addresses that gets included in the block chain. Bitcoin wallets keep a secret piece of data called a private key for each Bitcoin address. Private keys are used to sign transactions, providing a mathematical proof that they have come from the owner of the addresses. The signature also prevents the transaction from being altered by anybody once it has been issued. All transactions are broadcast between users and confirmed by the network in the following minutes, through a process called mining.

Processing - mining

-

Mining is a distributed consensus system that is used to confirm waiting transactions by including them in the block chain. It enforces a chronological order in the block chain, protects the neutrality of the network, and allows different computers to agree on the state of the system. To be confirmed, transactions must be packed in a block that fits very strict cryptographic rules that will be verified by the network. These rules prevent previous blocks from being modified because doing so would invalidate all following blocks. Mining also creates the equivalent of a competitive lottery that prevents any individual from easily adding new blocks consecutively in the block chain. This way, no individuals can control what is included in the block chain or replace parts of the block chain to roll back their own spends.

+

Mining is a distributed consensus system that is used to confirm waiting transactions by including them in the block chain. It enforces a chronological order in the block chain, protects the neutrality of the network, and allows different computers to agree on the state of the system. To be confirmed, transactions must be packed in a block that fits very strict cryptographic rules that will be verified by the network. These rules prevent previous blocks from being modified because doing so would invalidate all following blocks. Mining also creates the equivalent of a competitive lottery that prevents any individual from easily adding new blocks consecutively in the block chain. This way, no individuals can control what is included in the block chain or replace parts of the block chain to roll back their own spends.

Going down the rabbit hole

This is only a very short and concise summary of the system. If you want to get into the details, you can read the original paper that describes the system's design, and explore the Bitcoin wiki.

diff --git a/en/index.html b/en/index.html index c4329cca..2df6833e 100755 --- a/en/index.html +++ b/en/index.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: index title: Bitcoin - Open source P2P digital currency diff --git a/en/resources.html b/en/resources.html index dd2d2a5b..d13cdce1 100644 --- a/en/resources.html +++ b/en/resources.html @@ -1,4 +1,5 @@ --- +lang: en layout: base-en id: resources title: Resources - Bitcoin @@ -6,7 +7,7 @@ title: Resources - Bitcoin

Bitcoin resources

diff --git a/es/fundacion.html b/es/fundacion.html index 6b4849e7..a2fa19d8 100644 --- a/es/fundacion.html +++ b/es/fundacion.html @@ -1,4 +1,5 @@ --- +lang: es layout: base-es id: foundation title: Fundación Bitcoin - Bitcoin diff --git a/es/index.html b/es/index.html index 0a9cc378..84f4cf54 100644 --- a/es/index.html +++ b/es/index.html @@ -1,4 +1,5 @@ --- +lang: es layout: base-es id: index title: Bitcoin diff --git a/es/recursos.html b/es/recursos.html index 02cbd918..1b3f32ea 100644 --- a/es/recursos.html +++ b/es/recursos.html @@ -1,4 +1,5 @@ --- +lang: es layout: base-es id: resources title: Recursos - Bitcoin @@ -6,7 +7,7 @@ title: Recursos - Bitcoin

Recursos de Bitcoin