From 4213d102da38b32e9540c7eb7f11ca797a5d0876 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Thu, 9 Apr 2015 11:30:28 -0400 Subject: [PATCH] Style: Add anchor links to all subheads * Adds Makefile test to ensure all subheadings, except those on Choose Your Wallet, have an ID (anchor reference) * Adds an ID to all subheads that didn't have on previously --- Makefile | 11 +++- .../2012-03-16-critical-vulnerability.html | 20 +++---- _alerts/2012-05-14-dos.html | 14 ++--- _alerts/2013-03-11-chain-fork.html | 12 ++--- _alerts/2013-03-15-upgrade-deadline.html | 6 +-- _alerts/2013-08-11-android.html | 6 +-- _alerts/2014-02-11-malleability.html | 6 +-- _alerts/2014-04-11-heartbleed.html | 8 +-- _templates/about-us.html | 16 +++--- _templates/bitcoin-for-businesses.html | 14 ++--- _templates/bitcoin-for-developers.html | 12 ++--- _templates/bitcoin-for-individuals.html | 12 ++--- _templates/choose-your-wallet.html | 2 + _templates/community.html | 54 +++++++++---------- _templates/development.html | 14 ++--- _templates/download.html | 4 +- _templates/events.html | 2 +- _templates/faq.html | 2 +- _templates/getting-started.html | 16 +++--- _templates/how-it-works.html | 10 ++-- _templates/innovation.html | 24 ++++----- _templates/legal.html | 42 +++++++-------- _templates/press.html | 10 ++-- _templates/privacy.html | 4 +- _templates/protect-your-privacy.html | 14 ++--- _templates/resources.html | 12 ++--- _templates/secure-your-wallet.html | 32 +++++------ _templates/support-bitcoin.html | 20 +++---- _templates/vocabulary.html | 2 +- _templates/you-need-to-know.html | 14 ++--- en/developer-documentation.md | 18 +++---- 31 files changed, 222 insertions(+), 211 deletions(-) diff --git a/Makefile b/Makefile index a1db577f..ba551c76 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,8 @@ pre-build-tests-fast: check-for-non-ascii-urls check-for-wrong-filename-assignme post-build-tests-fast: check-for-build-errors ensure-each-svg-has-a-png check-for-liquid-errors \ check-for-missing-anchors check-for-broken-markdown-reference-links \ check-for-broken-kramdown-tables check-for-duplicate-header-ids \ - check-for-headers-containing-auto-link check-for-missing-subhead-links + check-for-headers-containing-auto-link check-for-missing-subhead-links \ + check-for-subheading-anchors ## All pre-build tests, including those which might take multiple minutes pre-build-tests: pre-build-tests-fast @@ -214,3 +215,11 @@ check-html-proofer: travis-background-keepalive: $S { while ps aux | grep -q '[m]ake' ; do echo "Ignore me: Travis CI keep alive" ; sleep 1m ; done ; } & + +check-for-subheading-anchors: +## Ensure all subheadings on the site have anchors so the Javascript +## function addAnchorLinks() can add anchor link affordance to each +## subhead + $S grep -r -L 'Note: this file exempt from check-for-subheading-anchors check' _site/ \ + | xargs grep ']* id=' | eval $(ERROR_ON_OUTPUT) diff --git a/_alerts/2012-03-16-critical-vulnerability.html b/_alerts/2012-03-16-critical-vulnerability.html index b832b529..9c98afb8 100644 --- a/_alerts/2012-03-16-critical-vulnerability.html +++ b/_alerts/2012-03-16-critical-vulnerability.html @@ -30,7 +30,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.1 for Windows and 0.5.3 for Linux

-

Español: Vulnerabilidad de seguridad (potencialmente crítica)

+

Español: Vulnerabilidad de seguridad (potencialmente crítica)

Una vulnerabilidad de seguridad posible no son afectadas en la versión Windows de Bitcoin-Qt. Si está utilizando Bitcoin-Qt 0.5 a través de las versiones 0.6 en Windows, debe cerrar y actualizar a la versión 0.5.3.1 o 0.6rc4 AHORA.

@@ -49,7 +49,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.1 para Windows y 0.5.3 para Linux

-

Deutsch: DRINGEND: Windows Bitcoin-Qt update

+

Deutsch: DRINGEND: Windows Bitcoin-Qt update

Es wurde eine potenzielle Schwachstelle in der Windowsversion Qt-Bitcoin entdeckt. Wenn Sie mit Bitcoin-Qt-Versionen 0.5 bis 0.6 unter Windows arbeiten, sollten Sie das Programm beenden und ein Upgrade auf entweder Version 0.5.3.1 oder 0.6rc4 JETZT durchführen.

@@ -70,7 +70,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.1 für Windows und 0.5.3 für Linux

-

Nederlands: Mogelijk kritisch veiligheidsprobleem

+

Nederlands: Mogelijk kritisch veiligheidsprobleem

Er is een een mogelijk veiligheidsprobleem gevonden in de Windows versie van Bitcoin-Qt. Als u Bitcoin-Qt versie 0.5 tot 0.6 draait, sluit het dan af @@ -97,7 +97,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.1 voor Windows en 0.5.3 for Linux

-

Русский: Найдена потенциальная критическая уязвимость в версиях Bitcoin-Qt от 0.5 до 0.6 для Windows

+

Русский: Найдена потенциальная критическая уязвимость в версиях Bitcoin-Qt от 0.5 до 0.6 для Windows

Найдена потенциальная критическая уязвимость в версиях Bitcoin-Qt от 0.5 до 0.6 для Windows. Если вы используете одну из этих версий, отключите её и обновитесь до 0.5.3.1 или 0.6rc4 немедленно.

@@ -117,7 +117,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.1

-

Italiano: Potenziale vulnerabilità di sicurezza critica.

+

Italiano: Potenziale vulnerabilità di sicurezza critica.

