PATCH, strings: Bug #'s 84465 and 84466 and maybe another.

[Gregory Merchan <merchan phys lsu edu>]

Attached is a patch to close bug #'s 84465 and 84466. There's another
string change for which I've not seen a bug report.

I hope this meets the string deadline. Commit?

Cheers,
Greg Merchan

Index: src/nautilus-shell-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-shell-ui.xml,v
retrieving revision 1.97
diff -p -u -r1.97 nautilus-shell-ui.xml
--- src/nautilus-shell-ui.xml	5 Jul 2002 20:37:23 -0000	1.97
+++ src/nautilus-shell-ui.xml	20 Jul 2002 00:38:41 -0000
@@ -130,7 +130,7 @@
 		<separator/>
 
 		<menuitem name="Backgrounds and Emblems" 
-			  _label="_Backgrounds and Emblems..." 
+			  _label="_Backgrounds and Emblems" 
 			  _tip="Display patterns, colors, and emblems that can be used to customize appearance"
 			  verb="Backgrounds and Emblems"/>
 		
Index: src/nautilus-sidebar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-sidebar.c,v
retrieving revision 1.213
diff -p -u -r1.213 nautilus-sidebar.c
--- src/nautilus-sidebar.c	19 Jul 2002 20:27:29 -0000	1.213
+++ src/nautilus-sidebar.c	20 Jul 2002 00:38:43 -0000
@@ -1487,9 +1487,7 @@ nautilus_sidebar_update_buttons (Nautilu
 	 * need a framework to allow protocols to add commands buttons */
 	if (eel_istr_has_prefix (sidebar->details->uri, "trash:")) {
 		/* FIXME: We don't use spaces to pad labels! */
-		temp_button = gtk_button_new_with_mnemonic (confirm_trash_auto_value 
-							 ? _("_Empty Trash...") 
-							 : _("_Empty Trash"));
+		temp_button = gtk_button_new_with_mnemonic (_("_Empty Trash"));
 
 		gtk_box_pack_start (GTK_BOX (sidebar->details->button_box), 
 					temp_button, FALSE, FALSE, 0);
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.185
diff -p -u -r1.185 fm-desktop-icon-view.c
--- src/file-manager/fm-desktop-icon-view.c	9 Jul 2002 20:57:18 -0000	1.185
+++ src/file-manager/fm-desktop-icon-view.c	20 Jul 2002 00:38:44 -0000
@@ -1349,11 +1349,7 @@ real_update_menus (FMDirectoryView *view
 		 DESKTOP_COMMAND_EMPTY_TRASH_CONDITIONAL,
 		 !include_empty_trash);
 	if (include_empty_trash) {
-		if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH)) {
-			label = g_strdup (_("Empty Trash..."));
-		} else {
-			label = g_strdup (_("Empty Trash"));
-		}
+		label = g_strdup (_("Empty Trash"));
 		nautilus_bonobo_set_label
 			(desktop_view->details->ui, 
 			 DESKTOP_COMMAND_EMPTY_TRASH_CONDITIONAL,
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.545
diff -p -u -r1.545 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	15 Jul 2002 18:13:23 -0000	1.545
+++ src/file-manager/fm-directory-view.c	20 Jul 2002 00:38:50 -0000
@@ -4383,7 +4383,7 @@ real_update_menus (FMDirectoryView *view
 	reset_bonobo_open_with_menu (view, selection);
 
 	if (all_selected_items_in_trash (view)) {
-		label = confirm_trash_auto_value ? _("_Delete from Trash...") : _("_Delete from Trash");
+		label = _("_Delete from Trash");
 		accelerator = "";
 		tip = _("Delete all selected items permanently");
 		show_separate_delete_command = FALSE;
@@ -4414,8 +4414,7 @@ real_update_menus (FMDirectoryView *view
 	if (show_separate_delete_command) {
 		nautilus_bonobo_set_label
 			(view->details->ui,
-			 FM_DIRECTORY_VIEW_COMMAND_DELETE,
-			 confirm_trash_auto_value ? _("_Delete...") : _("_Delete"));
+			 FM_DIRECTORY_VIEW_COMMAND_DELETE, _("_Delete"));
 		nautilus_bonobo_set_sensitive (view->details->ui, 
 					       FM_DIRECTORY_VIEW_COMMAND_DELETE,
 					       can_delete_files);
@@ -4449,9 +4448,7 @@ real_update_menus (FMDirectoryView *view
 	nautilus_bonobo_set_label
 		(view->details->ui,
 		 FM_DIRECTORY_VIEW_COMMAND_EMPTY_TRASH,
-		 confirm_trash_auto_value
-			? _("_Empty Trash...")
-			: _("_Empty Trash"));
+		 _("_Empty Trash"));
 	nautilus_bonobo_set_sensitive (view->details->ui, 
 				       FM_DIRECTORY_VIEW_COMMAND_EMPTY_TRASH,
 				       !nautilus_trash_monitor_is_empty ());
Index: src/file-manager/nautilus-directory-view-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/nautilus-directory-view-ui.xml,v
retrieving revision 1.46
diff -p -u -r1.46 nautilus-directory-view-ui.xml
--- src/file-manager/nautilus-directory-view-ui.xml	5 Jul 2002 20:37:24 -0000	1.46
+++ src/file-manager/nautilus-directory-view-ui.xml	20 Jul 2002 00:38:51 -0000
@@ -1,7 +1,7 @@
 <Root>
 <commands>
 	<cmd name="Rename"
-         _label="_Rename"
+         _label="_Rename..."
 	 _tip="Rename selected item"/>
 	<cmd name="Create Link"
          _label="Ma_ke Link"