Merge remote-tracking branch 'refs/remotes/bitcoin-dot-org/master' in…

…to capacity-increases

# Conflicts:
#	zh_CN/bitcoin-core/capacity-increases.md
#	zh_TW/bitcoin-core/capacity-increases.md

README.md

@@ -23,9 +23,7 @@
   Good To Me (LGTM)" comment.
 
 * [Submit new wallets][] for the [Choose Your Wallet page][], or
-  help us [review wallet submissions][]. **Reviewers with Apple iOS
-  hardware especially needed**---email <[email protected]> to
-  be notified about iOS wallets needing review.
+  help us [review wallet submissions][].
 
 * [Translate Bitcoin.org into another language][] using [Transifex][] or
   help review new and updated translations. **Translation coordinator

_includes/bitcoin-core/capability-increases-sigs.md

@@ -12,6 +12,7 @@ http://opensource.org/licenses/MIT.
 - [BtcDrak](https://github.com/btcdrak)
 - [Charlie Lee](https://github.com/coblee)
 - [Christian Decker](https://github.com/cdecker)
+- [Cøbra](https://github.com/cobra-bitcoin)
 - [Cory Fields](https://github.com/theuni)
 - [Craig Watkins](https://github.com/crwatkins)
 - [Daniel](https://github.com/arowser)

_templates/about-us.html

@@ -81,11 +81,11 @@ <h3 id="inactive-contributors">{% translate inactive_contributors %}</h3>
   <p>Greg Sanders<span>Documentation Writing</span></p>
 </div>
 
-<h3 id="owners">{% translate owners %} — {% translate partial_list %}</h3>
+<h3 id="owners">{% translate owners %}</h3>
 
 <div class="credit">
-  <p>Martti Malmi<span>(AKA Sirius)<br>Inactive</span></p>
-  <p><a href="https://github.com/theymos">Michael Marquardt</a><span>(AKA Theymos)</span></p>
+  <p><a href="https://github.com/cobra-bitcoin">Cøbra</a><span>Co-Owner</span></p>
+  <p><a href="https://github.com/theymos">theymos</a><span>Co-Owner</span></p>
 </div>
 
 <h3 id="github">{% translate github %}</h3>

_templates/choose-your-wallet.html

@@ -666,27 +666,6 @@
           privacyaddressreuse: "checkpassprivacyaddressrotation"
           privacydisclosure: "checkfailprivacydisclosurecentralized"
           privacynetwork: "checkfailprivacynetworknosupporttor"
-- coinbase:
-    title: "Coinbase"
-    titleshort: "Coinbase"
-    compat: "web"
-    level: 4
-    platform:
-      web:
-        text: "walletcoinbase"
-        link: "https://coinbase.com"
-        screenshot: "coinbase.png"
-        os:
-        check:
-          control: "checkfailcontrolthirdparty"
-          validation: "checkfailvalidationcentralized"
-          transparency: "checkfailtransparencyremote"
-          environment: "checkfailenvironmentdesktop"
-          privacy: "checkpassprivacybasic"
-        privacycheck:
-          privacyaddressreuse: "checkpassprivacyaddressrotation"
-          privacydisclosure: "checkfailprivacydisclosureaccount"
-          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 - coinkite:
     title: "Coinkite"
     titleshort: "Coinkite"
@@ -772,6 +751,23 @@
           privacyaddressreuse: "checkpassprivacyaddressrotation"
           privacydisclosure: "checkfailprivacydisclosureaccount"
           privacynetwork: "checkpassprivacynetworksupporttorproxy"
+- keepkey:
+    title: "KeepKey"
+    titleshort: "KeepKey"
+    compat: "hardware"
+    level: 2
+    platform:
+      hardware:
+        text: "walletkeepkey"
+        link: "https://www.keepkey.com/"
+        source: "https://github.com/keepkey/"
+        screenshot: "keepkey.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkneutralvalidationvariable"
+          transparency: "checkfailtransparencynew"
+          environment: "checkgoodenvironmenthardware"
+          privacy: "checkneutralprivacyvariable"
 ---
 
 <!-- Note: this file exempt from check-for-subheading-anchors check -->

_translations/en.yml

@@ -185,6 +185,7 @@ en:
     walletbitgo: "BitGo is a high-security multi-sig wallet, which protects your bitcoin from theft and loss. You maintain full custody; BitGo cannot spend or freeze funds. BitGo wallets are easy to use and offer advanced security features such as spending limits and multi-user access."
     walletgreenaddress: "GreenAddress is a user-friendly multi-signature wallet with improved security and privacy. At no time are your keys server side, even encrypted. For security reasons, you should always use 2FA and the browser extension or Android App."
     wallettrezor: "Trezor is a hardware wallet providing a high level of security without sacrificing convenience. Unlike cold storage, Trezor is able to sign transactions while connected to an online device. That means spending bitcoins is secure even when using a compromised computer."
+    walletkeepkey: "KeepKey is a hardware wallet that makes bitcoin security simple. When you entrust KeepKey with your money, every bitcoin transaction you make must be reviewed and approved via it's OLED display and confirmation button."
     walletcopay: "Copay is the HD-multisignature wallet originally built to secure BitPay's funds. Copay supports multiple personal and shared wallets, testnet, and the full Payment Protocol. A private <a href=\"https://github.com/bitpay/bitcore-wallet-service\">BWS</a> node can be used for enhanced security and privacy."
     walletnano: "Ledger Nano is a hardware wallet built upon a ST23YT66 banking smartcard platform. It keeps the user private keys safe, validates transactions, can be used as a secure prepaid card or a multisignature party. While not open-source, it can be deterministically validated."
     walletninki: "An advanced wallet for experienced Bitcoin users. Ninki is a multi-signature wallet with a beautiful user interface. You have full control of your bitcoins at all times."