Bitmessage/PyBitmessage-2024-12-02
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

grammar change #593

Merged
Atheros1 merged 4 commits from master into master 2013-12-25 06:47:51 +01:00
Conversation 0 Commits 4 Files Changed 8 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 346582dcb5 - Show all commits

4
src/bitmessageqt/__init__.py
View File

@ -820,7 +820,7 @@ class MyForm(QtGui.QMainWindow):
if status == 'awaitingpubkey': if status == 'awaitingpubkey':
statusText = _translate( statusText = _translate(
"MainWindow", "Waiting on their encryption key. Will request it again soon.") "MainWindow", "Waiting for their encryption key. Will request it again soon.")
elif status == 'doingpowforpubkey': elif status == 'doingpowforpubkey':
statusText = _translate( statusText = _translate(
"MainWindow", "Encryption key request queued.") "MainWindow", "Encryption key request queued.")
@ -828,7 +828,7 @@ class MyForm(QtGui.QMainWindow):
statusText = _translate( statusText = _translate(
"MainWindow", "Queued.") "MainWindow", "Queued.")
elif status == 'msgsent': elif status == 'msgsent':
statusText = _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent at %1").arg( statusText = _translate("MainWindow", "Message sent. Waiting for acknowledgement. Sent at %1").arg(
unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8')) unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8'))
elif status == 'msgsentnoackexpected': elif status == 'msgsentnoackexpected':
statusText = _translate("MainWindow", "Message sent. Sent at %1").arg( statusText = _translate("MainWindow", "Message sent. Sent at %1").arg(

2
src/class_singleWorker.py
View File

@ -833,7 +833,7 @@ class singleWorker(threading.Thread):
strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
else: else:
# not sending to a chan or one of my addresses # not sending to a chan or one of my addresses
shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, tr.translateText("MainWindow", "Message sent. Waiting on acknowledgement. Sent on %1").arg(unicode( shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, tr.translateText("MainWindow", "Message sent. Waiting for acknowledgement. Sent on %1").arg(unicode(
strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
print 'Broadcasting inv for my msg(within sendmsg function):', inventoryHash.encode('hex') print 'Broadcasting inv for my msg(within sendmsg function):', inventoryHash.encode('hex')
shared.broadcastToSendDataQueues(( shared.broadcastToSendDataQueues((

4
src/translations/bitmessage_en_pirate.ts
View File

@ -106,7 +106,7 @@
</message> </message>
<message> <message>
<location filename="../bitmessageqt/__init__.py" line="632"/> <location filename="../bitmessageqt/__init__.py" line="632"/>
<source>Waiting on their encryption key. Will request it again soon.</source> <source>Waiting for their encryption key. Will request it again soon.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -121,7 +121,7 @@
</message> </message>
<message> <message>
<location filename="../bitmessageqt/__init__.py" line="641"/> <location filename="../bitmessageqt/__init__.py" line="641"/>
<source>Message sent. Waiting on acknowledgement. Sent at %1</source> <source>Message sent. Waiting for acknowledgement. Sent at %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>