--- a/ROX-Filer/src/menu.c	Sat May 17 16:40:24 2008
+++ b/ROX-Filer/src/menu.c	Thu Jun 12 01:37:41 2008
@@ -182,33 +182,10 @@
 #define N_(x) x
 
 static GtkItemFactoryEntry filer_menu_def[] = {
-{N_("Display"),			NULL, NULL, 0, "<Branch>"},
-{">" N_("Icons View"),   	NULL, view_type, VIEW_TYPE_COLLECTION, NULL},
-{">" N_("Icons, With..."),	NULL, NULL, 0, "<Branch>"},
-{">>" N_("Sizes"),		NULL, set_with, DETAILS_SIZE, NULL},
-{">>" N_("Permissions"),	NULL, set_with, DETAILS_PERMISSIONS, NULL},
-{">>" N_("Types"),		NULL, set_with, DETAILS_TYPE, NULL},
-{">>" N_("Times"),		NULL, set_with, DETAILS_TIMES, NULL},
-{">" N_("List View"),   	NULL, view_type, VIEW_TYPE_DETAILS, "<StockItem>", ROX_STOCK_SHOW_DETAILS},
-{">",				NULL, NULL, 0, "<Separator>"},
-{">" N_("Bigger Icons"),   	"equal", change_size, 1, "<StockItem>", GTK_STOCK_ZOOM_IN},
-{">" N_("Smaller Icons"),   	"minus", change_size, -1, "<StockItem>", GTK_STOCK_ZOOM_OUT},
-{">" N_("Automatic"),   	NULL, change_size_auto, 0, "<ToggleItem>"},
-{">",				NULL, NULL, 0, "<Separator>"},
-{">" N_("Sort by Name"),	NULL, set_sort, SORT_NAME, NULL},
-{">" N_("Sort by Type"),	NULL, set_sort, SORT_TYPE, NULL},
-{">" N_("Sort by Date"),	NULL, set_sort, SORT_DATE, NULL},
-{">" N_("Sort by Size"),	NULL, set_sort, SORT_SIZE, NULL},
-{">" N_("Sort by Owner"),	NULL, set_sort, SORT_OWNER, NULL},
-{">" N_("Sort by Group"),	NULL, set_sort, SORT_GROUP, NULL},
-{">" N_("Reversed"),		NULL, reverse_sort, 0, "<ToggleItem>"},
-{">",				NULL, NULL, 0, "<Separator>"},
-{">" N_("Show Hidden"),   	"<Ctrl>H", hidden, 0, "<ToggleItem>"},
-{">" N_("Filter Files..."),   	NULL, mini_buffer, MINI_FILTER, NULL},
-{">" N_("Filter Directories With Files"),	NULL, filter_directories, 0, "<ToggleItem>"},
-{">" N_("Show Thumbnails"),	NULL, show_thumbs, 0, "<ToggleItem>"},
-{">" N_("Refresh"),		NULL, refresh, 0, "<StockItem>", GTK_STOCK_REFRESH},
-{">" N_("Save Current Display Settings..."),	 NULL, save_settings, 0, NULL},
+{N_("New"),			NULL, NULL, 0, "<Branch>"},
+{">" N_("Directory"),		NULL, new_directory, 0, NULL},
+{">" N_("Blank file"),		NULL, new_file, 0, "<StockItem>", GTK_STOCK_NEW},
+{">" N_("Customise Menu..."),	NULL, customise_new, 0, NULL},
 {N_("File"),			NULL, NULL, 0, "<Branch>"},
 {">" N_("Copy..."),		"<Ctrl>C", file_op, FILE_COPY_ITEM, "<StockItem>", GTK_STOCK_COPY},
 {">" N_("Rename..."),		NULL, file_op, FILE_RENAME_ITEM, NULL},
@@ -233,10 +210,6 @@
 {">" N_("Select by Name..."),	"period", mini_buffer, MINI_SELECT_BY_NAME, NULL},
 {">" N_("Select If..."),	"<Shift>question", mini_buffer, MINI_SELECT_IF, NULL},
 {N_("Options..."),		NULL, menu_show_options, 0, "<StockItem>", GTK_STOCK_PREFERENCES},
-{N_("New"),			NULL, NULL, 0, "<Branch>"},
-{">" N_("Directory"),		NULL, new_directory, 0, NULL},
-{">" N_("Blank file"),		NULL, new_file, 0, "<StockItem>", GTK_STOCK_NEW},
-{">" N_("Customise Menu..."),	NULL, customise_new, 0, NULL},
 {N_("Window"),			NULL, NULL, 0, "<Branch>"},
 {">" N_("Parent, New Window"), 	NULL, open_parent, 0, "<StockItem>", GTK_STOCK_GO_UP},
 {">" N_("Parent, Same Window"), NULL, open_parent_same, 0, NULL},
@@ -254,6 +227,33 @@
 {">" N_("Shell Command..."),	"<Shift>exclam", mini_buffer, MINI_SHELL, NULL},
 {">" N_("Terminal Here"),	"grave", xterm_here, FALSE, NULL},
 {">" N_("Switch to Terminal"),	NULL, xterm_here, TRUE, NULL},
+{N_("Display"),			NULL, NULL, 0, "<Branch>"},
+{">" N_("Icons View"),   	NULL, view_type, VIEW_TYPE_COLLECTION, NULL},
+{">" N_("Icons, With..."),	NULL, NULL, 0, "<Branch>"},
+{">>" N_("Sizes"),		NULL, set_with, DETAILS_SIZE, NULL},
+{">>" N_("Permissions"),	NULL, set_with, DETAILS_PERMISSIONS, NULL},
+{">>" N_("Types"),		NULL, set_with, DETAILS_TYPE, NULL},
+{">>" N_("Times"),		NULL, set_with, DETAILS_TIMES, NULL},
+{">" N_("List View"),   	NULL, view_type, VIEW_TYPE_DETAILS, "<StockItem>", ROX_STOCK_SHOW_DETAILS},
+{">",				NULL, NULL, 0, "<Separator>"},
+{">" N_("Bigger Icons"),   	"equal", change_size, 1, "<StockItem>", GTK_STOCK_ZOOM_IN},
+{">" N_("Smaller Icons"),   	"minus", change_size, -1, "<StockItem>", GTK_STOCK_ZOOM_OUT},
+{">" N_("Automatic"),   	NULL, change_size_auto, 0, "<ToggleItem>"},
+{">",				NULL, NULL, 0, "<Separator>"},
+{">" N_("Sort by Name"),	NULL, set_sort, SORT_NAME, NULL},
+{">" N_("Sort by Type"),	NULL, set_sort, SORT_TYPE, NULL},
+{">" N_("Sort by Date"),	NULL, set_sort, SORT_DATE, NULL},
+{">" N_("Sort by Size"),	NULL, set_sort, SORT_SIZE, NULL},
+{">" N_("Sort by Owner"),	NULL, set_sort, SORT_OWNER, NULL},
+{">" N_("Sort by Group"),	NULL, set_sort, SORT_GROUP, NULL},
+{">" N_("Reversed"),		NULL, reverse_sort, 0, "<ToggleItem>"},
+{">",				NULL, NULL, 0, "<Separator>"},
+{">" N_("Show Hidden"),   	"<Ctrl>H", hidden, 0, "<ToggleItem>"},
+{">" N_("Filter Files..."),   	NULL, mini_buffer, MINI_FILTER, NULL},
+{">" N_("Filter Directories With Files"),	NULL, filter_directories, 0, "<ToggleItem>"},
+{">" N_("Show Thumbnails"),	NULL, show_thumbs, 0, "<ToggleItem>"},
+{">" N_("Refresh"),		NULL, refresh, 0, "<StockItem>", GTK_STOCK_REFRESH},
+{">" N_("Save Current Display Settings..."),	 NULL, save_settings, 0, NULL},
 {N_("Help"),			NULL, NULL, 0, "<Branch>"},
 {">" N_("About ROX-Filer..."),	NULL, menu_rox_help, HELP_ABOUT, NULL},
 {">" N_("Show Help Files"),	"F1", menu_rox_help, HELP_DIR, "<StockItem>", GTK_STOCK_HELP},
