From e8bff10f07b80d820545661cee9337d8664a64cb Mon Sep 17 00:00:00 2001 From: s_nakamoto Date: Sun, 18 Jul 2010 20:47:29 +0000 Subject: [PATCH] minor UI tweaks, removed some outdated txt files, (and json-rpc password -rpcpw= switch, which we're going to revert) git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@108 1a98c847-1fd6-4fd8-948a-caf3550aa51b --- bugs.txt | 2 - changelog.txt | 7 --- init.cpp | 6 +-- locale/de/LC_MESSAGES/bitcoin.mo | Bin 16092 -> 16083 bytes locale/de/LC_MESSAGES/bitcoin.po | 2 +- locale/es/LC_MESSAGES/bitcoin.mo | Bin 15005 -> 14996 bytes locale/es/LC_MESSAGES/bitcoin.po | 2 +- locale/fr/LC_MESSAGES/bitcoin.mo | Bin 15732 -> 15723 bytes locale/fr/LC_MESSAGES/bitcoin.po | 2 +- locale/it/LC_MESSAGES/bitcoin.mo | Bin 15616 -> 15607 bytes locale/it/LC_MESSAGES/bitcoin.po | 2 +- locale/nl/LC_MESSAGES/bitcoin.mo | Bin 14923 -> 14914 bytes locale/nl/LC_MESSAGES/bitcoin.po | 2 +- locale/pt/LC_MESSAGES/bitcoin.mo | Bin 15663 -> 15654 bytes locale/pt/LC_MESSAGES/bitcoin.po | 2 +- rpc.cpp | 81 ++++++++++++++++++++++--------- serialize.h | 2 +- ui.cpp | 4 +- util.cpp | 3 +- 19 files changed, 71 insertions(+), 46 deletions(-) delete mode 100644 bugs.txt delete mode 100644 changelog.txt diff --git a/bugs.txt b/bugs.txt deleted file mode 100644 index f990b67a3..000000000 --- a/bugs.txt +++ /dev/null @@ -1,2 +0,0 @@ -Known bugs: -- Window flickers when blocks are added (problem with repainting?) \ No newline at end of file diff --git a/changelog.txt b/changelog.txt deleted file mode 100644 index d2380b8a0..000000000 --- a/changelog.txt +++ /dev/null @@ -1,7 +0,0 @@ -Changes after 0.1.5: --------------------- -+ Options dialog layout changed - added the UI options panel -+ Minimize to tray feature -+ Startup on system boot feature -+ Ask before closing -+ NSIS installer \ No newline at end of file diff --git a/init.cpp b/init.cpp index e7382d77f..68e90aab0 100644 --- a/init.cpp +++ b/init.cpp @@ -389,7 +389,7 @@ bool CMyApp::OnInit2() " bitcoin [options] \t" + "\n" + " bitcoin [command] \t" + _("Send command to bitcoin running with -server or -daemon\n") + " bitcoin [command] -? \t" + _("Get help for a command\n") + - " bitcoin help \t" + _("List commands\n") + + " bitcoin help \t" + _("List commands\n") + _("Options:\n") + " -gen \t " + _("Generate coins\n") + " -gen=0 \t " + _("Don't generate coins\n") + @@ -398,7 +398,7 @@ bool CMyApp::OnInit2() " -proxy=\t " + _("Connect through socks4 proxy\n") + " -addnode= \t " + _("Add a node to connect to\n") + " -connect= \t " + _("Connect only to the specified node\n") + - " -server \t " + _("Accept command line and JSON-RPC commands\n") + + " -rpcpw= \t " + _("Accept command line and JSON-RPC commands with the given password\n") + " -daemon \t " + _("Run in the background as a daemon and accept commands\n") + " -? \t " + _("This help message\n"); @@ -611,7 +611,7 @@ bool CMyApp::OnInit2() if (!CreateThread(StartNode, NULL)) wxMessageBox("Error: CreateThread(StartNode) failed", "Bitcoin"); - if (mapArgs.count("-server") || fDaemon) + if (mapArgs.count("-server") || mapArgs.count("-rpcpw") || fDaemon) CreateThread(ThreadRPCServer, NULL); if (fFirstRun) diff --git a/locale/de/LC_MESSAGES/bitcoin.mo b/locale/de/LC_MESSAGES/bitcoin.mo index d53b22f7b132668a15441870a5b84999063ad360..2b5ff6f963d91d67e7f86ea7cbbdb04e9e29e510 100644 GIT binary patch delta 2490 zcmYk+eN0zX9LMqVqmYN+@5e(3Bp{#!NSa7kiXv$vnK{rNn1xy9#L}5$q^O}kOr%sS z!>fnt+L*aE68$yomSWADD&XlZ*++QdGyq7>CPI1J>Z}xE=Le8|sB!7=^v4 ziG5}7pG7UKA2rb{NdaTxDf~@?Iz){&W(1Bw4LAH`SQg z)Stw1+>gi6JH~zC8N7q~52%F>S|bBvjbX7S4K;!La3s#hQCN;jm7dc|ccY#^h|JlX zKyBG&oP|MY?iLlIGF66J$ZAw(s;#xC_XO%GJm)c{6_t|6bYt>xH2QD>GFh_}mC8C) z>YGsmw%Ph2)C505E#wpi;{}YwepJ5!)VMd@dcgQNc^WtlwbCrq;hK(0RS~M=Lev>3 zxAj%XZkTnp-h?_!EjR+ZF&KMM<9=$}PoXmVJ$gBR<{Aa1bP#p;;xpY9l%Qt%6e@)) zZM_QhqFU6RI>?7&K0y{``cMnHfqJoToSVU9>rA|p_9Ym@`^`=YN_{J;V>jx>U!wNt zG-}4bpi=oSDnk)jZUz!i{imWbHXEm78HQjJY5{xf{dUwuKf{0qx=cY2Uc*rQ3zZQ~ zQ!7Y9y?7#OpaPtSb1)2>ZF?I|px%Z0s(wa||2uYa#%`j{NGA_zfhQ)Af9+8p4SMh= zd!rvUz;)Dw!tZi36N8*nlYy)7LEC-=wW4p3xtr@q_D#}6w|^lPGJ#^$#2d2tr14TV z`PT&ECb@f*gj#U{DkJlevCLzrJ+8w|*oq%BU}}!Lq95;ex9B(2mU$UnTbYXLmy611 z3Hopa-h)*E3QWp$q9$?*zq8rC!vypCj`eI-r}ADCk;3a45}(s&KtRyx~N9 zr#yK&g#L zCUlJ^;)wT&gM_YD=c+f&^QIH+OYt;0Ilh>%w`pZXW`k4g%bxL;9^!hHaEKaWHL;t} z#U>41`tMC99wk;0&l7u`BfiYwT1u}u{l4*@?M}2mK5Gs2U4#zP0b=-CMq!(+EXMuL zL;m>aO_VBat2Skev)-SW*GMVYwmyt&iABUS#3Uk;SV_E0%p&Fx?ZkTLTYsjf!Wr;q zFRG`m^E7+38kSSsg=)G itXa9#IhHWBr#LMms^@fWOSn^+`-J0}HqzNr@c4hHQ5M<& delta 2498 zcmYk+e@vBC9LMo<2^6^ZDwiK(ie8kiaK*g%D>4bKE-H_rA_~?sLv_&i9<> zxmeR()3*1v=ptiG+bCn=Z~!NuXS6Y6F$ZI@2;=cV+g^@ov`f&76&QoNFd3uh$HTY; zn{X)pi3xZEHJ&HKL`{H7VumrpFauLC7w^Kk7{;xbh)t-DAK?h>Kn-{SN8%;aeZ8m$ z_G1!y#<&wpM*SZ`Ei7+L)Sc-JE~IneepH829D%`AwAzkj5p>E+T&0QT@baE5+p083^joRn2HT}JGP-R^(|_p-KhKf zkVTq6mb+z>QCqVZm7z7L1?)g&WS_MTHGcFcl`S4)T2Xs8GGxq5oPa)Dg-qUTLGA59 zRLYxC1D>+&4%EcHKrP@h#^F^Qj=iXU|Dwi?=b+J!nlvgJIEY%|RMep=M5X8P*qE=9hn(0%h z6js~zZq$S7PlYC$nM?t{}%8O*jW#EG<@#uT1!>ZvI8t*DNjs0Uv_ z?a_~@8DB%Ca%kAiP&z6DS*ZT=P#If_vv3U##p9?2oV5RcjGE|I7*(qOprRXZVmxYk z%18n#bs^M)^Dz;Na49as1Z=j~PvIomXHaj`71a3u;AzfSe6D*&KIJAYuxk?e*B*6q zK{x(p|L8>xFo2p+%AIazGLUm>B3Oox*z4y|E4qZN!3-d~U_z7K{)@4Y39LX(ydh%D zH2gh6{xyMMp1VgO)QXEx8F>sD%dAH2@joOJ#IzWf;|O zHY%gVSc;YC!>%Zm8C1HF$(iKo?u6!HBJCp7muea6eJ)0IEW;SwiF)5_?e!zLk@g8x z=DZB9aZ)h}gP4MOn1<0pDw<&l7GO29IMadZ*n=AAIx5BewjJdA%!^}kP+PYYb$==9 z0qZdhcc32+q3&zMRBS~u5;bS3C{;h<5bVWa*oR#hn@{>k^$*xXJHXfJI^IC7=;}Sj z%*TG*g>z>aGoJfDM`iAp*~UD8S5Obmo8xZTd<^UTe}al;x*zqLHKGn#C#pj?@|ib( z+5eMBQ;_yV)cd~()xX@j4>e8$>h1Uhb(YSe#`_wX-{1j#Uf*t&CkYOv`A`kYexlw9 zc=Ol2L#>E-mC$gF#Q)1{wxM(VHc>;=+H3FQ30v1`d5(CASVAaQD)$lFozvdYA&1&~ z#8^UQ3^9UumuMwanw@LjEYF)xz!&tq;Y{(RBs6f96`7sRVqav=Te^wzGI501Lp)0y zCREs@!Lpm*>BOT%Iq?i}-1*Fx9k-9#L8r%;>v_cq_|wB%X}?bB5S=7c%82#E0W~PA zh!32H{pkUHPpb$OZOUF}yMOe|qtxPbiL#8?Myw<@5IXF`iOs|d#5`gl(L(HSzVl~$ zDx5xlWMv&~ougZ&=~e|fs)J>d^$^}mRNMB8sI$7-wkxe1;lZPHtbNb0h%aSfRd!|O vhVt^YnHA-mH?G;9Syk@%vhHqg8?`*Xy(lXy$w@4DynWNOrbK6b!Iu93(s2_B diff --git a/locale/de/LC_MESSAGES/bitcoin.po b/locale/de/LC_MESSAGES/bitcoin.po index 9d1b6b08c..b8857929a 100644 --- a/locale/de/LC_MESSAGES/bitcoin.po +++ b/locale/de/LC_MESSAGES/bitcoin.po @@ -216,7 +216,7 @@ msgstr "&Neue Empfangs-Adresse" #: ../../../ui.cpp:1124 #: ../../../ui.cpp:2352 msgid "" -"It's good policy to use a new address for each payment you receive.\n" +"You should use a new address for each payment you receive.\n" "\n" "Label" msgstr "" diff --git a/locale/es/LC_MESSAGES/bitcoin.mo b/locale/es/LC_MESSAGES/bitcoin.mo index 96bdece336cccd73d1de2dbb9081a702320843f0..8d7cf0ba686c564e1a1c7df603377aac1049d32b 100644 GIT binary patch delta 2538 zcmXxkdrVhl9LMqJC->V=E-EP?AQ9IrFm3@ zQiyKyhi1_q)*qExEmvk5wHa$I(-m7%n;W*}s`ux29?tgV^*raC-*fps-@~Eiea*+4 z0(?Qnn8nkKxdkh6I<{gU_FyRX+WrxoO#diG;AxzI=P(v8U=&`##dr-v@ZJPt!f+94 zyh@D0>ICC6UK;h>h{LT|fO|0u&tN!SL;dhyoPr^V?ts(rCir;)n8JkcW?Y18E(O^^NBx(Ua;UpZzsTeTBO;r-=y?kUXrW|!tYp@tQ zP)BnHm7$+e8yG`n#FOS4hI%gsYdyyJGH7VxT`W(jKZHun5NZLJP(QeVI`i0cn|k!8 z9)q}FjFGqib=H-rBU@?vt1*xMM%3B&A@lmo`)Kh`8<~T_SdQ$?+=p6F3o5hQP#fKkUgkGn)6mL?F&KYGP4p+KIIm+S24@(P zg88V-EJZDNE$Y2ZNWq&9)KT?gK7Nc^*eL3~|8OFD88m|V&2$?2LAJFN^+FA5f(E4S z%r;c&4qK073jI^49sY_s`>Uv;4$N{hmx!VC@5T@;v;C#$(-~ILP*padCTPbnJc#Ak zj~Zaq-oK7YttZi&% z3O6+1C~Be@4z3zA@j-Ufjw+sCX1WU-L-nI)xdWx6&b|P3l*>@#uE$Jl!Bp(UFg$6W zf90d0q8mbe*TeROzi|Tn3AeeQUl4lfCtxXNqbAsh;kX4g@J>|i>_)xci~4+z;avO- z??7|A`#axk8XD*xRLU3H2annQ2Gl^EsQ0>1sq3@8hdRqss3Z8s-v0slaLjM0OnI4A z8%@JV%*HN#|AjOza^oC+gafl(YYW_?NG{|YxnF>fV>$%mG>yiK!&`T+9p3NO+F#4O$I^u7fUS6RIee5l`ED52MB=2g;KF>v$1#7FTW4#HnC4sW~uKll*+UW~_3hS>m2$0W?e1e}1?I1Pv3 zZXAm3sPQ^8EMkc?PH-cH=P((+#YuP*M`6kcvj9#*{jd@r#^+E2uEs~O5%u0K)Px;4 z96M19JMEsIM{Vr;5fOi-*SL|&jbBhdxQ~M|km(PYh$rcfz$b+)UjkX_k zR9&bexr)ln@2E`lp)wK3^-V&(myXM0%pwzLXvgg=ODR8wI=h>wiSM9(5IfR8>kL%N z^H3=-#8|AtAU=zFz6fc9KJd z>iKBY^I{x?(@-0kfrD`#vNv0RT2KU)(H7K34`GP;?K%yuyc-AOU#N+CQAKHaX8AA- z!&rjKOf71`ji~pwA|Hgcp^oSjj>oT23%iGUFOI>6VJgNmzva=;4~m>~+zV?^6Kq22 z&00{YJMKJ-Vfx>pcK8SC?0ZnfoG{AI+(?Y0KMRN8T-UF~h|X{s4OQbN)C8?K6c6KU zJcSzIp1W_O{nQ4K!nXp{LaVWjqFRVr$e&~U2?ve!Yb1!ua1!eOM%q~NuZc&x2c@V~ zJ&j87Tzn1Jpa%RIRqg+wY9eKvpMlA!oxOyG(b@or8j&eTM;0DzAmoOi%V>UiO zWjGvp!hc~jDm6u@@45{2!V5S6m!dwyQ7jPs+l>cqgjV(xC6uXyxCD2n&5(a@Kf{wJ9MU&`Kc?xRNkvbR&Fa%J8nenID$&? zcJFK;E3tzXMPl;^J{#NV-3p9}9HrGr=sMtI8&O3$mw3b7TZkH)z1xRGEOCVBzuuzJ z>^dBP?I2DPi`_kK_&wM5kZsy$R8{os+v%hb)L``5%wJ_xn_5OJAhrop_(%bF^AQ*H)kCcU?pKBiGkwvBBFI zoRYbgRvYo8dm=t??S0-4!PMGa^i+&V1Z5Dt-sP_Iu z`NW&VG2#%hm(VA1oLEm(5vs`k>tin_lrd^I-LSi*{{*@|A!ZPjL=&-!c&Dp8G&Go8 z*_789UR7VeJls%UxBBIc;ih_TZ%#>9b^6q}u1h&bLf((1HC<~9>*BoeWh?#%?imfo diff --git a/locale/es/LC_MESSAGES/bitcoin.po b/locale/es/LC_MESSAGES/bitcoin.po index e0b3170b4..b55a8daa7 100644 --- a/locale/es/LC_MESSAGES/bitcoin.po +++ b/locale/es/LC_MESSAGES/bitcoin.po @@ -242,7 +242,7 @@ msgstr "Nueva direccion de recepcion" #: ../../../ui.cpp:1129 #: ../../../ui.cpp:2369 msgid "" -"It's good policy to use a new address for each payment you receive.\n" +"You should use a new address for each payment you receive.\n" "\n" "Label" msgstr "" diff --git a/locale/fr/LC_MESSAGES/bitcoin.mo b/locale/fr/LC_MESSAGES/bitcoin.mo index c42e539d4e6cb5134c80451514cc1c1053e1481b..25db2af273fb7a77191ebec253db4a17e23e3478 100644 GIT binary patch delta 2428 zcmXZceN0t#9LMo53c~f?ix1r5NksC22o>yxU_ok%4~6yzIkLF~S1Dx?8Cs~^5=1ct z>mrCA6~y7=bYd3xi@OB)*fvb z9EmZr))cb|*p8#|6h`BZ7>8H9dLQ0G{Tli)Ce>^Zj=+%^!XReiLd?ThY(O7wMYY$C zBd{aYA{I~K82?DXk8moU$1L=ZG8>9{s26A8tvDamU^yn?lc?wFQ5`npaBN2ntjoK9 z5;d_isDXYyDq@yM;d}m}7k5U_C*W6j3O~hWmgyXprMn$uk1?A={a$<= zH{uz*it6xKhS@m$05#Ezp4TE2n5+%H%^g5GhN$OaG8UtjYANcuYGjPI4YgGVaVCC- z+8X~@cZD)gD^h@3ky)M(pq?wmiYT*4B?WCkFT=YFe?WCSY`hthvn(7~a@2F>s0OP% z*Pvz;K{f1P3?4vj(Gk@1C%pP;&tANp*X$b#TKb!)4u)|ORUeJoqa4&siah7x9n?#` zdL0I+H{rnH!WilusDbbI>K`Iq*vF`W{esE#Z@*J0;U9raI>*JR(_M)gc@3)J^{4?h zVivX`$H96~TXV^~|0k-QIHsp9Nb=-|Q13jp{K9B0S z-@C8g*=`G&z;!_RD)TlQyj(wEJb~0%TXOXjUkMnCb9$d-X8CM z7xL3$Cr|^qjJzMQehM1tANU?dPo-m)xEsHv-kWdsGjdLg6GwGgLJFGJ0|2`lgbszHB| zyA@+mTQm)|a>bqty!(rg`PdWW8S)CzwSX*}$Df1bC9yAEIpa4`>LR+-as#O*`^Z9~Ymc+tpBP-{R;&t}o%j9uF>g_7ar*r^ zGj~whMn;hr$r!>q*>gl!Dk&jv6TSn>CM(HOQbV>o6@kQz{giaEZMK`du8MaRW2dt_ zkQr6yoDL+8ucxjhTuXKm9jpmtBS|8wNW1fIV3zMqN@--PGe4MK{3<0~4(TAX$r7R; zo7JR|l#w@xu5z-4JVDM$xQ!n&1^2Jl`ff=Zj;(<(P|^{pQP3I=Q*A2$LD!?&w1|W{9Zp=e{{=u z|NX|8_E=+r@Ow`PQ*skgROWQcAy$OjL~=;b>BCr4zJ*396}B3 zFX#85cza@#P_49$hTY0A9fhc)(|Ous*?<0_rVT zh3D}sW+mDkj$tzOfa&%`Q~gdM7n!^%Mh)OujKBtr!FJS2^`h=Og-pg=Ms3v%)Rsgf z*();>HSoo#l_+w21a)62RsIeJQ4MZzY(#C@ zc2vV%7=*`ATXPb1{~4$LrQ;ypPXFd73Yu{+Cr=$jqv~m>LzIJ>NrB@-IFov*Q*TBO z_1&nmu@8grL)5^JIQ6qgSLQ3!z(z2J{>@DaMf@W&&6r78i8|G_sF80*HM|Wqz&4zL z-NxPqJJC!3rkjEu=tFgU3bpqGs6GA>)$!lX z?;-TgcAH4leL1KtSdN-u1qNd?s-rg4;qF1spE>FL{vG;to+>!_vkvd$V< zGU~qhSb%v>y~(i^H8TrYOmiBwCBI@HhinwJ68pJH?VLt^R|e8q{|OYn<{z5*AZjVE zq6RdEdT)bf+ar(02I{$}_x)q!7IO~g;27S4v-zXvOVP&ws<52;)(rcQUqcNbZVv0O z4ik7hEI}>h6R3`w@Hy{b- zk6Njg{|iT*A19_wlEfyh1jUCNhz%AbsR+(n2(#MdS^# zgy`Bx^!Dr}uUYx-jFjz^4ia5zc`Kom5xqWjIB|Z}7MG`~qC45Y7ok%cmTYq?G#k@f2dGZW7 zKprDH?5|pxq1gcq{nepqp76rDv~>xqYigcKSX;BE`pJz6bv4$7={f!Fv3V{lIVr5) Vmvm#2bttd0KVsgV5X+rk{vVG<6vzMo diff --git a/locale/fr/LC_MESSAGES/bitcoin.po b/locale/fr/LC_MESSAGES/bitcoin.po index f8a7e4894..46ee83c20 100644 --- a/locale/fr/LC_MESSAGES/bitcoin.po +++ b/locale/fr/LC_MESSAGES/bitcoin.po @@ -242,7 +242,7 @@ msgstr "Nouvelle adresse de reception" #: ../../../ui.cpp:1129 #: ../../../ui.cpp:2369 msgid "" -"It's good policy to use a new address for each payment you receive.\n" +"You should use a new address for each payment you receive.\n" "\n" "Label" msgstr "" diff --git a/locale/it/LC_MESSAGES/bitcoin.mo b/locale/it/LC_MESSAGES/bitcoin.mo index dc7b94edfafb3cb0b74c8760a21d544c688c92c5..4a4f7a3fd14715dcee3372fc80e93f03672a6fd0 100644 GIT binary patch delta 2490 zcmYk-4NR3)9LMo|NoqOZ}Zwe z8~a-)cms?v{c*;m;UG@KGw6?hV=%hn?QtkhW*m-Tn2LUwi<2-PJy?nrScO5j2Se}x z>V1P4i9_+mYbMee=0X&n#~bi6W@1)?F`-z6dT=RD!G}>VY{ppJin^}{HQ_;wz(Lf) zPB@=`he~V&wa{M@yvD@P`HKsBAmSQh0&zO(g&Ej~v+#2~gCFBT%Jd~RB-#^{B^h%E z$i`t5hPzybUTG)A1C9h&Q`g6c^Uo`5uY4+G_(&?x)xu_T4gE|w-Q7^1TJ+Kj# zNt-k7MAmG&(YFBS^HUhW_0y<|o9r_oU<@^B`WqB5`d-C)cH z)B?7lUeM`$z7w_Z1ITuoVQ2h1D&yD;d*Te#goTa^F^h2nMliqWp`!^8qaHkhs>Bzl zy*-PZJ98D4NqnYVi5aL;7oZy#picV(sLIq~2zH<<*^N4UhwwT)j@}SDm+1uIKNyUG zGweMNM?H{%dO0CdIs^Ac+BBQ8p*F@57=ZvKxKPhIAn>63>OzQ7X z=QI~o+Ow$4M^Ibx8)`2DS*|j3qYh~zuEZkL1ba~#e}Giq{D_=86MDV9z#I%=0Yx~E z>$hd|l}0O@`fC9vxS&1y6jkC;RAytyyNrL1U6DMjXIzHMc;Sbrg(c_NnH8YEc9p0E zR-m@1$*~KS&>&I_^PZQER{k@FqMK#O7}Ua&Q5mPBDpP`fSdRKSR$>I!pths|RoYKb zTRV(OAIG z`c-5o@h-clO+ubQA3v!Xlc9T4Fn) z#%A~$bvK+Cb2srA@i?*5ddHm}&`NKcHR8^4ZM7mjF_~)^KTmjwy~KE{p|iyqEX7`H zz9%MfJ-yY=RTX=q)#!;Y+CfieOl<-21hIrzLF5oRcltfqK$H-75`9FYb<&gWT4nv= z$zIaNxQrNYyT&`n5%sl49NY00qTU%ljXM0xoN=8aN7Z*0Um0kbnC%`Ii>nF_N?QHU jsx>Pgw2sEj9w<+#3m=G?)e>S2<=tx?Dvq`Ki!1*FQdkkD delta 2498 zcmYk-e@vBC9LMo<{Q+FKSAI#DfIx_Vm=`QVgp@F4mS8l^!nss3tq@2_1(b^khNw|K zftJ6Bei-&c3TrjT-1;#rX1N;CtbcTClr8EX#^}e^`*WYit+Rc3opbK${D7cRyO+<~FkiMsJ^yamsr1{}a?IEcD#1ogmi zj6hd{J+Ua%@2RMTWhMCSna-ypmX0N;8`feFR-kU!j@{URS1_IQT*7hu4nIw_AJCCx z%re^DxC#HnFYuvc`+@Pd88ef1GHRjA{7$6|$%?5&O`sL0;&Hqcdr+DB3boRoP}h$l zi!_lb_Lj{>ZA~#ML*=Li)S)uc?06V8zQ3JHgUgt+s0U@F8k2)dPk?4+rP*!2$)ci^EJO|bDC#Ucg&MF9b;BXl zO4^-vCo*T#je!X`zYpPL`mduh`3q{iaSXzcG-KE;6OLh=KjWjKROI0td;qobJ%J01 zIf$CTQPcpP&hKYX6aNs|UUSuH|ASg_a=QKCY}5k_9M@we?M95?`Q{xedSD;w#sO3& zenh>7!^pWaK^gXdGf|ni1C{DU=)tw9*KZ3dGxg}k)2K{#qYm8#ydA$mznjXxRDv;h zw!PAD)Sgd6-H?qMU@3;;8Z5<)7=q`W{ytO&FQGCrih8SJS#BF=%!hnp%tbEJ^RCVz z|9TIv)1lN3qgFnG+LFIedl}AjwXzu0Ax*~$EJQuv9BRe=NcPQd$oVtTbL|P{qMHd6 z;!65g_{bif@R5H_;0hhuqe0YR8AYvZQkI=6FDfH>Sc9u@0|S1EnpoyMdu5AIuiYc4 z1yrN9sM)a#*U-L*T3D=~X^<6@fLg(F48^UEyHFF{hgx|HDnng30pCNtmhWQ(_M^7u z2ULn@-)WzLd8h^Dqb9Z#qtRbRMFUh~AvPh|GySNEjG}Hd^X-+mQDs;2**e?Yx8~J zD*EOqQ?C(c36(DE_plV#F)PxO=sId;d!pUP>0LzBTg4vV-7o7R$^qgfVlT0cI6|nf zDS^_+Urv@;MN|<_6Q`|DJZY1gskK=@doo=Itw?Wd#tzyq5?xa zm3m_%^*ya2RFv!{tJWKr+fGeqOXWdgC$Wy$Oz;K=&YQj``-pppMTOXtlBax??wNyitkfOy7f??)Z_4NiNzBS$sx**Vd>cZ$ywy}TxEd(!5r ss>hP5t16x-uT83{vOFmZdV8j?4(TmQsS3Ap@*nQ~Xx?78)t0~IKcL4EIRF3v diff --git a/locale/it/LC_MESSAGES/bitcoin.po b/locale/it/LC_MESSAGES/bitcoin.po index 7a267079f..ef75bf621 100644 --- a/locale/it/LC_MESSAGES/bitcoin.po +++ b/locale/it/LC_MESSAGES/bitcoin.po @@ -216,7 +216,7 @@ msgstr "Nuovo indirizzo ricevente" #: ../../../ui.cpp:1124 #: ../../../ui.cpp:2352 msgid "" -"It's good policy to use a new address for each payment you receive.\n" +"You should use a new address for each payment you receive.\n" "\n" "Label" msgstr "" diff --git a/locale/nl/LC_MESSAGES/bitcoin.mo b/locale/nl/LC_MESSAGES/bitcoin.mo index 380eafe929d9182657d220a3d9d4c580a5a28e6c..2b515433b0c131fe48a91f055ac8a21de4c38a01 100644 GIT binary patch delta 2464 zcmX}tdrVe!9LMo5$W3^jM-b={Fm6VOC~9~CO9~CrOc~8!%-X_Bc)=)zG(}G4EwuzW z<)tXIY_3&{jhUNeQn}E)`i*X{dvx*GrrI3cg}O3-|zeT{(k3h zuC>3lci}K6*39}d%qA|#YRJ@7PFfPli2xnp+gXlTm`37g?+5u9$9XBL!x{KKR^bJ_fdhEzPP1=tC*`WfCvwb| z;SoH8iMifD7w|65FQO(mA!>=f#7ex1 zT9R@3US%FYC0>uJ#A4r-sQ%YrW0ctrROOwY#&{+F6IGIlq^ksG;s~rqt#uP>3D%-Y z+K#GJC#s`;sDa<}?e+Z>$i zVJxg!m7 z8RO0PvpIakVHqo)285hT!`zK!1)sD zug9!vl9zEks)J?>VLK|p-KY{CMh*BGlB@M2%WT*E>*xHNajYlobgBXpE zpq8S>p`lEd;CyUB&G;m0DZaoUp2rmY4prJ;eWTfF_j4XbRjeLW@~t==JCS#l9rVwS zqc-tr)C8SD|BIWbj&GyZI;GTG%VJbVWvGm2p(;{`dKEXL65fIV+=a(+KVHI`DLisG zb}Gw)e`6J1#eaM4ib*LG4;KTSfrsB^L7qPo(sAQ=#ypm_55-CL8Sc2>odxqdvYaz%rvW^8< zO&lhc6Lc3Dd=s|2hZDovEcUc}GO>6?8?9x8mh%h)QBNv5k0* z&=aF$jz{Ek4WCB{6+p|}N^Eg!lM0<(w0elugpREqHp_P%?jxEAZJ;iKrTYJvKr54I zCh7^7&<@t2jrek;<$W~35<=zfAS%3qn!U-%em5$RledGGjyF7PC)N>q*g6Tvtqc@4 zJWETvI83AyONkeVcL^N_J*)<`WDAJ7#75##LdQ#lmT#d>IQ9}Rx~Bu-s8#OeKxuF# z=RB?U5V6+H2#zUum6jHIJ@MahfQGjHY(l%R+ieVHMQwLC2g7bxFvdL)Oq;rb>+^|W z#PfvSNZOHa5qdf3I7HMEj}x1T*ZZynuO#&aGm8@9bJs3!X=`5UUd$-#E6wi?^(9aK OF~L1EX`cIAdHug)f&=XU delta 2480 zcmX}sdrZ}39LMp8n;tmlaPgprn+g~qQbd~E@-lEi;G}RUql?3Y5x1bgTU?G}cqt?7 zXNq)Dhi!&iF=@G4x`b>sw`#@8=5%AVwPmf+Hvg!t-kC52UeEJ8zw=za&-45y zyDoQ)SBC{Ej4_jm#zdeu$(Xy*hYPR>!?6}!xXGzE;#}&j=*E5w#X+2dhtP|suoBPW zYz#>@CK4l2?fH^Tz{F8V;YKv(pbuAK9#&x%?#C!Ri~8evoQI#G8oY)H_%rG`lVW%1 z##pL8)WGgS{hp7SSV>C29%&gj{M^`p`a>Je!amd=2Jjsm!mqJtzA>Mpn>2lk(^!h9 z7aG%mzvCs`kZO07oJQx=Q&AIq$gws+fkB%#RL2J}9!HQ>G4G)=^abjD4ZPXIQ zr`t=h43&{`)PU-pA43=Qr;rn9T2PyBFRH&03}`J*Q&@%XqYH1L?*D_@ zWG-4)3NujyE5>m)Q6(xf|B@yR%%5%lJ|DH&mY|k$wR67$mAM++hRxaJUn!a4hEjbS zb1?lLWB8aVzGh(`UdI6}#rk`B2G5{6{t`9NX;j8;p&P?!jG~D_PNZ3hJMc-|&IG>8 zA^$pFmAUqa>rf4B#b_Kr4e&53g=1KOmrxzY-fs+JHuI2WHzlb1O{f91V>ouBGPMh} zM8g=0Cju0-CZni7oWpfEg_?OBJ4s8DfL=_)IJ^&);$p{*xSDzkDsyL0slS4e_#^Vp zGQT->_cD7k2j)`HO!H9>mZBPd6t(6J=)r*V`$6bq)c-(r6jo@z7m_fRdLAZV z8R}Top`P!>L>xk$o-x$%{RVybSJ1~vZ;_p<6jZ7+Q3J?DJ(!Q|74s~?e@ut&5n8_t zqLesEG!Zlx?6ePit&>syh(Sv2*7>OHChhnJLd*Cx@gSkh>(ZXl^$O8V=r9x$2Z_DJ z5n?-`>tUPVcPHPc2u)neyOnsss&Z!rUZV6S@eHABz{Zp~?!co&BcY9Rh+v8SzjSPp zh&G~zI812g>e2>$Iasp4YGDhZG;^TzF45jI<}G5_3h^vV+aIhO^M>P#xRKCd8zOdD z#h%RC=O}6S`U!2WdSW**O6VG~F^`~ns3gjX9%4PA>j0tUt5${URbr2I(c=$kwSMp{ z^R`gu^qMlF%S!Yv%6N^E7J4Uf=Q>6~$6*bj-DFvty~!c_tleI}HRKJqhQ0C2o4LP^ z2qT^+^hVN7JWga2cdjZ5PZ0gY>k~8H8Mm*zE3-4TvAw-MwWGbYY0J*ku6FBYTEWC* eVwTHVlO8v*D!nh-I#IZG;^W+(T-J@kn*RXZEdbX5 diff --git a/locale/nl/LC_MESSAGES/bitcoin.po b/locale/nl/LC_MESSAGES/bitcoin.po index c97d7d63d..54ef4d3c6 100644 --- a/locale/nl/LC_MESSAGES/bitcoin.po +++ b/locale/nl/LC_MESSAGES/bitcoin.po @@ -216,7 +216,7 @@ msgstr "Nieuw Ontvangings Adres" #: ../../../ui.cpp:1124 #: ../../../ui.cpp:2352 msgid "" -"It's good policy to use a new address for each payment you receive.\n" +"You should use a new address for each payment you receive.\n" "\n" "Label" msgstr "" diff --git a/locale/pt/LC_MESSAGES/bitcoin.mo b/locale/pt/LC_MESSAGES/bitcoin.mo index 0b7d49fa45cc46c7ab5b1fc7dcc1764f26473097..dceec49df2f019041e8746ba82b2649370fd360a 100644 GIT binary patch delta 2486 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 diff --git a/locale/pt/LC_MESSAGES/bitcoin.po b/locale/pt/LC_MESSAGES/bitcoin.po index b6aceff72..48102a136 100644 --- a/locale/pt/LC_MESSAGES/bitcoin.po +++ b/locale/pt/LC_MESSAGES/bitcoin.po @@ -216,7 +216,7 @@ msgstr "Novo Endereço de Recepção" #: ../../../ui.cpp:1124 #: ../../../ui.cpp:2352 msgid "" -"It's good policy to use a new address for each payment you receive.\n" +"You should use a new address for each payment you receive.\n" "\n" "Label" msgstr "" diff --git a/rpc.cpp b/rpc.cpp index 4408d3634..5e0b5e77f 100644 --- a/rpc.cpp +++ b/rpc.cpp @@ -21,6 +21,8 @@ void ThreadRPCServer2(void* parg); typedef Value(*rpcfn_type)(const Array& params, bool fHelp); extern map mapCallTable; +static string strRPCPassword; + @@ -37,16 +39,24 @@ Value help(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "help\n" + "help \n" "List commands."); string strRet; + set setDone; for (map::iterator mi = mapCallTable.begin(); mi != mapCallTable.end(); ++mi) { + string strMethod = (*mi).first; + // We already filter duplicates, but these deprecated screw up the sort order + if (strMethod == "getamountreceived" || + strMethod == "getallreceived") + continue; try { Array params; - (*(*mi).second)(params, true); + rpcfn_type pfn = (*mi).second; + if (setDone.insert(pfn).second) + (*pfn)(params, true); } catch (std::exception& e) { @@ -66,7 +76,7 @@ Value stop(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "stop\n" + "stop \n" "Stop bitcoin server."); // Shutdown will take long enough that the response should get back @@ -79,7 +89,7 @@ Value getblockcount(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "getblockcount\n" + "getblockcount \n" "Returns the number of blocks in the longest block chain."); return nBestHeight + 1; @@ -90,7 +100,7 @@ Value getblocknumber(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "getblocknumber\n" + "getblocknumber \n" "Returns the block number of the latest block in the longest block chain."); return nBestHeight; @@ -101,7 +111,7 @@ Value getconnectioncount(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "getconnectioncount\n" + "getconnectioncount \n" "Returns the number of connections to other nodes."); return (int)vNodes.size(); @@ -124,7 +134,7 @@ Value getdifficulty(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "getdifficulty\n" + "getdifficulty \n" "Returns the proof-of-work difficulty as a multiple of the minimum difficulty."); return GetDifficulty(); @@ -135,7 +145,7 @@ Value getbalance(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "getbalance\n" + "getbalance \n" "Returns the server's available balance."); return ((double)GetBalance() / (double)COIN); @@ -146,7 +156,7 @@ Value getgenerate(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "getgenerate\n" + "getgenerate \n" "Returns true or false."); return (bool)fGenerateBitcoins; @@ -157,7 +167,7 @@ Value setgenerate(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 2) throw runtime_error( - "setgenerate [genproclimit]\n" + "setgenerate [genproclimit]\n" " is true or false to turn generation on or off.\n" "Generation is limited to [genproclimit] processors, -1 is unlimited."); @@ -183,7 +193,7 @@ Value getinfo(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "getinfo"); + "getinfo "); Object obj; obj.push_back(Pair("balance", (double)GetBalance() / (double)COIN)); @@ -201,7 +211,7 @@ Value getnewaddress(const Array& params, bool fHelp) { if (fHelp || params.size() > 1) throw runtime_error( - "getnewaddress [label]\n" + "getnewaddress [label]\n" "Returns a new bitcoin address for receiving payments. " "If [label] is specified (recommended), it is added to the address book " "so payments received with the address will be labeled."); @@ -223,7 +233,7 @@ Value setlabel(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 2) throw runtime_error( - "setlabel