tMerge pull request #332 from rdymac/translations-and-fixes - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5133ef7a7a2f11dab29ed5c6377b0024bc155377
DIR parent dfb2d12602f2f44caf2e43819cdd97c6797a8153
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Thu, 10 Oct 2013 01:15:35 -0700
Merge pull request #332 from rdymac/translations-and-fixes
Translations, fixes, line breaks and blank spaces
Diffstat:
M gui/qt/installwizard.py | 8 ++++----
M gui/qt/network_dialog.py | 2 +-
M lib/version.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -30,7 +30,7 @@ class InstallWizard(QDialog):
grid = QGridLayout()
grid.setSpacing(5)
- msg = _("Electrum could not find an existing wallet.")+"\n\n"+_("Did you use Electrum before and want to restore a previous wallet or is this your first time and do you want to create a new wallet?"+"\n")
+ msg = _("Electrum could not find an existing wallet.")+"\n\n"+_("Did you use Electrum before and want to restore a previous wallet or is this your first time and do you want to create a new wallet?")+"\n"
label = QLabel(msg)
label.setWordWrap(True)
grid.addWidget(label, 0, 0)
t@@ -89,10 +89,10 @@ class InstallWizard(QDialog):
vbox = QVBoxLayout(self)
if is_restore:
msg = _("Please enter your wallet seed.") + "\n"
- msg += _("Your seed can be entered as a sequence of words, or as a hexadecimal string."+ ' \n')
+ msg += _("Your seed can be entered as a sequence of words, or as a hexadecimal string.")+ ' \n'
else:
msg = _("Your seed is important!") \
- + "\n" + _("To make sure that you have properly saved your seed, please retype it here." + ' ')
+ + "\n" + _("To make sure that you have properly saved your seed, please retype it here.") + ' '
logo = QLabel()
logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(56))
t@@ -195,7 +195,7 @@ class InstallWizard(QDialog):
grid.setSpacing(5)
label = QLabel(_("Electrum communicates with remote servers to get information about your transactions and addresses. The servers all fulfil the same purpose only differing in hardware. In most cases you simply want to let Electrum pick one at random if you have a preference though feel free to select a server manually.") + "\n\n" \
- + _("How do you want to connect to a server: "))
+ + _("How do you want to connect to a server:")+" ")
label.setWordWrap(True)
grid.addWidget(label, 0, 0)
DIR diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py
t@@ -104,7 +104,7 @@ class NetworkDialog(QDialog):
self.autocycle_cb.setChecked(self.config.get('auto_cycle', True))
grid.addWidget(self.autocycle_cb, 0, 1)
if not self.config.is_modifiable('auto_cycle'): self.autocycle_cb.setEnabled(False)
- msg = _("If auto-connect is enabled, Electrum will always use a server that is on the the longest blockchain.") + " " \
+ msg = _("If auto-connect is enabled, Electrum will always use a server that is on the longest blockchain.") + " " \
+ _("If it is disabled, Electrum will warn you if your server is lagging.")
grid.addWidget(HelpButton(msg), 0, 4)
DIR diff --git a/lib/version.py b/lib/version.py
t@@ -1,4 +1,4 @@
ELECTRUM_VERSION = "1.9" # version of the client package
PROTOCOL_VERSION = '0.6' # protocol version requested
SEED_VERSION = 5 # bump this every time the seed generation is modified
-TRANSLATION_ID = 4118 # version of the wiki page
+TRANSLATION_ID = 4127 # version of the wiki page