From ce1c9ca26a1beba5c6037c03ac0115172af69473 Mon Sep 17 00:00:00 2001 From: Yuri Date: Thu, 28 Nov 2013 17:51:07 -0800 Subject: [PATCH 1/3] Fixed grammar: 'Waiting on' -> 'Waiting for' --- src/translations/bitmessage_de.ts | 4 ++-- src/translations/bitmessage_eo.ts | 4 ++-- src/translations/bitmessage_fr.ts | 6 +++--- src/translations/bitmessage_ru.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/translations/bitmessage_de.ts b/src/translations/bitmessage_de.ts index 9eb718c3..210e4027 100644 --- a/src/translations/bitmessage_de.ts +++ b/src/translations/bitmessage_de.ts @@ -96,7 +96,7 @@ - Waiting on their encryption key. Will request it again soon. + Waiting for their encryption key. Will request it again soon. Warte auf den Verschlüsselungscode. Wird bald erneut angefordert. @@ -111,7 +111,7 @@ - Message sent. Waiting on acknowledgement. Sent at %1 + Message sent. Waiting for acknowledgement. Sent at %1 Nachricht gesendet. Warten auf Bestätigung. Gesendet %1 diff --git a/src/translations/bitmessage_eo.ts b/src/translations/bitmessage_eo.ts index 461ff559..816bd98c 100644 --- a/src/translations/bitmessage_eo.ts +++ b/src/translations/bitmessage_eo.ts @@ -101,7 +101,7 @@ - Waiting on their encryption key. Will request it again soon. + Waiting for their encryption key. Will request it again soon. mi ne certas kiel traduki "their" ĉi tie. Sonas strange al mi. Atendante al ilia ĉifroŝlosilo. Baldaŭ petos ĝin denove. @@ -117,7 +117,7 @@ - Message sent. Waiting on acknowledgement. Sent at %1 + Message sent. Waiting for acknowledgement. Sent at %1 Mesaĝo sendita. Atendante konfirmon. Sendita je %1 diff --git a/src/translations/bitmessage_fr.ts b/src/translations/bitmessage_fr.ts index d68a5990..3d94a688 100644 --- a/src/translations/bitmessage_fr.ts +++ b/src/translations/bitmessage_fr.ts @@ -313,7 +313,7 @@ p, li { white-space: pre-wrap; } - Waiting on their encryption key. Will request it again soon. + Waiting for their encryption key. Will request it again soon. En attente de la clé de chiffrement. Une nouvelle requête sera bientôt lancée. @@ -358,7 +358,7 @@ p, li { white-space: pre-wrap; } - Message sent. Waiting on acknowledgement. Sent at %1 + Message sent. Waiting for acknowledgement. Sent at %1 Message envoyé. En attente de l'accusé de réception. Envoyé le %1 @@ -747,7 +747,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o - Message sent. Waiting on acknowledgement. Sent on %1 + Message sent. Waiting for acknowledgement. Sent on %1 Message envoyé. En attente de l'accusé de réception. Envoyé le %1 diff --git a/src/translations/bitmessage_ru.ts b/src/translations/bitmessage_ru.ts index 3be907d0..a396165b 100644 --- a/src/translations/bitmessage_ru.ts +++ b/src/translations/bitmessage_ru.ts @@ -94,7 +94,7 @@ - Waiting on their encryption key. Will request it again soon. + Waiting for their encryption key. Will request it again soon. Ожидаем ключ шифрования от Вашего собеседника. Запрос будет повторен через некоторое время. @@ -109,7 +109,7 @@ - Message sent. Waiting on acknowledgement. Sent at %1 + Message sent. Waiting for acknowledgement. Sent at %1 Сообщение отправлено. Ожидаем подтверждения. Отправлено в %1 From 346582dcb526def1a3e14800556cd426c4d028b6 Mon Sep 17 00:00:00 2001 From: Yuri Date: Thu, 28 Nov 2013 17:52:05 -0800 Subject: [PATCH 2/3] Fixed grammar: 'Waiting on' -> 'Waiting for' --- src/bitmessageqt/__init__.py | 4 ++-- src/class_singleWorker.py | 2 +- src/translations/bitmessage_en_pirate.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index a3bf7ec3..0da4b5d2 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -820,7 +820,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.") @@ -828,7 +828,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( diff --git a/src/class_singleWorker.py b/src/class_singleWorker.py index 59d72ac3..10ba241c 100644 --- a/src/class_singleWorker.py +++ b/src/class_singleWorker.py @@ -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(( diff --git a/src/translations/bitmessage_en_pirate.ts b/src/translations/bitmessage_en_pirate.ts index 496b7d64..3666aa88 100644 --- a/src/translations/bitmessage_en_pirate.ts +++ b/src/translations/bitmessage_en_pirate.ts @@ -106,7 +106,7 @@ - Waiting on their encryption key. Will request it again soon. + Waiting for their encryption key. Will request it again soon. @@ -121,7 +121,7 @@ - Message sent. Waiting on acknowledgement. Sent at %1 + Message sent. Waiting for acknowledgement. Sent at %1 From 2ca0fed2272335c700ec9b258eee72c2b2b53864 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 25 Dec 2013 00:46:14 -0500 Subject: [PATCH 3/3] fix error during fixing of merge conflict --- src/translations/bitmessage_en_pirate.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/translations/bitmessage_en_pirate.ts b/src/translations/bitmessage_en_pirate.ts index 223c4b8b..2e719bf4 100644 --- a/src/translations/bitmessage_en_pirate.ts +++ b/src/translations/bitmessage_en_pirate.ts @@ -121,8 +121,7 @@ - - Waiting for their encryption key. Will request it again soon. + Waiting for their encryption key. Will request it again soon.