Merge pull request #1660 from prusnak/master

fix spelling of TREZOR and SatoshiLabs

plugins/trezor/__init__.py

@@ -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']
 

plugins/trezor/plugin.py

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

plugins/trezor/qt_generic.py

@@ -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)
@@ -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 = [

plugins/trezor/trezor.py

@@ -3,7 +3,7 @@ from .plugin import TrezorCompatiblePlugin, TrezorCompatibleWallet
 
 class TrezorWallet(TrezorCompatibleWallet):
     wallet_type = 'trezor'
-    device = 'Trezor'
+    device = 'TREZOR'
 
 
 class TrezorPlugin(TrezorCompatiblePlugin):