From d5dcab15a8400ddf70b20821bc67f52ad3d4548e Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Wed, 28 Aug 2019 18:41:09 +0800 Subject: [PATCH] Dev v52 (#3171) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] WebTerminal 跳转添加时间戳 * [Update] 修复创建授权规则授权节点时，系统用户不自动推送的问题 * [Update] remote app tree添加 User (#3159) * fix web sftp select all items display (#3162) * [Update] 更新翻译（批量改密） (#3170) * [Update] 更新翻译（批量改密） * [Update] 更新翻译（批量改密）2 --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 79221 -> 79722 bytes apps/locale/zh/LC_MESSAGES/django.po | 591 +++++++++--------- apps/static/plugins/elfinder/elfinder.full.js | 4 +- 3 files changed, 302 insertions(+), 293 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 231f4766d2227fc74a538a4c805010ee4d8be75d..3ec0085d841a1305361f49d7c1ee07de49ae4550 100644 GIT binary patch delta 23664 zcmY-12YgQV+sE;fh(rW2V}=m1_YP|B*51?>dnWeiP3>94rbcZ_5qq!NI;HBwGzx_MszLTc^=Xv$e@8O?*o@*)nW;tAC{2V6}zRc=4s}efS z>B`DFPL~#r(;U0v6g-SWuzpL&`PP?qIFYzpYsVRZukb1kXyZ6%d>p4iTgORFyRi0- z^9%Xn9UUhn`bRlVpyPO)^c2#N2uFX6#H3gOgRl;UU<=HJeK9-EN7m}>H*a7T;sl)> zhrKxASQv9*S!{uYa1Q3ho4z-}}=+V)Rr=VxD7!%=U%!s>Dk0u_qz$aG! z2D1_Sc6T2^1Zu$QsD2$$k6;99!DBEvPC=c(B20*J-8uin6n2u3M=%BcjM~u+p3x{*CAwD$A^>Xtwuq63As0D=f=KOWE;f$iA%7eME z0OrJ|sD>WY%Qgn}X;_6-(5H|4j#NV}yg%v$$C=YGh?LZ#H>eIDF&QT5>wXF{q6RF2sxOD?|GDLxV|L;w)QL_+^`C|LaXIQ8IE(7<`Hg}) zJiz3bEZTjBSx_%i8Pq$_5Hny`493ysOwNOanGP8K96d59raQ^ z#Xx=jUsKSL`}A{FhH^@D@5KKdyA9duFEpC81`Yz@$Oh-HowV^er ziFaCj6t%&NgE)V!0X)T3*TT2NcmS8rd`NlZbF zyVUXTE>IA+; zO|%)c;3KF<_KU@LQRBS8^mKQ8hPf|OM$~}CQ5|bozLD7rHSl=Ufb&rkZ$usGZq!K} zMxD%g)U&^e+Q1{!M&F>uPcU40o_{a}4IGMESwV}-p}vsnp?2ID^+?)V+#NO0Ak@U8 zQT=D37PcI9l0R5{619K}sPV32B7OcJQ_uolp>`7RmAmp_)U(Wj+EG!|PD-Qqgit$d zgqpY`YQZt6_JeQ_dQjt*Wim}%#jKAW?Wi>cP1G4Rz);jmN1%2x5yNm6X2xw;3oqa^ z3>)E|Op1|i{|u-FWI-)B2WtFc=v_EgCvG&7^Up|Op*7rrnTU^KCA?*Ej<5Ocg}5?m z!J|<-nu7X*nT2}!7GQ4Nh+0?hk_>l4z;qisAste z)$jmnfD@>8Kcm{kqjq);^-Ld|Z&3aG$GGi+QT;+t3&?EwJg5bF3R6&r8rGn`*$Ru1 z?}}M*5o)3XsEN;@c5oGSGEYzw{flasaIE{WPKkQ<`Opt5pdN8mWI-OMJq5jNy-*7o zgqmO^s^d4PZ>nXequ-4>p`TC#{*DFlCTc+`$GJPrj+&?ts$Ff=JPj=V5)+2cpP zw$fzIUjuX{p%wQ-eU%Qz?{Omb!je!Lce!DKi9HQ*Qwz{!@MiCV}q)HB|Q`a(N`I>A3s z@5*183`4$g+ee@_Qp7_+1C~RrtQu;k^)Uh)qjomb>PMnFPDUN!T+8oAJ(82C4V}06 zcdNgLTF?vBLK04M7vf1xK@(?1RpdkMqzvj~R~NPO&Q{+G^_CAuEp#zz$IFnP=gxlA zJ9HWKo6sZFg8ZhtU(HET8z_m)<8dle&`z47R`?Za=hIOO+K$QbC~6_`<~7tncTgwv z9E0&S>QfOg!(BjxSq}9xqABWULl5-R=l^R8DM^e&?R-A!i(>=or`;*cf)CBavF=29 zP|vgcPZUgG+w6KR6lc{HlsP^%x0I@u}ctIz)m3L0QFM&f4F0v@9V2%PDjKuXl3 z3da;!05wqs)Wlz+PO2TMT{P-shNDhy6sq4uRJ(=f(Qhd0Db&K_sBgMdv)q?51T|1* z)FaA`+DSc3iLFqNs1K$_59$%jM73LvMR61ACBK7uWKS>^zL~}OYllf^yDw7+s$mAy z1ldpvD2{4Z!K{gzpaJUh-3GPOo~WJ1p!y9#^&5j)=u|9--=g}Rna%lYC09wvr>JL> zV2-=vjHtJ`66(lWnmtfE9gb;n3hHQApg!;0F$}MuCVqznF!5ZsU8MQBhk^!bg?g4f z%?YTJSYfV5Enq8Zr$^1xsD+=!ba)r_E`3DryED)IB{U_bA)g<0vX!wsdYVwkNnti- z$9<@Vw@?k=U=d6*-`zoZ)XUZjH9?Fy40WVqP|r9PwSmQ`4X#49-;N=80C~whPCNyz z_@y=YU~#|#_Zg-@4Uh@7kbJ14Zi8A#U)0Mt02|;W)JCqMKDG%Ky6;3d>Yd4Bmc)em z{8yo%1=K>lJdIFC*%GybeyF1#h8b{*)vrb^>>%oq{EF%yk6Pe0RR3od|6}!uzjfb< z6d1((P8bC(ARlVL5~vBQpX;8(V<=9t{2J6VKY)5S zPM|gzk7@DVV$NS3K9bOiLYKG`XGg_(P|vt9>O@MQ7E~Rz!1|~kLQPTaTcVzEdsMsL zsPBQnsF!jy>LjP39?`NT9=EWSggP9A}y|N*0+31)K0r%1V&pt z7q#Q1s7J5~wa^0?hQ~aXxQ|-VQ&b0^@7x`yKt0=RsGXIyd`;Bnz6EOFUZ@2QN9}l$ z#j{Z-w;Xi>TT$a2#60NviGl`rgBmc=GWQu~!n(wzQ5`3uj&3$;fHkOvZbLnyqo_~K zDXfCGQ7>oixGmrQ0w+>Zr?@bx>bC?NA?^VW^$X zMD1iLYN6{;@6aCf$DdFqbpdsf577H*Lp{>aRh+*%9yQ=>48&Ea_M1=}If7w$5p}|^F(wc4ULOuK8$lK}6 zMok!J9yZTe{Vgm`y|d1pumol!tbzK*?2fr`1ZKrGs0EzDR`{2PLRSj)zjy!Qu^X!p ze?SdTc|Fe;o8cgQihHBsU2TlveVn4ivd9m3>_t}p|eJsDjn&{a_ zflWAxHo3p?#G$@$uApAJmskLUH@iD2XLd&IWEz&l9TzWwb{N8b$-V{aUZ zL-3V8|L-ZJBJpC2dzAiL-LKHHSdn~tb2;WGzKcaL^)`2>)p0uUa_oR5w!1r@kL`$q zcQ{U4?2Fa#Eb50|`knf!=lS=eP>RHA)Ix4xI(&utxFzF!^;0ef2H|IBO|vm3Bi|0S z(>~~n{V@R!LiHPl{x}{3@Ec5`&;J|>fw&y?>^7hV4BG8B%z&!Th8idzrod9D0c)X- zwmv4uFEJzb#56boGvH#>xVupOPoPI1zpE5d;(gT1^$xZ3413(27r~^&HBkdLMGe@~ z^5anh&qj^60`uTz)WUv8eTwd*Ht-K>0e*Wqe^rF+byu7N!-y-P-sTRN9tWWoI0Ln? z6{voDQ3IYq4S3n|k1YQVb<_d-T!XPJaaz=gHrmJecc;*rgeE+RdWP3g1K&pN{26NJ zA5c3@z26-$9CZ?TQ9G@MYF{6tunp$LAF(h#N3{z-;ErFwLqP+U#-dmg^%4$8HJpxm zrVCL!T#tG=_oGhW5^ACMEq;k=?{|MQ#IYN01k?Jk?wk(bxw+@YXn^cZy# zFHsXFIP4CP7WGnvp>~=dwWCPXqpFO0bTv>LXoX9$4{pMgN8ENtP~)61FQUIb|Fp#As@_C3n+VWngIpu(M45#M40EPI^OzzP_SD^TN{KrJ-Y z3HO9^VH)OlDpSzsxVhOD{fIkbCLjJ%fklWXoOBns2NM!M!Yue412M%Z_t|Ge9eF;~ zNtVS?SPyl==P?X#p+_D4PP+?8h8j2x>ZmeeV$6kl7mA_=sEV~&SR+aN-5EVdJ|(D~ z_xXv(;L9%_IGDKTul$t-*CU@ur_fnWlm366rQ2Hy8_x6RR4Ue7ba&7?-krEN>X{Bf zoyZgn!Wozd7oirm3PW)xrpI{H%lO<3xa6KxD5~FQmc~})QTyY;oTjVgDZkQBHU3E{in%NNb$lH1-XosDxVu)3Y zvv{hxz+7!^H4mW%`q{jQdZfQw{XO#~rX%n3o4b$sF$XqHK=d4Mjd5$ zi$|JM%>}4_t1aGP@sH*O%il3ypeFw4>T&#kcN0m?)TkX~#3UGD7C|kvyx9Od6Gx%i zpTX=HkGb$YHpPf*?$7_>Sf2Qrnfbb6o_}j^foG4AYJgf{xo3AZ?ZHCRnTJKTy1a1Uz52T=7VQT6c_Uo#(B{vXuDA1$Bqw)+*H z1=YVIYQj3GaeA8lZgc)>Fw`23w~ATjLUWnbuQj)uN38x=Ou#soupj~_Cmk=Zu=P20!COIi(2Rs)X8o%kD}WBhFa)T zOrpj>fi>F)tBFnEpEoiINpTauMJC3c?;DS}$ zw~BWbCwk;ABqM6&5vZdpgX-55HBdKmpgG#=r^imulPXj#_gT%aR&&kb=dlO#r1I!R z&i>dP^E1?#^-y!QG6$nhcb3H~P=|C71Mrm9pR@cei=SW;>i@NT;wSE}5UEl5uqV6& z8aO`*`I%W8b;_-*VMnvC`IR{dwZ*ySI?L}vZS0iAx6S9~2h{jMf7*9Y%0Jyi7EDS- z4%C8*S-uKt#h;ta%qTM&HK4~Fi}Q%5Se)~z+rNNW2GzcXhe9xgx|V2zny8Z*gL)Jr z%!Q~Qlsj-fzCg8~^2{A@zPS{YUyZ@I)#4vfKOoPdUMo-1=WfGr)KM0~LRi`2ein~I zt$2sI-#m&b$e+QicpWv4&kJ|l)Tl4Ttf>AGm>lyV?~up&%qps*R$Ry8mKaXl-tuEn zFI_Cw#cweeKEXT~@|WAcqFDzuVN0_;s()9jkMYX$A7KrqSj9|>m!fvI8r5-^<&U5i zddlKU7GFoTdu;w~_0CIoApvGG)XSMhvA%-}P|$$I%}SV)xGw7Jd!XePnrl$cbeqLT zQ9C_n@f8duzK5D9;VZX3GwP%wQ1jJ8PhtwKtU(v6=#6^mhM~T^=30I`YT_fP3D2XR z`BhAb|Dpy?{~a~Hus}G&!@2`c6#G} ze9ohG_RxH8{$qZ`iq!kRbtkNWYTwx6FFls%YKcDPaLZ3Lr(-cX&b9aq>Wk_;Y9}|% zr{;UqM1k+z9VbUUs&Le&sw%3Vrz-_D9Dq8S;W!DWVH3>s-u?W>pdQUY^J~Wq3sea(@WhIqQU z3N`UwOozXi4=nHd!5ue^SDt@1OB6&cpe$y<$`-e_`Y1CR^~K|{cr|KaTQL#txBPMQ z0%}1wEq-PCeqN7e%-hL72iJ+o{CB8)MtS4$gvoRGeL!HcabD!1!Xz^L|GHRiJn17l6K0e+B zr8je<#*6gv@pwB_Afad25cSNunqQj>%q^&eok2}>#o{NZ0pFs&IemP6yeE;{ENXs+ zA=Fn#onUKUk2_#{5|v2wMt$XOMokotn&>v_NMEBC7?8j<481!+ZJ+|GUlYrBFuS3~ z>5F<~qb;80p-_v&YE;L+OvlfSlVT3?87!`d8mJCxLG3K=YxSee=~$lnMW_W{v-}WgO?YTRS49_PF@ zxPjWyOVk4V{N0XWs18L@M_<9>=BSsm6RO`3)FYUP`lefg>URj$?`MnequRgn#vXn= z2DlTZGz*}1Sj()B8mO5WW%+1}2cvd4*5Y~QO4Neltp0@Me?z^b4=^+HJ1G*mD=vgu zSp(FB?NJ}k-l&&y7HVO;P|xn5dCI(CUPtwRfLhq!sD6Qg?#q`PmCuUazd;tGpbq6w z-(a7kCTL{&)|i>NyTubx1I|GWv14Q{}NXeHBJ-M_-)OesQyC|^Z8eU zk(QW*dR8+mUWb}sGim`pT6`Nd;A_;0`31QHrbfjXEzXN-SH$A-7FRPH2HEGoEeTE3 z(;Q*Onk&tns7G-cwb18g;w0_@!%+*UWHvC{quNKKc0LJ5;S3K2tuQ31YdESwA=Jr~ zL=9LG^&MUx)qXr`!Lv|56IP=pIEQ-a9;3$bP3E=_G(%AJ;ie~&f*RH}o0zT4j;M*c zqZag)<;R=fpcXXSTxM=G_nIeB+hMD8c8RoaB zlUa>g*bdaE<&eeq%@^i-)JFZ2`*?plPKw_D29cM7_a!mQn_r+-+}z?G77sQjTYfQW zA>X4W*kk#_<}c>&=0nt@daYQW|Kus$i9%5og|G_NL@jJ8YJvq8ud{duYQp2Fem`Ru zyl-*+ly1HoYMfE1lbUAneDwa`Ag!{*26H!R=f^F+YTh?rnZBvq0fSK!q(?0%hsF6Z zA#rKTS1_xi9&MdeeE!w3ISK8s6KW>|P%HfgRX-0k@Je$%>gV?si+7;f@5f|#!t$5Q z>*ih5cu!EDg14#o{QFTzp4zQQgW7pEvp8x&HOzLX0fw04Q0-@$t56HwW${5&`}3%A zZdm-*>H|D!e7t`t&wv^z+8l%Yo3u06;)x;dK;NQvy4KSx14%!aAbdG$CY zDClUKo6)F=C!vmRHR@!xqE>v|;&}89i29W(ReB%qf04_M`dLv0Ro?+M;be<{z-q*o zFp_`&bh2dd@&0cRnqyNcW}qg1h_msv<)>zJ7kbzHh^kM=e<#!een5RiAHe+ThdP0X zQ1@l4jv>UYuq^h&7=8XXQP6KZ5t-dbQ4zJ{`lyrXXz_5XpN1M}3D&^vSQVWt?k^VA zQ13`D)T0@M+K>l(<7E61-=jxIeJISw`!}EKn2$JlR`<8z&rnA-0*m7@Y>fZnXV@^C zdjiw35pk|?AMgLk@NjHS{0Fwc(%F5SFK`w%!<$$J%S7<`S7Bg;yW==aO?(vfFPB%% zC#ao#MD4^shifV`3{{^W^@URm_5D!V^5sxpI8`mKhdSY=IXv!Bbt5r^L_Z9|r`GTt z>L`74x+Xz&3_(qp+wz4hUmErD)kb})dYHpd3!jYYKhNUtJ=S0+>QS7q26s^dy+L(M zm&<*LB2e#28C1Th+0pEadfUIUc&WL;+-)8=Jr^iwMK@6|+bgR`mfMXpqUwvGUb^b2 ziCdf9Q9B)E@py9<>g2vNzsCy1+fXO>8XNLXIv*%#f(CiqiYT)OYN8la{Rq@Vv6u*# zp(gkq^~|@SK8AbnD?Edx@Qb{zV^HJmGf!c#KL3{}l&0c7YNGIb?!YBb6IL+mp?+wz zwRiw(0b?zmW-h@<@*7bTJ~UsWz8C!RyWa~%(EIbh5d}@u4mCkvi^rLBP!p{}EpQWt z;t|vYH!c4ZD--(`a8I%ts$Xr?r=cmTeM`%CLGRE1XsZ}(jzvAASaZI))Ld=;fLi!A z)WVM9V7!d_Vry8?o%kGTA@QgM+(3>0XF)#yg($ot5rH`h`FQ^qGGCy+I0oT#Jcq|H zs<4mu?|u1;xZiw}P+z6zQ9Ddg)cqn#gZh+oLml~8)B?9y{+PwLit_o_ivA{{6(uO< zni%7>B&g zq6RKtaS`+mg!;GKYN!EQAnS4_`s&X!{O4SJrjB-Xpxlb`uQW=)Z#H#^XK}}<6IUed zb!ErI(Qg4`XCYpJdXH*yPoW&aVy4okV**~&ZX^>CG@#-c_bEE++KhL|XLUoT z6Xl}RHzeO$?YOgYpCE2Vn|R7SC=cW2OVr_AbyjlEAU_CoHK1;ml@wm`M#~sRQXJZTQb5>V?cJI0Q9m82bt}^!stJ4^~`;w3^HOPCgs(H=IOeam~)v#u}>pijMPf2KQw032pHF z=2D!dGJV@KPA;rWn2($vTFjPvp)?wQ>QB(AqQm)6{nEG?vx;irOc^mv298RXPJ2_oXx$~3%i#w3I?`?oT%?xIF>i@fvv-m6YPo)XCb5r+% z`!m{pW8+S-_TPHX-+I>lZv>3xK5mWs(O5rh8gS3z)|HLHz97HT26{%@U&zg&t~~c1 z%3alvYpxc-9ZfEf#qnGD|1QsRf_9%IRI`(Y|6R?gOJ~7k^8XMYw|ald^C;is{)RRo z#6xf@i)v3U3$ZT!Qge^;_uhzh)E8wTrS$x(QjyInQc~VXWhIOAVI2n2rJsVj&eA5C z<^HwZZz4C!t#(FGzHas7%^TKEO}db~%FVz2ITiK%za&`8{epWY_jfe9g)eCk%qmlJ z>#D*aQRH=X)(=Iu86n!Gee|i-r zca&Rye{k+lGmhXsjdk6ne1vj2>K;?(_e!TK@jq_0_n+DMXF}?J#qH{A6Zq1uB#Y9o z=$FYSC*O;5F3P%^S-XP7Z}t7t!6uENvNXvt#INvA;sVww37wV@U*mpg?f2ts>ixI} zSi6GM>l#R1Df*13T+=2jMsAt4+vRP=!u9>%h9HMEQhuUU?x*p2%Ln0T@)6{Mt-cqz z_1sylO_oSjxZ3K<7BHDz6m7$5};m_WH6b-5|)nnV3c?p5U4+CqLdeeel&6>N+$`qzZ* zbgDtcU*7KSKVE-QE^VEann}k122RXfiTtm``a{Dnls_k@>jULQHo+g{rc*vbJ|*Q4 zY(w1L+IHjLKb%%{NWtBXwKlJ={<+ni!VtO~_e89_AzK3NPtOSEpw*kgc)|JC1 zaU*{6kq;vXu*4wzlQvh#-=e(E`l;GGe=kcMW8kMW)Og8Q$O;P0sLM;a8vaK9J4}iT zX!{lQQ?NDnAKbcrAh(+G3ho!gF~ljkyLfBqPx%h_0pgna{jW5GU!d_p64@z#di5jd z#Dr()kcc{e?r_Qjx#x0UqF)Bu{EJ~4hqk)DQm^YUp0wO;+^*-ZD>EHu zS?6@7^4qwZ67R%5n8_Bnih)`(z|Y(lH-%t5D`ANhDxR+AaH673D zyFVKR{W)zkm49>ZBQA(-)r#vFt}7<7QEc#Pm&u< z;wEkT5C>RWPZ5&6sT@UOFJ=DN`M+xlrQe8eQ~$;Wy-hALxe45j$qk|3dhR6T%h{mY zY>W(cTH}b<|8G=&ktMFoJy<{gpHorXDql0;eC{WoG%ilVGz=Wd-ODCeK>cdU^DMq( z-lcC7+WRo^GSt<@>VBuLtK|lf>rJ_Vo_|X!hPiE>M;OW7od!`f$U$9d8{j;?qizDZ zSjt~fzt8&l69+M={s2|bCRt^5Td=K-@dI@&xl3@jCKt%xADjaWsOu(oQ{wat^t(Dx zE(Rk}*E`znva;gYlzZY}OrbjN1e716uFQ;)$u0iBe-8Suo~&o11vPAiU2KAfRBpB0 zJj!#($I*5XHYP5FWr+J)e^Sm-a=%$z9xIRwRE1p~sDEkYA1QNroC6e2Q|iQICA~TK zA0LSSrZ~iH=$xnAkU>}A818f2f7k*kI=^%0waFFlrJRkEtVREYluOd~2=@}}6XexC z|LQQ5djpNX3xhHY^GFV5e;ZOA5>oTsg0Ryo=*+LBR8Ts6lt5E**(hHs4 z+W$huLCPO3R=dxv{FB?y;}juLouC$#h1G)V40mQ0Q<(hM)ThB8$W_D>_=cQ6!s%!~;-QHp)Y3`wqJk2UA|6-~aj${LGz%ibo`Mb#QUY()ljs zt>hQmKpSYM>vQ7L*qQqe?t#R2Xy=OyxtDP3T12jp_321%k(+idlKWimUuUbVVHG*) zFo1iU#iy+`|@=8uJhzwzx0#HEH)Aw{q7aU)<`-((Vg#wedb}(vx39 z`5Vf?+<#N&-Txj6pOZ-W$!h1)I5+nu?y5BV5wlP~k#@RH5Er9di1K8tW%=|N&v-Mu zgY)G@yN0wWZ?XDr(m%MC(l$!xUyi#r!BZM<=GL{GI2m^U9cyzhrd)%%kKE_DhjS;S z-H+tMD9=Y-3r&?L(k}~jYi;uTy?BVuL$k<{#p?7q2REK{58^=1wHS07WqhHTH{RYRK9$6_#od49U34?NkRqWWa zYp=#JQPFW(V`CBph2;pV*(;`ByIvil;-)Ov9vaX&x_AFRQ61wd?hH#7H~d(w1in4` z#~wa8BTQv?=v9;pEa?Brn=ZCTPmW*WKZsEbK{dab)ygzx=odsLm zRo~t_C3aAJ)y(&Q*nWRs?424J_||`*ZO_h zguyKA-iD?3rj5NfbM@Wv+qd`f@i`q3NcPT#MYs1&+Fmr!r$WZSy9?Le89(;k?$O($ Zv-^Z3-9ERl&&mY8BlgTGTihq|{{S}6gJ}Q& delta 23278 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 1ab0df5d2..8a804450c 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-08-07 16:56+0800\n" +"POT-Creation-Date: 2019-08-28 18:19+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -76,7 +76,7 @@ msgstr "运行参数" #: applications/templates/applications/remote_app_list.html:22 #: applications/templates/applications/user_remote_app_list.html:18 #: assets/forms/domain.py:15 assets/forms/label.py:13 -#: assets/models/asset.py:318 assets/models/authbook.py:24 +#: assets/models/asset.py:295 assets/models/authbook.py:24 #: assets/serializers/admin_user.py:32 assets/serializers/asset_user.py:81 #: assets/serializers/system_user.py:31 #: assets/templates/assets/admin_user_list.html:46 @@ -95,8 +95,8 @@ msgstr "运行参数" #: terminal/templates/terminal/command_list.html:66 #: terminal/templates/terminal/session_list.html:28 #: terminal/templates/terminal/session_list.html:72 -#: xpack/plugins/change_auth_plan/forms.py:115 -#: xpack/plugins/change_auth_plan/models.py:413 +#: xpack/plugins/change_auth_plan/forms.py:64 +#: xpack/plugins/change_auth_plan/models.py:416 #: 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 @@ -112,11 +112,11 @@ msgstr "资产" #: applications/templates/applications/remote_app_detail.html:61 #: applications/templates/applications/remote_app_list.html:23 #: applications/templates/applications/user_remote_app_list.html:19 -#: assets/models/user.py:166 assets/templates/assets/user_asset_list.html:52 +#: assets/models/user.py:168 assets/templates/assets/user_asset_list.html:53 #: audits/models.py:20 audits/templates/audits/ftp_log_list.html:49 #: audits/templates/audits/ftp_log_list.html:72 #: perms/forms/asset_permission.py:75 perms/models/asset_permission.py:80 -#: perms/models/asset_permission.py:114 +#: perms/models/asset_permission.py:115 #: perms/templates/perms/asset_permission_detail.html:140 #: perms/templates/perms/asset_permission_list.html:54 #: perms/templates/perms/asset_permission_list.html:75 @@ -126,7 +126,7 @@ msgstr "资产" #: terminal/templates/terminal/command_list.html:67 #: terminal/templates/terminal/session_list.html:29 #: terminal/templates/terminal/session_list.html:73 -#: users/templates/users/_granted_assets.html:26 +#: users/templates/users/_granted_assets.html:27 #: xpack/plugins/orgs/templates/orgs/org_list.html:19 msgid "System user" msgstr "系统用户" @@ -150,7 +150,7 @@ msgstr "系统用户" #: assets/templates/assets/system_user_detail.html:58 #: assets/templates/assets/system_user_list.html:51 ops/models/adhoc.py:37 #: ops/templates/ops/task_detail.html:60 ops/templates/ops/task_list.html:27 -#: orgs/models.py:11 perms/models/base.py:35 +#: orgs/models.py:11 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 @@ -167,15 +167,15 @@ msgstr "系统用户" #: settings/templates/settings/terminal_setting.html:105 terminal/models.py:22 #: terminal/models.py:258 terminal/templates/terminal/terminal_detail.html:43 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14 -#: users/models/user.py:331 users/templates/users/_select_user_modal.html:13 +#: users/models/user.py:330 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 #: users/templates/users/user_profile.html:51 #: users/templates/users/user_pubkey_update.html:57 -#: xpack/plugins/change_auth_plan/forms.py:98 -#: xpack/plugins/change_auth_plan/models.py:61 +#: xpack/plugins/change_auth_plan/forms.py:47 +#: xpack/plugins/change_auth_plan/models.py:64 #: 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 #: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:144 @@ -206,7 +206,7 @@ msgstr "参数" #: applications/models/remote_app.py:43 #: applications/templates/applications/remote_app_detail.html:77 -#: assets/models/asset.py:197 assets/models/base.py:36 +#: assets/models/asset.py:174 assets/models/base.py:36 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:25 #: assets/models/cmd_filter.py:58 assets/models/group.py:21 #: assets/templates/assets/admin_user_detail.html:68 @@ -215,12 +215,12 @@ msgstr "参数" #: assets/templates/assets/domain_detail.html:72 #: assets/templates/assets/system_user_detail.html:100 #: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:14 -#: perms/models/asset_permission.py:117 perms/models/base.py:41 +#: perms/models/asset_permission.py:118 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:372 users/serializers/v1.py:119 +#: users/models/user.py:371 users/serializers/v1.py:119 #: users/templates/users/user_detail.html:111 -#: xpack/plugins/change_auth_plan/models.py:106 +#: 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 msgid "Created by" @@ -230,7 +230,7 @@ msgstr "创建者" # msgstr "创建者" #: applications/models/remote_app.py:46 #: applications/templates/applications/remote_app_detail.html:73 -#: assets/models/asset.py:198 assets/models/base.py:34 +#: assets/models/asset.py:175 assets/models/base.py:34 #: assets/models/cluster.py:26 assets/models/domain.py:23 #: assets/models/group.py:22 assets/models/label.py:25 #: assets/templates/assets/admin_user_detail.html:64 @@ -238,8 +238,8 @@ msgstr "创建者" #: assets/templates/assets/domain_detail.html:68 #: assets/templates/assets/system_user_detail.html:96 #: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:64 -#: orgs/models.py:15 perms/models/asset_permission.py:118 -#: perms/models/base.py:42 +#: orgs/models.py:15 perms/models/asset_permission.py:119 +#: perms/models/base.py:55 #: perms/templates/perms/asset_permission_detail.html:94 #: perms/templates/perms/remote_app_permission_detail.html:86 #: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17 @@ -258,7 +258,7 @@ msgstr "创建日期" #: applications/templates/applications/remote_app_detail.html:81 #: applications/templates/applications/remote_app_list.html:24 #: applications/templates/applications/user_remote_app_list.html:20 -#: assets/models/asset.py:199 assets/models/base.py:33 +#: assets/models/asset.py:176 assets/models/base.py:33 #: assets/models/cluster.py:29 assets/models/cmd_filter.py:22 #: assets/models/cmd_filter.py:55 assets/models/domain.py:21 #: assets/models/domain.py:53 assets/models/group.py:23 @@ -273,17 +273,17 @@ msgstr "创建日期" #: assets/templates/assets/domain_list.html:28 #: assets/templates/assets/system_user_detail.html:104 #: assets/templates/assets/system_user_list.html:59 ops/models/adhoc.py:43 -#: orgs/models.py:16 perms/models/asset_permission.py:119 -#: perms/models/base.py:43 +#: orgs/models.py:16 perms/models/asset_permission.py:120 +#: perms/models/base.py:56 #: perms/templates/perms/asset_permission_detail.html:102 #: perms/templates/perms/remote_app_permission_detail.html:94 #: settings/models.py:34 terminal/models.py:32 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15 -#: users/models/user.py:364 users/templates/users/user_detail.html:129 +#: users/models/user.py:363 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 -#: xpack/plugins/change_auth_plan/models.py:102 +#: xpack/plugins/change_auth_plan/models.py:105 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19 #: xpack/plugins/cloud/models.py:77 xpack/plugins/cloud/models.py:173 @@ -404,7 +404,7 @@ msgstr "提交" #: 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:88 +#: xpack/plugins/change_auth_plan/views.py:91 msgid "Detail" msgstr "详情" @@ -416,7 +416,7 @@ msgstr "详情" #: assets/templates/assets/admin_user_list.html:111 #: assets/templates/assets/asset_detail.html:27 #: assets/templates/assets/asset_list.html:78 -#: assets/templates/assets/asset_list.html:168 +#: assets/templates/assets/asset_list.html:167 #: assets/templates/assets/cmd_filter_detail.html:29 #: assets/templates/assets/cmd_filter_list.html:58 #: assets/templates/assets/cmd_filter_rule_list.html:86 @@ -460,7 +460,7 @@ msgstr "更新" #: assets/templates/assets/admin_user_detail.html:28 #: assets/templates/assets/admin_user_list.html:112 #: assets/templates/assets/asset_detail.html:31 -#: assets/templates/assets/asset_list.html:169 +#: assets/templates/assets/asset_list.html:168 #: assets/templates/assets/cmd_filter_detail.html:33 #: assets/templates/assets/cmd_filter_list.html:59 #: assets/templates/assets/cmd_filter_rule_list.html:87 @@ -540,7 +540,7 @@ msgstr "创建远程应用" #: settings/templates/settings/terminal_setting.html:107 #: terminal/templates/terminal/session_list.html:36 #: terminal/templates/terminal/terminal_list.html:36 -#: users/templates/users/_granted_assets.html:28 +#: users/templates/users/_granted_assets.html:29 #: users/templates/users/user_group_list.html:38 #: users/templates/users/user_list.html:41 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60 @@ -554,7 +554,7 @@ msgid "Action" msgstr "动作" #: applications/templates/applications/user_remote_app_list.html:57 -#: assets/templates/assets/user_asset_list.html:31 +#: assets/templates/assets/user_asset_list.html:32 #: perms/models/asset_permission.py:30 msgid "Connect" msgstr "连接" @@ -581,20 +581,20 @@ msgstr "远程应用详情" msgid "My RemoteApp" msgstr "我的远程应用" -#: assets/api/asset.py:42 +#: assets/api/asset.py:40 #, python-format msgid "%(hostname)s was %(action)s successfully" msgstr "%(hostname)s %(action)s成功" -#: assets/api/node.py:61 +#: assets/api/node.py:58 msgid "You can't update the root node name" msgstr "不能修改根节点名称" -#: assets/api/node.py:283 +#: assets/api/node.py:266 msgid "Update node asset hardware information: {}" msgstr "更新节点资产硬件信息: {}" -#: assets/api/node.py:297 +#: assets/api/node.py:280 msgid "Test if the assets under the node are connectable: {}" msgstr "测试节点下资产是否可连接: {}" @@ -612,23 +612,23 @@ msgstr "可连接" msgid "Unknown" msgstr "未知" -#: assets/forms/asset.py:24 assets/models/asset.py:163 +#: assets/forms/asset.py:24 assets/models/asset.py:140 #: assets/models/domain.py:50 #: assets/templates/assets/domain_gateway_list.html:69 #: settings/templates/settings/replay_storage_create.html:59 msgid "Port" msgstr "端口" -#: assets/forms/asset.py:45 assets/models/asset.py:168 +#: assets/forms/asset.py:50 assets/models/asset.py:145 #: assets/models/user.py:110 assets/templates/assets/asset_detail.html:190 #: assets/templates/assets/asset_detail.html:198 #: assets/templates/assets/system_user_assets.html:83 #: perms/models/asset_permission.py:79 -#: xpack/plugins/change_auth_plan/models.py:72 +#: xpack/plugins/change_auth_plan/models.py:75 msgid "Nodes" msgstr "节点" -#: assets/forms/asset.py:48 assets/forms/asset.py:83 assets/models/asset.py:172 +#: assets/forms/asset.py:53 assets/forms/asset.py:99 assets/models/asset.py:149 #: assets/models/cluster.py:19 assets/models/user.py:68 #: assets/templates/assets/asset_detail.html:76 templates/_nav.html:24 #: xpack/plugins/cloud/models.py:161 @@ -637,7 +637,7 @@ msgstr "节点" msgid "Admin user" msgstr "管理用户" -#: assets/forms/asset.py:51 assets/forms/asset.py:86 assets/forms/asset.py:125 +#: assets/forms/asset.py:56 assets/forms/asset.py:102 assets/forms/asset.py:141 #: assets/templates/assets/asset_create.html:48 #: assets/templates/assets/asset_create.html:50 #: assets/templates/assets/asset_list.html:85 @@ -645,23 +645,23 @@ msgstr "管理用户" msgid "Label" msgstr "标签" -#: assets/forms/asset.py:54 assets/forms/asset.py:89 assets/models/asset.py:167 -#: assets/models/domain.py:26 assets/models/domain.py:52 -#: assets/templates/assets/asset_detail.html:80 -#: assets/templates/assets/user_asset_list.html:53 +#: assets/forms/asset.py:59 assets/forms/asset.py:105 +#: assets/models/asset.py:144 assets/models/domain.py:26 +#: assets/models/domain.py:52 assets/templates/assets/asset_detail.html:80 +#: assets/templates/assets/user_asset_list.html:54 #: xpack/plugins/orgs/templates/orgs/org_list.html:17 msgid "Domain" msgstr "网域" -#: assets/forms/asset.py:58 assets/forms/asset.py:80 assets/forms/asset.py:93 -#: assets/forms/asset.py:128 assets/models/node.py:254 +#: assets/forms/asset.py:63 assets/forms/asset.py:96 assets/forms/asset.py:109 +#: assets/forms/asset.py:144 assets/models/node.py:369 #: assets/templates/assets/asset_create.html:42 #: perms/forms/asset_permission.py:72 perms/forms/asset_permission.py:79 -#: perms/models/asset_permission.py:112 +#: perms/models/asset_permission.py:113 #: perms/templates/perms/asset_permission_list.html:53 #: perms/templates/perms/asset_permission_list.html:74 #: perms/templates/perms/asset_permission_list.html:124 -#: xpack/plugins/change_auth_plan/forms.py:116 +#: xpack/plugins/change_auth_plan/forms.py:65 #: 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:157 @@ -670,7 +670,7 @@ msgstr "网域" msgid "Node" msgstr "节点" -#: assets/forms/asset.py:62 assets/forms/asset.py:97 +#: assets/forms/asset.py:67 assets/forms/asset.py:113 msgid "" "root or other NOPASSWD sudo privilege user existed in asset,If asset is " "windows or other set any one, more see admin user left menu" @@ -678,20 +678,20 @@ msgstr "" "root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一" "个, 更多信息查看左侧 `管理用户` 菜单" -#: assets/forms/asset.py:65 assets/forms/asset.py:100 +#: assets/forms/asset.py:70 assets/forms/asset.py:116 msgid "Windows 2016 RDP protocol is different, If is window 2016, set it" msgstr "Windows 2016的RDP协议与之前不同，如果是请设置" -#: assets/forms/asset.py:66 assets/forms/asset.py:101 +#: assets/forms/asset.py:71 assets/forms/asset.py:117 msgid "" "If your have some network not connect with each other, you can set domain" msgstr "如果有多个的互相隔离的网络，设置资产属于的网域，使用网域网关跳转登录" -#: assets/forms/asset.py:108 assets/forms/asset.py:112 +#: assets/forms/asset.py:124 assets/forms/asset.py:128 #: assets/forms/domain.py:17 assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:78 -#: xpack/plugins/change_auth_plan/forms.py:106 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:84 +#: xpack/plugins/change_auth_plan/forms.py:55 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:74 msgid "Select assets" msgstr "选择资产" @@ -724,13 +724,13 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: 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:37 users/forms.py:14 -#: users/models/user.py:329 users/templates/users/_select_user_modal.html:14 +#: users/models/user.py:328 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:100 -#: xpack/plugins/change_auth_plan/models.py:63 -#: xpack/plugins/change_auth_plan/models.py:409 +#: xpack/plugins/change_auth_plan/forms.py:49 +#: xpack/plugins/change_auth_plan/models.py:66 +#: xpack/plugins/change_auth_plan/models.py:412 #: 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 @@ -756,14 +756,14 @@ msgstr "密码或密钥密码" #: users/templates/users/user_profile_update.html:41 #: users/templates/users/user_pubkey_update.html:41 #: users/templates/users/user_update.html:20 -#: xpack/plugins/change_auth_plan/models.py:93 -#: xpack/plugins/change_auth_plan/models.py:264 +#: xpack/plugins/change_auth_plan/models.py:96 +#: xpack/plugins/change_auth_plan/models.py:267 msgid "Password" msgstr "密码" #: assets/forms/user.py:29 assets/serializers/asset_user.py:70 #: assets/templates/assets/_asset_user_auth_update_modal.html:27 -#: users/models/user.py:358 +#: users/models/user.py:357 msgid "Private key" msgstr "ssh私钥" @@ -803,37 +803,37 @@ msgstr "如果选择手动登录模式，用户名和密码可以不填写" msgid "Use comma split multi command, ex: /bin/whoami,/bin/ifconfig" msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig" -#: assets/models/asset.py:158 assets/models/domain.py:49 +#: assets/models/asset.py:135 assets/models/domain.py:49 #: assets/serializers/asset_user.py:28 #: assets/templates/assets/_asset_list_modal.html:46 #: assets/templates/assets/_asset_user_list.html:15 #: assets/templates/assets/asset_detail.html:64 #: assets/templates/assets/asset_list.html:97 #: assets/templates/assets/domain_gateway_list.html:68 -#: assets/templates/assets/user_asset_list.html:49 +#: assets/templates/assets/user_asset_list.html:50 #: audits/templates/audits/login_log_list.html:54 #: perms/templates/perms/asset_permission_asset.html:58 settings/forms.py:140 -#: users/templates/users/_granted_assets.html:25 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:51 +#: users/templates/users/_granted_assets.html:26 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:54 msgid "IP" msgstr "IP" -#: assets/models/asset.py:159 assets/serializers/asset_user.py:27 +#: assets/models/asset.py:136 assets/serializers/asset_user.py:27 #: assets/templates/assets/_asset_list_modal.html:45 #: assets/templates/assets/_asset_user_auth_update_modal.html:9 #: assets/templates/assets/_asset_user_auth_view_modal.html:15 #: assets/templates/assets/_asset_user_list.html:14 #: assets/templates/assets/asset_detail.html:60 #: assets/templates/assets/asset_list.html:96 -#: assets/templates/assets/user_asset_list.html:48 +#: assets/templates/assets/user_asset_list.html:49 #: perms/templates/perms/asset_permission_asset.html:57 #: perms/templates/perms/asset_permission_list.html:73 settings/forms.py:139 -#: users/templates/users/_granted_assets.html:24 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:50 +#: users/templates/users/_granted_assets.html:25 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:53 msgid "Hostname" msgstr "主机名" -#: assets/models/asset.py:162 assets/models/domain.py:51 +#: assets/models/asset.py:139 assets/models/domain.py:51 #: assets/models/user.py:113 assets/templates/assets/asset_detail.html:72 #: assets/templates/assets/domain_gateway_list.html:70 #: assets/templates/assets/system_user_detail.html:70 @@ -842,91 +842,91 @@ msgstr "主机名" msgid "Protocol" msgstr "协议" -#: assets/models/asset.py:165 assets/serializers/asset.py:63 +#: assets/models/asset.py:142 assets/serializers/asset.py:63 #: assets/templates/assets/asset_create.html:24 -#: assets/templates/assets/user_asset_list.html:50 +#: assets/templates/assets/user_asset_list.html:51 #: perms/serializers/user_permission.py:38 msgid "Protocols" msgstr "协议组" -#: assets/models/asset.py:166 assets/templates/assets/asset_detail.html:104 -#: assets/templates/assets/user_asset_list.html:51 +#: assets/models/asset.py:143 assets/templates/assets/asset_detail.html:104 +#: assets/templates/assets/user_asset_list.html:52 msgid "Platform" msgstr "系统平台" -#: assets/models/asset.py:169 assets/models/cmd_filter.py:21 +#: assets/models/asset.py:146 assets/models/cmd_filter.py:21 #: assets/models/domain.py:54 assets/models/label.py:22 #: assets/templates/assets/asset_detail.html:112 msgid "Is active" msgstr "激活" -#: assets/models/asset.py:175 assets/templates/assets/asset_detail.html:68 +#: assets/models/asset.py:152 assets/templates/assets/asset_detail.html:68 msgid "Public IP" msgstr "公网IP" -#: assets/models/asset.py:176 assets/templates/assets/asset_detail.html:120 +#: assets/models/asset.py:153 assets/templates/assets/asset_detail.html:120 msgid "Asset number" msgstr "资产编号" -#: assets/models/asset.py:179 assets/templates/assets/asset_detail.html:84 +#: assets/models/asset.py:156 assets/templates/assets/asset_detail.html:84 msgid "Vendor" msgstr "制造商" -#: assets/models/asset.py:180 assets/templates/assets/asset_detail.html:88 +#: assets/models/asset.py:157 assets/templates/assets/asset_detail.html:88 msgid "Model" msgstr "型号" -#: assets/models/asset.py:181 assets/templates/assets/asset_detail.html:116 +#: assets/models/asset.py:158 assets/templates/assets/asset_detail.html:116 msgid "Serial number" msgstr "序列号" -#: assets/models/asset.py:183 +#: assets/models/asset.py:160 msgid "CPU model" msgstr "CPU型号" -#: assets/models/asset.py:184 +#: assets/models/asset.py:161 #: xpack/plugins/license/templates/license/license_detail.html:80 msgid "CPU count" msgstr "CPU数量" -#: assets/models/asset.py:185 +#: assets/models/asset.py:162 msgid "CPU cores" msgstr "CPU核数" -#: assets/models/asset.py:186 +#: assets/models/asset.py:163 msgid "CPU vcpus" msgstr "CPU总数" -#: assets/models/asset.py:187 assets/templates/assets/asset_detail.html:96 +#: assets/models/asset.py:164 assets/templates/assets/asset_detail.html:96 msgid "Memory" msgstr "内存" -#: assets/models/asset.py:188 +#: assets/models/asset.py:165 msgid "Disk total" msgstr "硬盘大小" -#: assets/models/asset.py:189 +#: assets/models/asset.py:166 msgid "Disk info" msgstr "硬盘信息" -#: assets/models/asset.py:191 assets/templates/assets/asset_detail.html:108 +#: assets/models/asset.py:168 assets/templates/assets/asset_detail.html:108 msgid "OS" msgstr "操作系统" -#: assets/models/asset.py:192 +#: assets/models/asset.py:169 msgid "OS version" msgstr "系统版本" -#: assets/models/asset.py:193 +#: assets/models/asset.py:170 msgid "OS arch" msgstr "系统架构" -#: assets/models/asset.py:194 +#: assets/models/asset.py:171 msgid "Hostname raw" msgstr "主机名原始" -#: assets/models/asset.py:196 assets/templates/assets/asset_create.html:46 -#: assets/templates/assets/asset_detail.html:227 templates/_nav.html:26 +#: assets/models/asset.py:173 assets/templates/assets/asset_create.html:46 +#: assets/templates/assets/asset_detail.html:224 templates/_nav.html:26 msgid "Labels" msgstr "标签管理" @@ -946,13 +946,13 @@ msgstr "版本" msgid "AuthBook" msgstr "" -#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:97 -#: xpack/plugins/change_auth_plan/models.py:271 +#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:100 +#: xpack/plugins/change_auth_plan/models.py:274 msgid "SSH private key" msgstr "ssh密钥" -#: assets/models/base.py:32 xpack/plugins/change_auth_plan/models.py:100 -#: xpack/plugins/change_auth_plan/models.py:267 +#: assets/models/base.py:32 xpack/plugins/change_auth_plan/models.py:103 +#: xpack/plugins/change_auth_plan/models.py:270 msgid "SSH public key" msgstr "ssh公钥" @@ -969,7 +969,7 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 users/models/user.py:350 +#: assets/models/cluster.py:22 users/models/user.py:349 #: users/templates/users/user_detail.html:76 msgid "Phone" msgstr "手机" @@ -995,7 +995,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:14 -#: users/models/user.py:470 +#: users/models/user.py:469 msgid "System" msgstr "系统" @@ -1103,7 +1103,7 @@ msgstr "默认资产组" #: ops/templates/ops/command_execution_list.html:35 #: ops/templates/ops/command_execution_list.html:60 #: perms/forms/asset_permission.py:63 perms/forms/remote_app_permission.py:31 -#: perms/models/base.py:36 +#: 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 @@ -1114,7 +1114,7 @@ msgstr "默认资产组" #: terminal/templates/terminal/command_list.html:65 #: terminal/templates/terminal/session_list.html:27 #: terminal/templates/terminal/session_list.html:71 users/forms.py:316 -#: users/models/user.py:127 users/models/user.py:458 +#: users/models/user.py:127 users/models/user.py:457 #: users/serializers/v1.py:108 users/templates/users/user_group_detail.html:78 #: users/templates/users/user_group_list.html:36 users/views/user.py:243 #: xpack/plugins/orgs/forms.py:26 @@ -1123,7 +1123,7 @@ msgstr "默认资产组" msgid "User" msgstr "用户" -#: assets/models/label.py:19 assets/models/node.py:245 +#: assets/models/label.py:19 assets/models/node.py:360 #: assets/templates/assets/label_list.html:15 settings/models.py:30 msgid "Value" msgstr "值" @@ -1132,14 +1132,22 @@ msgstr "值" msgid "Category" msgstr "分类" -#: assets/models/node.py:244 -msgid "Key" -msgstr "键" - -#: assets/models/node.py:302 +#: assets/models/node.py:198 msgid "New node" msgstr "新节点" +#: assets/models/node.py:284 perms/api/mixin.py:146 +msgid "ungrouped" +msgstr "未分组" + +#: assets/models/node.py:286 perms/api/mixin.py:151 +msgid "empty" +msgstr "空" + +#: assets/models/node.py:359 +msgid "Key" +msgstr "键" + #: assets/models/user.py:106 msgid "Automatic login" msgstr "自动登录" @@ -1154,9 +1162,9 @@ msgstr "手动登录" #: assets/templates/assets/system_user_detail.html:22 #: assets/views/admin_user.py:30 assets/views/admin_user.py:49 #: assets/views/admin_user.py:67 assets/views/admin_user.py:84 -#: assets/views/admin_user.py:109 assets/views/asset.py:38 -#: assets/views/asset.py:55 assets/views/asset.py:104 assets/views/asset.py:131 -#: assets/views/asset.py:171 assets/views/asset.py:203 +#: assets/views/admin_user.py:108 assets/views/asset.py:37 +#: assets/views/asset.py:54 assets/views/asset.py:103 assets/views/asset.py:130 +#: assets/views/asset.py:170 assets/views/asset.py:199 #: assets/views/cmd_filter.py:31 assets/views/cmd_filter.py:48 #: assets/views/cmd_filter.py:66 assets/views/cmd_filter.py:84 #: assets/views/cmd_filter.py:104 assets/views/cmd_filter.py:138 @@ -1167,7 +1175,7 @@ msgstr "手动登录" #: assets/views/label.py:27 assets/views/label.py:45 assets/views/label.py:73 #: assets/views/system_user.py:29 assets/views/system_user.py:46 #: assets/views/system_user.py:63 assets/views/system_user.py:79 -#: templates/_nav.html:19 xpack/plugins/change_auth_plan/models.py:68 +#: templates/_nav.html:19 xpack/plugins/change_auth_plan/models.py:71 msgid "Assets" msgstr "资产管理" @@ -1221,7 +1229,7 @@ msgid "Backend" msgstr "后端" #: assets/serializers/asset_user.py:66 users/forms.py:263 -#: users/models/user.py:361 users/templates/users/first_login.html:42 +#: users/models/user.py:360 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 @@ -1238,7 +1246,11 @@ msgstr "暂不支持OPENSSH格式的密钥，使用 ssh-keygen -t rsa -m pem生 msgid "private key invalid" msgstr "密钥不合法" -#: assets/serializers/node.py:33 +#: assets/serializers/node.py:18 +msgid "value" +msgstr "值" + +#: assets/serializers/node.py:34 msgid "The same level node name cannot be the same" msgstr "同级别节点名字不能重复" @@ -1311,7 +1323,7 @@ msgid "Test system user connectivity period: {}" msgstr "定期测试系统用户可连接性: {}" #: assets/tasks.py:478 assets/tasks.py:564 -#: xpack/plugins/change_auth_plan/models.py:522 +#: xpack/plugins/change_auth_plan/models.py:525 msgid "The asset {} system platform {} does not support run Ansible tasks" msgstr "资产 {} 系统平台 {} 不支持运行 Ansible 任务" @@ -1376,8 +1388,8 @@ msgstr "启用MFA" msgid "Import assets" msgstr "导入资产" -#: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:39 -#: templates/_nav.html:22 xpack/plugins/change_auth_plan/views.py:116 +#: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:38 +#: templates/_nav.html:22 xpack/plugins/change_auth_plan/views.py:118 msgid "Asset list" msgstr "资产列表" @@ -1390,12 +1402,12 @@ msgid "Update asset user auth" msgstr "更新资产用户认证信息" #: assets/templates/assets/_asset_user_auth_update_modal.html:23 -#: xpack/plugins/change_auth_plan/forms.py:102 +#: xpack/plugins/change_auth_plan/forms.py:51 msgid "Please input password" msgstr "请输入密码" #: assets/templates/assets/_asset_user_auth_update_modal.html:68 -#: assets/templates/assets/asset_detail.html:307 +#: assets/templates/assets/asset_detail.html:306 #: users/templates/users/user_detail.html:311 #: users/templates/users/user_detail.html:338 #: xpack/plugins/interface/views.py:35 @@ -1433,7 +1445,7 @@ msgid "Datetime" msgstr "日期" #: assets/templates/assets/_asset_user_list.html:36 -#: assets/templates/assets/asset_list.html:138 +#: assets/templates/assets/asset_list.html:137 msgid "Test datetime: " msgstr "测试日期: " @@ -1468,31 +1480,37 @@ msgstr "SSH端口" msgid "If use nat, set the ssh real port" msgstr "如果使用了nat端口映射，请设置为ssh真实监听的端口" -#: assets/templates/assets/_node_tree.html:49 +#: assets/templates/assets/_node_tree.html:40 +#: users/templates/users/_granted_assets.html:7 +#: users/templates/users/_granted_assets.html:83 +msgid "Loading" +msgstr "加载中..." + +#: assets/templates/assets/_node_tree.html:50 msgid "Add node" msgstr "新建节点" -#: assets/templates/assets/_node_tree.html:50 +#: assets/templates/assets/_node_tree.html:51 msgid "Rename node" msgstr "重命名节点" -#: assets/templates/assets/_node_tree.html:51 +#: assets/templates/assets/_node_tree.html:52 msgid "Delete node" msgstr "删除节点" -#: assets/templates/assets/_node_tree.html:160 +#: assets/templates/assets/_node_tree.html:161 msgid "Create node failed" msgstr "创建节点失败" -#: assets/templates/assets/_node_tree.html:172 +#: assets/templates/assets/_node_tree.html:173 msgid "Have child node, cancel" msgstr "存在子节点，不能删除" -#: assets/templates/assets/_node_tree.html:174 +#: assets/templates/assets/_node_tree.html:175 msgid "Have assets, cancel" msgstr "存在资产，不能删除" -#: assets/templates/assets/_node_tree.html:248 +#: assets/templates/assets/_node_tree.html:250 msgid "Rename success" msgstr "重命名成功" @@ -1539,7 +1557,7 @@ msgstr "更新系统用户" #: assets/templates/assets/_user_asset_detail_modal.html:11 #: assets/templates/assets/asset_asset_user_list.html:13 -#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:204 +#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:200 msgid "Asset detail" msgstr "资产详情" @@ -1574,16 +1592,16 @@ msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:91 #: perms/templates/perms/asset_permission_asset.html:103 -#: xpack/plugins/change_auth_plan/forms.py:110 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:112 +#: xpack/plugins/change_auth_plan/forms.py:59 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:99 msgid "Select nodes" msgstr "选择节点" #: assets/templates/assets/admin_user_detail.html:100 -#: assets/templates/assets/asset_detail.html:207 -#: assets/templates/assets/asset_list.html:386 +#: assets/templates/assets/asset_detail.html:204 +#: assets/templates/assets/asset_list.html:385 #: assets/templates/assets/cmd_filter_detail.html:106 -#: assets/templates/assets/system_user_assets.html:100 +#: assets/templates/assets/system_user_assets.html:97 #: assets/templates/assets/system_user_detail.html:182 #: assets/templates/assets/system_user_list.html:139 #: authentication/templates/authentication/_mfa_confirm_modal.html:20 @@ -1644,8 +1662,8 @@ msgstr "创建管理用户" #: assets/templates/assets/admin_user_list.html:162 #: assets/templates/assets/admin_user_list.html:193 -#: assets/templates/assets/asset_list.html:267 -#: assets/templates/assets/asset_list.html:304 +#: assets/templates/assets/asset_list.html:266 +#: assets/templates/assets/asset_list.html:303 #: assets/templates/assets/system_user_list.html:192 #: assets/templates/assets/system_user_list.html:223 #: users/templates/users/user_group_list.html:164 @@ -1657,7 +1675,7 @@ msgid "Please select file" msgstr "选择文件" #: assets/templates/assets/asset_asset_user_list.html:16 -#: assets/templates/assets/asset_detail.html:23 assets/views/asset.py:56 +#: assets/templates/assets/asset_detail.html:23 assets/views/asset.py:55 msgid "Asset user list" msgstr "资产用户列表" @@ -1702,7 +1720,7 @@ msgstr "创建日期" #: assets/templates/assets/asset_detail.html:150 authentication/models.py:15 #: authentication/templates/authentication/_access_key_modal.html:28 -#: perms/models/asset_permission.py:115 perms/models/base.py:38 +#: perms/models/asset_permission.py:116 perms/models/base.py:51 #: perms/templates/perms/asset_permission_create_update.html:55 #: perms/templates/perms/asset_permission_detail.html:120 #: perms/templates/perms/remote_app_permission_create_update.html:54 @@ -1731,7 +1749,7 @@ msgstr "" "左侧是资产树，右击可以新建、删除、更改树节点，授权资产也是以节点方式组织的，" "右侧是属于该节点下的资产" -#: assets/templates/assets/asset_list.html:61 assets/views/asset.py:105 +#: assets/templates/assets/asset_list.html:61 assets/views/asset.py:104 msgid "Create asset" msgstr "创建资产" @@ -1763,31 +1781,31 @@ msgstr "禁用所选" msgid "Active selected" msgstr "激活所选" -#: assets/templates/assets/asset_list.html:190 +#: assets/templates/assets/asset_list.html:189 msgid "Add assets to node" msgstr "添加资产到节点" -#: assets/templates/assets/asset_list.html:191 +#: assets/templates/assets/asset_list.html:190 msgid "Move assets to node" msgstr "移动资产到节点" -#: assets/templates/assets/asset_list.html:193 +#: assets/templates/assets/asset_list.html:192 msgid "Refresh node hardware info" msgstr "更新节点资产硬件信息" -#: assets/templates/assets/asset_list.html:194 +#: assets/templates/assets/asset_list.html:193 msgid "Test node connective" msgstr "测试节点资产可连接性" -#: assets/templates/assets/asset_list.html:196 +#: assets/templates/assets/asset_list.html:195 msgid "Display only current node assets" msgstr "仅显示当前节点资产" -#: assets/templates/assets/asset_list.html:197 +#: assets/templates/assets/asset_list.html:196 msgid "Displays all child node assets" msgstr "显示所有子节点资产" -#: assets/templates/assets/asset_list.html:380 +#: assets/templates/assets/asset_list.html:379 #: assets/templates/assets/system_user_list.html:133 #: users/templates/users/user_detail.html:386 #: users/templates/users/user_detail.html:412 @@ -1798,11 +1816,11 @@ msgstr "显示所有子节点资产" msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:381 +#: assets/templates/assets/asset_list.html:380 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:384 +#: assets/templates/assets/asset_list.html:383 #: assets/templates/assets/system_user_list.html:137 #: settings/templates/settings/terminal_setting.html:166 #: users/templates/users/user_detail.html:390 @@ -1816,16 +1834,16 @@ msgstr "删除选择资产" msgid "Cancel" msgstr "取消" -#: assets/templates/assets/asset_list.html:397 +#: assets/templates/assets/asset_list.html:396 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:398 -#: assets/templates/assets/asset_list.html:402 +#: assets/templates/assets/asset_list.html:397 +#: assets/templates/assets/asset_list.html:401 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:401 +#: assets/templates/assets/asset_list.html:400 msgid "Asset Deleting failed." msgstr "删除失败" @@ -2026,23 +2044,23 @@ msgstr "系统用户删除失败" msgid "Admin user list" msgstr "管理用户列表" -#: assets/views/admin_user.py:85 assets/views/admin_user.py:110 +#: assets/views/admin_user.py:85 assets/views/admin_user.py:109 msgid "Admin user detail" msgstr "管理用户详情" -#: assets/views/asset.py:68 templates/_nav_user.html:4 +#: assets/views/asset.py:67 templates/_nav_user.html:4 msgid "My assets" msgstr "我的资产" -#: assets/views/asset.py:132 +#: assets/views/asset.py:131 msgid "Update asset" msgstr "更新资产" -#: assets/views/asset.py:144 +#: assets/views/asset.py:143 msgid "Bulk update asset success" msgstr "批量更新资产成功" -#: assets/views/asset.py:172 +#: assets/views/asset.py:171 msgid "Bulk update asset" msgstr "批量更新资产" @@ -2106,11 +2124,11 @@ msgstr "系统用户列表" msgid "System user detail" msgstr "系统用户详情" -#: assets/views/system_user.py:106 +#: assets/views/system_user.py:102 msgid "assets" msgstr "资产管理" -#: assets/views/system_user.py:107 +#: assets/views/system_user.py:103 msgid "System user asset" msgstr "系统用户资产" @@ -2139,7 +2157,7 @@ msgstr "文件名" #: ops/templates/ops/task_list.html:31 #: users/templates/users/user_detail.html:462 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14 -#: xpack/plugins/cloud/api.py:62 +#: xpack/plugins/cloud/api.py:61 msgid "Success" msgstr "成功" @@ -2198,13 +2216,13 @@ msgstr "Agent" #: audits/models.py:85 audits/templates/audits/login_log_list.html:56 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms.py:175 users/models/user.py:353 +#: users/forms.py:175 users/models/user.py:352 #: users/templates/users/first_login.html:45 msgid "MFA" msgstr "MFA" #: audits/models.py:86 audits/templates/audits/login_log_list.html:57 -#: xpack/plugins/change_auth_plan/models.py:417 +#: xpack/plugins/change_auth_plan/models.py:420 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:15 #: xpack/plugins/cloud/models.py:281 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69 @@ -2226,12 +2244,12 @@ msgstr "登录日期" #: ops/templates/ops/adhoc_history.html:52 #: ops/templates/ops/adhoc_history_detail.html:61 #: ops/templates/ops/command_execution_list.html:66 -#: ops/templates/ops/task_history.html:58 perms/models/base.py:39 +#: ops/templates/ops/task_history.html:58 perms/models/base.py:52 #: perms/templates/perms/asset_permission_detail.html:86 #: perms/templates/perms/remote_app_permission_detail.html:78 #: terminal/models.py:165 terminal/templates/terminal/session_list.html:34 -#: xpack/plugins/change_auth_plan/models.py:250 -#: xpack/plugins/change_auth_plan/models.py:420 +#: xpack/plugins/change_auth_plan/models.py:253 +#: xpack/plugins/change_auth_plan/models.py:423 #: 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" @@ -2376,7 +2394,7 @@ msgid "" "Invalid token header. Sign string should not contain invalid characters." msgstr "" -#: authentication/backends/api.py:141 +#: authentication/backends/api.py:142 msgid "Invalid token or cache refreshed." msgstr "" @@ -2451,14 +2469,14 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:288 users/templates/users/user_profile.html:94 +#: users/models/user.py:287 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:289 users/templates/users/user_profile.html:92 +#: users/models/user.py:288 users/templates/users/user_profile.html:92 #: users/templates/users/user_profile.html:170 msgid "Enable" msgstr "启用" @@ -2701,6 +2719,10 @@ msgstr "" msgid "Waiting task start" msgstr "等待任务开始" +#: ops/api/command.py:35 +msgid "Not has host {} permission" +msgstr "" + #: ops/models/adhoc.py:38 msgid "Interval" msgstr "间隔" @@ -2780,8 +2802,8 @@ msgstr "完成时间" #: ops/models/adhoc.py:327 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:253 -#: xpack/plugins/change_auth_plan/models.py:423 +#: xpack/plugins/change_auth_plan/models.py:256 +#: xpack/plugins/change_auth_plan/models.py:426 #: 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" @@ -2936,33 +2958,33 @@ msgstr "任务列表" msgid "Go" msgstr "" -#: ops/templates/ops/command_execution_create.html:155 +#: ops/templates/ops/command_execution_create.html:197 msgid "Selected assets" msgstr "已选择资产" -#: ops/templates/ops/command_execution_create.html:158 +#: ops/templates/ops/command_execution_create.html:200 msgid "In total" msgstr "总共" -#: ops/templates/ops/command_execution_create.html:193 +#: ops/templates/ops/command_execution_create.html:236 msgid "" "Select the left asset, select the running system user, execute command in " "batch" msgstr "选择左侧资产, 选择运行的系统用户，批量执行命令" -#: ops/templates/ops/command_execution_create.html:211 +#: ops/templates/ops/command_execution_create.html:257 msgid "Unselected assets" msgstr "没有选中资产" -#: ops/templates/ops/command_execution_create.html:215 +#: ops/templates/ops/command_execution_create.html:261 msgid "No input command" msgstr "没有输入命令" -#: ops/templates/ops/command_execution_create.html:219 +#: ops/templates/ops/command_execution_create.html:265 msgid "No system user was selected" msgstr "没有选择系统用户" -#: ops/templates/ops/command_execution_create.html:264 +#: ops/templates/ops/command_execution_create.html:310 msgid "Pending" msgstr "等待" @@ -3044,26 +3066,26 @@ msgstr "命令执行列表" msgid "Command execution" msgstr "命令执行" -#: orgs/mixins/models.py:61 orgs/mixins/serializers.py:25 orgs/models.py:27 +#: orgs/mixins/models.py:61 orgs/mixins/serializers.py:25 orgs/models.py:29 msgid "Organization" msgstr "组织" -#: perms/api/mixin.py:148 -msgid "ungrouped" +#: perms/const.py:7 +msgid "Ungrouped" msgstr "未分组" -#: perms/api/mixin.py:153 -msgid "empty" +#: perms/const.py:10 +msgid "Empty" msgstr "空" #: perms/forms/asset_permission.py:66 perms/forms/remote_app_permission.py:34 -#: perms/models/asset_permission.py:113 perms/models/base.py:37 +#: perms/models/asset_permission.py:114 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/remote_app_permission_list.html:16 #: templates/_nav.html:14 users/forms.py:286 users/models/group.py:26 -#: users/models/user.py:337 users/templates/users/_select_user_modal.html:16 +#: users/models/user.py:336 users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_detail.html:217 #: users/templates/users/user_list.html:38 #: xpack/plugins/orgs/templates/orgs/org_list.html:15 @@ -3104,15 +3126,15 @@ msgstr "上传下载" msgid "Actions" msgstr "动作" -#: perms/models/asset_permission.py:86 perms/models/asset_permission.py:125 +#: perms/models/asset_permission.py:86 perms/models/asset_permission.py:126 #: templates/_nav.html:44 msgid "Asset permission" msgstr "资产授权" -#: perms/models/asset_permission.py:116 perms/models/base.py:40 +#: perms/models/asset_permission.py:117 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:369 users/templates/users/user_detail.html:107 +#: users/models/user.py:368 users/templates/users/user_detail.html:107 #: users/templates/users/user_profile.html:120 msgid "Date expired" msgstr "失效日期" @@ -3153,7 +3175,7 @@ msgstr "添加资产" #: settings/templates/settings/terminal_setting.html:98 #: settings/templates/settings/terminal_setting.html:120 #: users/templates/users/user_group_detail.html:95 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:93 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:80 #: xpack/plugins/orgs/templates/orgs/org_detail.html:93 #: xpack/plugins/orgs/templates/orgs/org_detail.html:130 msgid "Add" @@ -3165,7 +3187,7 @@ msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:112 #: users/templates/users/user_detail.html:234 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:121 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:105 msgid "Join" msgstr "加入" @@ -3266,9 +3288,9 @@ msgstr "添加用户" msgid "Add user group to this permission" msgstr "添加用户组" -#: perms/views/asset_permission.py:34 perms/views/asset_permission.py:65 +#: perms/views/asset_permission.py:33 perms/views/asset_permission.py:65 #: perms/views/asset_permission.py:82 perms/views/asset_permission.py:99 -#: perms/views/asset_permission.py:136 perms/views/asset_permission.py:173 +#: perms/views/asset_permission.py:136 perms/views/asset_permission.py:171 #: perms/views/remote_app_permission.py:33 #: perms/views/remote_app_permission.py:49 #: perms/views/remote_app_permission.py:66 @@ -3279,7 +3301,7 @@ msgstr "添加用户组" msgid "Perms" msgstr "权限管理" -#: perms/views/asset_permission.py:35 +#: perms/views/asset_permission.py:34 msgid "Asset permission list" msgstr "资产授权列表" @@ -3299,7 +3321,7 @@ msgstr "资产授权详情" msgid "Asset permission user list" msgstr "资产授权用户列表" -#: perms/views/asset_permission.py:174 +#: perms/views/asset_permission.py:172 msgid "Asset permission asset list" msgstr "资产授权资产列表" @@ -3327,33 +3349,33 @@ msgstr "远程应用授权用户列表" msgid "RemoteApp permission RemoteApp list" msgstr "远程应用授权远程应用列表" -#: settings/api.py:28 +#: settings/api.py:27 msgid "Test mail sent to {}, please check" msgstr "邮件已经发送{}, 请检查" -#: settings/api.py:54 +#: settings/api.py:53 msgid "Test ldap success" msgstr "连接LDAP成功" -#: settings/api.py:91 +#: settings/api.py:90 msgid "Match {} s users" msgstr "匹配 {} 个用户" -#: settings/api.py:161 +#: settings/api.py:159 msgid "succeed: {} failed: {} total: {}" msgstr "成功：{} 失败：{} 总数：{}" -#: settings/api.py:183 settings/api.py:219 +#: settings/api.py:181 settings/api.py:217 msgid "" "Error: Account invalid (Please make sure the information such as Access key " "or Secret key is correct)" msgstr "错误：账户无效 （请确保 Access key 或 Secret key 等信息正确）" -#: settings/api.py:189 settings/api.py:225 +#: settings/api.py:187 settings/api.py:223 msgid "Create succeed" msgstr "创建成功" -#: settings/api.py:207 settings/api.py:245 +#: settings/api.py:205 settings/api.py:243 #: settings/templates/settings/terminal_setting.html:154 msgid "Delete succeed" msgstr "删除成功" @@ -3666,7 +3688,7 @@ msgid "Please submit the LDAP configuration before import" msgstr "请先提交LDAP配置再进行导入" #: settings/templates/settings/_ldap_list_users_modal.html:39 -#: users/models/user.py:333 users/templates/users/user_detail.html:71 +#: users/models/user.py:332 users/templates/users/user_detail.html:71 #: users/templates/users/user_profile.html:59 msgid "Email" msgstr "邮件" @@ -4030,8 +4052,8 @@ msgstr "命令过滤" #: templates/_nav.html:55 templates/_nav_audits.html:11 #: terminal/views/command.py:21 terminal/views/session.py:43 #: terminal/views/session.py:54 terminal/views/session.py:78 -#: terminal/views/terminal.py:31 terminal/views/terminal.py:47 -#: terminal/views/terminal.py:60 +#: terminal/views/terminal.py:32 terminal/views/terminal.py:48 +#: terminal/views/terminal.py:61 msgid "Sessions" msgstr "会话管理" @@ -4397,7 +4419,7 @@ msgid "Finish session success" msgstr "标记会话完成成功" #: terminal/templates/terminal/terminal_detail.html:13 -#: terminal/views/terminal.py:61 +#: terminal/views/terminal.py:62 msgid "Terminal detail" msgstr "终端详情" @@ -4437,36 +4459,32 @@ msgstr "信息" msgid "Session online list" msgstr "在线会话" -#: terminal/views/terminal.py:32 +#: terminal/views/terminal.py:33 msgid "Terminal list" msgstr "终端列表" -#: terminal/views/terminal.py:47 +#: terminal/views/terminal.py:48 msgid "Update terminal" msgstr "更新终端" -#: terminal/views/terminal.py:110 terminal/views/terminal.py:111 +#: terminal/views/terminal.py:111 terminal/views/terminal.py:112 msgid "Redirect to web terminal" msgstr "重定向到web terminal" -#: terminal/views/terminal.py:118 +#: terminal/views/terminal.py:119 msgid "Connect ssh terminal" msgstr "连接ssh终端" -#: terminal/views/terminal.py:119 +#: terminal/views/terminal.py:120 msgid "" "You should use your ssh client tools connect terminal: {}

{}" msgstr "你可以使用ssh客户端工具连接终端" -#: users/api/user.py:96 -msgid "You do not have permission." -msgstr "你没有权限" - -#: users/api/user.py:190 +#: users/api/user.py:187 msgid "Could not reset self otp, use profile reset instead" msgstr "不能再该页面重置MFA, 请去个人信息页面重置" -#: users/forms.py:33 users/models/user.py:341 +#: users/forms.py:33 users/models/user.py:340 #: users/templates/users/_select_user_modal.html:15 #: users/templates/users/user_detail.html:87 #: users/templates/users/user_list.html:37 @@ -4511,7 +4529,7 @@ msgstr "生成重置密码链接，通过邮件发送给用户" msgid "Set password" msgstr "设置密码" -#: users/forms.py:133 xpack/plugins/change_auth_plan/models.py:86 +#: users/forms.py:133 xpack/plugins/change_auth_plan/models.py:89 #: 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 @@ -4585,7 +4603,7 @@ msgstr "选择用户" msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" -#: users/models/user.py:126 users/models/user.py:466 +#: users/models/user.py:126 users/models/user.py:465 msgid "Administrator" msgstr "管理员" @@ -4597,39 +4615,29 @@ msgstr "应用程序" msgid "Auditor" msgstr "审计员" -# #: users/models/user.py:288 users/templates/users/user_profile.html:94 -# #: users/templates/users/user_profile.html:163 -# #: users/templates/users/user_profile.html:166 -# msgid "Disable" -# msgstr "禁用" -# -# #: users/models/user.py:289 users/templates/users/user_profile.html:92 -# #: users/templates/users/user_profile.html:170 -# msgid "Enable" -# msgstr "启用" -#: users/models/user.py:290 users/templates/users/user_profile.html:90 +#: users/models/user.py:289 users/templates/users/user_profile.html:90 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:344 +#: users/models/user.py:343 msgid "Avatar" msgstr "头像" -#: users/models/user.py:347 users/templates/users/user_detail.html:82 +#: users/models/user.py:346 users/templates/users/user_detail.html:82 msgid "Wechat" msgstr "微信" -#: users/models/user.py:376 users/templates/users/user_detail.html:103 +#: users/models/user.py:375 users/templates/users/user_detail.html:103 #: users/templates/users/user_list.html:39 #: users/templates/users/user_profile.html:102 msgid "Source" msgstr "用户来源" -#: users/models/user.py:380 +#: users/models/user.py:379 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:469 +#: users/models/user.py:468 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -5408,32 +5416,18 @@ msgstr "MFA 解绑成功，返回登录页面" msgid "Password length" msgstr "密码长度" -#: xpack/plugins/change_auth_plan/forms.py:45 -#: xpack/plugins/change_auth_plan/models.py:213 -msgid "* For security, do not change {} user's password" -msgstr "* 为了安全，禁止更改 {} 用户的密码" - -#: xpack/plugins/change_auth_plan/forms.py:55 -msgid "* Please enter custom password" -msgstr "* 请输入自定义密码" - -#: xpack/plugins/change_auth_plan/forms.py:64 -#: xpack/plugins/cloud/serializers.py:73 -msgid "* Please enter a valid crontab expression" -msgstr "* 请输入有效的 crontab 表达式" - -#: xpack/plugins/change_auth_plan/forms.py:117 +#: xpack/plugins/change_auth_plan/forms.py:66 #: 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 -#: xpack/plugins/cloud/forms.py:33 xpack/plugins/cloud/forms.py:81 +#: xpack/plugins/cloud/forms.py:33 xpack/plugins/cloud/forms.py:87 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:41 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:72 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:16 msgid "Periodic perform" msgstr "定时执行" -#: xpack/plugins/change_auth_plan/forms.py:121 +#: xpack/plugins/change_auth_plan/forms.py:70 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." @@ -5441,11 +5435,11 @@ msgstr "" "提示：用户名为将要修改的资产上的用户的用户名。如果用户存在，则修改密码；如果" "用户不存在，则创建用户。" -#: xpack/plugins/change_auth_plan/forms.py:125 xpack/plugins/cloud/forms.py:84 +#: xpack/plugins/change_auth_plan/forms.py:74 xpack/plugins/cloud/forms.py:90 msgid "Tips: (Units: hour)" msgstr "提示：（单位： 时）" -#: xpack/plugins/change_auth_plan/forms.py:126 xpack/plugins/cloud/forms.py:85 +#: xpack/plugins/change_auth_plan/forms.py:75 xpack/plugins/cloud/forms.py:91 msgid "" "eg: Every Sunday 03:05 run <5 3 * * 0>
Tips: Using 5 digits linux " "crontab expressions ( fm.maxTargets) { files = $.map(incHashes || cwdHashes, function(hash) { return fm.file(hash) || null; }); @@ -33643,4 +33645,4 @@ elFinder.prototype.commands.view = function() { }; return elFinder; -})); \ No newline at end of file +}));