Index: src/nautilus-navigation-window-menus.c
===================================================================
--- src/nautilus-navigation-window-menus.c	(revision 13061)
+++ src/nautilus-navigation-window-menus.c	(working copy)
@@ -476,7 +476,7 @@
     G_CALLBACK (action_show_hide_toolbar_callback),
     TRUE}, /* is_active */
   { "Show Hide Sidebar", NULL,                 /* name, stock id */
-    N_("_Side Pane"), "F9",                    /* label, accelerator */     
+    N_("_Sidebar"), "F9",                    /* label, accelerator */     
     N_("Change the visibility of this window's sidebar"),                       /* tooltip */
     G_CALLBACK (action_show_hide_sidebar_callback),
     TRUE}, /* is_active */
Index: src/nautilus-side-pane.c
===================================================================
--- src/nautilus-side-pane.c	(revision 13061)
+++ src/nautilus-side-pane.c	(working copy)
@@ -417,7 +417,7 @@
 	gtk_widget_show (side_pane->details->menu);
 
 	gtk_widget_set_tooltip_text (close_button,
-				     _("Close the side pane"));
+				     _("Close the sidebar"));
 }
 
 static void
Index: libnautilus-private/apps_nautilus_preferences.schemas.in
===================================================================
--- libnautilus-private/apps_nautilus_preferences.schemas.in	(revision 13061)
+++ libnautilus-private/apps_nautilus_preferences.schemas.in	(working copy)
@@ -399,8 +399,8 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-        <short>Custom Side Pane Background Set</short>
-        <long>Whether a custom default side pane background has been set.</long>
+        <short>Custom Sidebar Background Set</short>
+        <long>Whether a custom default sidebar background has been set.</long>
       </locale>
     </schema>
     
@@ -411,8 +411,8 @@
       <type>string</type>
       <default>#ffffff</default>
       <locale name="C">
-         <short>Default Side Pane Background Color</short>
-         <long>Filename for the default side pane background.  Only used if side_pane_background_set is true.</long>
+         <short>Default Sidebar Background Color</short>
+         <long>Filename for the default sidebar background.  Only used if side_pane_background_set is true.</long>
       </locale>
     </schema>
     
@@ -423,8 +423,8 @@
       <type>string</type>
       <default></default>
       <locale name="C">
-         <short>Default Side Pane Background Filename</short>
-         <long>Filename for the default side pane background.  Only used if side_pane_background_set is true.</long>
+         <short>Default Sidebar Background Filename</short>
+         <long>Filename for the default sidebar background.  Only used if side_pane_background_set is true.</long>
       </locale>
     </schema>
 
@@ -668,9 +668,9 @@
       <type>int</type>
       <default>148</default>
       <locale name="C">
-         <short>Width of the side pane</short>
+         <short>Width of the sidebar</short>
          <long>
-          The default width of the side pane in new windows.
+          The default width of the sidebar in new windows.
          </long>
       </locale>
     </schema>
@@ -726,7 +726,7 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Show side pane in new windows</short>
+         <short>Show sidebar in new windows</short>
          <long>
            If set to true, newly opened windows will have the side
 	   pane visible.
@@ -743,7 +743,7 @@
       <locale name="C">
          <short>Side pane view</short>
          <long>
-	   The side pane view to show in newly opened windows.
+	   The sidebar view to show in newly opened windows.
          </long>
       </locale>
     </schema>
@@ -758,7 +758,7 @@
          <short>Only show folders in the tree sidebar</short>
          <long>
            If set to true, Nautilus will only show folders
-           in the tree side pane. Otherwise it will show both folders
+           in the tree sidebar. Otherwise it will show both folders
 	   and files.
          </long>
       </locale>
