Merge pulls #974 & 984

- 974: Update Text on "You Need to Know"
- 984: Update text on Bitcoin For X pages
This commit is contained in:
David A. Harding 2015-08-02 15:28:20 -04:00
commit d6d42e8b6c
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
75 changed files with 1254 additions and 968 deletions

View file

@ -502,23 +502,6 @@ wallets:
privacyaddressreuse: "checkpassprivacyaddressrotation"
privacydisclosure: "checkfailprivacydisclosureaccount"
privacynetwork: "checkfailprivacynetworknosupporttor"
desktop:
text: "wallethive"
link: "http://mac.hivewallet.com/"
source: "https://github.com/hivewallet/hive-osx"
screenshot: "hivemac.png"
os:
- mac
check:
control: "checkgoodcontrolfull"
validation: "checkpassvalidationspvp2p"
transparency: "checkpasstransparencyopensource"
environment: "checkfailenvironmentdesktop"
privacy: "checkfailprivacyweak"
privacycheck:
privacyaddressreuse: "checkfailprivacyaddressrotation"
privacydisclosure: "checkfailprivacydisclosurespv"
privacynetwork: "checkpassprivacynetworksupporttorproxy"
web:
text: "wallethive-web"
link: "https://hivewallet.com/"
@ -924,7 +907,7 @@ wallets:
<p class="summary">{% translate pagedesc %}</p>
<div class="walletmenu" id="walletmenu" onclick="walletMenuListener(event);" ontouchstart="walletMenuListener(event);">
<ul onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
<ul>
<li class="wallet-mobile">
<a id="mobile" data-walletcompat="mobile">{% translate walletcatmobile %}</a>
<ul>
@ -955,7 +938,7 @@ wallets:
<h2>{{ wallet[1].title }}</h2>
<div>{% for os in platform.os %}<img src="/img/os/{{ os }}.png" alt="{% translate platform{{os}} %}" title="{% translate platform{{os}} %}" />{% endfor %}</div>
<div>{% if platform.link == 'bitcoincore' %}<a href="/{{ page.lang }}/{% translate download url %}">{% translate walletdownload %}</a>{% elsif platform.link contains 'play.google.com' or platform.link contains 'itunes.apple.com' or platform.link contains 'chrome.google.com' %}<a href="{{ platform.link }}">{% translate walletdownload %}</a>{% else %}<a href="{{ platform.link }}">{% translate walletvisit %}</a>{% endif %}{% if platform.source %}<a href="{{ platform.source }}">{% translate walletsourcecode %}</a>{% endif %}</div>
<div>
<div ontouchstart="walletScoreListener(event);" onclick="walletScoreListener(event);">
{% for check in platform.check %}{% if check[0] == 'privacy' and platform.privacycheck %}
<div class="check{{ check[0] }} {% if check[1] contains "checkgood" %}checkgood{% elsif check[1] contains "checkpass" %}checkpass{% elsif check[1] contains "checkneutral" %}checkneutral{% else %}checkfail{% endif %}">{% translate {{check[1]}} %}<div><div>
{% for privacycheck in platform.privacycheck %}
@ -972,7 +955,7 @@ wallets:
<p>{% translate {{platform.text}} %}</p>
<div><img src="/img/screenshots/{{ platform.screenshot }}" alt="screenshot"></div>
</div>
<a href="#" onclick="return false;"><img src="/img/wallet/{{ wallet[0] }}.png" alt="{{ wallet[1].title }}" />{{ wallet[1].titleshort }}<span></span></a>
<a><img src="/img/wallet/{{ wallet[0] }}.png" alt="{{ wallet[1].title }}" />{{ wallet[1].titleshort }}<span></span></a>
</div>
{% endfor %}{% endfor %}
</div>
@ -985,7 +968,7 @@ wallets:
<h2>{{ wallet[1].title }}</h2>
<div>{% for os in platform[1].os %}<img src="/img/os/{{ os }}.png" alt="{% translate platform{{os}} %}" title="{% translate platform{{os}} %}" />{% endfor %}</div>
<div>{% if platform[1].link == 'bitcoincore' %}<a href="/{{ page.lang }}/{% translate download url %}">{% translate walletdownload %}</a>{% elsif platform[1].link contains 'play.google.com' or platform[1].link contains 'itunes.apple.com' or platform[1].link contains 'chrome.google.com' %}<a href="{{ platform[1].link }}">{% translate walletdownload %}</a>{% else %}<a href="{{ platform[1].link }}">{% translate walletvisit %}</a>{% endif %}{% if platform[1].source %}<a href="{{ platform[1].source }}">{% translate walletsourcecode %}</a>{% endif %}</div>
<div>
<div ontouchstart="walletScoreListener(event);" onclick="walletScoreListener(event);">
{% for check in platform[1].check %}{% if check[0] == 'privacy' and platform[1].privacycheck %}
<div class="check{{ check[0] }} {% if check[1] contains "checkgood" %}checkgood{% elsif check[1] contains "checkpass" %}checkpass{% elsif check[1] contains "checkneutral" %}checkneutral{% else %}checkfail{% endif %}">{% translate {{check[1]}} %}<div><div>
{% for privacycheck in platform[1].privacycheck %}
@ -1002,7 +985,7 @@ wallets:
<p>{% translate {{platform[1].text}} %}</p>
<div><img src="/img/screenshots/{{ platform[1].screenshot }}" alt="screenshot"></div>
</div>
<a href="#" onclick="return false;"><img src="/img/wallet/{{ wallet[0] }}.png" alt="{{ wallet[1].title }}" />{{ wallet[1].titleshort }}<span></span></a>
<a><img src="/img/wallet/{{ wallet[0] }}.png" alt="{{ wallet[1].title }}" />{{ wallet[1].titleshort }}<span></span></a>
</div>
{% endfor %}{% endfor %}{% endfor %}
</div>

