From 28cdfca14b4fb662cdeee6af29a56241c9ba4d9c Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Thu, 21 Feb 2019 18:49:40 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=20License=20(#242?= =?UTF-8?q?0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] License - 1.添加标签过滤器 * [Update] License - 2.添加翻译信息 --- apps/common/templatetags/common_tags.py | 8 +++ apps/locale/zh/LC_MESSAGES/django.mo | Bin 64628 -> 64657 bytes apps/locale/zh/LC_MESSAGES/django.po | 87 ++++++++++++++---------- 3 files changed, 60 insertions(+), 35 deletions(-) diff --git a/apps/common/templatetags/common_tags.py b/apps/common/templatetags/common_tags.py index d9f2c373d..790759f0a 100644 --- a/apps/common/templatetags/common_tags.py +++ b/apps/common/templatetags/common_tags.py @@ -97,6 +97,14 @@ def is_bool_field(field): return False +@register.filter +def is_image_field(field): + if isinstance(field, forms.ImageField): + return True + else: + return False + + @register.filter def to_dict(data): return dict(data) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 62c0858a181e640a916dd7acce79c953173e05ac..7a3be299fb40add6b92c7bcdc8c4f90489ff400b 100644 GIT binary patch delta 15063 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 PbKgw}$n0~uQ1Sl(Wa@b= delta 15039 zcmYk?2Y8NW`^WJoiIET@i3kZIh`l$lf*6hBA5^W{ReNjE*HgQSqBlxQ)v8u`jVPt0 zMq6sNHZ_W(wQCkd|KDG(v&Zp1$9wx+=XuThy2ta-clMK@2aki+EzIoC;q&=2clY_S zVkG9oSj>f`%tXvh+#K^_H_VQsQT-;H@1y$9vv>st6R$zF--MNM7iPvs-F<#v77EWu zsAEtMCdUX2$8s2o^)VV>#t`gf?DV*)WF+NJF*A0gFm4bd;v4zb<~3Hpmye& z-x8U7xd9_k9SfosP#!gKUDTO2v$!W};6bPXN1+Csj9So4)IyeE7=D3~xCOQ22T?oa zKSn`katYP&HfrJ*s1@gU-F1k-ZN&Ld1D`-meBQi)TEJt}L;<~B|0vW#V^Akj6boT_ zEXe%6Ruo<$F$n*}t*C*%e8UZ}5wj3)L9KWPYJx+Uv2Y9~zKu=rFD!-i`nY^w%t|~A zGvgT4wI7Eincp{$LdL+Ti4LJI!Ew}zuc8LHi<;<(8Q9nDSa#Gs5sPe^uN;=aIam&N zq9*QEBZusmvE)lmzri`x3;SP0u&JQ~%13ab4q zRR0e#J1(~Tm#C*@1NznBM+({Th)k57X%~2C{!cgpqdRm5{ z?wx6vA7^0*u0hSW8FdMF^k@I|TpuH$Exd{9_z#xHOat76RZt6Tj2bW%)ou`K;NcdJ zMNKdPLvcE4Cl{dFEyiN_1qR~J1K58Rj*=*hC(I|9LY#k~&sPE8KrLtizJfnuGb}X7 zok?HRmXAeEJPC8+2dITF!7aE3M`Q27K3@U6+Y%;MZwo;U`z)i0si zr=lk4h&r>r=5P!r9*f%1S*Z5Q%+;8K_$$;U@b9Le0ZyV;dJ(hXEsGzcwk*?7moJT4 zU^UcJl8CFZIkG9fCm4ip40Gf4NA1X4s7o;kHU2bY$Nau|6ttp6sJrq@Yp@ITjz5Sx zgWoK^iDATn!(ICb)J~K{?NAMi>!T)aiILa|_1!WUBXBwv*7LuZf(F=y>Tnpf6X#JY zy^aa^5OoHzBV0Zn)vgR`hiX{93uasr)WU~b{2!~If|}<8#d`i1Q_u=mp`M0x)Xj7P zwXky-k2g_Un{%XnOQIgPau|+HQD4s;P!kWslK3`i{LfGe-HO_Qi|E&xJ)oe8V%~Ju zv?OW)wag^cnKni3KpWIncR*c=?x?$YC~5(-%r7uE@h*(Qlc;;=7HR?a-emu^vdnL} z=QV0t$)&2$Qrp-Fa?O5JX z?7wb`QY18RW7IWIL7nLvK-ZaHEOFjqZW7`b;dVP zJN*K+GdcXc4YY-YQ4K3$Wvqu9a2RUq$Dqz&3hEx1W%YAV1244vTGRs4Q0>!EvRZjk;7XnXjR?dMM___fR{t%-m@8-=lW! z9O?~w$BcM8B*x-ob17;k(ork^!90Lk@DYr`GpL*F5o$+5|HCd~ z92UneSQMvVIb4mI^!%Tppn)!!*HBw^54H8av2FpOs0HRmwJ&OxMcr)GP+MOg)h-1q zVMo*nzK`1aPf^!?1*R~+Zz~0@Og{$Vur%tDs8ZK1)$D@Wf&QoohoaiOjk*LAP&>5{ z3*vIrCE1PIp<}52cToKvqF)`JSt8Rr?%HQZop}suON(K7tc}X|N8KZDVF{dq8gLzU zz|E-oh;hz%)Wj7qW2aC%P=6fzue-giHJplhi05M&T#E(ptmU7gwmy8kyF@XliA$K} zQCnOMHDMy^X-TsBWYmr}M=hlNc+OmB)Psa>nn6}E9<{LPSQ2+w{yOU3cwlkh1UFD9 zDxU{4?hUgn>RzaZ+L6Yn1-HdQ*vU^pH^+Za4QHaR*<#Fx>rgA+hkE=@q6WHwn(!&= zrVF0v;z(5gc+`niLiMkUr7#86eSim2 zjj$o=aeWu{K3I-g*f!L?wGTDn5%VJIp869xVgCL%+1(6zPz_6?R#pqOl`T*MwKKa| zzBgtjKNz*}kysqZV-{S6TIhPz4(+r2an!hHGh(j)6|1<3YIq+t;S1E6WSQdP+^7ZS z#}Zf?wIgj%?b@SuuD3ZF_1Mio?ab$>9o>Pt`3_<(=J%bXpnKpC%z{r*I}q@$+o~wk zQ&1Xprp-|8+u}>u+u{wV1$>A1@g(YA*gw@xd=@h z!!oFqS4W*`Bh=QXqORqusEG%n1|Da=hq|dfRKI1Yao3~f-Sr;VUmXvS&>8)Th43zF zYa^z)YZ{Hp*F(J@x}vV_o0uPGp(a{mZpW&`2T|h&O?O{DQK%PB4J?5#PiOz*DU2jh z9Oq*n+=05gOU-Z{2H_IoiTD;4d*8ic7h@6Pbli%UP!lYg$+L|ca5#p|a+h!-Rv=!A ztMI6wLNN+sXS;8u6{wXRGoPatR_p_|A6sBeoQzp<2WqGGVm3U8e6@`3Z+Lc=kTI1dKt`Oil|9SflD{*tIOtAL?c1GSaOsDYMR{d&|*v<20FH-_U+ zsBtc$cH|F?!uzPlF=T-orznOqzppX{O_Yogn2P%P?1j-d5jDU<)Bqb$ck@Big3h4& zU&m7T7i!|dAGw>dENWqOEN+QcoQ|yW7H01 z``8(Q+KCwKhec82%|hK9D^UGcp%%Ugbwb~vUuWZ=>ROQ61)^&g=`+ z%F|E_*om6(7V7bPhH6*n6Ssq~SiPN*H5iE8gp zqoA#Njym(a%iWojLrqu*^`dBmn($4G!_QD>@&oEp{fye7i#P%AqIP7&3U>)6qT+e@ zG7DURe*N$MXZ-f3V%SP{0Z$>nu6(JV^Y6DbJdWSu$E)~8H8&pho&W2;6Qb6- z1yn=blua<>F~&^9y--`<7j;QSqV5Sl#%T$&tztcvqGGFg1q%@8TIch`MQdk-{vg>V;DmHE?sYwb=pHubVm09D~})cP*Z8 z@e0(!zQPjtt=0eGx57iK2>jX&T-vOGT5+<)Juxrw5Y*PbXYnG`f;OQRu-oFJs1vw= zLHN7nZ&=>{*b@I(B6N!zI1)8rF^tE`7Pmz$s5@%lapt>LKhxrc<}%B#vUoFUA?Ysf z_wBLC-$#+Vn|TRha_NvH`wLA76MuFjC_ zzsV9i%zdacJ7)12tU`Rn@-g4If#NaasX?_*w0r~9P2C);;Sj6;++2$pmrAjo|J_!x z4~r2W#)0@4)v)(AcZS1J6HY^y%uLm=lRzF+0$Le2-M2s z%u1F|wm20vaWB+D2BFS;lGQIkEnuU$(>!GLXDq&L{+-VLYr^1fow29^%9)9%o2seV z4b^_M)z3if)JLd=twQ}C*l77}mOp?x(G#fg&zaZ#R`|=zw8KphZWcv#sE%4lBa1tm zea$yf6HK&tn#J=`FS5m`g|0!h+m0I7|D6>Mo9E3NsD_Wte{cbDmYpvDDQbX~=0?l! zL`}5U;!{@tt9cW3$(}g7UEQk+hYOZ*DXI0wFA>o zuk=lp--)^h_Wr>B7o>2RgccCA#|@YZiLam*xE-~SpHT}v ziCVyA%RfLpJ%3|AoV(AxzykdHUB_s%pqXHn!6Z6VMh!f|^5ZR@YVkaCk>!`0>n)#d zevew%0o20%XRYE6YJx{*&;h#?ScH5usy@;3O;H21#A(2_cPxzCrLg3 zA5h4Ji_LY`U?*y&hft5vMby@Y{_NW4GUHJbR>Cl>jXAJ6>IX;%%!RWt0he057yVlK zX$m^yz{BoWa2V=Liq=le27}`Kg>L;LfbQVV97pQjIEq@TBh_AZX?|Vi;4WdrCi4ss}RLN|CT5(^iA7b%X zizlH5`~bDE&n^EA7AM||`i}V%^_>!S(%lmkF^iu6S14#}JDa`DA?6s=C76Vo-~-fx zR#<*D>N($n8fTZ~51=MKZSiANzs#rHIH9QjwC9VXpvQ117RHZJ1Er%T-fJF54RFco zuUUK_^OApRapY+?aSUp~H7#zA+Ub6%amHZA_y2fHOhrvN%Up!&unH^UR*P?%&rlPG z{^ABqzzM`x!FuNzc&w{+8;G9n77Wb|EhROLR*#ftczo?3UP5PiJeeCASRo$&4uPl)ERBS zjC;U5V4g59pibaA>X*`8KLsry?3^>dSrWCNY8E%M_!W!$pe7uN8gR1ZXP6(EE6t6l zo!n{hFR1bTzf)*L;i*;BJMRW=j#^kJi~FD^8ig9@9ee{9SRDAP%g3U2pbDyeUDP=atwj;mN;(yGDOZ>m3$S0u24I$7t`OT7MHO%<;zlN4* zWp+0Enr~uG2AGJt={(dzms$NP%ul@8^2aQH#{9#4Xa-(({lhM^|5{ld60!)!V+CuF zih47)N4*)xqjqA2nU0$HB&z=d)ENg{as6_mzOL(F9JauMIMC{6Tw(t;@Fq)~#+t-| zSNZ!K)A*y29sNOOWY3$@Ti zm{-sLI;;56Do&uT`8CV??zstbpw1))b>^kaDyXfmi>)ykBXEJ`SDR_5GvA64xCi|j z@D~cfcpWwHebhC2j=3=CK7T#K+*kuW)IbN!)2MN-Vl8}x5m@no8?OW3YDWh? zVEs89L-)SOgKAd;HC{4CVOxv)nPX5VI1RPHx%$6A z6`=4r2@UXrRUE~PGeT|cBUH!d$X)Bp`pCuEQT0)%{`t+4mak^kF&mjFs0F0@DU71f z3w1C2ikhIyUv7dPsDTHdCK`V}N3jEz_}eXT0;=B(RKHJgKCZF)#?Rc}16rYW zv?m5&{XqWUR@z)WA#)Vv9p1(2u>mc;=lt2;%U7dgKo@UBjp6}EyhSxy2LyO`YjlZv z!}ak6GQh7K{fL9SUNx%+T=f>!EE0a5Tvl?k8F)Wl_72yK4w+0TI%BT8HDd$(UXEH# z0&aS3Yn2Xo?2W4xm-HU>DeUJ>psde1>a%csMBI@$8)bdka_pj9!@F3k zNYpWEhmaYmtH-Aoad9tSV(X|!looRIr)CB?dmUiFNq?LyJos`W(XSR^DUnIuXBRc$cV3d6>G;9*z7v`;;30+ zwZqL2uTSmRfOv0G?cx=$F+x3#1{^1CGbs`fgT3^jllp~xTJ^m-Bd?oKmo!DlZC@oXS zCyJvot-AkD%iqW)as0v9$ei<8kN%cx+en!;R8&WSiq%^r;qEg=M zda)Hp5pA}fJ?LJWv5S#wO|Fm4)08-z;~R4AymR%U1y!#Wwj}%7?tD z`Yl7YTjncoK>Z?RN6@|@BL<^Bv6Rbl)TezPa(X?C;kZV5sJFd-!+_ttfTYBLU%Wc} z`Lj1FDK_B$ytzrm1L}I)`Lm>VC8=H8ujx_3);X1t^eMv#_c)3Ze@Hx%@=KUTJeKkc zEXr|}@;BsHQeJ^YiS;?}&2A7Gb&2duqSd&YV**DVZ%c!?keb%+Z|`D*l&YOAN@5kq zDOcl&rd$ro(np`%w!&$YUvT8~x-~2xUWFD*Y0;J1)nu=DOB%*T9VQdXv54C79D6BG z@D4YOi$6-K5t*}?gX7;%Bl_PX=9eUjIk{U%u^|nkwGW%%u zDsfM*Por;M?rJr9!+uWr9g8*AM9Kv@V(2vk58yeDuGEENUfhArSj|9u$s3X!-Ryl@ zZssV!@jWf{iK4|!;?A_H%`u7cG!A`oV;s4)lq>3>tj~1saB^(aRBE@8IfWTNRj{=e z(6~tE@{}%mB^#%NM^Kv2p|6<~+~!Sc99MG+rGGzvQ_e?F)5iXm@>8oHOL+|CUe>rh@#E|9pL^}p{WHHppKflR8`tx06Q zXiB-Py_)Q|c5iw!niQ{kk5TpQrOy~!U0!TRk9V!t0A?9rL<%8*^PhWBgR%vqPWF2DTsnzV5ja^?SjnUiB! diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index ca6e66d84..0b04be0b0 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-02-21 15:53+0800\n" +"POT-Creation-Date: 2019-02-21 18:23+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -464,6 +464,7 @@ msgid "Reachable" msgstr "可连接" #: assets/models/asset.py:119 assets/models/base.py:36 +#: xpack/plugins/license/models.py:75 msgid "Unknown" msgstr "未知" @@ -579,7 +580,7 @@ msgstr "优先级可选范围为1-100,1最低优先级,100最高优先级" #: assets/models/cmd_filter.py:50 #: assets/templates/assets/cmd_filter_rule_list.html:59 -#: xpack/plugins/license/models.py:27 +#: xpack/plugins/license/models.py:29 msgid "Content" msgstr "内容" @@ -923,7 +924,7 @@ msgstr "其它" #: users/templates/users/user_pubkey_update.html:76 #: 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:50 +#: xpack/plugins/interface/templates/interface/interface.html:88 msgid "Reset" msgstr "重置" @@ -956,7 +957,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/interface/templates/interface/interface.html:51 +#: xpack/plugins/interface/templates/interface/interface.html:89 msgid "Submit" msgstr "提交" @@ -1173,7 +1174,7 @@ msgstr "创建日期" #: terminal/templates/terminal/session_detail.html:81 #: users/templates/users/user_detail.html:138 #: users/templates/users/user_profile.html:146 -#: xpack/plugins/license/templates/license/license_detail.html:81 +#: xpack/plugins/license/templates/license/license_detail.html:94 msgid "Quick modify" msgstr "快速修改" @@ -1221,7 +1222,7 @@ msgstr "创建资产" #: assets/templates/assets/asset_list.html:73 #: users/templates/users/user_list.html:7 -#: xpack/plugins/license/templates/license/license_detail.html:89 +#: xpack/plugins/license/templates/license/license_detail.html:102 msgid "Import" msgstr "导入" @@ -1688,7 +1689,7 @@ msgstr "文件名" #: audits/models.py:22 audits/templates/audits/ftp_log_list.html:76 #: ops/templates/ops/command_execution_list.html:64 #: ops/templates/ops/task_list.html:39 users/models/authentication.py:73 -#: users/templates/users/user_detail.html:458 xpack/plugins/cloud/api.py:61 +#: users/templates/users/user_detail.html:458 xpack/plugins/cloud/api.py:62 msgid "Success" msgstr "成功" @@ -2721,6 +2722,7 @@ msgid "Validity period" msgstr "有效期" #: perms/templates/perms/asset_permission_detail.html:66 +#: xpack/plugins/license/templates/license/license_detail.html:68 msgid "User count" msgstr "用户数量" @@ -2729,6 +2731,7 @@ msgid "User group count" msgstr "用户组列表" #: perms/templates/perms/asset_permission_detail.html:74 +#: xpack/plugins/license/templates/license/license_detail.html:64 msgid "Asset count" msgstr "资产数量" @@ -2986,6 +2989,7 @@ msgstr "验证码" #: users/templates/users/login.html:27 users/templates/users/login_otp.html:27 #: users/templates/users/new_login.html:56 #: users/templates/users/reset_password.html:25 +#: xpack/plugins/interface/models.py:36 msgid "Welcome to the Jumpserver open source fortress" msgstr "欢迎使用Jumpserver开源堡垒机" @@ -4490,7 +4494,7 @@ msgstr "MFA 解绑成功" msgid "MFA disable success, return login page" msgstr "MFA 解绑成功,返回登录页面" -#: xpack/plugins/cloud/api.py:60 xpack/plugins/cloud/providers/base.py:84 +#: xpack/plugins/cloud/api.py:61 xpack/plugins/cloud/providers/base.py:84 msgid "Account unavailable" msgstr "账户无效" @@ -4701,49 +4705,49 @@ msgstr "同步实例任务列表" msgid "Create sync Instance task" msgstr "创建同步实例任务" -#: xpack/plugins/interface/forms.py:11 xpack/plugins/interface/models.py:15 +#: xpack/plugins/interface/forms.py:16 xpack/plugins/interface/models.py:15 msgid "Title of login page" msgstr "登录页面标题" -#: xpack/plugins/interface/forms.py:13 +#: xpack/plugins/interface/forms.py:18 msgid "" "Tips: This will be displayed on the enterprise user login page. (eg: Welcome " "to the Jumpserver open source fortress)" msgstr "提示:将会显示在企业版用户登录页面(eg: 欢迎使用Jumpserver开源堡垒机)" -#: xpack/plugins/interface/forms.py:19 xpack/plugins/interface/models.py:19 +#: xpack/plugins/interface/forms.py:24 xpack/plugins/interface/models.py:19 msgid "Image of login page" msgstr "登录页面图片" -#: xpack/plugins/interface/forms.py:21 +#: xpack/plugins/interface/forms.py:26 msgid "" "Tips: This will be displayed on the enterprise user login page. (suggest " "image size: 635px*472px)" msgstr "提示:将会显示在企业版用户登录页面(建议图片大小为: 635px*472px)" -#: xpack/plugins/interface/forms.py:27 xpack/plugins/interface/models.py:23 +#: xpack/plugins/interface/forms.py:32 xpack/plugins/interface/models.py:23 msgid "Website icon" msgstr "网站图标" -#: xpack/plugins/interface/forms.py:29 +#: xpack/plugins/interface/forms.py:34 msgid "Tips: website icon. (suggest image size: 16px*16px)" msgstr "提示:网站图标(建议图片大小为: 16px*16px)" -#: xpack/plugins/interface/forms.py:34 xpack/plugins/interface/models.py:27 +#: xpack/plugins/interface/forms.py:39 xpack/plugins/interface/models.py:27 msgid "Logo of management page" msgstr "管理页面logo" -#: xpack/plugins/interface/forms.py:36 +#: xpack/plugins/interface/forms.py:41 msgid "" "Tips: This will appear at the top left of the administration page. (suggest " "image size: 185px*55px)" msgstr "提示:将会显示在管理页面左上方(建议图片大小为: 185px*55px)" -#: xpack/plugins/interface/forms.py:42 xpack/plugins/interface/models.py:31 +#: xpack/plugins/interface/forms.py:47 xpack/plugins/interface/models.py:31 msgid "Logo of logout page" msgstr "退出页面logo" -#: xpack/plugins/interface/forms.py:44 +#: xpack/plugins/interface/forms.py:49 msgid "" "Tips: This will be displayed on the enterprise user logout page. (suggest " "image size: 82px*82px)" @@ -4762,12 +4766,22 @@ msgstr "界面设置" msgid "Interface" msgstr "界面" -#: xpack/plugins/license/meta.py:11 xpack/plugins/license/views.py:27 +#: xpack/plugins/license/meta.py:11 +#: xpack/plugins/license/templates/license/license_detail.html:51 +#: xpack/plugins/license/views.py:31 msgid "License" msgstr "许可证" +#: xpack/plugins/license/models.py:71 +msgid "Standard edition" +msgstr "" + +#: xpack/plugins/license/models.py:73 +msgid "Enterprise edition" +msgstr "企业版" + #: xpack/plugins/license/templates/license/_license_import_modal.html:4 -#: xpack/plugins/license/templates/license/license_detail.html:87 +#: xpack/plugins/license/templates/license/license_detail.html:100 msgid "Import license" msgstr "导入许可证" @@ -4792,39 +4806,42 @@ msgid " expired." msgstr " 过期。" #: xpack/plugins/license/templates/license/license_detail.html:37 -#: xpack/plugins/license/views.py:28 +#: xpack/plugins/license/views.py:32 msgid "License detail" msgstr "许可证详情" -#: xpack/plugins/license/templates/license/license_detail.html:53 +#: xpack/plugins/license/templates/license/license_detail.html:52 +msgid "No license" +msgstr "暂无许可证" + +#: xpack/plugins/license/templates/license/license_detail.html:56 msgid "Corporation" msgstr "公司" -#: xpack/plugins/license/templates/license/license_detail.html:57 +#: xpack/plugins/license/templates/license/license_detail.html:60 msgid "Expired" msgstr "过期时间" -#: xpack/plugins/license/templates/license/license_detail.html:61 -msgid "Count" -msgstr "数量" - -#: xpack/plugins/license/templates/license/license_detail.html:63 +#: xpack/plugins/license/templates/license/license_detail.html:65 +#: xpack/plugins/license/templates/license/license_detail.html:69 +#: xpack/plugins/license/templates/license/license_detail.html:73 +#: xpack/plugins/license/templates/license/license_detail.html:77 msgid "Unlimited" msgstr "无限制" -#: xpack/plugins/license/templates/license/license_detail.html:67 +#: xpack/plugins/license/templates/license/license_detail.html:76 +msgid "Concurrent connections" +msgstr "并发连接" + +#: xpack/plugins/license/templates/license/license_detail.html:81 msgid "Edition" msgstr "版本" -#: xpack/plugins/license/templates/license/license_detail.html:69 -msgid "Enterprise edition" -msgstr "企业版" - -#: xpack/plugins/license/templates/license/license_detail.html:93 +#: xpack/plugins/license/templates/license/license_detail.html:106 msgid "Technology consulting" msgstr "技术咨询" -#: xpack/plugins/license/templates/license/license_detail.html:96 +#: xpack/plugins/license/templates/license/license_detail.html:109 msgid "Consult" msgstr "咨询"