From 9b47198e0f6d963bd07714c23ab109e30106ab4b Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Wed, 9 Sep 2015 14:31:49 -0400 Subject: [PATCH] Bitcoin Core: Remove Basic Translation --- .../bitcoin-core/download-bitcoin-core.html | 2 +- _includes/layout/base-core/head-logo.html | 2 +- _includes/layout/base-core/head-menu.html | 32 ++--- _includes/layout/base/head-menu.html | 9 +- _includes/references.md | 46 +++---- _templates/bitcoin-core-overview.html | 115 ------------------ _translations/en.yml | 73 ----------- en/bitcoin-core/index.md | 115 ++++++++++++++++++ 8 files changed, 160 insertions(+), 234 deletions(-) delete mode 100644 _templates/bitcoin-core-overview.html create mode 100644 en/bitcoin-core/index.md diff --git a/_includes/bitcoin-core/download-bitcoin-core.html b/_includes/bitcoin-core/download-bitcoin-core.html index 9cabbef7e2..b0587a6079 100644 --- a/_includes/bitcoin-core/download-bitcoin-core.html +++ b/_includes/bitcoin-core/download-bitcoin-core.html @@ -4,7 +4,7 @@ {% endcomment %}
-

{% translate download-bitcoin-core bitcoin-core-overview %} +

Download Bitcoin Core Windows Mac Linux diff --git a/_includes/layout/base-core/head-logo.html b/_includes/layout/base-core/head-logo.html index d79e5cf132..8210ceaf29 100644 --- a/_includes/layout/base-core/head-logo.html +++ b/_includes/layout/base-core/head-logo.html @@ -3,4 +3,4 @@ http://opensource.org/licenses/MIT. {% endcomment %} - + diff --git a/_includes/layout/base-core/head-menu.html b/_includes/layout/base-core/head-menu.html index 1a9e578c05..1b07ab2e30 100644 --- a/_includes/layout/base-core/head-menu.html +++ b/_includes/layout/base-core/head-menu.html @@ -4,26 +4,26 @@ {% endcomment %}

