[epiphany] Add 'History' item to the gear menu when not in the Shell

[Xan Lopez <xan src gnome org>]

commit 21caa3e6826f50e36ec3088c147e843dd34eedbb
Author: Xan Lopez <xan igalia com>
Date:   Sun Oct 7 14:29:22 2012 -0400

    Add 'History' item to the gear menu when not in the Shell

 src/ephy-window.c             |    4 ++--
 src/resources/epiphany-ui.xml |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index ad40ad7..dd85df7 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -137,9 +137,9 @@ static const GtkActionEntry ephy_menu_entries [] = {
 	  G_CALLBACK (window_cmd_edit_find_next) },
 	{ "EditFindPrev", NULL, N_("Find Pre_vious"), "<shift><control>G", NULL,
 	  G_CALLBACK (window_cmd_edit_find_prev) },
-	{ "EditBookmarks", NULL, N_("Edit _Bookmarksâ"), "<control>B", NULL,
+	{ "EditBookmarks", NULL, N_("Edit _Bookmarks"), "<control>B", NULL,
 	  G_CALLBACK (window_cmd_edit_bookmarks) },
-	{ "EditHistory", NULL, N_("Edit _Historyâ"), "<control>H", NULL,
+	{ "EditHistory", NULL, N_("_History"), "<control>H", NULL,
 	  G_CALLBACK (window_cmd_edit_history) },
 	{ "EditPreferences", NULL, N_("Preferences"), "<control>e", NULL,
 	  G_CALLBACK (window_cmd_edit_preferences) },
diff --git a/src/resources/epiphany-ui.xml b/src/resources/epiphany-ui.xml
index 5a2446c..8b117c7 100644
--- a/src/resources/epiphany-ui.xml
+++ b/src/resources/epiphany-ui.xml
@@ -84,6 +84,7 @@
                 <menuitem name="EditPreferencesMenu" action="EditPreferences"/>
                 <menuitem name="EditPersonalDataMenu" action="EditPersonalData"/>
                 <separator name="FileSep5"/>
+                <menuitem name="HistoryEditMenu" action="EditHistory"/>
                 <menuitem name="BookmarksEditMenu" action="EditBookmarks"/>
 		<menu name="BookmarksMenu" action="Bookmarks">
 			<menuitem name="BookmarksAddBookmarkMenu" action="FileBookmarkPage"/>