Merge pull request #663 from bitcoin/revisitbcinfo

Revisit blockchain.info listing

_templates/choose-your-wallet.html

@@ -418,101 +418,6 @@ wallets:
           privacyaddressreuse: "checkpassprivacyaddressrotation"
           privacydisclosure: "checkfailprivacydisclosurecentralized"
           privacynetwork: "checkfailprivacynetworknosupporttor"
-- blockchain:
-    title: "Blockchain.info"
-    titleshort: "Blockchain<br>.info"
-    compat: "mobile desktop web android ios windows mac linux"
-    level: 3
-    platform:
-      mobile:
-        text: "walletblockchaininfo"
-        link: "https://play.google.com/store/apps/details?id=piuk.blockchain.android"
-        source: "https://github.com/blockchain/My-Wallet-Android"
-        screenshot: "blockchainandroid.png"
-        os:
-        - android
-        - ios
-        check:
-          control: "checkpasscontrolhybrid"
-          validation: "checkfailvalidationcentralized"
-          transparency: "checkfailtransparencynew"
-          environment: "checkpassenvironmentmobile"
-          privacy: "checkfailprivacyweak"
-        privacycheck:
-          privacyaddressreuse: "checkfailprivacyaddressrotation"
-          privacydisclosure: "checkfailprivacydisclosureaccount"
-          privacynetwork: "checkfailprivacynetworknosupporttor"
-      desktop:
-        text: "walletblockchaininfo"
-        link: "https://chrome.google.com/webstore/detail/blockchain/glaohkkooicollgefkkmndjcbblominl"
-        source: "https://github.com/blockchain/My-Wallet-Chrome-Extension"
-        screenshot: "blockchaindesktop.png"
-        os:
-        - windows
-        - mac
-        - linux
-        check:
-          control: "checkpasscontrolhybrid"
-          validation: "checkfailvalidationcentralized"
-          transparency: "checkfailtransparencyremote"
-          environment: "checkfailenvironmentdesktop"
-          privacy: "checkfailprivacyweak"
-        privacycheck:
-          privacyaddressreuse: "checkfailprivacyaddressrotation"
-          privacydisclosure: "checkfailprivacydisclosureaccount"
-          privacynetwork: "checkpassprivacynetworksupporttorproxy"
-      web:
-        text: "walletblockchaininfo"
-        link: "https://chrome.google.com/webstore/detail/blockchain/glaohkkooicollgefkkmndjcbblominl"
-        source: "https://github.com/blockchain/My-Wallet-Chrome-Extension"
-        screenshot: "blockchaindesktop.png"
-        os:
-        check:
-          control: "checkpasscontrolhybrid"
-          validation: "checkfailvalidationcentralized"
-          transparency: "checkfailtransparencyremote"
-          environment: "checkfailenvironmentdesktop"
-          privacy: "checkfailprivacyweak"
-        privacycheck:
-          privacyaddressreuse: "checkfailprivacyaddressrotation"
-          privacydisclosure: "checkfailprivacydisclosureaccount"
-          privacynetwork: "checkpassprivacynetworksupporttorproxy"
-      ios:
-        text: "walletblockchaininfo"
-        link: "https://itunes.apple.com/us/app/blockchain-bitcoin-wallet/id493253309"
-        source: "https://github.com/blockchain/My-Wallet-iPhone"
-        screenshot: "blockchainiphone.png"
-        os:
-        - android
-        - ios
-        check:
-          control: "checkpasscontrolhybrid"
-          validation: "checkfailvalidationcentralized"
-          transparency: "checkfailtransparencynew"
-          environment: "checkpassenvironmentmobile"
-          privacy: "checkfailprivacyweak"
-        privacycheck:
-          privacyaddressreuse: "checkfailprivacyaddressrotation"
-          privacydisclosure: "checkfailprivacydisclosureaccount"
-          privacynetwork: "checkfailprivacynetworknosupporttor"
-      android:
-        text: "walletblockchaininfo"
-        link: "https://play.google.com/store/apps/details?id=piuk.blockchain.android"
-        source: "https://github.com/blockchain/My-Wallet-Android"
-        screenshot: "blockchainandroid.png"
-        os:
-        - android
-        - ios
-        check:
-          control: "checkpasscontrolhybrid"
-          validation: "checkfailvalidationcentralized"
-          transparency: "checkfailtransparencynew"
-          environment: "checkpassenvironmentmobile"
-          privacy: "checkfailprivacyweak"
-        privacycheck:
-          privacyaddressreuse: "checkfailprivacyaddressrotation"
-          privacydisclosure: "checkfailprivacydisclosureaccount"
-          privacynetwork: "checkfailprivacynetworknosupporttor"
 - bitgo:
     title: "BitGo"
     titleshort: "BitGo"

_translations/en.yml

@@ -116,7 +116,6 @@ en:
     walletkncwallet: "KnC Wallet strives to be an easy way to send bitcoins to your friends and family. It features an online directory so that you can start sending coins to your contacts right away, without knowing their Bitcoin address."
     walletbreadwallet: "Simplicity is breadwallet's core design principle. As a real standalone Bitcoin client, there is no server to get hacked or go down, and by building on iOS's strong security base, breadwallet is designed to protect you from malware, browser security holes, even physical theft."
     walletmyceliumwallet: "Mycelium Bitcoin Wallet is an open source wallet for Android designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage that help you secure your bitcoins."
