diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 9 | ||||
| -rw-r--r-- | src/file-manager/nautilus-directory-view-ui.xml | 2 | ||||
| -rw-r--r-- | src/nautilus-information-panel.c | 4 | ||||
| -rw-r--r-- | src/nautilus-shell-ui.xml | 2 | ||||
| -rw-r--r-- | src/nautilus-sidebar.c | 4 |
7 files changed, 18 insertions, 19 deletions
@@ -1,5 +1,15 @@ 2002-07-22 Alexander Larsson <alexl@redhat.com> + * src/file-manager/fm-desktop-icon-view.c: + * src/file-manager/fm-directory-view.c: + * src/file-manager/nautilus-directory-view-ui.xml: + * src/nautilus-shell-ui.xml: + * src/nautilus-sidebar.c: + Fixup usage of ellipses. + Patch from Gregory Merchan <merchan@phys.lsu.edu> + +2002-07-22 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-file.c (rename_guts): Allow renaming desktop files to have a slash in them. diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index a423bdf36..b25a344f0 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -1351,11 +1351,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, diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index bc59db4f7..c25d2324e 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -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 ()); diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml index 3c40565d9..42e0cb052 100644 --- a/src/file-manager/nautilus-directory-view-ui.xml +++ b/src/file-manager/nautilus-directory-view-ui.xml @@ -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" diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 275280aa9..ca327ce90 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -1487,9 +1487,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar) * 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); diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml index a9866cc1c..280b3c049 100644 --- a/src/nautilus-shell-ui.xml +++ b/src/nautilus-shell-ui.xml @@ -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"/> diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index 275280aa9..ca327ce90 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -1487,9 +1487,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar) * 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); |