syslinux: fix shortcut caret appearing in menu entries

also fixes the mistaken assignment of the same shortcut for both
entries in live.cfg.in

Gbp-Dch: Short

20 files changed, 40 insertions, 4 deletions

diff --git a/share/bootloaders/extlinux/advanced.cfg b/share/bootloaders/extlinux/advanced.cfg
index 373451aec..f1098603f 100644
--- a/share/bootloaders/extlinux/advanced.cfg
+++ b/share/bootloaders/extlinux/advanced.cfg
@@ -1,7 +1,9 @@
 label hdt
 	menu label ^Hardware Detection Tool (HDT)
+	menu title Hardware Detection Tool (HDT)
 	com32 hdt.c32
 
 label memtest
 	menu label ^Memory Diagnostic Tool (memtest86+)
+	menu title Memory Diagnostic Tool (memtest86+)
 	linux /live/memtest
diff --git a/share/bootloaders/extlinux/install_gui.cfg b/share/bootloaders/extlinux/install_gui.cfg
index f56b7f924..eecd3452e 100644
--- a/share/bootloaders/extlinux/install_gui.cfg
+++ b/share/bootloaders/extlinux/install_gui.cfg
@@ -1,11 +1,13 @@
 label installgui
 	menu label ^Graphical install
+	menu title Graphical install
 	linux /install/gtk/vmlinuz
 	initrd /install/gtk/initrd.gz
 	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
 
 label install
 	menu label ^Install
+	menu title Install
 	linux /install/vmlinuz
 	initrd /install/initrd.gz
 	append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/extlinux/install_text.cfg b/share/bootloaders/extlinux/install_text.cfg
index 83f014753..7969d52a0 100644
--- a/share/bootloaders/extlinux/install_text.cfg
+++ b/share/bootloaders/extlinux/install_text.cfg
@@ -1,5 +1,6 @@
 label install
 	menu label ^Install
+	menu title Install
 	linux /install/vmlinuz
 	initrd /install/initrd.gz
 	append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index 97ceb92a7..e5f6772ff 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -1,5 +1,6 @@
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
+	menu title Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
@@ -7,6 +8,7 @@ label live-@FLAVOUR@
 
 label live-@FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
+	menu title Live (@FLAVOUR@ failsafe)
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE_FAILSAFE@
diff --git a/share/bootloaders/extlinux/menu.cfg b/share/bootloaders/extlinux/menu.cfg
index 93682602d..a5a6727c8 100644
--- a/share/bootloaders/extlinux/menu.cfg
+++ b/share/bootloaders/extlinux/menu.cfg
@@ -6,10 +6,12 @@ include stdmenu.cfg
 include live.cfg
 include install.cfg
 menu begin advanced
-	menu title ^Advanced options
+	menu label ^Advanced options
+	menu title Advanced options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
+		menu title Back..
 		menu exit
 	include advanced.cfg
 menu end
diff --git a/share/bootloaders/isolinux/advanced.cfg b/share/bootloaders/isolinux/advanced.cfg
index 373451aec..f1098603f 100644
--- a/share/bootloaders/isolinux/advanced.cfg
+++ b/share/bootloaders/isolinux/advanced.cfg
@@ -1,7 +1,9 @@
 label hdt
 	menu label ^Hardware Detection Tool (HDT)
+	menu title Hardware Detection Tool (HDT)
 	com32 hdt.c32
 
 label memtest
 	menu label ^Memory Diagnostic Tool (memtest86+)
+	menu title Memory Diagnostic Tool (memtest86+)
 	linux /live/memtest
diff --git a/share/bootloaders/isolinux/install_gui.cfg b/share/bootloaders/isolinux/install_gui.cfg
index f56b7f924..eecd3452e 100644
--- a/share/bootloaders/isolinux/install_gui.cfg
+++ b/share/bootloaders/isolinux/install_gui.cfg
@@ -1,11 +1,13 @@
 label installgui
 	menu label ^Graphical install
+	menu title Graphical install
 	linux /install/gtk/vmlinuz
 	initrd /install/gtk/initrd.gz
 	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
 
 label install
 	menu label ^Install
+	menu title Install
 	linux /install/vmlinuz
 	initrd /install/initrd.gz
 	append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/isolinux/install_text.cfg b/share/bootloaders/isolinux/install_text.cfg
index 83f014753..7969d52a0 100644
--- a/share/bootloaders/isolinux/install_text.cfg
+++ b/share/bootloaders/isolinux/install_text.cfg
@@ -1,5 +1,6 @@
 label install
 	menu label ^Install
+	menu title Install
 	linux /install/vmlinuz
 	initrd /install/initrd.gz
 	append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index 97ceb92a7..e5f6772ff 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -1,5 +1,6 @@
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
+	menu title Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
@@ -7,6 +8,7 @@ label live-@FLAVOUR@
 
 label live-@FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
+	menu title Live (@FLAVOUR@ failsafe)
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE_FAILSAFE@
diff --git a/share/bootloaders/isolinux/menu.cfg b/share/bootloaders/isolinux/menu.cfg
index 93682602d..a5a6727c8 100644
--- a/share/bootloaders/isolinux/menu.cfg
+++ b/share/bootloaders/isolinux/menu.cfg
@@ -6,10 +6,12 @@ include stdmenu.cfg
 include live.cfg
 include install.cfg
 menu begin advanced
-	menu title ^Advanced options
+	menu label ^Advanced options
+	menu title Advanced options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
+		menu title Back..
 		menu exit
 	include advanced.cfg
 menu end
