diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | data/preferences.desktop.in | 2 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 4 | ||||
| -rw-r--r-- | src/file-manager/nautilus-directory-view-ui.xml | 6 | ||||
| -rw-r--r-- | src/nautilus-shell-ui.xml | 17 |
5 files changed, 27 insertions, 16 deletions
@@ -1,3 +1,17 @@ +2002-04-27 Alexander Larsson <alexl@redhat.com> + + * data/preferences.desktop.in: + Name is now "Desktop Preferences" + + * src/file-manager/fm-directory-view.c: + * src/file-manager/nautilus-directory-view-ui.xml: + "Remove Custom Images" -> "Remove Custom Icons" for consistency + + * src/nautilus-shell-ui.xml: + Move preferences to bottom of menu. + + patches from Dave Bordoley <bordoley@msu.edu> + 2002-04-27 Dave Camp <dave@ximian.com> * src/nautilus-zoom-control.c (nearest_preferred): Initialize diff --git a/data/preferences.desktop.in b/data/preferences.desktop.in index 2891e5e6e..2da23b80d 100644 --- a/data/preferences.desktop.in +++ b/data/preferences.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Link -_Name=Preferences +_Name=Desktop Preferences _Comment=Adjust your user environment URL=preferences:/// Icon=gnome-settings.png diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 6ed2ad424..7292f8cac 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -4372,8 +4372,8 @@ real_update_menus (FMDirectoryView *view) FM_DIRECTORY_VIEW_MENU_PATH_REMOVE_CUSTOM_ICONS, FM_DIRECTORY_VIEW_COMMAND_REMOVE_CUSTOM_ICONS, selection_count > 1 - ? _("R_emove Custom Images") - : _("R_emove Custom Image")); + ? _("R_emove Custom Icons") + : _("R_emove Custom Icon")); nautilus_bonobo_set_sensitive (view->details->ui, FM_DIRECTORY_VIEW_COMMAND_REMOVE_CUSTOM_ICONS, files_have_any_custom_images (selection)); diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml index e984eb04e..a44f78006 100644 --- a/src/file-manager/nautilus-directory-view-ui.xml +++ b/src/file-manager/nautilus-directory-view-ui.xml @@ -34,7 +34,7 @@ _label="Other Viewer..." _tip="Choose another viewer with which to view the selected item"/> <cmd name="Remove Custom Icons" - _label="Remove Custom Images" + _label="Remove Custom Icons" _tip="Remove any custom images from selected icons"/> <cmd name="Reset to Defaults" _label="Reset View to Default" @@ -174,9 +174,7 @@ verb="Select All"/> <placeholder name="Edit Items Placeholder"> - <menuitem name="Remove Custom Icons" - _label="R_emove Custom Images" - verb="Remove Custom Icons"/> + <menuitem name="Remove Custom Icons" verb="Remove Custom Icons"/> </placeholder> </submenu> diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml index 2c83a8dac..43992e11e 100644 --- a/src/nautilus-shell-ui.xml +++ b/src/nautilus-shell-ui.xml @@ -125,23 +125,22 @@ <menuitem name="Select All" _label="Select _All" verb="Select All"/> + + <placeholder name="Edit Items Placeholder" delimit="top"/> + <placeholder name="Global Edit Items Placeholder" delimit="none"/> <separator/> + <menuitem name="Customize" + _label="_Backgrounds and Emblems..." + _tip="Display patterns, colors, and emblems that can be used to customize appearance" + verb="Customize"/> + <menuitem name="User Level Customization" _label="P_references..." _tip="Edit Nautilus preferences" pixtype="stock" pixname="gtk-preferences" verb="User Level Customization"/> - - <menuitem name="Customize" - _label="_Backgrounds and Emblems..." - _tip="Display patterns, colors, and emblems that can be used to customize appearance" - verb="Customize"/> - - <placeholder name="Global Edit Items Placeholder" delimit="none"/> - <placeholder name="Edit Items Placeholder" delimit="top"/> - </submenu> <submenu name="View" _label="_View"> |