From 574f4d5c3e28f533683938f7f8232e6dbc945ec0 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 21:39:24 +0200 Subject: [PATCH] new translatable strings found + french translation updated --- src/bitmessagemain.py | 36 +++++++++++------------ src/translations/bitmessage_fr_BE.qm | Bin 50889 -> 52917 bytes src/translations/bitmessage_fr_BE.ts | 42 +++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 44c854a2..36c2ff4c 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3285,7 +3285,7 @@ class singleWorker(threading.Thread): fromaddress, 'privencryptionkey') except: shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) + ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file.")))) continue privSigningKeyHex = shared.decodeWalletImportFormat( @@ -3320,7 +3320,7 @@ class singleWorker(threading.Thread): payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For broadcast message) Doing proof of work...' shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Doing work necessary to send broadcast...'))) + ackdata, _translate("MainWindow", "Doing work necessary to send broadcast...")))) initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce @@ -3335,8 +3335,8 @@ class singleWorker(threading.Thread): shared.broadcastToSendDataQueues(( streamNumber, 'sendinv', inventoryHash)) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Broadcast sent on ' + unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Broadcast sent on %1").arg(unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) # Update the status of the message in the 'sent' table to have # a 'broadcastsent' status @@ -3359,7 +3359,7 @@ class singleWorker(threading.Thread): fromaddress, 'privencryptionkey') except: shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) + ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file.")))) continue privSigningKeyHex = shared.decodeWalletImportFormat( @@ -3406,7 +3406,7 @@ class singleWorker(threading.Thread): payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For broadcast message) Doing proof of work...' shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Doing work necessary to send broadcast...'))) + ackdata, _translate("MainWindow", "Doing work necessary to send broadcast...")))) initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce @@ -3421,8 +3421,8 @@ class singleWorker(threading.Thread): shared.broadcastToSendDataQueues(( streamNumber, 'sendinv', inventoryHash)) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Broadcast sent on ' + unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Broadcast sent on %1").arg(unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) # Update the status of the message in the 'sent' table to have # a 'broadcastsent' status @@ -3542,7 +3542,7 @@ class singleWorker(threading.Thread): fromStatus, fromAddressVersionNumber, fromStreamNumber, fromHash = decodeAddress( fromaddress) shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Looking up the receiver\'s public key'))) + ackdata, _translate("MainWindow", "Looking up the receiver\'s public key")))) shared.printLock.acquire() print 'Found a message in our database that needs to be sent with this pubkey.' print 'First 150 characters of message:', repr(message[:150]) @@ -3605,7 +3605,7 @@ class singleWorker(threading.Thread): requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.)'))) + ackdata, _translate("MainWindow", "Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.)")))) elif toAddressVersionNumber == 3: requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint( pubkeyPayload[readPosition:readPosition + 10]) @@ -3617,8 +3617,8 @@ class singleWorker(threading.Thread): requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte if requiredPayloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes: requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Doing work necessary to send message.\nReceiver\'s required difficulty: ' + str(float( - requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte) + ' and ' + str(float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Doing work necessary to send message.\nReceiver\'s required difficulty: %1 and %2").arg(str(float( + requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte)).arg(str(float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes))))) if status != 'forcepow': if (requiredAverageProofOfWorkNonceTrialsPerByte > shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') and shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') != 0) or (requiredPayloadLengthExtraBytes > shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') and shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') != 0): # The demanded difficulty is more than we are willing @@ -3631,8 +3631,8 @@ class singleWorker(threading.Thread): shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Problem: The work demanded by the recipient (' + str(float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte) + ' and ' + str(float( - requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes) + ') is more difficult than you are willing to do. ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do.").arg(str(float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte)).arg(str(float( + requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)).arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) continue embeddedTime = pack('>Q', (int(time.time()) + random.randrange( @@ -3652,7 +3652,7 @@ class singleWorker(threading.Thread): fromaddress, 'privencryptionkey') except: shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) + ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file.")))) continue privSigningKeyHex = shared.decodeWalletImportFormat( @@ -3698,7 +3698,7 @@ class singleWorker(threading.Thread): fromaddress, 'privencryptionkey') except: shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) + ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file.")))) continue privSigningKeyHex = shared.decodeWalletImportFormat( @@ -3769,8 +3769,8 @@ class singleWorker(threading.Thread): objectType = 'msg' shared.inventory[inventoryHash] = ( objectType, toStreamNumber, encryptedPayload, int(time.time())) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Message sent. Waiting on acknowledgement. Sent on ' + unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent on %1").ack(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(( streamNumber, 'sendinv', inventoryHash)) diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index 00d002533f828c955953bae2446bc4badb285991..6af9a1112360d8d67c52d8f6682cde43eac0f437 100644 GIT binary patch delta 2752 zcmZuzYgAO{72U(kW!^J91w`OdgMi|wAU**RB#7duh;Ky(<|4ym24@%p8X2n5_(aUL zD2P;%q7s9NBZ@CnwAE;Wx=3_E>MBVZO{`js2&-uudj=|5>FN*e=6?74&e>=0b3XWV zm$2!eu-wCz4qzNmTSFK@cn4rk0%`vMQf~mUw}Is&fmOeO=xz{gDTAnEB{2R8L{G;8 zk<9~GWdO5N1SF3IQ#}KiyNNIrm>&%Bq6FZE5UvR?fvwvyy!~e&+#jQcwgI+fg$Un6 z$@L~oyuS(9wHS#N*NH^y09F_x8<TmkG?fio7O@Km8brYc;^gRajqdgAFn}-ZfSMpZtXP7uEtk zFR{PKA2{$A+`60wjPS%g^-f^g8gyQ31Z1Ij=sOEI0`&gzIjPenkRIv*yy64_LrH-s zvmit<9N5w=2v2_kRI-BcB^19oOfY@LMA|=3puJD~h7<_Wm)6>V56T7kcRmGteFfWA z5;KcIaNr}Vq~%A!g*qWgd0Nm_8UxHO7d$B@i(GlZYo~a?dA-x420Jr$-{21t@zgRP1C( zs#2ly-YG!ZEL3l92X>bT$F_e$fwjVjZ4@}LSvbK|0-RVbjMlQil|bS2RULp)B5V_L zfHFwby)% z6&cM4zS010M;TRcBzYadOzhqdM7uMSZ*>EQ|Hj1iXaNt7ncejTNk556D`}$U+{4)P zi%EgxawaSCDoN|lm}=~RcQCW5lqx#Y#O$9;iLH;As+Y9y*b=5;2T7QEf%$O92EwOI z<2Hs8Pi4-pCIYFGnYJA{RPkh{Z-y&1aWC^a{y8wV+FAJ0ND~IzG2PGa<(v%Sn6*pcLX)*

