From 11c5ec3ac5c8c250a737a723d2dd0c1a9fd7a875 Mon Sep 17 00:00:00 2001 From: David Adam Bordoley Date: Thu, 8 May 2003 18:11:33 +0000 Subject: s/location/address. Fix up mnemonic collisions in the print dialog. Mark 2003-05-08 David Adam Bordoley * 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. --- src/bookmarks/ephy-bookmark-properties.c | 2 +- src/bookmarks/ephy-bookmarks-editor.c | 10 +++++----- src/ephy-history-window.c | 22 +++++++++++----------- src/ephy-window.c | 4 ++-- src/toolbar.c | 11 +++++++---- 5 files changed, 26 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index 575578aa2..95b956e67 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -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 ("", _("_Location:"), "", NULL); + str = g_strconcat ("", _("_Address:"), "", NULL); gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), str); g_free (str); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 25da06978..7427b3075 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -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 { diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index fac5c5243..1adba22cf 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -125,16 +125,16 @@ static EggActionGroupEntry ephy_history_ui_entries [] = { /* File Menu */ { "OpenInWindow", N_("_Open in New Window"), GTK_STOCK_OPEN, "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, "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, "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, "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, "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); diff --git a/src/ephy-window.c b/src/ephy-window.c index 51d26f38a..7aa87e8e7 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -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); diff --git a/src/toolbar.c b/src/toolbar.c index 3b8c63359..01f265a75 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -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", -- cgit v1.2.3