Merge pull request #1609 from harding/chain-size-in-translation-string

Translations: variablize chain size in translation strings
This commit is contained in:
Will Binns 2017-06-17 19:21:51 -06:00 committed by GitHub
commit 5472d7ebea
4 changed files with 21 additions and 11 deletions

View file

@ -216,21 +216,28 @@ kramdown:
coderay_css: style coderay_css: style
text: text:
## Values last updated 2015-12-29 ## Values last updated 2017-05-21
## All variable names must indicate unit type for easy translation of adjacent text, ## All variable names must indicate unit type for easy translation of adjacent text,
## such as: subsidy_in_decimal_bitcoins or ## such as: subsidy_in_decimal_bitcoins or
## bitcoin_org_docs_maintainer_email_link ## bitcoin_org_docs_maintainer_email_link
subsidy_in_decimal_bitcoins: 25 ## For increasing variables, like chain size, choose a somewhat higher
chain_gb: 100 ## value so we don't need to update too often
bitcoin_datadir_gb: 125 subsidy_in_decimal_bitcoins: 12.5
## cd ~ ; du -sh .bitcoin/ --exclude=testnet3 --exclude=regtest
bitcoin_datadir_gb: 145
## Slightly smaller than the total datadir size
chain_gb: 140
## The main difference between the datadir size and the chain size, if
## you don't have any extra indices
bitcoin_datadir_gb_pruned: 5 bitcoin_datadir_gb_pruned: 5
total_tx_count_in_millions: 100 ## the tx= field in: grep UpdateTip .bitcoin/debug.log | tail -n1
total_tx_count_in_millions: 230
typical_ibd_time_in_hours: 4 typical_ibd_time_in_hours: 4
typical_144_block_catchup_time_in_minutes: 5 typical_144_block_catchup_time_in_minutes: 5
bitcoin_org_docs_maintainer_email_link: '<a href="mailto:dave@dtrt.org">Dave Harding</a>' bitcoin_org_docs_maintainer_email_link: '<a href="mailto:dave@dtrt.org">Dave Harding</a>'
## Before updating this, verify all assertions are still correct: git grep site.text.assertion_month ## Before updating this, verify all assertions are still correct: git grep site.text.assertion_month
## Use ISO-8601 format, but feel free to round to the nearest month ## Use ISO-8601 format, but feel free to round to the nearest month
assertion_month: 2016-12-01 assertion_month: 2017-06-01
## Items in devsearches will appear in the search box in the order they ## Items in devsearches will appear in the search box in the order they

View file

@ -80,6 +80,9 @@ module Jekyll
text = ar[id] text = ar[id]
end end
end end
#interpret Liquid templating in string
text = Liquid::Template.parse(text).render context
#replace urls and anchors in string #replace urls and anchors in string
url = site['loc'][lang]['url'] url = site['loc'][lang]['url']
url.each do |key,value| url.each do |key,value|

View file

@ -221,9 +221,9 @@
checkfailcontrolthirdparty: "Money controlled by a third party" checkfailcontrolthirdparty: "Money controlled by a third party"
checkfailcontrolthirdpartytxt: "This service has full control over your bitcoins. This means you need to trust this service will not lose your funds in an incident on their side. As of today, most web wallets don't insure their deposits like a bank, and many such services have suffered from security breaches in the past." checkfailcontrolthirdpartytxt: "This service has full control over your bitcoins. This means you need to trust this service will not lose your funds in an incident on their side. As of today, most web wallets don't insure their deposits like a bank, and many such services have suffered from security breaches in the past."
checkgoodvalidationfullnode: "Full validation" checkgoodvalidationfullnode: "Full validation"
checkgoodvalidationfullnodetxt: "This wallet is a full node that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over 100GB), bandwidth, and a longer initial synchronization time." checkgoodvalidationfullnodetxt: "This wallet is a full node that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over {{site.text.bitcoin_datadir_gb}}GB), bandwidth, and a longer initial synchronization time."
checkgoodvalidationfullnoderequired: "Full validation" checkgoodvalidationfullnoderequired: "Full validation"
checkgoodvalidationfullnoderequiredtxt: "This wallet requires you to install full node software that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over 100GB), bandwidth, and a longer initial synchronization time." checkgoodvalidationfullnoderequiredtxt: "This wallet requires you to install full node software that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over {{site.text.bitcoin_datadir_gb}}GB), bandwidth, and a longer initial synchronization time."
checkneutralvalidationvariable: "Variable validation" checkneutralvalidationvariable: "Variable validation"
checkneutralvalidationvariabletxt: "Payment validation features are provided by the software wallet you use with this device. Please see the Validation score for the software wallet you plan to use." checkneutralvalidationvariabletxt: "Payment validation features are provided by the software wallet you use with this device. Please see the Validation score for the software wallet you plan to use."
checkpassvalidationspvp2p: "Simplified validation" checkpassvalidationspvp2p: "Simplified validation"
@ -324,7 +324,7 @@
source: "Source code" source: "Source code"
versionhistory: "Show version history" versionhistory: "Show version history"
notelicense: "Bitcoin Core is a community-driven <a href=\"https://www.fsf.org/about/what-is-free-software\">free software</a> project, released under the <a href=\"http://opensource.org/licenses/mit-license.php\">MIT license</a>." notelicense: "Bitcoin Core is a community-driven <a href=\"https://www.fsf.org/about/what-is-free-software\">free software</a> project, released under the <a href=\"http://opensource.org/licenses/mit-license.php\">MIT license</a>."
notesync: "Bitcoin Core initial synchronization will take time and download a lot of data. You should make sure that you have enough bandwidth and storage for the full block chain size (over 100GB). If you have a good Internet connection, you can help strengthen the network by keeping your PC running with Bitcoin Core and port 8333 open." notesync: "Bitcoin Core initial synchronization will take time and download a lot of data. You should make sure that you have enough bandwidth and storage for the full block chain size (over {{site.text.bitcoin_datadir_gb}}GB). If you have a good Internet connection, you can help strengthen the network by keeping your PC running with Bitcoin Core and port 8333 open."
full_node_guide: "Read the <a href=\"/en/full-node\">full node guide</a> for details." full_node_guide: "Read the <a href=\"/en/full-node\">full node guide</a> for details."
patient: "Check your bandwidth and space" patient: "Check your bandwidth and space"
releasekeys: "Bitcoin Core Release Signing Keys" releasekeys: "Bitcoin Core Release Signing Keys"

View file

@ -1291,8 +1291,8 @@ chatrooms](/en/bitcoin-core/help#live).
### Reduce Storage ### Reduce Storage
It is possible to configure your node to to run in pruned mode in order to It is possible to configure your node to to run in pruned mode in order to
reduce storage requirements. This can reduce the disk usage from over 100GB to reduce storage requirements. This can reduce the disk usage from over {{site.text.bitcoin_datadir_gb}}GB to
around 2GB. around {{site.text.bitcoin_datadir_gb_pruned}}GB.
Running a node in pruned mode is incompatible with `-txindex` and `-rescan`. It Running a node in pruned mode is incompatible with `-txindex` and `-rescan`. It
also disables the RPC `importwallet`. Two RPCs that are available and also disables the RPC `importwallet`. Two RPCs that are available and