reviewed by: Darin Adler <darin@eazel.com>

	Fixed bug 7506 (Font preference has silly, overly-specific
	label)

	Fixed bug 4049 ("Other Application" is bad terminology when
	there are no applications listed)

	Fixed bug 6193 (Users confused by lack of title on "ski" menu)

	* libnautilus-extensions/nautilus-global-preferences.c:
	(global_preferences_install_descriptions): Changed wording
	for font choices.

	* src/file-manager/fm-directory-view.c:
	(reset_bonobo_open_with_menu): Changed "Other Application..."
	to "An Application..." if there aren't any listed.

	* src/nautilus-shell-ui.xml: Add "Preferences" title to Preferences
	menu.


	Other changes

	* src/file-manager/fm-directory-view.h: Moved some #defines
	only used in fm-directory-view.c into that file.

	* src/nautilus-first-time-druid.c: (set_up_cron_information_page):
	Removed obsolete comment.

7 files changed, 77 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ccedc802..0e3f750e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2001-03-21  John Sullivan  <sullivan@eazel.com>
+
+	reviewed by: Darin Adler  <darin@eazel.com>
+
+	Fixed bug 7506 (Font preference has silly, overly-specific
+	label)
+
+	Fixed bug 4049 ("Other Application" is bad terminology when
+	there are no applications listed)
+	
+	Fixed bug 6193 (Users confused by lack of title on "ski" menu)
+
+	* libnautilus-extensions/nautilus-global-preferences.c:
+	(global_preferences_install_descriptions): Changed wording
+	for font choices.	
+
+	* src/file-manager/fm-directory-view.c:
+	(reset_bonobo_open_with_menu): Changed "Other Application..."
+	to "An Application..." if there aren't any listed.
+	
+	* src/nautilus-shell-ui.xml: Add "Preferences" title to Preferences
+	menu.
+
+
+	Other changes
+
+	* src/file-manager/fm-directory-view.h: Moved some #defines
+	only used in fm-directory-view.c into that file.
+	
+	* src/nautilus-first-time-druid.c: (set_up_cron_information_page):
+	Removed obsolete comment.	
+
 2001-03-20  Maciej Stachowiak  <mjs@eazel.com>
 
 	reviewed by: Ian McKellar  <ian@eazel.com>
diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c
index b802fdfac..acba41c8d 100644
--- a/libnautilus-extensions/nautilus-global-preferences.c
+++ b/libnautilus-extensions/nautilus-global-preferences.c
@@ -158,10 +158,10 @@ global_preferences_install_descriptions (void)
 					      _("Use smoother (but slower) graphics"));
 
 	nautilus_preferences_set_description (NAUTILUS_PREFERENCES_DIRECTORY_VIEW_FONT_FAMILY,
-					      _("Use this font family to display file names:"));
+					      _("Use this font to display non-smooth text:"));
 
 	nautilus_preferences_set_description (NAUTILUS_PREFERENCES_DIRECTORY_VIEW_SMOOTH_FONT,
-					      _("Use this font family to display file names:"));
+					      _("Use this font to display smooth text:"));
 	
 	nautilus_preferences_set_description (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
 					      _("Display toolbar in new windows"));
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index b802fdfac..acba41c8d 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -158,10 +158,10 @@ global_preferences_install_descriptions (void)
 					      _("Use smoother (but slower) graphics"));
 
 	nautilus_preferences_set_description (NAUTILUS_PREFERENCES_DIRECTORY_VIEW_FONT_FAMILY,
-					      _("Use this font family to display file names:"));
+					      _("Use this font to display non-smooth text:"));
 
 	nautilus_preferences_set_description (NAUTILUS_PREFERENCES_DIRECTORY_VIEW_SMOOTH_FONT,
-					      _("Use this font family to display file names:"));
+					      _("Use this font to display smooth text:"));
 	
 	nautilus_preferences_set_description (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
 					      _("Display toolbar in new windows"));
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index cdc2edf83..3b1ff25c4 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -82,7 +82,23 @@
 
 #define NAUTILUS_COMMAND_SPECIFIER "command:"
 
