1.0.83 release

diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
index 1f9ba50fbbe7d23bd5445281bfa98d0be0a8e685..3c2ae77ee4c5cd4104ee30dc8b54c801e34b364a 100644 (file)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
@@ -2448,7 +2448,6 @@ grub_err_t ventoy_cmd_load_plugin(grub_extcmd_context_t ctxt, int argc, char **a
     int ret = 0;
     int offset = 0;
     char *buf = NULL;
     int ret = 0;
     int offset = 0;
     char *buf = NULL;

-    const char *env = NULL;

     grub_uint8_t *code = NULL;
     grub_file_t file;
     VTOY_JSON *json = NULL;
     grub_uint8_t *code = NULL;
     grub_file_t file;
     VTOY_JSON *json = NULL;


@@ -2542,9 +2541,6 @@ grub_err_t ventoy_cmd_load_plugin(grub_extcmd_context_t ctxt, int argc, char **a
         grub_env_unset("VTOY_MENU_TIP_ENABLE");
     }
 
         grub_env_unset("VTOY_MENU_TIP_ENABLE");
     }
 

-    env = grub_env_get("VTOY_MENU_LANGUAGE");
-    ventoy_plugin_load_menu_lang(env ? env : "en_US");
-

     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 

diff --git a/INSTALL/EFI/BOOT/BOOTIA32.EFI b/INSTALL/EFI/BOOT/BOOTIA32.EFI
index 319af488657be5b35467f721f427a7745c442555..2db79d98dc15ed59a962cd1517d20532d6867084 100644 (file)
Binary files a/INSTALL/EFI/BOOT/BOOTIA32.EFI and b/INSTALL/EFI/BOOT/BOOTIA32.EFI differ

diff --git a/INSTALL/EFI/BOOT/BOOTX64.EFI b/INSTALL/EFI/BOOT/BOOTX64.EFI
index 956bdb8bffcca0ee53bff174350fed707c149555..3171b9e51d8e48a4f3003d4730d1bb5330aa2410 100644 (file)
Binary files a/INSTALL/EFI/BOOT/BOOTX64.EFI and b/INSTALL/EFI/BOOT/BOOTX64.EFI differ

diff --git a/INSTALL/EFI/BOOT/MokManager.efi b/INSTALL/EFI/BOOT/MokManager.efi
new file mode 100644 (file)
index 0000000..a2d4e9c
Binary files /dev/null and b/INSTALL/EFI/BOOT/MokManager.efi differ

diff --git a/INSTALL/EFI/BOOT/grub.efi b/INSTALL/EFI/BOOT/grub.efi
new file mode 100644 (file)
index 0000000..12145cb
Binary files /dev/null and b/INSTALL/EFI/BOOT/grub.efi differ

diff --git a/INSTALL/EFI/BOOT/mmx64.efi b/INSTALL/EFI/BOOT/mmx64.efi
deleted file mode 100644 (file)
index 06d2dfc..0000000
Binary files a/INSTALL/EFI/BOOT/mmx64.efi and /dev/null differ

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index f8ac91d886a7d86589a177de771602f6ed7d9774..71750eef5537dfcd584691cf8b6386acaa3fb24c 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -2456,6 +2456,11 @@ else
     vt_check_json_path_case $vtoy_iso_part
 fi
 
     vt_check_json_path_case $vtoy_iso_part
 fi
 

+if [ -n "$VTOY_MENU_LANGUAGE" ]; then
+    vt_load_menu_lang "$VTOY_MENU_LANGUAGE"
+else
+    vt_load_menu_lang en_US
+fi

 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then
     set timeout=$VTOY_MENU_TIMEOUT
 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then
     set timeout=$VTOY_MENU_TIMEOUT

diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh
index 8aaea30fef85dd681b45129dec3818be659ce64c..62c9b40792bd7a8acc256eb7c9efbd33ff5ce6be 100644 (file)
--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -91,7 +91,8 @@ cd ../../
 #tar menu txt & update menulang.cfg
 cd $tmpmnt/grub/
 
 #tar menu txt & update menulang.cfg
 cd $tmpmnt/grub/
 

-echo "menuentry \"zh_CN  -  Chinese Simplified (¼òÌåÖÐÎÄ)\" --class=menu_lang_item --class=debug_menu_lang --class=F5tool {" >> menulang.cfg
+vtlangtitle=$(grep VTMENU_LANGUAGE_NAME menu/zh_CN.json | awk -F\" '{print $4}')
+echo "menuentry \"zh_CN  -  $vtlangtitle\" --class=menu_lang_item --class=debug_menu_lang --class=F5tool {" >> menulang.cfg

 echo "    vt_load_menu_lang zh_CN"  >> menulang.cfg
 echo "}"  >> menulang.cfg
 
 echo "    vt_load_menu_lang zh_CN"  >> menulang.cfg
 echo "}"  >> menulang.cfg
 

diff --git a/Plugson/www/buildtime b/Plugson/www/buildtime
index a604ff4503d0d65739c849ba6e5dccbaa1332dcb..81db8deeccc826641279c56e7fba695a7431c36c 100644 (file)
--- a/Plugson/www/buildtime
+++ b/Plugson/www/buildtime
@@ -1 +1 @@
-20221117 18:12:12
\ No newline at end of file
+20221204 12:35:33
\ No newline at end of file

diff --git a/Plugson/www/helplist b/Plugson/www/helplist
index 6e1c05769c361682bcaed02defb06106f7fb1aae..ac24104110b97b5e01ebfd6f130398a892f16b39 100644 (file)
--- a/Plugson/www/helplist
+++ b/Plugson/www/helplist
@@ -1 +1 @@
-de_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTsr_RStr_TRzh_CN
\ No newline at end of file
+bn_BNde_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTru_RUsr_RStr_TRzh_CN
\ No newline at end of file

diff --git a/Plugson/www/index.html b/Plugson/www/index.html
index 5b34fc3983b2e55dc1ebed609ccac0b2f83a28bc..00aba1995c56ebd5c037b90995b58aef4fe137d1 100644 (file)
--- a/Plugson/www/index.html
+++ b/Plugson/www/index.html
@@ -757,7 +757,7 @@
 \r
         <footer class="main-footer">\r
             <div class="pull-right hidden-xs">\r
 \r
         <footer class="main-footer">\r
             <div class="pull-right hidden-xs">\r

-                <b id="plugson_build_date">20221117 18:12:12</b>
+                <b id="plugson_build_date">20221204 12:35:33</b>

             </div>\r
             <strong><a href="https://www.ventoy.net" target="_blank">https://www.ventoy.net</a></strong>\r
         </footer>\r
             </div>\r
             <strong><a href="https://www.ventoy.net" target="_blank">https://www.ventoy.net</a></strong>\r
         </footer>\r

diff --git a/Plugson/www/menulist b/Plugson/www/menulist
index 6e1c05769c361682bcaed02defb06106f7fb1aae..ac24104110b97b5e01ebfd6f130398a892f16b39 100644 (file)
--- a/Plugson/www/menulist
+++ b/Plugson/www/menulist
@@ -1 +1 @@
-de_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTsr_RStr_TRzh_CN
\ No newline at end of file
+bn_BNde_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTru_RUsr_RStr_TRzh_CN
\ No newline at end of file