Patches from sander for better HIG compliance Lay Out Items -> Arrange

2002-04-21  Alexander Larsson  <alla@lysator.liu.se>

	* src/nautilus-preferences-dialog.c:
	* src/file-manager/fm-icon-view.c:
	* src/nautilus-shell-ui.xml:
	* src/nautilus-window-menus.c:
	* src/file-manager/nautilus-directory-view-ui.xml:
	* src/file-manager/nautilus-icon-view-ui.xml:
	Patches from sander for better HIG compliance
	Lay Out Items -> Arrange Items
	View Preferences -> View Defaults
	Forget History -> Clear History
	Reset View to Match Preferences -> Reset View to Default

8 files changed, 34 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index de2f65e5a..c046be288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-04-21  Alexander Larsson  <alla@lysator.liu.se>
+
+	* src/nautilus-preferences-dialog.c:
+	* src/file-manager/fm-icon-view.c:
+	* src/nautilus-shell-ui.xml:
+	* src/nautilus-window-menus.c:
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	* src/file-manager/nautilus-icon-view-ui.xml:
+	Patches from sander for better HIG compliance
+	Lay Out Items -> Arrange Items
+	View Preferences -> View Defaults
+	Forget History -> Clear History
+	Reset View to Match Preferences -> Reset View to Default
+	
 2002-04-22  Anders Carlsson  <andersca@gnu.org>
 
 	* libnautilus-private/nautilus-directory-async.c:
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 4a6cc0764..b45814084 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -81,13 +81,13 @@
 /* Paths to use when creating & referring to Bonobo menu items */
 #define MENU_PATH_STRETCH_ICON 			"/menu/Edit/Edit Items Placeholder/Stretch"
 #define MENU_PATH_UNSTRETCH_ICONS 		"/menu/Edit/Edit Items Placeholder/Unstretch"
-#define MENU_PATH_LAY_OUT			"/menu/View/View Items Placeholder/Lay Out"
-#define MENU_PATH_MANUAL_LAYOUT 		"/menu/View/View Items Placeholder/Lay Out/Manual Layout"
-#define MENU_PATH_TIGHTER_LAYOUT 		"/menu/View/View Items Placeholder/Lay Out/Tighter Layout"
-#define MENU_PATH_SORT_REVERSED			"/menu/View/View Items Placeholder/Lay Out/Reversed Order"
+#define MENU_PATH_LAY_OUT			"/menu/View/View Items Placeholder/Arrange Items"
+#define MENU_PATH_MANUAL_LAYOUT 		"/menu/View/View Items Placeholder/Arrange Items/Manual Layout"
+#define MENU_PATH_TIGHTER_LAYOUT 		"/menu/View/View Items Placeholder/Arrange Items/Tighter Layout"
+#define MENU_PATH_SORT_REVERSED			"/menu/View/View Items Placeholder/Arrange Items/Reversed Order"
 #define MENU_PATH_CLEAN_UP			"/menu/View/View Items Placeholder/Clean Up"
 
-#define POPUP_PATH_LAY_OUT			"/popups/background/Before Zoom Items/View Items/Lay Out"
+#define POPUP_PATH_LAY_OUT			"/popups/background/Before Zoom Items/View Items/Arrange Items"
 
 #define COMMAND_PREFIX                          "/commands/"
 #define COMMAND_STRETCH_ICON 			"/commands/Stretch"
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index 064a7c332..feaa25daa 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -37,7 +37,7 @@
          _label="Remove Custom Images"
 	 _tip="Remove any custom images from selected icons"/>
 	<cmd name="Reset to Defaults"
-         _label="Reset View to Match Preferences"
+         _label="Reset View to Default"
 	 _tip="Reset sorting order and zoom level to match preferences for this view"/>
 	<cmd name="Reset Background"
          _label="Reset Background"
diff --git a/src/file-manager/nautilus-icon-view-ui.xml b/src/file-manager/nautilus-icon-view-ui.xml
index 18efa9f91..33365a189 100644
--- a/src/file-manager/nautilus-icon-view-ui.xml
+++ b/src/file-manager/nautilus-icon-view-ui.xml
@@ -49,7 +49,7 @@
 
 	<submenu name="View">
 		<placeholder name="View Items Placeholder">
-			<submenu name="Lay Out" _label="_Lay Out Items">
+			<submenu name="Arrange Items" _label="_Arrange Items">
 				<menuitem name="Manual Layout"
 					  _label="_Manually"
 					  type="radio" group="layout group"
