V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
5 changed files with 5 additions and 5 deletions
Showing only changes of commit 57575d0a39 - Show all commits

View File

@ -948,7 +948,7 @@ class singleWorker(threading.Thread):
toAddress) toAddress)
shared.UISignalQueue.put(( shared.UISignalQueue.put((
'updateStatusBar', tr.translateText("MainWindow",'Broacasting the public key request. This program will auto-retry if they are offline.'))) 'updateStatusBar', tr.translateText("MainWindow",'Broadcasting the public key request. This program will auto-retry if they are offline.')))
shared.UISignalQueue.put(('updateSentItemStatusByToAddress', (toAddress, tr.translateText("MainWindow",'Sending public key request. Waiting for reply. Requested at %1').arg(l10n.formatTimestamp())))) shared.UISignalQueue.put(('updateSentItemStatusByToAddress', (toAddress, tr.translateText("MainWindow",'Sending public key request. Waiting for reply. Requested at %1').arg(l10n.formatTimestamp()))))
def generateFullAckMessage(self, ackdata, toStreamNumber, TTL): def generateFullAckMessage(self, ackdata, toStreamNumber, TTL):

View File

@ -145,5 +145,5 @@ def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS
return False return False
except Exception as err: except Exception as err:
print "Info: we could not tell whether your OS is limited to having very view half open connections because we couldn't interpret the platform version. Don't worry; we'll assume that it is not limited. This tends to occur on Raspberry Pis. :", err print "Info: we could not tell whether your OS is limited to having very few half open connections because we couldn't interpret the platform version. Don't worry; we'll assume that it is not limited. This tends to occur on Raspberry Pis. :", err
return False return False

View File

@ -905,7 +905,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location filename="../bitmessagemain.py" line="3844"/> <location filename="../bitmessagemain.py" line="3844"/>
<source>Broacasting the public key request. This program will auto-retry if they are offline.</source> <source>Broadcasting the public key request. This program will auto-retry if they are offline.</source>
<translation type="obsolete">Anfrage für den Verschlüsselungscode versendet (wird automatisch periodisch neu verschickt).</translation> <translation type="obsolete">Anfrage für den Verschlüsselungscode versendet (wird automatisch periodisch neu verschickt).</translation>
</message> </message>
<message> <message>

View File

@ -899,7 +899,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location filename="../bitmessagemain.py" line="3844"/> <location filename="../bitmessagemain.py" line="3844"/>
<source>Broacasting the public key request. This program will auto-retry if they are offline.</source> <source>Broadcasting the public key request. This program will auto-retry if they are offline.</source>
<translation type="obsolete">Anfrage für den Verschlüsselungscode versendet (wird automatisch periodisch neu verschickt).</translation> <translation type="obsolete">Anfrage für den Verschlüsselungscode versendet (wird automatisch periodisch neu verschickt).</translation>
</message> </message>
<message> <message>

View File

@ -1065,7 +1065,7 @@ Receiver&apos;s required difficulty: %1 and %2</source>
</message> </message>
<message> <message>
<location filename="../class_singleWorker.py" line="928"/> <location filename="../class_singleWorker.py" line="928"/>
<source>Broacasting the public key request. This program will auto-retry if they are offline.</source> <source>Broadcasting the public key request. This program will auto-retry if they are offline.</source>
<translation>广. 线, .</translation> <translation>广. 线, .</translation>
</message> </message>
<message> <message>