Merge branch 'translations'

This commit is contained in:
Yuri 2013-11-28 17:57:04 -08:00
commit 63ac08a733
7 changed files with 14 additions and 14 deletions

View File

@ -822,7 +822,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.")
@ -830,7 +830,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(

View File

@ -833,7 +833,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((

View File

@ -96,7 +96,7 @@
</message>
<message>
<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>Warte auf den Verschlüsselungscode. Wird bald erneut angefordert.</translation>
</message>
<message>
@ -111,7 +111,7 @@
</message>
<message>
<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>Nachricht gesendet. Warten auf Bestätigung. Gesendet %1</translation>
</message>
<message>

View File

@ -106,7 +106,7 @@
</message>
<message>
<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>
</message>
<message>
@ -121,7 +121,7 @@
</message>
<message>
<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>
</message>
<message>

View File

@ -101,7 +101,7 @@
</message>
<message>
<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>
<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>
@ -117,7 +117,7 @@
</message>
<message>
<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>Mesaĝo sendita. Atendante konfirmon. Sendita je %1</translation>
</message>
<message>

View File

@ -313,7 +313,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<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>En attente de la clé de chiffrement. Une nouvelle requête sera bientôt lancée.</translation>
</message>
<message>
@ -358,7 +358,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<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>Message envoyé. En attente de l&apos;accusé de réception. Envoyé le %1</translation>
</message>
<message>
@ -747,7 +747,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>

View File

@ -94,7 +94,7 @@
</message>
<message>
<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>Ожидаем ключ шифрования от Вашего собеседника. Запрос будет повторен через некоторое время.</translation>
</message>
<message>
@ -109,7 +109,7 @@
</message>
<message>
<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>Сообщение отправлено. Ожидаем подтверждения. Отправлено в %1 </translation>
</message>
<message>