Una potenziale vulnerabilità di sicurezza è stata scoperta nella versione di Windows di Bitcoin-Qt. Se stai usando Bitcoin-Qt su Windows dalle versioni 0.5 alla 0.6 dovresti chiuderla e aggiornarla alle versioni 0.5.3.1 o 0.6rc4 ORA.

@@ -134,7 +134,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.2 per Windows e 0.5.3 per Linux

-

Português: Vulnerabilidade de segurança potencialmente crítica

+

Português: Vulnerabilidade de segurança potencialmente crítica

Uma vulnerabilidade de segurança em potencial foi descoberto na versão do Bitcoin-Qt para Windows. Se você estiver executando alguma versão entre a 0.5 até a 0.6 do Bitcoin-Qt no Windows, você deve desligá-lo e atualizá-lo para a versão 0.5.3.1 ou 0.6rc4 AGORA!

@@ -155,7 +155,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> Traduzido por Thiago Martins (ThiagoCMC)

-

Polski: Potencjalnie Krytyczne Zagrozenie Bezpieczenstwa

+

Polski: Potencjalnie Krytyczne Zagrozenie Bezpieczenstwa

Potencjalne zagrozenie zostalo odkryte w Bitcoin-QT wersji Windows. Jesli masz uruchomiony Bitcoin-Qt w wersjach 0.5 przez 0.6 w wersji Windows powinienes je zamknac i pobrac najnowsze wersje 0.5.3.1 lub 0.6rc4 TERAZ.

@@ -174,7 +174,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.1 dla WIndows i 0.5.3 dla Linuxa

-

Български език: Уязвимост в сигурността.

+

Български език: Уязвимост в сигурността.

Уязвимост в сигурността бе открита при Windows версията на Bitcoin-Qt.Ако използвате Bitcoin-Qt версия 0.5 до 0.6 през Windows,ще се наложи да я спрете и да направите ъпгрейд до 0.5.3.1 или 0.rc4.Command-line даемон-а(bitcoind),няма да бъде афектиран за потребители на Mac или Linux.Поради вида на тази уязвимост,ние вярваме,че би могло да бъде доста трудно за атакуващия да направи нещо повече от това да crash-не процесът - Bitcoin-Qt.Поради това ние го считаме за критичен проблем.

@@ -190,7 +190,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.1 за Windows и 0.5.3 за Linux.

-

Ελληνικά: Σοβαρό πρόβλημα ασφάλειας

+

Ελληνικά: Σοβαρό πρόβλημα ασφάλειας

Ένα πιθανά σοβαρό πρόβλημα ασφάλειας εντοπίστηκε στην έκδοση Windows του Bitcoin-Qt. Εαν χρησιμοποιείτε Bitcoin-Qt εκδόσεις 0.5 έως 0.6 στα Windows, αναβαθμήστε άμεσα σε έκδοση 0.5.3.1 ή 0.6rc4.

@@ -208,7 +208,7 @@ href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/"> 0.5.3.1 για Windows και 0.5.3 για Linux

-

Svenska: Potentiellt kritiskt säkerhetshål

+

Svenska: Potentiellt kritiskt säkerhetshål

Ett potentiellt kritiskt säkerhetshål har upptäckts i Windowsversionen av Bitcoin-QT. Om du kör Bitcoin-QT i någon av versionerna 0.5 t.o.m. 0.6 för Windows så bör du stänga av programmet och uppgradera till version 0.5.3.1 eller 0.6rc4 OMGÅENDE.

diff --git a/_alerts/2012-05-14-dos.html b/_alerts/2012-05-14-dos.html index 31d12028..1a4715af 100644 --- a/_alerts/2012-05-14-dos.html +++ b/_alerts/2012-05-14-dos.html @@ -4,14 +4,14 @@ alias: "dos" active: false banner: "" --- -

Risks

+

Risks

A denial-of-service vulnerability that affects all versions of bitcoind and Bitcoin-Qt has been reported and fixed. An attacker could isolate a victim's node and cause the creation of blockchain forks.

-

Solutions

+

Solutions

Because this bug could be exploited to severely disrupt the Bitcoin network we consider this a critical vulnerability, and encourage @@ -21,7 +21,7 @@ everybody to upgrade to Backports for older releases (0.5.5 and 0.4.6) are also available if you cannot upgrade to version 0.6.2.

-

Technical Details

+

Technical Details

Full technical details are being withheld to give people the opportunity to upgrade. @@ -29,8 +29,8 @@ opportunity to upgrade.

Thanks to Forrest Voight for discovering and reporting the vulnerability.

-

Questions & Answers

-

+

Questions & Answers

+

How would I know if I am the victim of this attack?

@@ -47,13 +47,13 @@ detects that the rest of the network seems to have a different block count, which can happen for several reasons unrelated to this vulnerability).

-

+

Could this bug be used to steal my wallet?

No.

-

+

Could this bug be used to install malware on my system?

diff --git a/_alerts/2013-03-11-chain-fork.html b/_alerts/2013-03-11-chain-fork.html index 518d2753..c3ec6439 100644 --- a/_alerts/2013-03-11-chain-fork.html +++ b/_alerts/2013-03-11-chain-fork.html @@ -4,7 +4,7 @@ alias: "chainfork" active: false banner: "" --- -

What happened

+

What happened

A bitcoin miner running version 0.8.0 created a large block (at height 225,430) that is incompatible with earlier versions of Bitcoin. @@ -14,22 +14,22 @@ The result was a block chain fork, with miners, merchants and users running the accepting, and building on, that block, and miners, merchants and users running older versions of bitcoin rejecting it and creating their own block chain.

-

What is being done

+

What is being done

Large mining pools running version 0.8.0 were asked to switch back to version 0.7, to create a single block chain compatible with all bitcoin software.

-

Questions & Answers

-

I'm not a miner or a merchant, what should I do?

+

Questions & Answers

+

I'm not a miner or a merchant, what should I do?

Nothing. Your bitcoin software will switch to the correct chain automatically, no matter which version you are running.

-

Are my bitcoins safe?

+

Are my bitcoins safe?

