diff --git a/distrib/utils/sysinst/arch/i386/msg.md.fr b/distrib/utils/sysinst/arch/i386/msg.md.fr
index 5929153232e5..61d9f0d9520d 100644
--- a/distrib/utils/sysinst/arch/i386/msg.md.fr
+++ b/distrib/utils/sysinst/arch/i386/msg.md.fr
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.22 2003/06/06 14:31:27 dsl Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.23 2003/06/11 09:03:33 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -167,41 +167,6 @@ pouvez devoir prendre soin de fusionner nouvellement cr
 d' /emul/aout avec le vieil.
 }
 
-message Change_a
-{Changer a}
-message Change_b
-{Changer b}
-message NetBSD_partition_cant_change
-{Partition de NetBSD - Changement impossible}
-message Whole_disk_cant_change
-{Totalité du disque - Changement impossible}
-message Change_e
-{Changer e}
-message Change_f
-{Changer f}
-message Change_g
-{Changer g}
-message Change_h
-{Changer h}
-message Change_i
-{Changer i}
-message Change_j
-{Changer j}
-message Change_k
-{Changer k}
-message Change_l
-{Changer l}
-message Change_m
-{Changer m}
-message Change_n
-{Changer n}
-message Change_o
-{Changer o}
-message Change_p
-{Changer p}
-message Set_new_allocation_size
-{Changer d'unité}
-
 message Selection_toggles_inclusion
 {Sélection des composants}
 message Kernel_GENERIC
diff --git a/distrib/utils/sysinst/arch/i386/msg.md.pl b/distrib/utils/sysinst/arch/i386/msg.md.pl
index 700dcfd762d5..e4553a026612 100644
--- a/distrib/utils/sysinst/arch/i386/msg.md.pl
+++ b/distrib/utils/sysinst/arch/i386/msg.md.pl
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.pl,v 1.7 2003/06/06 14:31:27 dsl Exp $	*/
+/*	$NetBSD: msg.md.pl,v 1.8 2003/06/11 09:03:33 dsl Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp 	*/
 
@@ -169,41 +169,6 @@ Kiedy juz uruchomisz swoj zaktualizowany system, mozliwe ze bedziesz musial
 zajac sie polaczeniem nowo utworzonego /emul/aout ze starym.
 }
 
-message Change_a
-{Zmien a}
-message Change_b
-{Zmien b}
-message NetBSD_partition_cant_change
-{partycja NetBSD - nie mozna zmienic}
-message Whole_disk_cant_change
-{Caly dysk - nie mozna zmienic}
-message Change_e
-{Zmien e}
-message Change_f
-{Zmien f}
-message Change_g
-{Zmien g}
-message Change_h
-{Zmien h}
-message Change_i
-{Zmien i}
-message Change_j
-{Zmien j}
-message Change_k
-{Zmien k}
-message Change_l
-{Zmien l}
-message Change_m
-{Zmien m}
-message Change_n
-{Zmien n}
-message Change_o
-{Zmien o}
-message Change_p
-{Zmien p}
-message Set_new_allocation_size
-{Ustaw nowy przydzial rozmiarow}
-
 message Selection_toggles_inclusion
 {Wybierz}
 message Kernel_GENERIC
