--- BasiliskII/src/include/user_strings.h	1999/10/03 14:16:26	1.1
+++ BasiliskII/src/include/user_strings.h	1999/10/27 16:59:53	1.4
@@ -21,7 +21,7 @@
 #ifndef USER_STRINGS_H
 #define USER_STRINGS_H
 
-// String numbers
+// Common string numbers
 enum {
 	// General messages
 	STR_ABOUT_TEXT1 = 0,
@@ -57,6 +57,8 @@ enum {
 	// Warning messages
 	STR_SMALL_RAM_WARN = 2000,
 	STR_CREATE_VOLUME_WARN,
+	STR_VOLUME_IS_MOUNTED_WARN,
+	STR_CANNOT_UNMOUNT_WARN,
 
 	// Preferences window
 	STR_PREFS_TITLE = 3000,
@@ -65,13 +67,8 @@ enum {
 	STR_PREFS_ITEM_START,
 	STR_PREFS_ITEM_ZAP_PRAM,
 	STR_PREFS_ITEM_QUIT,
-	STR_PREFS_MENU_FILE_GTK = 3040,
-	STR_PREFS_ITEM_START_GTK,
-	STR_PREFS_ITEM_ZAP_PRAM_GTK,
-	STR_PREFS_ITEM_SEPL_GTK,
-	STR_PREFS_ITEM_QUIT_GTK,
-	STR_HELP_MENU_GTK,
-	STR_HELP_ITEM_ABOUT_GTK,
+
+	STR_NONE_LAB = 3100,
 
 	STR_VOLUMES_PANE_TITLE = 3200,	// Volumes pane
 	STR_VOLUMES_CTRL,
@@ -86,6 +83,7 @@ enum {
 	STR_BOOT_ANY_LAB,
 	STR_BOOT_CDROM_LAB,
 	STR_NOCDROM_CTRL,
+	STR_EXTFS_CTRL,
 	STR_DEVICE_CTRL,
 	STR_UNIT_CTRL,
 	STR_ADD_VOLUME_TITLE,
@@ -126,6 +124,15 @@ enum {
 	STR_REF_60HZ_LAB,
 	STR_DISPLAY_X_CTRL,
 	STR_DISPLAY_Y_CTRL,
+	STR_SIZE_384_LAB,
+	STR_SIZE_480_LAB,
+	STR_SIZE_512_LAB,
+	STR_SIZE_600_LAB,
+	STR_SIZE_640_LAB,
+	STR_SIZE_768_LAB,
+	STR_SIZE_800_LAB,
+	STR_SIZE_1024_LAB,
+	STR_SIZE_MAX_LAB,
 	STR_COLOR_DEPTH_CTRL,
 	STR_1_BIT_LAB,
 	STR_2_BIT_LAB,
@@ -153,7 +160,6 @@ enum {
 	STR_24_BIT_1280x1024_LAB,
 	STR_24_BIT_1600x1200_LAB,
 	STR_SOUND_CTRL,
-	STR_AHI_MODE_CTRL,
 	STR_NOSOUND_CTRL,
 
 	STR_SERIAL_NETWORK_PANE_TITLE = 3500,	// Serial/Networking pane
@@ -170,8 +176,7 @@ enum {
 	STR_MODELID_5_LAB,
 	STR_MODELID_14_LAB,
 	STR_ROM_FILE_CTRL,
-	STR_KEYCODES_CTRL,
-	STR_KEYCODE_FILE_CTRL,
+	STR_FPU_CTRL,
 
 	// Mac window
 	STR_WINDOW_TITLE = 4000,
@@ -182,45 +187,21 @@ enum {
 	STR_WINDOW_ITEM_MOUNT,
 	STR_SUSPEND_WINDOW_TITLE,
 
-	// BeOS specific messages
-	STR_NO_SHEEP_DRIVER_ERR = 10000,
-	STR_SHEEP_UP_ERR,
-	STR_NO_KERNEL_DATA_ERR,
-	STR_VOLUME_IS_MOUNTED_WARN,
-	STR_CANNOT_UNMOUNT_WARN,
-	STR_NO_NET_ADDON_WARN,
-	STR_NET_CONFIG_MODIFY_WARN,
-	STR_NET_ADDON_INIT_FAILED,
-	STR_NET_ADDON_CLONE_FAILED,
-
-	// Unix specific messages
-	STR_NO_XSERVER_ERR = 11000,
-	STR_NO_XVISUAL_ERR,
-	STR_UNSUPP_DEPTH_ERR,
-	STR_NO_SHEEP_NET_DRIVER_WARN,
-	STR_SHEEP_NET_ATTACH_WARN,
-	STR_SCSI_DEVICE_OPEN_WARN,
-	STR_SCSI_DEVICE_NOT_SCSI_WARN,
-	STR_NO_AUDIO_DEV_WARN,
-	STR_AUDIO_FORMAT_WARN,
-	STR_KEYCODE_FILE_WARN,
-	STR_KEYCODE_VENDOR_WARN,
-
-	// AmigaOS specific messages
-	STR_NO_PREPARE_EMUL_ERR = 12000,
-	STR_NO_GADTOOLS_LIB_ERR,
-	STR_NO_ASL_LIB_ERR,
-	STR_NO_TIMER_DEV_ERR,
-	STR_NO_P96_MODE_ERR,
-	STR_WRONG_SCREEN_DEPTH_ERR,
-	STR_WRONG_SCREEN_FORMAT_ERR,
-	STR_NOT_ETHERNET_WARN,
-	STR_NO_MULTICAST_WARN,
-	STR_NO_GTLAYOUT_LIB_WARN,
-	STR_NO_AHI_WARN,
-	STR_NO_AHI_CTRL_WARN
+	// External file system
+	STR_EXTFS_NAME = 5000,
+	STR_EXTFS_VOLUME_NAME
+};
+
+// Common and platform-specific string definitions
+struct user_string_def {
+	int num;
+	const char *str;
 };
 
-extern char *GetString(int num);
+extern user_string_def common_strings[];
+extern user_string_def platform_strings[];
+
+// Fetch pointer to string, given the string number
+extern const char *GetString(int num);
 
 #endif