Yes.

-

What will be done

+

What will be done

The core developers have investigated what caused the old versions to reject the new blocks, and have released a 0.8.1 version that avoids creating blocks that are incompatible with diff --git a/_alerts/2013-03-15-upgrade-deadline.html b/_alerts/2013-03-15-upgrade-deadline.html index 48133851..585a8c5e 100644 --- a/_alerts/2013-03-15-upgrade-deadline.html +++ b/_alerts/2013-03-15-upgrade-deadline.html @@ -4,7 +4,7 @@ alias: "may15" active: false banner: "" --- -

What is happening

+

What is happening

If you are using an old version of Bitcoin-Qt (or bitcoind, the server bitcoin software), you must either upgrade to version 0.8.0 or later before May 15, 2013, @@ -44,7 +44,7 @@ set_lk_max_locks 537000 Look here if you need help finding the bitcoin data directory.

-

Miners/mining pool operators

+

Miners/mining pool operators

If you are creating new blocks (you are a solo miner or mining pool operator), then you should be aware that upgrading from 0.7 to 0.8 requires a lengthy @@ -58,7 +58,7 @@ reason, you should not set_lk_max_locks in a DB_CONFIG file until May 15th; if you increase locks before then you run the risk of creating or building on blocks incompatible with the rest of the network.

-

Why this is necessary

+

Why this is necessary

A bug caused a temporary block chain fork on 11 March, 2013. After investigating diff --git a/_alerts/2013-08-11-android.html b/_alerts/2013-08-11-android.html index 80af1cae..29d4b4a5 100644 --- a/_alerts/2013-08-11-android.html +++ b/_alerts/2013-08-11-android.html @@ -5,11 +5,11 @@ alias: "android" banner: "" --- -

What happened

+

What happened

We recently learned that a component of Android responsible for generating secure random numbers contains critical weaknesses, that render all Android wallets generated to date vulnerable to theft. Because the problem lies with Android itself, this problem will affect you if you have a wallet generated by any Android app. An incomplete list would be Bitcoin Wallet, blockchain.info wallet, BitcoinSpinner and Mycelium Wallet. Apps where you don't control the private keys at all are not affected. For example, exchange frontends like the Coinbase or Mt Gox apps are not impacted by this issue because the private keys are not generated on your Android phone.

-

What has been done

+

What has been done

Updates have been prepared for the following wallet apps:

-

What you should do

+

What you should do

In order to re-secure existing wallets, key rotation is necessary. This involves generating a new address with a repaired random number generator and then sending all the money in your wallet back to yourself. If you use an Android wallet then we strongly recommend you to upgrade to the latest version available in the Play Store as soon as one becomes available. Once your wallet is rotated, you will need to contact anyone who has stored addresses generated by your phone and give them a new one.

diff --git a/_alerts/2014-02-11-malleability.html b/_alerts/2014-02-11-malleability.html index d62a33bf..1b58f1ee 100644 --- a/_alerts/2014-02-11-malleability.html +++ b/_alerts/2014-02-11-malleability.html @@ -4,15 +4,15 @@ active: false banner: "" --- -

What happened

+

What happened

Many identical transactions with different transaction IDs are being relayed on the network from an unknown source. As a result, a certain number of services like Bitcoin exchanges and wallets have been found to handle these transactions improperly and are experiencing temporary issues with their internal accounting systems. Transaction malleability is a known issue and many services are mostly unaffected.

-

What is being done

+

What is being done

Bitcoin developers are collaborating with known affected exchanges to fix their internal systems and help resuming withdrawals as soon as possible. Some pool operators have been reported to work on blocking duplicate transactions to help mitigate the problem. Emergency fixes to the Bitcoin protocol are not required and future improvements are already being discussed.

-

What you should do

+

What you should do

No action is required to protect your bitcoins. Always remember to wait for one confirmation or more before spending your bitcoins. You should monitor your own exchange's website to be informed about their service status. Temporary confusion, delays and price volatility can be expected.

diff --git a/_alerts/2014-04-11-heartbleed.html b/_alerts/2014-04-11-heartbleed.html index 119dfbc8..b63d11a4 100644 --- a/_alerts/2014-04-11-heartbleed.html +++ b/_alerts/2014-04-11-heartbleed.html @@ -5,7 +5,7 @@ active: false banner: "" --- -

What happened

+

What happened

The version of OpenSSL used by Bitcoin Core software version 0.9.0 and earlier contains a bug that can reveal memory to a remote attacker. See @@ -13,7 +13,7 @@ contains a bug that can reveal memory to a remote attacker. See for details.

-

What you should do

+

What you should do

Immediately upgrade to Bitcoin Core version 0.9.1 which is linked against OpenSSL version 1.0.1g. @@ -26,13 +26,13 @@ system's OpenSSL. Linux users should also upgrade their system's version of OpenSSL.

-

Android

+

Android

Android version 4.1.1 is vulnerable to Heartbleed. Try if you can upgrade to at least Android 4.1.2. If you are using Bitcoin Wallet on an Android phone, you should upgrade the app to at least version 3.45.

-

How serious is the risk

+

How serious is the risk

If you are using the Windows version of the Bitcoin Core GUI without a wallet passphrase, it is possible that your wallet could be compromised by clicking diff --git a/_templates/about-us.html b/_templates/about-us.html index 374a27a2..abaf6bea 100644 --- a/_templates/about-us.html +++ b/_templates/about-us.html @@ -9,13 +9,13 @@ id: about-us

{% translate pagetitle %}

{% translate pagedesc %}

-

{% translate own %}

+

{% translate own %}

{% translate owntxt %}

-

{% translate control %}

+

{% translate control %}

{% translate controltxt %}

-

{% translate mission %}

+

{% translate mission %}

-

{% translate help %}

+

{% translate help %}

{% translate helptxt %}

-

{% translate maintenance %}

+

{% translate maintenance %}

Saïvann CarignanWebsite maintenance

@@ -37,14 +37,14 @@ id: about-us

