citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Jonathan Warren 2013-12-25 00:42:31 -05:00
commit c18ee8e803
8 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitmessageqt/__init__.py
View File

@ -823,7 +823,7 @@ class MyForm(QtGui.QMainWindow):
if status == 'awaitingpubkey':
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':
statusText = _translate(
"MainWindow", "Encryption key request queued.")
@ -831,7 +831,7 @@ class MyForm(QtGui.QMainWindow):
statusText = _translate(
"MainWindow", "Queued.")
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'))
elif status == 'msgsentnoackexpected':
statusText = _translate("MainWindow", "Message sent. Sent at %1").arg(

2
src/class_singleWorker.py
View File

@ -832,7 +832,7 @@ class singleWorker(threading.Thread):
strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
else:
# 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')))))
print 'Broadcasting inv for my msg(within sendmsg function):', inventoryHash.encode('hex')
shared.broadcastToSendDataQueues((

4
src/translations/bitmessage_de.ts
View File

@ -112,7 +112,7 @@
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="823"/>
<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>Warte auf den Verschlüsselungscode. Wird bald erneut angefordert.</translation>
</message>
<message>
@ -127,7 +127,7 @@
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="832"/>
<source>Message sent. Waiting on acknowledgement. Sent at %1</source>
<source>Message sent. Waiting for acknowledgement. Sent at %1</source>
<translation>Nachricht gesendet. Warten auf Bestätigung. Gesendet %1</translation>
</message>
<message>

7
src/translations/bitmessage_en_pirate.ts
View File

@ -121,8 +121,9 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="823"/>
<source>Waiting on their encryption key. Will request it again soon.</source>
<location filename="../bitmessageqt/__init__.py" line="832"/>
<source>Waiting for 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>
</message>
<message>
@ -137,7 +138,7 @@
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="832"/>
<source>Message sent. Waiting on acknowledgement. Sent at %1</source>
<source>Message sent. Waiting for acknowledgement. Sent at %1</source>
<translation type="unfinished"></translation>
</message>
<message>

5
src/translations/bitmessage_eo.ts
View File

@ -112,7 +112,8 @@
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="823"/>
<source>Waiting on their encryption key. Will request it again soon.</source>
<source>Waiting for their encryption key. Will request it again soon.</source>
<translatorcomment>mi ne certas kiel traduki &quot;their&quot; ĉi tie. Sonas strange al mi.</translatorcomment>
<translation type="unfinished">Atendante al ilia ĉifroŝlosilo. Baldaŭ petos ĝin denove.</translation>
</message>
<message>
@ -127,7 +128,7 @@
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="832"/>
<source>Message sent. Waiting on acknowledgement. Sent at %1</source>
<source>Message sent. Waiting for acknowledgement. Sent at %1</source>
<translation>Mesaĝo sendita. Atendante konfirmon. Sendita je %1</translation>
</message>
<message>

6
src/translations/bitmessage_fr.ts
View File

@ -330,7 +330,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="823"/>
<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>En attente de la clé de chiffrement. Une nouvelle requête sera bientôt lancée.</translation>
</message>
<message>
@ -375,7 +375,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="832"/>
<source>Message sent. Waiting on acknowledgement. Sent at %1</source>
<source>Message sent. Waiting for acknowledgement. Sent at %1</source>
<translation>Message envoyé. En attente de l&apos;accusé de réception. Envoyé le %1</translation>
</message>
<message>
@ -763,7 +763,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l&apos;o
</message>
<message>
<location filename="../bitmessagemain.py" line="3779"/>
<source>Message sent. Waiting on acknowledgement. Sent on %1</source>
<source>Message sent. Waiting for acknowledgement. Sent on %1</source>
<translation type="obsolete">Message envoyé. En attente de l&apos;accusé de réception. Envoyé le %1</translation>
</message>
<message>

4
src/translations/bitmessage_no.ts
View File

@ -330,7 +330,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="823"/>
<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>Venter på krypteringsnøkkel. Sender straks en ny forespørsel.</translation>
</message>
<message>
@ -375,7 +375,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="832"/>
<source>Message sent. Waiting on acknowledgement. Sent at %1</source>
<source>Message sent. Waiting for acknowledgement. Sent at %1</source>
<translation>Beskjed sendt. Venter på bekreftelse. Sendt %1</translation>
</message>
<message>

4
src/translations/bitmessage_ru.ts
View File

@ -112,7 +112,7 @@
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="823"/>
<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>Ожидаем ключ шифрования от Вашего собеседника. Запрос будет повторен через некоторое время.</translation>
</message>
<message>
@ -127,7 +127,7 @@
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="832"/>
<source>Message sent. Waiting on acknowledgement. Sent at %1</source>
<source>Message sent. Waiting for acknowledgement. Sent at %1</source>
<translation>Сообщение отправлено. Ожидаем подтверждения. Отправлено в %1 </translation>
</message>
<message>