From 36556f1234dfcd81bc8133c077d7295d5302b549 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Fri, 24 Jul 2015 16:20:04 -0400 Subject: [PATCH] You Need To Know: Update Text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rewrite "Unconfirmed transactions" section - Rewrite "Experimental" section Changes suggested by Saïvann (thanks!) --- _less/screen.less | 6 ++++ _templates/you-need-to-know.html | 47 ++++++++++++++++++++++++++++++++ _translations/en.yml | 13 +++++++-- 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/_less/screen.less b/_less/screen.less index 0148bd11..47920b43 100644 --- a/_less/screen.less +++ b/_less/screen.less @@ -175,6 +175,12 @@ table td,table th{ padding:10px; } +.center { + text-align: center; + margin-right: auto; + margin-left: auto; +} + .head{ margin:30px 0 30px 0; } diff --git a/_templates/you-need-to-know.html b/_templates/you-need-to-know.html index d2bf63fe..d3fd540e 100755 --- a/_templates/you-need-to-know.html +++ b/_templates/you-need-to-know.html @@ -23,6 +23,53 @@ id: you-need-to-know

Icon{% translate instant %}

{% translate instanttxt %}

+{% 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' %} +{% else %} +{% comment %} + +{% endcomment %} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% translate confirmations %}{% translate lightweight_wallets %}{% translate bitcoin_core %}
0{% translate unconfirmed_only_safe %}
1{% translate somewhat_reliable %}{% translate mostly_reliable %}
3{% translate mostly_reliable %}{% translate highly_reliable %}
6{% translate high_value_minimum %}
30{% translate alert_recommendation %}
+
+{% endcase %} +

Icon{% translate experimental %}

{% translate experimentaltxt %}

diff --git a/_translations/en.yml b/_translations/en.yml index d42e2e13..1033e626 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -676,9 +676,18 @@ en: anonymous: "Bitcoin is not anonymous" anonymoustxt: "Some effort is required to protect your privacy with Bitcoin. All Bitcoin transactions are stored publicly and permanently on the network, which means anyone can see the balance and transactions of any Bitcoin address. However, the identity of the user behind an address remains unknown until information is revealed during a purchase or in other circumstances. This is one reason why Bitcoin addresses should only be used once. Always remember that it is your responsibility to adopt good practices in order to protect your privacy. Read more about protecting your privacy." instant: "Unconfirmed transactions aren't secure" - instanttxt: "A Bitcoin transaction is usually deployed within a few seconds and begins to be confirmed in the following 10 minutes. During that time, a transaction can be considered authentic but still reversible. Dishonest users could try to cheat, which means there is a risk when accepting unconfirmated transactions. For large amounts like 1000 US$, it makes sense to wait for 6 confirmations or more. Each confirmation exponentially decreases the risk of a reversed transaction." + instanttxt: "Transactions don't start out as irreversible. Instead, they get a confirmation score that indicates how hard it is to reverse them (see table). Each confirmation takes between a few seconds and 90 minutes, with 10 minutes being the average. If the transaction pays too low a fee or is otherwise atypical, getting the first confirmation can take much longer." + confirmations: "Confirm­ations" + lightweight_wallets: "Lightweight wallets" + bitcoin_core: "Bitcoin Core" + unconfirmed_only_safe: "Only safe if you trust the person paying you" + somewhat_reliable: "Somewhat reliable" + mostly_reliable: "Mostly reliable" + highly_reliable: "Highly reliable" + high_value_minimum: "Minimum recommendation for high-value bitcoin transfers" + alert_recommendation: "Recommendation during emergencies to allow human intervention" experimental: "Bitcoin is still experimental" - experimentaltxt: "Bitcoin is an experimental new currency that is in active development. Although it becomes less experimental as usage grows, you should keep in mind that Bitcoin is a new invention that is exploring ideas that have never been attempted before. As such, its future cannot be predicted by anyone." + experimentaltxt: "Bitcoin is an experimental new currency that is in active development. Each improvement makes Bitcoin more appealing but also reveals new challenges as Bitcoin adoption grows. During these growing pains you might encounter increased fees, slower confirmations, or even more severe issues. Be prepared for problems and consult a technical expert before making any major investments, but keep in mind that nobody can predict Bitcoin's future." tax: "Government taxes and regulations" taxtxt: "Bitcoin is not an official currency. That said, most jurisdictions still require you to pay income, sales, payroll, and capital gains taxes on anything that has value, including bitcoins. It is your responsibility to ensure that you adhere to tax and other legal or regulatory mandates issued by your government and/or local municipalities." layout: