diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | configure.in | 20 | ||||
| -rw-r--r-- | src/ephy-main.c | 21 | ||||
| -rw-r--r-- | src/ephy-window.c | 2 |
4 files changed, 27 insertions, 32 deletions
@@ -1,3 +1,19 @@ +2003-06-18 Piers Cornwell <piersc@cogs.susx.ac.uk> + + * configure.in: + + Remove unused variables. + + * src/ephy-window.c: + + Add ellipse to Find menu item. + + * src/ephy-main.c: (ephy_main_start): + + Use the full program name, mark an error message as translatable + and don't print any message on launch when a window is already + open. + 2003-06-18 Marco Pesenti Gritti <marco@it.gnome.org> * lib/ephy-autocompletion.c: (ephy_autocompletion_refine_matches), diff --git a/configure.in b/configure.in index 1516091aa..d833d3907 100644 --- a/configure.in +++ b/configure.in @@ -11,28 +11,8 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) dnl put the ACLOCAL flags in the Makefile ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -GCONF_REQUIRED=1.0.4 -GDK_PIXBUF_REQUIRED=0.13.0 -GLIB_REQUIRED=1.2.9 -LIBGLADE_REQUIRED=0.13 -GNOME_LIBS_REQUIRED=1.2.11 -GNOME_REQUIRED=1.2.8 -GNOME_VFS_REQUIRED=1.0.1 -GTK_REQUIRED=1.2.9 -LIBXML_REQUIRED=1.8.14 -OAF_REQUIRED=0.6.5 -ORBIT_REQUIRED=0.5.7 -MOZILLA_REQUIRED=1.3 -SCROLLKEEPER_REQUIRED=0.1.4 LIBBONOBOUI_REQUIRED=2.1.1 -AC_SUBST(SCROLLKEEPER_REQUIRED) -AC_SUBST(GNOME_VFS_REQUIRED) -AC_SUBST(LIBXML_REQUIRED) -AC_SUBST(ORBIT_REQUIRED) -AC_SUBST(LIBGLADE_REQUIRED) -AC_SUBST(GNOME_LIBS_REQUIRED) -AC_SUBST(MOZILLA_REQUIRED) AC_SUBST(LIBBONOBOUI_REQUIRED) AC_ENABLE_SHARED(yes) diff --git a/src/ephy-main.c b/src/ephy-main.c index 4fa9e41d5..787140248 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -68,32 +68,32 @@ static struct poptOption popt_options[] = { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &bonobo_activation_popt_options, 0, NULL, NULL }, { "new-tab", 'n', POPT_ARG_NONE, &open_in_new_tab, 0, - N_("Open a new tab in an existing Ephy window"), + N_("Open a new tab in an existing Epiphany window"), NULL }, { "new-window", 'w', POPT_ARG_NONE, &open_in_new_window, 0, - N_("Open a new window in an existing Ephy process"), + N_("Open a new window in an existing Epiphany process"), NULL }, { "noraise", '\0', POPT_ARG_NONE, &noraise, 0, - N_("Do not raise the window when opening a page in an existing Ephy process"), + N_("Do not raise the window when opening a page in an existing Epiphany process"), NULL }, { "fullscreen", 'f', POPT_ARG_NONE, &open_fullscreen, 0, - N_("Run Ephy in full screen mode"), + N_("Run Epiphany in full screen mode"), NULL }, { "existing", 'x', POPT_ARG_NONE, &open_in_existing, 0, - N_("Attempt to load URL in existing Ephy window"), + N_("Attempt to load URL in existing Epiphany window"), NULL }, { "load-session", 'l', POPT_ARG_STRING, &session_filename, 0, N_("Load the given session file"), N_("FILE") }, { "server", 's', POPT_ARG_NONE, &ephy_server_mode, 0, N_("Don't open any windows; instead act as a server " - "for quick startup of new Ephy instances"), + "for quick startup of new Epiphany instances"), NULL }, { "add-bookmark", 't', POPT_ARG_STRING, &bookmark_url, 0, N_("Add a bookmark (don't open any window)"), N_("URL")}, { "close", 'c', POPT_ARG_NONE, &close_option, 0, - N_("Close all Ephy windows"), + N_("Close all Epiphany windows"), NULL }, { "quit", 'q', POPT_ARG_NONE, &quit_option, 0, N_("Same as --close, but exits server mode too"), @@ -186,12 +186,12 @@ ephy_main_start (gpointer data) GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - "Ephy can't be used now. " + _("Epiphany can't be used now. " "Running the command \"bonobo-slay\" " "from the console may fix the problem. If not, " "you can try rebooting the computer or " - "installing Ephy again.\n\n" - "Bonobo couldn't locate the GNOME_Epiphany_Automation.server. "); + "installing Epiphany again.\n\n" + "Bonobo couldn't locate the GNOME_Epiphany_Automation.server.")); gtk_dialog_run (GTK_DIALOG (dialog)); } @@ -290,7 +290,6 @@ ephy_main_automation_init (void) else { ephy_main_start (NULL); - g_message (_("Ephy already running, using existing process")); return FALSE; } } diff --git a/src/ephy-window.c b/src/ephy-window.c index bdcd30718..32b0a89c8 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -103,7 +103,7 @@ static EggActionGroupEntry ephy_menu_entries [] = { { "EditSelectAll", N_("Select _All"), NULL, "<control>A", N_("Select the entire page"), G_CALLBACK (window_cmd_edit_select_all), NULL }, - { "EditFind", N_("_Find"), GTK_STOCK_FIND, "<control>F", + { "EditFind", N_("_Find..."), GTK_STOCK_FIND, "<control>F", N_("Find a string"), G_CALLBACK (window_cmd_edit_find), NULL }, { "EditFindNext", N_("Find Ne_xt"), NULL, "<control>G", |