From 66571bc1d4fc31aa47563efe6edafabb138362a3 Mon Sep 17 00:00:00 2001 From: 0xJacky Date: Tue, 6 Feb 2024 16:25:20 +0800 Subject: [PATCH] chore: prepare v2.0.0-beta.14 --- app/package.json | 2 +- app/src/language/LINGUAS | 2 +- app/src/language/en/app.po | 9 +++++---- app/src/language/es/app.po | 12 ++++++++---- app/src/language/fr_FR/app.po | 9 +++++---- app/src/language/messages.pot | 8 ++++---- app/src/language/ru_RU/app.po | 9 +++++---- app/src/language/vi_VN/app.po | 8 ++++---- app/src/language/zh_CN/app.mo | Bin 22479 -> 22480 bytes app/src/language/zh_CN/app.po | 11 +++++++---- app/src/language/zh_TW/app.po | 9 +++++---- app/src/version.json | 2 +- .../views/certificate/CertificateEditor.vue | 2 +- app/version.json | 2 +- 14 files changed, 48 insertions(+), 37 deletions(-) diff --git a/app/package.json b/app/package.json index 88f602e8..0f2d43ad 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "nginx-ui-app-next", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "type": "module", "scripts": { "dev": "vite", diff --git a/app/src/language/LINGUAS b/app/src/language/LINGUAS index 39b120b5..e6be8ba0 100644 --- a/app/src/language/LINGUAS +++ b/app/src/language/LINGUAS @@ -1 +1 @@ -es fr_FR ru_RU vi_VN zh_CN zh_TW +en zh_CN zh_TW fr_FR es ru_RU vi_VN \ No newline at end of file diff --git a/app/src/language/en/app.po b/app/src/language/en/app.po index bacc54c1..0b5592e0 100644 --- a/app/src/language/en/app.po +++ b/app/src/language/en/app.po @@ -1561,14 +1561,15 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "Certificate Status" +#: src/views/certificate/CertificateEditor.vue:168 +#, fuzzy +msgid "The path exists, but the file is not a certificate" +msgstr "Certificate Status" + #: src/views/certificate/CertificateEditor.vue:183 msgid "The path exists, but the file is not a private key" msgstr "" -#: src/views/certificate/CertificateEditor.vue:168 -msgid "The path exists, but the file is not a public key" -msgstr "" - #: src/views/domain/cert/components/AutoCertStepOne.vue:45 #, fuzzy msgid "" diff --git a/app/src/language/es/app.po b/app/src/language/es/app.po index 48b54dda..ec764b4a 100644 --- a/app/src/language/es/app.po +++ b/app/src/language/es/app.po @@ -1492,14 +1492,15 @@ msgstr "La entrada no es un Certificado SSL" msgid "The input is not a SSL Certificate Key" msgstr "La entrada no es una clave de certificado SSL" +#: src/views/certificate/CertificateEditor.vue:168 +#, fuzzy +msgid "The path exists, but the file is not a certificate" +msgstr "La ruta existe, pero el archivo no es una clave privada" + #: src/views/certificate/CertificateEditor.vue:183 msgid "The path exists, but the file is not a private key" msgstr "La ruta existe, pero el archivo no es una clave privada" -#: src/views/certificate/CertificateEditor.vue:168 -msgid "The path exists, but the file is not a public key" -msgstr "La ruta existe, pero el archivo no es una clave pública" - #: src/views/domain/cert/components/AutoCertStepOne.vue:45 msgid "" "The server_name in the current configuration must be the domain name you " @@ -1672,6 +1673,9 @@ msgstr "Estás usando la última versión" msgid "You can check Nginx UI upgrade at this page." msgstr "Puede consultar la actualización de Nginx UI en esta página." +#~ msgid "The path exists, but the file is not a public key" +#~ msgstr "La ruta existe, pero el archivo no es una clave pública" + #, fuzzy #~ msgid "Server" #~ msgstr "Información del servidor" diff --git a/app/src/language/fr_FR/app.po b/app/src/language/fr_FR/app.po index 16d1fcf1..5f42b07b 100644 --- a/app/src/language/fr_FR/app.po +++ b/app/src/language/fr_FR/app.po @@ -1559,14 +1559,15 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "Chemin de la clé du certificat SSL" +#: src/views/certificate/CertificateEditor.vue:168 +#, fuzzy +msgid "The path exists, but the file is not a certificate" +msgstr "Chemin de la clé du certificat SSL" + #: src/views/certificate/CertificateEditor.vue:183 msgid "The path exists, but the file is not a private key" msgstr "" -#: src/views/certificate/CertificateEditor.vue:168 -msgid "The path exists, but the file is not a public key" -msgstr "" - #: src/views/domain/cert/components/AutoCertStepOne.vue:45 #, fuzzy msgid "" diff --git a/app/src/language/messages.pot b/app/src/language/messages.pot index dc5dce4c..9908bb78 100644 --- a/app/src/language/messages.pot +++ b/app/src/language/messages.pot @@ -1508,12 +1508,12 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "" -#: src/views/certificate/CertificateEditor.vue:183 -msgid "The path exists, but the file is not a private key" +#: src/views/certificate/CertificateEditor.vue:168 +msgid "The path exists, but the file is not a certificate" msgstr "" -#: src/views/certificate/CertificateEditor.vue:168 -msgid "The path exists, but the file is not a public key" +#: src/views/certificate/CertificateEditor.vue:183 +msgid "The path exists, but the file is not a private key" msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:45 diff --git a/app/src/language/ru_RU/app.po b/app/src/language/ru_RU/app.po index 948e372e..58c77d38 100644 --- a/app/src/language/ru_RU/app.po +++ b/app/src/language/ru_RU/app.po @@ -1567,14 +1567,15 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "Путь к ключу сертификата SSL" +#: src/views/certificate/CertificateEditor.vue:168 +#, fuzzy +msgid "The path exists, but the file is not a certificate" +msgstr "Путь к ключу сертификата SSL" + #: src/views/certificate/CertificateEditor.vue:183 msgid "The path exists, but the file is not a private key" msgstr "" -#: src/views/certificate/CertificateEditor.vue:168 -msgid "The path exists, but the file is not a public key" -msgstr "" - #: src/views/domain/cert/components/AutoCertStepOne.vue:45 #, fuzzy msgid "" diff --git a/app/src/language/vi_VN/app.po b/app/src/language/vi_VN/app.po index ce47eada..9a86d192 100644 --- a/app/src/language/vi_VN/app.po +++ b/app/src/language/vi_VN/app.po @@ -1564,12 +1564,12 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "" -#: src/views/certificate/CertificateEditor.vue:183 -msgid "The path exists, but the file is not a private key" +#: src/views/certificate/CertificateEditor.vue:168 +msgid "The path exists, but the file is not a certificate" msgstr "" -#: src/views/certificate/CertificateEditor.vue:168 -msgid "The path exists, but the file is not a public key" +#: src/views/certificate/CertificateEditor.vue:183 +msgid "The path exists, but the file is not a private key" msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:45 diff --git a/app/src/language/zh_CN/app.mo b/app/src/language/zh_CN/app.mo index a56cbd92a76324ef6aae52be66a69492ea464eea..020dc1e0c7ac64a21549f156ca7a3169b085c609 100644 GIT binary patch delta 3255 zcmXZedrX&A9LMqJC-{qtg5nKC5l}>u<~6*aa!E;3FaxoP6=-Eb?1x8DkKzi(W5PJM!J(-B66}P_ zQ1jN9>ro4CHn*b==6__3lc)*TZNPtKRF2E{Kov+b2bv>M@4y7q%}ho;l2TN?GSs}; zsCT0pbptQDe&5?*1GboTW|JG>wO|Yr4qN^^)XC3T|1Hah<+=qsnLY6ChEd}OT7Ep< z-6%%#{&}U=QI480&*CMhoj!-kzl!=bY(^D0f;!JCcF>#S$~`Lhs-;c59YghUCf?lia7vNs51zC zEijFS7JL+Sf=bN7YSc?rhe`MqCgVla+Z_FX%cr37xv0Vwn2IY=_3KdccVZzPMLm+9 zMDKDYci^P+hLH9v&fVEY1hlZmJ}4OK52yI{Uq>eJ9w zJcYw>B?j?R)XUdw9y5Q&Aotk~YKu3S@1PcLL_La6EIwrYUt^qp|E-p|WCL!Rfyr)x z2(z1+iYhn=BQXc{Y$u^kKGmF$IzWxZYb~xv-Q36Mt8tiycG_wK&Y%ikMlBRVU2((| zH!jIcGc(O$*p6|dF$~9I2h2mQQ-oTl0te&#DcrvjTdd=4vmP~}!Q%bqml#F8SC;Q70aUI#5390F%sFsCw1r3e>n)d>SgS4mDw`4cKYJi>Hx0G$AdAOfC*lIse@y-i8hW-*V=TUey5fzf9lnJsP-ixwzF;jDpES>) z7QBp_7edv$W5!N%eZQAYdZ$uK+(yQsHdcf>*pt|*-~R#{x`Be}uA>0r!4=A#h0xA23E!~;I<_?m$ED3c&x(bQ5(5{`ewJGzWp6%xCJs$@n9T^ zQ&2bO;{dG30Or;3V3|9YM8_nh-R55M32!O7hbCw52d zNloyFc%FBo!1L;{U!muv;tuSC`%(R!*cVeD_PjJ4h1nRy7+i`Ma5<)6O_AqCE00mQ z3=?oAs(u5;;af$X@7+h^eGhF%)SO%)_Ae@DT z_yTUlSWF)24w8;NiHk@2Zih2T1W452gSZ-Vu?2JRTg;E}yuVN<$sFzMgYm?JQ45Sf zZLrkhO0x=e&?m7gE=7%7A)PkGM?WlwKA6erRYQl9J@Sho9?DA=-0$FB%vk>(Tj7QzfB-A6RLe;BA&6|aK zH|kI~@RIBIy^S_ti`i)IbpyP1yq5`wE&mw6_MGI0WC;cV2z)f#~7P|ti5K7{+N|C05G%{!Kl8SCbym_5vZ*%x!DGZ1|( zFolK|oPj#QGgyFisF$h{v+*ko;6>EioG{Mi1E_p4s&Fm##xZEf~8w;7+Pz$%PD(D2A@Se;yTm~`pao(=dYj& zZ^S&@g4$Rc>W02Yjr#|CV$4L(>xMbzFx31qv)l}#=2crfA62gosqcFmtYar?;2zAy zHq_OfH^ZoRCFxQ3>;kBG0BYPAd;q7RHeQdaw;8pu?Wmjh(BggAMZf<8G~($vY8|J{ zGpGXR%|CGo@hyuNO>+G!P=y;T-ekUqT6h=gQG9Iim)8F^rs((IVTsE&;HK$Kb_>Lr zsb&tU;6RMWF{o!d5q0uPb3W<-t1Vtr~6~2O6D2%$|xNb1=gb`Y_$Q+mfvUbLF+$h{%ZLf7Dr8S z1=GwdRNXw(!UHWHiOIxesQ;M!=`{3g7h_j^8Fj@W)DGW46=*c~qP}457N0WDp%%P? zniodZyJOz_xceKCZ5AUp>3g*_w7?3p!3?1aZ8LYE7T9I+XQ)TfZt)KoP5cY$K)<0j z@UQhJOm+3TnHhKG`QJ|?g@O6F6pOGgHe&!!V?JI-eHnWNouxRFcpmD;zCdm0IO?Ul zfO@9_)7(Zzqc&E7I@laMqu>8R8oGh9D%UX;^)fwy%0Fc;wEkrl*Q36aZ=g=P8{{u?+qg#ouMkvyHh{lw|G09T$|_6_9Vy6-UGn_wMGNM% a<`t&*3e^VVLSuv3QNO?1+&U+?IQoBM<8_h% diff --git a/app/src/language/zh_CN/app.po b/app/src/language/zh_CN/app.po index 24d1ad6c..26370f70 100644 --- a/app/src/language/zh_CN/app.po +++ b/app/src/language/zh_CN/app.po @@ -1479,14 +1479,14 @@ msgstr "输入的内容不是 SSL 证书" msgid "The input is not a SSL Certificate Key" msgstr "输入的内容不是 SSL 证书密钥" +#: src/views/certificate/CertificateEditor.vue:168 +msgid "The path exists, but the file is not a certificate" +msgstr "路径存在，但文件不是证书" + #: src/views/certificate/CertificateEditor.vue:183 msgid "The path exists, but the file is not a private key" msgstr "路径存在，但文件不是私钥" -#: src/views/certificate/CertificateEditor.vue:168 -msgid "The path exists, but the file is not a public key" -msgstr "路径存在，但文件不是公钥" - #: src/views/domain/cert/components/AutoCertStepOne.vue:45 msgid "" "The server_name in the current configuration must be the domain name you " @@ -1652,6 +1652,9 @@ msgstr "您使用的是最新版本" msgid "You can check Nginx UI upgrade at this page." msgstr "你可以在这个页面检查Nginx UI的升级。" +#~ msgid "The path exists, but the file is not a public key" +#~ msgstr "路径存在，但文件不是公钥" + #~ msgid "Rename Upstream" #~ msgstr "重新命名 Upstream" diff --git a/app/src/language/zh_TW/app.po b/app/src/language/zh_TW/app.po index f633bd22..d3263ba3 100644 --- a/app/src/language/zh_TW/app.po +++ b/app/src/language/zh_TW/app.po @@ -1526,14 +1526,15 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "SSL 憑證金鑰路徑" +#: src/views/certificate/CertificateEditor.vue:168 +#, fuzzy +msgid "The path exists, but the file is not a certificate" +msgstr "SSL 憑證金鑰路徑" + #: src/views/certificate/CertificateEditor.vue:183 msgid "The path exists, but the file is not a private key" msgstr "" -#: src/views/certificate/CertificateEditor.vue:168 -msgid "The path exists, but the file is not a public key" -msgstr "" - #: src/views/domain/cert/components/AutoCertStepOne.vue:45 #, fuzzy msgid "" diff --git a/app/src/version.json b/app/src/version.json index 06a27421..c6cd25ba 100644 --- a/app/src/version.json +++ b/app/src/version.json @@ -1 +1 @@ -{"version":"2.0.0-beta.11","build_id":111,"total_build":315} \ No newline at end of file +{"version":"2.0.0-beta.14","build_id":112,"total_build":316} \ No newline at end of file diff --git a/app/src/views/certificate/CertificateEditor.vue b/app/src/views/certificate/CertificateEditor.vue index c00e243f..71b6fb2f 100644 --- a/app/src/views/certificate/CertificateEditor.vue +++ b/app/src/views/certificate/CertificateEditor.vue @@ -165,7 +165,7 @@ const isManaged = computed(() => { :validate-status="errors.ssl_certificate_path ? 'error' : ''" :help="errors.ssl_certificate_path === 'required' ? $gettext('This field is required') : errors.ssl_certificate_path === 'certificate_path' - ? $gettext('The path exists, but the file is not a public key') : ''" + ? $gettext('The path exists, but the file is not a certificate') : ''" >

{{ data.ssl_certificate_path }} diff --git a/app/version.json b/app/version.json index 06a27421..c6cd25ba 100644 --- a/app/version.json +++ b/app/version.json @@ -1 +1 @@ -{"version":"2.0.0-beta.11","build_id":111,"total_build":315} \ No newline at end of file +{"version":"2.0.0-beta.14","build_id":112,"total_build":316} \ No newline at end of file