New "Spending Bitcoins" page (plus few other minor tweaks, wording fixes, etc.) #1584
+38
−8
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- | ||
| # This file is licensed under the MIT License (MIT) available on | ||
| # http://opensource.org/licenses/MIT. | ||
|
|
||
| layout: base | ||
| id: spend-bitcoin | ||
| --- | ||
| <h1>{% translate pagetitle %}</h1> | ||
| <p class="summary">{% translate summary %}</p> | ||
|
|
||
| <h2 id="products-online"><span class="fa fa-shopping-cart fa-lg"></span> {% translate products-online %}</h2> | ||
| <p>{% translate products-online-text %}</p> | ||
|
|
||
| <h2 id="directory"><span class="fa fa-book fa-lg"></span> {% translate directory %}</h2> | ||
| <p>{% translate directory-text %}</p> | ||
|
|
||
| <h2 id="map"><span class="fa fa-globe fa-lg"></span> {% translate business-map %}</h2> | ||
| <p>{% translate business-map-text %}</p> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -350,7 +350,7 @@ | |
| howitworkstxt1: "From a user perspective, Bitcoin is nothing more than a mobile app or computer program that provides a personal Bitcoin wallet and allows a user to send and receive bitcoins with them. This is how Bitcoin works for most users." | ||
| howitworkstxt2: "Behind the scenes, the Bitcoin network is sharing a public ledger called the \"block chain\". This ledger contains every transaction ever processed, allowing a user's computer to verify the validity of each transaction. The authenticity of each transaction is protected by digital signatures corresponding to the sending addresses, allowing all users to have full control over sending bitcoins from their own Bitcoin addresses. In addition, anyone can process transactions using the computing power of specialized hardware and earn a reward in bitcoins for this service. This is often called \"mining\". To learn more about Bitcoin, you can consult the <a href=\"#how-it-works#\">dedicated page</a> and the <a href=\"#bitcoin-paper#\">original paper</a>." | ||
| used: "Is Bitcoin really used by people?" | ||
| usedtxt1: "Yes. There are a <a href=\"/en/spend-bitcoin\">growing number of businesses</a> and individuals using Bitcoin. This includes brick-and-mortar businesses like restaurants, apartments, and law firms, as well as popular online services such as Namecheap, Overstock.com, and Reddit. While Bitcoin remains a relatively new phenomenon, it is growing fast. At the end of April 2017, the <a href=\"https://bitcoincharts.com/bitcoin/\">total value of all existing bitcoins</a> exceeded 20 billion US dollars, with millions of dollars worth of bitcoins exchanged daily." | ||
| acquire: "How does one acquire bitcoins?" | ||
| acquireli1: "As payment for goods or services." | ||
| acquireli2: "Purchase bitcoins at a <a href=\"https://www.buybitcoinworldwide.com\">Bitcoin exchange</a>." | ||
|
|
@@ -543,7 +543,7 @@ | |
| getbut: "Find an exchange" | ||
| spend: "Spend bitcoins" | ||
| spendtxt: "There is a growing number of services and merchants accepting Bitcoin all over the world. You can use Bitcoin to pay them and rate your experience to help honest businesses to gain more visibility." | ||
| spendbut: "Find merchants and products" | ||
| merchants: "How to accept Bitcoin" | ||
| merchantinform: "Inform yourself" | ||
| merchantinformtxt: "Bitcoin does not require merchants to change their habits. However, Bitcoin is different than what you know and use every day. Before you start using Bitcoin, there are a few things that you need to know in order to use it securely and avoid common pitfalls." | ||
|
|
@@ -751,6 +751,16 @@ | |
| offlinemultitxt: "Bitcoin includes a multi-signature feature that allows a transaction to require multiple independent approvals to be spent. This can be used by an organization to give its members access to its treasury while only allowing a withdrawal if 3 of 5 members sign the transaction. Some web wallets also provide multi-signature wallets, allowing the user to keep control over their money while preventing a thief from stealing funds by compromising a single device or server." | ||
| offlinetestament: "Think about your testament" | ||
| offlinetestamenttxt: "Your bitcoins can be lost forever if you don't have a backup plan for your peers and family. If the location of your wallets or your passwords are not known by anyone when you are gone, there is no hope that your funds will ever be recovered. Taking a bit of time on these matters can make a huge difference." | ||
| spend-bitcoin: | ||
| title: "Spending Bitcoin - Bitcoin" | ||
| pagetitle: "Spending Bitcoin" | ||
| summary: "There are thousands of businesses, across the globe, that accept Bitcoin." | ||
| products-online: "Find products for sale online" | ||
| products-online-text: "One common use for Bitcoin is making purchases online. There are hundreds of online shops and retailers that accept Bitcoin. Using a search engine like <a href=\"https://spendabit.co/\">Spendabit</a> you can search through millions of products, all available for purchase with bitcoins." | ||
| directory: "Navigate a business directory" | ||
|
There was a problem hiding this comment. I think the word "to" may be missing from this (Navigate to a business directory). There was a problem hiding this comment. I meant it to be more like "navigate through" (a la "navigate the ocean"). How about "Peruse a business directory"? Or I can just add the "to" -- either way. There was a problem hiding this comment. @JustAHappyKid Ah, ok, nevermind, I see. :) Feel free to leave as-is. |
||
| directory-text: "You can also find many businesses listed in <a href=\"http://usebitcoins.info/\">online directories</a>. (Note: Unfortunately this directory includes a number of defunct businesses and websites.)" | ||
|
There was a problem hiding this comment. After additional review, let's just remove the "Navigate a business directory" section. The There was a problem hiding this comment. Maybe we can replace it with the 99 bitcoin List :https://99bitcoins.com/who-accepts-bitcoins-payment-companies-stores-take-bitcoins/ There was a problem hiding this comment. @Mirobit Thanks for the suggestion. We could alternatively do this, too. 👍 @JustAHappyKid It's your call! |
||
| business-map: "Find local businesses" | ||
| business-map-text: "There are also many local businesses, like cafes and restaurants, that accept Bitcoin. You can use <a href=\"https://coinmap.org/\">Coinmap.org</a> to browse thousands of businesses across the globe." | ||
| support-bitcoin: | ||
| title: "Support Bitcoin - Bitcoin" | ||
| pagetitle: "Support Bitcoin" | ||
|
|
@@ -768,7 +778,7 @@ | |
| nonprofit: "Organizations" | ||
| nonprofittxt: "Many <a href=\"#community##[community.non-profit]\">non-profit organizations</a> are dedicated to protecting and promoting Bitcoin. You can help these groups by joining them and taking part in their projects, discussions and events." | ||
| spread: "Spread" | ||
| spreadtxt: "Speak about Bitcoin to interested people. Write about it on your blog. Tell your favorite shops you would like to pay with Bitcoin. Help to keep <a href=\"/en/spend-bitcoin\">merchant directories</a> up to date. Or be creative and make yourself a nice Bitcoin T-shirt." | ||
| wiki: "Documentation" | ||
| wikitxt: "<a href=\"https://github.com/bitcoin-dot-org/bitcoin.org#how-to-participate\">Bitcoin.org</a> and the <a href=\"https://en.bitcoin.it/\">Bitcoin wiki</a> provide useful documentation and we are constantly improving the information they contain. You can help to improve these resources and keep them up to date." | ||
| translate: "Translate" | ||
|
|
@@ -893,6 +903,7 @@ | |
| vocabulary: vocabulary | ||
| you-need-to-know: you-need-to-know | ||
| bitcoin-paper: bitcoin-paper | ||
| spend-bitcoin: spend-bitcoin | ||
| anchor: | ||
| community: | ||
| non-profit: non-profit | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As per my other comment, let's remove this section, along with the strings in the other file.