diff --git a/_includes/layout/base/head-menu.html b/_includes/layout/base/head-menu.html index b537c2145b..c19aa11405 100644 --- a/_includes/layout/base/head-menu.html +++ b/_includes/layout/base/head-menu.html @@ -21,12 +21,11 @@ {% if page.lang == 'en' %}Documentation{% endif %} {% translate menu-vocabulary layout %} {% translate menu-events layout %} - {% case page.lang %} - {% when 'id' or 'da' or 'de' or 'es' or 'fr' or 'it' or 'hu' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'sl' or 'sv' or 'tr' or 'el' or 'bg' or 'ru' or 'uk' or 'ar' or 'fa' or 'hi' or 'ko' or 'ja' or 'zh_CN' or 'zh_TW' %} - {% translate bitcoin-core layout %} + {% if page.lang == 'en' %} +
  • {% translate bitcoin-core layout %}
    • {% else %} -
  • {% translate bitcoin-core layout %}
    • - {% endcase %} + {% translate bitcoin-core layout %} + {% endif %} {% translate menu-innovation layout %} diff --git a/_includes/references.md b/_includes/references.md index 37bf124e69..fe6a2e60f2 100644 --- a/_includes/references.md +++ b/_includes/references.md @@ -181,30 +181,30 @@ http://opensource.org/licenses/MIT. {% comment %}{% endcomment %} [bandwidth sharing guide]: /en/full-node -[bcc contribute]: /{{page.lang}}/{% translate bitcoin-core-contribute url %} +[bcc contribute]: /en/bitcoin-core/contribute/ [bcc contribute code]: /{{page.lang}}/{% translate development url %} -[bcc contribute documentation]: /{{page.lang}}/{% translate bitcoin-core-contribute-documentation url %} -[bcc contribute issues]: /{{page.lang}}/{% translate bitcoin-core-contribute-issues url %} -[bcc contribute support]: /{{page.lang}}/{% translate bitcoin-core-contribute-tech-support url %} -[bcc contribute translations]: /{{page.lang}}/{% translate bitcoin-core-contribute-translations url %} -[bcc decentralized peer discovery]: /{{page.lang}}/{% translate bitcoin-core-privacy url %}#decentralized-peer-discovery -[bcc documentation]: /{{page.lang}}/{% translate bitcoin-core-help url %}#documentation -[bcc download]: /{{page.lang}}/{% translate download url %} -[bcc features]: /{{page.lang}}/{% translate bitcoin-core-features url %} -[bcc forums]: /{{page.lang}}/{% translate bitcoin-core-help url %}#forums -[bcc help]: /{{page.lang}}/{% translate bitcoin-core-help url %} -[bcc live help]: /{{page.lang}}/{% translate bitcoin-core-help url %}#live -[bcc main]: /{{page.lang}}/{% translate bitcoin-core-overview url %} -[bcc network support]: /{{page.lang}}/{% translate bitcoin-core-network-support url %} -[bcc privacy]: /{{page.lang}}/{% translate bitcoin-core-privacy url %} -[bcc privacy data leaking]: /{{page.lang}}/{% translate bitcoin-core-privacy url %}#perfect-privacy-for-received-transactions -[bcc requirements]: /{{page.lang}}/{% translate bitcoin-core-requirements url %} -[bcc user interface]: /{{page.lang}}/{% translate bitcoin-core-user-interface url %} -[bcc user interface lightweight]: /{{page.lang}}/{% translate bitcoin-core-user-interface url %}#lightweight -[bcc validation]: /{{page.lang}}/{% translate bitcoin-core-validation url %} -[bcc validation decentralization]: /{{page.lang}}/{% translate bitcoin-core-validation url %}#help-protect-decentralization -[bcc validation do you validate]: /{{page.lang}}/{% translate bitcoin-core-validation url %}#do-you-validate -[bcc validation protection]: /{{page.lang}}/{% translate bitcoin-core-validation url %}#how-validation-protects-your-bitcoins +[bcc contribute documentation]: /en/bitcoin-core/contribute/documentation +[bcc contribute issues]: /en/bitcoin-core/contribute/issues +[bcc contribute support]: /en/bitcoin-core/contribute/support +[bcc contribute translations]: /en/bitcoin-core/contribute/translations +[bcc decentralized peer discovery]: /en/bitcoin-core/features/privacy#decentralized-peer-discovery +[bcc documentation]: /en/bitcoin-core/help#documentation +[bcc download]: /en/download +[bcc features]: /en/bitcoin-core/features/ +[bcc forums]: /en/bitcoin-core/help#forums +[bcc help]: /en/bitcoin-core/help +[bcc live help]: /en/bitcoin-core/help#live +[bcc main]: /en/bitcoin-core/ +[bcc network support]: /en/bitcoin-core/features/network-support +[bcc privacy]: /en/bitcoin-core/features/privacy +[bcc privacy data leaking]: /en/bitcoin-core/features/privacy#perfect-privacy-for-received-transactions +[bcc requirements]: /en/bitcoin-core/features/requirements +[bcc user interface]: /en/bitcoin-core/features/user-interface +[bcc user interface lightweight]: /en/bitcoin-core/features/user-interface#lightweight +[bcc validation]: /en/bitcoin-core/features/validation +[bcc validation decentralization]: /en/bitcoin-core/features/validation#help-protect-decentralization +[bcc validation do you validate]: /en/bitcoin-core/features/validation#do-you-validate +[bcc validation protection]: /en/bitcoin-core/features/validation#how-validation-protects-your-bitcoins [bcc version history]: /en/version-history [Bitcoin Core 0.6.0]: /en/release/v0.6.0 diff --git a/_templates/bitcoin-core-overview.html b/_templates/bitcoin-core-overview.html deleted file mode 100644 index 7fd9aa1b16..0000000000 --- a/_templates/bitcoin-core-overview.html +++ /dev/null @@ -1,115 +0,0 @@ ---- -# This file is licensed under the MIT License (MIT) available on -# http://opensource.org/licenses/MIT. - -layout: base-core -id: bitcoin-core-overview -columns: 1 -breadcrumbs: - - bitcoin - - Bitcoin Core ---- - - -

    {% translate bitcoin-core %}

    - -{% capture slogan %}{% translate bitcoin-core-slogan %}{% endcapture %} -

    {{slogan | strip_html }}

    - -
    -{% include bitcoin-core/download-bitcoin-core.html %} -
    - -
    -
    -

    {% translate about1 %}

    -
    - -
    -

    {% translate about2 %}

    - -

    {% translate about3 %}

    - -

    {% translate about4 %}

    - - {% comment %} - - {% endcomment %} - {% if page.lang == "en" %} -

    In addition to improving Bitcoin's decentralization, Bitcoin Core users get - better security - for their bitcoins, - privacy features - not available in other wallets, a choice of - user interfaces, - and several other powerful features.

    - {% else %} -

    {% translate about5 %}

    - {% endif %} -
    - -

    -
    - -
    - -{% comment %} - -{% endcomment %} -{% if page.lang == "en" %} -
    -
      -
    • - Download
      Download Bitcoin Core {{ site.DOWNLOAD_VERSION }} - -
    • - Features
      Discover what Bitcoin Core offers - -
    • - Get help
      Documentation, forums, chat rooms - -
    • - Contribute
      Code, translations, and more -
    -
    -{% else %} -

    - {% translate download-bitcoin-core %}

    -{% endif %} - -
    - -

    {% translate news %}

    - -{% comment %}{% endcomment %} -{% capture text_releases %} - {% filter_for p in site.pages reversed sort_by:versionint category:release %} - {% if p.optional_date %}{{ p.optional_date | date:"%Y-%m-%d" }} - {% endif %}{{ p.title }}:: - {% endfilter_for %} -{% endcapture %} -{% assign array_releases = text_releases | strip_newlines | split: '::' %} - -{% comment %}{% endcomment %} -
      -{% for release in array_releases %} - {% if forloop.index <= 3 %} -
    • {{ release }}
      • - {% endif %} -{% endfor %} -
    - -

    {% translate more-news-and-rss %}

    - -
    - - diff --git a/_translations/en.yml b/_translations/en.yml index 911b74b742..2fd0e024b0 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -28,50 +28,6 @@ en: owners: "Domain Owners" partial_list: "Partial List" github: "Contributors on GitHub" - bitcoin-core-overview: - title: "Bitcoin Core" - bitcoin-core: "Bitcoin Core" - bitcoin-core-slogan: "Helping you keep Bitcoin decentralized" - download-bitcoin-core: "Download Bitcoin Core" - about1: > - Bitcoin Core is programmed to decide which block chain contains - valid transactions. The users of Bitcoin Core only accept - transactions for that block chain, making it the Bitcoin block - chain that everyone else wants to use. - - about2: > - It is these users who keep Bitcoin decentralized. They - individually run their own Bitcoin Core full nodes, and each of - those full nodes separately follows the exact same rules to decide - which block chain is valid. - - about3: > - There's no voting or other corruptible process involved: there's - just individual software following identical rules—"math"—to - evaluate identical blocks and coming to identical conclusions - about which block chain is valid. - - about4: > - This shared agreement (called consensus) allows people like you to - only accept valid bitcoins, enforcing Bitcoin's rules against - even the most powerful miners. - - about5: > - In addition to improving Bitcoin's decentralization, Bitcoin Core - users get better security for their bitcoins, privacy features not - available in other wallets, a choice of user interfaces, and - several other powerful features. - - read-more: "Read more" - news: "News" - - more-news-and-rss: > - For more news, see the complete list of Bitcoin Core releases. For - notifications of new releases, subscribe to the RSS feed. - - bitcoin-for-businesses: title: "Bitcoin for Businesses - Bitcoin" pagetitle: "Bitcoin for Businesses" @@ -876,37 +832,8 @@ en: sponsor: "A community website sponsored by" getstarted: "Get started with Bitcoin" bitcoin-core: "Bitcoin Core" - menu-bcc-features: "Features" - menu-bcc-features-overview: "Overview" - menu-bcc-help: "Get Help" - menu-bcc-contribute: "Contribute" - menu-bcc-news: "News" - menu-bcc-download: "Download" - menu-bcc-validation: "Validation" - menu-bcc-privacy: "Privacy" - menu-bcc-requirements: "Requirements" - menu-bcc-user-interface: "User Interface" - menu-bcc-network-support: "Network Support" - menu-bcc-contribute-issues: "Bug reports" - menu-bcc-contribute-code: "Code" - menu-bcc-contribute-documentation: "Documentation" - menu-bcc-contribute-translations: "Translations" - menu-bcc-contribute-tech-support: "Tech Support" url: about-us: about-us - bitcoin-core-contribute: bitcoin-core/contribute/ - bitcoin-core-contribute-documentation: bitcoin-core/contribute/documentation - bitcoin-core-contribute-issues: bitcoin-core/contribute/issues - bitcoin-core-contribute-translations: bitcoin-core/contribute/translations - bitcoin-core-contribute-tech-support: bitcoin-core/contribute/support - bitcoin-core-features: bitcoin-core/features/ - bitcoin-core-help: bitcoin-core/help - bitcoin-core-network-support: bitcoin-core/features/network-support - bitcoin-core-overview: bitcoin-core/ - bitcoin-core-privacy: bitcoin-core/features/privacy - bitcoin-core-requirements: bitcoin-core/features/requirements - bitcoin-core-user-interface: bitcoin-core/features/user-interface - bitcoin-core-validation: bitcoin-core/features/validation bitcoin-for-developers: bitcoin-for-developers bitcoin-for-individuals: bitcoin-for-individuals bitcoin-for-businesses: bitcoin-for-businesses diff --git a/en/bitcoin-core/index.md b/en/bitcoin-core/index.md new file mode 100644 index 0000000000..82c41671d6 --- /dev/null +++ b/en/bitcoin-core/index.md @@ -0,0 +1,115 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base-core +id: bitcoin-core-overview +columns: 1 +lang: en +title: Bitcoin Core +breadcrumbs: + - bitcoin + - Bitcoin Core +--- + + +# Bitcoin Core +{:.not-displayed} + +![Bitcoin Core: Helping You Keep Bitcoin Decentralized](/img/bitcoin-core/en-big-logo.svg) + +
    +{% include bitcoin-core/download-bitcoin-core.html %} +
    + +
    +
    + Bitcoin Core is programmed to decide which block chain contains + valid transactions. The users of Bitcoin Core only accept + transactions for that block chain, making it the Bitcoin block + chain that everyone else wants to use +
    + +
    + It is these users who keep Bitcoin decentralized. They + individually run their own Bitcoin Core full nodes, and each of + those full nodes separately follows the exact same rules to decide + which block chain is valid. + + There's no voting or other corruptible process involved: there's + just individual software following identical rules—"math"—to + evaluate identical blocks and coming to identical conclusions + about which block chain is valid. + + This shared agreement (called consensus) allows people like you to + only accept valid bitcoins, enforcing Bitcoin's rules against + even the most powerful miners. + + In addition to improving Bitcoin's decentralization, Bitcoin Core users get + [better security][bcc validation] + for their bitcoins, + [privacy features][bcc privacy] + not available in other wallets, a choice of + [user interfaces][bcc user interface] + and several other powerful features. +
    + +

    + +
    + +
    + +
    +{:.fa-ul} +- + [Download][bcc download]
    Download Bitcoin Core {{ site.DOWNLOAD_VERSION }} + +- + [Features][bcc features]
    Discover what Bitcoin Core offers + +- + [Get help][bcc help]
    Documentation, forums, chat rooms + +- + [Contribute][bcc contribute]
    Code, translations, and more +
    + +
    + +### News + +{% comment %}{% endcomment %} +{% capture text_releases %} + {% filter_for p in site.pages reversed sort_by:versionint category:release %} + {% if p.optional_date %}{{ p.optional_date | date:"%Y-%m-%d" }} - {% endif %}{{ p.title }}:: + {% endfilter_for %} +{% endcapture %} +{% assign array_releases = text_releases | strip_newlines | split: '::' %} + +{% comment %}{% endcomment %} +{% for release in array_releases %} + {% if forloop.index <= 3 %} + - {{ release }} + {% endif %} +{% endfor %} + +For more news, see the complete list of [Bitcoin Core releases][bcc +version history]. For notifications of new releases, subscribe to the +RSS feed. + +
    + + + +{% include references.md %}