-/* Paths to use when referring to bonobo menu items. */
+/* Paths to use when referring to bonobo menu items. Paths used by
+ * subclasses are in fm-directory-view.h 
+ */
+#define FM_DIRECTORY_VIEW_COMMAND_OPEN                      		"/commands/Open"
+#define FM_DIRECTORY_VIEW_COMMAND_OPEN_IN_NEW_WINDOW        		"/commands/OpenNew"
+#define FM_DIRECTORY_VIEW_COMMAND_OPEN_WITH				"/commands/Open With"
+#define FM_DIRECTORY_VIEW_COMMAND_NEW_FOLDER				"/commands/New Folder"
+#define FM_DIRECTORY_VIEW_COMMAND_DELETE                    		"/commands/Delete"
+#define FM_DIRECTORY_VIEW_COMMAND_TRASH                    		"/commands/Trash"
+#define FM_DIRECTORY_VIEW_COMMAND_EMPTY_TRASH                   	"/commands/Empty Trash"
+#define FM_DIRECTORY_VIEW_COMMAND_DUPLICATE                		"/commands/Duplicate"
+#define FM_DIRECTORY_VIEW_COMMAND_CREATE_LINK                		"/commands/Create Link"
+#define FM_DIRECTORY_VIEW_COMMAND_SHOW_PROPERTIES         		"/commands/Show Properties"
+#define FM_DIRECTORY_VIEW_COMMAND_REMOVE_CUSTOM_ICONS			"/commands/Remove Custom Icons"
+#define FM_DIRECTORY_VIEW_COMMAND_OTHER_APPLICATION    			"/commands/OtherApplication"
+#define FM_DIRECTORY_VIEW_COMMAND_OTHER_VIEWER	   			"/commands/OtherViewer"
+
 #define FM_DIRECTORY_VIEW_MENU_PATH_OPEN_IN_NEW_WINDOW        		"/menu/File/Open Placeholder/OpenNew"
 #define FM_DIRECTORY_VIEW_MENU_PATH_OPEN_WITH				"/menu/File/Open Placeholder/Open With"
 #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS				"/menu/File/Open Placeholder/Scripts"
@@ -91,7 +107,9 @@
 #define FM_DIRECTORY_VIEW_MENU_PATH_CREATE_LINK                	 	"/menu/File/File Items Placeholder/Create Link"
 #define FM_DIRECTORY_VIEW_MENU_PATH_REMOVE_CUSTOM_ICONS			"/menu/Edit/Edit Items Placeholder/Remove Custom Icons"
 #define FM_DIRECTORY_VIEW_MENU_PATH_APPLICATIONS_PLACEHOLDER    	"/menu/File/Open Placeholder/Open With/Applications Placeholder"
+#define FM_DIRECTORY_VIEW_MENU_PATH_OTHER_APPLICATION		    	"/menu/File/Open Placeholder/Open With/OtherApplication"
 #define FM_DIRECTORY_VIEW_MENU_PATH_VIEWERS_PLACEHOLDER    		"/menu/File/Open Placeholder/Open With/Viewers Placeholder"
+#define FM_DIRECTORY_VIEW_MENU_PATH_OTHER_VIEWER		    	"/menu/File/Open Placeholder/Open With/OtherViewer"
 #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER    		"/menu/File/Open Placeholder/Scripts/Scripts Placeholder"
 #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_SEPARATOR    		"/menu/File/Open Placeholder/Scripts/After Scripts"
 
@@ -3170,6 +3188,8 @@ reset_bonobo_open_with_menu (FMDirectoryView *view, GList *selection)
 	GList *applications, *components, *node;
 	NautilusFile *file;
 	gboolean sensitive;
+	gboolean any_applications;
+	gboolean any_viewers;
 	char *uri;
 	int index;
 	
@@ -3189,6 +3209,9 @@ reset_bonobo_open_with_menu (FMDirectoryView *view, GList *selection)
 		monitor_file_for_open_with (view, NULL);
 	} else {
 		sensitive = TRUE;
+		any_applications = FALSE;
+		any_viewers = FALSE;
+		
 		file = NAUTILUS_FILE (selection->data);
 		
 		monitor_file_for_open_with (view, file);
@@ -3197,16 +3220,30 @@ reset_bonobo_open_with_menu (FMDirectoryView *view, GList *selection)
 		
 		applications = nautilus_mime_get_short_list_applications_for_file (NAUTILUS_FILE (selection->data));
 		for (node = applications, index = 0; node != NULL; node = node->next, index++) {
+			any_applications = TRUE;
 			add_application_to_bonobo_menu (view, node->data, file, index);
 		}
 		gnome_vfs_mime_application_list_free (applications); 
 		
 		components = nautilus_mime_get_short_list_components_for_file (NAUTILUS_FILE (selection->data));
 		for (node = components, index = 0; node != NULL; node = node->next, index++) {
+			any_viewers = TRUE;
 			add_component_to_bonobo_menu (view, node->data, uri, index);
 		}
 		gnome_vfs_mime_component_list_free (components); 
 
+		nautilus_bonobo_set_label_for_menu_item_and_command 
+			(view->details->ui,
+			 FM_DIRECTORY_VIEW_MENU_PATH_OTHER_APPLICATION,
+			 FM_DIRECTORY_VIEW_COMMAND_OTHER_APPLICATION,
+			 any_applications ? _("Other _Application...") : _("An _Application..."));
+
+		nautilus_bonobo_set_label_for_menu_item_and_command 
+			(view->details->ui,
+			 FM_DIRECTORY_VIEW_MENU_PATH_OTHER_VIEWER,
+			 FM_DIRECTORY_VIEW_COMMAND_OTHER_VIEWER,
+			 any_applications ? _("Other _Viewer...") : _("A _Viewer..."));
+
 		g_free (uri);
 	}
 
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index 2ef4f6d50..36392c589 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -43,27 +43,9 @@
 typedef struct FMDirectoryView FMDirectoryView;
 typedef struct FMDirectoryViewClass FMDirectoryViewClass;
 
