tMerge pull request #1660 from prusnak/master - electrum - Electrum Bitcoin wallet (HTM) git clone https://git.parazyd.org/electrum (DIR) Log (DIR) Files (DIR) Refs (DIR) Submodules --- (DIR) commit 78d59d6aa5783cbbd3c2fd0b67360dda992da20f (DIR) parent 03d313572e293d4a3d01cd4b4eb82f1d17214919 (HTM) Author: Neil <kyuupichan@gmail.com> Date: Sat, 30 Jan 2016 10:16:47 +0900 Merge pull request #1660 from prusnak/master fix spelling of TREZOR and SatoshiLabs Diffstat: M RELEASE-NOTES | 16 ++++++++-------- M contrib/build-wine/README | 2 +- M plugins/trezor/__init__.py | 6 +++--- M plugins/trezor/plugin.py | 4 ++-- M plugins/trezor/qt_generic.py | 4 ++-- M plugins/trezor/trezor.py | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) --- (DIR) diff --git a/RELEASE-NOTES b/RELEASE-NOTES t@@ -8,7 +8,7 @@ * the install wizard has been rewritten and improved * support minikeys as used in Casascius coins for private key import and sweeping - * much improved support for Trezor and KeepKey devices: + * much improved support for TREZOR and KeepKey devices: - full device information display - initialize a new or wiped device in 4 ways: 1) device generates a new wallet t@@ -17,7 +17,7 @@ 4) you enter a master private key - KeepKey secure seed recovery (KeepKey only) - change / set / disable PIN - - set homescreen (Trezor only) + - set homescreen (TREZOR only) - set a session timeout. Once a session has timed out, further use of the device requires your PIN and passhphrase to be re-entered - enable / disable passphrases t@@ -91,8 +91,8 @@ output). The BIP21 URI scheme is extended with 'name', 'sig', 'time', 'exp'. * Arbitrary m-of-n multisig wallets are supported (n<=15). - * Multisig transactions can be signed with Trezor. When you create - the multisig wallet, just enter the xpub of your existing Trezor + * Multisig transactions can be signed with TREZOR. When you create + the multisig wallet, just enter the xpub of your existing TREZOR wallet. * Transaction fees set manually in the GUI are retained, including when the user uses the '!' shortcut. t@@ -119,7 +119,7 @@ * More efficient coin selection. Spend oldest coins first, and minimize the number of transaction inputs. * Plugins are loaded independently of the GUI. As a result, Openalias, - TrustedCoin and Trezor wallets can be used with the command + TrustedCoin and TREZOR wallets can be used with the command line. Example: 'electrum payto <openalias> <amount>' * The command line has been refactored: - Arguments are parsed with argparse. t@@ -198,8 +198,8 @@ * Fix thread timing bug (#1054) # Release 2.0.1 - bugfixes - * Fix critical bug in Trezor address derivation: passphrases were not - NFKD normalized. Trezor users who created a wallet protected by a + * Fix critical bug in TREZOR address derivation: passphrases were not + NFKD normalized. TREZOR users who created a wallet protected by a passphrase containing utf-8 characters with diacritics are affected. These users will have to open their wallet with version 2.0 and to move their funds to a new wallet. t@@ -238,7 +238,7 @@ - Verification of the chain of signatures uses tlslite. - In the GUI, payment requests are shown in the 'Invoices' tab. - * Support for hardware wallets: Trezor (Satoshilabs) and Btchip (Ledger). + * Support for hardware wallets: TREZOR (SatoshiLabs) and Btchip (Ledger). * Two-factor authentication service by TrustedCoin. This service uses "2 of 3" multisig wallets and Google Authenticator. Note that (DIR) diff --git a/contrib/build-wine/README b/contrib/build-wine/README t@@ -3,7 +3,7 @@ These scripts can be used for cross-compilation of Windows Electrum executables Usage: 1. Install Wine (tested with wine-1.7.18) 2. Run "./prepare-wine.sh", it will download all dependencies. When you'll be asked, always leave default settings and press "Next >". -3. Run "./prepare-hw.sh" to build support for hardware wallets (trezor) +3. Run "./prepare-hw.sh" to build support for hardware wallets (TREZOR) 4. Run "./build-electrum-git.sh". Sources will be packed into three separate versions to dist/ directory: * Standalone compressed executable is "dist/electrum.exe" * Uncompressed binaries are in "dist/electrum". They're useful for comparsion with other builds. (DIR) diff --git a/plugins/trezor/__init__.py b/plugins/trezor/__init__.py t@@ -1,9 +1,9 @@ from electrum.i18n import _ -fullname = 'Trezor Wallet' -description = _('Provides support for Trezor hardware wallet') +fullname = 'TREZOR Wallet' +description = _('Provides support for TREZOR hardware wallet') requires = [('trezorlib','github.com/trezor/python-trezor')] requires_wallet_type = ['trezor'] -registers_wallet_type = ('hardware', 'trezor', _("Trezor wallet")) +registers_wallet_type = ('hardware', 'trezor', _("TREZOR wallet")) available_for = ['qt', 'cmdline'] (DIR) diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py t@@ -19,7 +19,7 @@ from electrum.wallet import BIP44_Wallet from electrum.util import ThreadJob -# Trezor initialization methods +# TREZOR initialization methods TIM_NEW, TIM_RECOVER, TIM_MNEMONIC, TIM_PRIVKEY = range(0, 4) class DeviceDisconnectedError(Exception): t@@ -290,7 +290,7 @@ class TrezorCompatiblePlugin(BasePlugin, ThreadJob): (item, label, pin_protection, passphrase_protection) \ = wallet.handler.request_trezor_init_settings(method, self.device) - if method == TIM_RECOVER and self.device == 'Trezor': + if method == TIM_RECOVER and self.device == 'TREZOR': # Warn user about firmware lameness wallet.handler.show_error(_( "You will be asked to enter 24 words regardless of your " (DIR) diff --git a/plugins/trezor/qt_generic.py b/plugins/trezor/qt_generic.py t@@ -131,7 +131,7 @@ class CharacterDialog(WindowModalDialog): class QtHandler(QObject, PrintError): '''An interface between the GUI (here, QT) and the device handling logic for handling I/O. This is a generic implementation of the - Trezor protocol; derived classes can customize it.''' + TREZOR protocol; derived classes can customize it.''' charSig = pyqtSignal(object) qcSig = pyqtSignal(object, object) t@@ -283,7 +283,7 @@ class QtHandler(QObject, PrintError): vbox1 = QVBoxLayout() gb.setLayout(vbox1) # KeepKey recovery doesn't need a word count - if method == TIM_NEW or self.device == 'Trezor': + if method == TIM_NEW or self.device == 'TREZOR': vbox.addWidget(gb) gb.setTitle(_("Select your seed length:")) choices = [ (DIR) diff --git a/plugins/trezor/trezor.py b/plugins/trezor/trezor.py t@@ -3,7 +3,7 @@ from .plugin import TrezorCompatiblePlugin, TrezorCompatibleWallet class TrezorWallet(TrezorCompatibleWallet): wallet_type = 'trezor' - device = 'Trezor' + device = 'TREZOR' class TrezorPlugin(TrezorCompatiblePlugin):