Fix typos
This commit is contained in:
committed by
Johann Bauer
parent
5b2b59420f
commit
989c9c2b55
@@ -32,7 +32,7 @@ try:
|
||||
sys.argv = ['']
|
||||
import kivy
|
||||
except ImportError:
|
||||
# This error ideally shouldn't raised with pre-built packages
|
||||
# This error ideally shouldn't be raised with pre-built packages
|
||||
sys.exit("Error: Could not import kivy. Please install it using the" + \
|
||||
"instructions mentioned here `http://kivy.org/#download` .")
|
||||
|
||||
|
||||
@@ -398,7 +398,7 @@
|
||||
|
||||
<ActionOvrButton@ActionButton>
|
||||
#on_release:
|
||||
# fixme: the following line was commented out because it does no seem to do what it is intended
|
||||
# fixme: the following line was commented out because it does not seem to do what it is intended
|
||||
# Clock.schedule_once(lambda dt: self.parent.parent.dismiss() if self.parent else None, 0.05)
|
||||
on_press:
|
||||
Clock.schedule_once(lambda dt: app.popup_dialog(self.name), 0.05)
|
||||
|
||||
@@ -270,7 +270,7 @@ class ElectrumWindow(App):
|
||||
self.use_change = config.get('use_change', True)
|
||||
self.use_unconfirmed = not config.get('confirmed_only', False)
|
||||
|
||||
# create triggers so as to minimize updation a max of 2 times a sec
|
||||
# create triggers so as to minimize updating a max of 2 times a sec
|
||||
self._trigger_update_wallet = Clock.create_trigger(self.update_wallet, .5)
|
||||
self._trigger_update_status = Clock.create_trigger(self.update_status, .5)
|
||||
self._trigger_update_history = Clock.create_trigger(self.update_history, .5)
|
||||
@@ -728,7 +728,7 @@ class ElectrumWindow(App):
|
||||
def show_error(self, error, width='200dp', pos=None, arrow_pos=None,
|
||||
exit=False, icon='atlas://gui/kivy/theming/light/error', duration=0,
|
||||
modal=False):
|
||||
''' Show a error Message Bubble.
|
||||
''' Show an error Message Bubble.
|
||||
'''
|
||||
self.show_info_bubble( text=error, icon=icon, width=width,
|
||||
pos=pos or Window.center, arrow_pos=arrow_pos, exit=exit,
|
||||
@@ -736,7 +736,7 @@ class ElectrumWindow(App):
|
||||
|
||||
def show_info(self, error, width='200dp', pos=None, arrow_pos=None,
|
||||
exit=False, duration=0, modal=False):
|
||||
''' Show a Info Message Bubble.
|
||||
''' Show an Info Message Bubble.
|
||||
'''
|
||||
self.show_error(error, icon='atlas://gui/kivy/theming/light/important',
|
||||
duration=duration, modal=modal, exit=exit, pos=pos,
|
||||
@@ -744,7 +744,7 @@ class ElectrumWindow(App):
|
||||
|
||||
def show_info_bubble(self, text=_('Hello World'), pos=None, duration=0,
|
||||
arrow_pos='bottom_mid', width=None, icon='', modal=False, exit=False):
|
||||
'''Method to show a Information Bubble
|
||||
'''Method to show an Information Bubble
|
||||
|
||||
.. parameters::
|
||||
text: Message to be displayed
|
||||
|
||||
@@ -3,7 +3,7 @@ __all__ = ('NFCBase', 'NFCScanner')
|
||||
class NFCBase(Widget):
|
||||
''' This is the base Abstract definition class that the actual hardware dependent
|
||||
implementations would be based on. If you want to define a feature that is
|
||||
accissible and implemented by every platform implementation then define that
|
||||
accessible and implemented by every platform implementation then define that
|
||||
method in this class.
|
||||
'''
|
||||
|
||||
@@ -39,6 +39,6 @@ class NFCBase(Widget):
|
||||
# load NFCScanner implementation
|
||||
|
||||
NFCScanner = core_select_lib('nfc_manager', (
|
||||
# keep the dummy implementtation as the last one to make it the fallback provider.NFCScanner = core_select_lib('nfc_scanner', (
|
||||
# keep the dummy implementation as the last one to make it the fallback provider.NFCScanner = core_select_lib('nfc_scanner', (
|
||||
('android', 'scanner_android', 'ScannerAndroid'),
|
||||
('dummy', 'scanner_dummy', 'ScannerDummy')), True, 'electrum_gui.kivy')
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
'''This is the Android implementatoin of NFC Scanning using the
|
||||
'''This is the Android implementation of NFC Scanning using the
|
||||
built in NFC adapter of some android phones.
|
||||
'''
|
||||
|
||||
@@ -33,8 +33,8 @@ app = None
|
||||
|
||||
|
||||
class ScannerAndroid(NFCBase):
|
||||
''' This is the class responsible for handling the interace with the
|
||||
Android NFC adapter. See Module Documentation for deatils.
|
||||
''' This is the class responsible for handling the interface with the
|
||||
Android NFC adapter. See Module Documentation for details.
|
||||
'''
|
||||
|
||||
name = 'NFCAndroid'
|
||||
@@ -56,7 +56,7 @@ class ScannerAndroid(NFCBase):
|
||||
if not self.nfc_adapter:
|
||||
return False
|
||||
|
||||
# specify that we want our activity to remain on top whan a new intent
|
||||
# specify that we want our activity to remain on top when a new intent
|
||||
# is fired
|
||||
self.nfc_pending_intent = PendingIntent.getActivity(context, 0,
|
||||
Intent(context, context.getClass()).addFlags(
|
||||
@@ -128,7 +128,7 @@ class ScannerAndroid(NFCBase):
|
||||
return details
|
||||
|
||||
def on_new_intent(self, intent):
|
||||
''' This functions is called when the application receives a
|
||||
''' This function is called when the application receives a
|
||||
new intent, for the ones the application has registered previously,
|
||||
either in the manifest or in the foreground dispatch setup in the
|
||||
nfc_init function above.
|
||||
@@ -184,7 +184,7 @@ class ScannerAndroid(NFCBase):
|
||||
return extRecord
|
||||
|
||||
def create_ndef_message(self, *recs):
|
||||
''' Create the Ndef message that will written to tag
|
||||
''' Create the Ndef message that will be written to tag
|
||||
'''
|
||||
records = []
|
||||
for record in recs:
|
||||
|
||||
@@ -143,7 +143,7 @@ class InfoBubble(Factory.Bubble):
|
||||
else:
|
||||
Window.add_widget(self)
|
||||
|
||||
# wait for the bubble to adjust it's size according to text then animate
|
||||
# wait for the bubble to adjust its size according to text then animate
|
||||
Clock.schedule_once(lambda dt: self._show(pos, duration))
|
||||
|
||||
def _show(self, pos, duration):
|
||||
|
||||
@@ -65,7 +65,7 @@ Builder.load_string('''
|
||||
description: _("Create replaceable transactions.")
|
||||
message:
|
||||
_('If you check this box, your transactions will be marked as non-final,') \
|
||||
+ ' ' + _('and you will have the possiblity, while they are unconfirmed, to replace them with transactions that pays higher fees.') \
|
||||
+ ' ' + _('and you will have the possibility, while they are unconfirmed, to replace them with transactions that pays higher fees.') \
|
||||
+ ' ' + _('Note that some merchants do not accept non-final transactions until they are confirmed.')
|
||||
action: partial(root.boolean_dialog, 'use_rbf', _('Replace by fee'), self.message)
|
||||
CardSeparator
|
||||
|
||||
@@ -209,7 +209,7 @@ class SendScreen(CScreen):
|
||||
if not self.screen.address:
|
||||
return
|
||||
if self.screen.is_pr:
|
||||
# it sould be already saved
|
||||
# it should be already saved
|
||||
return
|
||||
# save address as invoice
|
||||
from electrum.paymentrequest import make_unsigned_request, PaymentRequest
|
||||
@@ -460,7 +460,7 @@ class TabbedCarousel(Factory.TabbedPanel):
|
||||
self.current_tab.state = "normal"
|
||||
header.state = 'down'
|
||||
self._current_tab = header
|
||||
# set the carousel to load the appropriate slide
|
||||
# set the carousel to load the appropriate slide
|
||||
# saved in the screen attribute of the tab head
|
||||
slide = carousel.slides[header.slide]
|
||||
if carousel.current_slide != slide:
|
||||
|
||||
@@ -63,7 +63,7 @@ class Exception_Window(QWidget, MessageBoxMixin):
|
||||
self.exc_args = (exctype, value, tb)
|
||||
self.main_window = main_window
|
||||
QWidget.__init__(self)
|
||||
self.setWindowTitle('Electrum - ' + _('An Error Occured'))
|
||||
self.setWindowTitle('Electrum - ' + _('An Error Occurred'))
|
||||
self.setMinimumSize(600, 300)
|
||||
|
||||
main_box = QVBoxLayout()
|
||||
|
||||
@@ -441,7 +441,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
|
||||
|
||||
def show_restore(self, wallet, network):
|
||||
# FIXME: these messages are shown after the install wizard is
|
||||
# finished and the window closed. On MacOSX they appear parented
|
||||
# finished and the window closed. On macOS they appear parented
|
||||
# with a re-appeared ghost install wizard window...
|
||||
if network:
|
||||
def task():
|
||||
|
||||
@@ -519,7 +519,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
||||
|
||||
tools_menu = menubar.addMenu(_("&Tools"))
|
||||
|
||||
# Settings / Preferences are all reserved keywords in OSX using this as work around
|
||||
# Settings / Preferences are all reserved keywords in macOS using this as work around
|
||||
tools_menu.addAction(_("Electrum preferences") if sys.platform == 'darwin' else _("Preferences"), self.settings_dialog)
|
||||
tools_menu.addAction(_("&Network"), lambda: self.gui_object.show_network_dialog(self))
|
||||
tools_menu.addAction(_("&Plugins"), self.plugins_dialog)
|
||||
@@ -2376,7 +2376,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
||||
|
||||
if isinstance(self.wallet, Multisig_Wallet):
|
||||
self.show_message(_('WARNING: This is a multi-signature wallet.') + '\n' +
|
||||
_('It can not be "backed up" by simply exporting these private keys.'))
|
||||
_('It cannot be "backed up" by simply exporting these private keys.'))
|
||||
|
||||
d = WindowModalDialog(self, _('Private keys'))
|
||||
d.setMinimumSize(980, 300)
|
||||
|
||||
Reference in New Issue
Block a user