-    walletblockchaininfo: "Blockchain.info is a user-friendly hybrid wallet. It stores an encrypted version of your wallet online but decryption happens in your browser. For security reasons, you should always use the browser extension and email backups (and keep that email secure) ."
     walletcoinbase: "Coinbase is a web wallet service that aims to be easy to use. It also provides an Android web wallet app, merchant tools and integration with US bank accounts to buy and sell bitcoins."
     walletxapo: "Xapo combines the convenience of an everyday Bitcoin wallet with the security of an insured deep cold storage vault. Xapo Debit Card links to your Xapo Wallet and allows you to spend bitcoins at millions of merchants all around the world."
     walletcoinkite: "Coinkite is a web wallet & debit card service that aims to be easy to use. It also works on mobile browsers, has merchant tools, point-of-sale payment terminals. It is a hybrid wallet and full reserve vault."
@@ -235,7 +234,7 @@ en:
     sourcecode: "Get the source code"
     versionhistory: "Show version history"
     notelicense: "Bitcoin Core is a community-driven <a href=\"https://www.fsf.org/about/what-is-free-software\">free software</a> project, released under the <a href=\"http://opensource.org/licenses/mit-license.php\">MIT license</a>."
-    notesync: "Bitcoin Core initial sync can take a long time. You should make sure that you have enough bandwidth and storage for the full <a href=\"https://blockchain.info/charts/blocks-size\">block chain size</a> (over 20GB). If you know how to download a torrent file, you can speed up this process by putting <a href=\"/bin/blockchain/bootstrap.dat.torrent\">bootstrap.dat</a> (a previous copy of the block chain) in the Bitcoin Core data directory before starting the software."
+    notesync: "Bitcoin Core initial sync can take a long time. You should make sure that you have enough bandwidth and storage for the full block chain size (over 20GB). If you know how to download a torrent file, you can speed up this process by putting <a href=\"/bin/blockchain/bootstrap.dat.torrent\">bootstrap.dat</a> (a previous copy of the block chain) in the Bitcoin Core data directory before starting the software."
     patient: "You will need to be patient"
   events:
     title: "Conferences and events - Bitcoin"
@@ -353,7 +352,7 @@ en:
     poweredoff: "What if I receive a bitcoin when my computer is powered off?"
     poweredofftxt1: "This works fine. The bitcoins will appear next time you start your wallet application. Bitcoins are not actually received by the software on your computer, they are appended to a public ledger that is shared between all the devices on the network. If you are sent bitcoins when your wallet client program is not running and you later launch it, it will download blocks and catch up with any transactions it did not already know about, and the bitcoins will eventually appear as if they were just received in real time. Your wallet is only needed when you wish to spend bitcoins."
     sync: "What does \"synchronizing\" mean and why does it take so long?"
-    synctxt1: "Long synchronization time is only required with full node clients like Bitcoin Core. Technically speaking, synchronizing is the process of downloading and verifying all previous Bitcoin transactions on the network. For some Bitcoin clients to calculate the spendable balance of your Bitcoin wallet and make new transactions, it needs to be aware of all previous transactions. This step can be resource intensive and requires sufficient bandwidth and storage to accommodate the <a href=\"https://blockchain.info/charts/blocks-size\">full size of the block chain</a>. For Bitcoin to remain secure, enough people should keep using full node clients because they perform the task of validating and relaying transactions."
+    synctxt1: "Long synchronization time is only required with full node clients like Bitcoin Core. Technically speaking, synchronizing is the process of downloading and verifying all previous Bitcoin transactions on the network. For some Bitcoin clients to calculate the spendable balance of your Bitcoin wallet and make new transactions, it needs to be aware of all previous transactions. This step can be resource intensive and requires sufficient bandwidth and storage to accommodate the full size of the block chain. For Bitcoin to remain secure, enough people should keep using full node clients because they perform the task of validating and relaying transactions."
     mining: "Mining"
     whatismining: "What is Bitcoin mining?"
     whatisminingtxt1: "Mining is the process of spending computing power to process transactions, secure the network, and keep everyone in the system synchronized together. It can be perceived like the Bitcoin data center except that it has been designed to be fully decentralized with miners operating in all countries and no individual having control over the network. This process is referred to as \"mining\" as an analogy to gold mining because it is also a temporary mechanism used to issue new bitcoins. Unlike gold mining, however, Bitcoin mining provides a reward in exchange for useful services required to operate a secure payment network. Mining will still be required after the last bitcoin is issued."
@@ -592,7 +591,7 @@ en:
     node: "Be the network"
     nodetxt: "If you have a good Internet connection, you can strengthen the Bitcoin network by keeping <a href=\"#download#\">full node software</a> running on your computer or server with port 8333 open. Full nodes are securing and relaying all transactions."
     mining: "Mining"
-    miningtxt: "You can start <a href=\"http://www.bitcoinmining.com/\">mining bitcoins</a> to help processing transactions. In order to protect the network, you should join <a href=\"https://blockchain.info/pools\">smaller mining pools</a> and prefer decentralized pools like <a href=\"http://p2pool.in/\">P2Pool</a> or <a href=\"https://en.bitcoin.it/wiki/Comparison_of_mining_pools\">pools</a> with getblocktemplate (GBT) support."
+    miningtxt: "You can start <a href=\"http://www.bitcoinmining.com/\">mining bitcoins</a> to help processing transactions. In order to protect the network, you should join <a href=\"http://mempool.info/pools\">smaller mining pools</a> and prefer decentralized pools like <a href=\"http://p2pool.in/\">P2Pool</a> or <a href=\"https://en.bitcoin.it/wiki/Comparison_of_mining_pools\">pools</a> with getblocktemplate (GBT) support."
     develop: "Development"
     developtxt: "Bitcoin is free software. So if you are a developer, you can use your super-powers to do good and <a href=\"#development#\">improve Bitcoin</a>. Or you can build amazing new services or software that can use Bitcoin."
     donation: "Donation"