From f1822a960322dd49f2678edbc7b4a9203c55336a Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 15 Feb 2016 19:50:44 +0100 Subject: [PATCH] pending->unconfirmed --- gui/kivy/uix/screens.py | 4 ++-- gui/qt/history_widget.py | 4 ++-- gui/qt/main_window.py | 2 +- gui/stdio.py | 2 +- gui/text.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py index c5a20e8c8..2e69a6d1a 100644 --- a/gui/kivy/uix/screens.py +++ b/gui/kivy/uix/screens.py @@ -127,10 +127,10 @@ class HistoryScreen(CScreen): except Exception: time_str = _("error") if conf == -1: - time_str = _('unverified') + time_str = _('Not Verified') icon = "atlas://gui/kivy/theming/light/close" elif conf == 0: - time_str = _('pending') + time_str = _('Unconfirmed') icon = "atlas://gui/kivy/theming/light/unconfirmed" elif conf < 6: conf = max(1, conf) diff --git a/gui/qt/history_widget.py b/gui/qt/history_widget.py index 260802ad2..9aee386f8 100644 --- a/gui/qt/history_widget.py +++ b/gui/qt/history_widget.py @@ -44,10 +44,10 @@ class HistoryWidget(MyTreeWidget): if conf > 0: time_str = format_time(timestamp) if conf == -1: - time_str = 'unverified' + time_str = _('Not Verified') icon = QIcon(":icons/unconfirmed.png") elif conf == 0: - time_str = 'pending' + time_str = _('Unconfirmed') icon = QIcon(":icons/unconfirmed.png") elif conf < 6: icon = QIcon(":icons/clock%d.png"%conf) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index fd66a2104..73387bee4 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -2477,7 +2477,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): else: time_string = "unknown" else: - time_string = "pending" + time_string = "unconfirmed" if value is not None: value_string = format_satoshis(value, True) diff --git a/gui/stdio.py b/gui/stdio.py index c52cad789..650f5aa31 100644 --- a/gui/stdio.py +++ b/gui/stdio.py @@ -94,7 +94,7 @@ class ElectrumGui: except Exception: time_str = "unknown" else: - time_str = 'pending' + time_str = 'unconfirmed' label = self.wallet.get_label(tx_hash) messages.append( format_str%( time_str, label, format_satoshis(value, whitespaces=True), format_satoshis(balance, whitespaces=True) ) ) diff --git a/gui/text.py b/gui/text.py index 72acf702f..b3ca05fb0 100644 --- a/gui/text.py +++ b/gui/text.py @@ -115,7 +115,7 @@ class ElectrumGui: except Exception: time_str = "------" else: - time_str = 'pending' + time_str = 'unconfirmed' label = self.wallet.get_label(tx_hash) if len(label) > 40: