Edited! (#2105)

[Ventoy.git] / INSTALL / grub / grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 10260146ff077ad588e6cb3ff3dd49fd2b53014e..064542babc87323841bd82df8ae58dd11eb86492 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -91,7 +91,7 @@ function ventoy_ext_menu {
         unset ventoy_new_context
     else
        echo "ventoy_grub.cfg NOT exist."
         unset ventoy_new_context
     else
        echo "ventoy_grub.cfg NOT exist."

-       echo -V "VTMENU_ENTER_EXIT ..."
+       echo -en "\n$VTLANG_ENTER_EXIT ..."

        read vtInputKey
     fi
 }
        read vtInputKey
     fi
 }


@@ -1501,7 +1501,7 @@ function iso_common_menuentry {
             echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
             echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
             echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"
             echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
             echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
             echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"

-            echo -v "VTMENU_ENTER_CONTINUE ..."
+            echo -en "\n$VTLANG_ENTER_CONTINUE ..."

             read vtInputKey
         fi
     fi
             read vtInputKey
         fi
     fi


@@ -1589,7 +1589,7 @@ function miso_common_menuentry {
 function common_unsupport_menuentry {
     echo -e "\n The name of the iso file could NOT contain space or non-ascii characters. \n"
     echo -e " 文件名中不能有中文或空格 \n"    
 function common_unsupport_menuentry {
     echo -e "\n The name of the iso file could NOT contain space or non-ascii characters. \n"
     echo -e " 文件名中不能有中文或空格 \n"    

-    echo -V "VTMENU_ENTER_EXIT ..."    
+    echo -en "\n$VTLANG_ENTER_EXIT ..."  

     read vtInputKey
 }
 
     read vtInputKey
 }
 


@@ -1736,7 +1736,7 @@ function vhd_common_menuentry {
                 echo -e "!!! WARNING !!!\n"
                 echo -e "\nPartition1 ($vtoy_iso_fs) is NOT ntfs, the VHD(x) file may not boot normally \n"
                 echo -e "\nVHD(x) 文件所在分区不是 ntfs 格式, 可能无法正常启动 \n\n"
                 echo -e "!!! WARNING !!!\n"
                 echo -e "\nPartition1 ($vtoy_iso_fs) is NOT ntfs, the VHD(x) file may not boot normally \n"
                 echo -e "\nVHD(x) 文件所在分区不是 ntfs 格式, 可能无法正常启动 \n\n"

-                echo -vn "VTMENU_ENTER_CONTINUE ..."    
+                echo -en "\n$VTLANG_ENTER_CONTINUE ..."

                 read vtInputKey
             fi
         fi
                 read vtInputKey
             fi
         fi


@@ -1845,7 +1845,7 @@ function vtoy_unsupport_menuentry {
 
 function only_uefi_tip {
     echo -e "\n This IMG file is only supported in UEFI mode. \n"
 
 function only_uefi_tip {
     echo -e "\n This IMG file is only supported in UEFI mode. \n"

-    echo -V "VTMENU_ENTER_EXIT ..."
+    echo -en "\n$VTLANG_ENTER_EXIT ..."

     read vtInputKey 
 }
 
     read vtInputKey 
 }
 


@@ -2103,7 +2103,7 @@ function ventoy_img_openwrt {
             ventoy_gui_console
             echo -e "\n ventoy_openwrt.xz not found. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n"
             echo -e " 未找到 ventoy_openwrt.xz 文件。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n"
             ventoy_gui_console
             echo -e "\n ventoy_openwrt.xz not found. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n"
             echo -e " 未找到 ventoy_openwrt.xz 文件。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n"

-            echo -V "VTMENU_ENTER_EXIT ..."
+            echo -en "\n$VTLANG_ENTER_EXIT ..."

             read vtInputKey
             ventoy_cli_console
             return
             read vtInputKey
             ventoy_cli_console
             return


@@ -2235,7 +2235,7 @@ function ventoy_img_memtest86 {
 function img_unsupport_tip {
     echo -e "\n This IMG file is NOT supported now. \n"
     echo -e " 当前不支持启动此 IMG 文件 \n"    
 function img_unsupport_tip {
     echo -e "\n This IMG file is NOT supported now. \n"
     echo -e " 当前不支持启动此 IMG 文件 \n"    

-    echo -V "VTMENU_ENTER_EXIT ..."
+    echo -en "\n$VTLANG_ENTER_EXIT ..."

     read vtInputKey 
 }
 
     read vtInputKey 
 }
 


@@ -2397,7 +2397,7 @@ function mimg_common_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.84"
+set VENTOY_VERSION="1.0.86"

 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1


@@ -2555,7 +2555,11 @@ elif [ "$vtoy_display_mode" = "serial_console" ]; then
     fi
     terminal_input   serial console
     terminal_output  serial console    
     fi
     terminal_input   serial console
     terminal_output  serial console    

-else    
+else
+    if [ "$vtoy_res_fit" = "1" ]; then
+        terminal_output  gfxterm
+    fi
+

     if [ -n "$vtoy_theme" ]; then
         vt_set_theme
     else
     if [ -n "$vtoy_theme" ]; then
         vt_set_theme
     else