diff --git a/distrib/utils/sysinst/menus.mi b/distrib/utils/sysinst/menus.mi
index ea99d0e2d87c..16ab004abe36 100644
--- a/distrib/utils/sysinst/menus.mi
+++ b/distrib/utils/sysinst/menus.mi
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.mi,v 1.4 2003/06/10 17:47:15 dsl Exp $	*/
+/*	$NetBSD: menus.mi,v 1.5 2003/06/11 09:03:32 dsl Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -59,3 +59,28 @@ default y=12, no exit, scrollable;
 allow dynamic menus;
 allow dynamic messages;
 
+
+menu selfskind, title MSG_Select_the_type, y=15;
+	option "4.2BSD", exit, action 
+	    { ((partinfo *)arg)->pi_fstype = FS_BSDFFS; set_bsize(arg, 8192); };
+	option "unused", exit, action 
+	    { ((partinfo *)arg)->pi_fstype = FS_UNUSED; set_bsize(arg, 0); };
+	option "swap", exit, action 
+	    { ((partinfo *)arg)->pi_fstype = FS_SWAP;   set_bsize(arg, 0); };
+	option "msdos", exit, action 
+	    { ((partinfo *)arg)->pi_fstype = FS_MSDOS;  set_bsize(arg, 0); };
+	option "4.4LFS", exit, action 
+	    { ((partinfo *)arg)->pi_fstype = FS_BSDLFS; set_bsize(arg, 8192); };
+
+menu selbsize, title MSG_Select_file_system_block_size, y = 15;
+	option  "8192", exit, action { set_bsize(arg, 8192); };
+	option  "4096", exit, action { set_bsize(arg, 4096); };
+	option "16384", exit, action { set_bsize(arg, 16384); };
+	option "32768", exit, action { set_bsize(arg, 32768); };
+
+menu selfsize, title MSG_Select_number_of_fragments_per_block, y = 15;
+	option MSG_f8_per_block, exit, action { set_fsize(arg, 8); };
+	option MSG_f4_per_block, exit, action { set_fsize(arg, 4); };
+	option MSG_f2_per_block, exit, action { set_fsize(arg, 2); };
+	option MSG_f1_per_block, exit, action { set_fsize(arg, 1); };
+
diff --git a/distrib/utils/sysinst/menus.mi.en b/distrib/utils/sysinst/menus.mi.en
index f8fcc614d276..8bf55aaecde8 100644
--- a/distrib/utils/sysinst/menus.mi.en
+++ b/distrib/utils/sysinst/menus.mi.en
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.mi.en,v 1.70 2003/06/10 17:47:15 dsl Exp $	*/
+/*	$NetBSD: menus.mi.en,v 1.71 2003/06/11 09:03:32 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -106,129 +106,6 @@ menu sizechoice, title  "Choose your size specifier";
 		  multname = msg_string(MSG_secname);
 		};
 
-.if 0
-menu fspartok, title "Partitions ok?", y=15;
-	display action  {
-		msg_display(MSG_fspart, multname);
-		disp_cur_fspart(-1, 0);
-	};
-	option "Change partitions", sub menu editfsparts;
-	option "Partitions are ok", exit;
-
-menu edfspart, title "Change what?", exit, y=14;
-	display action  {
-		msg_display (MSG_edfspart, 'a'+editpart);
-		disp_cur_fspart(editpart, 1);
-	};
-	option "FS kind", action
-		{
-			if (check_lfs_progs())
-				process_menu (MENU_selfskindlfs, NULL);
-			else
-				process_menu (MENU_selfskind, NULL);
-		};
-	option "Start/size", action  
-		{	int start, size;
-			msg_display_add(MSG_defaultunit, multname);
-			start = getpartoff(MSG_start,
-				bsdlabel[editpart].pi_offset);
-			size = getpartsize(MSG_size, start,
-				bsdlabel[editpart].pi_size);
-			if (size == -1)
-				size = dlsize - start;
-			bsdlabel[editpart].pi_offset = start;
-			bsdlabel[editpart].pi_size = size;
-		};
-	option "Bsize/Fsize", action 
-		{	char buf[40]; int i;
-
-			if (!PI_ISBSDFS(&bsdlabel[editpart])) {
-				msg_display (MSG_not42bsd, 'a'+editpart);
-				process_menu (MENU_ok, NULL);
-				return FALSE;
-			}
-			snprintf(buf, sizeof(buf), "%d",
-				bsdlabel[editpart].pi_bsize);
-			msg_prompt_add (MSG_bsize, buf, buf, 40);
-			i = atoi(buf);
-			bsdlabel[editpart].pi_bsize = i;
-			snprintf(buf, sizeof(buf), "%d",
-				bsdlabel[editpart].pi_fsize);
-			msg_prompt_add (MSG_fsize, buf, buf, 40);
-			i = atoi(buf);
-			bsdlabel[editpart].pi_fsize = i;
-		};
-	option "Mount point", action 
-		{	if (PI_ISBSDFS(&bsdlabel[editpart]) ||
-			    bsdlabel[editpart].pi_fstype == FS_MSDOS) {
-				msg_prompt_add (MSG_mountpoint,
-					bsdlabel[editpart].pi_mount,
-					bsdlabel[editpart].pi_mount,
-					sizeof bsdlabel[editpart].pi_mount);
-				if (strcmp(bsdlabel[editpart].pi_mount, "none") == 0)
-					bsdlabel[editpart].pi_mount[0] = '\0';
-			} else {
-				msg_display (MSG_nomount, 'a'+editpart);
-				process_menu (MENU_ok, NULL);
-			}
-		};
-	option "Preserve", action 
-		{	bsdlabel[editpart].pi_newfs ^= 1; };
-.endif
-
-menu selfskind, title "Select the type", y=15;
-	option "4.2BSD", exit, action 
-	    { ((partinfo *)arg)->pi_fstype = FS_BSDFFS; set_bsize(arg, 8192); };
-	option "unused", exit, action 
-	    { ((partinfo *)arg)->pi_fstype = FS_UNUSED; set_bsize(arg, 0); };
-	option "swap", exit, action 
-	    { ((partinfo *)arg)->pi_fstype = FS_SWAP;   set_bsize(arg, 0); };
-	option "msdos", exit, action 
-	    { ((partinfo *)arg)->pi_fstype = FS_MSDOS;  set_bsize(arg, 0); };
-	option "4.4LFS", exit, action 
-	    { ((partinfo *)arg)->pi_fstype = FS_BSDLFS; set_bsize(arg, 8192); };
-
-menu selbsize, title "Select file system block size", y = 15;
-	option "8192", exit, action { set_bsize(arg, 8192); };
-	option "4096", exit, action { set_bsize(arg, 4096); };
-	option "16384", exit, action { set_bsize(arg, 16384); };
-	option "32768", exit, action { set_bsize(arg, 32768); };
-
-menu selfsize, title "Select number of fragments per filesystem block", y = 15;
-	option "8 per block", exit, action { set_fsize(arg, 8); };
-	option "4 per block", exit, action { set_fsize(arg, 4); };
-	option "2 per block", exit, action { set_fsize(arg, 2); };
-	option "1 per block", exit, action { set_fsize(arg, 1); };
-
-.if 0
-menu selfskindlfs, title "Select the type", y=15;
-	option "4.2BSD", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_BSDFFS;
-			  bsdlabel[editpart].pi_bsize  = 8192;
-			  bsdlabel[editpart].pi_fsize  = 1024;
-			};
-	option "unused", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_UNUSED;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "swap", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_SWAP;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "msdos", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_MSDOS;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "4.4LFS", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_BSDLFS;
-			  bsdlabel[editpart].pi_bsize  = 8192;
-			  bsdlabel[editpart].pi_fsize  = 1024;
-			};
-.endif
-
 menu distmedium, title "Select medium";
 	display action { msg_display (MSG_distmedium); nodist = 0; };
 	option "ftp",  action	{
diff --git a/distrib/utils/sysinst/menus.mi.fr b/distrib/utils/sysinst/menus.mi.fr
index be08fc65fe0e..21fb115610f4 100644
--- a/distrib/utils/sysinst/menus.mi.fr
+++ b/distrib/utils/sysinst/menus.mi.fr
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.mi.fr,v 1.48 2003/06/06 14:31:22 dsl Exp $	*/
+/*	$NetBSD: menus.mi.fr,v 1.49 2003/06/11 09:03:32 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -103,95 +103,6 @@ menu sizechoice, title  "Choisissez votre unit
 		  multname = msg_string(MSG_secname);
 		};
 
-menu fspartok, title "Partitions ok?", y=15;
-	display action  {
-		msg_display(MSG_fspart, multname);
-		disp_cur_fspart(-1, 0);
-	};
-	option "Changer une partition", sub menu editfsparts;
-	option "Les Partitions sont ok", exit;
-
-menu edfspart, title "Changer quoi?", exit, y=14;
-	display action  {
-		msg_display (MSG_edfspart, 'a'+editpart);
-		disp_cur_fspart(editpart, 1);
-	};
-	option "type de FS", sub menu  selfskind;
-	option "Offset/taille", action  
-		{	int start, size;
-			msg_display_add(MSG_defaultunit, multname);
-			start = getpartoff(MSG_start,
-				bsdlabel[editpart].pi_offset);
-			size = getpartsize(MSG_size, start,
-				bsdlabel[editpart].pi_size);
-			if (size == -1)
-				size = dlsize - start;
-			bsdlabel[editpart].pi_offset = start;
-			bsdlabel[editpart].pi_size = size;
-		};
-	option "Taille de block/Taille de fragment", action 
-		{	char buf[40]; int i;
-
-			if (!PI_ISBSDFS(&bsdlabel[editpart])) {
-				msg_display (MSG_not42bsd, 'a'+editpart);
-				process_menu (MENU_ok, NULL);
-				return FALSE;
-			}
-			snprintf(buf, sizeof(buf), "%d",
-				bsdlabel[editpart].pi_bsize);
-			msg_prompt_add (MSG_bsize, buf, buf, 40);
-			i = atoi(buf);
-			bsdlabel[editpart].pi_bsize = i;
-			snprintf(buf, sizeof(buf), "%d",
-				bsdlabel[editpart].pi_fsize);
-			msg_prompt_add (MSG_fsize, buf, buf, 40);
-			i = atoi(buf);
-			bsdlabel[editpart].pi_fsize = i;
-		};
-	option "Point de montage", action 
-		{	if (PI_ISBSDFS(&bsdlabel[editpart]) ||
-			    bsdlabel[editpart].pi_fstype == FS_MSDOS) {
-				msg_prompt_add (MSG_mountpoint,
-					bsdlabel[editpart].pi_mount,
-					bsdlabel[editpart].pi_mount,
-					sizeof bsdlabel[editpart].pi_mount);
-				if (strcmp(bsdlabel[editpart].pi_mount, "none") == 0)
-					bsdlabel[editpart].pi_mount[0] = '\0';
-			} else {
-				msg_display (MSG_nomount, 'a'+editpart);
-				process_menu (MENU_ok, NULL);
-			}
-		};
-	option "Preserve", action	/* XXX translate me */
-		{	bsdlabel[editpart].pi_newfs ^= 1; };
-
-menu selfskind, title "Selection du type de système de fichier", y=15;
-	option "4.2BSD", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_BSDFFS;
-			  bsdlabel[editpart].pi_bsize  = 8192;
-			  bsdlabel[editpart].pi_fsize  = 1024;
-			};
-	option "unused", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_UNUSED;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "swap", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_SWAP;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "msdos", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_MSDOS;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "4.4LFS", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_BSDLFS;
-			  bsdlabel[editpart].pi_bsize  = 8192;
-			  bsdlabel[editpart].pi_fsize  = 1024;
-  			};
-
 menu distmedium, title "Sélection du media d'installation";
 	display action { msg_display (MSG_distmedium); nodist = 0; };
 	option "ftp",  action   {
diff --git a/distrib/utils/sysinst/menus.mi.pl b/distrib/utils/sysinst/menus.mi.pl
index 06c0b2777e4c..9e9b98dc1348 100644
--- a/distrib/utils/sysinst/menus.mi.pl
+++ b/distrib/utils/sysinst/menus.mi.pl
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.mi.pl,v 1.18 2003/06/06 14:31:23 dsl Exp $	*/
+/*	$NetBSD: menus.mi.pl,v 1.19 2003/06/11 09:03:33 dsl Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: menus.mi.en,v 1.49 2002/04/04 14:26:44 ad Exp 	*/
 
@@ -108,124 +108,6 @@ menu sizechoice, title  "Wybierz specyfikator rozmiaru";
 		  multname = msg_string(MSG_secname);
 		};
 