diff --git a/share/bootloaders/pxelinux/advanced.cfg b/share/bootloaders/pxelinux/advanced.cfg
index 373451aec..f1098603f 100644
--- a/share/bootloaders/pxelinux/advanced.cfg
+++ b/share/bootloaders/pxelinux/advanced.cfg
@@ -1,7 +1,9 @@
 label hdt
 	menu label ^Hardware Detection Tool (HDT)
+	menu title Hardware Detection Tool (HDT)
 	com32 hdt.c32
 
 label memtest
 	menu label ^Memory Diagnostic Tool (memtest86+)
+	menu title Memory Diagnostic Tool (memtest86+)
 	linux /live/memtest
diff --git a/share/bootloaders/pxelinux/install_gui.cfg b/share/bootloaders/pxelinux/install_gui.cfg
index f56b7f924..eecd3452e 100644
--- a/share/bootloaders/pxelinux/install_gui.cfg
+++ b/share/bootloaders/pxelinux/install_gui.cfg
@@ -1,11 +1,13 @@
 label installgui
 	menu label ^Graphical install
+	menu title Graphical install
 	linux /install/gtk/vmlinuz
 	initrd /install/gtk/initrd.gz
 	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
 
 label install
 	menu label ^Install
+	menu title Install
 	linux /install/vmlinuz
 	initrd /install/initrd.gz
 	append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/pxelinux/install_text.cfg b/share/bootloaders/pxelinux/install_text.cfg
index 83f014753..7969d52a0 100644
--- a/share/bootloaders/pxelinux/install_text.cfg
+++ b/share/bootloaders/pxelinux/install_text.cfg
@@ -1,5 +1,6 @@
 label install
 	menu label ^Install
+	menu title Install
 	linux /install/vmlinuz
 	initrd /install/initrd.gz
 	append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
index 97ceb92a7..e5f6772ff 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -1,5 +1,6 @@
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
+	menu title Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
@@ -7,6 +8,7 @@ label live-@FLAVOUR@
 
 label live-@FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
+	menu title Live (@FLAVOUR@ failsafe)
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE_FAILSAFE@
diff --git a/share/bootloaders/pxelinux/menu.cfg b/share/bootloaders/pxelinux/menu.cfg
index 93682602d..a5a6727c8 100644
--- a/share/bootloaders/pxelinux/menu.cfg
+++ b/share/bootloaders/pxelinux/menu.cfg
@@ -6,10 +6,12 @@ include stdmenu.cfg
 include live.cfg
 include install.cfg
 menu begin advanced
-	menu title ^Advanced options
+	menu label ^Advanced options
+	menu title Advanced options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
+		menu title Back..
 		menu exit
 	include advanced.cfg
 menu end
diff --git a/share/bootloaders/syslinux/advanced.cfg b/share/bootloaders/syslinux/advanced.cfg
index 373451aec..f1098603f 100644
--- a/share/bootloaders/syslinux/advanced.cfg
+++ b/share/bootloaders/syslinux/advanced.cfg
@@ -1,7 +1,9 @@
 label hdt
 	menu label ^Hardware Detection Tool (HDT)
+	menu title Hardware Detection Tool (HDT)
 	com32 hdt.c32
 
 label memtest
 	menu label ^Memory Diagnostic Tool (memtest86+)
+	menu title Memory Diagnostic Tool (memtest86+)
 	linux /live/memtest
diff --git a/share/bootloaders/syslinux/install_gui.cfg b/share/bootloaders/syslinux/install_gui.cfg
index f56b7f924..eecd3452e 100644
--- a/share/bootloaders/syslinux/install_gui.cfg
+++ b/share/bootloaders/syslinux/install_gui.cfg
@@ -1,11 +1,13 @@
 label installgui
 	menu label ^Graphical install
+	menu title Graphical install
 	linux /install/gtk/vmlinuz
 	initrd /install/gtk/initrd.gz
 	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
 
 label install
 	menu label ^Install
+	menu title Install
 	linux /install/vmlinuz
 	initrd /install/initrd.gz
 	append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/syslinux/install_text.cfg b/share/bootloaders/syslinux/install_text.cfg
index 83f014753..7969d52a0 100644
--- a/share/bootloaders/syslinux/install_text.cfg
+++ b/share/bootloaders/syslinux/install_text.cfg
@@ -1,5 +1,6 @@
 label install
 	menu label ^Install
+	menu title Install
 	linux /install/vmlinuz
 	initrd /install/initrd.gz
 	append vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
index 97ceb92a7..e5f6772ff 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -1,5 +1,6 @@
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
+	menu title Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
@@ -7,6 +8,7 @@ label live-@FLAVOUR@
 
 label live-@FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
+	menu title Live (@FLAVOUR@ failsafe)
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE_FAILSAFE@
diff --git a/share/bootloaders/syslinux/menu.cfg b/share/bootloaders/syslinux/menu.cfg
index 93682602d..a5a6727c8 100644
--- a/share/bootloaders/syslinux/menu.cfg
+++ b/share/bootloaders/syslinux/menu.cfg
@@ -6,10 +6,12 @@ include stdmenu.cfg
 include live.cfg
 include install.cfg
 menu begin advanced
-	menu title ^Advanced options
+	menu label ^Advanced options
+	menu title Advanced options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
+		menu title Back..
 		menu exit
 	include advanced.cfg
 menu end