Merge pull request #257 from bitcoin/innovationimg

Add texts and artworks in "Innovation" page

COPYING

@@ -0,0 +1,6 @@
+Various picture files inside the folders listed above are subjected to copyright restrictions. The use of these materials is not permitted unless otherwise specified by their copyright owner.
+
+img/clients
+img/faq
+img/innovation
+img/press

_less/screen.less

@@ -590,6 +590,16 @@ li p{
 	width:400px;
 	vertical-align:top;
 	margin-left:40px;
+	margin-bottom:20px;
+}
+.tablehalf img{
+	border-radius:10px;
+	width:400px;
+	height:220px;
+}
+.tablehalf h2 img{
+	width:auto;
+	height:auto;
 }
 
 .contributors{
@@ -894,6 +904,10 @@ h2 .rssicon{
 	font-size:150%;
 }
 
+.attribution{
+	font-size:75%
+}
+
 .download{
 	text-align:center;
 }
@@ -1213,7 +1227,11 @@ h2 .rssicon{
 	.tablehalf div{
 		display:block;
 		width:auto;
-		margin:0px;
+		margin-left:0px;
+	}
+	.tablehalf img{
+		width:auto;
+		height:auto;
 	}
 	.preview{
 		display:none;

_templates/innovation.html

@@ -1,108 +1,9 @@
 ---
 layout: base
 id: innovation
-
-dialog:
-  pagetitle: "Innovation in payment systems"
-  summary: "Bitcoin is a major innovation in the world of payments. Just like these inventions that seemed impossible until their time has come, Bitcoin is real and it might become part of our everyday lifes. A wide range of new exciting possibilities are still to be discovered in years to come. Here is a short overview of the technology and some recent developments."
-  collaboration: "Worldwide collaboration"
-  collaborationtext: " Because of its open-source nature, Bitcoin is the first payment network to be powered by its users with no central authority. Developers cannot change the system without user's consent and every user benefits of the global economy growth and prosperity. If something is wrong with something related to Bitcoin, users have incentives to help fixing the problem. Bitcoin created an economy that rewards global collaboration."
-  control: "Control against fraud"
-  controltext: "An unprecedented level of security is possible with Bitcoin. The network provides users with protection against most prevalent frauds like chargebacks or unwanted charges, and bitcoins are impossible to counterfeit. Users can backup or encrypt their wallet and hardware wallets could make it nearly impossible to steal money in the future. Bitcoin is designed to allow its users to have complete control over their money."
-  cost: "Cost efficiency"
-  costtext: "With the use of cryptography, secure payments are possible without slow and costly middlemen. A Bitcoin transaction can be much cheaper than its alternatives and be completed in a short time. This means Bitcoin hold some potential to become a common way to transfer any currency in the future. Bitcoin could also play a role in reducing proverty in many countries by cutting high transaction fees on worker's salary."
-  global: "Global accessibility"
-  globaltext: "All payments in the world can be fully interoperable. Bitcoin allows any bank, business or individual to securely send and receive payments anywhere at any time, with or without a bank account. Bitcoin is available in a large number of countries that still remain out of reach for most payment systems due to their own limitations. Bitcoin increases global access to commerce and it can help international trades to flourish."
-  transparency: "Flexible transparency"
-  transparencytext: "All Bitcoin transactions are public and transparent and the identity of the people behind the payments is private by default. This allows individuals and organizations to work with flexible transparency rules. For instance, a business can choose to reveal certain transactions and balances only to certain employees just like a non-profit organization is free to allow the public to see how much they receive through donations."
-  trust: "Trust and integrity"
-  trusttext: "Bitcoin offers solutions to many of the trust problems that plague banks. With selective accounting transparency, digital contracts, and irreversible transactions, Bitcoin can be used as a ground to restore trust and agreement. Crooked banks cannot cheat the system to make a profit at the expense of other banks or the public. A future in which major banks would support Bitcoin could help to reinstate integrity and trust in financial institutions."
-  resiliency: "Resiliency and decentralization"
-  resiliencytext: "By its high decentralization, Bitcoin created a different form of payment network with an increased level of resilience and redundancy. Bitcoin can handle millions of dollars in trades without requiring military protection. With no central point of failure such as a data center, attacking the network is a more difficult project. For this reason, Bitcoin could represent an interesting step forward in securing financial systems."
-  predictable: "Predictability and neutrality"
-  predictabletext: "Bitcoin is the first form of money to be fully neutral, transparent and predictable. Because Bitcoin is backed by mathematics, the payment network and the number of bitcoins in circulation cannot be manipulated. There is no closed doors, central money issuer or any other form of authority. Bitcoin is a fully automated financial system. As an unprecedented experiment, it will be very exciting to discover what Bitcoin will accomplish."
-  multisig: "Multi-signature accounts"
-  multisigtext: "Multiple signatures allow a transaction to be accepted by the network only if a certain number of a defined group of persons agree to sign the transaction. This feature could be used by a board of directors to prevent any member to spend parts of their treasury without other member's consent. This can also be used by banks to prevent theft by blocking transactions above a certain threshold if the user do not provide additional credentials."
-  mediation: "Dispute mediation"
-  mediationtext: "Bitcoin can be used to develop innovative dispute mediation services using multiple signatures. Such services could make it possible for a third party to approve or reject a transaction in case of disagreement between the other parties without having control on their money. Since these services would be compatible with any user and merchant using Bitcoin, this would likely lead to free competition and higher quality standards."
-  micro: "Micro payments"
-  microtext: "Bitcoin can process payments to the scale of a dollar and soon even much smaller amounts. Such payments are routine even today. Imagine listening to Internet radio paid by the second, viewing web pages with a small tip for each ad not shown, or buying bandwidth from a WiFi hotspot by the kilobyte. Bitcoin is efficient enough to make all of these ideas possible. <a href=\"https://code.google.com/p/bitcoinj/wiki/WorkingWithMicropayments\">Learn more</a> about the technology behind Bitcoin micro payments."
-  donation: "Tips and donations"
-  donationtext: "Bitcoin has been a particularly efficient solution for tips and donations in several cases. Sending a payment only requires one click and receiving donations can be as simple as displaying a QR code. Donations can be visible for the public, giving increased transparency for non-profit organizations. In cases of emergencies such as natural disasters, Bitcoin donations could contribute to a faster international response."
-  crowdfunding: "Crowdfunding"
-  crowdfundingtext: "Although not yet easy to use, Bitcoin can be used to run Kickstarter-style crowdfunding campaigns, in which individuals pledge money to a project that is taken from them only if enough pledges are received to meet the target. Such assurance contracts are processed by the Bitcoin protocol, which prevents a transaction to take place until all conditions have been met. <a href=\"https://en.bitcoin.it/wiki/Contracts#Example_3:_Assurance_contracts\">Learn more</a> about the technology behind crowdfunding."
-
 ---
-{% if page.lang == 'en' %}
+{% case page.lang %}
-
+{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
-<h1>{{ page.dialog.pagetitle }}</h1>
-<p class="summarytxt">{{ page.dialog.summary }}</p>
-
-<div class="tablehalf">
-
-<div>
-<h2><img class="titleicon" src="/img/ico_lock.svg" alt="Icon" />{{ page.dialog.control }}</h2>
-<p>{{ page.dialog.controltext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_international.svg" alt="Icon" />{{ page.dialog.global }}</h2>
-<p>{{ page.dialog.globaltext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_lowfee.svg" alt="Icon" />{{ page.dialog.cost }}</h2>
-<p>{{ page.dialog.costtext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_donate.svg" alt="Icon" />{{ page.dialog.donation }}</h2>
-<p>{{ page.dialog.donationtext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_multi.svg" alt="Icon" />{{ page.dialog.crowdfunding }}</h2>
-<p>{{ page.dialog.crowdfundingtext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_micro.svg" alt="Icon" />{{ page.dialog.micro }}</h2>
-<p>{{ page.dialog.microtext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_multisig.svg" alt="Icon" />{{ page.dialog.multisig }}</h2>
-<p>{{ page.dialog.multisigtext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_balance.svg" alt="Icon" />{{ page.dialog.mediation }}</h2>
-<p>{{ page.dialog.mediationtext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_law.svg" alt="Icon" />{{ page.dialog.trust }}</h2>
-<p>{{ page.dialog.trusttext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_network.svg" alt="Icon" />{{ page.dialog.resiliency }}</h2>
-<p>{{ page.dialog.resiliencytext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_transparency.svg" alt="Icon" />{{ page.dialog.transparency }}</h2>
-<p>{{ page.dialog.transparencytext }}</p>
-</div>
-
-<div>
-<h2><img class="titleicon" src="/img/ico_democracy.svg" alt="Icon" />{{ page.dialog.collaboration }}</h2>
-<p>{{ page.dialog.collaborationtext }}</p>
-</div>
-
-</div>
-
-{% else %}
 
 <h1>{% translate pagetitle %}</h1>
 <p class="summarytxt">{% translate summary %}</p>
@@ -128,4 +29,93 @@ dialog:
 <h2><img class="titleicon" src="/img/ico_solve.svg" alt="Icon" />{% translate trust %}</h2>
 <p>{% translate trusttext %}</p>
 
-{% endif %}
+{% else %}
+
+<h1>{% translate pagetitle %}</h1>
+<p class="summarytxt">{% translate summary %}</p>
+
+<div class="tablehalf">
+
+<div>
+<img src="/img/innovation/inno_control.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_lock.svg" alt="Icon" />{% translate control %}</h2>
+<p>{% translate controltext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_global.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_international.svg" alt="Icon" />{% translate global %}</h2>
+<p>{% translate globaltext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_cost.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_lowfee.svg" alt="Icon" />{% translate cost %}</h2>
+<p>{% translate costtext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_donation.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_donate.svg" alt="Icon" />{% translate donation %}</h2>
+<p>{% translate donationtext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_crowdfunding.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_multi.svg" alt="Icon" />{% translate crowdfunding %}</h2>
+<p>{% translate crowdfundingtext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_micro.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_micro.svg" alt="Icon" />{% translate micro %}</h2>
+<p>{% translate microtext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_mediation.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_balance.svg" alt="Icon" />{% translate mediation %}</h2>
+<p>{% translate mediationtext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_multisig.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_multisig.svg" alt="Icon" />{% translate multisig %}</h2>
+<p>{% translate multisigtext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_trust.jpg" />
+<h2><img class="titleicon" src="/img/ico_law.svg" alt="Icon" />{% translate trust %}</h2>
+<p>{% translate trusttext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_resiliency.jpg" />
+<h2><img class="titleicon" src="/img/ico_network.svg" alt="Icon" />{% translate resiliency %}</h2>
+<p>{% translate resiliencytext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_transparency.jpg" alt="Banner" />
+<h2><img class="titleicon" src="/img/ico_transparency.svg" alt="Icon" />{% translate transparency %}</h2>
+<p>{% translate transparencytext %}</p>
+</div>
+
+<div>
+<img src="/img/innovation/inno_automation.jpg" />
+<h2><img class="titleicon" src="/img/ico_solve.svg" alt="Icon" />{% translate automation %}</h2>
+<p>{% translate automationtext %}</p>
+</div>
+
+</div>
+
+<p class="attribution">
+Trezor prototype, © <a href="http://www.bitcointrezor.com/">Trezor</a><br>
+National Gallery of Art, © AgnosticPreachersKid on <a href="http://commons.wikimedia.org/wiki/File:National_Gallery_of_Art_-_West_Building.JPG">Wikimedia</a> used under a Creative Commons license <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en">CC BY-SA 3.0</a><br>
+Weusecoins video screenshot, © <a href="https://weusecoins.com/">weusecoins.com</a> used under a Creative Commons license <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a><br>
+Robot Sketching, © <a href="http://www.flickr.com/photos/elmastudio/4784871615/in/photostream/">Elmastudio</a> on Flickr used under a Creative Commons license <a href="http://creativecommons.org/licenses/by-nc-nd/2.0/deed.fr">CC BY-NC-ND 2.0</a><br>
+All other pictures are copyrighted materials.
+</p>
+
+{% endcase %}

_translations/en.yml

@@ -350,22 +350,32 @@ en:
     developers: "Developers"
   innovation:
     title: "Innovation - Bitcoin"
-    pagetitle: "Why Bitcoin is changing the world"
+    pagetitle: "Innovation in payment systems"
-    summary: "Bitcoin is a major innovation that is giving you control over your money. Just like these inventions that seemed impossible until their time has come, Bitcoin is real and it might change our everyday lifes. A wide range of new exciting possibilities are still to be discovered in years to come."
+    summary: " The Bitcoin protocol is not just about sending money from A to B. It has many features and opens many possibilities that the community is still exploring. Here are some of the technologies currently being researched and in some cases, turned into real products and services. The most interesting uses of Bitcoin are probably still to be discovered."
-    consensus: "Bitcoin is a worldwide consensus"
+    control: "Control against fraud"
-    consensustext: "Because of its decentralized, open-source nature, Bitcoin is the first payment network that is powered by its users with no central authority. Even Bitcoin developers have no power to force updates in the protocol unless other users, developers, and miners also agree. <i>You</i> have exclusive control over your money."
+    controltext: "An unprecedented level of security is possible with Bitcoin. The network provides users with protection against most prevalent frauds like chargebacks or unwanted charges, and bitcoins are impossible to counterfeit. Users can backup or encrypt their wallet and hardware wallets could make it very difficult to steal or lose money in the future. Bitcoin is designed to allow its users to have complete control over their money."
-    network: "Digital money made for the Internet"
+    global: "Global accessibility"
-    networktext: "Bitcoin was born from the Internet, bringing the freedom of physical money to the virtual world while making payments easier and more secure in both worlds. Bitcoin can offer an alternative to previous cumbersome and costly systems, and it can increase online business access to developing countries."
+    globaltext: "All payments in the world can be fully interoperable. Bitcoin allows any bank, business or individual to securely send and receive payments anywhere at any time, with or without a bank account. Bitcoin is available in a large number of countries that still remain out of reach for most payment systems due to their own limitations. Bitcoin increases global access to commerce and it can help international trades to flourish."
-    freedom: "Protecting individual rights and freedom"
+    cost: "Cost efficiency"
-    freedomtext: "Bitcoin allows people to securely store and exchange value on a network that cannot be seized, manipulated, or stopped by any organization or individual. It gives many powerful tools to the people so that it is easier to protect individual rights against various levels of corruption."
+    costtext: "With the use of cryptography, secure payments are possible without slow and costly middlemen. A Bitcoin transaction can be much cheaper than its alternatives and be completed in a short time. This means Bitcoin hold some potential to become a common way to transfer any currency in the future. Bitcoin could also play a role in reducing proverty in many countries by cutting high transaction fees on worker's salary."
-    global: "The first neutral global currency"
+    donation: "Tips and donations"
-    globaltext: "Not often in our history has money been disconnected from any political influence or national economy. Could Bitcoin be the first global currency to cross all barriers between nations, politics, and cultures for the benefit of the common good? It certainly looks like it might happen. One for all and all for one!"
+    donationtext: "Bitcoin has been a particularly efficient solution for tips and donations in several cases. Sending a payment only requires one click and receiving donations can be as simple as displaying a QR code. Donations can be visible for the public, giving increased transparency for non-profit organizations. In cases of emergencies such as natural disasters, Bitcoin donations could contribute to a faster international response."
-    transparency: "Promoting transparency"
+    crowdfunding: "Crowdfunding"
-    transparencytext: "All Bitcoin transactions are public, but the owners or recipients of these transactions are not. Organizations can choose to reveal their ownership of some Bitcoin addresses to their members, allowing them to implement high levels of transparency."
+    crowdfundingtext: "Although not yet easy to use, Bitcoin can be used to run Kickstarter-style crowdfunding campaigns, in which individuals pledge money to a project that is taken from them only if enough pledges are received to meet the target. Such assurance contracts are processed by the Bitcoin protocol, which prevents a transaction to take place until all conditions have been met. <a href=\"https://en.bitcoin.it/wiki/Contracts#Example_3:_Assurance_contracts\">Learn more</a> about the technology behind crowdfunding."
-    secure: "Making money more secure"
+    micro: "Micro payments"
-    securetext: "Thanks to a clever use of strict cryptographic rules, Bitcoin provides an amazing list of security features. Not only are bitcoins impossible to counterfeit or spoof, but the protocol is also built to be very resistant against an impressive list of attacks."
+    microtext: "Bitcoin can process payments to the scale of a dollar and soon even much smaller amounts. Such payments are routine even today. Imagine listening to Internet radio paid by the second, viewing web pages with a small tip for each ad not shown, or buying bandwidth from a WiFi hotspot by the kilobyte. Bitcoin is efficient enough to make all of these ideas possible. <a href=\"https://code.google.com/p/bitcoinj/wiki/WorkingWithMicropayments\">Learn more</a> about the technology behind Bitcoin micro payments."
-    trust: "Solving issues with trust in banks"
+    mediation: "Dispute mediation"
-    trusttext: "Bitcoin offers solutions to many of the trust problems that plague banks thanks to selective accounting transparency, digital signature proofs, and irreversible transactions. It also increases the risks for crooked bankers: no bitcoins can be created to save them from their own mistakes at the expense of the public."
+    mediationtext: "Bitcoin can be used to develop innovative dispute mediation services using multiple signatures. Such services could make it possible for a third party to approve or reject a transaction in case of disagreement between the other parties without having control on their money. Since these services would be compatible with any user and merchant using Bitcoin, this would likely lead to free competition and higher quality standards."
+    multisig: "Multi-signature accounts"
+    multisigtext: "Multiple signatures allow a transaction to be accepted by the network only if a certain number of a defined group of persons agree to sign the transaction. This feature could be used by a board of directors to prevent any member to spend parts of their treasury without other member's consent. This can also be used by banks to prevent theft by blocking transactions above a certain threshold if the user do not provide additional credentials."
+    trust: "Trust and integrity"
+    trusttext: "Bitcoin offers solutions to many of the trust problems that plague banks. With selective accounting transparency, digital contracts, and irreversible transactions, Bitcoin can be used as a ground to restore trust and agreement. Crooked banks cannot cheat the system to make a profit at the expense of other banks or the public. A future in which major banks would support Bitcoin could help to reinstate integrity and trust in financial institutions."
+    resiliency: "Resiliency and decentralization"
+    resiliencytext: "By its high decentralization, Bitcoin created a different form of payment network with an increased level of resilience and redundancy. Bitcoin can handle millions of dollars in trades without requiring military protection. With no central point of failure such as a data center, attacking the network is a more difficult project. Bitcoin could represent an interesting step forward in securing local and global financial systems."
+    transparency: "Flexible transparency"
+    transparencytext: "All Bitcoin transactions are public and transparent and the identity of the people behind the payments is private by default. This allows individuals and organizations to work with flexible transparency rules. For instance, a business can choose to reveal certain transactions and balances only to certain employees just like a non-profit organization is free to allow the public to see how much they receive in daily and monthly donations."
+    automation: "Automated solutions"
+    automationtext: "Automated services usually have to deal with costs and limitations of cash or credit card payments. This includes all kinds of vending machines, from bus ticket booths to coffee machines. Bitcoin is suited to be used in a new generation of automated services as well as to cut their operating costs. Imagine self-driving taxis, or a store where your basket lets you pay your purchases without waiting at the queue. Many ideas are possible."
   legal:
     title: "Legal disclaimer - Bitcoin"
     pagetitle: "Legal disclaimer"