David HardingDocumentation maintenance

-

{% translate documentation %}

+

{% translate documentation %}

David HardingCoordination and writing

Greg SandersWriting

-

{% translate translation %}

+

{% translate translation %}

Garland William Binns IIIMaintenance

@@ -59,7 +59,7 @@ id: about-us

Thomas PrydsDanish

-

{% translate github %}

+

{% translate github %}

{% for c in site.sitecontributors %} diff --git a/_templates/bitcoin-for-businesses.html b/_templates/bitcoin-for-businesses.html index 617619cb..256fd17e 100755 --- a/_templates/bitcoin-for-businesses.html +++ b/_templates/bitcoin-for-businesses.html @@ -8,25 +8,25 @@ id: bitcoin-for-businesses

{% translate pagetitle %}

{% translate summary %}

-

Icon{% translate lowfee %}

+

Icon{% translate lowfee %}

{% translate lowfeetext %}

-

Icon{% translate fraud %}

+

Icon{% translate fraud %}

{% translate fraudtext %}

-

Icon{% translate international %}

+

Icon{% translate international %}

{% translate internationaltext %}

-

Icon{% translate pci %}

+

Icon{% translate pci %}

{% translate pcitext %}

-

Icon{% translate visibility %}

+

Icon{% translate visibility %}

{% translate visibilitytext %}

-

Icon{% translate multisig %}

+

Icon{% translate multisig %}

{% translate multisigtext %}

-

Icon{% translate transparency %}

+

Icon{% translate transparency %}

{% translate transparencytext %}

icon{% translate getstarted layout %}
diff --git a/_templates/bitcoin-for-developers.html b/_templates/bitcoin-for-developers.html index 88d6b7d4..9f3ee683 100755 --- a/_templates/bitcoin-for-developers.html +++ b/_templates/bitcoin-for-developers.html @@ -8,22 +8,22 @@ id: bitcoin-for-developers

{% translate pagetitle %}

{% translate summary %}

-

Icon{% translate simple %}

+

Icon{% translate simple %}

{% translate simpletext %}

-

Icon{% translate api %}

+

Icon{% translate api %}

{% translate apitext %}

-

Icon{% translate own %}

+

Icon{% translate own %}

{% translate owntext %}

-

Icon{% translate invoice %}

+

Icon{% translate invoice %}

{% translate invoicetext %}

-

Icon{% translate security %}

+

Icon{% translate security %}

{% translate securitytext %}

-

Icon{% translate micro %}

+

Icon{% translate micro %}

{% translate microtext %}

Developer Documentation {% if page.lang != "en" %}(English){% endif %}
diff --git a/_templates/bitcoin-for-individuals.html b/_templates/bitcoin-for-individuals.html index c729187f..43973ec6 100755 --- a/_templates/bitcoin-for-individuals.html +++ b/_templates/bitcoin-for-individuals.html @@ -8,22 +8,22 @@ id: bitcoin-for-individuals

{% translate pagetitle %}

{% translate summary %}

-

Icon{% translate mobile %}

+

Icon{% translate mobile %}

{% translate mobiletext %}

-

Icon{% translate secure %}

+

Icon{% translate secure %}

{% translate securetext %}

-

Icon{% translate simple %}

+

Icon{% translate simple %}

{% translate simpletext %}

-

Icon{% translate international %}

+

Icon{% translate international %}

{% translate internationaltext %}

-

Icon{% translate lowfee %}

+

Icon{% translate lowfee %}

{% translate lowfeetext %}

-

Icon{% translate anonymous %}

+

Icon{% translate anonymous %}

{% translate anonymoustext %}

icon{% translate getstarted layout %}
diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html index e2464fd9..cc164a05 100755 --- a/_templates/choose-your-wallet.html +++ b/_templates/choose-your-wallet.html @@ -664,6 +664,8 @@ wallets: privacynetwork: "checkfailprivacynetworknosupporttor" --- + +

{% translate pagetitle %}

{% translate pagedesc %}

diff --git a/_templates/community.html b/_templates/community.html index a7463b31..ef9e16cf 100644 --- a/_templates/community.html +++ b/_templates/community.html @@ -11,7 +11,7 @@ id: community
-

Icon{% translate forums %}

+

Icon{% translate forums %}

{% if page.lang == 'bg' %}

BitcoinBG.eu

{% endif %} {% if page.lang == 'bg' %}

Hash.bg

{% endif %} {% if page.lang == 'es' %}

ForoBitco.in en Español

{% endif %} @@ -23,7 +23,7 @@ id: community

{% translate reddit %}

{% translate stackexchange %}

-

Icon{% translate social %}

+

Icon{% translate social %}

{% if page.lang == 'ru' %}

Страница на ВКонтакте

{% endif %}

{% translate linkgoogle %}

{% translate linktwitter %}

@@ -32,13 +32,13 @@ id: community
-

Icon{% translate irc %}

+

Icon{% translate irc %}

{% translate ircjoin %}

#bitcoin {% translate chanbitcoin %}

#bitcoin-dev {% translate chandev %}

@@ -57,23 +57,23 @@ id: community
-

{% translate nonprofit %}

+

{% translate nonprofit %}

-

GlobeInternational

+

GlobeInternational

The Bitcoin Foundation

-

Argentinan flagArgentina

+

Argentinan flagArgentina

Fundación Bitcoin Argentina

-

Australian falgAustralia

+

Australian falgAustralia

Bitcoin Australia

@@ -81,19 +81,19 @@ id: community
-

Austrian flagAustria

+

Austrian flagAustria

Bitcoin Austria

-

Belgian flagBelgium

+

Belgian flagBelgium

Belgian Bitcoin Association

-

Canadian flagCanada

+

Canadian flagCanada

Bitcoin Embassy
Bitcoin Alliance of Canada @@ -102,19 +102,19 @@ id: community

-

Danish flagDenmark

+

Danish flagDenmark

Dansk Bitcoinforening

-

French flagFrance

+

French flagFrance

Bitcoin France

-