View file

@ -56,7 +56,7 @@ id: development
<li><a href="https://github.com/jgarzik/picocoin">picocoin</a> - A tiny library with lightweight client and utilities, written in C.</li>
<li><a href="https://github.com/petertodd/python-bitcoinlib">python-bitcoinlib</a> - A library for structures and protocols, written in Python.</li>
<li><a href="https://gitlab.com/bitcoin/python-blkmaker">Python Blkmaker</a> - A client library for the getblocktemplate mining protocol, written in Python.</li>
<li class="more"><a href="#" onclick="librariesShow(event)">{% translate moremore %}</a></li>
<li class="more"><a onclick="librariesShow(event)" ontouchstart="librariesShow(event);" class="link-js">{% translate moremore %}</a></li>
</ul>
<section id="devcommunities">

View file

@ -55,26 +55,26 @@ dialogs:
<div class="press-faq">
<div>
<a href="#" onclick="faqShow(event);">{% translate whatisbitcoin faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate whatisbitcoin faq %}</a>
<div>
<p>{% translate whatisbitcointxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate howitworks faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate howitworks faq %}</a>
<div>
<p>{% translate howitworkstxt1 faq %}</p>
<p>{% translate howitworkstxt2 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate whatismining faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate whatismining faq %}</a>
<div>
<p>{% translate whatisminingtxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate acquire faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate acquire faq %}</a>
<div>
<ul>
<li>{% translate acquireli1 faq %}</li>
@ -86,7 +86,7 @@ dialogs:
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate used faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate used faq %}</a>
<div>
<p>{% translate usedtxt1 faq %}</p>
<p>
@ -95,14 +95,14 @@ dialogs:
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate makepayment faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate makepayment faq %}</a>
<div>
<p>{% translate makepaymenttxt1 faq %}</p>
<p><img src="/img/faq/mobile_send.png" style="height:325px;width:190px;" alt="Screenshot"><img src="/img/faq/mobile_receive.png" style="height:325px;width:190px;" alt="Screenshot"></p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate advantages faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate advantages faq %}</a>
<div>
<ul>
<li>{% translate advantagesli1 faq %}</li>
@ -114,7 +114,7 @@ dialogs:
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate disadvantages faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate disadvantages faq %}</a>
<div>
<ul>
<li>{% translate disadvantagesli1 faq %}</li>
@ -124,13 +124,13 @@ dialogs:
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate secure faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate secure faq %}</a>
<div>
<p>{% translate securetxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate islegal faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate islegal faq %}</a>
<div>
<p>{% translate islegaltxt1 faq %}</p>
<p>{% translate islegaltxt2 faq %}</p>
@ -141,13 +141,13 @@ dialogs:
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate taxes faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate taxes faq %}</a>
<div>
<p>{% translate taxestxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate illegalactivities faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate illegalactivities faq %}</a>
<div>
<p>{% translate illegalactivitiestxt1 faq %}</p>
<p>{% translate illegalactivitiestxt2 faq %}</p>
@ -155,51 +155,51 @@ dialogs:
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate bubble faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate bubble faq %}</a>
<div>
<p>{% translate bubbletxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate whyvalue faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate whyvalue faq %}</a>
<div>
<p>{% translate whyvaluetxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate ponzi faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate ponzi faq %}</a>
<div>
<p>{% translate ponzitxt1 faq %}</p>
<p>{% translate ponzitxt2 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate creator faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate creator faq %}</a>
<div>
<p>{% translate creatortxt1 faq %}</p>
<p>{% translate creatortxt2 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate worthless faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate worthless faq %}</a>
<div>
<p>{% translate worthlesstxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate virtual faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate virtual faq %}</a>
<div>
<p>{% translate virtualtxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate trust faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate trust faq %}</a>
<div>
<p>{% translate trusttxt1 faq %}</p>
</div>
</div>
<div>
<a href="#" onclick="faqShow(event);">{% translate anonymous faq %}</a>
<a onclick="faqShow(event);" ontouchstart="faqShow(event);" class="link-js">{% translate anonymous faq %}</a>
<div>
<p>{% translate anonymoustxt1 faq %}</p>
<p>{% translate anonymoustxt2 faq %}</p>
@ -252,7 +252,7 @@ What is Bitcoin - Weusecoins<br>
<p><span>{{ page.dialogs.quotenavalravikant }}</span><span>Naval Ravikant, Founder of Angellist</span></p>
<p><span>{{ page.dialogs.quotemaxkeiser }}</span><span>Max Keiser, Journalist &amp; TV Host</span></p>
</div>
<a href="#" onclick="materialShow(event);">{{ page.dialogs.materialquotemore }}</a>
<a href="#" onclick="materialShow(event);" ontouchstart="materialShow(event);">{{ page.dialogs.materialquotemore }}</a>
</div>

