data/ui/epiphany-ui.xml.in Added some separators. Changed "bookmark" verbs

	* data/ui/epiphany-ui.xml.in
	Added some separators.
	Changed "bookmark" verbs and menu names to reflect changes
	in src/ephy-window.c

	* src/ephy-window.c
	Added a bunch of mneumonics to context menu entries
	s/Add Bookmark.../Bookmark Page... for pages.
	s/Add Bookmark.../Bookmark Link... for links.
	Changed callbacks in  ephy_menu_entries[] and ephy_popups_entries
	to reflect changes in src/window-commands.(ch) and src/pop-commands.(ch).

	* src/popup-commands.c
	* src/popup-commands.h
	s/popup_cmd_link_in_new_window/popup_cmd_link_in_new_browser
	s/popup_cmd_image_in_new_window/popup_cmd_image_in_new_browser
	s/popup_cmd_add_link_bookmark/void popup_cmd_bookmark_link
	s/void popup_cmd_frame_in_new_window/void popup_cmd_frame_in_new_browser

	* src/window-commands.c
	* src/window-commands.h
	s/window_cmd_file_new_window/window_cmd_file_new_browser
	s/window_cmd_file_add_bookmark/window_cmd_file_bookmark_page

	* lib/ephy-stock-icons.h
	Fixed #endif comment s/RB/EPHY

1 files changed, 10 insertions, 6 deletions

diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index c8f5fe8de..9304db7a2 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -10,7 +10,7 @@
 	<menuitem name="FilePrintMenu" verb="FilePrint"/>
 	<menuitem name="FileSendToMenu" verb="FileSendTo"/>
 	<separator name="FileSep3"/>
-	<menuitem name="FileAddBookmarkMenu" verb="FileAddBookmark"/>
+	<menuitem name="FileBookmarkPageMenu" verb="FileBookmarkPage"/>
 	<separator name="FileSep4"/>
 	<menuitem name="FileCloseBrowserMenu" verb="FileCloseBrowser"/>
 </submenu>
@@ -90,7 +90,7 @@
 	<separator name="DPSep1"/>
 	<menuitem name="SavePageAsDP" verb="FileSaveAs"/>
 	<menuitem name="SaveBackgroundAsDP" verb="SaveBackgroundAs"/>
-	<menuitem name="AddPageBookmarkDP" verb="FileAddBookmark"/>
+	<menuitem name="BookmarkPageDP" verb="FileBookmarkPage"/>
 	<menuitem name="CopyPageLocationDP" verb="CopyPageLocation"/>
 </popup>
 
@@ -101,7 +101,7 @@
 	<separator name="FDPSep1"/>
 	<menuitem name="SavePageAsFDP" verb="FileSaveAs"/>
 	<menuitem name="SaveBackgroundAsFDP" verb="SaveBackgroundAs"/>
-	<menuitem name="AddPageBookmarkFDP" verb="FileAddBookmark"/>
+	<menuitem name="BookmarkPageFDP" verb="FileBookmarkPage"/>
 	<menuitem name="CopyPageLocationFDP" verb="CopyPageLocation"/>
 	<separator name="FDBSep2"/>
 	<menuitem name="OpenFrameFDP" verb="OpenFrame"/>
@@ -113,8 +113,9 @@
 	<menuitem name="OpenLinkLP" verb="OpenLink"/>
         <menuitem name="OpenLinkInNewBrowserLP" verb="OpenLinkInNewBrowser"/>
 	<menuitem name="OpenLinkInNewTabLP" verb="OpenLinkInNewTab"/>
+	<separator name="LPSep1"/>
 	<menuitem name="DownloadLinkLP" verb="DownloadLink"/>
-	<menuitem name="AddLinkBookmarkLP" verb="AddLinkBookmark"/>
+	<menuitem name="BookmarkLinkLP" verb="BookmarkLink"/>
 	<menuitem name="CopyLinkLocationLP" verb="CopyLinkLocation"/>
 	<menuitem name="CopyEmailLinkLP" verb="CopyEmail"/>
 </popup>
@@ -123,6 +124,7 @@
 	<menuitem name="OpenImageIP" verb="OpenImage"/>
 	<menuitem name="OpenImageInNewBrowserIP" verb="OpenImageInNewBrowser"/>
 	<menuitem name="OpenImageInNewTabIP" verb="OpenImageInNewTab"/>
+	<separator name="IPSep1"/>
 	<menuitem name="SaveImageAsIP" verb="SaveImageAs"/>
 	<menuitem name="SetImageAsBackgroundIP" verb="SetImageAsBackground"/>
 	<menuitem name="CopyImageLocationIP" verb="CopyImageLocation"/>
@@ -132,14 +134,16 @@
 	<menuitem name="OpenLinkILP" verb="OpenLink"/>
         <menuitem name="OpenLinkInNewBrowserILP" verb="OpenLinkInNewBrowser"/>
 	<menuitem name="OpenLinkInNewTabILP" verb="OpenLinkInNewTab"/>
+	<separator name="ILPSep1"/>
 	<menuitem name="DownloadLinkILP" verb="DownloadLink"/>
-	<menuitem name="AddLinkBookmarkILP" verb="AddLinkBookmark"/>
+	<menuitem name="BookmarkLinkILP" verb="BookmarkLink"/>
 	<menuitem name="CopyLinkLocationILP" verb="CopyLinkLocation"/>
 	<menuitem name="CopyEmailLinkILP" verb="CopyEmail"/>
-	<separator name="LPSep1"/>
+	<separator name="ILPSep2"/>
 	<menuitem name="OpenImageILP" verb="OpenImage"/>
 	<menuitem name="OpenImageInNewBrowserILP" verb="OpenImageInNewBrowser"/>
 	<menuitem name="OpenImageInNewTabILP" verb="OpenImageInNewTab"/>
+	<separator name="ILPSep3"/>
 	<menuitem name="SaveImageAsILP" verb="SaveImageAs"/>
 	<menuitem name="SetImageAsBackgroundILP" verb="SetImageAsBackground"/>
 	<menuitem name="CopyImageLocationILP" verb="CopyImageLocation"/>