commit 37aef8332b4b99f7e2d8a74dcde2687a1dfad35a
parent 411209d2afe788c4af7b5363fe41e146f56a1f4e
Author: ThomasV <thomasv@gitorious>
Date: Sat, 11 Jul 2015 12:13:56 +0200
add more help messages
Diffstat:
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -585,7 +585,8 @@ class ElectrumWindow(QMainWindow):
self.receive_address_e = ButtonsLineEdit()
self.receive_address_e.addCopyButton(self.app)
self.receive_address_e.setReadOnly(True)
- self.receive_address_label = QLabel(_('Receiving address'))
+ msg = _('Bitcoin address where the payment should be received')
+ self.receive_address_label = HelpLabel(_('Receiving address'), msg)
self.receive_address_e.textChanged.connect(self.update_receive_qr)
self.receive_address_e.setFocusPolicy(Qt.NoFocus)
grid.addWidget(self.receive_address_label, 0, 0)
@@ -604,7 +605,8 @@ class ElectrumWindow(QMainWindow):
self.expires_combo = QComboBox()
self.expires_combo.addItems(map(lambda x:x[0], expiration_values))
self.expires_combo.setCurrentIndex(1)
- grid.addWidget(QLabel(_('Expires in')), 3, 0)
+ msg = _('Expiration date of your request. This information is not included in the Bitcoin address nor in the QR code; the recipient will see it only if you send them a complete request.')
+ grid.addWidget(HelpLabel(_('Expires in'), msg), 3, 0)
grid.addWidget(self.expires_combo, 3, 1)
self.expires_label = QLineEdit('')
self.expires_label.setReadOnly(1)
diff --git a/plugins/email.py b/plugins/email.py
@@ -178,10 +178,10 @@ class Plugin(BasePlugin):
d.setMinimumSize(500, 200)
vbox = QVBoxLayout(d)
+ vbox.addWidget(QLabel(_('Server hosting your email acount')))
grid = QGridLayout()
vbox.addLayout(grid)
-
- grid.addWidget(QLabel('Server'), 0, 0)
+ grid.addWidget(QLabel('Server (IMAP)'), 0, 0)
server_e = QLineEdit()
server_e.setText(self.imap_server)
grid.addWidget(server_e, 0, 1)
