Merge branch 'master' into coinapult

Conflicts: _translations/es.yml
bitcoin-dot-org · Nov 1, 2014 · db2fb51 · db2fb51
2 parents 0269670 + e06abfc
commit db2fb51
Show file tree

Hide file tree

Showing 100 changed files with 2,701 additions and 1,038 deletions.
diff --git a/README.md b/README.md
@@ -143,15 +143,15 @@ references are defined in _autocrossref.yaml .
 
 ### How To Translate
 
-You can join a translation team on [Transifex](https://www.transifex.com/projects/p/bitcoinorg/) and start translating or improving existing translations. Latest live previews and communications can be found on [this thread](https://bitcointalk.org/index.php?topic=349633.0).
+You can join a translation team on [Transifex](https://www.transifex.com/projects/p/bitcoinorg/) and start translating or improving existing translations.
 
 * You must be a native speaker for the language you choose to translate.
 * Please be careful to preserve the original meaning of each text.
 * Sentences and popular expressions should sound native in your language.
-* You can check the result on live previews and [test small changes](#preview-small-text-changes).
+* You can check the result on the [live preview](http://bitcointx.us.to/) and [test small changes](#preview-small-text-changes).
 * Translations need to be reviewed by a reviewer or coordinator before publication.
 * Once reviewed, translations can be [submitted](#import-translations) in a pull request on GitHub.
-* **In doubt, please open a discussion on Transifex with coordinators. That'll be much appreciated.**
+* **In doubt, please contact coordinators on Transifex. That'll be much appreciated.**
 
 ### Import Translations
 
@@ -271,7 +271,7 @@ To get a good score, the wallet must provide the user with full exclusive contro
 
 To get a passing score, the wallet must provide the user with exclusive control over their bitcoins. Encrypted online backups are accepted so long as only the user can decrypt them. Multisig wallets are accepted so long as only the user can spend without the other party's permission.
 
-**Decentralization** - How secure and « zero trust » is payment processing?
+**Validation** - How secure and « zero trust » is payment processing?
 
 To get a good score, the wallet must be a full node and need no trust on other nodes.
 

diff --git a/_autocrossref.yaml b/_autocrossref.yaml
@@ -2,8 +2,11 @@
 ## List of words to match with references in _includes/references.md
 ## in developer documentation, used by autocrossref.rb plugin.
 ## "pattern to match in file" => "reference to give it"
+#
+## To prevent a ref for term, use: "term: DO NOT AUTOCROSSREF"
 
 51 percent attack:
+'`addr`': addr message
 address: 
 addresses: address
 '`amount`': pp amount
@@ -48,11 +51,15 @@ confirmed:
 confirmation:
 confirmations:
 confirmed transactions:
+consensus:
+consensus rules:
 denomination:
 denominations: denomination
 DER format: der
 DER-formatted: der
 difficulty:
+dns seed:
+dns seeds: dns seed
 double spend:
 double-spend: double spend
 double spending: double spend
@@ -65,8 +72,11 @@ extended keys: extended key
 extended private key:
 extended public key:
 fiat:
-fork: accidental fork
+fork:
+forks: fork
 genesis block:
+hard fork:
+hard forks: hard fork
 hardened extended private key:
 HD protocol:
 header nonce:
@@ -76,13 +86,18 @@ inputs: input
 input:
 intermediate certificate:
 intermediate certificates: intermediate certificate
+internal byte order:
+IP address: DO NOT AUTOCROSSREF
+IP addresses: DO NOT AUTOCROSSREF
 key index:
 key pair:
 '`label`': label
 leaf certificate:
 locktime:
 long-term fork:
 mainnet:
+man in the middle: man-in-the-middle
+man-in-the-middle:
 master chain code:
 master private key:
 '`memo`': pp memo
@@ -114,8 +129,6 @@ op codes: op code
 '`op_hash160`': op_hash160
 '`op_return`': op_return
 '`op_verify`': op_verify
-orphan:
-orphaned: orphan
 outputs: output
 output:
 output index:
@@ -167,6 +180,7 @@ root certificate:
 root seed:
 RPCs: rpc
 RPC:
+RPC byte order:
 satoshi:
 satoshis: satoshi
 '`script`': pp script
@@ -186,8 +200,12 @@ signature hash:
 signature script:
 signature scripts: signature script
 signatures: signature
+soft fork:
+soft forks: soft fork
 SPV:
 stack:
+stale block:
+stale blocks: stale block
 standard script:
 standard scripts: standard script
 standard transaction: standard script
@@ -217,14 +235,21 @@ wallet import format:
 x.509: x509
 X509Certificates:
 
-## BIPS in numerical order; don't use padding zeros (e.g. BIP70 not BIP0070)
+## BIPs in numerical order; don't use padding zeros (e.g. BIP70 not BIP0070)
+BIP16:
 BIP21:
+BIP30:
 BIP32:
+BIP34:
 BIP39:
+BIP50:
 BIP70:
 BIP71:
 BIP72:
 
+## CVEs
+CVE-2012-2459:
+
 ## RPCs
 '`addmultisigaddress`': rpc addmultisigaddress
 '`addnode`': rpc addnode

diff --git a/_config.yml b/_config.yml
@@ -1,54 +1,54 @@
 langsorder:
-- id
-- da
-- de
-- en
-- es
-- fr
-- it
-- hu
-- nl
-- pl
-- pt_BR
-- ro
-- sl
-- sv
-- tr
-- bg
-- ru
-- ar
-- fa
-- hi
-- ko
-- ja
-- zh_CN
-- zh_TW
+- 'id'
+- 'da'
+- 'de'
+- 'en'
+- 'es'
+- 'fr'
+- 'it'
+- 'hu'
+- 'nl'
+- 'pl'
+- 'pt_BR'
+- 'ro'
+- 'sl'
+- 'sv'
+- 'tr'
+- 'bg'
+- 'ru'
+- 'ar'
+- 'fa'
+- 'hi'
+- 'ko'
+- 'ja'
+- 'zh_CN'
+- 'zh_TW'
 
 langs:
-  ar: العربية
-  bg: български
-  da: Dansk
-  de: Deutsch
-  en: English
-  es: Español
-  fa: فارسی
-  fr: Français
-  hi: हिन्दी
-  hu: magyar
-  id: Bahasa Indonesia‬
-  it: Italiano
-  ja: 日本語
-  ko: 한국의
-  nl: Nederlands
-  pl: polski
-  pt_BR: Português Brasil
-  ro: română
-  ru: Русский
-  sl: slovenščina
-  sv: Svenska
-  tr: Türkçe
-  zh_CN: ‪简体中文‬
-  zh_TW: ‪繁體中文‬
+  'ar': 'العربية'
+  'bg': 'български'
+  'da': 'Dansk'
+  'de': 'Deutsch'
+  'en': 'English'
+  'es': 'Español'
+  'fa': 'فارسی'
+  'fr': 'Français'
+  'hi': 'हिन्दी'
+  'hu': 'magyar'
+  'id': 'Bahasa Indonesia'
+  'it': 'Italiano'
+  'ja': '日本語'
+  'ko': '한국의'
+  'nl': 'Nederlands'
+  'pl': 'polski'
+  'pt_BR': 'Português Brasil'
+  'ro': 'română'
+  'ru': 'Русский'
+  'sl': 'slovenščina'
+  'sv': 'Svenska'
+  'tr': 'Türkçe'
+  'zh_CN': '简体中文'
+  'zh_TW': '繁體中文'
 
 redirects:
   /news: /en/version-history
@@ -130,6 +130,7 @@ aliases:
   sipa: Pieter Wuille
   tcatm: Nils Schneider
   whitj00: Whit Jack
+  CodeShark: Eric Lombrozo
 
 safe:        false
 server_port: 4000

diff --git a/_events/2014-09-15-insidebitcoinslondon.md b/_events/2014-09-15-insidebitcoinslondon.md
diff --git a/_events/2014-09-17-cryptovalleysummit.md b/_events/2014-09-17-cryptovalleysummit.md
diff --git a/_events/2014-09-17-digitalcurrencysummit.md b/_events/2014-09-17-digitalcurrencysummit.md
diff --git a/_events/2014-09-19-bitcoinexpo2014.md b/_events/2014-09-19-bitcoinexpo2014.md
diff --git a/_events/2014-09-26-bitcoinconferencekiev.md b/_events/2014-09-26-bitcoinconferencekiev.md
diff --git a/_events/2014-09-27-bitcointhailand.md b/_events/2014-09-27-bitcointhailand.md
diff --git a/_events/2014-10-05-insidebitcoinslasvegas.md b/_events/2014-10-05-insidebitcoinslasvegas.md
diff --git a/_events/2014-10-07-coinagenda.md b/_events/2014-10-07-coinagenda.md
diff --git a/_events/2014-10-08-eurobitcoin.md b/_events/2014-10-08-eurobitcoin.md
diff --git a/_events/2014-10-10-hackercongress.md b/_events/2014-10-10-hackercongress.md
diff --git a/_events/2014-10-16-BTC2B.md b/_events/2014-10-16-BTC2B.md
diff --git a/_events/2014-10-19-insidebitcoinstelaviv.md b/_events/2014-10-19-insidebitcoinstelaviv.md
diff --git a/_events/2014-10-21-bitcoinlaw b/_events/2014-10-21-bitcoinlaw
diff --git a/_events/2014-10-31-bitconfbrazil.md b/_events/2014-10-31-bitconfbrazil.md
@@ -0,0 +1,9 @@
+---
+date: 2014-10-31
+title: "II BitConf"
+venue: "Faculdade Impacta Tecnologia"
+address: "Avenida Rudge, 315, Barra Funda"
+city: "São Paulo, SP"
+country: "Brazil"
+link: "https://eventioz.com.br/e/ii-bitconf-conferencia-brasileira-sobre-bitcoin-e"
+---