0Ov0n+^DNBiQUSnSK>tC`K@F{bgp<& zIT6@-N4!2jMa|hH-jeJ?O;#_i%54P3j1d3+Fj?R;UtC-K9$Dxj{&45FfMmh|mYKw@ zkwoN@EkgWQ>yV^H+!xdW6iOtMoL>;L4UzOT)YrN&DkTlb?iDdS%T!Y&7bP*kaSiOj{ZQ>yKxP$y<5^3(E`Z#N&fYa z-q{;ck4Fp0^4N`1-=nW6p|^D6icIo8Tx!u$poq&-O92I#t&r}076A;akXC(3-Y!x} ztB0kLGS8)lqFxi)rC0Ju;u&Gm@BP~7`*vwhhSg1|yexo7~- zMl0^-5TWuE#XU6*Csocc4(w?etC!V3|$1*2Xhjt@LSvr8nzEgGS(}1_q z)sZ*-fs;wc&JWfcI552h`ACN0GYKlL)M6P!ACD zQUA1y#_;UBhH3qtwWKyMd1pl37QoY!dhuU$Na=aI^n z>lX+$knz(_cqz@`um)BNVgbk3C64l&0v18^KLAT#3j2Q#m-Js%^qA`iJh4A;K4-D$ zR&yFz3YWwBjhs z$_G^XiS@K-a|mXwrWHk-_WY`n>ur>7DM*(?JI>8O!2zhTRU6q~GrZ=tNg zNW?idmn*ht^twX6G~dS_HayVBbqP|4RVK3OX?7s*m+7;T7$5_A#M#jV9C6YUI-VRc zETnZKaVzZaGOB)%+gr&dQ?9|dnza`6=QID(1O?WNJVT~~0q;6th<$F9kAUZ+F7oYO zKKATrflScF=Ol9OA^+QC2<1OZOyVo2d3a{M$%kLm;P|+iVe*i{ZVKh|XKMIwTs-WC I#B|$#0F)jOb^rhX delta 1887 zcmX9;dsGzn8NIVRv$L}^yBiQ~1S>X##3vE~30m;6ivosCVi43IprVa{U`uR33QK%} zD2j?k5D6tn5;Tyo2QexTz&6AOm14Efn8Rs^@puwq6rm?=q&J7Z?#%9QzVCkb-tX6R zO8-T%zQn^h4ZsUP`9op=aMA~m8i2THAm(#m!7kwSnSB2v#2dbV-#LhV>i~auh~N1W z2gdP83#0=gVBZa?!VWCIO^g8|b0Eit18s3|3x5RUe+8f3C%~L#nC00GI9GOI-r-6h zz7xT>*lf=kEI)pkBs#|NU<;y;o7gA>uSC8va9_7-vZ>+I^l%Lg+Ha219c9Z$eIe22H;9t z0`Qwq^jHr7Av4h5Sr3?I;Eq=m6^g;gUxuhoprBL@1Cy=`-kzL%{!C%I=EI5X!n~yW zz~MKAz&zIdIA2&29}K)!BRFpH+{FJ1No%TsqCsKbIzK0n+9I6%h|HUp2^VYhK!i~k z$PWW-gTno6TH-cU7}MDRLym6FKn*9DrrTPW4m?$_%e_aUK1I6XZ6uV~p{vaxQO|9< z>q*4$Ufu27PAX#8^;^~hQMJ0eVkS_qP_G@3*zcy^+~aHnl=FJ)o?ia(cfEh_CoJsH z2kc|vDFgcX8F@fWgFe*3oSfgTUy|4dY>wA=%bNhRul{}kRyjip+Qu4D= z;-tDY!0KkZhIBGX+FQK&!VTPJ7{|1B}Gt{2zrxhUv*TD(Eu2W7!^Dj~!$~4@pa|i0( zWcLzgV&NtE)ec$^>?6mPkiZ@vImg?=Fm9FizBHMk`bjQNtp{d0`~ zR^3HPOn$}W&*lgSz{e;qA zGZwwKmfqAG56`4$TQiK8E{0LE2;-FxE;CeR#;eY$oUhN=Uq+mM!8o$>_ngFT91Um% z)OU>kyTf;{9~6(fukrp^pm@Fim<`jE;P{PP+qFujgLVAARWi5nd#5c)Dg8bGc=}7F z{2%nvu|cVrk^qz}RjPhFMwFG$(kN}{pmOim-TeP6WjM%(lU!5AK0OF5dDA4n!gMc> zG`*2r2{gWIN*Q3C{G;Re?p4#L>M$+*+0?QnjOQPlI`dtuQ(^l4ojmUU>3CJirUg$| zt0sL9uy~gG+;A(mB0-(rLL#1H>Y@phe63Y=L^0jY_HnFysJ=Qzh0b1AH|8wi4Oyd> zw9#9~9JRdH#teC@6-pqLYf`)Nw*c$2)vkZjvXwK`+hq>mJ&W3xJw&fR`H$Kkaf}U3 zn!L*bSdumWSTak?XfX+jP7V$S`W9i#)lW zbG6b9Q9y2o_F>iqZo?6+@fWLBeW9HTs^a!c(#~hlg543?MIn>hP)Bs~q2aK0BZZ6# zYqcKh5Iu8gy|eh?!H3#t3>!RKsEzjW_vbg8jdz=v2@kVn8Q-6IZ1zg~8hESS{9GC9 z1X;~pT*B{k|9m8M2yga>PAb|>n{R}+AY^Acz+zZ zXX&0xi)8ya?v1tdId)RHo8$QB5X(Sv0^nU}4eFW-yno92a!nYprO+C<_TyII*m`UI zax&hZVLk6%3Cx{s?U=~MF;A@HM7COgD(0Fs+@O(dg{~d)Gj1-o$*r=>Done generating address Génération de l'adresse terminée + + + Message sent. Waiting on acknowledgement. Sent on %1 + Message envoyé. En attente de l'accusé de réception. Envoyé le %1 + + + + Error! Could not find sender address (your address) in the keys.dat file. + Erreur ! L'adresse de l'expéditeur (vous) n'a pas pu être trouvée dans le fichier keys.dat. + + + + Doing work necessary to send broadcast... + Travail pour envoyer la diffusion en cours... + + + + Broadcast sent on %1 + Message de diffusion envoyé le %1 + + + + Looking up the receiver's public key + Recherche de la clé publique du destinataire + + + + Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.) + Travail nécessaire pour envoyer le message en cours. (Il n'y a pas de difficulté requise pour ces adresses de version 2.) + + + + Doing work necessary to send message. +Receiver's required difficulty: %1 and %2 + Travail nécessaire pour envoyer le message. +Difficulté requise par le destinataire : %1 et %2 + + + + Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do. + Problème : Le travail demandé par le destinataire (%1 et %2) est plus difficile que ce que vous souhaitez faire. + NewAddressDialog