German flagGermany

+

German flagGermany

Bundesverband Bitcoin e.V.

@@ -122,19 +122,19 @@ id: community
-

Indian flagIndia

+

Indian flagIndia

Bitcoin Alliance of India

-

Irish flagIreland

+

Irish flagIreland

Irish Bitcoin Foundation

-

Israeli flagIsrael

+

Israeli flagIsrael

איגוד הביטקוין הישראלי

@@ -142,19 +142,19 @@ id: community
-

Italian flagItaly

+

Italian flagItaly

Bitcoin Foundation Italia

-

Mexican flagMexico

+

Mexican flagMexico

Fundación Satoshi Nakamoto

-

Dutch flagNetherlands

+

Dutch flagNetherlands

Stichting Bitcoin Nederland

@@ -162,19 +162,19 @@ id: community
-

Polish flagPoland

+

Polish flagPoland

Polish Bitcoin Association

-

Romanian flagRomania

+

Romanian flagRomania

Fundatia Bitcoin Romania

-

Russian flagRussia

+

Russian flagRussia

Crypto Currencies Foundation Russia

@@ -182,19 +182,19 @@ id: community
-

Ukrainian flagUkraine

+

Ukrainian flagUkraine

Bitcoin Foundation Ukraine

-

Slovenian flagSlovenia

+

Slovenian flagSlovenia

Bitcoin Društvo Slovenije

-

Swedish flagSweden

+

Swedish flagSweden

Svenska Bitcoinföreningen

@@ -202,7 +202,7 @@ id: community
-

Swiss flagSwitzerland

+

Swiss flagSwitzerland

Bitcoin Association Switzerland

diff --git a/_templates/development.html b/_templates/development.html index 077128a4..0c08b4c0 100755 --- a/_templates/development.html +++ b/_templates/development.html @@ -9,10 +9,10 @@ id: development

{% translate pagetitle %}

{% translate summary %}

-

{% translate spec %}

+

{% translate spec %}

{% translate spectxt %}

-

{% translate coredev %}

+

{% translate coredev %}

{% translate inventor %}

@@ -24,16 +24,16 @@ id: development
-

{% translate disclosure %}

+

{% translate disclosure %}

bitcoin-security@lists.sourceforge.net

{% translate disclosuretxt %}

-

{% translate involve %}

+

{% translate involve %}

{% translate involvetxt1 %}

{% translate involvetxt2 %}

-

{% translate more %}

+

{% translate more %}

{% translate morechoose %}

@@ -60,7 +60,7 @@ id: development
-

{% translate devcommunities %}

+

{% translate devcommunities %}

{% translate devcommunitiesintro %}

    @@ -71,7 +71,7 @@ id: development
-

{% translate contributors %}

+

{% translate contributors %}

{% translate contributorsorder %}

{% for c in site.corecontributors %} diff --git a/_templates/download.html b/_templates/download.html index b6e702e7..f79b2fb3 100755 --- a/_templates/download.html +++ b/_templates/download.html @@ -21,7 +21,7 @@ lin64: "linux64.tar.gz"

{% translate pagetitle %}

-

{% translate latestversion %} {{ site.DOWNLOAD_VERSION }}rss

+

{% translate latestversion %} {{ site.DOWNLOAD_VERSION }}rss

icon{% translate download %}

{% translate downloados %}

@@ -81,7 +81,7 @@ lin64: "linux64.tar.gz" {% translate versionhistory %}

-

note{% translate patient %}

+

note{% translate patient %}

{% translate notesync %} {% translate full_node_guide %}

{% translate notelicense %}

