Update to version 2.9.3.1.2

-Added option to import Encrypted BIP32 Seed Phrases from Orion/Android
-Added note on the derivation path that should be used for Orion import
-Changed Android/iOS to Android/Orion

README.rst

@@ -87,13 +87,15 @@ Mac OS X
 
 ::
 
-    # On MacPorts installs: 
-    sudo python setup-release.py py2app
-    
-    # On Homebrew installs: 
+    # On MacPorts installs:
+    brew install cartr/qt4/pyqt
+    sudo python2 setup-release.py py2app
+
+    # On Homebrew installs:
     ARCHFLAGS="-arch i386 -arch x86_64" sudo python setup-release.py py2app --includes sip
-    
+
     sudo hdiutil create -fs HFS+ -volname "Electrum-NEBL" -srcfolder dist/Electrum-NEBL.app dist/electrum-nebl-VERSION-macosx.dmg
+    brew remove cartr/qt4/pyqt
 
 Windows
 -------

contrib/build-wine/build-electrum-git.sh

@@ -33,7 +33,7 @@ else
 fi
 
 cd electrum-nebl-git
-VERSION=2.9.3.1.1
+VERSION=2.9.3.1.2
 echo "Last commit: $VERSION"
 
 cd ..

gui/qt/installwizard.py

@@ -29,8 +29,8 @@ class GoBack(Exception):
                      + _("Leave this field empty if you want to disable encryption.")
 MSG_RESTORE_PASSPHRASE = \
     _("Please enter your seed derivation passphrase. "
-      "Note: this is NOT your encryption password. "
-      "Leave this field empty if you did not use one or are unsure.")
+      "Note: this is ONLY if you encrypted your seed phrase in Android or Orion with a password. "
+      "This is NOT a wallet password. Leave this field empty if you did not use one or are unsure.")
 
 
 class CosignWidget(QWidget):
@@ -353,12 +353,12 @@ def add_cosigner_dialog(self, run_next, index, is_valid):
     @wizard_dialog
     def restore_seed_dialog(self, run_next, test):
         options = []
-        #if self.opt_ext:
-        #    options.append('ext')
+        if self.opt_ext:
+            options.append('ext')
         if self.opt_bip39:
             options.append('bip39')
         title = _('Enter Seed')
-        message = _('Please enter your ELECTRUM seed phrase in order to restore your wallet.\nTo recover using an Android or iOS seed phrase, click Options')
+        message = _('Please enter your ELECTRUM seed phrase in order to restore your wallet.\nTo recover using an Android or Orion seed phrase, click Options')
         return self.seed_input(title, message, test, options)
 
     @wizard_dialog

gui/qt/seed_dialog.py

@@ -68,13 +68,13 @@ def f(b):
                 if b:
                     msg = ' '.join([
                         '<b>' + _('Warning') + ': BIP39 seeds can be imported by Electrum, but not exported!' + '</b><br/><br/>',
-                        _('BIP39 seeds can be imported in Electrum so that users can access funds from our Android or iOS wallets.'),
+                        _('BIP39 seeds can be imported in Electrum so that users can access funds from our Android or Orion wallets.'),
                         _('However, Electrum does not export BIP39 seeds or save your seed phrase for later viewing.'),
                     ])
                 else:
                     msg = ''
                 self.seed_warning.setText(msg)
-            cb_bip39 = QCheckBox(_('Android/iOS seed (BIP39)'))
+            cb_bip39 = QCheckBox(_('Android/Orion seed (BIP39)'))
             cb_bip39.toggled.connect(f)
             cb_bip39.setChecked(self.is_bip39)
             vbox.addWidget(cb_bip39)

lib/base_wizard.py

@@ -229,6 +229,7 @@ def derivation_dialog(self, f):
         default = bip44_derivation(0)
         message = '\n'.join([
             _('Enter your wallet derivation here.'),
+            _('For Orion use: m/44\'/0\'/0\''),
             _('If you are not sure what this is, leave this field unchanged.')
         ])
         self.line_dialog(run_next=f, title=_('Derivation'), message=message, default=default, test=bitcoin.is_bip32_derivation)
@@ -256,8 +257,8 @@ def passphrase_dialog(self, run_next):
             _('Your seed extension must be saved together with your seed.'),
         ])
         warning = '\n'.join([
-            _('Note that this is NOT your encryption password.'),
-            _('If you do not know what this is, leave this field empty.'),
+            _('Use this ONLY if you encrypted your seed phrase in Android/Orion.'),
+            _('This is NOT a wallet password. If you do not know what this is, leave this field empty.'),
         ])
         self.line_dialog(title=title, message=message, warning=warning, default='', test=lambda x:True, run_next=run_next)
 

lib/version.py

@@ -1,4 +1,4 @@
-ELECTRUM_VERSION = '2.9.3.1.1' # version of the client package
+ELECTRUM_VERSION = '2.9.3.1.2' # version of the client package
 PROTOCOL_VERSION = '0.10'   # protocol version requested
 
 # The hash of the mnemonic seed must begin with this