Skip to content

Commit

Permalink
Merge pulls #967, #989, #991, and #994
Browse files Browse the repository at this point in the history
- 967: Bitcoin Paper: Add Swedish Translation
- 989: Update text on FAQ & Innovation pages
- 991: Update quotes on Press page
- 994: [Full-Node] Added Win7 Daemon doc.
  • Loading branch information
harding committed Aug 5, 2015
5 parents 91fdb87 + 05e87af + 7b8e26f + 5705f0a + 619bb02 commit 13ec935
Show file tree
Hide file tree
Showing 7 changed files with 194 additions and 34 deletions.
6 changes: 5 additions & 1 deletion _less/screen.less
Expand Up @@ -2138,8 +2138,9 @@ h2 .rssicon{
.press-quotes p{
display:inline-block;
vertical-align:top;
width:400px;
width:380px;
margin:0 0 20px 20px;
padding-left: 20px;
}
.press-quotes p:nth-child(1n+9){
display:none;
Expand Down Expand Up @@ -2174,6 +2175,9 @@ h2 .rssicon{
font-size:180%;
content:"";
}
.press-quotes p.final {
width: 100%;
}

/*Styles specific to printing*/

Expand Down
2 changes: 2 additions & 0 deletions _templates/bitcoin-paper.html
Expand Up @@ -36,6 +36,8 @@ <h1>{% translate pagetitle %}</h1>
<a href="https://github.com/terzim">Terzim</a></li>

<li><a href="/files/bitcoin-paper/bitcoin_ru.pdf">Русский</a> {% translate translated_by %} <a href="https://github.com/arvicco">Ar Vicco</a></li>

<li><a href="/files/bitcoin-paper/bitcoin_se.pdf">Svenska</a> {% translate translated_by %} <a href="https://github.com/hanspandeya">hanspandeya</a></li>
</ul>

<p>{% translate submit_new_translation %}</p>
48 changes: 28 additions & 20 deletions _templates/press.html
Expand Up @@ -12,23 +12,29 @@
materialvideomore: "More videos"
materialquote: "Quotes"
materialquotemore: "Show more quotes..."
material_even_more_quotes: "For even more quotes about Bitcoin, please see <a href=\"https://en.wikiquote.org/wiki/Bitcoin\">WikiQuote.</a>"
material_source: "source"
quotesatoshi: "With e-currency based on cryptographic proof, without the need to trust a third party middleman, money can be secure and transactions effortless."
quotetonygallippi: "Bitcoin is Money Over Internet Protocol."
quotedankaminsky: "Entire classes of bugs are missing."
quotechrisdixon: "There are 3 eras of currency: Commodity based, politically based, and now, math based."
quotejeremyliew: "The potential for disruption is enormous."
quotewencescasares: "Right now Bitcoin feels like the Internet before the browser."
quotetylerwinklevoss: "We have elected to put our money and faith in a mathematical framework that is free of politics and human error."
quotemaxkeiser: "It's the cheapest way to move money around."
quotebillgates: "Bitcoin is a technological tour de force."
quotepaulbuchheit: "Bitcoin may be the TCP/IP of money."
quotegavinandresen: "You can basically put a bank in your pocket... That's pretty amazing."
quotenavalravikant: "All the things that gold does, Bitcoin kind of does better."
quotetimothylee: "Bitcoin allows wealth to be reduced to pure information and transmitted costlessly around the world—something nobody knew how to do before 2009. Its applications won’t be immediately obvious, especially to ordinary users."
quotebrianforde: >
Digital currencies have immense potential to improve human welfare
by strengthening the capacity of governments to deliver more
responsive services and secure the rights of their citizens to
property, identity and increased financial inclusion.

quoteandyskelton: "PayPal alone blocks access from over 60 countries ... Whatever the reason, we don’t think an individual blogger from Haiti, Ethiopia, or Kenya should have diminished access to the blogosphere because of payment issues they can’t control."
quotetuurdemeester: "The Babyboomers gave us the personal computer, Generation X gave us the Internet, and now Generation Y is building a new financial paradigm."
quoterichardbrown: "Had you asked me five years ago, I would just say it was impossible. Bitcoin and cryptocurrencies solved this problem of coming to a consensus globally where you don't trust anybody else."
quotefredwilson: "We believe that Bitcoin represents something fundamental and powerful ... It reminds us of SMTP, HTTP, RSS, and BitTorrent in its architecture and openness."
quotejohndonohoe: "Digital currency is going to be a very powerful thing."
quotejohndonohoe: "[Digital currency is going to be] a very powerful thing."
quotefrancoisrvelde: "It represents a remarkable conceptual and technical achievement, which may well be used by existing financial institutions (which could issue their own bitcoins) or even by governments themselves."

---
Expand Down Expand Up @@ -233,25 +239,27 @@ <h2 id="videos">{{ page.dialogs.materialvideo }}</h2>

<h2 id="quotes">{{ page.dialogs.materialquote }}</h2>
<div>
<p><span>{{ page.dialogs.quotechrisdixon }}</span><span>Chris Dixon, Technology Investor</span></p>
<p><span>{{ page.dialogs.quotewencescasares }}</span><span>Wences Casares, Technology Entrepreneur</span></p>
<p><span>{{ page.dialogs.quotetonygallippi }}</span><span>Tony Gallippi, BitPay CEO</span></p>
<p><span>{{ page.dialogs.quotedankaminsky }}</span><span>Dan Kaminsky, Security Researcher</span></p>
<p><span>{{ page.dialogs.quotejeremyliew }}</span><span>Jeremy Liew, Lightspeed Venture Partners</span></p>
<p><span>{{ page.dialogs.quotejohndonohoe }}</span>John Donohoe, Ebay CEO<span></span></p>
<p><span>{{ page.dialogs.quotetylerwinklevoss }}</span><span>Tyler Winklevoss, Entrepreneur</span></p>
<p><span>{{ page.dialogs.quotesatoshi }}</span><span>Satoshi Nakamoto, Bitcoin Developer</span></p>
<p><span>{{ page.dialogs.quotebillgates }}</span><span>Bill Gates, Executive Chairman, Microsoft<br>Eric Schmidt, Executive Chairman, Google</span></p>
<p><span>{{ page.dialogs.quotegavinandresen }}</span><span>Gavin Andresen, Chief Scientist, The Bitcoin Foundation</span></p>
<p><span>{{ page.dialogs.quotetimothylee }}</span><span>Timothy B. Lee, Reporter, The Washington Post</span></p>
<p><span>{{ page.dialogs.quoteandyskelton }}</span><span>Andy Skelton, Developer, WordPress</span></p>
<p><span>{{ page.dialogs.quotechrisdixon }}</span><span><a href="https://en.wikipedia.org/wiki/Chris_Dixon">Chris Dixon</a>, Technology Investor</span></p>
<p><span>{{ page.dialogs.quotewencescasares }}</span><span><a href="https://en.wikipedia.org/wiki/Wences_Casares">Wences Casares</a>, Technology Entrepreneur (<a href="http://techcrunch.com/2013/04/11/bitcoin/">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotetonygallippi }}</span><span><a href="https://en.wikipedia.org/wiki/Tony_Gallippi">Tony Gallippi</a>, BitPay CEO</span></p>
<p><span>{{ page.dialogs.quotedankaminsky }}</span><span><a href="https://en.wikipedia.org/wiki/Dan_Kaminsky">Dan Kaminsky</a>, Security Researcher (<a href="https://bitcointalk.org/index.php?topic=34458.0">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotejeremyliew }}</span><span><a href="https://en.wikipedia.org/wiki/Lightspeed_Ventures">Jeremy Liew</a>, Lightspeed Venture Partners (<a href="http://techcrunch.com/2013/04/11/bitcoin/">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotejohndonohoe }}</span><a href="https://en.wikipedia.org/wiki/John_Donahoe">John Donohoe</a>, former Ebay CEO (<a href="http://techcrunch.com/2013/11/03/ebay-ceo-john-donahoe-is-bullish-on-digital-currency-and-hes-keeping-tabs-on-bitcoin/">{{page.dialogs.material_source}}</a>)<span></span></p>
<p><span>{{ page.dialogs.quotetylerwinklevoss }}</span><span><a href="https://en.wikipedia.org/wiki/Tyler_Winklevoss">Tyler Winklevoss</a>, Entrepreneur (<a href="http://dealbook.nytimes.com/2013/04/11/as-big-investors-emerge-bitcoin-gets-ready-for-its-close-up/">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotesatoshi }}</span><span><a href="https://en.wikipedia.org/wiki/Satoshi_Nakamoto">Satoshi Nakamoto</a>, Bitcoin Developer (<a href="http://p2pfoundation.ning.com/forum/topics/bitcoin-open-{{page.dialogs.material_source}}">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotegavinandresen }}</span><span><a href="https://en.wikipedia.org/wiki/Gavin_Andresen">Gavin Andresen</a>, Chief Scientist, The Bitcoin Foundation (<a href="https://www.youtube.com/watch?v=0S4dSXTnfms">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotepaulbuchheit }}</span><span><a href="https://en.wikipedia.org/wiki/Paul_Buchheit">Paul Buchheit</a>, Creator of GMail, Google (<a href="https://twitter.com/paultoo/status/328969714283995136">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quoteandyskelton }}</span><span>Andy Skelton, Developer, WordPress (<a href="https://en.blog.wordpress.com/2012/11/15/pay-another-way-bitcoin/">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotetuurdemeester }}</span><span>Tuur Demeester, Author, MacroTrends</span></p>
<p><span>{{ page.dialogs.quoterichardbrown }}</span><span>Richard Brown, Executive architect, IBM</span></p>
<p><span>{{ page.dialogs.quotefredwilson }}</span><span>Fred Wilson, Co-Founder of Union Square Ventures</span></p>
<p><span>{{ page.dialogs.quotefrancoisrvelde }}</span><span>François R. Velde, Economist, Federal Reserve</span></p>
<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>
<p><span>{{ page.dialogs.quotefredwilson }}</span><span><a href="https://en.wikipedia.org/wiki/Fred_Wilson_%28financier%29">Fred Wilson</a>, Co-Founder of Union Square Ventures (<a href="http://www.businessinsider.com/fred-wilson-heres-why-im-investing-in-bitcoin-2013-5">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotefrancoisrvelde }}</span><span>François R. Velde, Economist, Federal Reserve (<a href="http://www.nytimes.com/2013/11/24/your-money/a-bitcoin-puzzle-heads-its-excitement-tails-its-anxiety.html">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotenavalravikant }}</span><span><a href="https://en.wikipedia.org/wiki/AngelList">Naval Ravikant</a>, Founder of Angellist (<a href="https://gigaom.com/2013/09/10/as-bitcoin-hype-settles-down-real-possibilities-start-to-emerge/">{{page.dialogs.material_source}}</a>)</span></p>
<p><span>{{ page.dialogs.quotebrianforde }}</span><span>Brian Forde, Director of Digital Currency, MIT Media Lab (<a href="http://www.forbes.com/sites/gregoryferenstein/2015/07/29/former-obama-tech-advisor-explains-how-bitcoin-could-transform-government-in-5-quotes/">{{page.dialogs.material_source}}</a>)</span></p>

<p class="final"><i>{{page.dialogs.material_even_more_quotes}}</i></p>
</div>

<a href="#" onclick="materialShow(event);" ontouchstart="materialShow(event);">{{ page.dialogs.materialquotemore }}</a>

</div>
Expand Down

0 comments on commit 13ec935

Please sign in to comment.