From 4221c99c10801fcac73e6840ccab21d15090fe34 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpeseng@src.gnome.org>
Date: Fri, 7 Feb 2003 20:43:07 +0000
Subject: *** empty log message ***

---
 data/ui/epiphany-ui.xml.in | 18 +++++++++---------
 src/ephy-window.c          | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index 69ae70265..b9875b411 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -1,9 +1,9 @@
 <Root>
 <menu>
 <submenu name="FileMenu" verb="File">  
-        <menuitem name="FileNewWindowMenu" verb="FileNewWindow"/>
+        <menuitem name="FileNewBrowserMenu" verb="FileNewBrowser"/>
 	<menuitem name="FileNewTabMenu" verb="FileNewTab"/>
-        <menuitem name="FileOpenMenu" verb="FileOpen"/>
+	<menuitem name="FileOpenMenu" verb="FileOpen"/>
 	<separator name="FileSep1"/>	
         <menuitem name="FileSaveAsMenu" verb="FileSaveAs"/>
 	<separator name="FileSep2"/>
@@ -12,8 +12,8 @@
 	<separator name="FileSep3"/>
 	<menuitem name="FileAddBookmarkMenu" verb="FileAddBookmark"/>
 	<separator name="FileSep4"/>
-        <menuitem name="FileCloseTabMenu" verb="FileCloseTab"/>
-	<menuitem name="FileCloseWindowMenu" verb="FileCloseWindow"/>
+	<menuitem name="FileCloseTabMenu" verb="FileCloseTab"/>
+	<menuitem name="FileCloseBrowserMenu" verb="FileCloseBrowser"/>
 </submenu>
 
 <submenu name="EditMenu" verb="Edit">
@@ -106,13 +106,13 @@
 	<menuitem name="CopyPageLocationFDP" verb="CopyPageLocation"/>
 	<separator name="FDBSep2"/>
 	<menuitem name="OpenFrameFDP" verb="OpenFrame"/>
-	<menuitem name="OpenFrameInNewWindowFDP" verb="OpenFrameInNewWindow"/>
+	<menuitem name="OpenFrameInNewBrowserFDP" verb="OpenFrameInNewBrowser"/>
 	<menuitem name="OpenFrameInNewTabFDP" verb="OpenFrameInNewTab"/>
 </popup>
 
 <popup name="EphyLinkPopup" verb="FakeToplevel">
 	<menuitem name="OpenLinkLP" verb="OpenLink"/>
-        <menuitem name="OpenLinkInNewWindowLP" verb="OpenLinkInNewWindow"/>
+        <menuitem name="OpenLinkInNewBrowserLP" verb="OpenLinkInNewBrowser"/>
 	<menuitem name="OpenLinkInNewTabLP" verb="OpenLinkInNewTab"/>
 	<menuitem name="DownloadLinkLP" verb="DownloadLink"/>
 	<menuitem name="AddLinkBookmarkLP" verb="AddLinkBookmark"/>
@@ -122,7 +122,7 @@
 
 <popup name="EphyImagePopup" verb="FakeToplevel">
 	<menuitem name="OpenImageIP" verb="OpenImage"/>
-	<menuitem name="OpenImageInNewWindowIP" verb="OpenImageInNewWindow"/>
+	<menuitem name="OpenImageInNewBrowserIP" verb="OpenImageInNewBrowser"/>
 	<menuitem name="OpenImageInNewTabIP" verb="OpenImageInNewTab"/>
 	<menuitem name="SaveImageAsIP" verb="SaveImageAs"/>
 	<menuitem name="SetImageAsBackgroundIP" verb="SetImageAsBackground"/>
@@ -131,7 +131,7 @@
 
 <popup name="EphyImageLinkPopup" verb="FakeToplevel">
 	<menuitem name="OpenLinkILP" verb="OpenLink"/>
-        <menuitem name="OpenLinkInNewWindowILP" verb="OpenLinkInNewWindow"/>
+        <menuitem name="OpenLinkInNewBrowserILP" verb="OpenLinkInNewBrowser"/>
 	<menuitem name="OpenLinkInNewTabILP" verb="OpenLinkInNewTab"/>
 	<menuitem name="DownloadLinkILP" verb="DownloadLink"/>
 	<menuitem name="AddLinkBookmarkILP" verb="AddLinkBookmark"/>
@@ -139,7 +139,7 @@
 	<menuitem name="CopyEmailLinkILP" verb="CopyEmail"/>
 	<separator name="LPSep1"/>
 	<menuitem name="OpenImageILP" verb="OpenImage"/>
