Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Airbitz updates #652

Merged
merged 10 commits into from Feb 10, 2015
2 changes: 1 addition & 1 deletion _config.yml
Expand Up @@ -136,7 +136,7 @@ aliases:
CodeShark: Eric Lombrozo

safe: false
server_port: 4000
port: 4000
base-url: /

source: .
Expand Down
63 changes: 63 additions & 0 deletions _templates/choose-your-wallet.html
Expand Up @@ -188,6 +188,69 @@
privacyaddressreuse: "checkfailprivacyaddressrotation"
privacydisclosure: "checkfailprivacydisclosurespv"
privacynetwork: "checkfailprivacynetworknosupporttor"


- airbitzwallet:
title: "Airbitz Bitcoin Wallet"
titleshort: "Airbitz"
compat: "mobile android ios"
level: 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paullinator This can be replaced with level: 3


platform:
mobile:
text: "walletairbitzwallet"
link: "https://airbitz.co/bitcoin-wallet/"
source: "https://github.com/Airbitz"
screenshot: "airbitzwalletandroid.png"
os:
- android
- ios
check:
control: "checkpasscontrolhybrid"
decentralization: "checkfailvalidationcentralized"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paullinator This can be replaced with validation: "checkfailvalidationcentralized"

transparency: "checkfailtransparencynew"
environment: "checkpassenvironmentmobile"
privacy: "checkpassprivacybasic"
privacycheck:
privacyaddressreuse: "checkpassprivacyaddressrotation"
privacydisclosure: "checkfailprivacydisclosureaccount"
privacynetwork: "checkfailprivacynetworknosupporttor"
android:
text: "walletairbitzwallet"
link: "https://play.google.com/store/apps/details?id=com.airbitz"
source: "https://github.com/Airbitz"
screenshot: "airbitzwalletandroid.png"
os:
- android
check:
control: "checkpasscontrolhybrid"
decentralization: "checkfailvalidationcentralized"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paullinator This can be replaced with validation: "checkfailvalidationcentralized"

transparency: "checkfailtransparencynew"
environment: "checkpassenvironmentmobile"
privacy: "checkpassprivacybasic"
privacycheck:
privacyaddressreuse: "checkpassprivacyaddressrotation"
privacydisclosure: "checkfailprivacydisclosureaccount"
privacynetwork: "checkfailprivacynetworknosupporttor"
ios:
text: "walletairbitzwallet"
link: "https://itunes.apple.com/us/app/bitcoin-wallet-map-directory/id843536046?mt=8"
source: "https://github.com/Airbitz"
screenshot: "airbitzwalletandroid.png"
os:
- ios
check:
control: "checkpasscontrolhybrid"
decentralization: "checkfailvalidationcentralized"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paullinator This can be replaced with validation: "checkfailvalidationcentralized"

transparency: "checkfailtransparencynew"
environment: "checkpassenvironmentmobile"
privacy: "checkpassprivacybasic"
privacycheck:
privacyaddressreuse: "checkpassprivacyaddressrotation"
privacydisclosure: "checkfailprivacydisclosureaccount"
privacynetwork: "checkfailprivacynetworknosupporttor"


- kncwallet:
title: "KnC Wallet"
titleshort: "KnC<br>Wallet"
Expand Down
2 changes: 2 additions & 0 deletions _templates/resources.html
Expand Up @@ -17,6 +17,8 @@ <h2><img src="/img/ico_simple.svg" class="titleicon" alt="Icon">{% translate use
</div><div>
<h2><img src="/img/ico_invoice.svg" class="titleicon" alt="Icon">{% translate directories %}</h2>
<p><a href="/{{ page.lang }}/{% translate choose-your-wallet url %}">{% translate linkwallets %}</a> - bitcoin.org</p>
<p><a href="http://coinmap.org/">{% translate linkmap %}</a> - coinmap.org</p>
<p><a href="https://airbitz.co/">{% translate linkbusinessdirectory %}</a> - airbitz.co</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paullinator Can you use {% translate linkmerchants %} and drop the "linkmap" and "linkbusinessdirectory" entries in _translations/en.yml? These are all merchant directories, so I guess it would make sense to use existing translations.

<p><a href="http://usebitcoins.info/">{% translate linkmerchants %}</a> - usebitcoins.info</p>
<p><a href="http://howtobuybitcoins.info/">{% translate linkexchanges %}</a> - howtobuybitcoins.info</p>
<p><a href="https://en.bitcoin.it/wiki/Category:Shopping_Cart_Interfaces">{% translate linkmerchantstools %}</a> - en.bitcoin.it</p>
Expand Down
3 changes: 3 additions & 0 deletions _translations/en.yml
Expand Up @@ -113,6 +113,7 @@ en:
walletelectrum: "Electrum's focus is speed and simplicity, with low resource usage. It uses remote servers that handle the most complicated parts of the Bitcoin system, and it allows you to recover your wallet from a secret phrase."
walletmsigna: "mSIGNA is an advanced yet easy-to-use wallet featuring speed and simplicity, enterprise-level scalability, and strong security. It supports BIP32, multisignature transactions, offline storage, multidevice synchronization, and encrypted electronic and paper backups."
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: "<a href='https://www.youtube.com/watch?v=E3Z7-ya-h5Y' target='_blank'>Airbitz (Video)</a> is a powerful yet easy to use Bitcoin Wallet & Directory allowing Bitcoin users to send and receive bitcoin and search 1000s of curated bitcoin businesses. The app has a focus on delivering privacy and security with an amazing user experience."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paullinator Can you avoid additional links in the description?

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."
Expand Down Expand Up @@ -502,6 +503,8 @@ en:
linkcointelegraph: "<a href=\"http://cointelegraph.com/\">CoinTelegraph</a>"
directories: "Directories"
linkwallets: "Wallets"
linkmap: "Map"
linkbusinessdirectory: "Business Directory"
linkmerchants: "Merchants"
linkexchanges: "Exchanges"
linkmerchantstools: "Merchant tools"
Expand Down
Binary file added img/screenshots/airbitzwalletandroid.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/wallet/airbitzwallet.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.