electrum

commit 0dfec561e5fc32791890f85219c76108753fe91e
parent 2d1600d350254e7b4b1079992d227ca601b30c12
Author: Neil <kyuupichan@gmail.com>
Date:   Thu, 24 Sep 2015 12:17:07 +0900

Merge pull request #1460 from joelstanner/master

Fixes expiration value bug
Diffstat:
M
gui/qt/main_window.py
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -98,7 +98,7 @@ pr_tooltips = {
 
 expiration_values = [
     (_('1 hour'), 60*60),
-    (_('1 day'), 24*64*64),
+    (_('1 day'), 24*60*60),
     (_('1 week'), 7*24*60*60),
     (_('Never'), None)
 ]
@@ -607,7 +607,7 @@ class ElectrumWindow(QMainWindow, PrintError):
             _('Expired requests have to be deleted manually from your list, in order to free the corresponding Bitcoin addresses.'),
             _('The bitcoin address never expires and will always be part of this electrum wallet.'),
         ])
-        grid.addWidget(HelpLabel(_('Request expires in'), msg), 3, 0)
+        grid.addWidget(HelpLabel(_('Request expires'), msg), 3, 0)
         grid.addWidget(self.expires_combo, 3, 1)
         self.expires_label = QLineEdit('')
         self.expires_label.setReadOnly(1)