tMerge pull request #139 from rdymac/patch-33 - electrum - Electrum Bitcoin wallet
(HTM) git clone https://git.parazyd.org/electrum
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
---
(DIR) commit 681e8a0ec5d5334c2795e2d90bb5e9484b96287f
(DIR) parent 094fb8b0a06edb2e2fdbd780658bed310c5af3b8
(HTM) Author: ThomasV <thomasv1@gmx.de>
Date: Thu, 31 Jan 2013 02:10:20 -0800
Merge pull request #139 from rdymac/patch-33
Reviewed the entire code for missing text strings
Diffstat:
M lib/gui_qt.py | 50 ++++++++++++++++----------------
1 file changed, 25 insertions(+), 25 deletions(-)
---
(DIR) diff --git a/lib/gui_qt.py b/lib/gui_qt.py
t@@ -113,7 +113,7 @@ class UpdateLabel(QtGui.QLabel):
dialog.setModal(1)
main_layout = QGridLayout()
- main_layout.addWidget(QLabel("A new version of Electrum is available: " + self.latest_version), 0,0,1,3)
+ main_layout.addWidget(QLabel(_("A new version of Electrum is available:")+" " + self.latest_version), 0,0,1,3)
ignore_version = QPushButton(_("Ignore this version"))
ignore_version.clicked.connect(self.ignore_this_version)
t@@ -286,7 +286,7 @@ class QR_Window(QWidget):
def __init__(self, exchanger):
QWidget.__init__(self)
self.exchanger = exchanger
- self.setWindowTitle('Electrum - Invoice')
+ self.setWindowTitle('Electrum - '+_('Invoice'))
self.setMinimumSize(800, 250)
self.address = ''
self.labe = ''
t@@ -479,7 +479,7 @@ class ElectrumWindow(QMainWindow):
def update_wallet(self):
if self.wallet.interface and self.wallet.interface.is_connected:
if not self.wallet.up_to_date:
- text = _( "Synchronizing..." )
+ text = _("Synchronizing...")
icon = QIcon(":icons/status_waiting.png")
else:
c, u = self.wallet.get_balance()
t@@ -488,7 +488,7 @@ class ElectrumWindow(QMainWindow):
text += self.create_quote_text(Decimal(c+u)/100000000)
icon = QIcon(":icons/status_connected.png")
else:
- text = _( "Not connected" )
+ text = _("Not connected")
icon = QIcon(":icons/status_disconnected.png")
self.status_text = text
t@@ -516,7 +516,7 @@ class ElectrumWindow(QMainWindow):
l.setColumnCount(5)
for i,width in enumerate(self.column_widths['history']):
l.setColumnWidth(i, width)
- l.setHeaderLabels( [ '', _( 'Date' ), _( 'Description' ) , _('Amount'), _('Balance')] )
+ l.setHeaderLabels( [ '', _('Date'), _('Description') , _('Amount'), _('Balance')] )
self.connect(l, SIGNAL('itemDoubleClicked(QTreeWidgetItem*, int)'), self.tx_label_clicked)
self.connect(l, SIGNAL('itemChanged(QTreeWidgetItem*, int)'), self.tx_label_changed)
t@@ -1055,7 +1055,7 @@ class ElectrumWindow(QMainWindow):
def delete_imported_key(self, addr):
- if self.question("Do you want to remove %s from your wallet?"%addr):
+ if self.question(_("Do you want to remove")+" %s "%addr +_("from your wallet?")):
self.wallet.imported_keys.pop(addr)
self.update_receive_tab()
self.update_history_tab()
t@@ -1074,7 +1074,7 @@ class ElectrumWindow(QMainWindow):
menu.addAction(_("Copy to clipboard"), lambda: self.app.clipboard().setText(addr))
if self.receive_tab_mode == 2:
menu.addAction(_("Request amount"), lambda: self.edit_amount())
- menu.addAction(_("View QR"), lambda: ElectrumWindow.show_qrcode("Address","bitcoin:"+addr) )
+ menu.addAction(_("View QR"), lambda: ElectrumWindow.show_qrcode(_("Address"),"bitcoin:"+addr) )
menu.addAction(_("Edit label"), lambda: self.edit_label(True))
menu.addAction(_("Sign message"), lambda: self.sign_message(addr))
if addr in self.wallet.imported_keys:
t@@ -1103,7 +1103,7 @@ class ElectrumWindow(QMainWindow):
self.amount_e.setFocus()
def delete_contact(self, x, is_alias):
- if self.question("Do you want to remove %s from your list of contacts?"%x):
+ if self.question(_("Do you want to remove")+" %s "%x +_("from your list of contacts?")):
if not is_alias and x in self.wallet.addressbook:
self.wallet.addressbook.remove(x)
if x in self.wallet.labels.keys():
t@@ -1128,7 +1128,7 @@ class ElectrumWindow(QMainWindow):
menu = QMenu()
menu.addAction(_("Copy to Clipboard"), lambda: self.app.clipboard().setText(addr))
menu.addAction(_("Pay to"), lambda: self.payto(x, is_alias))
- menu.addAction(_("View QR code"),lambda: self.show_qrcode("Address","bitcoin:"+addr))
+ menu.addAction(_("View QR code"),lambda: self.show_qrcode(_("Address"),"bitcoin:"+addr))
if not is_alias:
menu.addAction(_("Edit label"), lambda: self.edit_label(False))
else:
t@@ -1213,7 +1213,7 @@ class ElectrumWindow(QMainWindow):
s = self.wallet.authorities.get(a[0])
else:
s = "self-signed"
- msg = 'Alias: '+ m + '\nTarget address: '+ a[1] + '\n\nSigned by: ' + s + '\nSigning address:' + a[0]
+ msg = _('Alias:')+' '+ m + '\n'+_('Target address:')+' '+ a[1] + '\n\n'+_('Signed by:')+' ' + s + '\n'+_('Signing address:')+' ' + a[0]
QMessageBox.information(self, 'Alias', msg, 'OK')
def update_contacts_tab(self):
t@@ -1299,7 +1299,7 @@ class ElectrumWindow(QMainWindow):
def show_master_public_key(self):
dialog = QDialog(None)
dialog.setModal(1)
- dialog.setWindowTitle("Master Public Key")
+ dialog.setWindowTitle(_("Master Public Key"))
main_text = QTextEdit()
main_text.setText(self.wallet.master_public_key)
t@@ -1349,7 +1349,7 @@ class ElectrumWindow(QMainWindow):
dialog = QDialog(None)
dialog.setModal(1)
- dialog.setWindowTitle(_("Electrum") + ' - ' + _('Seed'))
+ dialog.setWindowTitle('Electrum' + ' - ' + _('Seed'))
brainwallet = ' '.join(mnemonic.mn_encode(seed))
t@@ -1433,7 +1433,7 @@ class ElectrumWindow(QMainWindow):
if not address: return
d = QDialog(self)
d.setModal(1)
- d.setWindowTitle('Sign Message')
+ d.setWindowTitle(_('Sign Message'))
d.setMinimumSize(410, 290)
tab_widget = QTabWidget()
t@@ -1479,7 +1479,7 @@ class ElectrumWindow(QMainWindow):
b.clicked.connect(d.accept)
hbox.addWidget(b)
layout.addLayout(hbox, 4, 1)
- tab_widget.addTab(tab, "Sign")
+ tab_widget.addTab(tab, _("Sign"))
tab = QWidget()
t@@ -1502,7 +1502,7 @@ class ElectrumWindow(QMainWindow):
def do_verify():
try:
self.wallet.verify_message(verify_address.text(), str(verify_signature.toPlainText()), str(verify_message.toPlainText()))
- self.show_message("Signature verified")
+ self.show_message(_("Signature verified"))
except BaseException, e:
self.show_message(str(e))
return
t@@ -1515,7 +1515,7 @@ class ElectrumWindow(QMainWindow):
b.clicked.connect(d.accept)
hbox.addWidget(b)
layout.addLayout(hbox, 4, 1)
- tab_widget.addTab(tab, "Verify")
+ tab_widget.addTab(tab, _("Verify"))
vbox = QVBoxLayout()
vbox.addWidget(tab_widget)
t@@ -1689,14 +1689,14 @@ class ElectrumWindow(QMainWindow):
return
if not seed:
- QMessageBox.warning(None, _('Error'), _('No seed'), 'OK')
+ QMessageBox.warning(None, _('Error'), _('No seed'), _('OK'))
return
return seed, gap
def do_import_labels(self):
- labelsFile = QFileDialog.getOpenFileName(QWidget(), "Open text file", util.user_dir(), self.tr("Text Files (labels.dat)"))
+ labelsFile = QFileDialog.getOpenFileName(QWidget(), _("Open text file"), util.user_dir(), self.tr("Text Files (labels.dat)"))
if not labelsFile: return
try:
f = open(labelsFile, 'r')
t@@ -1705,9 +1705,9 @@ class ElectrumWindow(QMainWindow):
for key, value in json.loads(data).items():
self.wallet.labels[key] = value
self.wallet.save()
- QMessageBox.information(None, "Labels imported", "Your labels where imported from '%s'" % str(labelsFile))
+ QMessageBox.information(None, _("Labels imported"), _("Your labels where imported from")+" '%s'" % str(labelsFile))
except (IOError, os.error), reason:
- QMessageBox.critical(None, "Unable to import labels", "Electrum was unable to import your labels.\n" + str(reason))
+ QMessageBox.critical(None, _("Unable to import labels"), _("Electrum was unable to import your labels.")+"\n" + str(reason))
t@@ -1718,9 +1718,9 @@ class ElectrumWindow(QMainWindow):
f = open(labelsFile, 'w+')
json.dump(labels, f)
f.close()
- QMessageBox.information(None, "Labels exported", "Your labels where exported to '%s'" % str(labelsFile))
+ QMessageBox.information(None, "Labels exported", _("Your labels where exported to")+" '%s'" % str(labelsFile))
except (IOError, os.error), reason:
- QMessageBox.critical(None, "Unable to export labels", "Electrum was unable to export your labels.\n" + str(reason))
+ QMessageBox.critical(None, "Unable to export labels", _("Electrum was unable to export your labels.")+"\n" + str(reason))
def do_export_history(self):
from gui_lite import csv_transaction
t@@ -1745,13 +1745,13 @@ class ElectrumWindow(QMainWindow):
try:
addr = self.wallet.import_key(sec, password)
if not addr:
- QMessageBox.critical(None, "Unable to import key", "error")
+ QMessageBox.critical(None, _("Unable to import key"), "error")
else:
- QMessageBox.information(None, "Key imported", addr)
+ QMessageBox.information(None, _("Key imported"), addr)
self.update_receive_tab()
self.update_history_tab()
except BaseException as e:
- QMessageBox.critical(None, "Unable to import key", str(e))
+ QMessageBox.critical(None, _("Unable to import key"), str(e))
def settings_dialog(self):
d = QDialog(self)