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 6 additions and 1 deletions
Showing only changes of commit 930159303c - Show all commits

View File

@ -4093,7 +4093,7 @@ class addressGenerator(threading.Thread):
apiAddressGeneratorReturnQueue.put( apiAddressGeneratorReturnQueue.put(
listOfNewAddressesToSendOutThroughTheAPI) listOfNewAddressesToSendOutThroughTheAPI)
shared.UISignalQueue.put(( shared.UISignalQueue.put((
'updateStatusBar', _translate("MainWindows", "Done generating address"))) 'updateStatusBar', _translate("MainWindow", "Done generating address")))
# shared.reloadMyAddressHashes() # shared.reloadMyAddressHashes()
elif command == 'getDeterministicAddress': elif command == 'getDeterministicAddress':
apiAddressGeneratorReturnQueue.put(address) apiAddressGeneratorReturnQueue.put(address)

Binary file not shown.

View File

@ -739,6 +739,11 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o
<source>Done generating address. Doing work necessary to broadcast it...</source> <source>Done generating address. Doing work necessary to broadcast it...</source>
<translation>Génération de l&apos;adresse terminée. Travail pour la diffuser en cours...</translation> <translation>Génération de l&apos;adresse terminée. Travail pour la diffuser en cours...</translation>
</message> </message>
<message>
<location filename="../bitmessagemain.py" line="4095"/>
<source>Done generating address</source>
<translation>Génération de l&apos;adresse terminée</translation>
</message>
</context> </context>
<context> <context>
<name>NewAddressDialog</name> <name>NewAddressDialog</name>