-menu fspartok, title "Partycje ok?", y=15;
-	display action  {
-		msg_display(MSG_fspart, multname);
-		disp_cur_fspart(-1, 0);
-	};
-	option "Zmien partycje", sub menu editfsparts;
-	option "Partycje sa ok", exit;
-
-menu edfspart, title "Co zmienic?", exit, y=14;
-	display action  {
-		msg_display (MSG_edfspart, 'a'+editpart);
-		disp_cur_fspart(editpart, 1);
-	};
-	option "SystemPlikow", action
-		{
-			if (check_lfs_progs())
-				process_menu (MENU_selfskindlfs, NULL);
-			else
-				process_menu (MENU_selfskind, NULL);
-		};
-	option "Przesuniecie/rozmiar", action  
-		{	int start, size;
-			msg_display_add(MSG_defaultunit, multname);
-			start = getpartoff(MSG_start,
-				bsdlabel[editpart].pi_offset);
-			size = getpartsize(MSG_size, start,
-				bsdlabel[editpart].pi_size);
-			if (size == -1)
-				size = dlsize - start;
-			bsdlabel[editpart].pi_offset = start;
-			bsdlabel[editpart].pi_size = size;
-		};
-	option "Bsize/Fsize", action 
-		{	char buf[40]; int i;
-
-			if (!PI_ISBSDFS(&bsdlabel[editpart])) {
-				msg_display (MSG_not42bsd, 'a'+editpart);
-				process_menu (MENU_ok, NULL);
-				return FALSE;
-			}
-			snprintf(buf, sizeof(buf), "%d",
-				bsdlabel[editpart].pi_bsize);
-			msg_prompt_add (MSG_bsize, buf, buf, 40);
-			i = atoi(buf);
-			bsdlabel[editpart].pi_bsize = i;
-			snprintf(buf, sizeof(buf), "%d",
-				bsdlabel[editpart].pi_fsize);
-			msg_prompt_add (MSG_fsize, buf, buf, 40);
-			i = atoi(buf);
-			bsdlabel[editpart].pi_fsize = i;
-		};
-	option "Punkt montazu", action 
-		{	if (PI_ISBSDFS(&bsdlabel[editpart]) ||
-			    bsdlabel[editpart].pi_fstype == FS_MSDOS) {
-				msg_prompt_add (MSG_mountpoint,
-					bsdlabel[editpart].pi_mount,
-					bsdlabel[editpart].pi_mount,
-					sizeof bsdlabel[editpart].pi_mount);
-				if (strcmp(bsdlabel[editpart].pi_mount, "none") == 0)
-					bsdlabel[editpart].pi_mount[0] = '\0';
-			} else {
-				msg_display (MSG_nomount, 'a'+editpart);
-				process_menu (MENU_ok, NULL);
-			}
-		};
-	option "Ochrona", action 
-		{	bsdlabel[editpart].pi_newfs ^= 1; };
-
-menu selfskind, title "Wybierz rodzaj", y=15;
-	option "4.2BSD", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_BSDFFS;
-			  bsdlabel[editpart].pi_bsize  = 8192;
-			  bsdlabel[editpart].pi_fsize  = 1024;
-			};
-	option "nie uzywana", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_UNUSED;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "wymiany", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_SWAP;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "msdos", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_MSDOS;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-
-menu selfskindlfs, title "Wybierz rodzaj", y=15;
-	option "4.2BSD", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_BSDFFS;
-			  bsdlabel[editpart].pi_bsize  = 8192;
-			  bsdlabel[editpart].pi_fsize  = 1024;
-			};
-	option "nie uzywana", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_UNUSED;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "wymiany", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_SWAP;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "msdos", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_MSDOS;
-			  bsdlabel[editpart].pi_bsize  = 0;
-			  bsdlabel[editpart].pi_fsize  = 0;
-			};
-	option "4.4LFS", exit, action 
-			{ bsdlabel[editpart].pi_fstype = FS_BSDLFS;
-			  bsdlabel[editpart].pi_bsize  = 8192;
-			  bsdlabel[editpart].pi_fsize  = 1024;
-			};
-
-
 menu distmedium, title "Wybierz medium";
 	display action { msg_display (MSG_distmedium); nodist = 0; };
 	option "ftp",  action	{
diff --git a/distrib/utils/sysinst/msg.mi.en b/distrib/utils/sysinst/msg.mi.en
index 0cd3375359e4..628a5b27a402 100644
--- a/distrib/utils/sysinst/msg.mi.en
+++ b/distrib/utils/sysinst/msg.mi.en
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.en,v 1.102 2003/06/10 17:47:15 dsl Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.103 2003/06/11 09:03:33 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -323,6 +323,9 @@ message not42bsd
 frag size to set.
 }
 
+message Select_the_type
+{MSG Select the type}
+
 message label_size
 {%s
 Special values that can be entered for the size value:
@@ -343,6 +346,17 @@ message invalid_sector_number
 {Badly formed sector number
 }
 
+message Select_file_system_block_size
+{Select file system block size}
+
+message Select_number_of_fragments_per_block
+{Select number of fragments per filesystem block}
+
+message f8_per_block {8 per block}
+message f4_per_block {4 per block}
+message f2_per_block {2 per block}
+message f1_per_block {1 per block}
+
 message packname
 {Please enter a name for your NetBSD disk}
 
diff --git a/distrib/utils/sysinst/msg.mi.fr b/distrib/utils/sysinst/msg.mi.fr
index 4d09ad564e49..4bd965e67cdb 100644
--- a/distrib/utils/sysinst/msg.mi.fr
+++ b/distrib/utils/sysinst/msg.mi.fr
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.fr,v 1.51 2003/06/09 19:06:48 dsl Exp $	*/
+/*	$NetBSD: msg.mi.fr,v 1.52 2003/06/11 09:03:33 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -162,7 +162,7 @@ message fsize
 {taille de fragment}
 
 message mountpoint
-{point de montage (or 'none')}
+{point de montage (ou 'none')}
 
 message cylname
 {cyl}
@@ -227,6 +227,15 @@ message askfssize	/* XXX translate */
 message askunits	/* XXX translate */
 {Change input units (sectors/cylinders/MB)}
 
+message NetBSD_partition_cant_change
+{Partition de NetBSD - Changement impossible}
+
+message Whole_disk_cant_change
+{Totalité du disque - Changement impossible}
+
+message Boot_partition_cant_change
+{Partition de démarrer - Changement impossible}
+
 message add_another_ptn	/* XXX translate */
 {Add a user defined partition}
 
@@ -281,11 +290,72 @@ Les valeurs actuelles pour la partition %c sont :
 
 }
 
+message fstype_fmt	/* XXX translate */
+{  FStype: %9s}
+
+message start_fmt	/* XXX translate */
+{   start: %9d %9d %9d}
+
+message size_fmt	/* XXX translate */
+{    size: %9d %9d %9d}
+
+message end_fmt		/* XXX translate */
+{     end: %9d %9d %9d}
+
+message bsize_fmt	/* XXX translate */
+{   bsize: %9d bytes}
+
+message fsize_fmt	/* XXX translate */
+{   fsize: %9d bytes}
+
+message preserve_fmt	/* XXX translate */
+{preserve: %9s}
+
+message mount_fmt	/* XXX translate */
+{mount pt: %9s}
+
+message restore		/* XXX translate */
+{Restore original values}
+
 message not42bsd
 {La partition %c n'est pas du type 4.2BSD et ne doit pas avoir de taille de
 block et de fragment spécifiée.
 }
 
+message Select_the_type
+{Selection du type de système de fichier}
+
+message label_size	/* XXX translate */
+{%s
+Special values that can be entered for the size value:
+    -1:   use until the end of the NetBSD part of the disk
+   a-%c:   end this partition where partition X starts
+
+size (%s)}
+
+message label_offset	/* XXX translate */
+{%s
+Special values that can be entered for the offset value:
+    -1:   start at the beginning of the NetBSD part of the disk
+   a-%c:   start at the end of previous partition (a, b, ..., %c)
+
+start (%s)}
+
+message invalid_sector_number	/* XXX translate */
+{Badly formed sector number
+}
+
+message Select_file_system_block_size	/* XXX translate */
+{Select file system block size}
+
+message Select_number_of_fragments_per_block	/* XXX translate */
+{Select number of fragments per filesystem block}
+
+message f8_per_block {8 per block}	/* XXX translate */
+message f4_per_block {4 per block}	/* XXX translate */
+message f2_per_block {2 per block}	/* XXX translate */
+message f1_per_block {1 per block}	/* XXX translate */
+
 message packname
 {SVP donnez un nom à votre disque NetBSD.}
 