View file

@ -14,9 +14,6 @@ id: protect-your-privacy
<h2 id="receive">{% translate receive %}</h2>
<p>{% translate receivetxt %}</p>
<h2 id="send">{% translate send %}</h2>
<p>{% translate sendtxt %}</p>
<h2 id="public">{% translate public %}</h2>
<p>{% translate publictxt %}</p>

View file

@ -50,7 +50,7 @@ id: secure-your-wallet
<p>{% translate offlinetxt %}</p>
<div class="box boxexpand">
<h3 id="offlinetx"><a href="#" onclick="boxShow(event);">{% translate offlinetx %}</a></h3>
<h3 id="offlinetx"><a onclick="boxShow(event);" ontouchstart="boxShow(event);" class="link-js">{% translate offlinetx %}</a></h3>
<p>{% translate offlinetxtxt1 %}</p>
<ol>
<li>{% translate offlinetxtxt2 %}</li>
@ -62,7 +62,7 @@ id: secure-your-wallet
<br>
<div class="box boxexpand">
<h3 id="hardwarewallet"><a href="#" onclick="boxShow(event);">{% translate hardwarewallet %}</a></h3>
<h3 id="hardwarewallet"><a onclick="boxShow(event);" ontouchstart="boxShow(event);" class="link-js">{% translate hardwarewallet %}</a></h3>
<p>{% translate hardwarewallettxt %}</p>
</div>