From 0c349f9350a6955c3e364e8094bc38a30dd73cfa Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 19 Nov 2019 10:30:32 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 83752 -> 83832 bytes apps/locale/zh/LC_MESSAGES/django.po | 304 ++++++++++++++------------- apps/users/models/user.py | 2 +- 3 files changed, 157 insertions(+), 149 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index d387a08b9806de58d983cefc3371e2b582d78b5a..daba13c8fae9ed1b21fab52b7182c51d65bcbd7a 100644 GIT binary patch delta 24465 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 X9Czjqw_TD50Au^P4aD5?}SLXFm5wW*@is-pI; zy^H_n``nlR&w2fh_kCUWJoh>0$s=ulFD3*noe<=^5E6H~$I&gW=cUJyk)C%W$n)-2 zRo3%HxAeTG_zjN7D>w*yw(`72fwaSu#Fg86UXuXNOViHt#t`>v?|ISq2G8Np4xaZr z_02kZUMl+K?Cg2RJkRHS^o8ez&>(3S&kM!~48=Sc4=Z94`~(wWBMif~7=Z)LIhcuf z8*(k)c`SsNu`H(Q>UjmRF6P1E7{UDBDhjzs9K($G3UgzcZl0GPtC+o!i}My@HjLNZ zEjTZpAuf&=Fj)`JON{?wB7BW0G5(kCg3_UOIt!*^ey==*_}BoG;^(N2T~Gt{H%Fod znvB|+#i)L<7XOS%h__%eJc!|V7B$X8jDv46GY0l#|Fz|j6ttpzsI9Gmx+QHe0rtUk z_!a8b%tkHnC#&CrS%~+bZpjVQc)`6~zwD@6QVF%-YM2~9>&5=3qR^TI&z#p66XIa= zYfM2r8FfWJAkUe%4t1qry*)2GW<}k?n#gW@eUblp*Z89zHtpki^)c4;`nr6BzU+Sq zDt;uP1zbdJ?KRX^-Nl^v0CQlPey&|b)Rk64y&X|l1$Se9OwivgyaZ|otDE&uJJ%d_ zOFH=|XiNH_p57st66d0>a5ZY{wxbrf8`be3>RCC3VR#KS@PAgHV1Vl%ipob~RxE(p z;RdMwzE%|SQRt3(7UrTRSc2-X4t1~2pq_zS7>+>$-LsGZ(-Id!-J(y;mZ%B3qjvNw z%a268J=2i!ecomYTH!_1%I;YF47GKEeAb&D#YcCaey8Tb@6;Q-Xm z`A`=$5;e|b%m0We^!~?E(7@YK@BabRmE6FB_}uDq4t4__#i!{2EiI24sIpnxY;3kMyP$4SU(`55u@p{3 zO?(h@;W5;LUZE~9aH#7SGL-#S$8;ppVqVk-Nj208zd$WyBf)WU*> zyU&9#)Q%KJO;FYH4N*JV6E)rl^gpzyd6ptO?DN)A(7iu^+L9}%9eITsFu@2nKsaja zvZC%~3DizhLQT{dwcse!t?O&?SkyQ(QP0#8b0>!A{r`)CI^IJ~{LGQ>Xzi zpziU%s4ENn+FemFY60P>c9E!wi(pBtgt~yi7!RXyE5@M4uM)%lYXP-l+!Z!OEujJO?Z;CXz2IY+y3(tP9kXF)9>2kKVjM~z?h8}?sUP=`b{ z{2bHaB5Sx4(-R-TN_fZO{9`_5A|^VfVprZ>Y2HWTEGibyLi5_ zZe@v4_b??U#H^?R3!o+_VOGGL#MMz--V6O7DA<8`I_AaKm>+YFbGM{1>h0=?n)oYB zguW3JG{HpFy`P1ecsXjz)}rp|CRDovr~&>!wL6V!cM)}E*D*0ZF$2cCeo0a7!cqM) zA`9?&*{z~5YK5gx6V-7IyryOcEK0s7M&J_EL171Yi=MNJem!L>_*y60(8 zJDndB>isWIK?Br4ZDkWw$1bQ3jNYh@<53G-fO;r5qMnUysIB}9gYi1*0v@2oeTnKH zf1>*YOoy7M2qxA0UzLIeY={N08R|;Lpa!0cnrJDi-Cop0hb;aRHQ`y*j$B6FqWh?J zPcb{b!$8bF$(aj%T47!aS+KO(0zV>-Ms4+WY=r+{bu2O2UC}VqJ)MqP@Lbe*t1u~U zMP2D{<^|LOADV9`v;TU36HVa(!`#TXE$=F3z*bY;m3@V}qOVaqFwWx1Sb%sY>Xz+C z?Zi>k0?wdz;0C6^ho}X`ndaJsO=JJnArlEbTscu4TA*ITPN-YZ3pL8n6dy%Lk#h zdKiY`L{$9}48=95h3&Wa7$zgWj$!x=HNG#&OgCV9)D}jfD)OKfQW{fYHPk0#bJQ00 zM?EuRQ0-Tu+HXbe*g@2ICs7x89(5s?Pz$|*T!7DeL_sU^X1NK%Q3Dh~ZDn~>hmNRQ z(-U=NgDoCu^%GDFn~hpfENVeptp0%IPoOU7GKTB@e?~!Dnsm177>au8v!YgB6?Nq` zFb#G@JxtN4g-pR*I0v=xy{HNPKwZE!)WQ;f>;C4G3AMnFF}dFV1{Ab_4rW)>K)q30 z=0n}PQK+|KI;O^T=3z`ld<}K)U!mTTQR=6DOGG7Mc|`QBhRCQmB44P&?NUwX@Apw{@=)I9cI zh3`q!z%8hi#{14ay}_sfQ=sl;deqKTM%~josC(HCbqji-b}$CjZYFAhi?9eTL%kK} zQMdS-kAm*aL(~og&36x7QdGkb)I@1fTbB>ju>@*il~MgZH5;QQZjJhU=!V*f!Kj@W zhUzyO)z3GTg05gL7Qhv#j^|JdyJfyX-OCi;yPe2|dI;;FwlvBdgxZ0zsP=PETfYwV zd9fEW<4t5YfiaXQFmyow)^dCA(1zIgGmE^X3)wUkGZ! zZ%{iKwov_itcHS~fn2E9rwVGzn_&*@hFNjC)o-@?V_2B{71TWr`@tfR=>*P4XAtgD{6-hqZaZvY6p`oatn$; zJ(St89+ttZH~}-^I`rwGI6*-V&0ppX)D}KLE#MWZUEIZP3lpKPAS>$1@}joBG-@Yn zqPDstYJols!ilJHrlS@*cQN~~fmT^!y)`(1dMJ;gw(J6GA-7QjK0!?wcZq8kin?W4 zQCD07Be53h+4&OF;5f{POHj9Z?-KT36PzQV32$Ide1`Eb(~mp{m>pF=%$$Tl#Pd-L zTa23cCoF_}Q00L zExw6bzqBQXIM!fbl~OIxBf>dK=~TQ?B3($Sb1CtAE3 zwV(~C_6Jc{d=_<&Z=7^r<59P29;Vj&zmP%|+=6;qy_N3Xr$=pR zQPhgdp*|OCVSJ22Eu^Ozje4plq9$5w`Cm{A-GkctGpPQT(Es=UTb6ic4c?+2viPgq zN|T@#5`u{^J?hrvw73B3eJ_LBxdxaJJD}QqiJG{-#nEQWD(=4;P9UKb&ql3m879Fs z7Vp5M#QQNPoNccSj?Db$reLACc*yYCAjsJI2{UiZMqI2@B>zcp^+7}SMMLtV&x)CH{aQP9Ba zP+PPEwZa1yA4jeHoaJw#27ZJZFwR<6pA@wd=}@;W7wQ5EUJ#lV^ndoF9#$V}!ntOwxz*MCyu%cV z(cl(p!c0HAFA9ZFAE^ycTNZ`7_X98j7oZlh8(ZKVjKb=_xL?(*L%mhcFcp?rPamv< z1Mm@M)X)De8{7|zF}RtERj3Y88~J?@4#hrr4)b80O|-!wxE%A)DLbA*eE_||v>3j{ zeX%KwT6i0C3~J%)u!P?Ka}-Kp%B>`@HtH=Hg}O)MF%;*Zo|QFLzYTRu_M)DJLpTgi z;!|wA%{|Pux4Ru~gM8$AGqECWL!S!oDCEP6JKPtE9{4%&LY%C6Y=@I~x}A86ZHT}4 zl`ooj7=7Ew|h7{U`paHyV?KL6nrGYaTe+!T8+BW{pJbt zBI;SVgSzrp7>MsM4hHUV{oYkrK z4R{IlFg>??$UZl4X4HTMFgKP(Evysjb?b$?fZ?bGOtAd-s0FXa%;-BzK~MWV)YBWd z->on`YJdW$1(rb#T;KBTPy_d{{4mQ;#`xstnTxS3@k-Rz-^MQZ1ew?8wLakPWna{U zgHSv0HEIW@p|)~4#>Y*l9r+b?#ebvP-@p#|6!T#7gYK(X465BG)cAW);~hi)KmWT( zK~L#J)Ki)5kn2zib&so{uCyWQVeN$4iD=Y-lPsQ#Y9EWA;5H1#c)z&?CdWL)88H%T zU@*_0*PVhMiUFuA8;hE732H$bF##S%-HMZ_hvyy!VdBGXr$VqiaZXhG&Zvd3UWB0Pz@qDvST@1UNY2iOIJes_Pt=!v?Z8MpwK z;To)Y#PxfFiHQS`a{pCGcGRsXJ?fJ%67ypVjKFbN9ao_SdV$AqIe+xS!GCyO1$=}R zvB+`vdC(WN)dNxe=b;vS1GUrt9cTabkcFRc9rB^JrV#21OJe!}em#eUiJSfD7B(KW zrCTu*?n3R%Wz^2yMNRM&^-Lr`>25^?rX((eBk*G%1#SI7)E1vX4RjSX!M~^-dV&ct z;FNnd5~KQMv^XEuW})RJ`SGXqZt+2d?Xme8-giDKccOOg(qH_1puKPHIktyH!t;Ds z;7H`>h8O<=_n!uP@fD8x$Mb$BAAQ+fQL!s-K~*t?d|lLzwMSh@6ly2>VhS9Jp*YE0 zg6y2n+e$$V|Hj;S4fA61tL`7ae}u|+#|$_dv*QNT7GJ>3_|odrUUThAVl??i_%WVF z?QDkYJkXc}*J+O)P)I^z(G9oNYt0=PkNjcO6`rvCb<01t_>~#|rt6=|j4<<~#wlY~ zLM^1a>UEFmtAMRhA28i4{u;YpQR6l++nC*bRv3)B6{AsC zGz+yw3$6Y)^Ni)MS)BB~8#o>6LULMM4fQNFK;4pVX0+v}TI`Fp!Vc65kDC`U8S!1z z!2g-)9=LX;QCC_Gwct<9Ca8XGQRDSOEx?Cya0;sZ49u$c|9c8*xED3xaf{EI*De1T zHP9=|Cwb_8Hl#)MFN<1eb<{YW%^p_Y&m3X-Nq)KiGcEC*HCSw}HFsG3Vbm3zz&?1| z>T5l63uua3U`I@d12F-PM7^Hl%^y$;+=Tx3ehW!zmKF;(x5-p2bfr4tVN5^Aliq+7&>x{|>c~ z6&7ztE%-MK#dGFERJ-`k+=A1h`WJu3{Z~b0OEfaup;r8*#r@5ZmY;0SviyA1#IY7{ zwfcjWKZd$x|5*J?)P=|MJ$Dl&H^WgC8Br_DY58IpMqJk7`c~h}>}2^qScZ0kE#82- z!0o8F;}44;pvL#bdEpu)HzU!%H5OM!EvOM{OIxGvc|WV4f@;6mTx;&I`ok7qH1Ase zrHlFg_tGsO4QimgW+_ZfT-9uax{?7_Kh~UOE=DbEt$74>OKw~I3Uwi2uiW1wGGj9R z{Le{26(#)%etCdeNIlE9LjN}!%lAbMJlvdOE<`;uYf=3-nfuHW=0B(lxhI*Qe_6vN zQldI$M_qXli))!p&5o#vdRsim;uzEqp$Vu3&b53jYTR|^PV;y4|NieU3i)Vo12u5y zf6nwcn>f5&c`>Pf|#7N>7mQU{m_}k~g&&U_4LqR|1M__J@ zMGbJ;yo#Feq4@$e;XA7j4sh+mQ0*e8RxFUxr%NeEMlI`DO*3oR#^UZ4_eHfEZjQ71 z8Rk555$dU2VeuZ+N`EuYpuT%u3kdM}KmC&gx(0>K@~E3w%i_;bOOCSmOVk8kq4s`; z<(HZ3Ex#Mp?-XXh^QeBWF)gNw<8uuP#BqCC9JSIms2|MTQ3DLLd^Dyb9*-GundJ|l z7JL%b{u=7xxQkj~(ztHi2-E`dqjs{IkAgbXHJeyPE7X8dmLG^(P&8_QvB=-iyhY}Z zn3Q-q=EqIuO{_;89u(mJtIZc!iFh@3MBifyT4A$zZXw-JaUax9#Gn>3&GL&Z-eC3n z%|9^>?Jl7{2wr11oE|^G|K7z(;Kom5W_J3#9G1wB73ok6HF1B-kFKQJ&@s4Fjzx_9+ZFJvFof@Y!GEk?DA#j&^p z8)40a0sa?%A?j8wG1s8pvaP88M^NLPl+5p4rl0}uqqZ_D9T%NqGOYk_RO8ki5d;m>{Xkmq&G|j@hu8#nGrMnv7cDW=x6u zQ9E?bylnNiEPiIbK`k(@FPSTZo4HY2_mNo}HDC*?Z;!f%{ZY4Uyt%~OVV*%P>>+BR zw-%>J?(!K?}XoQhh}64Vv0L`|^U^2f~6sP-37x8|Y6fg$eg3B?-Z3!wTB zGGokXn4SCrf6V)LfPw}*iCXDRi(mK~@P#g=8z?nuf!VM;=C!!1)%P}|Q9C)_;+d#^ zi%>s1R-oqDFZKSPrl6JHFrSzKsa(gTsQOTgvzWQef@TTSg_J{maMeZi>uV0T`iZCo zEJUAHwALz)Sj8pOy?TfmAYrI`y2DW&^Pp}~8Pq3bT~xc?sD9BF&qlRhV)1&^e7nty zp}havn%5*`V3->y*bFlxQS}8aE`hqzDi$|3+oKlN)9Pa^|1IjF`w_L^eW-=q4CDRR z%3qMs`yCYSCdy+LM%~L&W@WRs*%;No4QfH%Q41Z0dN@a0el}{HSXBG?mNUPI>LU+Q!PFDR{>IJKF_ zEQk7Fsf&8J`k50^3tWm?(0=o@c>~q{IclNF(*^i{j~nCg^|YP~*g)+D|a&Sp8CSJF4BEQt$scOI$`R;FiUY zQ4_whe3A^VW4M_SHBmORuvy-$Wi~~P)6pDgjzj-n>gH3>SEg9Zg_ls@U=n3?hM5s& zUepeiKrOf$>g}m(aes4|ITm%r(@|f;=UTiuBk#Yi;8zmzhP$FA-;*4C|_nbQE60M!{WxM zi94YN?2er=#^MKNaD?lZ1+`-ZEH34vpaH5{qPE!#wV+NG4>DuSY32gdfU7Lth#GIN z#fLG7_^jnGn%7ac*msYDuIL47D}%DQD+xsnoF7$R5;gG0W-ZkBfch3UMzwE=`in?s z%l9{jnxjzTjYHlVpEsLAToON7#m}fK|JD2xwY4`)FVYQ=#>|dtU&O46T4+;?TcalI zjT$G~;@SRs-oGUj8dI^!pWrX|S>1qHk>A^TB`nUB%?(r*b*0rUu8*3qwZ)yxKISlU zf;q=rD)s*VVu@X-tviak6&Fwg|7-P6F+Fi$cDImBW?r+DSryf4 z`t(C&9tHgn*=OEDZB^nN&TOcO%b~WiIcm#0qZT~a;xXtS5B1Y;A7;YSsE_LBs0$0r z>Dpz_$@{N~KeI$HtV%ow^;@6ISQ69ca<`}YgpIcq#TE{ss49wgT=J+`)px2?_@I|IueD z)YtEhsGVDe#qa?(#O#Fv{QrH<5cKaDHXvWOaDe|mkM}L1(3C`QkpTa{h|>v^RS?ecn)OFc$SmH3jv- zGRyLFQJ+*lSiB0gg}_q|04DN@3O>E)Z6g4 z#qZ3-CEY-2%Xuw66W>)lnOeO{I-fpr@|Sf( zcQ*T?-iP6+kBrrpKaLvmB5J7n76*Og@}a1yv!Rw&0QKFc66z9KTfQ4sCXW8d{w}nK zggX9)dJj&bI-Irqb=2lRu>5l~ZaJ4vVWu`Snc2;JsD&5Bu2=>2^sFhzXQ5Vlh{QlV zk9s^Cmv;*}jat|_)Pk;|7V-%7k@OO?VeSe6?q7byX2e5qGM>i$7*#RA|8HRys^mU1 zCt_LhXM7ZN#i5nmi;@Pl^~F#NYiId>7EeL7UyNGNGSq_BV^{!>BbF!rvx@u7OZBm9 zAB9?2H`E0kFnz}25ftGX>qhO>w>p*n6v)$g+SC~84xQ42Y5^;c299eRk` z`k-oVo={|+UZy}kwgTDgl6(=$$Oyl1eoIXd74JA-Y19vnf2j+jZ8h>!IFoW7)JPo9 zX&=m)m-@-%TXBX`4yW!l`K7dLLvAePv)1QR>Z<8x7oy=*0{uj2M}zlAZSrr4w~|Oj z=l)g^ME-Ldq@lH6iP4tZN!!C#R+j66EAX}qkMsL9p^yepYQ~2bvz(`{lTO=iI;HRvHHQ7iAAg>$B$G0F@l_LFvUS6 zUQ!W*TS+#>VZ>=TFH?@evNq5))PtlWpXFS{?V+8H_)K)j761Rw4YaMu`73SCT6U4{ zzrH#gv5u1{ueU*4QhrAH6Bf{p0d*8HKXRe}bJ9osZ^T{jp7pJO70E3p_ZMTIvG#&r zo%xSCw5bxv{->vKn^YB5+5~Dbj`J#wqZyzMXIsvPHi7CJ*g*GD-vIk@#-q)rjFAn4 zu@}bDrxK^$GCqU7%(#raj%hwBc2Ov4iQ>eGIrSz zTirb3B37=&Kyx`;lUqbCF6|4_R>wb-yHdA-vj+7gT-yKV*TjP?ZldSEiFKM!CmplQ zg_KKE9?u!X*_U`D1J2`|!1)ye=~zK|HT8`s^J(nO_hLQ6p;oqFetZhro!#E+Fxv8(u`8R$3!CBU38*ydoyOVnqhxxxEv7O*QYfy%jEu#Dn zjh0aNE$2GQXE>9RpGMowlyx*FE=&72#H}cIaB2PLC!RL8AALJe_Xl-4W^yJX=KH@_ zgt|bz|4AsEBzX?kQc=U-l#fp9q_899^BRcqzo?@Pxthpd7Q7zxO-+6#XLrgKnY|z` zroI#ExNq*EJ>Tj0C&eVS|2l7RE~N9X7(>GuRGz}S_!;^51aqj-`V|N()C5ec3F%I^Ntd5JO{XRU#L=6^}2#l&AQ&_d4k{ucaj z!t2xp(C;wyFDTEm2_k5Bp8DTxoQsyvg!MRoroK5o*QqaCTWEO120liazutP^<5s*Bel%+9WjQ{^wO~-GEKBw+8^7)DNov@~C!iu3jRR;H4|`MjpEamNBfiM`kB+o^NPCb^!v6}X>xCjI}y^5l+_JBQ6^Tb2AS%1Oz!Chkai z6zx9c{Fl=XpZ|AWscG;Dr;fI`i_R%Izi}!5p9lFfFN0j7b6x7B+x8?ofDX zb)Qg9O!=%$n2`9OwXM%Qopk??TH+6DloyZLXc;h&_=43nCeA|pc9`52e2odta7L5+ zk9PejXXfl|eMXVj(ck7-g?BiMs$LU(cswTgHQKWo4J7eGy2pd{*>}O+HBW1 z^k3=x9l=qYN<}p42%vF1;(ezQA9I$8pxDzOXIe z{V+wz=eId3>L>I-5<03n{J$n?N3NE|;w>Gr;S2^`NVyAx2GQm(a>cB_+LfRjOPlgG z=@#0)u==*xh`6^J+L25j`2i$9LLH@Ow8a&@PBzFkaX7202+O*u?EwN0ax zz8@(yp%(nd3@aqH5t7*G?cX<`)o#kOF##ji;(WsS%60d;(7vU$4J9|7^A+`($)&-* z)NjJljQ_E|X8lWpVN}K?d5g;7Heps9MB}!nE;;!VsN*PSb}O&+XZR~M?Mu<-66cc- z`j)3$+uDfls9#C$GUdtqn#Ze45XEZZ;V}mNTpci$29-J2QC@{TIUjOf^4bCm^8&bECQ%96d zJe58=_TmrZo>Q((IVX$r5!d6KL;sJ+weh!ff9!-CI$GLf z1&DK7+0`&Hh2rEsV?rID(I%X7R&r}7cgG0MeVjT%ZOmuP*NEIP-G4oK{W;H(>}(4; zZXG7!;13pel5%>^xwNm3MVahAZ4ML1p?sC{H=H>rUnaMX^ZhY_@)+uVuaUX1k(Qia+BK)J9|zE; ziPdi=SBY3hQ{AU)oH~BN@z@*-)A+n~XsAj2E%P&biz=X)qlbh#NEL&;J|18%?`l z8>1}sC8+=Km_d+^+!gE7h;kar3256y?|%~OoDds)(DO8nhLB55ZU<+4I^6xBJ^|&Q zIg`_F740_SZTy8?cFxSUkd*i%edBQcM*W9JR(;L7O~+wmFIr_K8oocuQ1^;Bgh4W6 zPuk?>+{$^u+HWGCf$|GFePom7Hs6m^l)`x0HRgPOv|w!i{a4}$!Fe07Go4cqPb5DE zuierCgJ87V1({j^!*t+=X}~mZnWAavvTA^+UYE2bq#I zpslyl8t$R%x~MbhWHZ((D4b zWb_%0yNT~nzJWR>>Hg~|&RLlT1#mkaCqLU7rDC!c#5>4;LM{S5TOcK`2IbH2d)n;B zpRf+OQr2cZeX5i1ME-9aVdMTo?7#mnNxnZWQP@nyL(a#P%X3cV9L}U&IZtxlB-Zg0 z1J$Hm3!A7r<#yB`;2g<0jx#51O5nHHfOgAh^EI)KA#wN(T%>g#?Q;Hq&^p*wSk8QE rbs{^RlX&a)wQO2yUA9>p%f&C5xlrNK1&gk`dTM*I4Y7#>4wwEv0a-b; diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index c4584d3a9..43f218060 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-18 12:04+0800\n" +"POT-Creation-Date: 2019-11-19 10:29+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -89,7 +89,7 @@ msgstr "运行参数" #: perms/forms/asset_permission.py:84 perms/models/asset_permission.py:80 #: perms/templates/perms/asset_permission_create_update.html:45 #: perms/templates/perms/asset_permission_list.html:52 -#: perms/templates/perms/asset_permission_list.html:121 +#: perms/templates/perms/asset_permission_list.html:112 #: terminal/backends/command/models.py:13 terminal/models.py:157 #: terminal/templates/terminal/command_list.html:30 #: terminal/templates/terminal/command_list.html:66 @@ -130,7 +130,7 @@ msgstr "资产" #: orgs/models.py:12 perms/models/base.py:48 #: perms/templates/perms/asset_permission_detail.html:62 #: perms/templates/perms/asset_permission_list.html:49 -#: perms/templates/perms/asset_permission_list.html:68 +#: perms/templates/perms/asset_permission_list.html:208 #: perms/templates/perms/asset_permission_user.html:54 #: perms/templates/perms/remote_app_permission_detail.html:62 #: perms/templates/perms/remote_app_permission_list.html:14 @@ -143,9 +143,10 @@ msgstr "资产" #: settings/templates/settings/terminal_setting.html:83 #: settings/templates/settings/terminal_setting.html:105 terminal/models.py:23 #: terminal/models.py:260 terminal/templates/terminal/terminal_detail.html:43 -#: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14 -#: users/models/user.py:410 users/templates/users/_select_user_modal.html:13 -#: users/templates/users/user_detail.html:64 +#: terminal/templates/terminal/terminal_list.html:29 users/forms.py:162 +#: users/models/group.py:14 users/models/user.py:428 +#: users/templates/users/_select_user_modal.html:13 +#: users/templates/users/user_detail.html:63 #: users/templates/users/user_group_detail.html:55 #: users/templates/users/user_group_list.html:35 #: users/templates/users/user_list.html:35 @@ -197,8 +198,8 @@ msgstr "参数" #: orgs/models.py:16 perms/models/base.py:54 #: perms/templates/perms/asset_permission_detail.html:98 #: perms/templates/perms/remote_app_permission_detail.html:90 -#: users/models/user.py:451 users/serializers/group.py:32 -#: users/templates/users/user_detail.html:112 +#: users/models/user.py:469 users/serializers/group.py:32 +#: users/templates/users/user_detail.html:111 #: xpack/plugins/change_auth_plan/models.py:109 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 #: xpack/plugins/cloud/models.py:80 xpack/plugins/cloud/models.py:179 @@ -260,7 +261,7 @@ msgstr "创建日期" #: settings/models.py:34 terminal/models.py:33 #: terminal/templates/terminal/terminal_detail.html:63 #: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:15 -#: users/models/user.py:443 users/templates/users/user_detail.html:130 +#: users/models/user.py:461 users/templates/users/user_detail.html:129 #: users/templates/users/user_group_detail.html:67 #: users/templates/users/user_group_list.html:37 #: users/templates/users/user_profile.html:138 @@ -312,7 +313,7 @@ msgstr "远程应用" #: terminal/templates/terminal/terminal_update.html:45 #: users/templates/users/_user.html:51 #: users/templates/users/user_bulk_update.html:23 -#: users/templates/users/user_detail.html:179 +#: users/templates/users/user_detail.html:180 #: users/templates/users/user_group_create_update.html:31 #: users/templates/users/user_password_update.html:75 #: users/templates/users/user_profile.html:209 @@ -414,12 +415,12 @@ msgstr "详情" #: assets/templates/assets/system_user_list.html:27 #: assets/templates/assets/system_user_list.html:79 audits/models.py:34 #: perms/templates/perms/asset_permission_detail.html:30 -#: perms/templates/perms/asset_permission_list.html:178 +#: perms/templates/perms/asset_permission_list.html:169 #: perms/templates/perms/remote_app_permission_detail.html:30 #: perms/templates/perms/remote_app_permission_list.html:64 #: terminal/templates/terminal/terminal_detail.html:16 #: terminal/templates/terminal/terminal_list.html:73 -#: users/templates/users/user_detail.html:26 +#: users/templates/users/user_detail.html:25 #: users/templates/users/user_group_detail.html:28 #: users/templates/users/user_group_list.html:20 #: users/templates/users/user_group_list.html:71 @@ -460,13 +461,13 @@ msgstr "更新" #: authentication/templates/authentication/_access_key_modal.html:65 #: ops/templates/ops/task_list.html:69 #: perms/templates/perms/asset_permission_detail.html:34 -#: perms/templates/perms/asset_permission_list.html:179 +#: perms/templates/perms/asset_permission_list.html:170 #: perms/templates/perms/remote_app_permission_detail.html:34 #: perms/templates/perms/remote_app_permission_list.html:65 #: settings/templates/settings/terminal_setting.html:93 #: settings/templates/settings/terminal_setting.html:115 #: terminal/templates/terminal/terminal_list.html:75 -#: users/templates/users/user_detail.html:31 +#: users/templates/users/user_detail.html:30 #: users/templates/users/user_group_detail.html:32 #: users/templates/users/user_group_list.html:73 #: users/templates/users/user_list.html:111 @@ -521,13 +522,13 @@ msgstr "创建远程应用" #: perms/forms/asset_permission.py:21 #: perms/templates/perms/asset_permission_create_update.html:50 #: perms/templates/perms/asset_permission_list.html:56 -#: perms/templates/perms/asset_permission_list.html:130 +#: perms/templates/perms/asset_permission_list.html:121 #: perms/templates/perms/remote_app_permission_list.html:20 #: settings/templates/settings/terminal_setting.html:85 #: settings/templates/settings/terminal_setting.html:107 #: terminal/templates/terminal/session_list.html:36 #: terminal/templates/terminal/terminal_list.html:36 -#: tickets/templates/tickets/ticket_list.html:106 +#: tickets/templates/tickets/ticket_list.html:105 #: users/templates/users/_granted_assets.html:34 #: users/templates/users/user_group_list.html:38 #: users/templates/users/user_list.html:41 @@ -642,8 +643,8 @@ msgstr "网域" #: assets/templates/assets/asset_create.html:42 #: perms/forms/asset_permission.py:87 perms/forms/asset_permission.py:94 #: perms/templates/perms/asset_permission_list.html:53 -#: perms/templates/perms/asset_permission_list.html:74 -#: perms/templates/perms/asset_permission_list.html:124 +#: perms/templates/perms/asset_permission_list.html:115 +#: perms/templates/perms/asset_permission_list.html:214 #: xpack/plugins/change_auth_plan/forms.py:74 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:55 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:15 @@ -703,12 +704,13 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: audits/templates/audits/login_log_list.html:57 authentication/forms.py:13 #: authentication/templates/authentication/login.html:58 #: authentication/templates/authentication/xpack_login.html:93 -#: ops/models/adhoc.py:189 perms/templates/perms/asset_permission_list.html:70 +#: ops/models/adhoc.py:189 perms/templates/perms/asset_permission_list.html:210 #: perms/templates/perms/asset_permission_user.html:55 #: perms/templates/perms/remote_app_permission_user.html:54 #: settings/templates/settings/_ldap_list_users_modal.html:31 users/forms.py:14 -#: users/models/user.py:408 users/templates/users/_select_user_modal.html:14 -#: users/templates/users/user_detail.html:68 +#: users/forms.py:161 users/models/user.py:426 +#: users/templates/users/_select_user_modal.html:14 +#: users/templates/users/user_detail.html:67 #: users/templates/users/user_list.html:36 #: users/templates/users/user_profile.html:47 #: xpack/plugins/change_auth_plan/forms.py:58 @@ -747,7 +749,7 @@ msgstr "密码" #: assets/forms/user.py:30 assets/serializers/asset_user.py:71 #: assets/templates/assets/_asset_user_auth_update_modal.html:27 -#: users/models/user.py:437 +#: users/models/user.py:455 msgid "Private key" msgstr "ssh私钥" @@ -796,7 +798,8 @@ msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig" #: assets/templates/assets/domain_gateway_list.html:68 #: assets/templates/assets/user_asset_list.html:76 #: audits/templates/audits/login_log_list.html:60 -#: perms/templates/perms/asset_permission_asset.html:58 settings/forms.py:144 +#: perms/templates/perms/asset_permission_asset.html:58 +#: perms/templates/perms/asset_permission_list.html:212 settings/forms.py:144 #: users/templates/users/_granted_assets.html:31 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:54 #: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:63 @@ -813,7 +816,7 @@ msgstr "IP" #: assets/templates/assets/asset_list.html:96 #: assets/templates/assets/user_asset_list.html:75 #: perms/templates/perms/asset_permission_asset.html:57 -#: perms/templates/perms/asset_permission_list.html:73 settings/forms.py:143 +#: perms/templates/perms/asset_permission_list.html:213 settings/forms.py:143 #: users/templates/users/_granted_assets.html:30 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:53 #: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:62 @@ -961,8 +964,8 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 users/models/user.py:429 -#: users/templates/users/user_detail.html:77 +#: assets/models/cluster.py:22 users/models/user.py:447 +#: users/templates/users/user_detail.html:76 msgid "Phone" msgstr "手机" @@ -987,7 +990,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:14 -#: users/models/user.py:549 +#: users/models/user.py:567 msgid "System" msgstr "系统" @@ -1044,7 +1047,7 @@ msgstr "过滤器" #: settings/templates/settings/replay_storage_create.html:31 #: settings/templates/settings/terminal_setting.html:84 #: settings/templates/settings/terminal_setting.html:106 -#: tickets/models/ticket.py:42 tickets/templates/tickets/ticket_detail.html:33 +#: tickets/models/ticket.py:43 tickets/templates/tickets/ticket_detail.html:33 #: tickets/templates/tickets/ticket_list.html:35 msgid "Type" msgstr "类型" @@ -1119,18 +1122,18 @@ msgstr "默认资产组" #: perms/models/base.py:49 #: perms/templates/perms/asset_permission_create_update.html:41 #: perms/templates/perms/asset_permission_list.html:50 -#: perms/templates/perms/asset_permission_list.html:115 +#: perms/templates/perms/asset_permission_list.html:106 #: perms/templates/perms/remote_app_permission_create_update.html:43 #: perms/templates/perms/remote_app_permission_list.html:15 #: templates/index.html:87 terminal/backends/command/models.py:12 #: terminal/models.py:156 terminal/templates/terminal/command_list.html:29 #: terminal/templates/terminal/command_list.html:65 #: terminal/templates/terminal/session_list.html:27 -#: terminal/templates/terminal/session_list.html:71 tickets/models/ticket.py:32 -#: tickets/models/ticket.py:104 tickets/templates/tickets/ticket_detail.html:32 +#: terminal/templates/terminal/session_list.html:71 tickets/models/ticket.py:33 +#: tickets/models/ticket.py:128 tickets/templates/tickets/ticket_detail.html:32 #: tickets/templates/tickets/ticket_list.html:34 -#: tickets/templates/tickets/ticket_list.html:101 users/forms.py:339 -#: users/models/user.py:149 users/models/user.py:165 users/models/user.py:537 +#: tickets/templates/tickets/ticket_list.html:100 users/forms.py:339 +#: users/models/user.py:148 users/models/user.py:164 users/models/user.py:555 #: users/serializers/group.py:21 #: users/templates/users/user_group_detail.html:78 #: users/templates/users/user_group_list.html:36 users/views/user.py:250 @@ -1226,8 +1229,8 @@ msgstr "登录模式" #: perms/models/asset_permission.py:82 perms/models/remote_app_permission.py:16 #: perms/templates/perms/asset_permission_detail.html:140 #: perms/templates/perms/asset_permission_list.html:54 -#: perms/templates/perms/asset_permission_list.html:75 -#: perms/templates/perms/asset_permission_list.html:127 +#: perms/templates/perms/asset_permission_list.html:118 +#: perms/templates/perms/asset_permission_list.html:215 #: perms/templates/perms/remote_app_permission_detail.html:131 #: perms/templates/perms/remote_app_permission_list.html:18 #: templates/_nav.html:45 terminal/backends/command/models.py:14 @@ -1286,7 +1289,7 @@ msgid "Backend" msgstr "后端" #: assets/serializers/asset_user.py:67 users/forms.py:282 -#: users/models/user.py:440 users/templates/users/first_login.html:42 +#: users/models/user.py:458 users/templates/users/first_login.html:42 #: users/templates/users/user_password_update.html:49 #: users/templates/users/user_profile.html:69 #: users/templates/users/user_profile_update.html:46 @@ -1480,8 +1483,8 @@ msgstr "请输入密码" #: assets/templates/assets/_asset_user_auth_update_modal.html:68 #: assets/templates/assets/asset_detail.html:302 -#: users/templates/users/user_detail.html:366 -#: users/templates/users/user_detail.html:393 +#: users/templates/users/user_detail.html:367 +#: users/templates/users/user_detail.html:394 #: xpack/plugins/interface/views.py:35 msgid "Update successfully!" msgstr "更新成功" @@ -1504,7 +1507,7 @@ msgstr "获取认证信息错误" #: authentication/templates/authentication/_access_key_modal.html:142 #: authentication/templates/authentication/_mfa_confirm_modal.html:53 #: settings/templates/settings/_ldap_list_users_modal.html:171 -#: templates/_modal.html:22 tickets/models/ticket.py:67 +#: templates/_modal.html:22 tickets/models/ticket.py:68 #: tickets/templates/tickets/ticket_detail.html:103 msgid "Close" msgstr "关闭" @@ -1679,11 +1682,11 @@ msgstr "选择节点" #: authentication/templates/authentication/_mfa_confirm_modal.html:20 #: settings/templates/settings/terminal_setting.html:168 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112 -#: users/templates/users/user_detail.html:271 -#: users/templates/users/user_detail.html:447 -#: users/templates/users/user_detail.html:473 -#: users/templates/users/user_detail.html:496 -#: users/templates/users/user_detail.html:541 +#: users/templates/users/user_detail.html:272 +#: users/templates/users/user_detail.html:448 +#: users/templates/users/user_detail.html:474 +#: users/templates/users/user_detail.html:497 +#: users/templates/users/user_detail.html:542 #: users/templates/users/user_group_create_update.html:32 #: users/templates/users/user_group_list.html:120 #: users/templates/users/user_list.html:256 @@ -1761,7 +1764,7 @@ msgstr "资产用户" #: assets/templates/assets/asset_asset_user_list.html:47 #: assets/templates/assets/asset_detail.html:142 #: terminal/templates/terminal/session_detail.html:85 -#: users/templates/users/user_detail.html:141 +#: users/templates/users/user_detail.html:140 #: users/templates/users/user_profile.html:150 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:128 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:132 @@ -1788,7 +1791,7 @@ msgid "Disk" msgstr "硬盘" #: assets/templates/assets/asset_detail.html:126 -#: users/templates/users/user_detail.html:116 +#: users/templates/users/user_detail.html:115 #: users/templates/users/user_profile.html:106 msgid "Date joined" msgstr "创建日期" @@ -1802,7 +1805,7 @@ msgstr "创建日期" #: perms/templates/perms/remote_app_permission_detail.html:112 #: terminal/templates/terminal/terminal_list.html:34 #: users/templates/users/_select_user_modal.html:18 -#: users/templates/users/user_detail.html:147 +#: users/templates/users/user_detail.html:146 #: users/templates/users/user_profile.html:63 msgid "Active" msgstr "激活中" @@ -1883,9 +1886,9 @@ msgstr "显示所有子节点资产" #: assets/templates/assets/asset_list.html:421 #: assets/templates/assets/system_user_list.html:127 -#: users/templates/users/user_detail.html:441 -#: users/templates/users/user_detail.html:467 -#: users/templates/users/user_detail.html:535 +#: users/templates/users/user_detail.html:442 +#: users/templates/users/user_detail.html:468 +#: users/templates/users/user_detail.html:536 #: users/templates/users/user_group_list.html:114 #: users/templates/users/user_list.html:250 #: xpack/plugins/interface/templates/interface/interface.html:97 @@ -1899,9 +1902,9 @@ msgstr "删除选择资产" #: assets/templates/assets/asset_list.html:425 #: assets/templates/assets/system_user_list.html:131 #: settings/templates/settings/terminal_setting.html:166 -#: users/templates/users/user_detail.html:445 -#: users/templates/users/user_detail.html:471 -#: users/templates/users/user_detail.html:539 +#: users/templates/users/user_detail.html:446 +#: users/templates/users/user_detail.html:472 +#: users/templates/users/user_detail.html:540 #: users/templates/users/user_group_list.html:118 #: users/templates/users/user_list.html:254 #: xpack/plugins/interface/templates/interface/interface.html:101 @@ -2229,7 +2232,7 @@ msgstr "文件名" #: audits/templates/audits/ftp_log_list.html:79 #: ops/templates/ops/command_execution_list.html:68 #: ops/templates/ops/task_list.html:15 -#: users/templates/users/user_detail.html:517 +#: users/templates/users/user_detail.html:518 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14 #: xpack/plugins/cloud/api.py:61 msgid "Success" @@ -2254,12 +2257,12 @@ msgstr "资源" msgid "Change by" msgstr "修改者" -#: audits/models.py:71 users/templates/users/user_detail.html:99 +#: audits/models.py:71 users/templates/users/user_detail.html:98 msgid "Disabled" msgstr "禁用" #: audits/models.py:72 settings/models.py:33 -#: users/templates/users/user_detail.html:97 +#: users/templates/users/user_detail.html:96 msgid "Enabled" msgstr "启用" @@ -2290,7 +2293,7 @@ msgstr "Agent" #: audits/models.py:86 audits/templates/audits/login_log_list.html:62 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms.py:194 users/models/user.py:432 +#: users/forms.py:194 users/models/user.py:450 #: users/templates/users/first_login.html:45 msgid "MFA" msgstr "MFA" @@ -2306,7 +2309,7 @@ msgstr "原因" #: audits/models.py:88 audits/templates/audits/login_log_list.html:64 #: tickets/templates/tickets/ticket_detail.html:34 #: tickets/templates/tickets/ticket_list.html:36 -#: tickets/templates/tickets/ticket_list.html:102 +#: tickets/templates/tickets/ticket_list.html:101 #: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/models.py:310 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 @@ -2496,7 +2499,7 @@ msgid "" "after {} minutes)" msgstr "账号已被锁定（请联系管理员解锁 或 {}分钟后重试）" -#: authentication/errors.py:46 users/views/user.py:393 users/views/user.py:418 +#: authentication/errors.py:46 users/views/user.py:398 users/views/user.py:423 msgid "MFA code invalid, or ntp sync server time" msgstr "MFA验证码不正确，或者服务器端时间不对" @@ -2524,10 +2527,15 @@ msgstr "MFA 验证码" msgid "Private Token" msgstr "ssh密钥" -#: authentication/models.py:44 users/templates/users/user_detail.html:265 +#: authentication/models.py:44 users/templates/users/user_detail.html:266 msgid "Reviewers" msgstr "审批人" +#: authentication/models.py:53 tickets/models/ticket.py:25 +#: users/templates/users/user_detail.html:258 +msgid "Login confirm" +msgstr "登录复核" + #: authentication/templates/authentication/_access_key_modal.html:6 msgid "API key list" msgstr "API Key列表" @@ -2550,14 +2558,14 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:352 users/templates/users/user_profile.html:94 +#: users/models/user.py:351 users/templates/users/user_profile.html:94 #: users/templates/users/user_profile.html:163 #: users/templates/users/user_profile.html:166 msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:353 users/templates/users/user_profile.html:92 +#: users/models/user.py:352 users/templates/users/user_profile.html:92 #: users/templates/users/user_profile.html:170 msgid "Enable" msgstr "启用" @@ -2645,7 +2653,7 @@ msgid "Keycloak" msgstr "" #: authentication/templates/authentication/login_otp.html:46 -#: users/templates/users/user_detail.html:92 +#: users/templates/users/user_detail.html:91 #: users/templates/users/user_profile.html:87 msgid "MFA certification" msgstr "MFA认证" @@ -3186,12 +3194,12 @@ msgstr "提示：RDP 协议不支持单独控制上传或下载文件" #: perms/forms/asset_permission.py:81 perms/forms/remote_app_permission.py:37 #: perms/models/base.py:50 perms/templates/perms/asset_permission_list.html:51 -#: perms/templates/perms/asset_permission_list.html:71 -#: perms/templates/perms/asset_permission_list.html:118 +#: perms/templates/perms/asset_permission_list.html:109 +#: perms/templates/perms/asset_permission_list.html:211 #: perms/templates/perms/remote_app_permission_list.html:16 #: templates/_nav.html:21 users/forms.py:313 users/models/group.py:26 -#: users/models/user.py:416 users/templates/users/_select_user_modal.html:16 -#: users/templates/users/user_detail.html:218 +#: users/models/user.py:434 users/templates/users/_select_user_modal.html:16 +#: users/templates/users/user_detail.html:219 #: users/templates/users/user_list.html:38 #: xpack/plugins/orgs/templates/orgs/org_list.html:16 msgid "User group" @@ -3233,7 +3241,7 @@ msgstr "资产授权" #: perms/models/base.py:53 #: perms/templates/perms/asset_permission_detail.html:90 #: perms/templates/perms/remote_app_permission_detail.html:82 -#: users/models/user.py:448 users/templates/users/user_detail.html:108 +#: users/models/user.py:466 users/templates/users/user_detail.html:107 #: users/templates/users/user_profile.html:120 msgid "Date expired" msgstr "失效日期" @@ -3286,7 +3294,7 @@ msgid "Add node to this permission" msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:109 -#: users/templates/users/user_detail.html:235 +#: users/templates/users/user_detail.html:236 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:105 msgid "Join" msgstr "加入" @@ -3335,7 +3343,7 @@ msgid "Refresh permission cache" msgstr "刷新授权缓存" #: perms/templates/perms/asset_permission_list.html:55 -#: perms/templates/perms/asset_permission_list.html:69 +#: perms/templates/perms/asset_permission_list.html:209 #: perms/templates/perms/remote_app_permission_list.html:19 #: users/templates/users/user_list.html:40 xpack/plugins/cloud/models.py:74 #: xpack/plugins/cloud/templates/cloud/account_detail.html:58 @@ -3343,7 +3351,7 @@ msgstr "刷新授权缓存" msgid "Validity" msgstr "有效" -#: perms/templates/perms/asset_permission_list.html:230 +#: perms/templates/perms/asset_permission_list.html:232 msgid "Refresh success" msgstr "刷新成功" @@ -3808,7 +3816,7 @@ msgid "Refresh cache" msgstr "刷新缓存" #: settings/templates/settings/_ldap_list_users_modal.html:33 -#: users/models/user.py:412 users/templates/users/user_detail.html:72 +#: users/models/user.py:430 users/templates/users/user_detail.html:71 #: users/templates/users/user_profile.html:59 msgid "Email" msgstr "邮件" @@ -4209,7 +4217,7 @@ msgstr "批量命令" msgid "Task monitor" msgstr "任务监控" -#: templates/_nav.html:128 tickets/views.py:17 tickets/views.py:34 +#: templates/_nav.html:128 tickets/views.py:19 tickets/views.py:37 msgid "Tickets" msgstr "工单管理" @@ -4563,8 +4571,8 @@ msgid "Accept" msgstr "接受" #: terminal/templates/terminal/terminal_list.html:80 -#: tickets/models/ticket.py:30 tickets/templates/tickets/ticket_detail.html:101 -#: tickets/templates/tickets/ticket_list.html:108 +#: tickets/models/ticket.py:31 tickets/templates/tickets/ticket_detail.html:101 +#: tickets/templates/tickets/ticket_list.html:107 msgid "Reject" msgstr "拒绝" @@ -4601,66 +4609,62 @@ msgid "" "You should use your ssh client tools connect terminal: {}

{}" msgstr "你可以使用ssh客户端工具连接终端" -#: tickets/models/ticket.py:17 tickets/models/ticket.py:69 -#: tickets/templates/tickets/ticket_list.html:103 +#: tickets/models/ticket.py:18 tickets/models/ticket.py:70 +#: tickets/templates/tickets/ticket_list.html:102 msgid "Open" msgstr "开启" -#: tickets/models/ticket.py:18 tickets/templates/tickets/ticket_list.html:104 +#: tickets/models/ticket.py:19 tickets/templates/tickets/ticket_list.html:103 msgid "Closed" msgstr "关闭" -#: tickets/models/ticket.py:23 +#: tickets/models/ticket.py:24 msgid "General" msgstr "一般" -#: tickets/models/ticket.py:24 users/templates/users/user_detail.html:257 -msgid "Login confirm" -msgstr "登录复核" - -#: tickets/models/ticket.py:29 tickets/templates/tickets/ticket_detail.html:100 -#: tickets/templates/tickets/ticket_list.html:107 +#: tickets/models/ticket.py:30 tickets/templates/tickets/ticket_detail.html:100 +#: tickets/templates/tickets/ticket_list.html:106 msgid "Approve" msgstr "同意" -#: tickets/models/ticket.py:33 tickets/models/ticket.py:105 +#: tickets/models/ticket.py:34 tickets/models/ticket.py:129 msgid "User display name" msgstr "用户显示名称" -#: tickets/models/ticket.py:35 tickets/templates/tickets/ticket_list.html:33 -#: tickets/templates/tickets/ticket_list.html:100 +#: tickets/models/ticket.py:36 tickets/templates/tickets/ticket_list.html:33 +#: tickets/templates/tickets/ticket_list.html:99 msgid "Title" msgstr "标题" -#: tickets/models/ticket.py:36 tickets/models/ticket.py:106 +#: tickets/models/ticket.py:37 tickets/models/ticket.py:130 msgid "Body" msgstr "内容" -#: tickets/models/ticket.py:37 +#: tickets/models/ticket.py:38 msgid "Meta" msgstr "" -#: tickets/models/ticket.py:38 tickets/templates/tickets/ticket_detail.html:51 +#: tickets/models/ticket.py:39 tickets/templates/tickets/ticket_detail.html:51 msgid "Assignee" msgstr "处理人" -#: tickets/models/ticket.py:39 +#: tickets/models/ticket.py:40 msgid "Assignee display name" msgstr "处理人名称" -#: tickets/models/ticket.py:40 tickets/templates/tickets/ticket_detail.html:50 +#: tickets/models/ticket.py:41 tickets/templates/tickets/ticket_detail.html:50 msgid "Assignees" msgstr "待处理人" -#: tickets/models/ticket.py:41 +#: tickets/models/ticket.py:42 msgid "Assignees display name" msgstr "待处理人名称" -#: tickets/models/ticket.py:70 +#: tickets/models/ticket.py:71 msgid "{} {} this ticket" msgstr "{} {} 这个工单" -#: tickets/models/ticket.py:81 +#: tickets/models/ticket.py:82 msgid "this ticket" msgstr "这个工单" @@ -4745,11 +4749,11 @@ msgstr "" " \n" " " -#: tickets/views.py:18 +#: tickets/views.py:20 msgid "Ticket list" msgstr "工单列表" -#: tickets/views.py:35 +#: tickets/views.py:38 msgid "Ticket detail" msgstr "工单详情" @@ -4757,16 +4761,16 @@ msgstr "工单详情" msgid "Could not reset self otp, use profile reset instead" msgstr "不能再该页面重置MFA, 请去个人信息页面重置" -#: users/forms.py:47 users/models/user.py:420 +#: users/forms.py:47 users/models/user.py:438 #: users/templates/users/_select_user_modal.html:15 -#: users/templates/users/user_detail.html:88 +#: users/templates/users/user_detail.html:87 #: users/templates/users/user_list.html:37 #: users/templates/users/user_profile.html:55 msgid "Role" msgstr "角色" -#: users/forms.py:51 users/models/user.py:455 -#: users/templates/users/user_detail.html:104 +#: users/forms.py:51 users/models/user.py:473 +#: users/templates/users/user_detail.html:103 #: users/templates/users/user_list.html:39 #: users/templates/users/user_profile.html:102 msgid "Source" @@ -4785,7 +4789,7 @@ msgstr "" msgid "Paste user id_rsa.pub here." msgstr "复制用户公钥到这里" -#: users/forms.py:71 users/templates/users/user_detail.html:226 +#: users/forms.py:71 users/templates/users/user_detail.html:227 msgid "Join user groups" msgstr "添加到用户组" @@ -4878,49 +4882,53 @@ msgstr "复制你的公钥到这里" msgid "Select users" msgstr "选择用户" -#: users/models/user.py:52 users/templates/users/user_update.html:22 +#: users/models/user.py:51 users/templates/users/user_update.html:22 #: users/views/login.py:46 users/views/login.py:107 msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" -#: users/models/user.py:148 users/models/user.py:545 +#: users/models/user.py:147 users/models/user.py:563 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:150 +#: users/models/user.py:149 msgid "Application" msgstr "应用程序" -#: users/models/user.py:151 xpack/plugins/orgs/forms.py:30 +#: users/models/user.py:150 xpack/plugins/orgs/forms.py:30 #: xpack/plugins/orgs/templates/orgs/org_list.html:14 msgid "Auditor" msgstr "审计员" -#: users/models/user.py:161 +#: users/models/user.py:160 msgid "Org admin" msgstr "组织管理员" -#: users/models/user.py:163 +#: users/models/user.py:162 msgid "Org auditor" msgstr "组织审计员" -#: users/models/user.py:354 users/templates/users/user_profile.html:90 +#: users/models/user.py:353 users/templates/users/user_profile.html:90 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:423 +#: users/models/user.py:418 +msgid "Local" +msgstr "数据库" + +#: users/models/user.py:441 msgid "Avatar" msgstr "头像" -#: users/models/user.py:426 users/templates/users/user_detail.html:83 +#: users/models/user.py:444 users/templates/users/user_detail.html:82 msgid "Wechat" msgstr "微信" -#: users/models/user.py:459 +#: users/models/user.py:477 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:548 +#: users/models/user.py:566 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -5092,7 +5100,7 @@ msgid "Always young, always with tears in my eyes. Stay foolish Stay hungry" msgstr "永远年轻，永远热泪盈眶 stay foolish stay hungry" #: users/templates/users/reset_password.html:46 -#: users/templates/users/user_detail.html:432 users/utils.py:83 +#: users/templates/users/user_detail.html:433 users/utils.py:83 msgid "Reset password" msgstr "重置密码" @@ -5161,102 +5169,102 @@ msgstr "很强" msgid "Create user" msgstr "创建用户" -#: users/templates/users/user_detail.html:20 +#: users/templates/users/user_detail.html:19 #: users/templates/users/user_granted_asset.html:18 users/views/user.py:190 msgid "User detail" msgstr "用户详情" -#: users/templates/users/user_detail.html:23 +#: users/templates/users/user_detail.html:22 #: users/templates/users/user_granted_asset.html:21 #: users/templates/users/user_group_detail.html:25 #: users/templates/users/user_group_granted_asset.html:21 msgid "Asset granted" msgstr "授权的资产" -#: users/templates/users/user_detail.html:95 +#: users/templates/users/user_detail.html:94 msgid "Force enabled" msgstr "强制启用" -#: users/templates/users/user_detail.html:120 +#: users/templates/users/user_detail.html:119 #: users/templates/users/user_profile.html:110 msgid "Last login" msgstr "最后登录" -#: users/templates/users/user_detail.html:125 +#: users/templates/users/user_detail.html:124 #: users/templates/users/user_profile.html:115 msgid "Last password updated" msgstr "最后更新密码" -#: users/templates/users/user_detail.html:161 +#: users/templates/users/user_detail.html:160 msgid "Force enabled MFA" msgstr "强制启用MFA" -#: users/templates/users/user_detail.html:176 +#: users/templates/users/user_detail.html:177 msgid "Reset MFA" msgstr "重置MFA" -#: users/templates/users/user_detail.html:185 +#: users/templates/users/user_detail.html:186 msgid "Send reset password mail" msgstr "发送重置密码邮件" -#: users/templates/users/user_detail.html:188 -#: users/templates/users/user_detail.html:198 +#: users/templates/users/user_detail.html:189 +#: users/templates/users/user_detail.html:199 msgid "Send" msgstr "发送" -#: users/templates/users/user_detail.html:195 +#: users/templates/users/user_detail.html:196 msgid "Send reset ssh key mail" msgstr "发送重置密钥邮件" -#: users/templates/users/user_detail.html:204 -#: users/templates/users/user_detail.html:520 +#: users/templates/users/user_detail.html:205 +#: users/templates/users/user_detail.html:521 msgid "Unblock user" msgstr "解除登录限制" -#: users/templates/users/user_detail.html:207 +#: users/templates/users/user_detail.html:208 msgid "Unblock" msgstr "解除" -#: users/templates/users/user_detail.html:375 +#: users/templates/users/user_detail.html:376 msgid "Goto profile page enable MFA" msgstr "请去个人信息页面启用自己的MFA" -#: users/templates/users/user_detail.html:431 +#: users/templates/users/user_detail.html:432 msgid "An e-mail has been sent to the user`s mailbox." msgstr "已发送邮件到用户邮箱" -#: users/templates/users/user_detail.html:442 +#: users/templates/users/user_detail.html:443 msgid "This will reset the user password and send a reset mail" msgstr "将失效用户当前密码，并发送重设密码邮件到用户邮箱" -#: users/templates/users/user_detail.html:457 +#: users/templates/users/user_detail.html:458 msgid "" "The reset-ssh-public-key E-mail has been sent successfully. Please inform " "the user to update his new ssh public key." msgstr "重设密钥邮件将会发送到用户邮箱" -#: users/templates/users/user_detail.html:458 +#: users/templates/users/user_detail.html:459 msgid "Reset SSH public key" msgstr "重置SSH密钥" -#: users/templates/users/user_detail.html:468 +#: users/templates/users/user_detail.html:469 msgid "This will reset the user public key and send a reset mail" msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱" -#: users/templates/users/user_detail.html:486 +#: users/templates/users/user_detail.html:487 msgid "Successfully updated the SSH public key." msgstr "更新ssh密钥成功" -#: users/templates/users/user_detail.html:487 -#: users/templates/users/user_detail.html:491 +#: users/templates/users/user_detail.html:488 +#: users/templates/users/user_detail.html:492 msgid "User SSH public key update" msgstr "ssh密钥" -#: users/templates/users/user_detail.html:536 +#: users/templates/users/user_detail.html:537 msgid "After unlocking the user, the user can log in normally." msgstr "解除用户登录限制后，此用户即可正常登录" -#: users/templates/users/user_detail.html:550 +#: users/templates/users/user_detail.html:551 msgid "Reset user MFA success" msgstr "重置用户MFA成功" @@ -5371,13 +5379,13 @@ msgid "Set MFA" msgstr "设置MFA" #: users/templates/users/user_profile.html:178 -msgid "Update password" -msgstr "更改密码" - -#: users/templates/users/user_profile.html:188 msgid "Update MFA" msgstr "更改MFA" +#: users/templates/users/user_profile.html:188 +msgid "Update password" +msgstr "更改密码" + #: users/templates/users/user_profile.html:198 msgid "Update SSH public key" msgstr "更改SSH密钥" @@ -5679,19 +5687,19 @@ msgstr "密钥更新" msgid "Password invalid" msgstr "用户名或密码无效" -#: users/views/user.py:448 +#: users/views/user.py:453 msgid "MFA enable success" msgstr "MFA 绑定成功" -#: users/views/user.py:449 +#: users/views/user.py:454 msgid "MFA enable success, return login page" msgstr "MFA 绑定成功，返回到登录页面" -#: users/views/user.py:451 +#: users/views/user.py:456 msgid "MFA disable success" msgstr "MFA 解绑成功" -#: users/views/user.py:452 +#: users/views/user.py:457 msgid "MFA disable success, return login page" msgstr "MFA 解绑成功，返回登录页面" diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 67e75b569..834247099 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -415,7 +415,7 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser): SOURCE_OPENID = 'openid' SOURCE_RADIUS = 'radius' SOURCE_CHOICES = ( - (SOURCE_LOCAL, 'Local'), + (SOURCE_LOCAL, _('Local')), (SOURCE_LDAP, 'LDAP/AD'), (SOURCE_OPENID, 'OpenID'), (SOURCE_RADIUS, 'Radius'),