@@ -858,22 +928,6 @@ message rootsh	/* XXX translate */
 {You can now select which shell to use for the root user. The default is
 /bin/csh, but you may prefer another one.}
 
-message label_size_special	/* XXX translate */
-{
-Special values that can be entered for the size value:
-    -1:   use until the end of the NetBSD part of the disk
-   a-%c:   end this partition where partition X starts
-
-}
-
-message label_offset_special	/* XXX translate */
-{
-Special values that can be entered for the offset value:
-    -1:   start at the beginning of the NetBSD part of the disk
-   a-%c:   start at the end of previous partition (a, b, ..., %c)
-
-}
-
 message postuseexisting		/* XXX translate */
 {
 Don't forget to fill in the file system mount points for each of the
diff --git a/distrib/utils/sysinst/msg.mi.pl b/distrib/utils/sysinst/msg.mi.pl
index 0a3ee9b99617..57bbff654fa0 100644
--- a/distrib/utils/sysinst/msg.mi.pl
+++ b/distrib/utils/sysinst/msg.mi.pl
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.pl,v 1.14 2003/06/09 19:06:48 dsl Exp $	*/
+/*	$NetBSD: msg.mi.pl,v 1.15 2003/06/11 09:03:33 dsl Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.mi.en,v 1.86 2002/04/04 14:26:44 ad Exp 	*/
 
@@ -226,6 +226,15 @@ message askfssize	/* XXX translate */
 message askunits	/* XXX translate */
 {Change input units (sectors/cylinders/MB)}
 
+message NetBSD_partition_cant_change
+{partycja NetBSD - nie mozna zmienic}
+
+message Whole_disk_cant_change
+{Caly dysk - nie mozna zmienic}
+
+message Boot_partition_cant_change
+{partycja uruchomic - nie mozna zmienic}
+
 message add_another_ptn	/* XXX translate */
 {Add a user defined partition}
 
@@ -280,11 +289,72 @@ Aktualne wartosci dla partycji %c:
 
 }
 
