# HG changeset patch # User xpol # Date 2012-09-21 07:29:50 # Node ID a5f29bd67760649f1074509993302abe41a0c63a # Parent 02e668af87ac0e6e47986601b29178ae7bac1ce3 update zh_CN translation for 1.4.2. diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo index cd423e40593c578ae8b07dcf04bfeaae941d3810..52185c12cecd51c8c881c5cfe91fcbae598c8497 GIT binary patch literal 54392 zc%1FLd3;pW`9FR^>sGs{wVSq%3o0#%xYR1PDnbM*n^{0MVKOsG29lXDGXaC50kV<} z*}@X`1j3et9g;xAeP7#8t8KMvW|CN~*6xe;`#k6U+Ruepn;6|ypF$MiPAmyJWcr(G* z2!4&=Id`Mnw+XK0{t#S4u#I3H!L(6^@hyVC9|ig|M$^OnAC3CIH5&aKG#c}9!)VM` z3c)WCOdpN z-J>zS3&)_JmyAI_en{{Ng2TpOU1y8|U0CQI8iRGN61YvuwT(glpBsa5z9RVFjsc&1 zI0pT?{AV(Lg6TYdf-4D@{S4!~^d9O1^B=)$cpeB|M{qI0AM>~f{)pfQ_n=o*bn-$*c( z_aVU)E_bhC3?Vp%;8g_Y-HUeC--~(NcQ5$*m-nK*kMBi2=cJ~J*la(KU1+@VS<-2AE$zEo=gS5y&>h_PX*unJ{9BoyQI%e1N>$h=I2U* zBMDwf&`0ocUavHaV|NrW1LM3s1N4(JFkiDX(BFa#%+ulw%u_`MPc9q8zx~sM^8e#_e$D73G*JBgnkuI!v0@53H|OA{Hv1wouvOb3H=%{ z8Tc?M|?!$by+=ul&LNJN<(|uTW@Yg2*${#3L#cq+=>J{9|I^i=eJ`Bccs zhN)QB_Nm~L$ArFTD#rDx(EoEP+Btt3@D~dF?liP}1;I-QUN87@(;&Apra>+iPs2WL zBX}dh?rEs+lIfV=%crB?qo!lLsgj;G9qT%0I{Nv5z=hM%&SFU~osNFjPDj0K1;1%J z*0VwIhX}6c@k)B~4Dj=e8R-Aq8Cb7sf_E~1&p`kFF$41Dvim`I%l&9Sogk?QW4few z+z)3;O%U4fqp-5E2{@2|}S-FIe+9WfL6w@G@Gz>Jv~muDvAa?VWf zcjZixi!-tA`(|SPo}LMQe~qAr;9E1%&)a8VzurAd)@v5{Awyv9EY!PX7W%hh7V6(X zkh*RhAb1D!fm_zg4L+XbMtuw2=tqgbb#AOwcLQ!+)4XQIAvChA|DiFvNhM8CI4JuL!H3f&u- zkQZ+Y-5;f%|72oazUsj|eb<9_ulJzbJs#9E$%A%s1U}?Jzn6K?-&G#W(^e1qyUT-i z+C9(%&w0@QUJvH|Qz>_j7k0(PUg+UeFZNfN7xf+YiazjSzTWg=o!{}IzL*#FeN1o| z!7uqRjyrwe@5w%lBj1N{Jm|xCt9_6=YkgSHgFeXJ=X@B~yFRoZ^Fe?A!H4-9o`rVP zvoL=%1m4(Pt0gLxjB1A8wk2kWs> z=yvCzodY@OcSjET@m3DzKbC`jf0ToH9N@=zF7=~7H~LZEJp%9ZgAaUu^s9v6_nBV= zf6|X}zw5_5f98ij@b%e{3!`RZoo5rgm0;0qjH^x3PYKW;Fru?^k;r9=&N(VzYV!)|IJ+R z%^!2okCAya$2<>t;N#9b)c;f-*5mCw(0!7J`pyhs{x2a&E{}0l0QzT60PD6c0R8i7 z0Q%>%0NTAiNHz%bQxN0s2x2|o3<_Td!B?>$*746l%>TcFSm#UfAs=te$GnWlM?de+ zhy0wM4?ZX(NK0g_$Or#_mXG?+pNsKaFct#yq8kK|eK&bq|EWzr|t9^R_Vh`&bzB`%)Nk^w(j`-(Q68s}abD zA4XvJj*Fn5p$NvgAcFa?ilE%;2=;wT1pPk{k?{~Ln@p%~Md-Jfr{!Z`+uj72=e?agSUXKT0XN`UU z_2)kTKCK}56!%lo4;Nw_dkew;`wB77M+81yi1GbG;9G^@$9D+c&g)-@@%>~0=6U)8 z>_h(otjog-u&Z$wTPxr3*3dgBPNml!c(bcOmj8 zFT{Ag3$YH17lJR=E)==H5c{uD=nhHwHx^ zYKk$>b&|hD@J+?&-@anZ%ag?z$Lqz|?{5{Ozkeyl`kY&W@>iCizdtBJJGYjgT#CSP zC792Q5{!Gc(9bUczm}GWJzWC+JWv9DeNFP;Ey2G2yVUoYwELw}lsmr^?Oss|xtm-H z`a2{&vJ~UXC`G;ZmtuT@QjGVZQtZcCDYw5A^K(SXpDaatua|-k-z-HuE*;|3}AE>~%It9K|fpPr00`nA=^uH=F|6f{)@qS||>i^DCtkYFXG2UC3V%_gt zigu<6oqH+taPCsfU$MZtrQo|=OEGU9l749^*6p38ScmSV=+7ro-&vKwUr>qkcPr7a zL6ZJ~q<>V2{tv4}|3(VDrxNw2R$|;!E79K^DHo_jdtu41s6@Z&B!8#0(_D#h9V0l9 z`L7ak_vcdICzas;zgA+t&#OW`->gFW*H&R3hE}0pBdRdZKNGqsRp7rlRT%GsRcODs z3iDM_h4$A~VSV>YJ)Khj(^c3HFH3z4&5%s!{JUfm^DjKh=;kol?&e0$-H!zo^Fe-m1p@d?4ljS`EHBy9VuES|f3> z8sy(l13zv=4cafNfqW^efqk~62IGIc2JJszgZ5q)`ZsFOkGEtBm;-nb0(cM42dChNEi^EhQ0%4HKgFo5)m;4fbed2row zjCba8)E8NfelA*$@s|r+F8KQ8n73_`J|M77%AXYamj(Vx=--q4PX+!*@aL}pyj0+j z70CaIz%eUO&m_s8CFy*D3j`Lg!1~lkxlMxKL-00&ho$_dE70G8E6Fz_cnr>ii}16NBNdo|YMqSdJH+pDn;u3C+KbMtES zW4yo&fzt(gR-^vetI^&GuHus^*YeswGMhIdmZXqu@3Yn1^#Xw#{Hjl z=;y`j0k2q(^}B98*5y{g-@abtvZPZbf987ZWAA#=A3|3wuyQ@xSuW|O^|1e1*26!3 zWj*?HWk_I*{}xMrmEbqk<2g5}tfA8CX z`Ka1}cH1_f{F@t4u6G0a`{j**mv2NpKi-Ib3>P?F@Y5vi+lcXnHln`5jgS`=g5S6i z>)f~z?K~^xJ`ngffoE<4yg=ah1^!UrEt_B;r)j#v?%M=;`GUar zHi19>A#@jS#`u4@8RdVrS>pDa(N3YjQh_T3Zr+Uk@7;`Xz9Qw{k@Vk%?wl=1U%Un5 zAG8JdAp&m|{N0isw*~b~-2%N4mi$(MN48+SPe}STN&iaHzuyA=_~{nN^|Q8OA6&c@ zbi=kvJCdHd75&Q-{6a}D-HLs`PVh$sJ|*yVf$wa^e15nUd~nV-;4j<;Id<7LnP0*G zjNrWlCkuY3;GY%v3&Fp)4dWTmfb=;H;MZ#!us#_LnEyEq7)Q0h%>oYy-O~-wtG{W$ zxPI4wetyy*=llZCZp1jg(TMz^jp7eA3coj^p78=xg>F(K{K;93qURc=eJTHRBkbju zg#L4Z=WGZ4h1)@Q#dhEaZ-*SYaXa+xZQDh!3Eiaan1>nLQE#Qd4uKzSNB_RR1M_pm z4zVY9puKw}J#7ct%iIC^l`HtU0v{0gh`>^T)dE-UK)=>Yx@iaGdW+P1X%pJJx(V}f za})fzF-?g7X6LFMlc49te?UZ{RJE0fnOS)nw`msh}qrm+; z#hw%R#7@zFlK)FdcM1ISPRzrZyTJG7?gHI4yU_oecALn4tZn`>MxP}sy(Q8lhExH{4uHLMah3t;QK=N zk)%Hpc=leDyI?QUSM8PaX-VI{SMJXU%-D)+>7;nP3V6i z>31ak{$7mhBPsXiy|9nZYesz+HKYEko3W2?Y=(ZECvaCY%D>%=_M*+G_b&qfBl+jH zpq{U{z&`n&q*GeJPpK`S%NP87Nf%4HvIX_6X+b+%C4axbV=a*5k4b)1@PCo={}y;| zEAqeDig~=c75tLYit>|M(Vquf(a*K5;LDS(n2)zwQO`%Mkca9hAE|Ev3fPuef? zdB2=L?Z^72@5lIO3;hD2U%MakyM4dh|JpD1qoku!&*uU!IDm3j9e}*O{s8bZ4~YGB z0CwBr0}@X;0DXP(0PK#>51>EaJ}CTt5b4_mrVD=dLCo6%!9RKs?d~{;_6`bs<{;$x zTL&?&e;-7@FFAyIZaReWBM(8YPL*^e!QnjLl79aXoDS&O@}cbe>seHt~`Qt`VpiTAAwvtK(L7WeFXD7`l#5)M^RtyQPdxnbkR}pXW3EM zb9*HJ#iJPSn@2IPe;53P#{e%QIF8^DNiR5t`pS;U{itJ@pDo8=7w?n&zX|>40>9h_ z{I}cC{$*{@zjw5u{J1ue`)wG{Y=Nb1a$eUa=QL7Jv<-amp``yR@H2sDwqyOi+>ZLM zY6t$NcFen?pd=VVa^L1SO>f>nlu)ya8 z{zmdYmh?X)ef|lgzbSC=3B(J3LU0!EzY`em8z*pI?c)=OQ(oQ){5_qJbJ+w>5-jP& zI*ob^z##U-cO3tA7mb9DPjgyFDiN-A=dJ1~^ zlc%trS3Qk+8}T&KGoJ<@KKwNF{E4Sg?wO~tkAC|!>ihI*#Jewg2K(aHXW+Nr^9<}t zkKjWBiv_M0*z^qI$8FER?)rtmccq?>1b*pR(0}h))O($zZ+{l^IZ@zbf%iWv_t%~U zA3PxV5=mD*i}9>|7VFa@uv5ytBJ}SG?3Hq#JPSSjnc%ylVuwJiAJ%4x(HA(ryFN)TdKvMW8ll@QaR1A&7mi82 zFA4nJ%UI7pN%?bM5xe#kl)GABlHhN8Mf&jy`g!jw*k>89z^}`e{9GwlDCLSIy-Z-8 zz>PxRDCzwIkG+C%JtpOU^9uU;p|m^jRXO*075sF;t0?z_S23>ZU&XwQl=OJXcfX4I zawPqLq#u!V?W^d|YQb+4c;Hp=-xIH*{a1wUjaM=qUq^d;1%Lc?jQ3TkKPK=afqxeGFM$K! z0R6ddp!{WTU_EbmL*l=0z>ZFR1M}4>_~+ihJ)>6zKjP=WkNY{+C;jKpOZWX8^|}Qg zAvnOmABiA!x1(~PVg3Dw-h1fzF+IsdI84h6(fc`6$vDEVqUS++b{o*Ix%7SpJ;!Wv z<913vLS=qU@O&yaklrUqeac222%ls*Ju8UjT^>K-?xSZ9J@W{68^N$v=MMwE*2H3R!q4ySf|DM!yG2v7>hM$fbKxT(!j!GD?Rn@#DTQ#$Dk*voH9pSDTeFHrh9%5N3?IRjyzG|}Uh zdf2|%FZsI(*GbPkls-x@Lb%`2`&;zxA$SozBsz_=C_R$iLsG|9dViB4J-;>Z?aLqN z`6WFAh$da=))D+J(f-A`1jfsRE23u%J%1;f&!s;n2&PiHgPzG6{ndn@G7xvN`0oSC z-!cF;9RH1oTVwwFJ3U3xk3UQPg_Le27^U?3xH4x7d_wRX&+4Z4jRY^J`5sKqg_NF1 zbzDL3j}Rm`U&Wy>rgYN)*wp;@hSag1aD(YRU+`B7yiMR;8n2muU)K8d1m#bZ_nq`k z?zST}_ zN~al+fBg3=%Il(MLEO9z6uuuz_%)P&E~VcUnqPAt&%ifjO9=N2J*(--;eOC_{Xpo! z6ZGCp@8k{`zo++w^gf5)zeMlT4a7$I?+D?q;5{$n{gdE-J`ndm$t*R_p!fUfsUVs` z(zmVjei6MdCj7Mn;Un`dWO*RA*KHyblV3Y4mD^X z?)mZGrM$lM{LR2OgSQaPHcEeLz=z4>dE|NsAE1X+m+=|Fholc2Kl0J@3+64t-A(YH z^n5%Jz83#2WZ5S4w+j4R;3q=!vA}Opx!=-LK>4F7J&a`n!JBx`()&Sz-=#JGAQxqM7*hu%1j_wPS5y(u+7x>N>c7TqJLY;zQVNh%p3q; zaUj9(Q2q*fe^F>E1U@b0*(P|9aMc7KC-{<#`3}~x1kYmrruU^h4+Ej=@1yiz=sAlL z^Q4|CN{`_F63s8^$utme;J-?GW=Ol!2!24%yK%h!B;hIv_YuJt3AStbi|DzX@Lw5- z?`nS|_;Hl}vCwrByo}!oH;Z6}(6mrGNa+n+r}Uv=0PYYyPR|cyzHer|OvvQ~H`CKV zxLXI}PRe@(FPC=yP0#nJ%r{sj5q_}Xw;QmR@(6e1K*V^=zac{NHP)d7pB;$1)BN{) zlZfg(hv>dXPn|aQYYG1=qVJIO+4TN4!9hfG8$IVU&r`Zs+h;l2do|^k@t&3R`8@vw zYY6uty&oC?JMJ!e|Na^9amwlaVyUA@%55XMW%7QW^v^Hpll06dTrQOv$uf!HzX_)5dluJ^!Hee+aJQ{Z8*S+Ptwpc)7e6$MMTMl>QQx`Ict;yhpe~ zdTt^7C`vbLWxmDpMEK#nH>3=IcYKI&n^qpevdJuXVSdEQuN zYi<5Rd+(*Ze@VHOyg%4ZBivAW4hzl0tbceMtp5b}D}n4^dAS~Xey_FvG|_*|>qyVl z^o)^txsr7wy=T%hpVHqI{3d#KQC>E|I|!a2IEi2_J&)1*PlfL51hWV?P1>my{HM}( zBf&+2dyC#*r}szc{V9U~rstdVTqpUfD1QgNFQBJ~o)nhF0}zYjzdzISO`;jkc!ELG>qV#W=_s)PH^h1LGX8EAa z-vH(><|o4K;klsqKhb*zy;lp}3mR`eDDZy<;9I990}w0bzaI$w0D+U4x23E{Xw>~J z!bNy44ET@y_ZX#rNzZ2kaW;FO;9sEU0eVsiU#InZ6up1Oc?5q#<$gB+vDdE=ecNxuP zIm;f_u~OGP%+FexSG6|zZ?2^06Z{{7m&ktK$+|$J<#Xu~R8KwO9-{Y_0f_nY-%|r| z--!QyN6%Dxyp+F#;2g?(fOR50%|eqwxXlD7OTRv+=WMNy{LRGIs2@9s&PUHT>HTSf z6Y25N)5!XSXwEzXaaZ#%kMK#9e-**w1lMVK9Pc`~^JU^z5VeCk;9OqWtZQqxXgMe3|lIV?8PTzlPx72v?#ZvxFSJU$T!dLoA1gm z$jznqxdpy(#C7GMYx6@h{ocW0V~~4@YY^3u=^8Y}HE8s(LF0xEN;3%K3FhVb0uk*s z%N~E zf-bK=D@!GUxw%1fj1!?bCRB(tUnJrWWaB+27>YF0b1jTKNzrT^ZIgq3Neg}<@y6YTChOG_kbEI zI3rARoF5GPBf(Ii%O7?Hf)Q7qJ3pT)CKmB#y7GOY9CtodA0h4uyF4MEn_CTrs9?aI zN3U6-V4f?I<5L}Tg$u(GU!E&J*XIuVT%m%1%Ay)`{T?^>h6d^O2dKMLhu0SZCx$)l zfZY>62Ks-uXaApdEH60E*{%O)`gJYs0)K#4d9dR>DJeB&+=NLfuDd6s-jkGM3?Dg? zAJ_Pl$*xhU6EY@Rsf@IgR7XO~PfeLPA#F_hgw!d<@UdejOg4s39OIhfD>R0uPZ+2E z!?sgzvuV!<+_@SizaW!_6PMxf1Pe%x4EOLT6`1EUhI_sIxZEU_h<_no6oTeChlZc$ z%gZF`z^DL;FSR{6K@(h%pBr?0WrKMAA=)6hg|2yiw<|R#==F`DN0IWpSubH%b|_eo zZ>QD5N)qCSr#zBFORdYwWJN+b&ao*hi(BhOYrv=WWuFca+L!0{=W-@hXqNV2ggGR} zC`nQi|7$H#${&t|+?YU9A_NL}hFrlc%)}6vhx#{%YYyiG=c|oRvLQkZ(#+=O@?(of zPPjdgBYAGG&lL<{>>AV0_Y+YjF{#Jn3y1xgwC$;K-#lNaFi1j%x)?tvMDO)wxeIb5 zygTyzREis*x_xd>PNKR)EQPsR4~;+U3uxtr@Rp+{bKDWdCZ2+Dgf>*)2DpBGk64xG z2E!56DSbg{?9`o5h!`p8@f3tYG?m_h5D9XZhdRmQn&-~-du6u!qcx>2&;OuP)Tz@c z29b6D@92fOzF<4rJclFhQ;oQvQeV7_afSZ7etz+092=~^0@z$(_dH7UPo*>FX=#~n zlo${B@|YQOgPzmyg*G8sWGFD|RO}Ik4bf-sCD>g3RiTOoX;`P}nW77m0Yy9U3y>EC zXs~lIJ;6X>Ua%l6lE4_QX)V@uj0my%GltU+rT-!!e0uDcK&S7!1Tswp`++0cw`^{Uuk^@c~|CJkU#L~9rH_}!-2OIakzDdF&8#3XYo z3!O*kW97%)QrbjKqvGg5#A+ssmdWc&5|@aU76m-o-08J=X`Pg*!Fz_R78v2Qz-rz> z9Haq;X|+70C$l1KxVY7(SDg+JJBnTdyO?Z0!c^6?5d->o^+VR9~r%Hs=oc|$t! zUZ0l1ikStLywX;--g5aZ%u|KgB(XF?d^~|_)zn;@7#;~Nj&dpA!yW-^cDja$;Zdrjz? zL@Q_|GEM1VB6!zYiFqImWcfpRYFV{itaQdO%tb;1wQi>(aIRQl8hxLhj^b2pu^K#G zem`BdtQw!LW;_s?HW|zOe!8m$D$CvIX54fuYQlCKTt1mO$B_)BxTQ^ zI5!f96K{J2OIi=lb$+3)&HEtGNoEC~!{#5MTu9rk(9+Ju1m59(jWFHMfH4C0sM15m z$dqxz$B#5dy2Ck{L3hYYZxJ^%Ycjw4jFEi}<3u>}ZoI06aDh^`S=6IKi;yLkGI?2c z!2!yr?J>j>RpbWDXNi-e_A=|nJZ_pvN;GLi%8h70GqgYam^dQssF4#(ISN-pr{TWQK?M?`A2g|4#MPw#g zlY+GF#n}j{fz!&IwBB^mL=G9_S!5{|NZ}6Pf0x_q4Y8HuNcqfk#2ubv1|dvTkY4gh zr0E?BC^Kj5$l(*scT1ZnUCJDdIFVYxtSRDH4J_G}4#Q9F4$D_# z(+nXB_L<;I!yXZi(EKDaS9t68-;i#ZXjH6fB&lugJ{am$fQHlGP-*%CtS|>%OaAR( zKZ}+S?Q32+;t>_M0)g8_qN~7{h>%oUwoRSbsZ)xipUf~6r*q$@Jiz^T*z$K6cVoNQ z;!XMMeXxoL6Jkw%yxW~i`t@#KM46We&>AZ0IG#;u^`_!?tYz(JqqO5{|3TW&urhrrG#2JgMhf$Nn&GbKl*ggof?0qL361dV-7NaY zOf*IfS0SaMvW>r1uquhD}KW+dmoBR9Dr zQ7P6~U$}|>i0uZf|6NxMx>g})@)QmZUqK>*HAJDy#~dFPD#a+H9Of!g0Xsw1WAyOU zk;Z72A)~1Rp4ibrqT&D4R;M>sj-xpaGlmP1Sn%hwQuPOnF&XtO)I}5DPQKHl#e=nOvdAHswV|vcb&p)L>>fsB9*t<#JXT zNJzD1{baI^31kKzp#MpPC`n>FFk=GL1Ain@w2ShTrKO9hYiX+_k^S!X4_2PNu)j@e zn&?AZ>`2puLg-mpIgv>Iwc)|nh35r+DDTRmH!Bdgp5zzr)O4D{xdlNb!!Qm|X?%gj z9CHez@MjWtxX0&%o13GYkboCqQd;1kKM+ZFWvInVO&LCNTnb!wR`D#DNpyQ{lOvpL zur_2rUqKR5G&gupL-*4>GIca@wl>Qu9SF{sH)0wDHRL#8 zoI6lJ7D}P+m>~X|z(P!RO(2t3=`PVV2|~#-!|E8tu3m+gUEE4=^1_%04%TT6 zF9(&UT(>d`$lB$U_z+_7nx)C`9VbF^oG-*)3#pZq2S|HE7}!Wn`-~&wJ1O0r%}ZsB z^XK_k%^BkgUFKN{y^aq`>@O%NR=x z=?UIs?4yDG#>e|ae>dB%Hi+K+l!!pT`Fb?nn-!1NsEJ)b5hPP;RQ5A)kll zB#bCpGBDZ>M1cTCqpaUCBbg<}bL59sP>C7ed^G{YgtXcM_4f329&erLM1uLbzInb} zr*Si3e9Bl_*0II}jvMvySQ$$*lvzmANC~c!IFA*^wD1g87~t~xIezD949WI_T(8|mUpoxp)oVPs+0nz>Jvg@g)v3p}(26LAh<+5;1v#}bm%3-%W$vJOusI`5){ z`yf}$MrD@up*QcJIM5O*pXd;;oHDJ_zT+Z| z$eU7~Jl|WuQCg*XjnuR>esChrFODN}MkG2qPxU2%6D&SRWo?wIm=LyuTZ;)@Gbnrw zXXcU~=zc5IEA-kF8r&MIZDX2=STAn7iMK*-O-@V;27Jf(U2mJ68) zf57W|fZ%MXhE&>$`MPQ15O|cU)GG_LR5jfSu!*JL91xsZmAG>=$%>CT0d1bhtAfhM zO0}a*VI=IXXxj~LklNDbsaS&iK=2fq>foyX?D^zh_!8#F2@*#hoW8y&tPQI~_5yhx z68L|8i=DbLi}4*;-5i!R<$bC|4@aekz{67ScF98Rwf`=%_mu7MWr;>FIjA4ATq8-m zXyU9pMq}gjtqZ z4ARJ{SsamsElX)OE zbETz?Rm;sTuOAU-iIOL~#$>5%T2IxM3b~l2Bcy^{qtnwTx)6T8Y3R+v*t26t&zB$J zy>6tX4^K^>nLaj+Eg2R2(83&P8F!_prlc5Yvk=6sp*(t59)LP|M69gO$sC^!OVMQ4WR?kXMI{#(+%kQ+e0l)) zfGl$#B%GW|6^j2UEn)u$=1?-=RsT6%qcnA|!1UWyQr*>L-ic!rb=fS(pG&?$0GBk_ zd1SsBLWA+-7I+CG%(VMw&P;P9 z-A;gbm+#?>37C+Dl6uX^Hz809Xeewf(;BhRPH-y<`RWkSq)1|%DJbpN)1NsqElC5n z3MG5vlEYjIQ4khj-Y20E@j|EzKg^2aIIyEa*kJxCyIz><&ni?Ag>2#jAD;tKh-R*B%Ki94@nnlX0g zPSGjE$?6knFz>jhkuG<{5=;y)DFXIm0$D+|K_l}I3k#*lJ#NG(atmn)LChVF+s)`HJ zhln?ghEs_3m>n0^=UzbTn zzkNx1^oqxCT5()Y07P(;tZRw-Z9!339$ae7^qF!11-ZI_L!p4{EZZpAqEi>}BN)Ux5D9#upq#8r!|`IE_BSI+M&uHQ1LDn^0xWLkV&^GxOw#0i!VGiTXex?wrk>Dm76?x<8+u2$_EAWP1eI zY(%&*JtVgg@C{IUsDMcLWPtyRyKK$8r_AVNBLnv?>{tzXHD0&6A3_dReqkgh7)WBw z6}E$98LO(ex`0Re*Ywro+Y=?mD4*vWfow|53D9o0E<~z>3lnJtqG)9^aJ@^`T*bpO zlwU5U11?7jNJuga6j;Fwy%@I{8yZ@sYR zY&M#}Z|;xGuPoq9zt>A*!XnaXoV;q0kh#qG(k2qt(s#Mz;Ngv}mL)&07!mt?)N;DN#Ku=F3taOw~$H5y1 zw@p%~skY1{8R=8EzSMc)q{NIe*{!bm7?XXO#$-(caqW^0`9yQ^#j-F{7jOhWmZ0S4}n0&=Iy58#r)a10jw@V_47F$HyICg&Lt1d3)w$adLU9!1i#!Phnv=@<&E$N7-fC`S9;ok^3~r@`!T z)+&af6NwwuPF#MUW3dDs2hj|CpfHVT+J?I&A!tREys?MRxV zmL2HESE*!C^JCo!F)#5jPAPjgK1Vg71L@K)C_8ZIkBL&f(Gyx3AGgn+fV#c&$VcN{ zX`O&BKg*b}>cb`uiC9ZFu-|^YF$J%Jxp`3%#I4-N^bc& zaE^e5Mxfm?k;`7{K0n^WhTMoZAwq`oIg8=AE-(6nFX-__C-c*EjSo~29c`XcCB~X@ zQ7czzjkvT{H8Zp!cMuKiRl|(wIGfWh;u&%f;R@z@)x{b^T`*RkdCBiZr~?B_5qPzm z{UP^!JB@Od_iq&t|CB5fP#Q*Q{w(vtybG`KQE8}h0nRT<<+C1q|Ek>?cAU8S z?3<2cvhptu%+KLt+Hk(x<1^scK-S|J$MDDBc(yRsL8f23t&Ap3uY5Kep)6^0-JxtB z=1J>8E??NiJt}@xMRSQI2pjR|8_e`Zu6@UrV-tq;5t<)?}K8yx}lh&Uqf~ zb9&CkM+4wrYbwnbCg3wfBg{v%h&>CiZ+DxBNT?v-QD2TJU&FLQ`1IfEPS`vcHczTl;;s=nFgH%HC==29C{X`-_w zC5-ybG4;KCAZA3|+5ChJ1iS^%gcax!Jew&@bezcN@7AwF?2XJdW_9?$;0)CzwRzRC zI6mN~J>`s&`}>5+g)x&|a>k{$p#)(hoDmE=?`0-SZxFpxy)^oShx-KA{$Gf$Iex7} zZB?c=@P#`LJ*nr;58jnH;)|htbuVd*H)#^oz%VV4d42K?$wSZMdpn^>(ztN8-ov3Cw1IWjdRE$zIC6Vj7Lh{ck`pU4h#-7xg}8Wlm|BmM5ATWmV+W0o(JloId+ zSse{?-ID2#oHvS;0W&L2S>Z6(UFz&-X!5PeH=lQ3lH~EQCI*$ce0}ndl5eCOB$N0@ zH24gLrg_-(oM4`Bx)qo@&*%gv}gB> zrv#m=t&1Mt7hO>uttyFC?oqR`r7BjtJX+EiU0x;WX!+*ewGAJ4tTT}AI=Zy$XeHGk zbs4Viitx z^5aU{zt$FQp>5ZQA8f;ha%t~iU>y@J*%K|nV~ZKTOA^cAwEtF2A-3;ix{)rXsCmhCC-(|ZtfwUx4Fj2_ufZG+k@ zc__MfS?}Uz8VXZjG`-7r64vN$-qO9S)BtNq>w?3+C$WQBAl@V{>t1{;TGk$0bE3PU zt*2#scYA49=a$%_76Vgn#43u2p+!)2wYPU2UqvJBU2>e*nYb}p-=q(eX1Tk*l17iY zvZjym)Gq2;+QiF^ggxi$ihJAF^fWibHZ18~yDZvT+Ou^x@j6LGs;;-FB38MRt5CVr z@4m%*%63JY*L5AM&}-;Ax;5IdL>kkV&WIf?p)Jzgu_C&64Jndn?W5f*H}$Su+tWg0 zr%@>h=z^T){Gzo^5|vNOCo28$T=s_Z$^5-n-v~4BL9HqN=wDR7KRnYz_#qX6x z_ic<7?SOJHL`y^JiBNO=NLg1~RZr*oX!&7m*N;2O2ZcZGs4&E2kuAwW-`xDJBv-U{ zS5Hg30k$TgRZS{~cLKI!d$Af+oB3INtZsAcz$%;7qw6JIs%aF~XhJ(>1wMM-C zg(4s{Z2K!#zbjU8g4WwcS#RA-566lY*=ZUWiP&hvj-H|_k_xeMvWE6TC&xB5vdF60 z6x~s2(PNro>pQ#Jw`sLB?4l}YQLQSH)t}ZWnw)6KqMqiX=q}Nc0oYr&R~J1PjH9E` z$`d5wNS<<;+BKLkn}`auZ|mN?C`wX+x*J!9EVG{D$L*!i<~dqZ+1;^|vW#eR6*E~$ zW$(Ju=&~BpS<$k#SlcpGY>0rR-40HKT3{u)yRv)zQ5poVnl3*t$G0iwqan>6)J{5xS{n>vUDbRF-c zjiv0_mc7j7#|{%4$Ep@7m049m@*!5giHrkmL>^x4vaYs<*g?{hqEG-jfNY|I1+A;aFl27&;^6sW82dS*{cqpm^vs(&7)M!*4=U9%RwQgH<{D03$1iKvm?Xq4$>xznudp%VDb}P zv6>wuyn8onjcw>O;0TDq0P7jLy<_mcTe>MmcI)a^X9kS5L$y6S%HJ?ceyx+7wp1t$5&9h(d^BtZF?P#rX2!7cFT zyI8dJ74IUEj_mJlukGHxh+EL@1?WLTyk`s(35N+DhceSJqV+^VBU%&-jA)0Wu6M=I zH=r}Y0tw5m(US!nUAn~}{oh-(h;)z9y;ElkrOfeTT%y>wFOHTT>fLh4nw6f~`e^kk z$(Bh*0y-3Yhu!pk(PB(4iDz)x|nvb&BJu@)nZ*bg1|zNkZ_YrIt@ zSZx=^Q*_s~>Mj5?E#wLIVYFdi&%s8AHJbp%6DQbZ)bW}l)SP8g$mSz!&U_V)E z$11AX!C6Hubgp63silC;Ws^Usc!fQY&25)n46Qe3&?@cTrvUsFQF+U0T*(B$g``%TZ%J5|M%xyV-xQawdti2(+wh2k}x2I}Jbp1hK5Z7Vm!OvE~E;4jGfV`w4 zGWW%fjqX^X9t%knDgvhyAp!BrGD*)QF|OK@4yx@7uF~xnR*yYfn#3HJ5DQqVypA%A z=+e!k_Cz=;6njx@GO*Uzt6Zw%9Qv_?tGsy@Hz8<1GbQSsI@ViX)U$mNBBdn1^zf)5 z3a)!?JG+v-MeOq!a4aSCq0~$C(c@k14bF_3CRXssKzY+@scB_7yp|MAsabQZqLO@u zge*aQ<>36Xn(jS&h+kuSwm@v#!Hm{Y?mS5?@!8vJFeNk*s29^5XJz5G7@MB8+o@iM zWbIwjM7y7*J~{K`t+up_@T0bz(Q1>58g|MpOlJK?2PVPr6Kg@mY^1ckE>jw zDM%P`MDE~r74K9DGSIp=H73fjhGq|FHuMU%qBcV#LnEr~DmTHD*FwUIQ&DZK+FWi^IVPMcLQ(KBeU3s zEh?^Ew^_3js>)dR(-bLIXC{d2r#X>zn=M^!)~CWD5;y@05nD&_CR*D<1C$?-qFPiS zMTM}DqTZli(opXfGT0Z}4%DjF-m+Tz2cim83_Q z;a8BExXb$eD6A&LIZH*o3Ir-3`B@Ze935MELPh@$)1>{c%D~E2>Z`0x3p825Dtp2m zY$gc+iCJR^(EFydAT9^!XeE@XthTkO9$1U5Z=*TtU2%d%xw$nIV9WCG0VhsE`!w+) zis(&@bLrvk7Pi~FcPyeY2(TBRc2~6J7`8hfPwiO5(;Y`-bhYh>uAt%R2O0?yT7g6{ zUTr>|r@!Go2v_&YeGo^Qm)(b`-&~d=o6CB)uIVW|K(2@DM$I#E_!EwE8@&Pq*y4Cv z={KOtcIo58&oOb-z?O=gyL*c^(JJ)THL2fZk^?gPRnEa|gyVRO(GK2X8IBoLzrI8x z+DpR(*XTdR6eZO~3K&i|ITg{;D)M)mSWl3G>MV*KYzNjl^?3hlW0#Ocd>~5{nC`jhZoD&a(D!VX zeQUK<%-vJxIPMcyO3ZjYqotkCC;DcP{YJ~Hp)6a>(G}hDC-Ke!6zw;Mbmivgc!Ju5 z*AgE8Vsbd1t#qP`4+^T}5Lksj5>ANz(?-ltdS7ib!R~I{Nw;qB#dX{?@)16^8&_P} zCzht-Jnnt#edj zc8X6scq=iZINeBxEo66CaiUb?lG6uM0;``OiqogCn4`@VJ=;p0ziY(xCca;g5Gy81 zdn3#wT>`R+9$i+&CN4tB#qoh>YNLjeDSQVtd6pykN^*z$(nl|^4TE}>C>;kbmOg;NJ55>(%R zP(r&DVF?xZ@Z^+e@lrk|+`fn>1P3SlTSMaC!xvg!g=yn(lv+WtFl};m(8!@2{1nkm zLvMz&{c*>-xZffY|CZfVTn%tpzfNTR6cJ951xTa_KCn8b#reOsBX}WIwoBc%6k6Q8 zBrCxoyx7`v_|vDZ(Qs~gRbFzW7QK7q^!K#v)z0VOTp;sjt@VRM zsZ}nOm20 z=7Cw4)kpKn8zsE^?Z=7pOWzIUU?WtzGgta4{8|I3CRS2Gh_M9Aa!yt{u~Pd-NubBs^{Qw z-!8{CABlF5cqA?=jh63Lu{6`Ihi|KXFi70oqkG>g+D`vWqZU^)Te$nF#QH*g+7Mqyd3daE96=CnG7K`e85RnPGj_N1#y#2e?I0FsN7u|t(T zEvv*}L;y`iaS+(y{*D;$LO2|bDy<&eGq5QRz~m%>Ty^qNNUm7%L>x1-ms?*QUAiT@ zwn?s6v>d}IAWiw|W!p;jvw98{$J&-z*BA_x<2xVZH*DD0yR|r0zlqoI$dRsN`>@s= zgQYHYtm|FV&THAcq~Gc}NP(*&dMLmQ@#rXoJFGK6%~PW)a6)BeA`T&;14m`f>vLND z=JbO~c@TW`)mEcNV0${3QSZ%P&jA&OK54XkWm5U>eD=Sx*^-?S-NrdHE}9@JtqAlR zl$co-#V0yNwXfV1TUD-Bfy!txB;4+RQZuY;Gttr#`&zRmayIuARq2;#q`SIWRWe$g z{uQZ%JeF?UE=hNLV9Uy>3M=TN*{^Vf;pDo+RE>)SvZiRK&3r7@tS;H9lW^-IDR*e| z5xqm^F(J;UW#d5GEIAI#6_M}$f64|k4?8mcIH9?U&vxuXh0P!n7ZWiyiLsWi)B_4@2vX5su zD&Nr-ZP-V)miEgvWM{#6RY9?ua#EJODr%$31uv1PY(UiSqO~MZV>Y7FXj+NlxH}B? zWz-+4LCnBAE%E4rUqB-S&vRt5rBT15Ylk0*7gTF#*}NBQRYjcP{OK6S zd75?Q%5K{EV>G9zNEnW9&5^fG3yl{Oc7yy<74cTJ zNF3VQ_qH3WlqhXu5g&5@M5HS2ZLqB(!Kj4T|E`WxQ`=rjH!QNNu`GF|#gQUhhwU2C}; zB6m5>%J^&$qD0+56e}7vS*6Xp|5^kcu8tl-HxG@q^G1;J;+ZEsaUpkfh7>%XOHU)q zGFrQIhA|Dd2xqt)M&>lk)r^ElzA>Qrg_iGNOzV4nU)irS_>zvr=F`9#Gx}oUV^ z_|KW-ojnaK>a40ShHKR^`Zc_`z6p~3#c5DVOhA=ro{Xb%&5zLWSm#6-8H*#S%tXhh zA2>?VzCvN6TCuO=YY&smfwRgutk8ttd1$fi1mC+Tl=;a-@9s6-Z97bPsP68#?C+{# zb%%TF4kr4z0163FcMMK+8Zy`zI@0LKz>RD1PibCz%a$6}WiL69l`G?M7sJg9;c@rE z0U(_bh&A9S+IOS*v|qme*xL|oD7L0UDwd11ZKckOwQZ$N-%PQ4+#OjY+G?y^{nBCA zQDx2o=gg8r9c2~A$B$Vt@&_?atb76E2+u?}$+?gV#Oe@H?(*?MYt>jPS9vtry-f4& zqzDw}afG7ArApj>iPi1EX|KVD#pS!r>%TZT7HKNiBGpxMbM0`IQhnHtyItaN={||e z@e3zx?}#0sG+W%|#=iF`&E0j{3w80@tIxL|YTleg{Zp7T?dqo)ZRQh@#D6~1Z#%GW z``jK>lE$T7Q%Ovb_#>4#gS?;S$@+ED_5YEI5cWGIdVW7s0+LgWCC+~9LnN0L_ltRPuckL){+Fe@Q}omUa%Vh2Yw?C2CWs!2%g zTA!miCf>U0EkP!e2G_M5#~gBmPr~o~DCP=7k*-kd;%; zH$KVuF%XP3@61foe(ud;IEibL;E@}<`qdVi6{^DeXi!}d;g2uyU2y+5<`Hrxr@XX# z{c5b5>6Tj8Df*gw=H&+Uy|LDp#Mc+(;=!peBj6|=cjDD7idEy=$f((h5Mb|@%UV&jft;0pA0<-~x}kLS!=Ec!{9 z*$67&tLb zpdpk=&_|4mAMU!&)xEx19Ve9bu3O2ycX*?s8Pr)7UkuimT)xYT3p66S2^-GV#pcf9 vc!N`ek_E)fr^T)ze*Z58J|JcPi`a)UwS{MRV=J4KrM7hnWpCipwZ{JeU^IYh diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-09-02 20:30+0200\n" -"PO-Revision-Date: 2012-09-19 13:27+0800\n" +"POT-Creation-Date: 2012-09-21 14:39+0800\n" +"PO-Revision-Date: 2012-09-21 15:20+0800\n" "Last-Translator: xpol \n" "Language-Team: mikespook\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -19,9 +19,8 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.5.3\n" "X-Poedit-Basepath: E:\\home\\rhodecode\n" -"X-Poedit-SourceCharset: UTF-8\n" - -#: rhodecode/controllers/changelog.py:94 + +#: rhodecode/controllers/changelog.py:95 msgid "All Branches" msgstr "所有分支" @@ -39,17 +38,24 @@ msgid "%s line context" msgstr "%s 行上下文" #: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 +#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:71 msgid "binary file" msgstr "二进制文件" -#: rhodecode/controllers/changeset.py:408 +#: rhodecode/controllers/changeset.py:381 +#: rhodecode/controllers/pullrequests.py:368 +#, python-format +#| msgid "Last change" +msgid "Status change -> %s" +msgstr "状态改变 -> %s" + +#: rhodecode/controllers/changeset.py:412 msgid "" "Changing status on a changeset associated witha closed pull request is not " "allowed" msgstr "不允许修改已关闭拉取请求的修订集状态" -#: rhodecode/controllers/compare.py:69 +#: rhodecode/controllers/compare.py:72 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -90,7 +96,12 @@ msgstr "%s 库的修改" msgid "%s %s feed" msgstr "%s %s 订阅" -#: rhodecode/controllers/feed.py:75 +#: rhodecode/controllers/feed.py:67 +#: rhodecode/templates/changeset/changeset.html:119 +msgid "Changeset was too big and was cut off..." +msgstr "修订集太大已被截断......" + +#: rhodecode/controllers/feed.py:81 msgid "commited on" msgstr "提交于" @@ -163,16 +174,16 @@ msgid "Changesets" msgstr "修订集" #: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 +#: rhodecode/controllers/summary.py:234 rhodecode/model/scm.py:543 msgid "Branches" msgstr "分支" #: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 +#: rhodecode/controllers/summary.py:235 rhodecode/model/scm.py:554 msgid "Tags" msgstr "标签" -#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " @@ -181,7 +192,7 @@ msgstr "" "版本库 %s 没有映射到数据库，可能是从文件系统创建或者重命名，请重启 RhodeCode " "以重新扫描版本库" -#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " @@ -190,22 +201,22 @@ msgstr "" " 版本库 %s 没有映射到数据库，可能是从文件系统创建或者重命名，请重启 " "RhodeCode 以重新扫描版本库" -#: rhodecode/controllers/forks.py:167 +#: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" msgstr "版本库 %s 被分支到 %s" -#: rhodecode/controllers/forks.py:181 +#: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" msgstr "在分支版本库 %s 的时候发生错误" -#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 +#: rhodecode/controllers/journal.py:203 rhodecode/controllers/journal.py:240 msgid "public journal" msgstr "公共日志" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 +#: rhodecode/controllers/journal.py:207 rhodecode/controllers/journal.py:244 +#: rhodecode/templates/base/base.html:229 msgid "journal" msgstr "日志" @@ -226,51 +237,51 @@ msgstr "密码已经成功重置，新密码已经发送到你的邮箱" msgid "Bookmarks" msgstr "书签" -#: rhodecode/controllers/pullrequests.py:158 +#: rhodecode/controllers/pullrequests.py:174 msgid "Pull request requires a title with min. 3 chars" msgstr "拉取请求的标题至少 3 个字符" -#: rhodecode/controllers/pullrequests.py:160 +#: rhodecode/controllers/pullrequests.py:176 msgid "error during creation of pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:181 +#: rhodecode/controllers/pullrequests.py:197 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: rhodecode/controllers/pullrequests.py:184 +#: rhodecode/controllers/pullrequests.py:200 msgid "Error occurred during sending pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:217 +#: rhodecode/controllers/pullrequests.py:233 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: rhodecode/controllers/search.py:131 +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" -#: rhodecode/controllers/search.py:136 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "没有索引用于搜索。请运行 whoosh 索引器" -#: rhodecode/controllers/search.py:140 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "在搜索操作中发生异常" -#: rhodecode/controllers/settings.py:107 +#: rhodecode/controllers/settings.py:108 #: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Repository %s updated successfully" msgstr "版本库 %s 成功更新" -#: rhodecode/controllers/settings.py:125 +#: rhodecode/controllers/settings.py:126 #: rhodecode/controllers/admin/repos.py:284 #, python-format msgid "error occurred during update of repository %s" msgstr "在更新版本库 %s 的时候发生错误" -#: rhodecode/controllers/settings.py:143 +#: rhodecode/controllers/settings.py:144 #: rhodecode/controllers/admin/repos.py:302 #, python-format msgid "" @@ -280,19 +291,40 @@ msgstr "" "版本库 %s 没有映射到数据库，可能是从文件系统创建或者重命名，请重启 RhodeCode " "以重新扫描版本库" -#: rhodecode/controllers/settings.py:155 +#: rhodecode/controllers/settings.py:156 #: rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" msgstr "已经删除版本库 %s" -#: rhodecode/controllers/settings.py:159 +#: rhodecode/controllers/settings.py:160 #: rhodecode/controllers/admin/repos.py:324 #: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除 %s 的时候发生错误" +#: rhodecode/controllers/settings.py:179 +#| msgid "unlock" +msgid "unlocked" +msgstr "未锁" + +#: rhodecode/controllers/settings.py:182 +#| msgid "unlock" +msgid "locked" +msgstr "已锁" + +#: rhodecode/controllers/settings.py:184 +#, python-format +#| msgid "forked %s repository as %s" +msgid "Repository has been %s" +msgstr "版本库已经 %s" + +#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/admin/repos.py:422 +msgid "An error occurred during unlocking" +msgstr "解锁时发生错误" + #: rhodecode/controllers/summary.py:138 msgid "No data loaded yet" msgstr "数据未加载" @@ -389,9 +421,9 @@ msgstr "写" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:337 -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:346 +#: rhodecode/templates/base/base.html:348 +#: rhodecode/templates/base/base.html:350 msgid "Admin" msgstr "管理" @@ -465,10 +497,6 @@ msgstr "删除版本库统计时发生错误" msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during unlocking" -msgstr "解锁时发生错误" - #: rhodecode/controllers/admin/repos.py:442 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" @@ -477,7 +505,7 @@ msgstr "成功更新在公共日志中的可见性" msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "令牌不匹配" @@ -502,109 +530,109 @@ msgstr "成功将版本库 %s 标记为从 %s 分支" msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: rhodecode/controllers/admin/repos_groups.py:116 +#: rhodecode/controllers/admin/repos_groups.py:117 #, python-format msgid "created repos group %s" msgstr "建立版本库组 %s" -#: rhodecode/controllers/admin/repos_groups.py:129 +#: rhodecode/controllers/admin/repos_groups.py:130 #, python-format msgid "error occurred during creation of repos group %s" msgstr "创建版本库组时发生错误 %s" -#: rhodecode/controllers/admin/repos_groups.py:163 +#: rhodecode/controllers/admin/repos_groups.py:164 #, python-format msgid "updated repos group %s" msgstr "更新版本库组 %s" -#: rhodecode/controllers/admin/repos_groups.py:176 +#: rhodecode/controllers/admin/repos_groups.py:177 #, python-format msgid "error occurred during update of repos group %s" msgstr "更新版本库组时发生错误 %s" -#: rhodecode/controllers/admin/repos_groups.py:194 +#: rhodecode/controllers/admin/repos_groups.py:195 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "这个组内有 %s 个版本库因而无法删除" -#: rhodecode/controllers/admin/repos_groups.py:202 +#: rhodecode/controllers/admin/repos_groups.py:203 #, python-format msgid "removed repos group %s" msgstr "移除版本库组 %s" -#: rhodecode/controllers/admin/repos_groups.py:208 +#: rhodecode/controllers/admin/repos_groups.py:209 msgid "Cannot delete this group it still contains subgroups" msgstr "不能删除包含子组的组" -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 +#: rhodecode/controllers/admin/repos_groups.py:214 +#: rhodecode/controllers/admin/repos_groups.py:219 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "删除版本库组时发生错误 %s" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:240 msgid "An error occurred during deletion of group user" msgstr "删除组用户时发生错误" -#: rhodecode/controllers/admin/repos_groups.py:258 +#: rhodecode/controllers/admin/repos_groups.py:261 msgid "An error occurred during deletion of group users groups" msgstr "删除版本库组的用户组时发生错误" -#: rhodecode/controllers/admin/settings.py:121 +#: rhodecode/controllers/admin/settings.py:122 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "重新扫描版本库成功，增加 %s， 移除 %s" -#: rhodecode/controllers/admin/settings.py:129 +#: rhodecode/controllers/admin/settings.py:130 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引任务调度" -#: rhodecode/controllers/admin/settings.py:160 +#: rhodecode/controllers/admin/settings.py:161 msgid "Updated application settings" msgstr "更新应用设置" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:165 +#: rhodecode/controllers/admin/settings.py:293 msgid "error occurred during updating application settings" msgstr "更新设置时发生错误" -#: rhodecode/controllers/admin/settings.py:200 +#: rhodecode/controllers/admin/settings.py:201 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: rhodecode/controllers/admin/settings.py:205 +#: rhodecode/controllers/admin/settings.py:206 msgid "error occurred during updating visualisation settings" msgstr "更新可视化设置时发生错误" -#: rhodecode/controllers/admin/settings.py:271 +#: rhodecode/controllers/admin/settings.py:289 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:303 msgid "Added new hook" msgstr "新建钩子" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:315 msgid "Updated hooks" msgstr "更新钩子" -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:319 msgid "error occurred during hook creation" msgstr "创建钩子时发生错误" -#: rhodecode/controllers/admin/settings.py:320 +#: rhodecode/controllers/admin/settings.py:338 msgid "Email task created" msgstr "已创建电子邮件任务" -#: rhodecode/controllers/admin/settings.py:375 +#: rhodecode/controllers/admin/settings.py:393 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/controllers/admin/settings.py:406 +#: rhodecode/controllers/admin/settings.py:424 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: rhodecode/controllers/admin/settings.py:421 +#: rhodecode/controllers/admin/settings.py:439 #: rhodecode/controllers/admin/users.py:191 #, python-format msgid "error occurred during update of user %s" @@ -722,198 +750,198 @@ msgstr "必须是注册用户才能进行此操作" msgid "You need to be a signed in to view this page" msgstr "必须登录才能访问该页面" -#: rhodecode/lib/diffs.py:86 +#: rhodecode/lib/diffs.py:87 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "修订集因过大而被截断，可查看原始修订集作为替代" -#: rhodecode/lib/diffs.py:96 +#: rhodecode/lib/diffs.py:97 msgid "No changes detected" msgstr "未发现差异" -#: rhodecode/lib/helpers.py:372 +#: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%Y/%b/%d %H:%M:%S %a" -#: rhodecode/lib/helpers.py:484 +#: rhodecode/lib/helpers.py:485 msgid "True" msgstr "是" -#: rhodecode/lib/helpers.py:488 +#: rhodecode/lib/helpers.py:489 msgid "False" msgstr "否" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 msgid "Changeset not found" msgstr "未找到修订集" -#: rhodecode/lib/helpers.py:555 +#: rhodecode/lib/helpers.py:556 #, python-format msgid "Show all combined changesets %s->%s" msgstr "显示合并的修订集 %s->%s" -#: rhodecode/lib/helpers.py:561 +#: rhodecode/lib/helpers.py:562 msgid "compare view" msgstr "比较显示" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:582 msgid "and" msgstr "还有" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:583 #, python-format msgid "%s more" msgstr "%s 个" -#: rhodecode/lib/helpers.py:583 +#: rhodecode/lib/helpers.py:584 #: rhodecode/templates/changelog/changelog.html:48 msgid "revisions" msgstr "修订" -#: rhodecode/lib/helpers.py:606 +#: rhodecode/lib/helpers.py:607 msgid "fork name " msgstr "分支名称" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:621 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "拉取请求 #%s" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:627 msgid "[deleted] repository" -msgstr "[删除] 版本库" - -#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 +msgstr "[删除]版本库" + +#: rhodecode/lib/helpers.py:629 rhodecode/lib/helpers.py:639 msgid "[created] repository" -msgstr "[创建] 版本库" - -#: rhodecode/lib/helpers.py:630 +msgstr "[创建]版本库" + +#: rhodecode/lib/helpers.py:631 msgid "[created] repository as fork" -msgstr "[创建] 分支版本库" - -#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 +msgstr "[创建]分支版本库" + +#: rhodecode/lib/helpers.py:633 rhodecode/lib/helpers.py:641 msgid "[forked] repository" -msgstr "[分支] 版本库" - -#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 +msgstr "[分支]版本库" + +#: rhodecode/lib/helpers.py:635 rhodecode/lib/helpers.py:643 msgid "[updated] repository" -msgstr "[更新] 版本库" - -#: rhodecode/lib/helpers.py:636 +msgstr "[更新]版本库" + +#: rhodecode/lib/helpers.py:637 msgid "[delete] repository" -msgstr "[删除] 版本库" - -#: rhodecode/lib/helpers.py:644 +msgstr "[删除]版本库" + +#: rhodecode/lib/helpers.py:645 msgid "[created] user" -msgstr "[创建] 用户" - -#: rhodecode/lib/helpers.py:646 +msgstr "[创建]用户" + +#: rhodecode/lib/helpers.py:647 msgid "[updated] user" -msgstr "[更新] 用户" - -#: rhodecode/lib/helpers.py:648 +msgstr "[更新]用户" + +#: rhodecode/lib/helpers.py:649 msgid "[created] users group" -msgstr "[创建] 用户组" - -#: rhodecode/lib/helpers.py:650 +msgstr "[创建]用户组" + +#: rhodecode/lib/helpers.py:651 msgid "[updated] users group" -msgstr "[更新] 用户组" - -#: rhodecode/lib/helpers.py:652 +msgstr "[更新]用户组" + +#: rhodecode/lib/helpers.py:653 msgid "[commented] on revision in repository" -msgstr "[评论] 了版本库中的修订" - -#: rhodecode/lib/helpers.py:654 +msgstr "[评论]了版本库中的修订" + +#: rhodecode/lib/helpers.py:655 msgid "[commented] on pull request for" -msgstr "[评论] 拉取请求" - -#: rhodecode/lib/helpers.py:656 +msgstr "[评论]拉取请求" + +#: rhodecode/lib/helpers.py:657 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: rhodecode/lib/helpers.py:658 +#: rhodecode/lib/helpers.py:659 msgid "[pushed] into" -msgstr "[推送] 到" - -#: rhodecode/lib/helpers.py:660 +msgstr "[推送]到" + +#: rhodecode/lib/helpers.py:661 msgid "[committed via RhodeCode] into repository" -msgstr "[通过 RhodeCode 提交] 到版本库" - -#: rhodecode/lib/helpers.py:662 +msgstr "[通过 RhodeCode 提交]到版本库" + +#: rhodecode/lib/helpers.py:663 msgid "[pulled from remote] into repository" -msgstr "[远程拉取] 到版本库" - -#: rhodecode/lib/helpers.py:664 +msgstr "[远程拉取]到版本库" + +#: rhodecode/lib/helpers.py:665 msgid "[pulled] from" -msgstr "[拉取] 自" - -#: rhodecode/lib/helpers.py:666 +msgstr "[拉取]自" + +#: rhodecode/lib/helpers.py:667 msgid "[started following] repository" -msgstr "[开始关注] 版本库" - -#: rhodecode/lib/helpers.py:668 +msgstr "[开始关注]版本库" + +#: rhodecode/lib/helpers.py:669 msgid "[stopped following] repository" -msgstr "[停止关注] 版本库" - -#: rhodecode/lib/helpers.py:840 +msgstr "[停止关注]版本库" + +#: rhodecode/lib/helpers.py:845 #, python-format msgid " and %s more" msgstr "还有 %s 个" -#: rhodecode/lib/helpers.py:844 +#: rhodecode/lib/helpers.py:849 msgid "No Files" msgstr "没有文件" -#: rhodecode/lib/utils2.py:335 +#: rhodecode/lib/utils2.py:352 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: rhodecode/lib/utils2.py:336 +#: rhodecode/lib/utils2.py:353 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d 月" -#: rhodecode/lib/utils2.py:337 +#: rhodecode/lib/utils2.py:354 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 天" -#: rhodecode/lib/utils2.py:338 +#: rhodecode/lib/utils2.py:355 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 小时" -#: rhodecode/lib/utils2.py:339 +#: rhodecode/lib/utils2.py:356 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分钟" -#: rhodecode/lib/utils2.py:340 +#: rhodecode/lib/utils2.py:357 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:372 #, python-format msgid "%s ago" msgstr "%s 之前" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:374 #, python-format msgid "%s and %s ago" msgstr "%s 零 %s 之前" -#: rhodecode/lib/utils2.py:360 +#: rhodecode/lib/utils2.py:377 msgid "just now" msgstr "刚才" @@ -926,87 +954,87 @@ msgstr "密码重置链接" msgid "on line %s" msgstr "在 %s 行" -#: rhodecode/model/comment.py:157 +#: rhodecode/model/comment.py:173 msgid "[Mention]" msgstr "[提及]" -#: rhodecode/model/db.py:1140 +#: rhodecode/model/db.py:1164 msgid "Repository no access" msgstr "无版本库访问权限" -#: rhodecode/model/db.py:1141 +#: rhodecode/model/db.py:1165 msgid "Repository read access" msgstr "版本库读取权限" -#: rhodecode/model/db.py:1142 +#: rhodecode/model/db.py:1166 msgid "Repository write access" msgstr "版本库写入权限" -#: rhodecode/model/db.py:1143 +#: rhodecode/model/db.py:1167 msgid "Repository admin access" msgstr "版本库管理权限" -#: rhodecode/model/db.py:1145 +#: rhodecode/model/db.py:1169 msgid "Repositories Group no access" msgstr "无版本库组访问权限" -#: rhodecode/model/db.py:1146 +#: rhodecode/model/db.py:1170 msgid "Repositories Group read access" msgstr "版本库组读取权限" -#: rhodecode/model/db.py:1147 +#: rhodecode/model/db.py:1171 msgid "Repositories Group write access" msgstr "版本库组写入" -#: rhodecode/model/db.py:1148 +#: rhodecode/model/db.py:1172 msgid "Repositories Group admin access" msgstr "版本库组管理权限" -#: rhodecode/model/db.py:1150 +#: rhodecode/model/db.py:1174 msgid "RhodeCode Administrator" msgstr "RhodeCode 管理员" -#: rhodecode/model/db.py:1151 +#: rhodecode/model/db.py:1175 msgid "Repository creation disabled" msgstr "禁用创建版本库" -#: rhodecode/model/db.py:1152 +#: rhodecode/model/db.py:1176 msgid "Repository creation enabled" msgstr "允许创建版本库" -#: rhodecode/model/db.py:1153 +#: rhodecode/model/db.py:1177 msgid "Repository forking disabled" msgstr "禁用分支 版本库" -#: rhodecode/model/db.py:1154 +#: rhodecode/model/db.py:1178 msgid "Repository forking enabled" msgstr "允许分支版本库" -#: rhodecode/model/db.py:1155 +#: rhodecode/model/db.py:1179 msgid "Register disabled" msgstr "禁用注册" -#: rhodecode/model/db.py:1156 +#: rhodecode/model/db.py:1180 msgid "Register new user with RhodeCode with manual activation" msgstr "用手动激活注册新用户" -#: rhodecode/model/db.py:1159 +#: rhodecode/model/db.py:1183 msgid "Register new user with RhodeCode with auto activation" msgstr "用自动激活注册新用户" -#: rhodecode/model/db.py:1579 +#: rhodecode/model/db.py:1611 msgid "Not Reviewed" msgstr "未检视" -#: rhodecode/model/db.py:1580 +#: rhodecode/model/db.py:1612 msgid "Approved" msgstr "已批准" -#: rhodecode/model/db.py:1581 +#: rhodecode/model/db.py:1613 msgid "Rejected" msgstr "驳回" -#: rhodecode/model/db.py:1582 +#: rhodecode/model/db.py:1614 msgid "Under Review" msgstr "检视中" @@ -1052,7 +1080,7 @@ msgstr "创建新的拉取请求" msgid "commented on pull request" msgstr "评论了拉取请求" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:89 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "%(user)s 想要你检视拉取请求 #%(pr_id)s" @@ -1083,138 +1111,143 @@ msgstr "" "由于用户 \"%s\" 拥有版本库 %s 因而无法删除，请修改版本库所有者或删除版本" "库。%s" -#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "值不能为空" -#: rhodecode/model/validators.py:82 +#: rhodecode/model/validators.py:83 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "用户名称 %(username)s 已经存在" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "不允许用户名 \"%(username)s\"" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 msgid "" "Username may only contain alphanumeric characters underscores, periods or " "dashes and must begin with alphanumeric character" msgstr "" "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头" -#: rhodecode/model/validators.py:114 +#: rhodecode/model/validators.py:115 #, python-format msgid "Username %(username)s is not valid" msgstr "用户名称 %(username)s 无效" -#: rhodecode/model/validators.py:133 +#: rhodecode/model/validators.py:134 msgid "Invalid users group name" msgstr "无效的用户组名" -#: rhodecode/model/validators.py:134 +#: rhodecode/model/validators.py:135 #, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "用户组 \"%(usersgroup)s\" 已经存在" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头" -#: rhodecode/model/validators.py:174 +#: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" msgstr "不能将这个组作为 parent" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "组 \"%(group_name)s\" 已经存在" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "已经存在名为 \"%(group_name)s\" 的版本库" -#: rhodecode/model/validators.py:235 +#: rhodecode/model/validators.py:236 msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效（非ASCII）字符" -#: rhodecode/model/validators.py:250 +#: rhodecode/model/validators.py:251 msgid "Passwords do not match" msgstr "密码不符" -#: rhodecode/model/validators.py:267 +#: rhodecode/model/validators.py:268 msgid "invalid password" msgstr "无效密码" -#: rhodecode/model/validators.py:268 +#: rhodecode/model/validators.py:269 msgid "invalid user name" msgstr "无效用户名" -#: rhodecode/model/validators.py:269 +#: rhodecode/model/validators.py:270 msgid "Your account is disabled" msgstr "该帐号已被禁用" -#: rhodecode/model/validators.py:313 +#: rhodecode/model/validators.py:314 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "版本库名称不能为 %(repo)s" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository named %(repo)s already exists" msgstr "已经存在版本库 %(repo)s" -#: rhodecode/model/validators.py:316 +#: rhodecode/model/validators.py:317 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\"" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "已经存在名为 \"%(repo)s\" 的版本库组" -#: rhodecode/model/validators.py:431 +#: rhodecode/model/validators.py:432 msgid "invalid clone url" msgstr "无效的克隆地址" -#: rhodecode/model/validators.py:432 +#: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "无效的克隆地址，提供一个有效的克隆 http(s) 或 svn+http(s) 地址" -#: rhodecode/model/validators.py:457 +#: rhodecode/model/validators.py:458 msgid "Fork have to be the same type as parent" msgstr "分支必须使用和父版本库相同的类型" -#: rhodecode/model/validators.py:478 +#: rhodecode/model/validators.py:473 +#| msgid "You don't have permission to view this page" +msgid "You don't have permissions to create repository in this group" +msgstr "没有在这个组里面创建版本库的权限" + +#: rhodecode/model/validators.py:498 msgid "This username or users group name is not valid" msgstr "用户或用户组名称无效" -#: rhodecode/model/validators.py:562 +#: rhodecode/model/validators.py:582 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: rhodecode/model/validators.py:577 +#: rhodecode/model/validators.py:597 msgid "This e-mail address is already taken" msgstr "该邮件地址已被使用" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:617 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "邮件地址 \"%(email)s\" 不存在" -#: rhodecode/model/validators.py:634 +#: rhodecode/model/validators.py:654 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name of " "the attribute that is equivalent to \"username\"" msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名" -#: rhodecode/model/validators.py:653 +#: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "修订 %(revs)s 已经包含在拉取请求中或者或者已经设置状态" @@ -1237,9 +1270,9 @@ msgstr "快速过滤..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:230 msgid "repositories" -msgstr "个版本库" +msgstr "版本库" #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:15 @@ -1551,7 +1584,7 @@ msgstr "无书签" #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:9 msgid "Admin journal" -msgstr "管理员日志" +msgstr "系统日志" #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 @@ -1681,8 +1714,8 @@ msgid "Comments" msgstr "评论" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:263 +#: rhodecode/templates/base/base.html:265 msgid "Pull requests" msgstr "拉取请求" @@ -1753,7 +1786,7 @@ msgid "Repository forking" msgstr "版本库分支" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 +#: rhodecode/templates/admin/repos/repo_edit.html:255 msgid "set" msgstr "设置" @@ -1835,7 +1868,7 @@ msgstr "保持简短。用 README 文件来写更长的描述。" msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." -msgstr "私有版本库只对显示添加的合作者可见。" +msgstr "私有版本库只对成员可见。" #: rhodecode/templates/admin/repos/repo_add_base.html:73 msgid "add" @@ -1964,79 +1997,89 @@ msgstr "清除版本库缓存" msgid "Confirm to invalidate repository cache" msgstr "确认清除版本库缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository " +"will be cached again" +msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" +msgstr "缓存数据列表" + +#: rhodecode/templates/admin/repos/repo_edit.html:209 +#: rhodecode/templates/base/base.html:327 +#: rhodecode/templates/base/base.html:329 +#: rhodecode/templates/base/base.html:331 msgid "Public journal" msgstr "公共日志" -#: rhodecode/templates/admin/repos/repo_edit.html:201 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Remove from public journal" msgstr "从公共日志删除" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:217 msgid "Add to public journal" msgstr "添加到公共日志" -#: rhodecode/templates/admin/repos/repo_edit.html:208 +#: rhodecode/templates/admin/repos/repo_edit.html:222 msgid "" "All actions made on this repository will be accessible to everyone in public " "journal" msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" -#: rhodecode/templates/admin/repos/repo_edit.html:215 +#: rhodecode/templates/admin/repos/repo_edit.html:229 msgid "Locking" msgstr "锁定" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:234 msgid "Unlock locked repo" msgstr "解锁版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:234 msgid "Confirm to unlock repository" msgstr "确认解锁版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:237 msgid "lock repo" msgstr "锁定版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:237 msgid "Confirm to lock repository" msgstr "确认锁定版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:238 msgid "Repository is not locked" msgstr "版本库未锁定" -#: rhodecode/templates/admin/repos/repo_edit.html:229 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "" "Force locking on repository. Works only when anonymous access is disabled" msgstr "强制锁定版本库。只有在禁止匿名访问时候才有效" -#: rhodecode/templates/admin/repos/repo_edit.html:236 +#: rhodecode/templates/admin/repos/repo_edit.html:250 msgid "Set as fork of" msgstr "设置 fork 自" -#: rhodecode/templates/admin/repos/repo_edit.html:245 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "Manually set this repository as a fork of another from the list" msgstr "从列表中手动设置这个版本库 fork 自另一版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:251 +#: rhodecode/templates/admin/repos/repo_edit.html:265 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "删除" -#: rhodecode/templates/admin/repos/repo_edit.html:255 +#: rhodecode/templates/admin/repos/repo_edit.html:269 msgid "Remove this repository" msgstr "删除版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:255 +#: rhodecode/templates/admin/repos/repo_edit.html:269 #: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "确认删除版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:273 msgid "" "This repository will be renamed in a special way in order to be unaccesible " "for RhodeCode and VCS systems.\n" @@ -2064,9 +2107,9 @@ msgstr "写" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:85 -#: rhodecode/templates/base/base.html:217 +#: rhodecode/templates/base/base.html:226 msgid "admin" -msgstr "管理员" +msgstr "管理" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 @@ -2099,12 +2142,12 @@ msgid "Add another member" msgstr "添加成员" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "Failed to remove user" msgstr "删除用户失败" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 msgid "Failed to remove users group" msgstr "删除用户组失败" @@ -2112,11 +2155,45 @@ msgstr "删除用户组失败" msgid "Repositories administration" msgstr "版本库管理员" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 -msgid "Groups" -msgstr "组" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "应用到成员" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "授予或者撤销权限所有组成员，包括子组和子版本库" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:309 +#: rhodecode/templates/base/base.html:311 +#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 +#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "首页" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 msgid "with" msgstr "有" @@ -2198,7 +2275,7 @@ msgstr "没有版本库组" #: rhodecode/templates/admin/settings/hooks.html:5 #: rhodecode/templates/admin/settings/settings.html:5 msgid "Settings administration" -msgstr "设置管理员" +msgstr "系统设置" #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 @@ -2389,6 +2466,7 @@ msgid "" msgstr "这是一个关键设置。如果确认修改该项设置，请重启服务以便设置生效。" #: rhodecode/templates/admin/settings/settings.html:251 +#: rhodecode/templates/base/base.html:218 msgid "unlock" msgstr "解锁" @@ -2616,7 +2694,7 @@ msgid "Users administration" msgstr "用户管理员" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:232 msgid "users" msgstr "用户" @@ -2646,7 +2724,7 @@ msgid "active" msgstr "启用" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:235 msgid "ldap" msgstr "LDAP" @@ -2737,37 +2815,10 @@ msgstr "登录" msgid "Inbox" msgstr "收件箱" -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 -#: rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 -#: rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "首页" - #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:320 +#: rhodecode/templates/base/base.html:322 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2832,50 +2883,59 @@ msgstr "选项" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "设置" - -#: rhodecode/templates/base/base.html:209 +#| msgid "Repository creation" +msgid "repository settings" +msgstr "版本库设置" + +#: rhodecode/templates/base/base.html:210 #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "分支" -#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/base/base.html:212 #: rhodecode/templates/changelog/changelog.html:40 msgid "Open new pull request" msgstr "新建拉取请求" -#: rhodecode/templates/base/base.html:213 +#: rhodecode/templates/base/base.html:214 msgid "search" msgstr "搜索" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:220 +#| msgid "unlock" +msgid "lock" +msgstr "锁定" + +#: rhodecode/templates/base/base.html:231 msgid "repositories groups" msgstr "版本库组" -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:233 msgid "users groups" msgstr "用户组" -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:234 msgid "permissions" msgstr "权限" -#: rhodecode/templates/base/base.html:238 -#: rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:236 +msgid "settings" +msgstr "设置" + +#: rhodecode/templates/base/base.html:247 +#: rhodecode/templates/base/base.html:249 msgid "Followers" msgstr "关注者" -#: rhodecode/templates/base/base.html:246 -#: rhodecode/templates/base/base.html:248 +#: rhodecode/templates/base/base.html:255 +#: rhodecode/templates/base/base.html:257 msgid "Forks" msgstr "分支" -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/base/base.html:336 +#: rhodecode/templates/base/base.html:338 +#: rhodecode/templates/base/base.html:340 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "搜索" @@ -3107,10 +3167,6 @@ msgstr[0] "(%d 内嵌)" msgid "%s files affected with %s insertions and %s deletions:" msgstr "%s 个文件受影响包括 %s 行插入和 %s 行删除：" -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "修订集太大已被截断......" - #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." msgstr "提交中……" @@ -3615,6 +3671,11 @@ msgstr "发送拉取请求" msgid "Closed %s" msgstr "关闭于 %s" +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "状态%s" + #: rhodecode/templates/pullrequests/pullrequest_show.html:31 msgid "Status" msgstr "状态" @@ -3657,11 +3718,10 @@ msgstr "所有拉取请求" msgid "Closed" msgstr "已关闭" -# 中文中 repo name 在前面 serch term在后面 #: rhodecode/templates/search/search.html:6 #, python-format msgid "Search \"%s\" in repository: %s" -msgstr "在版本库 %2s 中搜索 \"%1s\"" +msgstr "搜索 \"%s\" 于版本库 %s 中" #: rhodecode/templates/search/search.html:8 #, python-format @@ -3892,3 +3952,6 @@ msgstr "文件已删除" #, python-format msgid "%s Tags" msgstr "%s 标签" + +#~ msgid "Groups" +#~ msgstr "组"