From 5e57929f07563eaf246de51840af189606bdd4c7 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 11 Mar 2007 00:55:48 +0000
Subject: [PATCH] - Fixed a possible crash when saving options

---
 src/lang/qbittorrent_zh.qm | Bin 22498 -> 22582 bytes
 src/lang/qbittorrent_zh.ts |  12 ++++++------
 src/options_imp.cpp        |   2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lang/qbittorrent_zh.qm b/src/lang/qbittorrent_zh.qm
index 15a6e08485d5557baead948b95f46547f10735bb..e30eb3edf683878ad8daa5ea1e981df0ec0a59bf 100644
GIT binary patch
delta 1944
zcmXZcc~p&Q90%}U(|z~lqE%WcZi`59lT_0!ZMuaTMkAUsvd%;inJ%YmMoPz6vW3ao
zkkBHNEn}IPj@?1WuE`t{$Kmt`N11Qt{`Gl&&+|Ud^Lu{J`@U^Qtd1YGIvQnd>aQt1
z@-2~Vs%A^vDY)EXrN!$OyZ_g2n8j(D-BoLd?26z)cvw?)VjsM#srG~Rg62Zj6F5S1
zJ+}>}X<E&jV6o=qFcBVQ?4m=6O!oJfA+a??4&N}|)mLF1GqSt~wlayW$A}ymX6Eo{
zID*OkyB;Pp+1(g-%w_VJ6u6byzIqF6V=B}vqW%(7;cJF^xEE$H75=^brOd&S^YAQF
zZCwnXGPTXWk%^pam<C5=<TReSGTaW{VQ!~b!!Fjzm`OCi&teX%|92<idUkB^0{E6S
zoV!Ql?7|wZzJm$uR6`ytVP~Agft*jVi#6EDWfHr@0~K;9W(!!X>+(BW!2bguvjs2S
znTT9vc6kyqbv3d@xBX!yyL!bdc#GZJ_y~5f_3tkbx%sjuJ00Lk_TuR|u!ViR0tvWv
zvCjf9?moz(k^3SLSLt5J*{8<C8=TWKT!{zAdFD@oletO#mce!0j1UthdYtAKmNXF!
z6uCvc0|WIIf8a{5ZAQF@+t6i%E!;-y_e7o-xytn&@B?>x1rqiO;%;~%_R8eir(zwi
zUwEGkcX)>Pd-pwj!$*28AR3&-8%!7<yoFDwD}$H#1XFKgNGNZt?SdEhiP|LilK*<M
z4Ux{yVhEqvn}F^+ep!EPq-*61^tnXdHvIBjH@JZ>Dt`^{^5wSMh<xn%a@SHA$2WCv
zg-iLfeNkzj8vfi<9ME?he=#x)F5^ut=W!Rl)dE{G9bOZ(9?yvU90c8Bl-_T);9WWg
z{v{0SQi+C=5VSiLCJ2#EvtgAmZAm<QETk9TBJ%HRF-XXJftS{Qx{$xB29^jbHqVD=
zg_@@=M8n*L)Az2y@h0I(%mOrOh1Z(fM8lnhw^?2=N$9y%2x~?4T|QAjjHvt5A8r@*
zvut6vsP7p_G$K}<a-V^_#I#2ZutUrW#dzQtaaK=%m|?L)T%^MRg650)ojq`?Sk!~{
zf=oBW;*1EQk$uG-&SfxEtU46}%fy<n53tE%yLfzYJJBe6vGMp$7$LTo#llkY<(-T0
zrbK(pM0#t<`tTVTBneAr!X=WkGv?`cSZtQ2E?$ecO`6pQ2Q&ruk$w!todjn~CT}bp
zTp^i9FM*e(pZYw4AElow*As>0NSpeIaG$il%>ds>&6RjZ#tfD&O?eBGrOVT@VU_gc
zLKu7{ed@>~3iXl)v}}NLWmhH&R>~f=SK&3;_lPIH|FKq|8#FdZj?`k~u^F;qVkg`s
zM<-{(`|>y=5)2z9Py7lM3Y%rIM4s{ZHR1+&j!htZF3+3iNfaI^=MV6Q*|OP;jlwJB
z)$@ypA~<>VCnOLNAa4wJg8B01e${v@BdX=Cvwh$LdADCZ(U-iux6m4nmaD@$;2Qbd
z&4aK}e)vak|8u#ma1BwUqvAXncOJP&@k~RdB7ar9%Fe@w|7);Sf=8SoGNdZWgU-T2
zWkL_uH&iNVHAvLZt)z#TT8N@zl&sl!Fse<->diFTTba2h1m-B&Ls81;L(05zOo;AK
ziiEvH<7|`?7XhXy2Tow#xP!{A7hUk9a@VbpC`PZe_QNkZW`-JI!v7-XggQ#sLlhgV
zrk-<!tJI~@L*N;;)O2+rQJhxYmaBn!bz9yXSg#(44}#t5u~IWpyiu(?lnytk4eJ}>
z6}5XLN|>N(wQJj9xYj{l1RJ%VE0XY18xV*2;~ljz$5z2f+QjuLG;0quBa!i)+M4S)
zKw`AkwzcX58u{ARCY(6279VwDXI;G5Y$Fm8TM##Wm2qgD>e^!053!oRAZ=&y%5^m1
zLy7~1*F6X{4{$`kE4drRB=>c0>H8^!+{udq$bCaVUz<JildJ~gfq_d`=IJPkVkw1m
a6WMg@=~}cFQU+zxT$+iNcU?|$4)-5VQWReR

delta 1862
zcmXZcdo)#990%~9+;i@E-diE^W+)^P#Yifb65aHmmqi*(GG*4PJW6$23#B~P8VWsU
zdQ4Q(gCrt`YSJV<M~~^LSwpHdsWq$CxXsse|N8v)*=O(l+rPcfsXb-%{G`#TU}K$$
zBLCz!M5YmnvY8iPn!!B=+YSEnMKf1}3l#?|wiB6cgvVgHqN46+cvDg74o4U(+7g~Z
zcSYyg=P*jqmAw;YDPD~e;4#K5#Ggnv;tn%9w2H`l0pnWP0Z%X!O7!p+qwP8kKQoD*
zAw(ALOw!dF7{(+Gpx+{eNo68oF|#MP3_fD^suGAsGR)pF+0Y9fhSAJkkHP0#m}7aZ
z@H|s#ybV5N&NLq-9a+lESqo%jIi0!gX$Cu)yOGB5Eo(VDp2%vH!S7h#Klh_u#ZLB1
zfqkr|<pGhkIjiaDhav0|O)AV`;~KCb>smHVfrV_eY`Oy~WRt~avY6MVn$6^1!24`w
zPrr`HmSs0YAXD2=HtVhj+{5N>ehsg)htEBRZ`qoUZA5m?Y(t+p%w#V$Cc`%N$z~*A
z_m+L>g?@V*gQ3bH-Z)D84CRQZFnCRA`4UIsV5D@)m=EVF=MP^Gw=3iPbr|SyPPsa-
zp2$(5Tr=3==w&cjnSY}c?S0DP53^yLa)<FpBBzVW14X^?y|QsL5_a}b-gH9SIY!yN
z1oJrOac;}(VIAk*|2^#Gf}B%`M#XX(9r{NVapBd4u$c?j4F;npa<k8TfKA*ybp(9L
zEiN@7a#0)f;o=7qaEasAkHkVQx42B-wM4Emw_&XvEa0+A-oRF_#B?{2+YqkAHXlyl
z>IZhgMDF4+RN8Gf*YXS-95bG~6ch-*<#g?>IEyi5Je#)^Ht=ePmqhNyyh|EN?;gdw
z<|o4%e%uEY?Bjh7MiGtm<%29&z#V){dKkRM$8Ng~2fpZG&!_g_(t3pR897xjo!?x#
z3LfXHp0yK=llaC5H=v)6e>x)t!G8XY;x3UV$G=N(hLd>x?M-mMpz6;c^70m3u6V$$
zg70!u*dzGr9f`*K2#X#vFi(hnd=}ml5(3cgJz7|<9|^Sv?+I&MumPXNLPnn+<_KAO
z%;%$P6t*p!ieNz4XI)4%!9}RJ;1AaeRe_)25rdsVZCW?c#391D+WpX7=q?O}8N#c3
zmtd1fhqB>Y(fC9Yk*~eTuS<mSqO~=~`ED~<DK1GXK)XX+J`@|&`Ti?z48WQAMT$CC
zOzf8{W`CUy>%=WXAH%=Itp|#T{A0wOLk0MQc;vYTJ`$S`;EqfhE?!>r4hD$7#U#NU
z;?uT3cwhY7n@SWgOtNY(h6^QICKwh-4re-GgEZ!(6Tbg|*Z&7J*<K1#W8ukKNi(kx
z=1C!Q;^7r(`fMZ^=qSxwfC>f9H<&KPJ$Zxn0V&zU8{Uytu5==rVkc!-dB8|1I~xm4
z$(3?fWx;+a_cIchY9sBKVhIzZ(&3f3l~c>4T`Sz+uhK#H8u(s1yvdkonzK|H*bCF7
zmRrZ*A?c4_2A|)No^RSt6r_-?7vju=mdZ}is8mqC>|EFiuYOTOvfub7BF!{;&Q}*<
zvOHIh`85S{bQKcS^vJRPx^|*qZ#iKFUJUM#69zL4F_RMy`NJu4(pZ!-WSzXS1Or0q
z<ShO$d?x4F@I=!c<?=d=o4!E4-SYuf$iLfdf-mH*;rJ!bkW^ke{4ZuCs3yATVYe!(
z#g-`4OSLX!G)z|I>pE5=Xi)85tAH<5yHk^iX2z+?!+hXT)#?0f_(@fLJeDYIn(A!P
zIk-+WFaaeDt5>TFy5TFexwM8TJYM~OMZ!zfUNbR1yiGmhbPoKi))uLVW_ha1n~}(@
zGIdoaHZbdNwP{zyCnBwrx~m>L*2dza)|OR=3C$+OdIzrB!uGNm0=fF5ccxYGc~L&}
QV}w!hPg=RUV@{ItKY)M-=>Px#

diff --git a/src/lang/qbittorrent_zh.ts b/src/lang/qbittorrent_zh.ts
index 0c98993d1..0f0f51d4b 100644
--- a/src/lang/qbittorrent_zh.ts
+++ b/src/lang/qbittorrent_zh.ts
@@ -513,7 +513,7 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
     <message>
         <location filename="../options.ui" line="508"/>
         <source>Disable DHT (Trackerless)</source>
-        <translation type="unfinished"></translation>
+        <translation>禁用DHT(分布式Tracker)</translation>
     </message>
     <message>
         <location filename="../options.ui" line="579"/>
@@ -1105,30 +1105,30 @@ Please close the other one first.</source>
         <location filename="../GUI.cpp" line="464"/>
         <source>UP speed: %1 KiB/s</source>
         <comment>e.g: Upload speed: 10 KiB/s</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> 上传速度: %1 KiB/s</translation>
     </message>
     <message>
         <location filename="../GUI.cpp" line="491"/>
         <source>Finished</source>
         <comment>i.e: Torrent has finished downloading</comment>
-        <translation type="unfinished">完成</translation>
+        <translation>完成</translation>
     </message>
     <message>
         <location filename="../GUI.cpp" line="500"/>
         <source>Checking...</source>
         <comment>i.e: Checking already downloaded parts...</comment>
-        <translation type="unfinished">检查中...</translation>
+        <translation>检查中...</translation>
     </message>
     <message>
         <location filename="../GUI.cpp" line="530"/>
         <source>Stalled</source>
         <comment>i.e: State of a torrent whose download speed is 0kb/s</comment>
-        <translation type="unfinished"></translation>
+        <translation>等待中</translation>
     </message>
     <message>
         <location filename="../GUI.cpp" line="816"/>
         <source>Are you sure you want to quit?</source>
-        <translation type="unfinished"></translation>
+        <translation>确实要退出吗?</translation>
     </message>
     <message>
         <location filename="../GUI.cpp" line="1003"/>
diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index e9aa7d34f..9dc5e2d47 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -521,8 +521,8 @@ void options_imp::on_okButton_clicked(){
     saveOptions();
     applyButton->setEnabled(false);
     // set infobar text
-    emit status_changed(tr("Options were saved successfully."), true);
     this->hide();
+    emit status_changed(tr("Options were saved successfully."), true);
   }else{
     setAttribute(Qt::WA_DeleteOnClose);
     accept();