+message fstype_fmt		/* XXX translate */
+{  FStype: %9s}
+
+message start_fmt		/* XXX translate */
+{   start: %9d %9d %9d}
+
+message size_fmt		/* XXX translate */
+{    size: %9d %9d %9d}
+
+message end_fmt		/* XXX translate */
+{     end: %9d %9d %9d}
+
+message bsize_fmt		/* XXX translate */
+{   bsize: %9d bytes}
+
+message fsize_fmt		/* XXX translate */
+{   fsize: %9d bytes}
+
+message preserve_fmt		/* XXX translate */
+{preserve: %9s}
+
+message mount_fmt		/* XXX translate */
+{mount pt: %9s}
+
+message restore		/* XXX translate */
+{Restore original values}
+
 message not42bsd
 {Partycja %c nie jest typu 4.2BSD i dlatego nie ma mozliwosci ustawienia
 rozmiaru bloku i frag.
 }
 
+message Select_the_type
+{Wybierz rodzaj}
+
+message label_size
+{%s
+Specjalne wartosci, ktore moga byc podane jako wartosci rozmiaru:
+    -1:   az do konca czesci dysku NetBSD
+   a-%c:   zakoncz ta partycje tam gdzie partycja X sie zaczyna
+
+rozmiar (%s)}
+
+message label_offset	/* XXX translate */
+{%s
+Specjalne wartosci, ktore moga byc podane jako wartosci przesuniecia:
+    -1:   zacznij na poczatku czesci dysku NetBSD
+   a-%c:   zacznij na koncu partycji X 
+
+start (%s)}
+
+message invalid_sector_number	/* XXX translate */
+{Badly formed sector number
+}
+
+message Select_file_system_block_size	/* XXX translate */
+{Select file system block size}
+
+message Select_number_of_fragments_per_block	/* XXX translate */
+{Select number of fragments per filesystem block}
+
+message f8_per_block {8 per block}	/* XXX translate */
+message f4_per_block {4 per block}	/* XXX translate */
+message f2_per_block {2 per block}	/* XXX translate */
+message f1_per_block {1 per block}	/* XXX translate */
+
 message packname
 {Podaj nazwe dla swojego dysku NetBSD}
 
@@ -835,22 +905,6 @@ message rootsh	/* XXX translate */
 {You can now select which shell to use for the root user. The default is
 /bin/csh, but you may prefer another one.}
 
-message label_size_special
-{
-Specjalne wartosci, ktore moga byc podane jako wartosci rozmiaru:
-    -1:   az do konca czesci dysku NetBSD
-   a-%c:   zakoncz ta partycje tam gdzie partycja X sie zaczyna
-
-}
-
-message label_offset_special
-{
-Specjalne wartosci, ktore moga byc podane jako wartosci przesuniecia:
-    -1:   zacznij na poczatku czesci dysku NetBSD
-   a-%c:   zacznij na koncu partycji X 
-
-}
-
 message postuseexisting
 {
 Nie zapomnij zamountowac wszystkich systemow plikow, ktorych chcesz