-	<menuitem name="OpenImageInNewWindowILP" verb="OpenImageInNewWindow"/>
+	<menuitem name="OpenImageInNewBrowserILP" verb="OpenImageInNewBrowser"/>
 	<menuitem name="OpenImageInNewTabILP" verb="OpenImageInNewTab"/>
 	<menuitem name="SaveImageAsILP" verb="SaveImageAs"/>
 	<menuitem name="SetImageAsBackgroundILP" verb="SetImageAsBackground"/>
diff --git a/src/ephy-window.c b/src/ephy-window.c
index f78696a3c..60e1da07b 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -63,8 +63,8 @@ static EggActionGroupEntry ephy_menu_entries [] = {
 	{ "Help", N_("_Help"), NULL, NULL, NULL, NULL, NULL },
 
 	/* File menu */
-	{ "FileNewWindow", N_("_New Window"), GTK_STOCK_NEW, "<control>N",
-	  N_("Create a new window"),
+	{ "FileNewBrowser", N_("_New Browser"), GTK_STOCK_NEW, "<control>N",
+	  N_("Create a new browser"),
 	  G_CALLBACK (window_cmd_file_new_window), NULL },
 	{ "FileNewTab", N_("New _Tab"), EPHY_STOCK_NEW_TAB, "<control>T",
 	  N_("Create a new tab"),
@@ -84,11 +84,11 @@ static EggActionGroupEntry ephy_menu_entries [] = {
 	{ "FileAddBookmark", N_("_Add Bookmark..."), GTK_STOCK_ADD, "<control>D",
 	  N_("Add a bookmark for the current page"),
 	  G_CALLBACK (window_cmd_file_add_bookmark), NULL },
-	{ "FileCloseTab", N_("_Close Tab"), GTK_STOCK_CLOSE, "<control>W",
-	  N_("Send a link of the current page"),
+	{ "FileCloseTab", N_("C_lose Tab"), GTK_STOCK_CLOSE, "<shift><control>W",
+	  N_("Close the selected tab"),
 	  G_CALLBACK (window_cmd_file_close_tab), NULL },
-	{ "FileCloseWindow", N_("Close _Window"), NULL, "<shift><control>W",
-	  N_("Send a link of the current page"),
+	{ "FileCloseBrowser", N_("_Close"), GTK_STOCK_CLOSE, "<control>W",
+	  N_("Close this browser"),
 	  G_CALLBACK (window_cmd_file_close_window), NULL },
 
 	/* Edit menu */
@@ -213,7 +213,7 @@ static EggActionGroupEntry ephy_popups_entries [] = {
 	/* Framed document */
 	{ "OpenFrame", N_("Open Frame"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_open_frame), NULL },
-	{ "OpenFrameInNewWindow", N_("Open Frame in New Window"), NULL, NULL,
+	{ "OpenFrameInNewBrowser", N_("Open Frame in New Browser"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_frame_in_new_window), NULL },
 	{ "OpenFrameInNewTab", N_("Open Frame in New Tab"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_frame_in_new_tab), NULL },
@@ -221,7 +221,7 @@ static EggActionGroupEntry ephy_popups_entries [] = {
 	/* Links */
 	{ "OpenLink", N_("Open Link"), GTK_STOCK_OPEN, NULL,
 	  NULL, G_CALLBACK (popup_cmd_open_link), NULL },
-	{ "OpenLinkInNewWindow", N_("Open Link in New Window"), NULL, NULL,
+	{ "OpenLinkInNewBrowser", N_("Open Link in New Browser"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_link_in_new_window), NULL },
 	{ "OpenLinkInNewTab", N_("Open Link in New Tab"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_link_in_new_tab), NULL },
@@ -237,7 +237,7 @@ static EggActionGroupEntry ephy_popups_entries [] = {
 	/* Images */
 	{ "OpenImage", N_("Open Image"), GTK_STOCK_OPEN, NULL,
 	  NULL, G_CALLBACK (popup_cmd_open_image), NULL },
-	{ "OpenImageInNewWindow", N_("Open Image in New Window"), NULL, NULL,
+	{ "OpenImageInNewBrowser", N_("Open Image in New Browser"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_image_in_new_window), NULL },
 	{ "OpenImageInNewTab", N_("Open Image in New Tab"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_image_in_new_tab), NULL },
-- 
cgit