Translation and other merge requests #224

Merged
Atheros1 merged 47 commits from master into master 2013-06-19 16:55:24 +02:00
3 changed files with 11 additions and 6 deletions
Showing only changes of commit 71e30e1a65 - Show all commits

View File

@ -1415,7 +1415,7 @@ class MyForm(QtGui.QMainWindow):
# send broadcast...'+
# unicode(strftime(config.get('bitmessagesettings',
# 'timeformat'),localtime(int(time.time()))),'utf-8'))
newItem = myTableWidgetItem('Work is queued.')
newItem = myTableWidgetItem(_translate("MainWindow", "Work is queued."))
newItem.setData(Qt.UserRole, QByteArray(ackdata))
newItem.setData(33, int(time.time()))
self.ui.tableWidgetSent.setItem(0, 3, newItem)
@ -1502,10 +1502,10 @@ class MyForm(QtGui.QMainWindow):
# broadcast...'+
# unicode(strftime(shared.config.get('bitmessagesettings',
# 'timeformat'),localtime(int(time.time()))),'utf-8'))
newItem = myTableWidgetItem('Work is queued. ' + unicode(strftime(shared.config.get(
'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))
newItem.setToolTip('Work is queued. ' + unicode(strftime(shared.config.get(
'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))
newItem = myTableWidgetItem(_translate("MainWindow", "Work is queued. %1").arg(unicode(strftime(shared.config.get(
'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))
newItem.setToolTip(_translate("MainWindow", "Work is queued. %1").arg(unicode(strftime(shared.config.get(
'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))
newItem.setData(Qt.UserRole, QByteArray(ackdata))
newItem.setData(33, int(time.time()))
self.ui.tableWidgetSent.setItem(0, 3, newItem)

Binary file not shown.

View File

@ -750,7 +750,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o
<translation>Message envoyé. En attente de l&apos;accusé de réception. Envoyé le %1</translation>
</message>
<message>
<location filename="../bitmessagemain.py" line="3361"/>
<location filename="../bitmessagemain.py" line="3700"/>
<source>Error! Could not find sender address (your address) in the keys.dat file.</source>
<translation>Erreur ! L&apos;adresse de l&apos;expéditeur (vous) n&apos;a pas pu être trouvée dans le fichier keys.dat.</translation>
</message>
@ -786,6 +786,11 @@ Difficulté requise par le destinataire : %1 et %2</translation>
<source>Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do.</source>
<translation>Problème : Le travail demandé par le destinataire (%1 et %2) est plus difficile que ce que vous souhaitez faire.</translation>
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="1418"/>
<source>Work is queued.</source>
<translation>Travail en attente.</translation>
</message>
</context>
<context>
<name>NewAddressDialog</name>