From dbc5abbe1969ea1bbd2ada39eae05e97006a10e3 Mon Sep 17 00:00:00 2001
From: Gatien Bovyn
Date: Thu, 13 Jun 2013 20:16:48 +0200
Subject: [PATCH] new string find to be translated in bitmessagemain + fixed
english typo in GUI
---
src/bitmessagemain.py | 3 +-
src/iconglossary.py | 37 +++-
src/newaddressdialog.py | 65 +++++---
src/translations/bitmessage_fr_BE.qm | Bin 50175 -> 50389 bytes
src/translations/bitmessage_fr_BE.ts | 241 ++++++++++++++-------------
5 files changed, 198 insertions(+), 148 deletions(-)
diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index 01202da1..bd46e308 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -177,7 +177,8 @@ class outgoingSynSender(threading.Thread):
shared.printLock.release()
except socks.Socks5AuthError as err:
shared.UISignalQueue.put((
- 'updateStatusBar', "SOCKS5 Authentication problem: " + str(err)))
+ 'updateStatusBar', _translate(
+ "MainWindow", "SOCKS5 Authentication problem: %1").arg(str(err))))
except socks.Socks5Error as err:
pass
print 'SOCKS5 error. (It is possible that the server wants authentication).)', str(err)
diff --git a/src/iconglossary.py b/src/iconglossary.py
index dc6a7ffd..32d92db6 100644
--- a/src/iconglossary.py
+++ b/src/iconglossary.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'iconglossary.ui'
#
-# Created: Tue Dec 18 14:31:18 2012
-# by: PyQt4 UI code generator 4.9.4
+# Created: Thu Jun 13 20:15:48 2013
+# by: PyQt4 UI code generator 4.10.1
#
# WARNING! All changes made in this file will be lost!
@@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
- _fromUtf8 = lambda s: s
+ def _fromUtf8(s):
+ return s
+
+try:
+ _encoding = QtGui.QApplication.UnicodeUTF8
+ def _translate(context, text, disambig):
+ return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+ def _translate(context, text, disambig):
+ return QtGui.QApplication.translate(context, text, disambig)
class Ui_iconGlossaryDialog(object):
def setupUi(self, iconGlossaryDialog):
@@ -69,11 +78,21 @@ class Ui_iconGlossaryDialog(object):
QtCore.QMetaObject.connectSlotsByName(iconGlossaryDialog)
def retranslateUi(self, iconGlossaryDialog):
- iconGlossaryDialog.setWindowTitle(QtGui.QApplication.translate("iconGlossaryDialog", "Icon Glossary", None, QtGui.QApplication.UnicodeUTF8))
- self.groupBox.setTitle(QtGui.QApplication.translate("iconGlossaryDialog", "Icon Glossary", None, QtGui.QApplication.UnicodeUTF8))
- self.label_2.setText(QtGui.QApplication.translate("iconGlossaryDialog", "You have no connections with other peers. ", None, QtGui.QApplication.UnicodeUTF8))
- self.label_4.setText(QtGui.QApplication.translate("iconGlossaryDialog", "You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn\'t configured to foward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.", None, QtGui.QApplication.UnicodeUTF8))
- self.labelPortNumber.setText(QtGui.QApplication.translate("iconGlossaryDialog", "You are using TCP port ?. (This can be changed in the settings).", None, QtGui.QApplication.UnicodeUTF8))
- self.label_6.setText(QtGui.QApplication.translate("iconGlossaryDialog", "You do have connections with other peers and your firewall is correctly configured.", None, QtGui.QApplication.UnicodeUTF8))
+ iconGlossaryDialog.setWindowTitle(_translate("iconGlossaryDialog", "Icon Glossary", None))
+ self.groupBox.setTitle(_translate("iconGlossaryDialog", "Icon Glossary", None))
+ self.label_2.setText(_translate("iconGlossaryDialog", "You have no connections with other peers. ", None))
+ self.label_4.setText(_translate("iconGlossaryDialog", "You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn\'t configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.", None))
+ self.labelPortNumber.setText(_translate("iconGlossaryDialog", "You are using TCP port ?. (This can be changed in the settings).", None))
+ self.label_6.setText(_translate("iconGlossaryDialog", "You do have connections with other peers and your firewall is correctly configured.", None))
import bitmessage_icons_rc
+
+if __name__ == "__main__":
+ import sys
+ app = QtGui.QApplication(sys.argv)
+ iconGlossaryDialog = QtGui.QDialog()
+ ui = Ui_iconGlossaryDialog()
+ ui.setupUi(iconGlossaryDialog)
+ iconGlossaryDialog.show()
+ sys.exit(app.exec_())
+
diff --git a/src/newaddressdialog.py b/src/newaddressdialog.py
index 637c3a46..f9bf9203 100644
--- a/src/newaddressdialog.py
+++ b/src/newaddressdialog.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'newaddressdialog.ui'
#
-# Created: Tue Apr 30 12:21:14 2013
-# by: PyQt4 UI code generator 4.9.4
+# Created: Thu Jun 13 20:12:21 2013
+# by: PyQt4 UI code generator 4.10.1
#
# WARNING! All changes made in this file will be lost!
@@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
- _fromUtf8 = lambda s: s
+ def _fromUtf8(s):
+ return s
+
+try:
+ _encoding = QtGui.QApplication.UnicodeUTF8
+ def _translate(context, text, disambig):
+ return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+ def _translate(context, text, disambig):
+ return QtGui.QApplication.translate(context, text, disambig)
class Ui_NewAddressDialog(object):
def setupUi(self, NewAddressDialog):
@@ -161,24 +170,34 @@ class Ui_NewAddressDialog(object):
NewAddressDialog.setTabOrder(self.checkBoxEighteenByteRipe, self.buttonBox)
def retranslateUi(self, NewAddressDialog):
- NewAddressDialog.setWindowTitle(QtGui.QApplication.translate("NewAddressDialog", "Create new Address", None, QtGui.QApplication.UnicodeUTF8))
- self.label.setText(QtGui.QApplication.translate("NewAddressDialog", "Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a \"deterministic\" address.\n"
-"The \'Random Number\' option is selected by default but deterministic addresses have several pros and cons:", None, QtGui.QApplication.UnicodeUTF8))
- self.label_5.setText(QtGui.QApplication.translate("NewAddressDialog", "
Pros: You can recreate your addresses on any computer from memory. You need-not worry about backing up your keys.dat file as long as you can remember your passphrase. Cons: You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost. You must remember the address version number and the stream number along with your passphrase. If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.
", None, QtGui.QApplication.UnicodeUTF8))
- self.radioButtonRandomAddress.setText(QtGui.QApplication.translate("NewAddressDialog", "Use a random number generator to make an address", None, QtGui.QApplication.UnicodeUTF8))
- self.radioButtonDeterministicAddress.setText(QtGui.QApplication.translate("NewAddressDialog", "Use a passpharase to make addresses", None, QtGui.QApplication.UnicodeUTF8))
- self.checkBoxEighteenByteRipe.setText(QtGui.QApplication.translate("NewAddressDialog", "Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter", None, QtGui.QApplication.UnicodeUTF8))
- self.groupBoxDeterministic.setTitle(QtGui.QApplication.translate("NewAddressDialog", "Make deterministic addresses", None, QtGui.QApplication.UnicodeUTF8))
- self.label_9.setText(QtGui.QApplication.translate("NewAddressDialog", "Address version number: 3", None, QtGui.QApplication.UnicodeUTF8))
- self.label_8.setText(QtGui.QApplication.translate("NewAddressDialog", "In addition to your passphrase, you must remember these numbers:", None, QtGui.QApplication.UnicodeUTF8))
- self.label_6.setText(QtGui.QApplication.translate("NewAddressDialog", "Passphrase", None, QtGui.QApplication.UnicodeUTF8))
- self.label_11.setText(QtGui.QApplication.translate("NewAddressDialog", "Number of addresses to make based on your passphrase:", None, QtGui.QApplication.UnicodeUTF8))
- self.label_10.setText(QtGui.QApplication.translate("NewAddressDialog", "Stream number: 1", None, QtGui.QApplication.UnicodeUTF8))
- self.label_7.setText(QtGui.QApplication.translate("NewAddressDialog", "Retype passphrase", None, QtGui.QApplication.UnicodeUTF8))
- self.groupBox.setTitle(QtGui.QApplication.translate("NewAddressDialog", "Randomly generate address", None, QtGui.QApplication.UnicodeUTF8))
- self.label_2.setText(QtGui.QApplication.translate("NewAddressDialog", "Label (not shown to anyone except you)", None, QtGui.QApplication.UnicodeUTF8))
- self.radioButtonMostAvailable.setText(QtGui.QApplication.translate("NewAddressDialog", "Use the most available stream", None, QtGui.QApplication.UnicodeUTF8))
- self.label_3.setText(QtGui.QApplication.translate("NewAddressDialog", " (best if this is the first of many addresses you will create)", None, QtGui.QApplication.UnicodeUTF8))
- self.radioButtonExisting.setText(QtGui.QApplication.translate("NewAddressDialog", "Use the same stream as an existing address", None, QtGui.QApplication.UnicodeUTF8))
- self.label_4.setText(QtGui.QApplication.translate("NewAddressDialog", "(saves you some bandwidth and processing power)", None, QtGui.QApplication.UnicodeUTF8))
+ NewAddressDialog.setWindowTitle(_translate("NewAddressDialog", "Create new Address", None))
+ self.label.setText(_translate("NewAddressDialog", "Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a \"deterministic\" address.\n"
+"The \'Random Number\' option is selected by default but deterministic addresses have several pros and cons:", None))
+ self.label_5.setText(_translate("NewAddressDialog", "
Pros: You can recreate your addresses on any computer from memory. You need-not worry about backing up your keys.dat file as long as you can remember your passphrase. Cons: You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost. You must remember the address version number and the stream number along with your passphrase. If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.