From 0ca9d84d10912fc932d4c6e265df5f46e74d0ef6 Mon Sep 17 00:00:00 2001 From: Jacky Date: Sun, 30 Mar 2025 14:02:53 +0000 Subject: [PATCH] feat: enhance restore functionality with nginx restart and countdown dialog --- api/system/restore.go | 15 +-- .../SystemRestore/SystemRestoreContent.vue | 2 +- app/src/language/ar/app.po | 114 +++++++++-------- app/src/language/de_DE/app.po | 114 +++++++++-------- app/src/language/en/app.po | 114 +++++++++-------- app/src/language/es/app.po | 114 +++++++++-------- app/src/language/fr_FR/app.po | 114 +++++++++-------- app/src/language/ko_KR/app.po | 114 +++++++++-------- app/src/language/messages.pot | 113 +++++++++-------- app/src/language/ru_RU/app.po | 114 +++++++++-------- app/src/language/tr_TR/app.po | 114 +++++++++-------- app/src/language/vi_VN/app.po | 114 +++++++++-------- app/src/language/zh_CN/app.po | 115 ++++++++++-------- app/src/language/zh_TW/app.po | 114 +++++++++-------- app/src/version.json | 2 +- app/src/views/other/Install.vue | 2 +- app/src/views/system/Backup/SystemRestore.vue | 4 +- internal/backup/restore.go | 10 -- internal/middleware/encrypted_params.go | 6 - 19 files changed, 768 insertions(+), 641 deletions(-) diff --git a/api/system/restore.go b/api/system/restore.go index f92c7e85..50ff619b 100644 --- a/api/system/restore.go +++ b/api/system/restore.go @@ -9,10 +9,10 @@ import ( "time" "github.com/0xJacky/Nginx-UI/internal/backup" + "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/gin-gonic/gin" "github.com/jpillora/overseer" "github.com/uozi-tech/cosy" - "github.com/uozi-tech/cosy/logger" ) // RestoreResponse contains the response data for restore operation @@ -29,10 +29,6 @@ func RestoreBackup(c *gin.Context) { restoreNginxUI := c.PostForm("restore_nginx_ui") == "true" verifyHash := c.PostForm("verify_hash") == "true" securityToken := c.PostForm("security_token") // Get concatenated key and IV - logger.Debug("restoreNginx", restoreNginx) - logger.Debug("restoreNginxUI", restoreNginxUI) - logger.Debug("verifyHash", verifyHash) - logger.Debug("securityToken", securityToken) // Get backup file backupFile, err := c.FormFile("backup_file") if err != nil { @@ -40,8 +36,6 @@ func RestoreBackup(c *gin.Context) { return } - logger.Debug("backupFile", backupFile.Size) - // Validate security token if securityToken == "" { cosy.ErrHandler(c, backup.ErrInvalidSecurityToken) @@ -118,6 +112,13 @@ func RestoreBackup(c *gin.Context) { defer os.RemoveAll(restoreDir) } + if restoreNginx { + go func() { + time.Sleep(2 * time.Second) + nginx.Restart() + }() + } + if restoreNginxUI { go func() { time.Sleep(2 * time.Second) diff --git a/app/src/components/SystemRestore/SystemRestoreContent.vue b/app/src/components/SystemRestore/SystemRestoreContent.vue index 9b28276e..72a1edfb 100644 --- a/app/src/components/SystemRestore/SystemRestoreContent.vue +++ b/app/src/components/SystemRestore/SystemRestoreContent.vue @@ -336,7 +336,7 @@ async function doRestore() { {{ $gettext('Nginx UI configuration has been restored and will restart automatically in a few seconds.') }}

- {{ $gettext('You can close this dialog in') }} {{ countdown }} {{ $gettext('seconds') }} + {{ $gettext('You can close this dialog in %{countdown} seconds', { countdown: countdown.toString() }) }}

