joshua/dash-docs
1
0
Fork 0
mirror of https://github.com/seigler/dash-docs synced 2025-07-27 01:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branches 'upstream-pull/1083/head' and 'upstream-pull/1082/head'

Browse source
This commit is contained in:
Saivann 2015-10-10 00:33:35 -04:00
commit 29ca419f57
No known key found for this signature in database
GPG key ID: 5780F5D31B5577B0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -86,7 +86,7 @@ git remote add upstream https://github.com/bitcoin-dot-org/bitcoin.org.git
6. Push your branch on your GitHub repository. `git push origin (name of your branch)`
7. Click on your branch on GitHub and click the **Compare / pull request** button to send a pull request.
When submitting a pull request, please take required time to discuss your changes and adapt your work. It is generally a good practice to split unrelated changes into separate branchs and pull requests.
When submitting a pull request, please take required time to discuss your changes and adapt your work. It is generally a good practice to split unrelated changes into separate branches and pull requests.
**Travis Continuous Integration (CI)**
@ -449,7 +449,7 @@ optional_magnetlink:
## Warning: this site's Markdown parser commonly requires you make two
## changes to the release notes from the Bitcoin Core source tree:
##
## 1. Make sure both ordered and unordered lists are preceeded by an empty
## 1. Make sure both ordered and unordered lists are preceded by an empty
## (whitespace only) line, like the empty line before this list item.
##
## 2. Place URLs inside angle brackets, like <http://bitcoin.org/bin>
@ -704,7 +704,7 @@ bannerclass: success
## Wallets
The wallet list is based on the personal evaluation of the maintainer(s) and regular contributors of this site, according to the criterias detailed below.
The wallet list is based on the personal evaluation of the maintainer(s) and regular contributors of this site, according to the criteria detailed below.
These requirements are meant to be updated and strengthened over time. Innovative wallets are exciting and encouraged, so if your wallet has a good reason for not following some of the rules below, please submit it anyway and we'll consider updating the rules.
@ -744,7 +744,7 @@ Basic requirements:
- Supports importing custom seeds
- Provides source code and/or detailed specification for blackbox testing if using a closed-source Secure Element
Optional criterias (some could become requirements):
Optional criteria (some could become requirements):
- Received independent security audit(s)
- Avoid address reuse by displaying a new receiving address for each transaction in the wallet UI
@ -753,7 +753,7 @@ Optional criterias (some could become requirements):
- Provides a bug reporting policy on the website
- If user has no access over its private keys:
- Full reserve audit(s)
- Insurrance(s) against failures on their side
- Insurance(s) against failures on their side
- Reminds the user to enable 2FA in the main UI of the wallet
- If user has exclusive access over its private keys:
- Supports HD wallets (BIP32)
@ -786,7 +786,7 @@ Wallets can be added in `_templates/choose-your-wallet.html`. Entries are ordere
### Score
Each wallet is assigned a score for five criterias. For each of them, the appropriate text in `_translations/en.yml` needs to be choosen.
Each wallet is assigned a score for five criteria. For each of them, the appropriate text in `_translations/en.yml` needs to be chosen.
**Control** - What control the user has over his bitcoins?

2
_translations/en.yml
View file

@ -176,7 +176,7 @@ en:
walletbitcoinwallet: "Bitcoin Wallet is easy to use and reliable, while also being secure and fast. Its vision is de-centralization and zero trust; no central service is needed for Bitcoin-related operations. The app is a good choice for non-technical people."
walletairbitzwallet: "Airbitz is a mobile Bitcoin Wallet making high levels of privacy, security, and decentralization very familiar and usable to the masses. Airbitz wallets are always automatically encrypted, backed up, and even function when Airbitz servers go down."
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 for Android is designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage and offers compatibilty with Trezor and others."
walletmyceliumwallet: "Mycelium Bitcoin Wallet for Android is designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage and offers compatibility with Trezor and others."
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."
walletcircle: "Circle is a web wallet service that aims to be easy to use. It provides the ability to instantly purchase and sell bitcoins using either a credit card or a U.S. bank account. It also provides an Android and an iOS web wallet app."