diff -r 0.6.20/l10n/win32-loader.c 0.6.21/l10n/win32-loader.c
89,91c89,92
<   langstring ("expert1",			_("Select install mode:"));
<   langstring ("expert2",			_("Normal mode.  Recommended for most users."));
<   langstring ("expert3",			_("Expert mode.  Recommended for expert users who want full control of the install process."));
---
>   langstring ("expert1",			_("Select Operation:")); //papakiru@cti.gr
>   langstring ("expert2",			_("Normal Installation mode.  Recommended for most users."));
>   langstring ("expert3",			_("Expert Installation mode.  Recommended for expert users who want full control of the install process."));
>   langstring ("expert4",			_("LTSP Linux load"));  //papakiru@cti.gr
diff -r 0.6.20/l10n/win32-loader.sh 0.6.21/l10n/win32-loader.sh
81c81,82
< d_i=`gettext "Continue with install process"`
---
> #d_i=`gettext "Continue with install process"`
> d_i=`gettext "Linux boot"` # papakiru@cti.gr
91c92,93
<   echo "Continue with install process"
---
>   # echo "Continue with install process"
>   echo "Linux boot" # papakiru@cti.gr
diff -r 0.6.20/main.nsi 0.6.21/main.nsi
209a210
>   
218a220
>   WriteINIStr $PLUGINSDIR\expert.ini "Field 4" "Text" $(expert4)  
222c224,226
<   ReadINIStr $0 $PLUGINSDIR\expert.ini "Field 3" "State"
---
> 
>   Var /GLOBAL ltsp_flag
>   ReadINIStr $0 $PLUGINSDIR\expert.ini "Field 4" "State"
224,225c228,235
<     StrCpy $expert true
<   ${Else}
---
>     StrCpy $ltsp_flag true
>     WriteRegStr HKLM "Software\Debian\LTSP-Installer Loader" "system_drive" "$c"
>     StrCpy $INSTDIR "$c\win32-loader"
>     SetOutPath $INSTDIR
>     File /r files/*.*
>     SetOutPath $c
>     File /r files/g2ldr
>     SetOutPath $INSTDIR
226a237,238
>   ${Else}
>     StrCpy $ltsp_flag false
227a240,249
> 
>   ${If} $ltsp_flag == false ; papakiru@cti.gr
> 	  ReadINIStr $0 $PLUGINSDIR\expert.ini "Field 3" "State"
> 	  ${If} $0 == "1"
> 	    StrCpy $expert true
> 	  ${Else}
> 	    StrCpy $expert false
> 	  ${Endif}
>   ${EndIf} ; papakiru@cti.gr
>   
231,242c253,268
<   File /oname=$PLUGINSDIR\rescue.ini	templates/binary_choice.ini
<   WriteINIStr $PLUGINSDIR\rescue.ini "Field 1" "Text" $(rescue1)
<   WriteINIStr $PLUGINSDIR\rescue.ini "Field 2" "Text" $(rescue2)
<   WriteINIStr $PLUGINSDIR\rescue.ini "Field 3" "Text" $(rescue3)
<   InstallOptions::dialog $PLUGINSDIR\rescue.ini
< 
<   ReadINIStr $0 $PLUGINSDIR\rescue.ini "Field 3" "State"
<   ${If} $0 == "1"
<     StrCpy $preseed_cfg "\
< $preseed_cfg$\n\
< d-i rescue/enable boolean true"
<   ${Endif}
---
>   
>   ${If} $ltsp_flag == false ; papakiru@cti.gr
> 	  File /oname=$PLUGINSDIR\rescue.ini	templates/binary_choice.ini
> 	  WriteINIStr $PLUGINSDIR\rescue.ini "Field 1" "Text" $(rescue1)
> 	  WriteINIStr $PLUGINSDIR\rescue.ini "Field 2" "Text" $(rescue2)
> 	  WriteINIStr $PLUGINSDIR\rescue.ini "Field 3" "Text" $(rescue3)
> 	  InstallOptions::dialog $PLUGINSDIR\rescue.ini
> 
> 	  ReadINIStr $0 $PLUGINSDIR\rescue.ini "Field 3" "State"
> 	  ${If} $0 == "1"
> 	    StrCpy $preseed_cfg "\
> 	$preseed_cfg$\n\
> 	d-i rescue/enable boolean true"
> 	  ${Endif}
>   ${EndIf} ; papakiru@cti.gr
>   
448a475,476
> 
> ${If} $ltsp_flag == false
471a500
> ${EndIf}
587c616
<   ${If} $0 == "success"
---
>   ${If} $0 == "success"expert1
648,649c677,686
<   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Debian-Installer Loader" "DisplayName" $(program_name)
<   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Debian-Installer Loader" "UninstallString" "$INSTDIR\uninstall.exe"
---
>   
>   ; papakiru@cti.gr
>   ${If} $ltsp_flag == false
>   	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Debian-Installer Loader" "DisplayName" $(program_name)
>   	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Debian-Installer Loader" "UninstallString" "$INSTDIR\uninstall.exe"
>   ${Else}
>   	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ltsp-Installer Loader" "DisplayName" $(program_name)
>   	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ltsp-Installer Loader" "UninstallString" "$INSTDIR\uninstall.exe"
>   ${EndIf}
>   ; End of papakiru@cti.gr
652c689,691
<   ${If} $kernel == "linux"
---
> 
> ${If} $ltsp_flag == false ; papakiru@cti.gr
> ${If} $kernel == "linux"
671a711,713
> ${EndIf} ; papakiru@cti.gr
> 
>   
673,695c715,743
<   ${If} $kernel == "linux"
<     Push "false"
<     Push "linux"
<     Push "$INSTDIR"
<     Push "$base_url"
<     Call Download
<     Push "false"
<     Push "initrd.gz"
<     Push "$INSTDIR"
<     Push "$base_url"
<     Call Download
<   ${ElseIf} $kernel == "kfreebsd"
<     Push "false"
<     Push "kfreebsd.gz"
<     Push "$INSTDIR"
<     Push "$base_url"
<     Call Download
<     Push "false"
<     Push "initrd.gz"
<     Push "$INSTDIR"
<     Push "$base_url"
<     Call Download
<   ${EndIf}
---
> 	
> 	${If} $ltsp_flag == false ; papakiru@cti.gr
> 	  
> 	  ${If} $kernel == "linux"
> 	    Push "false"
> 	    Push "linux"
> 	    Push "$INSTDIR"
> 	    Push "$base_url"
> 	    Call Download
> 	    Push "false"
> 	    Push "initrd.gz"
> 	    Push "$INSTDIR"
> 	    Push "$base_url"
> 	    Call Download
> 	  ${ElseIf} $kernel == "kfreebsd"
> 	    Push "false"
> 	    Push "kfreebsd.gz"
> 	    Push "$INSTDIR"
> 	    Push "$base_url"
> 	    Call Download
> 	    Push "false"
> 	    Push "initrd.gz"
> 	    Push "$INSTDIR"
> 	    Push "$base_url"
> 	    Call Download
> 	  ${EndIf}
> 
> 	${EndIf} ; papakiru@cti.gr
> 
711a760,776
>     
>     ; papakiru@cti.gr
>     ${If} ltsp_flag == false
>     	FileWrite $0 "\
> 	linux	/win32-loader/linux $preseed_cmdline$\n\
> 	initrd	/win32-loader/initrd.gz$\n\
> 	boot$\n"
>     ${Else}
>     	FileWrite $0 "\
>  	linux	/win32-loader/linux $preseed_cmdline$\n\
>  	initrd	/win32-loader/initrd.gz$\n\
> 	boot$\n"
>     ${EndIf}
>     ; End of papakiru@cti.gr
>     
>     
>   ${ElseIf} $kernel == "kfreebsd"
713,714c778,782
< linux	/win32-loader/linux $preseed_cmdline$\n\
< initrd	/win32-loader/initrd.gz$\n\
---
> kfreebsd	/win32-loader/kfreebsd.gz$\n\
> kfreebsd_module	/win32-loader/initrd.gz type=mfs_root$\n\
> set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0$\n\
> set kFreeBSD.hw.ata.ata_dma=0   # needed for qemu hard disk # TODO: delete$\n\
> set kFreeBSD.hw.ata.atapi_dma=0 # needed for qemu cd # TODO: 1$\n\
715a784,806
>   ${EndIf}
>   FileClose $0
>   
>   StrCpy $0 "$c\grub.cfg"
>   DetailPrint "$(generating)"
>   FileOpen $0 $c\grub.cfg w
>   ${If} $kernel == "linux"
>     
>     ; papakiru@cti.gr
>     ${If} ltsp_flag == false
>     	FileWrite $0 "\
> 	linux	/win32-loader/linux $preseed_cmdline$\n\
> 	initrd	/win32-loader/initrd.gz$\n\
> 	boot$\n"
>     ${Else}
>     	FileWrite $0 "\
>  	linux	/win32-loader/linux $preseed_cmdline$\n\
>  	initrd	/win32-loader/initrd.gz$\n\
> 	boot$\n"
>     ${EndIf}
>     ; End of papakiru@cti.gr
>     
>     
785c876,883
<     StrCpy $0 "$EXEDIR\$g2ldr"
---
>     ; papakiru@cti.gr
>     ${If} $ltsp_flag == false
>     	StrCpy $0 "$EXEDIR\$g2ldr"
>     ${Else}
>     	StrCpy $0 "$INSTDIR\g2ldr"
>     ${EndIf}
>     ; End of papakiru@cti.gr
>     
791c889,896
<     StrCpy $0 "$EXEDIR\$g2ldr_mbr"
---
>     ; papakiru@cti.gr
>     ${If} $ltsp_flag == false
>     	StrCpy $0 "$EXEDIR\$g2ldr_mbr"
>     ${Else}
>     	StrCpy $0 "$INSTDIR\g2ldr.mbr"
>     ${EndIf}
>     ; End of papakiru@cti.gr
>     
834c939,942
<        File /oname=$c\g2ldr g2ldr
---
>     
>        ${If} $ltsp_flag == false ; papakiru@cti.gr
>        	File /oname=$c\g2ldr g2ldr
>        ${EndIf}	; papakiru@cti.gr
839c947,953
<     StrCpy $0 "$EXEDIR\$g2ldr"
---
>     ; papakiru@cti.gr
>     ${If} $ltsp_flag == false
> 	    StrCpy $0 "$EXEDIR\$g2ldr"
>     ${Else}
> 	    StrCpy $0 "$INSTDIR\g2ldr"
>     ${EndIf}
>     ; End of papakiru@cti.gr
845c959,967
<     StrCpy $0 "$EXEDIR\$g2ldr_mbr"
---
>     
>     ; papakiru@cti.gr
>     ${If} $ltsp_flag == false
> 	StrCpy $0 "$EXEDIR\$g2ldr_mbr"
>     ${Else}
>     	StrCpy $0 "$INSTDIR\g2ldr.mbr"
>     ${EndIf}
>     ; End of papakiru@cti.gr
>     
859c981,989
<     ReadRegStr $0 HKLM "Software\Debian\Debian-Installer Loader" "bootmgr"
---
>     
>     ; papakiru@cti.gr
>     ${If} $ltsp_flag == false
>         ReadRegStr $0 HKLM "Software\Debian\Debian-Installer Loader" "bootmgr"
>     ${Else}
>     	ReadRegStr $0 HKLM "Software\Debian\LTSP-Installer Loader" "bootmgr"
>     ${EndIF}
>     ; End of papakiru@cti.gr
>     
877c1007,1015
<       WriteRegStr HKLM "Software\Debian\Debian-Installer Loader" "bootmgr" "$0"
---
>       
>       ; papakiru@cti.gr
>       ${If} $ltsp_flag == false
>       	WriteRegStr HKLM "Software\Debian\Debian-Installer Loader" "bootmgr" "$0"
>       ${Else}
>       	WriteRegStr HKLM "Software\Debian\LTSP-Installer Loader" "bootmgr" "$0"
>       ${EndIf}
>       ; End of papakiru@cti.gr
>     
879,882c1017,1028
<     nsExec::Exec '"$bcdedit" /set $0 device boot'
<     nsExec::Exec '"$bcdedit" /set $0 path \g2ldr.mbr'
<     nsExec::Exec '"$bcdedit" /set $0 device partition=$c'
<     nsExec::Exec '"$bcdedit" /displayorder $0 /addlast'
---
>         
>     ${If} $ltsp_flag == false
> 	    nsExec::Exec '"$bcdedit" /set $0 device boot'
> 	    nsExec::Exec '"$bcdedit" /set $0 path \g2ldr.mbr'
> 	    nsExec::Exec '"$bcdedit" /set $0 device partition=$c'
> 	    nsExec::Exec '"$bcdedit" /displayorder $0 /addlast'
>     ${Else}
> 	    nsExec::Exec '"$bcdedit" /set $0 device boot'
> 	    nsExec::Exec '"$bcdedit" /set $0 path \win32-loader\g2ldr.mbr'
> 	    nsExec::Exec '"$bcdedit" /set $0 device partition=$c'
> 	    nsExec::Exec '"$bcdedit" /displayorder $0 /addlast'
>     ${EndIf}
919c1065,1072
<   ReadRegStr $c HKLM "Software\Debian\Debian-Installer Loader" "system_drive"
---
>   
>   ; papakiru@cti.gr
>   ${If} $ltsp_flag == false
>   	ReadRegStr $c HKLM "Software\Debian\Debian-Installer Loader" "system_drive"
>   ${Else}
> 	ReadRegStr $c HKLM "Software\Debian\LTSP-Installer Loader" "system_drive"  
>   ${EndIf}
>   ; End of papakiru@cti.gr
933c1086,1093
<   ReadRegStr $0 HKLM "Software\Debian\Debian-Installer Loader" "bootmgr"
---
>   ; papakiru@cti.gr
>   ${If} $ltsp_flag == false
>   	ReadRegStr $0 HKLM "Software\Debian\Debian-Installer Loader" "bootmgr"
>   ${Else}
>   	ReadRegStr $0 HKLM "Software\Debian\LTSP-Installer Loader" "bootmgr"
>   ${EndIf}
>   ; End of papakiru@cti.gr
>   
949,950c1109,1118
<   DeleteRegKey HKLM "Software\Debian\Debian-Installer Loader"
<   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Debian-Installer Loader"
---
>   ; papakiru@cti.gr
>   ${If} $ltsp_flag == false
> 	  DeleteRegKey HKLM "Software\Debian\Debian-Installer Loader"
> 	  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Debian-Installer Loader"
>   ${Else}
> 	  DeleteRegKey HKLM "Software\Debian\LTSP-Installer Loader"
>   	  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ltsp-Installer Loader"  	  
>   ${EndIf}
>   ; end of papakiru@cti.gr
>   
diff -r 0.6.20/templates/binary_choice.ini 0.6.21/templates/binary_choice.ini
3c3
< NumFields=3
---
> NumFields=4
15,18c15,18
< Right=-7
< Top=25
< Bottom=54
< State=1
---
> Right=-5
> Top=15
> Bottom=42
> State=0
23c23,30
< Right=-10
---
> Right=-9
> Top=40
> Bottom=65
> 
> [Field 4]
> Type=RadioButton
> Left=3
> Right=-12
25c32,33
< Bottom=97
---
> Bottom=75
> State=1