{{ $gettext('You can close this dialog now') }} diff --git a/app/src/language/ar/app.po b/app/src/language/ar/app.po index bf5c36af..cd6dc2e0 100644 --- a/app/src/language/ar/app.po +++ b/app/src/language/ar/app.po @@ -252,7 +252,7 @@ msgstr "تم تعطيل التجديد التلقائي لـ‎%{name}" msgid "Auto-renewal enabled for %{name}" msgstr "تم تمكين التجديد التلقائي لـ‏%{name}" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -277,7 +277,7 @@ msgstr "العودة إلى القائمة" msgid "Backup" msgstr "رجوع" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -499,8 +499,8 @@ msgstr "مسح" msgid "Cleared successfully" msgstr "تم المسح بنجاح" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -668,7 +668,7 @@ msgstr "قم بتخصيص اسم العقدة المحلية ليتم عرضها msgid "Dashboard" msgstr "لوحة المعلومات" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "قاعدة البيانات (اختياري، الافتراضي: قاعدة البيانات)" @@ -981,7 +981,7 @@ msgstr "تعديل البث" msgid "Email" msgstr "بريد إلكتروني" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "البريد الإلكتروني (*)" @@ -1556,11 +1556,11 @@ msgstr "أدخل الرمز من التطبيق:" msgid "Input the recovery code:" msgstr "أدخل رمز الاسترداد:" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "تثبيت" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 msgid "Install successfully" msgstr "تم التثبيت بنجاح" @@ -1568,7 +1568,7 @@ msgstr "تم التثبيت بنجاح" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1592,7 +1592,7 @@ msgstr "رمز 2FA أو الاسترداد غير صالح" msgid "Invalid AES key format: {0}" msgstr "رمز 2FA أو الاسترداد غير صالح" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "اسم ملف غير صالح" @@ -1894,7 +1894,7 @@ msgstr "إجمالي استقبال الشبكة" msgid "Network Total Send" msgstr "إجمالي إرسال الشبكة" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "تثبيت" @@ -1954,7 +1954,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "قائمة السماح لمجلد سجلات Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "خطأ في تحليل تكوين Nginx" @@ -2013,12 +2013,12 @@ msgstr "تم إعادة تشغيل Nginx بنجاح" msgid "Nginx UI already installed" msgstr "هذه القيمة مستخدمة مسبقا" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "خطأ في تحليل تكوين Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2121,7 +2121,6 @@ msgstr "حسنًا" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2146,7 +2145,7 @@ msgstr "بمجرد اكتمال التحقق، سيتم إزالة السجلا msgid "Online" msgstr "متصل" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2209,7 +2208,7 @@ msgstr "" msgid "Password" msgstr "كلمة المرور" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "كلمة المرور (*)" @@ -2218,7 +2217,7 @@ msgstr "كلمة المرور (*)" msgid "Password incorrect" msgstr "اسم المستخدم أو كلمة المرور غير صحيحة" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2263,13 +2262,13 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "يرجى إدخال رمز OTP:" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 #, fuzzy msgid "Please enter the security token" msgstr "يرجى إدخال رمز OTP:" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2319,18 +2318,22 @@ msgid "" "configuration." msgstr "يرجى إدخال الاسم، سيتم استخدامه كاسم الملف للتكوين الجديد." -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "يرجى إدخال بريدك الإلكتروني!" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "يرجى إدخال كلمة المرور الخاصة بك!" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "يرجى إدخال اسم المستخدم الخاص بك!" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2340,7 +2343,7 @@ msgstr "يرجى ملاحظة أن تكوين وحدات الوقت أدناه msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "يرجى اختيار عقدة واحدة على الأقل!" @@ -2617,24 +2620,24 @@ msgstr "إعادة تشغيل" msgid "Restarting" msgstr "إعادة التشغيل" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "تم الحذف بنجاح" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "نظام" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "مجلد تكوينات Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "مجلد تكوينات Nginx" @@ -2750,8 +2753,8 @@ msgstr "حزمة تطوير البرمجيات SDK" msgid "Secret has been copied" msgstr "تم نسخ السر" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -2903,8 +2906,8 @@ msgstr "تسجيل الدخول عبر SSO" msgid "Stable" msgstr "مستقر" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -2961,8 +2964,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3053,14 +3056,15 @@ msgstr "نظام" msgid "System Initial User" msgstr "مستخدم النظام الأولي" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "نظام" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "تم إعادة تشغيل Nginx بنجاح" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3084,7 +3088,7 @@ msgstr "" "سيتم فحص شهادة النطاق لمدة 30 دقيقة، وسيتم تجديدها إذا مر أكثر من أسبوع أو " "الفترة التي حددتها في الإعدادات منذ إصدارها الأخير." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "لا يمكن أن يحتوي اسم الملف على الأحرف التالية: %{c}" @@ -3228,15 +3232,15 @@ msgstr "" msgid "This value is already taken" msgstr "هذه القيمة مستخدمة مسبقا" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3413,7 +3417,7 @@ msgstr "" msgid "Username" msgstr "اسم المستخدم" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "اسم المستخدم (*)" @@ -3423,8 +3427,8 @@ msgstr "اسم المستخدم (*)" msgid "Valid" msgstr "صالح" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3467,8 +3471,8 @@ msgstr "عرض" msgid "Warning" msgstr "تحذير" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3549,6 +3553,14 @@ msgstr "أنت تستخدم أحدث إصدار" msgid "You can check Nginx UI upgrade at this page." msgstr "يمكنك التحقق من ترقية Nginx UI في هذه الصفحة." +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/de_DE/app.po b/app/src/language/de_DE/app.po index d9b7cf3c..a4dc0539 100644 --- a/app/src/language/de_DE/app.po +++ b/app/src/language/de_DE/app.po @@ -265,7 +265,7 @@ msgstr "Automatische Verlängerung deaktiviert für %{name}" msgid "Auto-renewal enabled for %{name}" msgstr "Automatische Verlängerung aktiviert für %{name}" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -291,7 +291,7 @@ msgstr "Zurück zur Liste" msgid "Backup" msgstr "Zurück" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -516,8 +516,8 @@ msgstr "Säubern" msgid "Cleared successfully" msgstr "Erfolgreich deaktiviert" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -692,7 +692,7 @@ msgstr "" msgid "Dashboard" msgstr "Übersicht" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "Datenbank (Optional, Standard: database)" @@ -1022,7 +1022,7 @@ msgstr "Seite bearbeiten" msgid "Email" msgstr "Email (*)" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "Email (*)" @@ -1611,11 +1611,11 @@ msgstr "Füge den Code aus der App ein:" msgid "Input the recovery code:" msgstr "Füge den Wiederherstellungscode ein:" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "Installieren" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 #, fuzzy msgid "Install successfully" msgstr "Aktualisierung erfolgreich" @@ -1624,7 +1624,7 @@ msgstr "Aktualisierung erfolgreich" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1647,7 +1647,7 @@ msgstr "" msgid "Invalid AES key format: {0}" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "Ungültige E-Mail!" @@ -1970,7 +1970,7 @@ msgstr "Gesamter Netzwerkempfang" msgid "Network Total Send" msgstr "Gesamter Netzwerkversand" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "Installieren" @@ -2032,7 +2032,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "Nginx-Log-Verzeichnis-Whitelist" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Name der Konfiguration" @@ -2095,12 +2095,12 @@ msgstr "Speichern erfolgreich" msgid "Nginx UI already installed" msgstr "Dieser Wert ist bereits vergeben" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Name der Konfiguration" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2208,7 +2208,6 @@ msgstr "OK" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2234,7 +2233,7 @@ msgstr "" msgid "Online" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2298,7 +2297,7 @@ msgstr "" msgid "Password" msgstr "Passwort" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "Passwort (*)" @@ -2307,7 +2306,7 @@ msgstr "Passwort (*)" msgid "Password incorrect" msgstr "Benuztername oder Passwort ist falsch" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "Passwort darf nicht länger als 20 Zeichen sein" @@ -2353,13 +2352,13 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "Bitte gib den OTP-Code ein:" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 #, fuzzy msgid "Please enter the security token" msgstr "Bitte gib den OTP-Code ein:" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2418,18 +2417,22 @@ msgstr "" "Bitte gib einen Namen ein, der als Dateiname der neuen Konfiguration " "verwendet wird." -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "Bitte gib deine E-Mail-Adresse ein!" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "Bitte gib dein Passwort ein!" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "Bitte gib deinen Benutzernamen ein!" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2441,7 +2444,7 @@ msgstr "" msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "Bitte wähle mindestens einen Knoten aus!" @@ -2740,24 +2743,24 @@ msgstr "Neustart" msgid "Restarting" msgstr "Starte neu" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "Erfolgreich deaktiviert" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "System" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Name der Konfiguration" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Name der Konfiguration" @@ -2878,8 +2881,8 @@ msgstr "SDK" msgid "Secret has been copied" msgstr "Schlüssel wurde kopiert" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -3036,8 +3039,8 @@ msgstr "Login" msgid "Stable" msgstr "Altiviert" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -3092,8 +3095,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3191,14 +3194,15 @@ msgstr "System" msgid "System Initial User" msgstr "System-Startbenutzer" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "System" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Speichern erfolgreich" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3223,7 +3227,7 @@ msgstr "" "Das Zertifikat für die Domain wird alle Stunde überprüft und erneuert, wenn " "es seit der letzten Ausstellung vor mehr als 1 Monat ausgestellt wurde." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "Der Dateiname darf die folgenden Zeichen nicht enthalten: %{c}" @@ -3370,15 +3374,15 @@ msgstr "" msgid "This value is already taken" msgstr "Dieser Wert ist bereits vergeben" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3558,7 +3562,7 @@ msgstr "" msgid "Username" msgstr "Benutzername" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "Benutzername (*)" @@ -3568,8 +3572,8 @@ msgstr "Benutzername (*)" msgid "Valid" msgstr "Gültig" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3614,8 +3618,8 @@ msgstr "Anzeigen" msgid "Warning" msgstr "Warnung" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3699,6 +3703,14 @@ msgstr "Du verwendest die neueste Version" msgid "You can check Nginx UI upgrade at this page." msgstr "Du kannst das Nginx UI-Upgrade auf dieser Seite überprüfen." +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/en/app.po b/app/src/language/en/app.po index 33727219..a7aa88a3 100644 --- a/app/src/language/en/app.po +++ b/app/src/language/en/app.po @@ -263,7 +263,7 @@ msgstr "Auto-renewal disabled for %{name}" msgid "Auto-renewal enabled for %{name}" msgstr "Auto-renewal enabled for %{name}" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -289,7 +289,7 @@ msgstr "" msgid "Backup" msgstr "Back" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -511,8 +511,8 @@ msgstr "" msgid "Cleared successfully" msgstr "Disabled successfully" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -684,7 +684,7 @@ msgstr "" msgid "Dashboard" msgstr "Dashboard" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "Database (Optional, default: database)" @@ -1009,7 +1009,7 @@ msgstr "Edit Site" msgid "Email" msgstr "Email (*)" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "Email (*)" @@ -1593,11 +1593,11 @@ msgstr "" msgid "Input the recovery code:" msgstr "" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "Install" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 #, fuzzy msgid "Install successfully" msgstr "Enabled successfully" @@ -1606,7 +1606,7 @@ msgstr "Enabled successfully" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1631,7 +1631,7 @@ msgstr "Invalid E-mail!" msgid "Invalid AES key format: {0}" msgstr "Invalid E-mail!" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "Invalid E-mail!" @@ -1950,7 +1950,7 @@ msgstr "Network Total Receive" msgid "Network Total Send" msgstr "Network Total Send" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "Install" @@ -2012,7 +2012,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "Configuration Name" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Configuration Name" @@ -2075,12 +2075,12 @@ msgstr "Saved successfully" msgid "Nginx UI already installed" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Configuration Name" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2185,7 +2185,6 @@ msgstr "" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2210,7 +2209,7 @@ msgstr "" msgid "Online" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2270,7 +2269,7 @@ msgstr "" msgid "Password" msgstr "Password" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "Password (*)" @@ -2279,7 +2278,7 @@ msgstr "Password (*)" msgid "Password incorrect" msgstr "Password" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2324,12 +2323,12 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 msgid "Please enter the security token" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2379,18 +2378,22 @@ msgid "" "configuration." msgstr "" -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "Please input your E-mail!" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "Please input your password!" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "Please input your username!" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2400,7 +2403,7 @@ msgstr "" msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "Please input your username!" @@ -2699,24 +2702,24 @@ msgstr "" msgid "Restarting" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "Disabled successfully" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "Created at" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Configuration Name" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Configuration Name" @@ -2836,8 +2839,8 @@ msgstr "" msgid "Secret has been copied" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -2995,8 +2998,8 @@ msgstr "Login" msgid "Stable" msgstr "Enabled" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -3053,8 +3056,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3152,13 +3155,14 @@ msgstr "" msgid "System Initial User" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 msgid "System Restore" msgstr "" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Saved successfully" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3183,7 +3187,7 @@ msgstr "" "The certificate for the domain will be checked every hour, and will be " "renewed if it has been more than 1 month since it was last issued." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "The filename cannot contain the following characters: %{c}" @@ -3321,15 +3325,15 @@ msgstr "" msgid "This value is already taken" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3495,7 +3499,7 @@ msgstr "" msgid "Username" msgstr "Username" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "Username (*)" @@ -3506,8 +3510,8 @@ msgstr "Username (*)" msgid "Valid" msgstr "Invalid E-mail!" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3553,8 +3557,8 @@ msgstr "Basic Mode" msgid "Warning" msgstr "Warning" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3629,6 +3633,14 @@ msgstr "" msgid "You can check Nginx UI upgrade at this page." msgstr "" +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/es/app.po b/app/src/language/es/app.po index c0a11afd..caacafda 100644 --- a/app/src/language/es/app.po +++ b/app/src/language/es/app.po @@ -257,7 +257,7 @@ msgstr "Renovación automática deshabilitada por %{name}" msgid "Auto-renewal enabled for %{name}" msgstr "Renovación automática habilitada por %{name}" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -282,7 +282,7 @@ msgstr "Volver a la lista" msgid "Backup" msgstr "Volver" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -498,8 +498,8 @@ msgstr "Borrar" msgid "Cleared successfully" msgstr "Limpiado exitoso" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -669,7 +669,7 @@ msgstr "" msgid "Dashboard" msgstr "Panel" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "Base de datos (Opcional, default: database)" @@ -981,7 +981,7 @@ msgstr "Editar Transmisión" msgid "Email" msgstr "Correo" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "Correo (*)" @@ -1559,11 +1559,11 @@ msgstr "Ingrese el código de la aplicación:" msgid "Input the recovery code:" msgstr "Ingrese el código de recuperación:" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "Instalar" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 msgid "Install successfully" msgstr "Instalación exitosa" @@ -1571,7 +1571,7 @@ msgstr "Instalación exitosa" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1593,7 +1593,7 @@ msgstr "" msgid "Invalid AES key format: {0}" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "Nombre de archivo inválido" @@ -1897,7 +1897,7 @@ msgstr "Total recibido por la red" msgid "Network Total Send" msgstr "Total enviado por la red" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "Instalar" @@ -1957,7 +1957,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "Lista blanca de directorios de registro de Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Error de análisis de configuración de Nginx" @@ -2019,12 +2019,12 @@ msgstr "Nginx reiniciado con éxito" msgid "Nginx UI already installed" msgstr "Este valor ya está elegido" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Error de análisis de configuración de Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2129,7 +2129,6 @@ msgstr "Ok" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2154,7 +2153,7 @@ msgstr "Una vez que se complete la verificación, los registros se eliminarán." msgid "Online" msgstr "En línea" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2218,7 +2217,7 @@ msgstr "" msgid "Password" msgstr "Contraseña" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "Contraseña (*)" @@ -2227,7 +2226,7 @@ msgstr "Contraseña (*)" msgid "Password incorrect" msgstr "El nombre de usuario o contraseña son incorrectos" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2274,13 +2273,13 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "Por favor, ingrese el código 2FA:" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 #, fuzzy msgid "Please enter the security token" msgstr "Por favor, ingrese el código 2FA:" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2337,18 +2336,22 @@ msgstr "" "Ingrese el nombre por favor, este se usará como el nombre de archivo de la " "nueva configuración." -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "¡Por favor ingrese su correo electrónico!" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "¡Por favor ingrese su contraseña!" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "¡Por favor ingrese su nombre de usuario!" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2360,7 +2363,7 @@ msgstr "" msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "¡Seleccione al menos un nodo!" @@ -2645,24 +2648,24 @@ msgstr "Reiniciar" msgid "Restarting" msgstr "Reiniciando" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "Borrado exitoso" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "Sistema" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Error de análisis de configuración de Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Error de análisis de configuración de Nginx" @@ -2782,8 +2785,8 @@ msgstr "SDK" msgid "Secret has been copied" msgstr "El secreto ha sido copiado" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -2933,8 +2936,8 @@ msgstr "Acceso SSO" msgid "Stable" msgstr "Estable" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -2990,8 +2993,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3084,14 +3087,15 @@ msgstr "Sistema" msgid "System Initial User" msgstr "Usuario inicial del sistema" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "Sistema" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Nginx reiniciado con éxito" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3116,7 +3120,7 @@ msgstr "" "renovado si ha pasado más de 1 semana o el período que configuró en ajustes " "desde que fue emitido por última vez." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "" "El nombre del archivo no puede contener los siguientes caracteres: %{c}" @@ -3269,15 +3273,15 @@ msgstr "" msgid "This value is already taken" msgstr "Este valor ya está elegido" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3455,7 +3459,7 @@ msgstr "" msgid "Username" msgstr "Nombre de usuario" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "Nombre de usuario (*)" @@ -3465,8 +3469,8 @@ msgstr "Nombre de usuario (*)" msgid "Valid" msgstr "Válido" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3509,8 +3513,8 @@ msgstr "Ver" msgid "Warning" msgstr "Advertencia" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3594,6 +3598,14 @@ 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." +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/fr_FR/app.po b/app/src/language/fr_FR/app.po index 461e3fb2..b970d5b9 100644 --- a/app/src/language/fr_FR/app.po +++ b/app/src/language/fr_FR/app.po @@ -269,7 +269,7 @@ msgstr "Renouvellement automatique désactivé pour %{name}" msgid "Auto-renewal enabled for %{name}" msgstr "Renouvellement automatique activé pour %{name}" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -294,7 +294,7 @@ msgstr "Retour à la liste" msgid "Backup" msgstr "Retour" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -522,8 +522,8 @@ msgstr "Effacer" msgid "Cleared successfully" msgstr "Désactivé avec succès" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -697,7 +697,7 @@ msgstr "" msgid "Dashboard" msgstr "Dashboard" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "Base de données (Facultatif, par défaut : database)" @@ -1026,7 +1026,7 @@ msgstr "Modifier le site" msgid "Email" msgstr "Email (*)" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "Email (*)" @@ -1624,11 +1624,11 @@ msgstr "Entrez le code de l'application :" msgid "Input the recovery code:" msgstr "Entrez le code de récupération :" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "Installer" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 msgid "Install successfully" msgstr "Installé avec succès" @@ -1636,7 +1636,7 @@ msgstr "Installé avec succès" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1660,7 +1660,7 @@ msgstr "Format de la requête invalide" msgid "Invalid AES key format: {0}" msgstr "Format de la requête invalide" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "Nom de fichier invalide" @@ -1976,7 +1976,7 @@ msgstr "Réception totale du réseau" msgid "Network Total Send" msgstr "Envoi total réseau" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "Installer" @@ -2039,7 +2039,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "Erreur d'analyse de configuration Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Erreur d'analyse de configuration Nginx" @@ -2102,12 +2102,12 @@ msgstr "Nginx a redémarré avec succès" msgid "Nginx UI already installed" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Erreur d'analyse de configuration Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2210,7 +2210,6 @@ msgstr "" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2235,7 +2234,7 @@ msgstr "" msgid "Online" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2294,7 +2293,7 @@ msgstr "" msgid "Password" msgstr "Mot de passe" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "Mot de passe (*)" @@ -2303,7 +2302,7 @@ msgstr "Mot de passe (*)" msgid "Password incorrect" msgstr "Le pseudo ou mot de passe est incorect" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2347,12 +2346,12 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 msgid "Please enter the security token" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2409,18 +2408,22 @@ msgstr "" "Veuillez entrer le nom, il sera utilisé comme nom de fichier de la nouvelle " "configuration." -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "Veuillez saisir votre e-mail !" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "Veuillez saisir votre mot de passe !" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "Veuillez saisir votre nom d'utilisateur !" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2430,7 +2433,7 @@ msgstr "" msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "Veuillez renseigner un nom de fichier" @@ -2732,24 +2735,24 @@ msgstr "Redémarrer" msgid "Restarting" msgstr "Redémarrage" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "Désactivé avec succès" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "Système" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Erreur d'analyse de configuration Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Erreur d'analyse de configuration Nginx" @@ -2867,8 +2870,8 @@ msgstr "" msgid "Secret has been copied" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -3024,8 +3027,8 @@ msgstr "Connexion" msgid "Stable" msgstr "Tableau" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -3082,8 +3085,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3183,14 +3186,15 @@ msgstr "Système" msgid "System Initial User" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "Système" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Nginx a redémarré avec succès" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3215,7 +3219,7 @@ msgstr "" "Le certificat du domaine sera vérifié toutes les heures et sera renouvelé " "s'il s'est écoulé plus d'une semaine depuis sa dernière émission." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "Le nom de fichier ne peut pas contenir les caractères suivants : %{c}" @@ -3356,15 +3360,15 @@ msgstr "" msgid "This value is already taken" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3532,7 +3536,7 @@ msgstr "" msgid "Username" msgstr "Nom d'utilisateur" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "Nom d'utilisateur (*)" @@ -3542,8 +3546,8 @@ msgstr "Nom d'utilisateur (*)" msgid "Valid" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3588,8 +3592,8 @@ msgstr "Voir" msgid "Warning" msgstr "Avertissement" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3665,6 +3669,14 @@ msgstr "Vous utilisez la dernière version" msgid "You can check Nginx UI upgrade at this page." msgstr "Vous pouvez vérifier la mise à niveau de Nginx UI sur cette page." +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/ko_KR/app.po b/app/src/language/ko_KR/app.po index 44a3dc36..242564a6 100644 --- a/app/src/language/ko_KR/app.po +++ b/app/src/language/ko_KR/app.po @@ -254,7 +254,7 @@ msgstr "%{name}에 대한 자동 갱신 비활성화됨" msgid "Auto-renewal enabled for %{name}" msgstr "%{name}에 대한 자동 갱신 활성화됨" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -279,7 +279,7 @@ msgstr "목록으로 돌아가기" msgid "Backup" msgstr "뒤로" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -495,8 +495,8 @@ msgstr "클리어" msgid "Cleared successfully" msgstr "성공적으로 제거됨" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -665,7 +665,7 @@ msgstr "" msgid "Dashboard" msgstr "대시보드" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "데이터베이스 (선택사항, 기본값: database)" @@ -978,7 +978,7 @@ msgstr "스트림 편집" msgid "Email" msgstr "이메일 (*)" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "이메일 (*)" @@ -1554,11 +1554,11 @@ msgstr "" msgid "Input the recovery code:" msgstr "" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "설치" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 #, fuzzy msgid "Install successfully" msgstr "성공적으로 활성화됨" @@ -1567,7 +1567,7 @@ msgstr "성공적으로 활성화됨" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1590,7 +1590,7 @@ msgstr "" msgid "Invalid AES key format: {0}" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "Invalid E-mail!" @@ -1909,7 +1909,7 @@ msgstr "네트워크 총 수신" msgid "Network Total Send" msgstr "네트워크 총 송신" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "설치" @@ -1971,7 +1971,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "Nginx 구성 오류름" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Nginx 구성 오류름" @@ -2035,12 +2035,12 @@ msgstr "Nginx가 성공적으로 재시작됨" msgid "Nginx UI already installed" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Nginx 구성 오류름" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2143,7 +2143,6 @@ msgstr "" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2168,7 +2167,7 @@ msgstr "검증이 완료되면, 레코드는 제거됩니다." msgid "Online" msgstr "온라인" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2228,7 +2227,7 @@ msgstr "" msgid "Password" msgstr "비밀번호" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "비밀번호 (*)" @@ -2237,7 +2236,7 @@ msgstr "비밀번호 (*)" msgid "Password incorrect" msgstr "사용자 이름 또는 비밀번호가 올바르지 않습니다" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2281,12 +2280,12 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 msgid "Please enter the security token" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2339,18 +2338,22 @@ msgid "" "configuration." msgstr "이름을 입력해주세요, 이것은 새 구성의 파일 이름으로 사용될 것입니다!" -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "이메일을 입력해주세요!" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "비밀번호를 입력해주세요!" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "사용자 이름을 입력해주세요!" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2360,7 +2363,7 @@ msgstr "아래의 시간 설정 단위는 모두 초 단위임을 유의해주 msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "적어도 하나의 노드를 선택해주세요!" @@ -2662,24 +2665,24 @@ msgstr "재시작" msgid "Restarting" msgstr "재시작 중" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "성공적으로 삭제됨" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "시스템" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Nginx 구성 오류름" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Nginx 구성 오류름" @@ -2799,8 +2802,8 @@ msgstr "" msgid "Secret has been copied" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -2953,8 +2956,8 @@ msgstr "SSO 로그인" msgid "Stable" msgstr "활성화됨" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -3010,8 +3013,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3109,14 +3112,15 @@ msgstr "시스템" msgid "System Initial User" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "시스템" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Nginx가 성공적으로 재시작됨" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3141,7 +3145,7 @@ msgstr "" "도메인의 인증서는 매 시간 확인되며,마지막으로 발급된 지 1개월이 경과한 경우 " "갱신됩니다." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "파일 이름은 다음 문자를 포함할 수 없습니다: %{c}" @@ -3280,15 +3284,15 @@ msgstr "" msgid "This value is already taken" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3456,7 +3460,7 @@ msgstr "" msgid "Username" msgstr "사용자 이름" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "사용자 이름 (*)" @@ -3466,8 +3470,8 @@ msgstr "사용자 이름 (*)" msgid "Valid" msgstr "유효함" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3513,8 +3517,8 @@ msgstr "보기" msgid "Warning" msgstr "경고" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3592,6 +3596,14 @@ msgstr "최신 버전을 사용하고 있습니다" msgid "You can check Nginx UI upgrade at this page." msgstr "이 페이지에서 Nginx UI 업그레이드를 확인할 수 있습니다." +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/messages.pot b/app/src/language/messages.pot index 97c0c639..2c6c5d30 100644 --- a/app/src/language/messages.pot +++ b/app/src/language/messages.pot @@ -240,7 +240,7 @@ msgstr "" msgid "Auto-renewal enabled for %{name}" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -266,7 +266,7 @@ msgstr "" msgid "Backup" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -469,8 +469,8 @@ msgstr "" msgid "Cleared successfully" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -634,7 +634,7 @@ msgstr "" msgid "Dashboard" msgstr "" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "" @@ -933,7 +933,7 @@ msgstr "" msgid "Email" msgstr "" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "" @@ -1463,11 +1463,11 @@ msgid "Input the recovery code:" msgstr "" #: src/routes/modules/auth.ts:8 -#: src/views/other/Install.vue:181 +#: src/views/other/Install.vue:185 msgid "Install" msgstr "" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 msgid "Install successfully" msgstr "" @@ -1475,7 +1475,7 @@ msgstr "" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "Installation is not allowed after 10 minutes of system startup, please restart the Nginx UI." msgstr "" @@ -1495,7 +1495,7 @@ msgstr "" msgid "Invalid AES key format: {0}" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 msgid "Invalid file object" msgstr "" @@ -1782,7 +1782,7 @@ msgstr "" msgid "Network Total Send" msgstr "" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 msgid "New Installation" msgstr "" @@ -1840,7 +1840,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 msgid "Nginx configuration has been restored" msgstr "" @@ -1898,11 +1898,11 @@ msgstr "" msgid "Nginx UI already installed" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 msgid "Nginx UI configuration has been restored" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 msgid "Nginx UI configuration has been restored and will restart automatically in a few seconds." msgstr "" @@ -1994,7 +1994,6 @@ msgstr "" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2019,7 +2018,7 @@ msgstr "" msgid "Online" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2077,7 +2076,7 @@ msgstr "" msgid "Password" msgstr "" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "" @@ -2085,7 +2084,7 @@ msgstr "" msgid "Password incorrect" msgstr "" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2128,12 +2127,12 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 msgid "Please enter the security token" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2171,20 +2170,25 @@ msgstr "" msgid "Please input name, this will be used as the filename of the new configuration." msgstr "" -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "" -#: src/views/other/Install.vue:71 +#: src/views/other/Install.vue:70 #: src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "" -#: src/views/other/Install.vue:65 +#: src/views/other/Install.vue:64 #: src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "" +#: src/views/other/Install.vue:110 +#: src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "Please note that the unit of time configurations below are all in seconds." msgstr "" @@ -2193,7 +2197,7 @@ msgstr "" msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 msgid "Please select a backup file" msgstr "" @@ -2463,21 +2467,21 @@ msgstr "" msgid "Restarting" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 msgid "Restore completed successfully" msgstr "" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 msgid "Restore from Backup" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 msgid "Restore Nginx Configuration" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 msgid "Restore Nginx UI Configuration" msgstr "" @@ -2588,8 +2592,8 @@ msgstr "" msgid "Secret has been copied" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -2727,8 +2731,8 @@ msgstr "" msgid "Stable" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -2778,8 +2782,8 @@ msgstr "" msgid "Support communication with the backend through the WebSocket protocol. If your Nginx UI is being used via an Nginx reverse proxy, please refer to this link to write the corresponding configuration file: https://nginxui.com/guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -2870,12 +2874,13 @@ msgstr "" msgid "System Initial User" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 msgid "System Restore" msgstr "" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." +#: src/views/other/Install.vue:106 +#: src/views/system/Backup/SystemRestore.vue:8 +msgid "System restored successfully." msgstr "" #: src/constants/errors/self_check.ts:2 @@ -2895,7 +2900,7 @@ msgstr "" msgid "The certificate for the domain will be checked 30 minutes, and will be renewed if it has been more than 1 week or the period you set in settings since it was last issued." msgstr "" -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "" @@ -3004,13 +3009,13 @@ msgstr "" msgid "This value is already taken" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "This will restore all Nginx configuration files. Nginx will restart after the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "This will restore configuration files and database. Nginx UI will restart after the restoration is complete." msgstr "" @@ -3158,7 +3163,7 @@ msgstr "" msgid "Username" msgstr "" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "" @@ -3168,8 +3173,8 @@ msgstr "" msgid "Valid" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3211,8 +3216,8 @@ msgstr "" msgid "Warning" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "Warning: Restore operation will overwrite current configurations. Make sure you have a valid backup file and security token, and carefully select what to restore." msgstr "" @@ -3272,6 +3277,14 @@ msgstr "" msgid "You can check Nginx UI upgrade at this page." msgstr "" +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "You have not configured the settings of Webauthn, so you cannot add a passkey." msgstr "" diff --git a/app/src/language/ru_RU/app.po b/app/src/language/ru_RU/app.po index ce7f1e81..0c98e197 100644 --- a/app/src/language/ru_RU/app.po +++ b/app/src/language/ru_RU/app.po @@ -250,7 +250,7 @@ msgstr "Автообновление отключено для %{name}" msgid "Auto-renewal enabled for %{name}" msgstr "Автообновление включено для %{name}" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -275,7 +275,7 @@ msgstr "Возврат к списку" msgid "Backup" msgstr "Назад" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -485,8 +485,8 @@ msgstr "Очистить" msgid "Cleared successfully" msgstr "Очищено успешно" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -654,7 +654,7 @@ msgstr "Настройте имя локального сервера для о msgid "Dashboard" msgstr "Доска" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "База данных (Опционально, по умолчанию: database)" @@ -967,7 +967,7 @@ msgstr "Редактировать поток" msgid "Email" msgstr "Электронная почта" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "Email (*)" @@ -1541,11 +1541,11 @@ msgstr "Введите код из приложения:" msgid "Input the recovery code:" msgstr "Введите код восстановления:" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "Установить" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 msgid "Install successfully" msgstr "Установка прошла успешно" @@ -1553,7 +1553,7 @@ msgstr "Установка прошла успешно" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1575,7 +1575,7 @@ msgstr "" msgid "Invalid AES key format: {0}" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "Неверное имя файла" @@ -1876,7 +1876,7 @@ msgstr "Всего получено" msgid "Network Total Send" msgstr "Всего отправлено" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "Установить" @@ -1936,7 +1936,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "Белый список директорий для логов Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Ошибка разбора конфигурации Nginx" @@ -1997,12 +1997,12 @@ msgstr "Nginx успешно перезапущен" msgid "Nginx UI already installed" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Ошибка разбора конфигурации Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2105,7 +2105,6 @@ msgstr "Ок" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2130,7 +2129,7 @@ msgstr "После завершения проверки записи будут msgid "Online" msgstr "Онлайн" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2189,7 +2188,7 @@ msgstr "" msgid "Password" msgstr "Пароль" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "Пароль (*)" @@ -2198,7 +2197,7 @@ msgstr "Пароль (*)" msgid "Password incorrect" msgstr "Имя пользователя или пароль неверны" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2243,13 +2242,13 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "Пожалуйста, введите код 2FA:" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 #, fuzzy msgid "Please enter the security token" msgstr "Пожалуйста, введите код 2FA:" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2306,18 +2305,22 @@ msgstr "" "Введите имя, оно будет использоваться в качестве имени файла новой " "конфигурации." -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "Введите ваш E-mail!" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "Введите ваш пароль!" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "Введите ваше имя пользователя!" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2329,7 +2332,7 @@ msgstr "" msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "Пожалуйста, выберите хотя бы один узел!" @@ -2611,24 +2614,24 @@ msgstr "Перезапуск" msgid "Restarting" msgstr "Перезапускается" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "Удалено успешно" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "Система" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Ошибка разбора конфигурации Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Ошибка разбора конфигурации Nginx" @@ -2746,8 +2749,8 @@ msgstr "SDK" msgid "Secret has been copied" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -2896,8 +2899,8 @@ msgstr "SSO Вход" msgid "Stable" msgstr "Стабильный" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -2953,8 +2956,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3047,14 +3050,15 @@ msgstr "Система" msgid "System Initial User" msgstr "Первоначальный пользователь системы" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "Система" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Nginx успешно перезапущен" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3079,7 +3083,7 @@ msgstr "" "более 1 недели или периода, установленного в настройках, с момента его " "последней выдачи." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "Имя файла не может содержать такой символ: %{c}" @@ -3231,15 +3235,15 @@ msgstr "" msgid "This value is already taken" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3410,7 +3414,7 @@ msgstr "" msgid "Username" msgstr "Имя пользователя" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "Имя пользователя (*)" @@ -3420,8 +3424,8 @@ msgstr "Имя пользователя (*)" msgid "Valid" msgstr "Действительный" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3465,8 +3469,8 @@ msgstr "Просмотр" msgid "Warning" msgstr "Внимание" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3544,6 +3548,14 @@ msgstr "Вы используете последнюю версию" msgid "You can check Nginx UI upgrade at this page." msgstr "Вы можете проверить обновление Nginx UI на этой странице." +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/tr_TR/app.po b/app/src/language/tr_TR/app.po index 9013c160..8ccae204 100644 --- a/app/src/language/tr_TR/app.po +++ b/app/src/language/tr_TR/app.po @@ -252,7 +252,7 @@ msgstr "Otomatik yenileme %{name} için devre dışı" msgid "Auto-renewal enabled for %{name}" msgstr "Otomatik yenileme %{name} için etkinleştirildi" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -277,7 +277,7 @@ msgstr "Listeye geri dön" msgid "Backup" msgstr "Geri" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -491,8 +491,8 @@ msgstr "Temizle" msgid "Cleared successfully" msgstr "Başarıyla temizlendi" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -661,7 +661,7 @@ msgstr "Ortam göstergesinde görüntülenecek yerel sunucu adını özelleştir msgid "Dashboard" msgstr "Kontrol Paneli" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "Veritabanı (İsteğe bağlı, varsayılan: database)" @@ -987,7 +987,7 @@ msgstr "Akışı Düzenle" msgid "Email" msgstr "E-posta" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "E-posta(*)" @@ -1572,11 +1572,11 @@ msgstr "Uygulamadan kodu girin:" msgid "Input the recovery code:" msgstr "Kurtarma kodunu girin:" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "Yükle" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 msgid "Install successfully" msgstr "Başarıyla yüklendi" @@ -1584,7 +1584,7 @@ msgstr "Başarıyla yüklendi" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1606,7 +1606,7 @@ msgstr "" msgid "Invalid AES key format: {0}" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "Geçersiz dosya adı" @@ -1929,7 +1929,7 @@ msgstr "Ağ Toplam Alım" msgid "Network Total Send" msgstr "Ağ Toplam Gönderme" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "Yükle" @@ -1995,7 +1995,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "Nginx Yapılandırma Ayrıştırma Hatası" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Nginx Yapılandırma Ayrıştırma Hatası" @@ -2063,12 +2063,12 @@ msgstr "Nginx başarıyla yeniden başlatıldı" msgid "Nginx UI already installed" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Nginx Yapılandırma Ayrıştırma Hatası" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2184,7 +2184,6 @@ msgstr "Tamam" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2212,7 +2211,7 @@ msgstr "Doğrulama tamamlandıktan sonra kayıtlar kaldırılacaktır." msgid "Online" msgstr "Çevrimiçi" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2286,7 +2285,7 @@ msgstr "" msgid "Password" msgstr "Şifre" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 #, fuzzy msgid "Password (*)" msgstr "Şifre (*)" @@ -2296,7 +2295,7 @@ msgstr "Şifre (*)" msgid "Password incorrect" msgstr "Kullanıcı adı veya şifre yanlış" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2348,13 +2347,13 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "Lütfen OTP kodunu girin:" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 #, fuzzy msgid "Please enter the security token" msgstr "Lütfen OTP kodunu girin:" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2416,21 +2415,25 @@ msgid "" msgstr "" "Lütfen isim girin, bu yeni yapılandırmanın dosya adı olarak kullanılacaktır!" -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 #, fuzzy msgid "Please input your E-mail!" msgstr "Lütfen e-postanızı girin!" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 #, fuzzy msgid "Please input your password!" msgstr "Lütfen şifrenizi girin!" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 #, fuzzy msgid "Please input your username!" msgstr "Lütfen kullanıcı adınızı girin!" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 #, fuzzy msgid "" @@ -2443,7 +2446,7 @@ msgstr "" msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "Lütfen en az bir düğüm seçin!" @@ -2777,24 +2780,24 @@ msgstr "Yeniden başlat" msgid "Restarting" msgstr "Yeniden Başlatma" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "Başarıyla silindi" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "Sistem" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Nginx Yapılandırma Ayrıştırma Hatası" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Nginx Yapılandırma Ayrıştırma Hatası" @@ -2923,8 +2926,8 @@ msgstr "SDK" msgid "Secret has been copied" msgstr "Sır kopyalandı" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -3093,8 +3096,8 @@ msgstr "SSO Girişi" msgid "Stable" msgstr "Stabil" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -3154,8 +3157,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3261,14 +3264,15 @@ msgstr "Sistem" msgid "System Initial User" msgstr "Sistem İlk Kullanıcısı" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "Sistem" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Nginx başarıyla yeniden başlatıldı" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3296,7 +3300,7 @@ msgstr "" "verilmesinden bu yana 1 haftadan veya ayarlarda belirlediğiniz süreden fazla " "zaman geçtiyse yenilenecektir." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 #, fuzzy msgid "The filename cannot contain the following characters: %{c}" msgstr "Dosya adı aşağıdaki karakterleri içeremez: %{c}" @@ -3458,15 +3462,15 @@ msgstr "" msgid "This value is already taken" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3669,7 +3673,7 @@ msgstr "" msgid "Username" msgstr "Kullanıcı Adı" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 #, fuzzy msgid "Username (*)" msgstr "Kullanıcı adı (*)" @@ -3681,8 +3685,8 @@ msgstr "Kullanıcı adı (*)" msgid "Valid" msgstr "Geçerli" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3731,8 +3735,8 @@ msgstr "Görünüm" msgid "Warning" msgstr "Uyarı" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3822,6 +3826,14 @@ msgstr "En son sürümü kullanıyorsunuz" msgid "You can check Nginx UI upgrade at this page." msgstr "Nginx UI yükseltmesini bu sayfadan kontrol edebilirsiniz." +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 #, fuzzy msgid "" diff --git a/app/src/language/vi_VN/app.po b/app/src/language/vi_VN/app.po index 7fa88578..958d5af3 100644 --- a/app/src/language/vi_VN/app.po +++ b/app/src/language/vi_VN/app.po @@ -263,7 +263,7 @@ msgstr "Đã tắt tự động gia hạn SSL cho %{name}" msgid "Auto-renewal enabled for %{name}" msgstr "Đã bật tự động gia hạn SSL cho %{name}" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -289,7 +289,7 @@ msgstr "" msgid "Backup" msgstr "Quay lại" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -514,8 +514,8 @@ msgstr "Xoá" msgid "Cleared successfully" msgstr "Đã xóa thành công" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -687,7 +687,7 @@ msgstr "" msgid "Dashboard" msgstr "Bảng điều khiển" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "Tên cơ sở dữ liệu (Tuỳ chọn, Mặc định là: database)" @@ -1013,7 +1013,7 @@ msgstr "Sửa trang web" msgid "Email" msgstr "Email (*)" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "Email (*)" @@ -1593,11 +1593,11 @@ msgstr "" msgid "Input the recovery code:" msgstr "" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "Cài đặt" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 #, fuzzy msgid "Install successfully" msgstr "Cài đặt thành công" @@ -1606,7 +1606,7 @@ msgstr "Cài đặt thành công" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1629,7 +1629,7 @@ msgstr "" msgid "Invalid AES key format: {0}" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "E-mail không chính xác!" @@ -1943,7 +1943,7 @@ msgstr "Tổng lưu lượng mạng đã nhận" msgid "Network Total Send" msgstr "Tổng lưu lượng mạng đã gửi" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "Cài đặt" @@ -2005,7 +2005,7 @@ msgstr "" msgid "Nginx config directory is not set" msgstr "Lỗi phân tích cú pháp cấu hình Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Lỗi phân tích cú pháp cấu hình Nginx" @@ -2068,12 +2068,12 @@ msgstr "Restart Nginx thành công" msgid "Nginx UI already installed" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Lỗi phân tích cú pháp cấu hình Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2176,7 +2176,6 @@ msgstr "" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2201,7 +2200,7 @@ msgstr "Sau khi quá trình xác minh hoàn tất, bản ghi sẽ bị xóa." msgid "Online" msgstr "Trực tuyến" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2261,7 +2260,7 @@ msgstr "" msgid "Password" msgstr "Mật khẩu" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "Mật khẩu (*)" @@ -2270,7 +2269,7 @@ msgstr "Mật khẩu (*)" msgid "Password incorrect" msgstr "Tên người dùng hoặc mật khẩu không chính xác" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "" @@ -2314,12 +2313,12 @@ msgstr "" msgid "Please enter the OTP code:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 msgid "Please enter the security token" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2375,18 +2374,22 @@ msgid "" msgstr "" "Vui lòng nhập tên, tên này sẽ được sử dụng làm tên tệp của cấu hình mới!" -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "Vui lòng nhập E-mail của bạn!" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "Vui lòng nhập mật khẩu!" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "Vui lòng nhập username!" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2396,7 +2399,7 @@ msgstr "Lưu ý đơn vị cấu hình thời gian bên dưới được tính b msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "Vui lòng nhập username!" @@ -2696,24 +2699,24 @@ msgstr "Khởi động lại" msgid "Restarting" msgstr "Đang khởi động lại" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "Đã xoá thành công" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "Thông tin" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Lỗi phân tích cú pháp cấu hình Nginx" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Lỗi phân tích cú pháp cấu hình Nginx" @@ -2833,8 +2836,8 @@ msgstr "" msgid "Secret has been copied" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -2984,8 +2987,8 @@ msgstr "" msgid "Stable" msgstr "Ổn định" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -3041,8 +3044,8 @@ msgid "" "guide/nginx-proxy-example.html" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3140,14 +3143,15 @@ msgstr "Thông tin" msgid "System Initial User" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "Thông tin" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Restart Nginx thành công" #: src/constants/errors/self_check.ts:2 #, fuzzy @@ -3172,7 +3176,7 @@ msgstr "" "Chứng chỉ cho miền sẽ được kiểm tra 5 phút / lần và sẽ được gia hạn nếu đã " "hơn 1 tuần kể từ lần cuối nó được cấp." -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "Tên tệp không thể chứa các ký tự sau: %{c}" @@ -3306,15 +3310,15 @@ msgstr "" msgid "This value is already taken" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3483,7 +3487,7 @@ msgstr "" msgid "Username" msgstr "Username" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "Username (*)" @@ -3493,8 +3497,8 @@ msgstr "Username (*)" msgid "Valid" msgstr "Hợp lệ" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3540,8 +3544,8 @@ msgstr "Xem" msgid "Warning" msgstr "Lưu ý" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3619,6 +3623,14 @@ msgstr "Bạn đang sử dụng phiên bản mới nhất" msgid "You can check Nginx UI upgrade at this page." msgstr "Bạn có thể kiểm tra nâng cấp Nginx UI tại trang này" +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/zh_CN/app.po b/app/src/language/zh_CN/app.po index 4a384a21..f59b2ad8 100644 --- a/app/src/language/zh_CN/app.po +++ b/app/src/language/zh_CN/app.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2025-03-30 08:14+0800\n" +"PO-Revision-Date: 2025-03-30 21:51+0800\n" "Last-Translator: 0xJacky \n" "Language-Team: Chinese (Simplified Han script) \n" @@ -248,7 +248,7 @@ msgstr "成功关闭 %{name} 自动续签" msgid "Auto-renewal enabled for %{name}" msgstr "成功启用 %{name} 自动续签" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "自动重启" @@ -272,7 +272,7 @@ msgstr "返回列表" msgid "Backup" msgstr "备份" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "备份文件完整性检查失败，可能已被篡改" @@ -477,8 +477,8 @@ msgstr "清空" msgid "Cleared successfully" msgstr "清除成功" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "单击或拖动备份文件到此区域上传" @@ -643,7 +643,7 @@ msgstr "自定义显示在环境指示器中的本地服务器名称。" msgid "Dashboard" msgstr "仪表盘" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "数据库 (可选，默认: database)" @@ -936,7 +936,7 @@ msgstr "编辑 Stream" msgid "Email" msgstr "邮箱" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "邮箱 (*)" @@ -1465,11 +1465,11 @@ msgstr "输入应用程序中的代码：" msgid "Input the recovery code:" msgstr "输入恢复代码：" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "安装" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 msgid "Install successfully" msgstr "安装成功" @@ -1477,7 +1477,7 @@ msgstr "安装成功" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "系统启动 10 分钟后不允许安装" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1499,7 +1499,7 @@ msgstr "AES IV 格式无效：{0}" msgid "Invalid AES key format: {0}" msgstr "AES 密钥格式无效：{0}" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 msgid "Invalid file object" msgstr "无效文件对象" @@ -1794,7 +1794,7 @@ msgstr "下载流量" msgid "Network Total Send" msgstr "上传流量" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 msgid "New Installation" msgstr "新安装" @@ -1852,7 +1852,7 @@ msgstr "Nginx Conf 中未引用 stream-enabled" msgid "Nginx config directory is not set" msgstr "未设置 Nginx 配置目录" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 msgid "Nginx configuration has been restored" msgstr "Nginx 配置已恢复" @@ -1909,11 +1909,11 @@ msgstr "Nginx 重启成功" msgid "Nginx UI already installed" msgstr "Nginx UI 已安装" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 msgid "Nginx UI configuration has been restored" msgstr "Nginx 用户界面配置已恢复" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 msgid "" "Nginx UI configuration has been restored and will restart automatically in a " "few seconds." @@ -2011,7 +2011,6 @@ msgstr "确定" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2036,7 +2035,7 @@ msgstr "一旦验证完成，这些记录将被删除。" msgid "Online" msgstr "在线" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "只允许使用zip文件" @@ -2097,7 +2096,7 @@ msgstr "" msgid "Password" msgstr "密码" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "密码 (*)" @@ -2105,7 +2104,7 @@ msgstr "密码 (*)" msgid "Password incorrect" msgstr "用户名和密码错误" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "密码长度不能超过 20 个字符" @@ -2149,12 +2148,12 @@ msgstr "请为您要创建的 Passkey 输入一个名称，然后单击下面的 msgid "Please enter the OTP code:" msgstr "请输入 OTP：" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 msgid "Please enter the security token" msgstr "请输入安全令牌" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "请输入备份时收到的安全令牌" @@ -2204,18 +2203,22 @@ msgid "" "configuration." msgstr "请输入名称，这将作为新配置的文件名。" -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "请输入您的邮箱！" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "请输入您的密码！" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "请输入您的用户名！" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "请登录。" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2225,7 +2228,7 @@ msgstr "请注意，下面的时间单位配置均以秒为单位。" msgid "Please save this security token, you will need it for restoration:" msgstr "请保存此安全令牌，恢复时会用到它：" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 msgid "Please select a backup file" msgstr "请选择备份文件" @@ -2495,21 +2498,21 @@ msgstr "重启" msgid "Restarting" msgstr "重启中" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 msgid "Restore completed successfully" msgstr "恢复成功" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 msgid "Restore from Backup" msgstr "从备份还原" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 msgid "Restore Nginx Configuration" msgstr "恢复 Nginx 配置" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 msgid "Restore Nginx UI Configuration" msgstr "恢复 Nginx UI 配置" @@ -2618,8 +2621,8 @@ msgstr "SDK" msgid "Secret has been copied" msgstr "密钥已复制" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "安全 Token" @@ -2765,8 +2768,8 @@ msgstr "SSO 登录" msgid "Stable" msgstr "稳定" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "开始还原" @@ -2820,8 +2823,8 @@ msgstr "" "支持通过 WebSocket 协议与后端通信，如果您正在使用 Nginx 反向代理了 Nginx UI " "请参考：https://nginxui.com/guide/nginx-proxy-example.html 编写配置文件" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "支持的文件类型：.zip" @@ -2908,13 +2911,13 @@ msgstr "系统备份" msgid "System Initial User" msgstr "系统初始用户" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 msgid "System Restore" msgstr "系统还原" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "系统恢复成功。请登录。" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +msgid "System restored successfully." +msgstr "系统恢复成功。" #: src/constants/errors/self_check.ts:2 msgid "Task not found" @@ -2937,7 +2940,7 @@ msgstr "" "域名证书将在 30 分钟内接受检查，如果距离上次签发证书的时间超过 1 周或您在设置" "中设定的时间，证书将被更新。" -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "文件名不能包含以下字符: %{c}" @@ -3070,15 +3073,15 @@ msgstr "此 Token 只显示一次，以后无法找回。请确保将其保存 msgid "This value is already taken" msgstr "该字段的值已经存在" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "这将还原所有 Nginx 配置文件。恢复完成后，Nginx 将重新启动。" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3243,7 +3246,7 @@ msgstr "用户未启用 OTP 作为 2FA" msgid "Username" msgstr "用户名" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "用户名 (*)" @@ -3253,8 +3256,8 @@ msgstr "用户名 (*)" msgid "Valid" msgstr "有效的" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "验证备份文件的完整性" @@ -3295,8 +3298,8 @@ msgstr "已查看" msgid "Warning" msgstr "警告" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3377,6 +3380,14 @@ msgstr "您使用的是最新版本" msgid "You can check Nginx UI upgrade at this page." msgstr "你可以在这个页面检查Nginx UI的升级。" +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "您可以在 %{countdown} 秒后关闭此对话框" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "现在可以关闭此对话框" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/language/zh_TW/app.po b/app/src/language/zh_TW/app.po index 9b20e2b3..661e0c25 100644 --- a/app/src/language/zh_TW/app.po +++ b/app/src/language/zh_TW/app.po @@ -252,7 +252,7 @@ msgstr "已關閉 %{name} 的自動續簽" msgid "Auto-renewal enabled for %{name}" msgstr "已啟用 %{name} 的自動續簽" -#: src/components/SystemRestore/SystemRestoreContent.vue:111 +#: src/components/SystemRestore/SystemRestoreContent.vue:332 msgid "Automatic Restart" msgstr "" @@ -277,7 +277,7 @@ msgstr "返回列表" msgid "Backup" msgstr "返回" -#: src/components/SystemRestore/SystemRestoreContent.vue:119 +#: src/components/SystemRestore/SystemRestoreContent.vue:155 msgid "Backup file integrity check failed, it may have been tampered with" msgstr "" @@ -486,8 +486,8 @@ msgstr "清除" msgid "Cleared successfully" msgstr "清除成功" -#: src/components/SystemRestore/SystemRestoreContent.vue:164 -#: src/components/SystemRestore/SystemRestoreContent.vue:241 +#: src/components/SystemRestore/SystemRestoreContent.vue:194 +#: src/components/SystemRestore/SystemRestoreContent.vue:271 msgid "Click or drag backup file to this area to upload" msgstr "" @@ -654,7 +654,7 @@ msgstr "自訂顯示在環境指示器中的本地節點名稱。" msgid "Dashboard" msgstr "儀表板" -#: src/views/other/Install.vue:165 +#: src/views/other/Install.vue:169 msgid "Database (Optional, default: database)" msgstr "資料庫 (可選，預設: database)" @@ -951,7 +951,7 @@ msgstr "編輯 Stream" msgid "Email" msgstr "電子郵件" -#: src/views/other/Install.vue:134 +#: src/views/other/Install.vue:138 msgid "Email (*)" msgstr "電子郵件 (*)" @@ -1520,11 +1520,11 @@ msgstr "請輸入應用程式中的代碼：" msgid "Input the recovery code:" msgstr "輸入恢復碼：" -#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:181 +#: src/routes/modules/auth.ts:8 src/views/other/Install.vue:185 msgid "Install" msgstr "安裝" -#: src/views/other/Install.vue:94 +#: src/views/other/Install.vue:93 msgid "Install successfully" msgstr "安裝成功" @@ -1532,7 +1532,7 @@ msgstr "安裝成功" msgid "Installation is not allowed after 10 minutes of system startup" msgstr "" -#: src/views/other/Install.vue:123 +#: src/views/other/Install.vue:127 msgid "" "Installation is not allowed after 10 minutes of system startup, please " "restart the Nginx UI." @@ -1556,7 +1556,7 @@ msgstr "無效的請求格式" msgid "Invalid AES key format: {0}" msgstr "無效的請求格式" -#: src/components/SystemRestore/SystemRestoreContent.vue:86 +#: src/components/SystemRestore/SystemRestoreContent.vue:121 #, fuzzy msgid "Invalid file object" msgstr "無效的檔案名" @@ -1853,7 +1853,7 @@ msgstr "下載流量" msgid "Network Total Send" msgstr "上傳流量" -#: src/views/other/Install.vue:129 +#: src/views/other/Install.vue:133 #, fuzzy msgid "New Installation" msgstr "安裝" @@ -1913,7 +1913,7 @@ msgstr "Nginx 配置檔未包含 stream-enabled" msgid "Nginx config directory is not set" msgstr "Nginx 日誌目錄白名單" -#: src/components/SystemRestore/SystemRestoreContent.vue:103 +#: src/components/SystemRestore/SystemRestoreContent.vue:138 #, fuzzy msgid "Nginx configuration has been restored" msgstr "Nginx 設定解析錯誤" @@ -1972,12 +1972,12 @@ msgstr "Nginx 重啟成功" msgid "Nginx UI already installed" msgstr "此值已被使用" -#: src/components/SystemRestore/SystemRestoreContent.vue:107 +#: src/components/SystemRestore/SystemRestoreContent.vue:142 #, fuzzy msgid "Nginx UI configuration has been restored" msgstr "Nginx 設定解析錯誤" -#: src/components/SystemRestore/SystemRestoreContent.vue:112 +#: src/components/SystemRestore/SystemRestoreContent.vue:336 #, fuzzy msgid "" "Nginx UI configuration has been restored and will restart automatically in a " @@ -2076,7 +2076,6 @@ msgstr "確定" #: src/components/ChatGPT/ChatGPT.vue:375 #: src/components/Notification/Notification.vue:134 #: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:95 -#: src/components/SystemRestore/SystemRestoreContent.vue:113 #: src/views/notification/Notification.vue:38 #: src/views/site/cert/components/ObtainCert.vue:139 #: src/views/site/ngx_conf/NgxConfigEditor.vue:50 @@ -2101,7 +2100,7 @@ msgstr "驗證完成後，記錄將被刪除。" msgid "Online" msgstr "線上" -#: src/components/SystemRestore/SystemRestoreContent.vue:43 +#: src/components/SystemRestore/SystemRestoreContent.vue:78 msgid "Only zip files are allowed" msgstr "" @@ -2162,7 +2161,7 @@ msgstr "" msgid "Password" msgstr "密碼" -#: src/views/other/Install.vue:154 +#: src/views/other/Install.vue:158 msgid "Password (*)" msgstr "密碼 (*)" @@ -2170,7 +2169,7 @@ msgstr "密碼 (*)" msgid "Password incorrect" msgstr "密碼錯誤" -#: src/views/other/Install.vue:75 +#: src/views/other/Install.vue:74 msgid "Password length cannot exceed 20 characters" msgstr "密碼長度不能超過 20 個字元" @@ -2214,13 +2213,13 @@ msgstr "請輸入您希望創建的通行密鑰名稱，並點擊下面的確定 msgid "Please enter the OTP code:" msgstr "請輸入 OTP 代碼：" -#: src/components/SystemRestore/SystemRestoreContent.vue:77 +#: src/components/SystemRestore/SystemRestoreContent.vue:112 #, fuzzy msgid "Please enter the security token" msgstr "請輸入 OTP 代碼：" -#: src/components/SystemRestore/SystemRestoreContent.vue:180 -#: src/components/SystemRestore/SystemRestoreContent.vue:257 +#: src/components/SystemRestore/SystemRestoreContent.vue:210 +#: src/components/SystemRestore/SystemRestoreContent.vue:287 msgid "Please enter the security token received during backup" msgstr "" @@ -2270,18 +2269,22 @@ msgid "" "configuration." msgstr "請輸入名稱，此名稱將用作新配置的檔案名稱。" -#: src/views/other/Install.vue:59 +#: src/views/other/Install.vue:58 msgid "Please input your E-mail!" msgstr "請輸入您的電子郵件！" -#: src/views/other/Install.vue:71 src/views/other/Login.vue:47 +#: src/views/other/Install.vue:70 src/views/other/Login.vue:47 msgid "Please input your password!" msgstr "請輸入您的密碼！" -#: src/views/other/Install.vue:65 src/views/other/Login.vue:41 +#: src/views/other/Install.vue:64 src/views/other/Login.vue:41 msgid "Please input your username!" msgstr "請輸入您的使用者名稱！" +#: src/views/other/Install.vue:110 src/views/system/Backup/SystemRestore.vue:12 +msgid "Please log in." +msgstr "" + #: src/views/certificate/DNSCredential.vue:62 msgid "" "Please note that the unit of time configurations below are all in seconds." @@ -2291,7 +2294,7 @@ msgstr "請注意，以下時間配置單位均為秒。" msgid "Please save this security token, you will need it for restoration:" msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:72 +#: src/components/SystemRestore/SystemRestoreContent.vue:107 #, fuzzy msgid "Please select a backup file" msgstr "請至少選擇一個節點！" @@ -2568,24 +2571,24 @@ msgstr "重新啟動" msgid "Restarting" msgstr "正在重新啟動" -#: src/components/SystemRestore/SystemRestoreContent.vue:100 +#: src/components/SystemRestore/SystemRestoreContent.vue:135 #, fuzzy msgid "Restore completed successfully" msgstr "刪除成功" -#: src/views/other/Install.vue:186 +#: src/views/other/Install.vue:190 #, fuzzy msgid "Restore from Backup" msgstr "系統" -#: src/components/SystemRestore/SystemRestoreContent.vue:193 -#: src/components/SystemRestore/SystemRestoreContent.vue:270 +#: src/components/SystemRestore/SystemRestoreContent.vue:223 +#: src/components/SystemRestore/SystemRestoreContent.vue:300 #, fuzzy msgid "Restore Nginx Configuration" msgstr "Nginx 配置目錄" -#: src/components/SystemRestore/SystemRestoreContent.vue:204 -#: src/components/SystemRestore/SystemRestoreContent.vue:281 +#: src/components/SystemRestore/SystemRestoreContent.vue:234 +#: src/components/SystemRestore/SystemRestoreContent.vue:311 #, fuzzy msgid "Restore Nginx UI Configuration" msgstr "Nginx 配置目錄" @@ -2701,8 +2704,8 @@ msgstr "SDK" msgid "Secret has been copied" msgstr "密鑰已複製" -#: src/components/SystemRestore/SystemRestoreContent.vue:177 -#: src/components/SystemRestore/SystemRestoreContent.vue:254 +#: src/components/SystemRestore/SystemRestoreContent.vue:207 +#: src/components/SystemRestore/SystemRestoreContent.vue:284 msgid "Security Token" msgstr "" @@ -2850,8 +2853,8 @@ msgstr "SSO 登錄" msgid "Stable" msgstr "穩定" -#: src/components/SystemRestore/SystemRestoreContent.vue:216 -#: src/components/SystemRestore/SystemRestoreContent.vue:293 +#: src/components/SystemRestore/SystemRestoreContent.vue:246 +#: src/components/SystemRestore/SystemRestoreContent.vue:323 msgid "Start Restore" msgstr "" @@ -2908,8 +2911,8 @@ msgstr "" "理使用，請參考此鏈接編寫對應的配置文件： https://nginxui.com/guide/nginx-" "proxy-example.html" -#: src/components/SystemRestore/SystemRestoreContent.vue:167 -#: src/components/SystemRestore/SystemRestoreContent.vue:244 +#: src/components/SystemRestore/SystemRestoreContent.vue:197 +#: src/components/SystemRestore/SystemRestoreContent.vue:274 msgid "Supported file type: .zip" msgstr "" @@ -3000,14 +3003,15 @@ msgstr "系統" msgid "System Initial User" msgstr "系統初始使用者" -#: src/components/SystemRestore/SystemRestoreContent.vue:144 +#: src/components/SystemRestore/SystemRestoreContent.vue:174 #, fuzzy msgid "System Restore" msgstr "系統" -#: src/views/other/Install.vue:107 -msgid "System restored successfully. Please log in." -msgstr "" +#: src/views/other/Install.vue:106 src/views/system/Backup/SystemRestore.vue:8 +#, fuzzy +msgid "System restored successfully." +msgstr "Nginx 重啟成功" #: src/constants/errors/self_check.ts:2 msgid "Task not found" @@ -3030,7 +3034,7 @@ msgstr "" "網域憑證將在 30 分鐘內接受檢查，如果自上次簽發以來已超過 1 週或您在設置中設定" "的時間，憑證將會自動更新。" -#: src/views/other/Install.vue:81 +#: src/views/other/Install.vue:80 msgid "The filename cannot contain the following characters: %{c}" msgstr "檔名不能包含以下字元: %{c}" @@ -3164,15 +3168,15 @@ msgstr "" msgid "This value is already taken" msgstr "此值已被使用" -#: src/components/SystemRestore/SystemRestoreContent.vue:197 -#: src/components/SystemRestore/SystemRestoreContent.vue:274 +#: src/components/SystemRestore/SystemRestoreContent.vue:227 +#: src/components/SystemRestore/SystemRestoreContent.vue:304 msgid "" "This will restore all Nginx configuration files. Nginx will restart after " "the restoration is complete." msgstr "" -#: src/components/SystemRestore/SystemRestoreContent.vue:208 -#: src/components/SystemRestore/SystemRestoreContent.vue:285 +#: src/components/SystemRestore/SystemRestoreContent.vue:238 +#: src/components/SystemRestore/SystemRestoreContent.vue:315 msgid "" "This will restore configuration files and database. Nginx UI will restart " "after the restoration is complete." @@ -3337,7 +3341,7 @@ msgstr "使用者未啟用 OTP 作為雙重身份驗證 (2FA)" msgid "Username" msgstr "使用者名稱" -#: src/views/other/Install.vue:144 +#: src/views/other/Install.vue:148 msgid "Username (*)" msgstr "使用者名稱 (*)" @@ -3347,8 +3351,8 @@ msgstr "使用者名稱 (*)" msgid "Valid" msgstr "有效" -#: src/components/SystemRestore/SystemRestoreContent.vue:186 -#: src/components/SystemRestore/SystemRestoreContent.vue:263 +#: src/components/SystemRestore/SystemRestoreContent.vue:216 +#: src/components/SystemRestore/SystemRestoreContent.vue:293 msgid "Verify Backup File Integrity" msgstr "" @@ -3389,8 +3393,8 @@ msgstr "已檢視" msgid "Warning" msgstr "警告" -#: src/components/SystemRestore/SystemRestoreContent.vue:148 -#: src/components/SystemRestore/SystemRestoreContent.vue:225 +#: src/components/SystemRestore/SystemRestoreContent.vue:178 +#: src/components/SystemRestore/SystemRestoreContent.vue:255 msgid "" "Warning: Restore operation will overwrite current configurations. Make sure " "you have a valid backup file and security token, and carefully select what " @@ -3470,6 +3474,14 @@ msgstr "您正在使用最新版本" msgid "You can check Nginx UI upgrade at this page." msgstr "您可以在此頁面檢查 Nginx UI 的升級。" +#: src/components/SystemRestore/SystemRestoreContent.vue:339 +msgid "You can close this dialog in %{countdown} seconds" +msgstr "" + +#: src/components/SystemRestore/SystemRestoreContent.vue:342 +msgid "You can close this dialog now" +msgstr "" + #: src/views/preference/components/AddPasskey.vue:87 msgid "" "You have not configured the settings of Webauthn, so you cannot add a " diff --git a/app/src/version.json b/app/src/version.json index de8bc9ed..c4ef25c5 100644 --- a/app/src/version.json +++ b/app/src/version.json @@ -1 +1 @@ -{"version":"2.0.0-rc.4","build_id":6,"total_build":391} \ No newline at end of file +{"version":"2.0.0-rc.4","build_id":8,"total_build":393} \ No newline at end of file diff --git a/app/src/views/other/Install.vue b/app/src/views/other/Install.vue index 4437f23b..529cbe12 100644 --- a/app/src/views/other/Install.vue +++ b/app/src/views/other/Install.vue @@ -108,7 +108,7 @@ function handleRestoreSuccess(options: { restoreNginx: boolean, restoreNginxUI: // Only redirect to login page if Nginx UI was restored if (options.restoreNginxUI) { message.info($gettext('Please log in.')) - router.push('/login') + window.location.reload() } } diff --git a/app/src/views/system/Backup/SystemRestore.vue b/app/src/views/system/Backup/SystemRestore.vue index 5dd9507c..073bfa51 100644 --- a/app/src/views/system/Backup/SystemRestore.vue +++ b/app/src/views/system/Backup/SystemRestore.vue @@ -2,15 +2,13 @@ import SystemRestoreContent from '@/components/SystemRestore/SystemRestoreContent.vue' import { message } from 'ant-design-vue' -const router = useRouter() - function handleRestoreSuccess(options: { restoreNginx: boolean, restoreNginxUI: boolean }): void { message.success($gettext('System restored successfully.')) // Only redirect to login page if Nginx UI was restored if (options.restoreNginxUI) { message.info($gettext('Please log in.')) - router.push('/login') + window.location.reload() } } diff --git a/internal/backup/restore.go b/internal/backup/restore.go index a2a1a40e..628d4eed 100644 --- a/internal/backup/restore.go +++ b/internal/backup/restore.go @@ -401,16 +401,6 @@ func cleanDirectoryPreservingStructure(dir string) error { for _, entry := range entries { path := filepath.Join(dir, entry.Name()) - info, err := entry.Info() - if err != nil { - return err - } - - // Preserve symlinks - they will be handled separately during restore - if info.Mode()&os.ModeSymlink != 0 { - continue - } - err = os.RemoveAll(path) if err != nil { return err diff --git a/internal/middleware/encrypted_params.go b/internal/middleware/encrypted_params.go index b533c3ef..a1be1ab9 100644 --- a/internal/middleware/encrypted_params.go +++ b/internal/middleware/encrypted_params.go @@ -12,7 +12,6 @@ import ( "github.com/0xJacky/Nginx-UI/internal/crypto" "github.com/gin-gonic/gin" "github.com/uozi-tech/cosy" - "github.com/uozi-tech/cosy/logger" ) var ( @@ -105,9 +104,6 @@ func EncryptedForm() gin.HandlerFunc { } } - logger.Debug("newForm values", newForm.Value) - logger.Debug("newForm files", newForm.File) - // Replace the original form with our modified one c.Request.MultipartForm = newForm @@ -127,8 +123,6 @@ func EncryptedForm() gin.HandlerFunc { c.Request.PostForm[k] = v } - logger.Debug("PostForm after sync", c.Request.PostForm) - c.Next() } }