[nautilus] Move "go to same location as other pane" in the menus

[Alexander Larsson <alexl src gnome org>]

commit d9abc4bf2ff65009ab1521c31f0877b0e312c8a6
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Dec 17 15:57:08 2009 +0100

    Move "go to same location as other pane" in the menus
    
    We don'r want separators around this single item, put it with the
    navigation stuff instead (not ideal, but ok).

 src/nautilus-navigation-window-menus.c |    6 +++---
 src/nautilus-navigation-window-ui.xml  |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 15ec94b..0351dfe 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -1013,9 +1013,9 @@ static const GtkActionEntry navigation_entries[] = {
                                  G_CALLBACK (action_clear_history_callback) },
   /* name, stock id, label */  { "SplitViewNextPane", NULL, N_("Switch to other pane"),
 				 "F6", N_("Move focus to the other pane in a split view window"),
-				 G_CALLBACK (action_split_view_switch_next_pane_callback) },                                 
-  /* name, stock id, label */  { "SplitViewSameLocation", NULL, N_("Go to same location as other pane"),
-				 NULL, N_("Go to the same location in the other pane of a split view window"),
+				 G_CALLBACK (action_split_view_switch_next_pane_callback) },
+  /* name, stock id, label */  { "SplitViewSameLocation", NULL, N_("Same location as other pane"),
+				 NULL, N_("Go to the same location as in the extra pane"),
 				 G_CALLBACK (action_split_view_same_location_callback) },
   /* name, stock id, label */  { "Add Bookmark", GTK_STOCK_ADD, N_("_Add Bookmark"),
                                  "<control>d", N_("Add a bookmark for the current location to this menu"),
diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml
index 3e91c6a..d9c179e 100644
--- a/src/nautilus-navigation-window-ui.xml
+++ b/src/nautilus-navigation-window-ui.xml
@@ -29,6 +29,7 @@
 			<menuitem name="Up" action="Up"/>
 			<menuitem name="Back" action="Back"/>
 			<menuitem name="Forward"  action="Forward"/>
+			<menuitem name="SplitViewSameLocationMenu" action="SplitViewSameLocation"/>
 	                </placeholder>
 	                <separator/>
 			<menuitem name="Home" action="Home"/>
@@ -41,8 +42,6 @@
 			<separator/>
 			<menuitem name="Clear History" action="Clear History"/>
 			<separator/>
-            <menuitem name="SplitViewSameLocationMenu" action="SplitViewSameLocation"/>
-            <separator/>
 			<placeholder name="History Placeholder"/>
 		</menu>
 		<menu action="Bookmarks">