-/* Paths to use when referring to bonobo menu items.
- * These are the new ones defined by FMDirectoryView. The
- * Nautilus-wide ones are in <libnautilus/nautilus-bonobo-ui.h>
- * Note that this may change as we complete the switchover to the
- * new Bonobo UI code.
- */
-#define FM_DIRECTORY_VIEW_COMMAND_OPEN                      	"/commands/Open"
-#define FM_DIRECTORY_VIEW_COMMAND_OPEN_IN_NEW_WINDOW        	"/commands/OpenNew"
-#define FM_DIRECTORY_VIEW_COMMAND_OPEN_WITH			"/commands/Open With"
-#define FM_DIRECTORY_VIEW_COMMAND_NEW_FOLDER			"/commands/New Folder"
-#define FM_DIRECTORY_VIEW_COMMAND_DELETE                    	"/commands/Delete"
-#define FM_DIRECTORY_VIEW_COMMAND_TRASH                    	"/commands/Trash"
-#define FM_DIRECTORY_VIEW_COMMAND_EMPTY_TRASH                   "/commands/Empty Trash"
-#define FM_DIRECTORY_VIEW_COMMAND_DUPLICATE                	"/commands/Duplicate"
-#define FM_DIRECTORY_VIEW_COMMAND_CREATE_LINK                	"/commands/Create Link"
-#define FM_DIRECTORY_VIEW_COMMAND_SHOW_PROPERTIES         	"/commands/Show Properties"
-#define FM_DIRECTORY_VIEW_COMMAND_RESET_BACKGROUND		"/commands/Reset Background"
-#define FM_DIRECTORY_VIEW_COMMAND_REMOVE_CUSTOM_ICONS		"/commands/Remove Custom Icons"
-#define FM_DIRECTORY_VIEW_COMMAND_OTHER_APPLICATION    		"/commands/OtherApplication"
-#define FM_DIRECTORY_VIEW_COMMAND_OTHER_VIEWER	   		"/commands/OtherViewer"
 
+/* Bonobo command paths that are used by subclasses. Others are defined in fm-directory-view.c */
+#define FM_DIRECTORY_VIEW_COMMAND_RESET_BACKGROUND		"/commands/Reset Background"
 
 #define FM_TYPE_DIRECTORY_VIEW			(fm_directory_view_get_type ())
 #define FM_DIRECTORY_VIEW(obj)			(GTK_CHECK_CAST ((obj), FM_TYPE_DIRECTORY_VIEW, FMDirectoryView))
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index 70e6ef5d3..61c5608b4 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -1023,7 +1023,6 @@ set_up_cron_information_page (NautilusDruidPageEazel *page)
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (main_box), hbox, FALSE, FALSE, 0);
 
-	/* Translators: Do not translate this text.  It has not been edited yet, and will be altered shortly. */
 	label = new_body_label (cron_status == NAUTILUS_CRON_STATUS_OFF ? 
 				_("Indexing is turned on, enabling the fast search feature. However, indexing\n"
 				  "currently can't be performed because the program crond, which does\n"
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 27e36529f..8f44ce7f9 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -266,7 +266,7 @@
 	</submenu>
 
 
-	<submenu name="Preferences" _label="" pixtype="filename">
+	<submenu name="Preferences" _label="_Preferences" pixtype="filename">
 
 		<placeholder name="User Levels Placeholder" delimit="none">
 			<menuitem name="Switch to Beginner Level"