Index: libnautilus-private/nautilus-global-preferences.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-global-preferences.c,v
retrieving revision 1.203
diff -u -p -r1.203 nautilus-global-preferences.c
--- libnautilus-private/nautilus-global-preferences.c	28 Jun 2002 14:13:47 -0000	1.203
+++ libnautilus-private/nautilus-global-preferences.c	8 Jul 2002 19:50:10 -0000
@@ -98,7 +98,7 @@ static PreferenceImportType OLD_PREFEREN
 /* Enumerations used to qualify some INTEGER preferences */
 static EelEnumerationEntry speed_tradeoff_enum_entries[] = {
 	{ "always",	    N_("_Always"),		NAUTILUS_SPEED_TRADEOFF_ALWAYS },
-	{ "local_only",	    N_("_Local Files Only"),	NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY },
+	{ "local_only",	    N_("_Local File Only"),	NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY },
 	{ "never",	    N_("_Never"),		NAUTILUS_SPEED_TRADEOFF_NEVER },
 	{ NULL }
 };
Index: src/nautilus-preferences-dialog.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-preferences-dialog.c,v
retrieving revision 1.40
diff -u -p -r1.40 nautilus-preferences-dialog.c
--- src/nautilus-preferences-dialog.c	2 Jul 2002 18:30:08 -0000	1.40
+++ src/nautilus-preferences-dialog.c	8 Jul 2002 19:51:03 -0000
@@ -55,7 +55,7 @@ static void preferences_dialog_populate_
 static GtkWidget *preferences_dialog;
 
 static EelPreferencesItemDescription appearance_items[] = {
-	{ N_("Nautilus Themes"),
+	{ N_("Themes"),
 	  NULL,
 	  NULL,
 	  0,
@@ -68,29 +68,29 @@ static EelPreferencesItemDescription app
 };
 
 static EelPreferencesItemDescription windows_items[] = {
-	{ N_("Opening New Windows"),
+	{ N_("New Window Behavior"),
 	  NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW,
-	  N_("_Open each file or folder in a separate window"),
+	  N_("_Open each file or folder in a new window"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
-	{ N_("Opening New Windows"),
+	{ N_("New Windows Display"),
 	  NAUTILUS_PREFERENCES_START_WITH_SIDEBAR,
-	  N_("Display _side pane in new windows"),
+	  N_("Display _side pane"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
-	{ N_("Opening New Windows"),
+	{ N_("New Windows Display"),
 	  NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
-	  N_("Display _toolbar in new windows"),
+	  N_("Display _toolbar"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
-	{ N_("Opening New Windows"),
+	{ N_("New Windows Display"),
 	  NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR,
-	  N_("Display location _bar in new windows"),
+	  N_("Display location _bar"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
-	{ N_("Opening New Windows"),
+	{ N_("New Windows Display"),
 	  NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR,
-	  N_("Display st_atus bar in new windows"),
+	  N_("Display st_atusbar"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ NULL }
@@ -131,24 +131,24 @@ static EelPreferencesItemDescription dir
 	  N_("Executable Text Files"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_VERTICAL_RADIO
 	},
-	{ N_("Show/Hide Options"),
+	{ N_("Show Options"),
 	  NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
-	  N_("Show _hidden files (file names start with \".\")"),
+	  N_("_Hidden files (file names starting with \".\")"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
-	{ N_("Show/Hide Options"),
+	{ N_("Show Options"),
 	  NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
-	  N_("Show _backup files (file names end with \"~\")"),
+	  N_("_Backup files (file names ending with \"~\")"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
-	{ N_("Show/Hide Options"),
+	{ N_("Show Options"),
 	  NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS,
-	  N_("Show special flags in _Properties window"),
+	  N_("Special flags in _Properties dialog"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
-	{ N_("Sorting Order"),
+	{ N_("Sort"),
 	  NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST,
-	  N_("Always _list folders before files"),
+	  N_("Fo_lders before files"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ NULL }
@@ -179,12 +179,12 @@ static EelPreferencesItemDescription vie
 	/* Icon View Defaults */
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT,
-	  N_("_Arrange Items:"),
+	  N_("_Arrange items:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU
 	},
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER,
-	  N_("_Sort in reversed order"),
+	  N_("_Sort in reverse"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Icon View Defaults"),
@@ -195,7 +195,7 @@ static EelPreferencesItemDescription vie
 	},
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT,
-	  N_("Use _tighter layout"),
+	  N_("Use co_mpact layout"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN,
 	  NULL, 0, 1
 	},
@@ -203,12 +203,12 @@ static EelPreferencesItemDescription vie
 	/* List View Defaults */
 	{ N_("List View Defaults"),
 	  NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER,
-	  N_("Arrange _Items:"),
+	  N_("Arrange _items:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU
 	},
 	{ N_("List View Defaults"),
 	  NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER,
-	  N_("Sort in _reversed order"),
+	  N_("Sort in _reverse"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("List View Defaults"),
@@ -237,6 +237,7 @@ static EelPreferencesItemDescription sea
 };
 #endif
 
+#ifdef WEB_NAVIGATION_ENABLED
 static EelPreferencesItemDescription navigation_items[] = {
 	{ N_("Home"),
 	  NAUTILUS_PREFERENCES_HOME_URI,
@@ -250,6 +251,7 @@ static EelPreferencesItemDescription nav
 	},
 	{ NULL }
 };
+#endif
 
 static EelPreferencesItemDescription tradeoffs_items[] = {
 	{ N_("Show Text in Icons"),
@@ -257,7 +259,7 @@ static EelPreferencesItemDescription tra
 	  NULL,
 	  EEL_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO
 	},
-	{ N_("Show Count of Items in Folders"),
+	{ N_("Show Number of Items in Folders"),
 	  NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
 	  NULL,
 	  EEL_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO
@@ -269,7 +271,7 @@ static EelPreferencesItemDescription tra
 	},
 	{ N_("Show Thumbnails for Image Files"),
 	  NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
-	  N_("_Don't make thumbnails for files larger than:"),
+	  N_("_Do not make thumbnails for files larger than:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU_INTEGER
 	},
 	{ N_("Preview Sound Files"),
@@ -292,7 +294,7 @@ static EelPreferencesItemDescription sid
 	},
 	{ N_("Tree"),
 	  NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
-	  N_("_Show only folders (no files) in the tree"),
+	  N_("_Show folders only"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ NULL }
@@ -327,8 +329,10 @@ static EelPreferencesPaneDescription pan
 #ifdef HAVE_MEDUSA
 	{ N_("Search"),			  search_items },
 #endif
+#ifdef WEB_NAVIGATION_ENABLED
 	{ N_("Navigation"),		  navigation_items },
-	{ N_("Speed Tradeoffs"),	  tradeoffs_items },
+#endif
+	{ N_("Performance"),		  tradeoffs_items },
 #ifdef NEWS_SIDEBAR_ENABLED
 	{ N_("News Panel"),		  news_panel_items },
 #endif
@@ -442,23 +446,17 @@ global_preferences_populate_sidebar_pane
 						     const char *preference_key,
 						     gpointer callback_data) 
 {
-	char *description;
-
 	g_return_if_fail (name != NULL);
 	g_return_if_fail (iid != NULL);
 	g_return_if_fail (preference_key != NULL);
 	g_return_if_fail (EEL_IS_PREFERENCES_GROUP (callback_data));
 	
-	description = g_strdup_printf (_("Display %s tab in side pane"), name);
-	
-	eel_preferences_set_description (preference_key, description);
+	eel_preferences_set_description (preference_key, name);
 
 	eel_preferences_group_add_item (EEL_PREFERENCES_GROUP (callback_data),
 					preference_key,
 					EEL_PREFERENCE_ITEM_BOOLEAN,
 					0);
-
-	g_free (description);
 }
 
 static void
@@ -520,6 +518,7 @@ preferences_dialog_populate_themes_group
 	g_return_if_fail (EEL_IS_PREFERENCES_GROUP (group));
 
 	child = nautilus_theme_selector_new ();
+	gtk_widget_set_size_request (child, -1, 300);
 
 	parent_window = gtk_widget_get_ancestor (GTK_WIDGET (group), GTK_TYPE_WINDOW);
 
Index: src/nautilus-theme-selector.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-theme-selector.c,v
retrieving revision 1.71
diff -u -p -r1.71 nautilus-theme-selector.c
--- src/nautilus-theme-selector.c	24 Jun 2002 16:40:01 -0000	1.71
+++ src/nautilus-theme-selector.c	8 Jul 2002 19:51:12 -0000
@@ -535,27 +535,30 @@ nautilus_theme_selector_instance_init (N
  	alignment_box = gtk_hbox_new (FALSE, 4);
 	button_box = gtk_hbox_new (TRUE, 2);
 	
+#if 0
+	/* The UI Review decided to remove the help label. */
 	gtk_box_pack_start (GTK_BOX (theme_selector), theme_selector->details->help_label, FALSE, FALSE, 0);
+#endif
 	gtk_box_pack_start (GTK_BOX (theme_selector), theme_selector->details->scrolled_window, TRUE, TRUE, 4);
 	gtk_box_pack_start (GTK_BOX (theme_selector), theme_selector->details->remove_scrolled_window, TRUE, TRUE, 2);
 	gtk_box_pack_start (GTK_BOX (theme_selector), alignment_box, FALSE, TRUE, 2);
 
 	gtk_box_pack_end (GTK_BOX (alignment_box), button_box, FALSE, FALSE, 2);
 
-	theme_selector->details->install_theme_button = create_button_with_stock_image (_("Add New Theme..."),
+	theme_selector->details->install_theme_button = create_button_with_stock_image (_("_Add Theme..."),
 											GTK_STOCK_ADD);
 	
 	g_signal_connect_object (theme_selector->details->install_theme_button, "clicked",
 				 G_CALLBACK (install_theme_button_clicked_callback),
 				 theme_selector, 0);
 
-	theme_selector->details->remove_theme_button = create_button_with_stock_image (_("Remove Theme..."),
+	theme_selector->details->remove_theme_button = create_button_with_stock_image (_("_Remove Theme..."),
 										       GTK_STOCK_REMOVE);
 	g_signal_connect_object (theme_selector->details->remove_theme_button, "clicked",
 				 G_CALLBACK (remove_theme_button_clicked_callback),
 				 theme_selector, 0);
 
-	theme_selector->details->cancel_remove_button = create_button_with_stock_image (_("Cancel Remove"),
+	theme_selector->details->cancel_remove_button = create_button_with_stock_image (_("Cancel _Remove"),
 											GTK_STOCK_CANCEL);
 	g_signal_connect_object (theme_selector->details->cancel_remove_button, "clicked",
 				 G_CALLBACK (cancel_remove_button_clicked_callback),
Index: src/nautilus-window-manage-views.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-manage-views.c,v
retrieving revision 1.301
diff -u -p -r1.301 nautilus-window-manage-views.c
--- src/nautilus-window-manage-views.c	5 Jul 2002 10:51:03 -0000	1.301
+++ src/nautilus-window-manage-views.c	8 Jul 2002 19:51:21 -0000
@@ -1339,7 +1339,11 @@ determined_initial_view_callback (Nautil
 			   better test for that */
 
                         if (!eel_uris_match (location, "file:///")) {
+#ifdef WEB_NAVIGATION_ENABLED
                                 home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI);
+#else
+                                home_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
+#endif
                                 if (!eel_uris_match (home_uri, location)) {	
                                         nautilus_window_go_home (NAUTILUS_WINDOW (window));
                                 } else {
Index: src/nautilus-window-menus.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-menus.c,v
retrieving revision 1.249
diff -u -p -r1.249 nautilus-window-menus.c
--- src/nautilus-window-menus.c	8 Jul 2002 15:32:09 -0000	1.249
+++ src/nautilus-window-menus.c	8 Jul 2002 19:51:28 -0000
@@ -826,6 +826,7 @@ append_bookmark_to_menu (NautilusWindow 
 	nautilus_window_ui_thaw (window);
 }
 
+#ifdef WEB_NAVIGATION_ENABLED
 static char *
 get_static_bookmarks_file_path (void)
 {
@@ -889,6 +890,7 @@ get_static_bookmarks_file_path (void)
 	
 	return result;
 }
+#endif
 
 static void
 append_separator (NautilusWindow *window, const char *path)
@@ -950,6 +952,7 @@ create_menu_item_from_node (NautilusWind
 	nautilus_window_ui_thaw (window);
 }
 
+#ifdef WEB_NAVIGATION_ENABLED
 static void
 append_static_bookmarks (NautilusWindow *window, const char *menu_path)
 {
@@ -977,6 +980,7 @@ append_static_bookmarks (NautilusWindow 
 	
 	xmlFreeDoc(doc);
 }
+#endif
 
 static NautilusBookmarkList *bookmarks = NULL;
 
@@ -1060,9 +1064,11 @@ refresh_bookmarks_menu (NautilusWindow *
 
 	nautilus_window_remove_bookmarks_menu_items (window);
 
+#ifdef WEB_NAVIGATION_ENABLED
 	if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS)) {
 		append_static_bookmarks (window, MENU_PATH_BUILT_IN_BOOKMARKS_PLACEHOLDER);
 	}
+#endif
 
 	append_dynamic_bookmarks (window);
 
Index: src/nautilus-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.c,v
retrieving revision 1.389
diff -u -p -r1.389 nautilus-window.c
--- src/nautilus-window.c	11 Jun 2002 03:42:25 -0000	1.389
+++ src/nautilus-window.c	8 Jul 2002 19:51:39 -0000
@@ -1490,7 +1490,11 @@ nautilus_window_go_home (NautilusWindow 
 
 	nautilus_window_set_search_mode (window, FALSE);
 
+#ifdef WEB_NAVIGATION_ENABLED
 	home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI);
+#else
+	home_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
+#endif
 	
 	g_assert (home_uri != NULL);
 	nautilus_window_go_to (window, home_uri);
Index: src/file-manager/fm-desktop-icon-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-desktop-icon-view.c,v
retrieving revision 1.184
diff -u -p -r1.184 fm-desktop-icon-view.c
--- src/file-manager/fm-desktop-icon-view.c	8 Jul 2002 15:32:10 -0000	1.184
+++ src/file-manager/fm-desktop-icon-view.c	8 Jul 2002 19:51:50 -0000
@@ -1153,7 +1153,11 @@ update_home_link_and_delete_copies (void
 	 */
 	home_link_name = g_strdup_printf (_("%s's Home"), g_get_user_name ());
 	
+#ifdef WEB_NAVIGATION_ENABLED
 	home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI);
+#else
+	home_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
+#endif
 	
 	if (!update_link_and_delete_copies (nautilus_link_local_is_home_link,
 					    NULL,
