From 4d56b8486140d56cf10db776e628a89eac9b2ade Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Tue, 26 Mar 2019 15:47:24 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=20(#2541)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/asset_asset_user_list.html | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 69760 -> 70756 bytes apps/locale/zh/LC_MESSAGES/django.po | 164 ++++++++++-------- 3 files changed, 95 insertions(+), 71 deletions(-) diff --git a/apps/assets/templates/assets/asset_asset_user_list.html b/apps/assets/templates/assets/asset_asset_user_list.html index 540be02d8..9a330ce77 100644 --- a/apps/assets/templates/assets/asset_asset_user_list.html +++ b/apps/assets/templates/assets/asset_asset_user_list.html @@ -46,7 +46,7 @@
jDCx&u z2Kby3L81))K!+*jw|-+S_t5&hPFpSN zll* (mZj|o_^t;$mp<$0TJP0RXh {l~s_qO7GNw>EL z`DL!-sa~so?K(;Sewsb7dh+hQ$$R5dwoFf%vf=*zS+} HD-t0Xb);%-E1Ref_P~ zvu jtX;NRy<5E#-6~O{gb=;=-g_53glMruRu94ICEDs;M3;!@K_Y@^ ziIO0Ri2M0I^V@s#y63*edw#!}Gc#w-InO>z{`dBpz;Vk0eLtiMoa1rqPU?AC@OD@&k#TsEOyc_Po>>k6PFc)Xwb3H26IR<714# zm#FiC+IU_VrZTgm#wm;%r;1q%b)oNLB=dW1sHDd}r~xJ-cf*^7+NwF21(%?9WFKlP z&tr1Di<$8;vZY>VTeqMbsP-b56U$&0Y>C>*Vd&G9d_W~7PC#AZY)po0F$6c6doYUl zC`RIC?1aCduBc8s&&!J~P`AW~{c$Z0#*FPfuMxW4zg(`>#r=4z6JemL in8MDmtMt z>K2SZ-OH({d$|%b;a=31UqTId*L;q8xB|Pl_E6M9Gou!e50hdERKGG9h?P(a@KvLt ziRxQJSJc+^LalT(X2VIS1+2ukaJ#kNMGgGK+Fx2exU1XIDAW$6H}jzSmvs8P@>Dc% zRn(O=MBSqf7>Gkq59vtMTQVMXOBSFOxEVFz9@N4QV@5oW+R FZfgL-}Hp$2M(G1wi0a2aZ0Yfu-k8P)#~s{cvUt@|Ex;&ar(GIVzfD1k+p z->XQa81_b8@n@I}m!h_A73yAX!(cpYo C~_%$Xc4)5s}kPh_$lnr$&ilY|#uC+HqP1p{#6MfCG);<&U zIWw;(@4qJAKtcl^MLoS&tmAF-5o*9cEKb_XEhrS#KMj_|Xbi$8sQ#@{Z&NSS&P+mG z*nHHpw6YibpMuJM656WcsC#w;b!C5|t}L>*8!#(sfWoK+$6yH7MO{&I)I@zS6vv{* zoo4Y;)WSBPo`t *1Zsk448}sJEiH+ 7lbecb}1Pz%e2T2LX>GgSd~ zE9zr7HbYI^1=Vi=GOy1YM@1{1i8^66?!(Ve1GnhsChlPNMJ-?yYN83K^XH)!x(Ib4 zt1ue3pgzF9!#emBpJ2uQ8i)H|WPlr>3~B)tFdVC)CTM{Em7^vefVFTW7R1Are}r1_ zbJXkm8ud&h9q4` N^XsA}ZesZksD*VO%>L_yvDRU-8Hc6FFF_4_0X6YY7=@2f zI}$L&O%R3Zml5?^ IrvV^Ftv8tPUoKwW@uC6z8zzQoO#Zv+n_ zUcud1b)@^={|d7b4;$sKY&PnO7Nd4xxy5TxJGK#Z?|(q;#9h<^9;0^PUnlqf1GlxQ zP+OlHbwXLQ3hLh1#!}cEHNbS#mCQBcQE$;ki+7{8_^9O{p%(fQQ{q3kLGOR~XwU0M zVh`#ILV+=E;3BB4i$Ps!P1FQ+QCr&_wXk-W4*OX91WZdj19c%QEdB!Z&>lhcKaUZ5 z{~u7%z<;3z4jk*YE)=z8sZk5biF#^_VP<>>wPWp3&&(iH|2e4sD^NSM1vUPD)CHcv zJa`6uy0T~1;ZM{FNm-S)PQRV##4@NYuZp^&_bhH=?d?z#_Oy5yYN6vXJ 6qAE4+%jRS!@f zRL@a68a%;Glnd3KA9cYcQMbewLq#W4K@HRhGht^;f@4wd@p#k#Q&C$!8@1rQs2w EZ^SNIj`3QwW>pF=J1dn|_cF zvSqb&fwm|J@Kdg-7(U*_PVJf-tKB{BH6u08s7)ab0HDC*~ zBWlZgp%yX%gK;8iXQpFvTx709J-i!Hw{RD#-;pWoe+eq*NoZ?=rn(6;pdO;E_#T!( zEpRMm$K@D=M^MkeDf2RFr*2~ke1Pir2Wp32p%$8EntMI7OymA*iz|@OR@Frf&>eMR zU(^XhPzxMw`5CBtI|sD`D^NSP8TD`-v-}HGza$^Kzqp7(jawdDVO1X$by#GsM=f9v z>Ix2_cH$J4#2-=pQ%`q4L~>$b;uzEiS2xQ~#N@=Ep>EX*)Wlm+ sgk1(8grp1e$K5w-(Y(cH~ zAm+gn7XOBNSYD#8Ja~q?l5`kNoE3Fz-bVFnfV!m}P(MosVi %pSbtGHtGYVD~973)Wi2NMqr#7k9yd)pawpUdPXi=`y gBgv= z=STm~|Ke1%^0Jr@-$6Yry-_P2gxaBxEk74Ez+#J6nO~s#Z9^^mAnHPnTYM39AvZ8T zKAOe*uPsUYse5=bp-#w++QJfM4b zwC QYB~bAgOocP?cZ^3(Fn6|_cr|K(ZK$0%gj&c+i_cqp9d+Ja z)Xuy_Ej-B_ccGC!DtaHYqE?s-HE|4T;JRj0)V*$p+M#}^fk&ezjzyg}4|M_SFdFxv zcK8PB*50yw$XwU%D?~-#M(d*Pb!XHUjM1nG7no};zZ*-Fzl547Y@Yk6mkrYpS4G|1 zW|#wgsEL zbN4hB-y&X*>+m|}#mS4@53`M^h21cN7HeVL|6)|i($E}Za3<>MJ&D@7bEtcF3CH74 z_#8Wb&O44Rm$-*4 +3Qqh)nLJf4# zI(&nAxGtdvxQV*wk5B{si`toFE8N4I67`zqMU7Jx)xQC1o=&KTv_I 9a#B=m5-M6EDvmD~F4sDa9&2C9V`s4;2_yPAEmBJohvj%~%>xDPdM{?+c*R6>nY z4Rt~9`>5zj+n}~=5C-FT)Rj*~UC|2E37fDh?#DuyYmIBKj~ciYYMgFZ5{IImskNwa z_M<*GPM|Ktca@4Bwuh)I4P5I6N`s1{Q762G?_yO oLJ% z)IuL7xW6mvy^UYXh`+@TvCejW)Y9*3Jcw~Sx$k@eHQvo%GSc33uY1eF_ql}>#Srq9 z_c3fL4M0L$+!jNz6Y3uK!zdh%x}vF;UyB8ax0*LFFLCnyZpVsYR^mE14trn?ypP(E zVh7w0xtIf7Ru&S?NPLZhF$}97biR+e$E{Hd?PU3(mjBS=spedBxw+Zgj~eF`Y60gg zf6Zr=d#Km&xy2EO+zFXc_bexBVI|DUsAr 5+_R7! zwbkV;e$V1As09p1EpW0q+w#jS-hx52AHbw|)bb}Se+m6R|8H2s18aDRn)qMKM;&*c zXxUH`RzWSe9tL3_bFj6KvUsvN!}4>?c*}1(&ik*G?XZSD=5f>lE}%XrenEX6JVQP8 zugs_uZbA7_TVD!w-rK0RsiDQaEFOcJZ!W6;!V~PjDl06p(cEQziMqlw7N5sb#5XLT z>ZChABkGpqLiI0++NtuW1=T`*;b>*?Fib%_)kh^al{hSeyHEo>HeX;0;@7AFgHO5k zG-hVZOFk#|!`i5RyHFD!wfG8Zfp<_l_}uh`o^~B`pjKE4H9!N)x3zeHIR>@BX%^2i zKezmPbF1Zdqb5FP@g-~j+2wuS11eh4-_{}J8F$55Q4{5}xG07Zm$Q5gv#!|~E70D` z;<*?`yco3;>&*R@|JEOK|8G#y7C%A%LQp%Ak{<{xr+-i`W*YO1?)ZN z20US&MddG{CivOn->u#I&i$|n#(cC_LoKM6InW$|QRID?181SeO|bSuYDh`qIO^VA zv4&fyj`uBoVexBJzmW6pFP+k0e&Q}z5Mxp2?J|#=-=P-xqj}fzzF#fzw K$TQ~i=2&7QYT)hWm#D2hYw=4n z@S?jVQK OSqb)xH^$f*YelcnxE71S`Z=%AtW$%P}8jBKtW4^|= z#Dy=rUm&KLr?Ce4uq#|GHo|T=2er_DPz#E@>K2?1wUAt>d`a|Wq*9(rJ8XiBF#%g( z!|&Z|xDI<0SHI>yAvdE2IA(rrUNEm=RoZW%b}ILE*S|O_E@yF#>+HV #@@(-{Ser)+er~!|ouK0q*zgYVpn2Y=?%V)pg7E&11zvK<>|Ho8nl4ye8p}rvG z`@!9#LS`A%LaU-CeAjG>8mJR$Cx=>orsWq|ya_YVz7I9dMT@WdtiyBE>z3q4*C7q+ zp~{T9@;qi~OiNtDY>isLK-2^i&Bd1Afm-lM^Ac(SKVv5JJ+MTwo33M+nGyBDlGoz; zs0Fpb;m$@fp;@Z=e}(E0Eo7>> z05#xRYu}8zHAhgl;;Q+~4E@>VbE6hk34@s5t3yRs+R$umcExn$`(sj^ggS8=>O12+ zi}#@xd=j<5>!<}hGLzkQ3(bZ)KaW`g{r~+>Whxq=CTdGtTHFhD!WeU!IS=!aUt#fS z)cIFX3wUVpD{GIq mAsbqUcBm^EXz_S!pN-nuWft$j)WpY8{jXX3 zL)5bn_=_7i6Y9Kt7FR*_ujjKwThx{IGACgWalEy!HFsG4h{dPO%cxs$+v1mI;61mH zC{%ks)P );~~^S?x1ebBlCsn-FNvA)WB&_6XigiSIY7g zFgfwNm;xKRyw7V*MGNTR65eFgiL+4yeTI#2Bj(3|2mH2!1u+HILrvV=?1DOfptX;% z_(Rk!m}+r6X4Ct>mWn1i;ZJZ6Q9JNAYM_vZ&M4GG87$6YabYtCbzV&@j?FBdV$Me` zU=3>A!#F|j{|PD@xb7ooOH_w$s4MJ?8hAMBlW#JH;Q`dbPh&y+0X0F2U)?>=i5jOI zs()pR>za+x|NghKL`SoS*&lV{Fmr e{i~zKY3Pr+|GlikaMa&aPP6!y`5gI4>Lvff z4g3f-&>J)Cxr;NJdCih$6| uO*f_6opDpROvOV*oTp%!ohb)|o!wl?^sGZSi{BA61J zVRr0}`Y4}l?W<7ZpSAcI#t>)zlYbMyrhnSc|Mev1lGugKvHo9fL95L}sP?O<2?zY` zJ_*NT5uJx=@h%p^e{eA7f8~CvE<#=4F4Tpb!$`dSiu<3A${!@n6A;uT)J?Pw_(3 z)~!J8#Cq(HyYMLHf6YJB;BS}(C;#jI5qbqyBff~b(hP6h?-%{B6Y&vjiFtiqfd4-P z8iy4~TtlreeL#T!9}Wv*6meys;0&X)I?)6E6uD%8W4VDTmMXY+~q+6)QQ!nptGsp#P-h?@8v ze*>RTsAr?I 1VEKN7W53FaZxYxp(l{8y;&lA+06zapr7dDJ|0Ebfpzz~^rmKtdCa zL#=cg>gW1m)I@tNe*!hoHPlu 1Hm zYT-z1g*+nO1=IvhLfnKcPy=^DEu=rbg~Kopu10+jeT^;fFXX$3*C;f={VRG{fd9W2 znC7FRfsbQRJdJwV|3+ IOMa$i^aEPM1cP < zPePr)z+&GjD*6Q5joQja{8M#mY=heB0T_Tf8YJN>7G)$Q@hD4u9)(-(Kl1YD73y^; z!^rQjj>D{dEzTjY|IKg>z5hB^QChPNKU*h%l0T+ce3ugvkAdVKQNE@Ww05;^qEBlq zZ+#cjc7^&B#w|d;g7wX!?dF(68JCp#hfvY$# @<(HpUrEe9acoom`|A;;x^+*`hH$B^~82I$gl5_?SMEsn4fu zC$3K!$%!e6A5wm#UB^92H4Vt|lf(b#D*ET3)|I}UsK1~-o_Y`ZeuBQ|{LzkN60A%z z6~3nYP3Hx~*>M}O4!x54sddrfx3CLw5&DeA5c #n{uihx&}T9E{M0!T zub(HMsDpJ>%T7vHIwu~rXzM_njuW%vSmLzQ-=V`X9ELo@{;yUy?WAqklYZGP9!YyK zO5(93$^Xso&jm5?UQW=boQ|@@MTozkzMB)%5qBnDh&m#$9C6|?(duvL`#a^jH4MNQ z+7{q6&bdl`B|cA_e+!9!C|gPDBT_%}b@ZbYCf|a5JzPT^j#Y?tBsjd%#0#15GVy2B zkK&i~8$!`B!{K$Z^R^Jzqwae_hkq&g2^v~w^_|XO$0^y!>6=aBv59`45G26@w8vV* z#{Zmqid=e18Ok5zOVdwBXUZDR(~-&P^Cr?bmqckB;4|uNs4vAr*7-x!r`bR}XM-iB zPdsHgxw7PXQS|@B;3EC1kuO1ghxOfT#?i(%GOrJ1DSiI;`FqPctmPyffi&_($m46B zchB0C&qzIw_1QrEeM(0)aPYmtdxsKB`#&z_9mWa%iTqy!yhgPBMxPv7Aa3;8VE+;% zkUYQ%eB%0#S+xCWC+8s7mFx_1zmofv`n%TVdh=KGv^6Bq=lml|X3m*y V)>Hi7 5JeFY%~v z19sw^0P2fz8y=;vewuEfuI~pr_LD0_X-Ykw?;qX;f7<;qgpT?iu!8}9rL6#QCF;wm z*P-4Ybx`#mxri$ew4l#w JV4*-w!ld^gj@yMUXq`O%PD8cg-~>)!hJXzzoSn% z|G75*ZGRX39*ATutFNGwj_)1*|25=P+Ru>RP0|0Clf+{nmHrfclX}Gj$7!oT(O0-1 ziNB%Tp`MG !>%NJRp8Vd6(P= zlojL(sRKu9>M1Bc(LR>A4dnr2_M?m-=cAM(cT08jALj_BQ!7QONypT-2-nKLk`e1+ z)v=JWkusfgK4PNUn2fjLaQ5qmPbV4zCRPAE N@h7JLyxL`Zb(MDfxfb&jU!q zmy}OAA)Hc_i91r7lN*dWMsZT&@rwEw+QKZi#~NA@uOq*Va-MoUtZ#i1&)v>=KakI> zEuBC)M29Nak)k6v4x`fuN|;M|?~!{<`G|NX O@D9xN{6^J@gd#+UIcw8@6-5<IPyHtKC)A5D(OZ;ely>CTTAxo%{|WrTuaf>>(H1J7`2KYysL6?u dk4$f{8~K;)?%?7ZL0DoZM2*zhrS^>J!MP!3MPLvU7eWH< !iY zMf*JJL#e-mlPM$Y98%ur^zW{75_7u$l}Y5Z#COCUs23%tBO?R6AU;EVJGoz|kE1@w z`j5px`c%iNSc5(%Xir5wCF(drDdw+Hr@bZREM*_(_?FS}E|s|?(&HsMeu0U{Vd?|u z^WUQ#eXEi$Ln%eu`@~;SbR4mBx8Y`TACo&qxu!;r^44CF^Tz1@Cms @8A?6zcY;>bXL3>#$_eT^T2a?g2FGJ{&e1WG_KFx{@pa-=^l6qPE~ |0MX~*F4l%C`=QNCgSQs;a|Ed?ct9#?TW zo<$v%C{?u0>Eoj72m9g)qZwcV<+)AP8&{J*!D*Yx>zHkAPcfh68qxkeaUV(s>N-NL zpX$4;-zdvHwm$FCR+9SIr2gNz)s^2b^#>>XEjhlVOrcW&%6;nfDBm*BkHj| WR$?^BX6Yg&QC?GU{>FAQt1^K_X3d9ZDS~}tA)}{fG8Ya5q z;K5yoMEB`Act}FVZQ%jIC8CR$EnmDuLXqteAqo8tj!cpC&L^>P*G?2qD0DJSc+kC# z%kE71G@;z3ya5TZmxrW^i+IpJ%q8z_T6K5AM+to%yhxTX^hspYykh|Yi{^y}21M>m zo-|-@*v=d&1G)!9KHfLwe;4z3-_&`tqXJ6oycrd+KOmKjvwh<2J*)3bnRjp5nt6*- H2b}mHjkJ!g diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 9c40a44b2..b9f70ee7d 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-03-22 17:12+0800\n" +"POT-Creation-Date: 2019-03-26 14:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team \n" @@ -73,7 +73,7 @@ msgstr "网域" #: perms/templates/perms/asset_permission_list.html:57 #: perms/templates/perms/asset_permission_list.html:78 #: perms/templates/perms/asset_permission_list.html:128 -#: xpack/plugins/change_auth_plan/forms.py:101 +#: xpack/plugins/change_auth_plan/forms.py:115 #: 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 #: xpack/plugins/cloud/models.py:123 @@ -102,7 +102,7 @@ msgstr "如果有多个的互相隔离的网络,设置资产属于的网域, #: assets/forms/asset.py:92 assets/forms/asset.py:96 assets/forms/domain.py:17 #: assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:88 -#: xpack/plugins/change_auth_plan/forms.py:92 +#: xpack/plugins/change_auth_plan/forms.py:105 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:84 msgid "Select assets" msgstr "选择资产" @@ -125,9 +125,9 @@ msgstr "选择资产" #: terminal/templates/terminal/command_list.html:73 #: terminal/templates/terminal/session_list.html:41 #: terminal/templates/terminal/session_list.html:72 -#: xpack/plugins/change_auth_plan/models.py:65 -#: xpack/plugins/change_auth_plan/models.py:401 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:40 +#: xpack/plugins/change_auth_plan/forms.py:114 +#: xpack/plugins/change_auth_plan/models.py:408 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:46 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:54 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:13 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:14 @@ -179,7 +179,7 @@ msgstr "SSH网关,支持代理SSH,RDP和VNC" #: users/templates/users/user_list.html:23 #: users/templates/users/user_profile.html:51 #: users/templates/users/user_pubkey_update.html:53 -#: xpack/plugins/change_auth_plan/forms.py:84 +#: xpack/plugins/change_auth_plan/forms.py:97 #: xpack/plugins/change_auth_plan/models.py:58 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12 @@ -211,6 +211,13 @@ msgstr "名称" #: users/templates/users/user_detail.html:67 #: users/templates/users/user_list.html:24 #: users/templates/users/user_profile.html:47 +#: xpack/plugins/change_auth_plan/forms.py:99 +#: xpack/plugins/change_auth_plan/models.py:60 +#: xpack/plugins/change_auth_plan/models.py:404 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:53 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:12 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:13 msgid "Username" msgstr "用户名" @@ -232,7 +239,7 @@ msgstr "密码或密钥密码" #: users/templates/users/user_pubkey_update.html:40 #: users/templates/users/user_update.html:20 #: xpack/plugins/change_auth_plan/models.py:90 -#: xpack/plugins/change_auth_plan/models.py:252 +#: xpack/plugins/change_auth_plan/models.py:259 msgid "Password" msgstr "密码" @@ -517,9 +524,7 @@ msgstr "未知" msgid "Latest version" msgstr "最新版本" -#: assets/models/authbook.py:29 -#: assets/templates/assets/asset_asset_user_list.html:49 -#: ops/templates/ops/adhoc_history.html:58 +#: assets/models/authbook.py:29 ops/templates/ops/adhoc_history.html:58 #: ops/templates/ops/adhoc_history_detail.html:57 #: ops/templates/ops/task_adhoc.html:58 ops/templates/ops/task_history.html:64 msgid "Version" @@ -530,12 +535,12 @@ msgid "AuthBook" msgstr "" #: assets/models/base.py:29 xpack/plugins/change_auth_plan/models.py:94 -#: xpack/plugins/change_auth_plan/models.py:259 +#: xpack/plugins/change_auth_plan/models.py:266 msgid "SSH private key" msgstr "ssh密钥" #: assets/models/base.py:30 xpack/plugins/change_auth_plan/models.py:97 -#: xpack/plugins/change_auth_plan/models.py:255 +#: xpack/plugins/change_auth_plan/models.py:262 msgid "SSH public key" msgstr "ssh公钥" @@ -774,7 +779,7 @@ msgstr "手动登录" #: assets/views/label.py:26 assets/views/label.py:43 assets/views/label.py:69 #: assets/views/system_user.py:28 assets/views/system_user.py:44 #: assets/views/system_user.py:60 assets/views/system_user.py:74 -#: templates/_nav.html:19 +#: templates/_nav.html:19 xpack/plugins/change_auth_plan/models.py:65 msgid "Assets" msgstr "资产管理" @@ -948,7 +953,7 @@ msgid "If set id, will use this id update asset existed" msgstr "如果设置了id,则会使用该行信息更新该id的资产" #: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:51 -#: templates/_nav.html:22 +#: templates/_nav.html:22 xpack/plugins/change_auth_plan/views.py:110 msgid "Asset list" msgstr "资产列表" @@ -957,7 +962,7 @@ msgid "Update asset user auth" msgstr "更新资产用户认证信息" #: assets/templates/assets/_asset_user_auth_modal.html:23 -#: xpack/plugins/change_auth_plan/forms.py:88 +#: xpack/plugins/change_auth_plan/forms.py:101 msgid "Please input password" msgstr "请输入密码" @@ -978,7 +983,7 @@ msgstr "如果使用了nat端口映射,请设置为ssh真实监听的端口" #: assets/templates/assets/asset_update.html:21 #: assets/templates/assets/gateway_create_update.html:37 #: perms/templates/perms/asset_permission_create_update.html:38 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:37 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:43 msgid "Basic" msgstr "基本" @@ -1000,7 +1005,7 @@ msgstr "自动生成密钥" #: assets/templates/assets/gateway_create_update.html:53 #: perms/templates/perms/asset_permission_create_update.html:50 #: terminal/templates/terminal/terminal_update.html:40 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:61 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:67 msgid "Other" msgstr "其它" @@ -1031,7 +1036,7 @@ msgstr "其它" #: users/templates/users/user_profile_update.html:63 #: users/templates/users/user_pubkey_update.html:70 #: users/templates/users/user_pubkey_update.html:76 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:65 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:71 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:33 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:35 #: xpack/plugins/interface/templates/interface/interface.html:88 @@ -1068,7 +1073,7 @@ msgstr "重置" #: users/templates/users/user_password_update.html:72 #: users/templates/users/user_profile_update.html:64 #: users/templates/users/user_pubkey_update.html:77 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:66 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:72 #: xpack/plugins/interface/templates/interface/interface.html:89 msgid "Submit" msgstr "提交" @@ -1098,7 +1103,11 @@ msgstr "关闭" #: perms/templates/perms/asset_permission_asset.html:18 #: perms/templates/perms/asset_permission_detail.html:18 #: perms/templates/perms/asset_permission_user.html:18 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:17 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:20 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:17 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:106 +#: xpack/plugins/change_auth_plan/views.py:83 msgid "Detail" msgstr "详情" @@ -1235,7 +1244,7 @@ msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:91 #: perms/templates/perms/asset_permission_asset.html:116 -#: xpack/plugins/change_auth_plan/forms.py:96 +#: xpack/plugins/change_auth_plan/forms.py:109 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:112 msgid "Select nodes" msgstr "选择节点" @@ -1301,6 +1310,10 @@ msgstr "资产用户列表" msgid "Asset users of" msgstr "资产用户" +#: assets/templates/assets/asset_asset_user_list.html:49 +msgid "Password version" +msgstr "密码版本" + #: assets/templates/assets/asset_asset_user_list.html:51 #: assets/templates/assets/cmd_filter_detail.html:73 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109 @@ -1927,7 +1940,7 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:100 audits/templates/audits/login_log_list.html:57 -#: xpack/plugins/change_auth_plan/models.py:405 +#: xpack/plugins/change_auth_plan/models.py:412 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:15 #: xpack/plugins/cloud/models.py:172 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69 @@ -1952,8 +1965,8 @@ msgstr "登录日期" #: ops/templates/ops/task_history.html:58 perms/models.py:34 #: perms/templates/perms/asset_permission_detail.html:86 terminal/models.py:165 #: terminal/templates/terminal/session_list.html:78 -#: xpack/plugins/change_auth_plan/models.py:238 -#: xpack/plugins/change_auth_plan/models.py:408 +#: xpack/plugins/change_auth_plan/models.py:245 +#: xpack/plugins/change_auth_plan/models.py:415 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:59 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:17 msgid "Date start" @@ -2283,8 +2296,8 @@ msgstr "完成时间" #: ops/models/adhoc.py:326 ops/templates/ops/adhoc_history.html:57 #: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:33 -#: xpack/plugins/change_auth_plan/models.py:241 -#: xpack/plugins/change_auth_plan/models.py:411 +#: xpack/plugins/change_auth_plan/models.py:248 +#: xpack/plugins/change_auth_plan/models.py:418 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:58 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:16 msgid "Time" @@ -4740,49 +4753,57 @@ msgstr "MFA 解绑成功,返回登录页面" msgid "Password length" msgstr "密码长度" -#: xpack/plugins/change_auth_plan/forms.py:40 +#: xpack/plugins/change_auth_plan/forms.py:45 +msgid "* For security, please do not change root user's password" +msgstr "* 为了安全,请不要更改root用户的密码" + +#: xpack/plugins/change_auth_plan/forms.py:54 msgid "* Please enter custom password" msgstr "* 请输入自定义密码" -#: xpack/plugins/change_auth_plan/forms.py:50 +#: xpack/plugins/change_auth_plan/forms.py:63 msgid "* Please enter a valid crontab expression" msgstr "* 请输入有效的 crontab 表达式" -#: xpack/plugins/change_auth_plan/forms.py:86 -#: xpack/plugins/change_auth_plan/models.py:60 -#: xpack/plugins/change_auth_plan/models.py:397 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:53 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:12 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:13 -msgid "Asset username" -msgstr "资产用户名" - -#: xpack/plugins/change_auth_plan/forms.py:102 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:54 +#: xpack/plugins/change_auth_plan/forms.py:116 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:60 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:81 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:17 msgid "Periodic perform" msgstr "定时执行" -#: xpack/plugins/change_auth_plan/forms.py:106 +#: xpack/plugins/change_auth_plan/forms.py:120 +msgid "" +"Tips: Currently only unix-like assets are supported, while Windows assets " +"are not" +msgstr "提示:目前仅支持类Unix资产,暂不支持Windows资产" + +#: xpack/plugins/change_auth_plan/forms.py:122 +msgid "" +"Tips: The username of the user on the asset to be modified. if the user " +"exists, change the password; If the user does not exist, create the user." +msgstr "" +"提示:用户名为将要修改的资产上的用户的用户名。如果用户存在,则修改密码;如果" +"用户不存在,则创建用户。" + +#: xpack/plugins/change_auth_plan/forms.py:126 msgid "Tips: (Units: hour)" msgstr "提示:(单位: 时)" -#: xpack/plugins/change_auth_plan/forms.py:107 +#: xpack/plugins/change_auth_plan/forms.py:127 msgid "" -"eg: Every Sunday 03:05 run (5 3 * * 0)
Tips: Using 5 digits linux " -"crontab expressions (Online tools)
Note: If both Regularly perform and " -"Cycle perform are set, give priority to Regularly perform" +"eg: Every Sunday 03:05 run <5 3 * * 0>
Tips: Using 5 digits linux " +"crontab expressions(Online tools)
Note: If both Regularly " +"perform and Cycle perform are set, give priority to Regularly perform" msgstr "" -"eg:每周日 03:05 执行(5 3 * * 0)
提示: 使用5位 Linux crontab 表达式" -"(在线工具)
注" -"意: 如果同时设置了定期执行和周期执行,优先使用定期执行" +"eg:每周日 03:05 执行 <5 3 * * 0>
提示: 使用5位 Linux crontab 表达式 <" +"分 时 日 月 星期> (在线工" +"具)
注意: 如果同时设置了定期执行和周期执行,优先使用定期执行" #: xpack/plugins/change_auth_plan/meta.py:9 #: xpack/plugins/change_auth_plan/models.py:110 -#: xpack/plugins/change_auth_plan/models.py:245 +#: xpack/plugins/change_auth_plan/models.py:252 #: xpack/plugins/change_auth_plan/views.py:31 #: xpack/plugins/change_auth_plan/views.py:47 #: xpack/plugins/change_auth_plan/views.py:68 @@ -4818,7 +4839,7 @@ msgid "Regularly perform" msgstr "定期执行" #: xpack/plugins/change_auth_plan/models.py:83 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:45 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:51 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:16 @@ -4830,34 +4851,35 @@ msgstr "密码策略" msgid "Password rules" msgstr "密码规则" -#: xpack/plugins/change_auth_plan/models.py:249 +#: xpack/plugins/change_auth_plan/models.py:209 +msgid "For security, do not change root user's password" +msgstr "为了安全,禁止更改root用户的密码" + +#: xpack/plugins/change_auth_plan/models.py:212 +msgid "Assets is empty, please add the asset" +msgstr "资产为空,请添加资产" + +#: xpack/plugins/change_auth_plan/models.py:256 msgid "Change auth plan snapshot" msgstr "改密计划快照" -#: xpack/plugins/change_auth_plan/models.py:264 -#: xpack/plugins/change_auth_plan/models.py:415 +#: xpack/plugins/change_auth_plan/models.py:271 +#: xpack/plugins/change_auth_plan/models.py:422 msgid "Change auth plan execution" msgstr "改密计划执行" -#: xpack/plugins/change_auth_plan/models.py:424 +#: xpack/plugins/change_auth_plan/models.py:431 msgid "Change auth plan execution subtask" msgstr "改密计划执行子任务" -#: xpack/plugins/change_auth_plan/models.py:442 +#: xpack/plugins/change_auth_plan/models.py:449 msgid "Authentication failed" msgstr "认证失败" -#: xpack/plugins/change_auth_plan/models.py:444 +#: xpack/plugins/change_auth_plan/models.py:451 msgid "Connection timeout" msgstr "连接超时" -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:17 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:20 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:17 -#: xpack/plugins/change_auth_plan/views.py:83 -msgid "Plan detail" -msgstr "计划详情" - #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:23 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:26 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:23 @@ -4873,13 +4895,19 @@ msgstr "添加资产" msgid "Add node to this plan" msgstr "添加节点" +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:12 +msgid "" +"When the user password on the asset is changed, the action is performed " +"using the admin user associated with the asset" +msgstr "更改资产上的用户密码时,将会使用与该资产关联的管理用户进行操作" + #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:76 msgid "Length" msgstr "长度" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:134 -msgid "Execute plan" -msgstr "执行计划" +msgid "Run plan manually" +msgstr "手动执行计划" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:179 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:101 @@ -4915,10 +4943,6 @@ msgstr "计划列表" msgid "Update plan" msgstr "更新计划" -#: xpack/plugins/change_auth_plan/views.py:110 -msgid "plan asset list" -msgstr "计划资产列表" - #: xpack/plugins/change_auth_plan/views.py:140 msgid "Plan execution task list" msgstr "执行任务列表"