s/location/address. Fix up mnemonic collisions in the print dialog. Mark

2003-05-08  David Adam Bordoley <bordoley@msu.edu>

	* TODO:
	* data/glade/epiphany.glade:
	* data/glade/prefs-dialog.glade:
	* data/glade/print.glade:
	* src/ephy-history-window.c: (ephy_history_ui_entries [])
	(ephy_history_window_update_menu),
	(ephy_history_window_construct):
	* src/ephy-window.c: (ephy_popups_entries []),
	* src/toolbar.c: (toolbar_setup_actions):
	* src/bookmarks/ephy-bookmark-properties.c: (build_ui):
	* src/bookmarks/ephy-bookmarks-editor.c:
	(ephy_bookmark_popup_entries []),
	(ephy_bookmarks_editor_update_menu):

	s/location/address. Fix up mnemonic collisions
	in the print dialog. Mark toolbar action names
	for translation. s/location/"address entry" for
	the entry bar name (this may change depending
	on what the docs team says). Add a todo
	about changing code to use address where
	appropriate.

3 files changed, 12 insertions, 13 deletions

diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade
index a967af487..c272bdfe7 100644
--- a/data/glade/epiphany.glade
+++ b/data/glade/epiphany.glade
@@ -363,7 +363,6 @@
 	  <child>
 	    <widget class="GtkButton" id="abort_button">
 	      <property name="visible">True</property>
-	      <property name="sensitive">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-stop</property>
@@ -545,7 +544,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label1142">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Location:&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Address:&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index a4f7be549..6aab71381 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -90,7 +90,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label1243">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Location:</property>
+			  <property name="label" translatable="yes">_Address:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/data/glade/print.glade b/data/glade/print.glade
index 66a55bef0..14af228f8 100644
--- a/data/glade/print.glade
+++ b/data/glade/print.glade
@@ -83,8 +83,6 @@
 	  <property name="show_border">True</property>
 	  <property name="tab_pos">GTK_POS_TOP</property>
 	  <property name="scrollable">False</property>
-	  <property name="tab_hborder">2</property>
-	  <property name="tab_vborder">2</property>
 	  <property name="enable_popup">False</property>
 
 	  <child>
@@ -161,7 +159,7 @@
 			    <widget class="GtkRadioButton" id="printer_radiobutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Printer</property>
+			      <property name="label" translatable="yes">P_rinter</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="active">False</property>
@@ -388,8 +386,8 @@
 			      <child>
 				<widget class="GtkLabel" id="label241">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">from:</property>
-				  <property name="use_underline">False</property>
+				  <property name="label" translatable="yes">_from:</property>
+				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
 				  <property name="wrap">False</property>
@@ -398,6 +396,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">from_spinbutton</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -428,8 +427,8 @@
 			      <child>
 				<widget class="GtkLabel" id="label242">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">to:</property>
-				  <property name="use_underline">False</property>
+				  <property name="label" translatable="yes">_to:</property>
+				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
 				  <property name="wrap">False</property>
@@ -438,6 +437,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">to_spinbutton</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1210,7 +1210,7 @@
 				<widget class="GtkRadioButton" id="print_color_radiobutton">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Color</property>
+				  <property name="label" translatable="yes">C_olor</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>
@@ -1228,7 +1228,7 @@
 				<widget class="GtkRadioButton" id="print_grayscale_radiobutton">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">G_rayscale</property>
+				  <property name="label" translatable="yes">Gra_yscale</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>
@@ -1493,7 +1493,7 @@
 				<widget class="GtkCheckButton" id="print_page_url_checkbutton">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Page _URL</property>
+				  <property name="label" translatable="yes">Page Addre_ss</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>