commit 2b61c8e0cc46cd984bfa7ad9894f32054e0839e5
parent 5cc05b06852a0205eea4bc04af6be79913e2c750
Author: ecdsa <ecdsa@github>
Date: Mon, 1 Apr 2013 12:12:29 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/app.fil b/app.fil
@@ -2,3 +2,8 @@ gui/gui_gtk.py
gui/gui_classic.py
gui/gui_lite.py
gui/history_widget.py
+plugins/aliases.py
+plugins/pointofsale.py
+plugins/labels.py
+plugins/qrscanner.py
+plugins/virtualkeyboard.py
diff --git a/gui/gui_lite.py b/gui/gui_lite.py
@@ -912,7 +912,7 @@ class MiniActuator:
def copy_master_public_key(self):
- master_pubkey = self.wallet.master_public_key
+ master_pubkey = self.wallet.get_master_public_key()
qApp.clipboard().setText(master_pubkey)
QMessageBox.information(None, _("Copy successful"), _("Your master public key has been copied to your clipboard."))
diff --git a/lib/version.py b/lib/version.py
@@ -1,4 +1,4 @@
ELECTRUM_VERSION = "1.7.2" # version of the client package
PROTOCOL_VERSION = '0.6' # protocol version requested
SEED_VERSION = 4 # bump this every time the seed generation is modified
-TRANSLATION_ID = 3992 # version of the wiki page
+TRANSLATION_ID = 4012 # version of the wiki page
diff --git a/plugins/qrscanner.py b/plugins/qrscanner.py
@@ -12,7 +12,7 @@ from electrum_gui import BasePlugin
class Plugin(BasePlugin):
def __init__(self, gui):
- BasePlugin.__init__(self, gui, 'qrscans', 'QR scans', "QR Scans.\nInstall the zbar package to enable this plugin")
+ BasePlugin.__init__(self, gui, 'qrscans', 'QR scans', "QR Scans.\nInstall the zbar package (http://zbar.sourceforge.net/download.html) to enable this plugin")
self._is_available = self._init()
def _init(self):