diff --git a/_templates/events.html b/_templates/events.html index d18c1c14..92d0c9c0 100644 --- a/_templates/events.html +++ b/_templates/events.html @@ -38,7 +38,7 @@ L.marker([{{ p.geoloc }}]).bindPopup('{{ map.addLayer(markers); -

{% translate upcoming %}

+

{% translate upcoming %}

{% filter_for p in site.conferences sort_by:date %}
{{ p.date | date:"%Y-%m-%d" }}
{{ p.city | htmlescape }}, {{ p.country | htmlescape }}
diff --git a/_templates/faq.html b/_templates/faq.html index 947d97d3..de38c20d 100755 --- a/_templates/faq.html +++ b/_templates/faq.html @@ -8,7 +8,7 @@ id: faq

{% translate pagetitle %}

{% translate summary %}

-

{% translate table %}

+

{% translate table %}

    diff --git a/_templates/getting-started.html b/_templates/getting-started.html index 732fc194..d3841c41 100644 --- a/_templates/getting-started.html +++ b/_templates/getting-started.html @@ -14,22 +14,22 @@ id: getting-started
    -

    1. {% translate inform %}

    +

    1. {% translate inform %}

    {% translate informtxt %}

    -

    2. {% translate choose %}

    +

    2. {% translate choose %}

    {% translate choosetxt %}

    -

    3. {% translate get %}

    +

    3. {% translate get %}

    {% translate gettxt %}

    -

    4. {% translate spend %}

    +

    4. {% translate spend %}

    {% translate spendtxt %}

    @@ -41,22 +41,22 @@ id: getting-started
    -

    1. {% translate merchantinform %}

    +

    1. {% translate merchantinform %}

    {% translate merchantinformtxt %}

    -

    2. {% translate merchantservice %}

    +

    2. {% translate merchantservice %}

    {% translate merchantservicetxt %}

    -

    3. {% translate tax %}

    +

    3. {% translate tax %}

    {% translate taxtxt %}

    -

    4. {% translate visibility %}

    +

    4. {% translate visibility %}

    {% translate visibilitytxt %}

    diff --git a/_templates/how-it-works.html b/_templates/how-it-works.html index 711b821e..cb21ba3e 100755 --- a/_templates/how-it-works.html +++ b/_templates/how-it-works.html @@ -8,19 +8,19 @@ id: how-it-works

    {% translate pagetitle %}

    {% translate intro %}

    -

    {% translate basics %}

    +

    {% translate basics %}

    {% translate basicstxt1 %}


    Bitcoin

    -

    {% translate balances %}

    +

    {% translate balances %}

    {% translate balancestxt %}

    -

    {% translate transactions %}

    +

    {% translate transactions %}

    {% translate transactionstxt %}

    -

    {% translate processing %}

    +

    {% translate processing %}

    {% translate processingtxt %}

    -

    {% translate readmore %}

    +

    {% translate readmore %}

    {% translate readmoretxt %}

    diff --git a/_templates/innovation.html b/_templates/innovation.html index 56395d2a..da74a20f 100755 --- a/_templates/innovation.html +++ b/_templates/innovation.html @@ -12,73 +12,73 @@ id: innovation
    Banner -

    Icon{% translate control %}

    +

    Icon{% translate control %}

    {% translate controltext %}

    Banner -

    Icon{% translate global %}

    +

    Icon{% translate global %}

    {% translate globaltext %}

    Banner -

    Icon{% translate cost %}

    +

    Icon{% translate cost %}

    {% translate costtext %}

    Banner -

    Icon{% translate donation %}

    +

    Icon{% translate donation %}

    {% translate donationtext %}

    Banner -

    Icon{% translate crowdfunding %}

    +

    Icon{% translate crowdfunding %}

    {% translate crowdfundingtext %}

    Banner -

    Icon{% translate micro %}

    +

    Icon{% translate micro %}

    {% translate microtext %}

    Banner -

    Icon{% translate mediation %}

    +

    Icon{% translate mediation %}

    {% translate mediationtext %}

    Banner -

    Icon{% translate multisig %}

    +

    Icon{% translate multisig %}

    {% translate multisigtext %}

    Banner -

    Icon{% translate trust %}

    +

    Icon{% translate trust %}

    {% translate trusttext %}

    Banner -

    Icon{% translate resiliency %}

    +

    Icon{% translate resiliency %}

    {% translate resiliencytext %}

    Banner -

    Icon{% translate transparency %}

    +

    Icon{% translate transparency %}

    {% translate transparencytext %}

    Banner -

    Icon{% translate automation %}

    +

    Icon{% translate automation %}

    {% translate automationtext %}

    diff --git a/_templates/legal.html b/_templates/legal.html index a20929a8..881f95d5 100755 --- a/_templates/legal.html +++ b/_templates/legal.html @@ -16,13 +16,13 @@ lastchange: "November 22th, 2014." {% else %} -

    1. {% translate information %}

    +

    1. {% translate information %}

    {% translate informationtxt1 %}

    -

    2. {% translate translations %}

    +

    2. {% translate translations %}

    {% translate translationstxt1 %}

    -

    3. {% translate userisks %}

    +

    3. {% translate userisks %}

    {% translate useriskstxt1 %}

    (1) {% translate useriskstxt2 %}

    (2) {% translate useriskstxt3 %}

    @@ -30,40 +30,40 @@ lastchange: "November 22th, 2014."

    (4) {% translate useriskstxt5 %}

    (5) {% translate useriskstxt6 %}

    -

    4. {% translate investmentrisks %}

    +

    4. {% translate investmentrisks %}

    {% translate investmentriskstxt1 %}

    -

    5. {% translate taxcompliance %}

    +

    5. {% translate taxcompliance %}

    {% translate taxcompliancetxt1 %}

    -

    6. {% translate noissuer %}

    +

    6. {% translate noissuer %}

    {% translate noissuertxt1 %}

    -

    7. {% translate nowarranties %}

    +

    7. {% translate nowarranties %}

    {% translate nowarrantiestxt1 %}

    -

    8. {% translate noliability %}

    +

    8. {% translate noliability %}

    {% translate noliabilitytxt1 %}

    -

    9. {% translate arbitration %}

    +

    9. {% translate arbitration %}

    {% translate arbitrationtxt1 %}

    -

    10. {% translate lastchange %}

    +

    10. {% translate lastchange %}

    {% translate lastchangetxt1 %} {{ page.lastchange }}

    {% endcase %} {% if page.lang != 'en' %} -

    English version

    +

    English version

    -

    1. {% translate information legal en %}

    +

    1. {% translate information legal en %}

    {% translate informationtxt1 legal en %}

    -

    2. {% translate translations legal en %}

    +

    2. {% translate translations legal en %}

    {% translate translationstxt1 legal en %}

    -

    3. {% translate userisks legal en %}

    +

    3. {% translate userisks legal en %}

    {% translate useriskstxt1 legal en %}

    (1) {% translate useriskstxt2 legal en %}

    (2) {% translate useriskstxt3 legal en %}

    @@ -71,25 +71,25 @@ lastchange: "November 22th, 2014."

    (4) {% translate useriskstxt5 legal en %}

    (5) {% translate useriskstxt6 legal en %}

    -

    4. {% translate investmentrisks legal en %}

    +

    4. {% translate investmentrisks legal en %}

    {% translate investmentriskstxt1 legal en %}

    -

    5. {% translate taxcompliance legal en %}

    +

    5. {% translate taxcompliance legal en %}

    {% translate taxcompliancetxt1 legal en %}

    -

    6. {% translate noissuer legal en %}

    +

    6. {% translate noissuer legal en %}

    {% translate noissuertxt1 legal en %}

    -

    7. {% translate nowarranties legal en %}

    +

    7. {% translate nowarranties legal en %}

    {% translate nowarrantiestxt1 legal en %}

    -

    8. {% translate noliability legal en %}

    +

    8. {% translate noliability legal en %}

    {% translate noliabilitytxt1 legal en %}

    -

    9. {% translate arbitration legal en %}

    +

    9. {% translate arbitration legal en %}

    {% translate arbitrationtxt1 legal en %}

    -

    10. {% translate lastchange legal en %}

    +

    10. {% translate lastchange legal en %}

    {% translate lastchangetxt1 legal en %} {{ page.lastchange }}

    {% endif %} diff --git a/_templates/press.html b/_templates/press.html index b074a183..aee51bbd 100644 --- a/_templates/press.html +++ b/_templates/press.html @@ -36,7 +36,7 @@ dialogs:

    {% translate pagetitle %}

    {% translate summary %}

    -

    {% translate volunteer %}

    +

    {% translate volunteer %}

    @@ -50,7 +50,7 @@ dialogs:
    -

    {% translate menu-faq layout %}

    +

    {% translate menu-faq layout %}

    @@ -213,7 +213,7 @@ dialogs:
    -

    {{ page.dialogs.materialvideo }}

    +

    {{ page.dialogs.materialvideo }}

    what is Bitcoin
    @@ -234,7 +234,7 @@ What is Bitcoin - Weusecoins
    -

    {% translate materialpicture %}

    +

    {% translate materialpicture %}

    Bitcoin Kiez sign Bitcoin logo @@ -262,7 +262,7 @@ What is Bitcoin - Weusecoins
    -

    {{ page.dialogs.materialquote }}

    +

    {{ page.dialogs.materialquote }}

    {{ page.dialogs.quotechrisdixon }}Chris Dixon, Technology Investor

    {{ page.dialogs.quotewencescasares }}Wences Casares, Technology Entrepreneur

    diff --git a/_templates/privacy.html b/_templates/privacy.html index 7778f1cd..750069fb 100755 --- a/_templates/privacy.html +++ b/_templates/privacy.html @@ -4,8 +4,8 @@ id: privacy ---

    {% translate pagetitle %}

    -

    {% translate datacollect %}

    +

    {% translate datacollect %}

    {% translate datacollecttxt %}

    -

    {% translate datause %}

    +

    {% translate datause %}

    {% translate datausetxt %}

    diff --git a/_templates/protect-your-privacy.html b/_templates/protect-your-privacy.html index 43a8c2ba..87d38449 100755 --- a/_templates/protect-your-privacy.html +++ b/_templates/protect-your-privacy.html @@ -8,23 +8,23 @@ id: protect-your-privacy

    {% translate pagetitle %}

    {% translate pagedesc %}

    -

    {% translate traceable %}

    +

    {% translate traceable %}

    {% translate traceabletxt %}

    -

    {% translate receive %}

    +

    {% translate receive %}

    {% translate receivetxt %}

    -

    {% translate send %}

    +

    {% translate send %}

    {% translate sendtxt %}

    -

    {% translate public %}

    +

    {% translate public %}

    {% translate publictxt %}

    -

    {% translate iplog %}

    +

    {% translate iplog %}

    {% translate iplogtxt %}

    -

    {% translate mixing %}

    +

    {% translate mixing %}

    {% translate mixingtxt %}

    -

    {% translate future %}

    +

    {% translate future %}

    {% translate futuretxt %}

    diff --git a/_templates/resources.html b/_templates/resources.html index 08644e12..58d5e5cc 100644 --- a/_templates/resources.html +++ b/_templates/resources.html @@ -11,13 +11,13 @@ id: resources
    -

    Icon{% translate useful %}

    +

    Icon{% translate useful %}

    Bitcoin Foundation

    {% translate linkwiki %}

    WeUseCoins.com

    BitcoinMining.com

    -

    Icon{% translate directories %}

    +

    Icon{% translate directories %}

    {% translate linkwallets %} - bitcoin.org

    {% translate linkmerchants %} - coinmap.org

    {% translate linkmerchants %} - airbitz.co

    @@ -29,7 +29,7 @@ id: resources
    -

    Icon{% translate news %}

    +

    Icon{% translate news %}

    {% if page.lang == 'fr' %}

    Le Coin Coin

    {% endif %} {% if page.lang == 'fr' %}

    Bitcoin.fr

    {% endif %} {% if page.lang == 'bg' %}

    Hash.bg

    {% endif %} @@ -40,7 +40,7 @@ id: resources

    Bitcoin Magazine

    {% if page.lang == 'ru' %}

    Биткойн Форум / Новости

    {% else %}

    BitcoinTalk press links

    {% endif %}
    -

    Icon{% translate charts %}

    +

    Icon{% translate charts %}

    Blockchain.info

    Biteasy.com

    Trade Block

    @@ -50,10 +50,10 @@ id: resources
    -

    Icon{% translate documentaries %}

    +

    Icon{% translate documentaries %}

    BitcoinFilm.org

    -

    Icon{% translate learn %}

    +

    Icon{% translate learn %}

    Let's Talk Bitcoin

    Bitcoin Knowledge Podcast

    Khan Academy

    diff --git a/_templates/secure-your-wallet.html b/_templates/secure-your-wallet.html index 7c422ee8..454aa98a 100755 --- a/_templates/secure-your-wallet.html +++ b/_templates/secure-your-wallet.html @@ -8,49 +8,49 @@ id: secure-your-wallet

    {% translate pagetitle %}

    {% translate summary %}

    -

    warning{% translate online %}

    +

    warning{% translate online %}

    {% translate onlinetxt %}

    -

    {% translate everyday %}

    +

    {% translate everyday %}

    {% translate everydaytxt %}

    -

    {% translate backup %}

    +

    {% translate backup %}

    {% translate backuptxt %}

    -

    {% translate backupwhole %}

    +

    {% translate backupwhole %}

    {% translate backupwholetxt %}

    -

    {% translate backuponline %}

    +

    {% translate backuponline %}

    {% translate backuponlinetxt %}

    -

    {% translate backupmany %}

    +

    {% translate backupmany %}

    {% translate backupmanytxt %}

    -

    {% translate backupregular %}

    +

    {% translate backupregular %}

    {% translate backupregulartxt %}

    -

    {% translate encrypt %}

    +

    {% translate encrypt %}

    {% translate encrypttxt %}

    -

    {% translate encryptforget %}

    +

    {% translate encryptforget %}

    {% translate encryptforgettxt %}

    -

    {% translate encryptstrong %}

    +

    {% translate encryptstrong %}

    {% translate encryptstrongtxt %}

    -

    {% translate offline %}

    +

    {% translate offline %}

    {% translate offlinetxt %}

    -

    {% translate offlinetx %}

    +

    {% translate offlinetx %}

    {% translate offlinetxtxt1 %}

    1. {% translate offlinetxtxt2 %}
      2. @@ -62,15 +62,15 @@ id: secure-your-wallet
      -

      {% translate hardwarewallet %}

      +

      {% translate hardwarewallet %}

      {% translate hardwarewallettxt %}

      -

      {% translate update %}

      +

      {% translate update %}

      {% translate updatetxt %}

      -

      {% translate offlinemulti %}

      +

      {% translate offlinemulti %}

      {% translate offlinemultitxt %}

      -

      {% translate offlinetestament %}

      +

      {% translate offlinetestament %}

      {% translate offlinetestamenttxt %}

      diff --git a/_templates/support-bitcoin.html b/_templates/support-bitcoin.html index 93a1ee53..f94293f7 100755 --- a/_templates/support-bitcoin.html +++ b/_templates/support-bitcoin.html @@ -8,33 +8,33 @@ id: support-bitcoin

      {% translate pagetitle %}

      {% translate summary %}

      -

      Icon{% translate use %}

      +

      Icon{% translate use %}

      {% translate usetxt %}

      -

      Icon{% translate node %}

      +

      Icon{% translate node %}

      {% translate nodetxt %}

      -

      Icon{% translate mining %}

      +

      Icon{% translate mining %}

      {% translate miningtxt %}

      -

      Icon{% translate translate %}

      +

      Icon{% translate translate %}

      {% translate translatetxt %}

      Bitcoin Core - Bitcoin.org - Bitcoin Wiki - Bitcoin Wallet (Android) - MultiBit - Electrum - Hive

      -

      Icon{% translate develop %}

      +

      Icon{% translate develop %}

      {% translate developtxt %}

      -

      Icon{% translate donation %}

      +

      Icon{% translate donation %}

      {% translate donationtxt %}

      -

      Icon{% translate nonprofit %}

      +

      Icon{% translate nonprofit %}

      {% translate nonprofittxt %}

      -

      Icon{% translate spread %}

      +

      Icon{% translate spread %}

      {% translate spreadtxt %}

      -

      Icon{% translate wiki %}

      +

      Icon{% translate wiki %}

      {% translate wikitxt %} -

      Icon{% translate help %}

      +

      Icon{% translate help %}

      {% translate helptxt %}

      diff --git a/_templates/vocabulary.html b/_templates/vocabulary.html index 6b6d2d01..b221969f 100755 --- a/_templates/vocabulary.html +++ b/_templates/vocabulary.html @@ -25,7 +25,7 @@ voc: ---

      {% translate pagetitle %}

      {% translate summary %}

      -

      {% translate table %}

      +

      {% translate table %}

      {% alphab_for v in page.voc %} diff --git a/_templates/you-need-to-know.html b/_templates/you-need-to-know.html index d135df58..d2bf63fe 100755 --- a/_templates/you-need-to-know.html +++ b/_templates/you-need-to-know.html @@ -8,23 +8,23 @@ id: you-need-to-know

      {% translate pagetitle %}

      {% translate summary %}

      -

      Icon{% translate secure %}

      +

      Icon{% translate secure %}

      {% translate securetxt %}

      -

      Icon{% translate volatile %}

      +

      Icon{% translate volatile %}

      {% translate volatiletxt %}

      -

      Icon{% translate irreversible %}

      +

      Icon{% translate irreversible %}

      {% translate irreversibletxt %}

      -

      Icon{% translate anonymous %}

      +

      Icon{% translate anonymous %}

      {% translate anonymoustxt %}

      -

      Icon{% translate instant %}

      +

      Icon{% translate instant %}

      {% translate instanttxt %}

      -

      Icon{% translate experimental %}

      +

      Icon{% translate experimental %}

      {% translate experimentaltxt %}

      -

      Icon{% translate tax %}

      +

      Icon{% translate tax %}

      {% translate taxtxt %}

      diff --git a/en/developer-documentation.md b/en/developer-documentation.md index 7ea5c3cf..30f4a383 100644 --- a/en/developer-documentation.md +++ b/en/developer-documentation.md @@ -20,11 +20,11 @@ title: "Developer Documentation - Bitcoin"
      -

      IconBlock Chain

      +

      IconBlock Chain

      Block Chain Guide

      Block Chain Reference

      -

      IconTransactions

      +

      IconTransactions

      Transactions Guide

      Transactions Reference

      Transaction Examples

      @@ -32,14 +32,14 @@ title: "Developer Documentation - Bitcoin"
      -

      IconContracts

      +

      IconContracts

      Contracts Guide

      More Contracts - Wiki

      Micropayment Channel Example - bitcoinj

      -

      IconWallets

      +

      IconWallets

      Wallets Guide

      Wallets Reference

      @@ -50,20 +50,20 @@ title: "Developer Documentation - Bitcoin"
      -

      IconPayment Processing

      +

      IconPayment Processing

      Payment Processing Guide

      Payment Processing Examples

      Payment Protocol - BIP70

      -

      IconOperating Modes

      +

      IconOperating Modes

      Operating Modes Guide

      -

      IconP2P Network

      +

      IconP2P Network

      P2P Network Guide

      P2P Network Reference

      P2P Network Examples

      @@ -71,7 +71,7 @@ title: "Developer Documentation - Bitcoin"

      Full Protocol Specification - Wiki

      -

      IconMining

      +

      IconMining

      Mining Guide

      getworktemplate Fundamentals - BIP22

      @@ -82,7 +82,7 @@ title: "Developer Documentation - Bitcoin"
      -

      IconAdditional resources

      +

      IconAdditional resources

      Bitcoin: A Peer-to-Peer Electronic Cash System - Satoshi Nakamoto

      Bitcoin Improvement Proposals - GitHub

      Bitcoin Developer Reference (working paper) - Krzysztof Okupski