Commit 11c5ec3a authored by David Adam Bordoley's avatar David Adam Bordoley Committed by Dave Bordoley

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.
parent 58045fd0
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.
2003-05-08 David Adam Bordoley <bordoley@msu.edu>
* data/glade/epiphany.glade:
......
Bookmarks:
- Consistent use of topics instead of keywords in the code
- Consistent use of address instead of location in the code where appropriate
- <campd> nautilus/libnautilus-private/nautilus-tree-view-drag-dest.c. Dest crashes.
Others:
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -370,7 +370,7 @@ build_ui (EphyBookmarkProperties *editor)
gtk_widget_show (entry);
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
str = g_strconcat ("<b>", _("_Location:"), "</b>", NULL);
str = g_strconcat ("<b>", _("_Address:"), "</b>", NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), str);
g_free (str);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
......
......@@ -189,11 +189,11 @@ static EggActionGroupEntry ephy_bookmark_popup_entries [] = {
{ "ViewTitle", N_("_Title"), NULL, NULL,
N_("Show only the title column"),
NULL, NULL, RADIO_ACTION, NULL },
{ "ViewLocation", N_("_Location"), NULL, NULL,
N_("Show only the location column"),
{ "ViewLocation", N_("_Address"), NULL, NULL,
N_("Show only the address column"),
NULL, NULL, RADIO_ACTION, "ViewTitle" },
{ "ViewTitleLocation", N_("T_itle and Location"), NULL, NULL,
N_("Show both the title and location columns"),
{ "ViewTitleLocation", N_("T_itle and Address"), NULL, NULL,
N_("Show both the title and address columns"),
NULL, NULL, RADIO_ACTION, "ViewTitle" },
/* Help Menu */
......@@ -744,7 +744,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
if (bmk_focus)
{
copy_label = _("_Copy Location");
copy_label = _("_Copy Address");
}
else
{
......
......@@ -125,16 +125,16 @@ static EggActionGroupEntry ephy_history_ui_entries [] = {
/* File Menu */
{ "OpenInWindow", N_("_Open in New Window"), GTK_STOCK_OPEN, "<control>O",
N_("Open the selected history item in a new window"),
N_("Open the selected history link in a new window"),
G_CALLBACK (cmd_open_bookmarks_in_browser), NULL },
{ "OpenInTab", N_("Open in New _Tab"), NULL, "<shift><control>O",
N_("Open the selected history item in a new tab"),
N_("Open the selected history link in a new tab"),
G_CALLBACK (cmd_open_bookmarks_in_tabs), NULL },
{ "Delete", N_("_Delete"), GTK_STOCK_DELETE, NULL,
N_("Delete the selected history item"),
N_("Delete the selected history link"),
G_CALLBACK (cmd_delete), NULL },
{ "BookmarkPage", N_("Boo_kmark Page..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
N_("Bookmark the selected history item"),
N_("Bookmark the selected history link"),
G_CALLBACK (cmd_bookmark_page), NULL },
{ "Close", N_("_Close"), GTK_STOCK_CLOSE, "<control>W",
N_("Close the history window"),
......@@ -151,7 +151,7 @@ static EggActionGroupEntry ephy_history_ui_entries [] = {
N_("Paste the clipboard"),
G_CALLBACK (cmd_paste), NULL },
{ "SelectAll", N_("Select _All"), NULL, "<control>A",
N_("Select all history items or text"),
N_("Select all history links or text"),
G_CALLBACK (cmd_select_all), NULL },
{ "Clear", N_("C_lear History"), GTK_STOCK_CLEAR, NULL,
N_("Clear your browsing history"),
......@@ -161,11 +161,11 @@ static EggActionGroupEntry ephy_history_ui_entries [] = {
{ "ViewTitle", N_("_Title"), NULL, NULL,
N_("Show only the title column"),
NULL, NULL, RADIO_ACTION, NULL },
{ "ViewLocation", N_("_Location"), NULL, NULL,
N_("Show only the location column"),
{ "ViewLocation", N_("_Address"), NULL, NULL,
N_("Show only the address column"),
NULL, NULL, RADIO_ACTION, "ViewTitle" },
{ "ViewTitleLocation", N_("T_itle and Location"), NULL, NULL,
N_("Show both the title and location columns"),
{ "ViewTitleLocation", N_("T_itle and Address"), NULL, NULL,
N_("Show both the title and address columns"),
NULL, NULL, RADIO_ACTION, "ViewTitle" },
/* Help Menu */
......@@ -647,7 +647,7 @@ ephy_history_window_update_menu (EphyHistoryWindow *editor)
if (pages_focus)
{
copy_label = _("_Copy Location");
copy_label = _("_Copy Address");
}
else
{
......@@ -1058,7 +1058,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
G_TYPE_STRING, EPHY_NODE_PAGE_PROP_TITLE,
-1, EPHY_NODE_VIEW_USER_SORT, NULL);
gtk_tree_view_column_set_max_width (col, 250);
col = ephy_node_view_add_column (EPHY_NODE_VIEW (pages_view), _("Location"),
col = ephy_node_view_add_column (EPHY_NODE_VIEW (pages_view), _("Address"),
G_TYPE_STRING, EPHY_NODE_PAGE_PROP_LOCATION,
-1, EPHY_NODE_VIEW_USER_SORT, NULL);
gtk_tree_view_column_set_max_width (col, 200);
......
......@@ -229,7 +229,7 @@ static EggActionGroupEntry ephy_popups_entries [] = {
NULL, G_CALLBACK (popup_cmd_download_link), NULL },
{ "BookmarkLink", N_("_Bookmark Link..."), EPHY_STOCK_BOOKMARK_PAGE, NULL,
NULL, G_CALLBACK (popup_cmd_bookmark_link), NULL },
{ "CopyLinkLocation", N_("_Copy Link Location"), NULL, NULL,
{ "CopyLinkLocation", N_("_Copy Link Address"), NULL, NULL,
NULL, G_CALLBACK (popup_cmd_copy_link_location), NULL },
{ "CopyEmail", N_("Copy _Email"), NULL, NULL,
NULL, G_CALLBACK (popup_cmd_copy_email), NULL },
......@@ -245,7 +245,7 @@ static EggActionGroupEntry ephy_popups_entries [] = {
NULL, G_CALLBACK (popup_cmd_save_image_as), NULL },
{ "SetImageAsBackground", N_("Use Image As _Background"), NULL, NULL,
NULL, G_CALLBACK (popup_cmd_set_image_as_background), NULL },
{ "CopyImageLocation", N_("_Copy Image Location"), GTK_STOCK_COPY, NULL,
{ "CopyImageLocation", N_("_Copy Image Address"), GTK_STOCK_COPY, NULL,
NULL, G_CALLBACK (popup_cmd_copy_image_location), NULL },
};
static guint ephy_popups_n_entries = G_N_ELEMENTS (ephy_popups_entries);
......
......@@ -279,14 +279,17 @@ toolbar_setup_actions (Toolbar *t)
action = g_object_new (EPHY_TYPE_SPINNER_ACTION,
"name", "Spinner",
"label", "Spinner",
"label", _("Spinner"),
NULL);
egg_action_group_add_action (t->priv->action_group, action);
g_object_unref (action);
/* FIXME: I'm still waiting for the exact term to
* user here from the docs team.
*/
action = g_object_new (EPHY_TYPE_LOCATION_ACTION,
"name", "Location",
"label", "Location",
"label", _("Address Entry"),
"stock_id", EPHY_STOCK_ENTRY,
NULL);
g_signal_connect (action, "go_location",
......@@ -296,7 +299,7 @@ toolbar_setup_actions (Toolbar *t)
action = g_object_new (EPHY_TYPE_FAVICON_ACTION,
"name", "Favicon",
"label", "Favicon",
"label", _("Favicon"),
"window", t->priv->window,
NULL);
egg_action_group_add_action (t->priv->action_group, action);
......@@ -304,7 +307,7 @@ toolbar_setup_actions (Toolbar *t)
action = g_object_new (EPHY_TYPE_GO_ACTION,
"name", "ToolbarGo",
"label", "Go",
"label", _("Go"),
"stock_id", GTK_STOCK_JUMP_TO,
NULL);
g_signal_connect (action, "activate",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment