Merge branch 'airbitz'

_config.yml

@@ -143,7 +143,7 @@ aliases:
   CodeShark: Eric Lombrozo
 
 safe:        false
-server_port: 4000
+port: 4000
 base-url:    /
 
 source:      .

_templates/choose-your-wallet.html

@@ -191,6 +191,69 @@ wallets:
           privacyaddressreuse: "checkfailprivacyaddressrotation"
           privacydisclosure: "checkfailprivacydisclosurespv"
           privacynetwork: "checkfailprivacynetworknosupporttor"
+
+
+- airbitzwallet:
+    title: "Airbitz Bitcoin Wallet"
+    titleshort: "Airbitz"
+    compat: "mobile android ios"
+    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"
+          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"
+          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"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencynew"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+
+
 - kncwallet:
     title: "KnC Wallet"
     titleshort: "KnC<br>Wallet"

_templates/resources.html

@@ -19,6 +19,8 @@ id: resources
   </div><div>
     <h2><img src="/img/icons/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 linkmerchants %}</a> - coinmap.org</p>
+    <p><a href="https://airbitz.co/">{% translate linkmerchants %}</a> - airbitz.co</p>
     <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>

_translations/en.yml

@@ -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: "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."
     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."