--- hatari/src/gui-sdl/dlgFloppy.c	2019/04/09 08:54:41	1.1.1.5
+++ hatari/src/gui-sdl/dlgFloppy.c	2019/04/09 08:57:08	1.1.1.7
@@ -45,31 +45,31 @@ static SGOBJ floppydlg[] =
 	{ SGTEXT, 0, 0, 25,1, 12,1, "Floppy disks" },
 
 	{ SGTEXT, 0, 0, 2,3, 8,1, "Drive A:" },
-	{ SGCHECKBOX, 0, 0, 12,3, 7,1, "Enabled" },
-	{ SGCHECKBOX, 0, 0, 23,3, 12,1, "Double Sided" },
-	{ SGBUTTON, 0, 0, 46,3, 7,1, "Eject" },
-	{ SGBUTTON, 0, 0, 54,3, 8,1, "Browse" },
+	{ SGCHECKBOX, 0, 0, 12,3,  9,1, "En_abled" },
+	{ SGCHECKBOX, 0, 0, 23,3, 14,1, "_Double Sided" },
+	{ SGBUTTON,   0, 0, 46,3,  7,1, "_Eject" },
+	{ SGBUTTON,   0, 0, 54,3,  8,1, "B_rowse" },
 	{ SGTEXT, 0, 0, 3,4, 58,1, NULL },
 
 	{ SGTEXT, 0, 0, 2,6, 8,1, "Drive B:" },
-	{ SGCHECKBOX, 0, 0, 12,6, 7,1, "Enabled" },
-	{ SGCHECKBOX, 0, 0, 23,6, 12,1, "Double Sided" },
-	{ SGBUTTON, 0, 0, 46,6, 7,1, "Eject" },
-	{ SGBUTTON, 0, 0, 54,6, 8,1, "Browse" },
+	{ SGCHECKBOX, 0, 0, 12,6,  9,1, "Ena_bled" },
+	{ SGCHECKBOX, 0, 0, 23,6, 14,1, "Doub_le Sided" },
+	{ SGBUTTON,   0, 0, 46,6,  7,1, "E_ject" },
+	{ SGBUTTON,   0, 0, 54,6,  8,1, "Bro_wse" },
 	{ SGTEXT, 0, 0, 3,7, 58,1, NULL },
 
 	{ SGTEXT, 0, 0, 2,9, 32,1, "Default floppy images directory:" },
 	{ SGTEXT, 0, 0, 3,10, 58,1, NULL },
-	{ SGBUTTON, 0, 0, 54,9, 8,1, "Browse" },
-	{ SGCHECKBOX, 0, 0, 2,12, 16,1, "Auto insert B" },
-	{ SGCHECKBOX, 0, 0, 2,14, 21,1, "Fast floppy access" },
-	{ SGBUTTON, 0, 0, 42,14, 20,1, "Create blank image" },
+	{ SGBUTTON,   0, 0, 54, 9,  8,1, "Brow_se" },
+	{ SGCHECKBOX, 0, 0,  2,12, 15,1, "Auto _insert B" },
+	{ SGCHECKBOX, 0, 0,  2,14, 20,1, "_Fast floppy access" },
+	{ SGBUTTON,   0, 0, 42,14, 20,1, "_Create blank image" },
 	{ SGTEXT, 0, 0, 2,16, 17,1, "Write protection:" },
-	{ SGRADIOBUT, 0, 0, 21,16, 5,1, "Off" },
-	{ SGRADIOBUT, 0, 0, 28,16, 5,1, "On" },
-	{ SGRADIOBUT, 0, 0, 34,16, 6,1, "Auto" },
+	{ SGRADIOBUT, 0, 0, 21,16,  5,1, "_Off" },
+	{ SGRADIOBUT, 0, 0, 28,16,  4,1, "O_n" },
+	{ SGRADIOBUT, 0, 0, 34,16,  6,1, "A_uto" },
 	{ SGBUTTON, SG_DEFAULT, 0, 22,18, 20,1, "Back to main menu" },
-	{ -1, 0, 0, 0,0, 0,0, NULL }
+	{ SGSTOP, 0, 0, 0,0, 0,0, NULL }
 };
 
 
@@ -82,10 +82,10 @@ static SGOBJ alertdlg[] =
 {
 	{ SGBOX, 0, 0, 0,0, 40,6, NULL },
 	{ SGTEXT, 0, 0, 3,1, 30,1, "Insert last created disk to?" },
-	{ SGBUTTON, 0, 0, 3,4, 10,1, "Drive A:" },
-	{ SGBUTTON, 0, 0, 15,4, 10,1, "Drive B:" },
-	{ SGBUTTON, SG_CANCEL, 0, 27,4, 10,1, "Cancel" },
-	{ -1, 0, 0, 0,0, 0,0, NULL }
+	{ SGBUTTON, 0, 0,  3,4, 10,1, "Drive _A:" },
+	{ SGBUTTON, 0, 0, 15,4, 10,1, "Drive _B:" },
+	{ SGBUTTON, SG_CANCEL, 0, 27,4, 10,1, "_Cancel" },
+	{ SGSTOP, 0, 0, 0,0, 0,0, NULL }
 };
 
 
@@ -103,7 +103,7 @@ static void DlgDisk_BrowseDisk(char *dlg
 	else
 		tmpname = ConfigureParams.DiskImage.szDiskImageDirectory;
 
-	selname = SDLGui_FileSelect(tmpname, &zip_path, false);
+	selname = SDLGui_FileSelect("Floppy image:", tmpname, &zip_path, false);
 	if (!selname)
 		return;
 
@@ -118,8 +118,7 @@ static void DlgDisk_BrowseDisk(char *dlg
 		Floppy_SetDiskFileNameNone(drive);
 		dlgname[0] = '\0';
 	}
-	if (zip_path)
-		free(zip_path);
+	free(zip_path);
 	free(selname);
 }
 
@@ -131,7 +130,7 @@ static void DlgDisk_BrowseDir(char *dlgn
 {
 	char *str, *selname;
 
-	selname = SDLGui_FileSelect(confname, NULL, false);
+	selname = SDLGui_FileSelect("Floppy image directory:", confname, NULL, false);
 	if (!selname)
 		return;
 
@@ -156,7 +155,7 @@ static void DlgFloppy_QueryInsert(char *
 	char *dlgname;
 
 	SDLGui_CenterDlg(alertdlg);
-	switch (SDLGui_DoDialog(alertdlg, NULL))
+	switch (SDLGui_DoDialog(alertdlg, NULL, false))
 	{
 		case DLGMOUNT_A:
 			dlgname = namea;
@@ -257,7 +256,7 @@ void DlgFloppy_Main(void)
 	/* Draw and process the dialog */
 	do
 	{
-		but = SDLGui_DoDialog(floppydlg, NULL);
+		but = SDLGui_DoDialog(floppydlg, NULL, false);
 		switch (but)
 		{
 		 case FLOPPYDLG_EJECTA:                         /* Eject disk in drive A: */