@@ -97,7 +97,7 @@
 	<popup name="background">
 		<placeholder name="Before Zoom Items">
 			<placeholder name="View Items">
-				<submenu name="Lay Out" _label="Lay Out Items" tearoff="0">
+				<submenu name="Arrange Items" _label="Arrange Items" tearoff="0">
 					<menuitem name="Manual Layout"
 						  type="radio" group="context menu layout group"
 						  id="Manual Layout"/>
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 33542aa5b..bee6b6817 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -350,8 +350,8 @@ forget_history_if_confirmed (NautilusWindow *window)
 	}
 					   
 	dialog = eel_create_question_dialog (prompt,
-					     _("Forget History?"), 
-					     _("Forget"), RESPONSE_FORGET,
+					     _("Clear History?"), 
+					     _("Clear"), RESPONSE_FORGET,
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					     GTK_WINDOW (window));
 
@@ -1096,7 +1096,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		BONOBO_UI_VERB ("Home", go_menu_home_callback),
 		BONOBO_UI_VERB ("Start Here", go_menu_start_here_callback),
 		BONOBO_UI_VERB ("Go to Location", go_menu_location_callback),
-		BONOBO_UI_VERB ("Forget History", go_menu_forget_history_callback),
+		BONOBO_UI_VERB ("Clear History", go_menu_forget_history_callback),
 		BONOBO_UI_VERB ("Reload", view_menu_reload_callback),
 		BONOBO_UI_VERB ("Show Hide Sidebar", view_menu_show_hide_sidebar_callback),
 		BONOBO_UI_VERB ("Show Hide Toolbar", view_menu_show_hide_toolbar_callback),
diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c
index a2bf6ace5..01a4ac5c3 100644
--- a/src/nautilus-preferences-dialog.c
+++ b/src/nautilus-preferences-dialog.c
@@ -180,7 +180,7 @@ static EelPreferencesItemDescription view_preferences_items[] = {
 	/* Icon View Defaults */
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT,
-	  N_("Lay Out Items:"),
+	  N_("Arrange Items:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU
 	},
 	{ N_("Icon View Defaults"),
@@ -215,7 +215,7 @@ static EelPreferencesItemDescription view_preferences_items[] = {
 	/* List View Defaults */
 	{ N_("List View Defaults"),
 	  NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER,
-	  N_("Lay Out Items:"),
+	  N_("Arrange Items:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU
 	},
 	{ N_("List View Defaults"),
@@ -381,7 +381,7 @@ static EelPreferencesItemDescription news_panel_items[] = {
 
 
 static EelPreferencesPaneDescription panes[] = {
-	{ N_("View Preferences"),	  view_preferences_items },
+	{ N_("View Defaults"),  	  view_preferences_items },
 	{ N_("Appearance"),		  appearance_items },
 	{ N_("Windows"),	  	  windows_items },
 	{ N_("Desktop & Trash"),	  desktop_and_trash_items },
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index ac09183c4..73ed6aa6f 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -215,10 +215,10 @@
 
 		<separator/>
 
-		<menuitem name="Forget History" 
-			  _label="For_get History" 
+		<menuitem name="Clear History" 
+			  _label="_Clear History" 
 			  _tip="Clear contents of Go menu and Back/Forward lists"
-			  verb="Forget History"/>
+			  verb="Clear History"/>
 
 		<placeholder name="History Placeholder" delimit="top"/>
 	</submenu>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 33542aa5b..bee6b6817 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -350,8 +350,8 @@ forget_history_if_confirmed (NautilusWindow *window)
 	}
 					   
 	dialog = eel_create_question_dialog (prompt,
-					     _("Forget History?"), 
-					     _("Forget"), RESPONSE_FORGET,
+					     _("Clear History?"), 
+					     _("Clear"), RESPONSE_FORGET,
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					     GTK_WINDOW (window));
 
@@ -1096,7 +1096,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		BONOBO_UI_VERB ("Home", go_menu_home_callback),
 		BONOBO_UI_VERB ("Start Here", go_menu_start_here_callback),
 		BONOBO_UI_VERB ("Go to Location", go_menu_location_callback),
-		BONOBO_UI_VERB ("Forget History", go_menu_forget_history_callback),
+		BONOBO_UI_VERB ("Clear History", go_menu_forget_history_callback),
 		BONOBO_UI_VERB ("Reload", view_menu_reload_callback),
 		BONOBO_UI_VERB ("Show Hide Sidebar", view_menu_show_hide_sidebar_callback),
 		BONOBO_UI_VERB ("Show Hide Toolbar", view_menu_show_hide_toolbar_callback),