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 a56cbd92..020dc1e0 100644 Binary files a/app/src/language/zh_CN/app.mo and b/app/src/language/zh_CN/app.mo differ 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