Move comments around to help translators (#463616) Patch from Yann Simon

2008-02-19  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-clipboard.c:
        * src/file-manager/fm-directory-view.c:
        * src/file-manager/fm-icon-view.c:
        * src/file-manager/fm-list-view.c:
        * src/nautilus-navigation-window-menus.c:
        * src/nautilus-spatial-window.c:
        * src/nautilus-window-menus.c:
	Move comments around to help translators (#463616)
	Patch from Yann Simon



svn path=/trunk/; revision=13771

8 files changed, 410 insertions, 398 deletions

diff --git a/ChangeLog b/ChangeLog
index 303272c95..b6c3bb3c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-02-19  Alexander Larsson  <alexl@redhat.com>
 
+        * libnautilus-private/nautilus-clipboard.c:
+        * src/file-manager/fm-directory-view.c:
+        * src/file-manager/fm-icon-view.c:
+        * src/file-manager/fm-list-view.c:
+        * src/nautilus-navigation-window-menus.c:
+        * src/nautilus-spatial-window.c:
+        * src/nautilus-window-menus.c:
+	Move comments around to help translators (#463616)
+	Patch from Yann Simon
+
+2008-02-19  Alexander Larsson  <alexl@redhat.com>
+
         * libnautilus-private/Makefile.am:
         * libnautilus-private/nautilus-file-operations-progress-icons.h:
         * libnautilus-private/nautilus-file-operations-progress.[ch]:
diff --git a/libnautilus-private/nautilus-clipboard.c b/libnautilus-private/nautilus-clipboard.c
index 66ee4f4ff..cfc5459d9 100644
--- a/libnautilus-private/nautilus-clipboard.c
+++ b/libnautilus-private/nautilus-clipboard.c
@@ -437,22 +437,22 @@ target_data_free (TargetCallbackData *target_data)
 }
 
 static const GtkActionEntry clipboard_entries[] = {
-  { "Cut", GTK_STOCK_CUT,                  /* name, stock id */
-    NULL, NULL,                /* label, accelerator */
-    N_("Cut the selected text to the clipboard"),                   /* tooltip */ 
-    G_CALLBACK (action_cut_callback) },
-  { "Copy", GTK_STOCK_COPY,                  /* name, stock id */
-    NULL, NULL,                /* label, accelerator */
-    N_("Copy the selected text to the clipboard"),                   /* tooltip */ 
-    G_CALLBACK (action_copy_callback) },
-  { "Paste", GTK_STOCK_PASTE,                  /* name, stock id */
-    NULL, NULL,                /* label, accelerator */
-    N_("Paste the text stored on the clipboard"),                   /* tooltip */ 
-    G_CALLBACK (action_paste_callback) },
-  { "Select All", NULL,                  /* name, stock id */
-    N_("Select _All"), "<control>A",                /* label, accelerator */
-    N_("Select all the text in a text field"),                   /* tooltip */ 
-    G_CALLBACK (action_select_all_callback) },
+  /* name, stock id */      { "Cut", GTK_STOCK_CUT,
+  /* label, accelerator */    NULL, NULL,
+  /* tooltip */               N_("Cut the selected text to the clipboard"),
+                              G_CALLBACK (action_cut_callback) },
+  /* name, stock id */      { "Copy", GTK_STOCK_COPY,
+  /* label, accelerator */    NULL, NULL,
+  /* tooltip */               N_("Copy the selected text to the clipboard"),
+                              G_CALLBACK (action_copy_callback) },
+  /* name, stock id */      { "Paste", GTK_STOCK_PASTE,
+  /* label, accelerator */    NULL, NULL,
+  /* tooltip */               N_("Paste the text stored on the clipboard"),
+                              G_CALLBACK (action_paste_callback) },
+  /* name, stock id */      { "Select All", NULL,
+  /* label, accelerator */    N_("Select _All"), "<control>A",
+  /* tooltip */               N_("Select all the text in a text field"),
+                              G_CALLBACK (action_select_all_callback) },
 };
 
 static TargetCallbackData *
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index d88d6f91f..865c75de4 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -6196,206 +6196,206 @@ fm_directory_view_init_show_hidden_files (FMDirectoryView *view)
 }
 
 static const GtkActionEntry directory_view_entries[] = {
-  { "New Documents", "document-new", N_("Create _Document") },               /* name, stock id, label */
-  { "Open With", NULL, N_("Open Wit_h"),               /* name, stock id, label */
-    NULL, N_("Choose a program with which to open the selected item") },
-  { "Properties", GTK_STOCK_PROPERTIES,                  /* name, stock id */
-    N_("_Properties"), "<alt>Return",                /* label, accelerator */
-    N_("View or modify the properties of each selected item"),                   /* tooltip */ 
-    G_CALLBACK (action_properties_callback) },
-  { "PropertiesAccel", NULL,                  /* name, stock id */
-    "PropertiesAccel", "<control>I",                /* label, accelerator */
-    NULL,                   /* tooltip */ 
-    G_CALLBACK (action_properties_callback) },
-  { "SelfProperties", GTK_STOCK_PROPERTIES,                  /* name, stock id */
-    N_("_Properties"), NULL,                /* label, accelerator */
-    N_("View or modify the properties of the open folder"),                   /* tooltip */ 
-    G_CALLBACK (action_self_properties_callback) },
-  { "New Folder", "folder-new",                  /* name, stock id */
-    N_("Create _Folder"), "<control><shift>N",                /* label, accelerator */
-    N_("Create a new empty folder inside this folder"),                   /* tooltip */ 
-    G_CALLBACK (action_new_folder_callback) },
-  { "No Templates", NULL, N_("No templates installed") },               /* name, stock id, label */
-  { "New Empty File", NULL,                  /* name, stock id */
+  /* name, stock id, label */  { "New Documents", "document-new", N_("Create _Document") },
+  /* name, stock id, label */  { "Open With", NULL, N_("Open Wit_h"),
+                                 NULL, N_("Choose a program with which to open the selected item") },
+  /* name, stock id */         { "Properties", GTK_STOCK_PROPERTIES,
+  /* label, accelerator */       N_("_Properties"), "<alt>Return",
+  /* tooltip */                  N_("View or modify the properties of each selected item"),
+                                 G_CALLBACK (action_properties_callback) },
+  /* name, stock id */         { "PropertiesAccel", NULL,
+  /* label, accelerator */       "PropertiesAccel", "<control>I",
+  /* tooltip */                  NULL,
+                                 G_CALLBACK (action_properties_callback) },
+  /* name, stock id */         { "SelfProperties", GTK_STOCK_PROPERTIES,
+  /* label, accelerator */       N_("_Properties"), NULL,
+  /* tooltip */                  N_("View or modify the properties of the open folder"),
+                                 G_CALLBACK (action_self_properties_callback) },
+  /* name, stock id */         { "New Folder", "folder-new",
+  /* label, accelerator */       N_("Create _Folder"), "<control><shift>N",
+  /* tooltip */                  N_("Create a new empty folder inside this folder"),
+                                 G_CALLBACK (action_new_folder_callback) },
+  /* name, stock id, label */  { "No Templates", NULL, N_("No templates installed") },
+  /* name, stock id */         { "New Empty File", NULL,
     /* translators: this is used to indicate that a file doesn't contain anything */
-    N_("_Empty File"), NULL,                /* label, accelerator */
-    N_("Create a new empty file inside this folder"),                   /* tooltip */ 
-    G_CALLBACK (action_new_empty_file_callback) },
-  { "New Launcher", NULL,                  /* name, stock id */
-    N_("Create L_auncher..."), NULL,                /* label, accelerator */
-    N_("Create a new launcher"),                   /* tooltip */ 
-    G_CALLBACK (action_new_launcher_callback) },
-  { "Open", GTK_STOCK_OPEN,                  /* name, stock id */
-    N_("_Open"), "<control>o",                /* label, accelerator */
-    N_("Open the selected item in this window"),                   /* tooltip */ 
-    G_CALLBACK (action_open_callback) },
-  { "OpenAccel", NULL,                  /* name, stock id */
-    "OpenAccel", "<alt>Down",                /* label, accelerator */
-    NULL,                   /* tooltip */ 
-    G_CALLBACK (action_open_callback) },
-  { "OpenAlternate", NULL,                  /* name, stock id */
-    N_("Open in Navigation Window"), "<control><shift>o",                /* label, accelerator */
-    N_("Open each selected item in a navigation window"),                   /* tooltip */ 
-    G_CALLBACK (action_open_alternate_callback) },
-  { "OpenFolderWindow", NULL,                  /* name, stock id */
-    N_("Open in Folder Window"), NULL,                /* label, accelerator */
-    N_("Open each selected item in a folder window"),                   /* tooltip */ 
-    G_CALLBACK (action_open_folder_window_callback) },
-  { "OtherApplication1", NULL,                  /* name, stock id */
-    N_("Open with Other _Application..."), NULL,                /* label, accelerator */
-    N_("Choose another application with which to open the selected item"),                   /* tooltip */ 
-    G_CALLBACK (action_other_application_callback) },
-  { "OtherApplication2", NULL,                  /* name, stock id */
-    N_("Open with Other _Application..."), NULL,                /* label, accelerator */
-    N_("Choose another application with which to open the selected item"),                   /* tooltip */ 
-    G_CALLBACK (action_other_application_callback) },
-  { "Open Scripts Folder", NULL,                  /* name, stock id */
-    N_("_Open Scripts Folder"), NULL,                /* label, accelerator */
-    N_("Show the folder containing the scripts that appear in this menu"),                   /* tooltip */ 
-    G_CALLBACK (action_open_scripts_folder_callback) },
-  { "Empty Trash", NULL,                  /* name, stock id */
-    N_("E_mpty Trash"), NULL,                /* label, accelerator */
-    N_("Delete all items in the Trash"),                   /* tooltip */ 
-    G_CALLBACK (action_empty_trash_callback) },
-  { "Cut", GTK_STOCK_CUT,                  /* name, stock id */
-    NULL, NULL,                /* label, accelerator */
-    N_("Prepare the selected files to be moved with a Paste command"),                   /* tooltip */ 
-    G_CALLBACK (action_cut_files_callback) },
-  { "Copy", GTK_STOCK_COPY,                  /* name, stock id */
-    NULL, NULL,                /* label, accelerator */
-    N_("Prepare the selected files to be copied with a Paste command"),                   /* tooltip */ 
-    G_CALLBACK (action_copy_files_callback) },
-  { "Paste", GTK_STOCK_PASTE,                  /* name, stock id */
-    NULL, NULL,                /* label, accelerator */
-    N_("Move or copy files previously selected by a Cut or Copy command"),                   /* tooltip */ 
-    G_CALLBACK (action_paste_files_callback) },
+  /* label, accelerator */       N_("_Empty File"), NULL,
+  /* tooltip */                  N_("Create a new empty file inside this folder"),
+                                 G_CALLBACK (action_new_empty_file_callback) },
+  /* name, stock id */         { "New Launcher", NULL,
+  /* label, accelerator */       N_("Create L_auncher..."), NULL,
+  /* tooltip */                  N_("Create a new launcher"),
+                                 G_CALLBACK (action_new_launcher_callback) },
+  /* name, stock id */         { "Open", GTK_STOCK_OPEN,
+  /* label, accelerator */       N_("_Open"), "<control>o",
+  /* tooltip */                  N_("Open the selected item in this window"),
+                                 G_CALLBACK (action_open_callback) },
+  /* name, stock id */         { "OpenAccel", NULL,
+  /* label, accelerator */       "OpenAccel", "<alt>Down",
+  /* tooltip */                  NULL,
+                                 G_CALLBACK (action_open_callback) },
+  /* name, stock id */         { "OpenAlternate", NULL,
+  /* label, accelerator */       N_("Open in Navigation Window"), "<control><shift>o",
+  /* tooltip */                  N_("Open each selected item in a navigation window"),
+                                 G_CALLBACK (action_open_alternate_callback) },
+  /* name, stock id */         { "OpenFolderWindow", NULL,
+  /* label, accelerator */       N_("Open in Folder Window"), NULL,
+  /* tooltip */                  N_("Open each selected item in a folder window"),
+                                 G_CALLBACK (action_open_folder_window_callback) },
+  /* name, stock id */         { "OtherApplication1", NULL,
+  /* label, accelerator */       N_("Open with Other _Application..."), NULL,
+  /* tooltip */                  N_("Choose another application with which to open the selected item"),
+                                 G_CALLBACK (action_other_application_callback) },
+  /* name, stock id */         { "OtherApplication2", NULL,
+  /* label, accelerator */       N_("Open with Other _Application..."), NULL,
+  /* tooltip */                  N_("Choose another application with which to open the selected item"),
+                                 G_CALLBACK (action_other_application_callback) },
+  /* name, stock id */         { "Open Scripts Folder", NULL,
+  /* label, accelerator */       N_("_Open Scripts Folder"), NULL,
+   /* tooltip */                 N_("Show the folder containing the scripts that appear in this menu"),
+                                 G_CALLBACK (action_open_scripts_folder_callback) },
+  /* name, stock id */         { "Empty Trash", NULL,
+  /* label, accelerator */       N_("E_mpty Trash"), NULL,
+  /* tooltip */                  N_("Delete all items in the Trash"),
+                                 G_CALLBACK (action_empty_trash_callback) },
+  /* name, stock id */         { "Cut", GTK_STOCK_CUT,
+  /* label, accelerator */       NULL, NULL,
+  /* tooltip */                  N_("Prepare the selected files to be moved with a Paste command"),
+                                 G_CALLBACK (action_cut_files_callback) },
+  /* name, stock id */         { "Copy", GTK_STOCK_COPY,
+  /* label, accelerator */       NULL, NULL,
+  /* tooltip */                  N_("Prepare the selected files to be copied with a Paste command"),
+                                 G_CALLBACK (action_copy_files_callback) },
+  /* name, stock id */         { "Paste", GTK_STOCK_PASTE,
+  /* label, accelerator */       NULL, NULL,
+  /* tooltip */                  N_("Move or copy files previously selected by a Cut or Copy command"),
+                                 G_CALLBACK (action_paste_files_callback) },
   /* We make accelerator "" instead of null here to not inherit the stock
      accelerator for paste */
-  { "Paste Files Into", GTK_STOCK_PASTE,                  /* name, stock id */
-    N_("_Paste Into Folder"), "",                /* label, accelerator */
-    N_("Move or copy files previously selected by a Cut or Copy command into the selected folder"),                   /* tooltip */ 
-    G_CALLBACK (action_paste_files_into_callback) },
-  { "Select All", NULL,                  /* name, stock id */
-    N_("Select _All"), "<control>A",                /* label, accelerator */
-    N_("Select all items in this window"),                   /* tooltip */ 
-    G_CALLBACK (action_select_all_callback) },
-  { "Select Pattern", NULL,                  /* name, stock id */
-    N_("Select _Pattern"), "<control>S",                /* label, accelerator */
-    N_("Select items in this window matching a given pattern"),                   /* tooltip */ 
-    G_CALLBACK (action_select_pattern_callback) },
-  { "Duplicate", NULL,                  /* name, stock id */
-    N_("D_uplicate"), NULL,                /* label, accelerator */
-    N_("Duplicate each selected item"),                   /* tooltip */ 
-    G_CALLBACK (action_duplicate_callback) },
-  { "Create Link", NULL,                  /* name, stock id */
-    N_("Ma_ke Link"), "<control>M",                /* label, accelerator */
-    N_("Create a symbolic link for each selected item"),                   /* tooltip */ 
-    G_CALLBACK (action_create_link_callback) },
-  { "Rename", NULL,                  /* name, stock id */
-    N_("_Rename..."), "F2",                /* label, accelerator */
-    N_("Rename selected item"),                   /* tooltip */ 
-    G_CALLBACK (action_rename_callback) },
-  { "RenameSelectAll", NULL,                  /* name, stock id */
-    "RenameSelectAll", "<shift>F2",                /* label, accelerator */
-    NULL,                   /* tooltip */ 
-    G_CALLBACK (action_rename_select_all_callback) },
-  { "Trash", NAUTILUS_ICON_TRASH,                  /* name, stock id */
-    N_("Mo_ve to Trash"), "<control>T",                /* label, accelerator */
-    N_("Move each selected item to the Trash"),                   /* tooltip */ 
-    G_CALLBACK (action_trash_callback) },
-  { "Delete", NULL,                  /* name, stock id */
-    N_("_Delete"), "<shift>Delete",                /* label, accelerator */
-    N_("Delete each selected item, without moving to the Trash"),                   /* tooltip */ 
-    G_CALLBACK (action_delete_callback) },
-  { "Reset to Defaults", NULL,                  /* name, stock id */
-    N_("Reset View to _Defaults"), NULL,                /* label, accelerator */
-    N_("Reset sorting order and zoom level to match preferences for this view"),                   /* tooltip */ 
-    G_CALLBACK (action_reset_to_defaults_callback) },
-  { "Connect To Server Link", NULL,                  /* name, stock id */
-    N_("Connect To This Server"), NULL,                /* label, accelerator */
-    N_("Make a permanent connection to this server"),                   /* tooltip */ 
-    G_CALLBACK (action_connect_to_server_link_callback) },
-  { "Mount Volume", NULL,                  /* name, stock id */
-    N_("_Mount Volume"), NULL,                /* label, accelerator */
-    N_("Mount the selected volume"),                   /* tooltip */ 
-    G_CALLBACK (action_mount_volume_callback) },
-  { "Unmount Volume", NULL,                  /* name, stock id */
-    N_("_Unmount Volume"), NULL,                /* label, accelerator */
-    N_("Unmount the selected volume"),                   /* tooltip */ 
-    G_CALLBACK (action_unmount_volume_callback) },
-  { "Eject Volume", NULL,                  /* name, stock id */
-    N_("_Eject"), NULL,                /* label, accelerator */
-    N_("Eject the selected volume"),                   /* tooltip */ 
-    G_CALLBACK (action_eject_volume_callback) },
-  { "Format Volume", NULL,                  /* name, stock id */
-    N_("_Format"), NULL,                /* label, accelerator */
-    N_("Format the selected volume"),                   /* tooltip */ 
-    G_CALLBACK (action_format_volume_callback) },
-  { "Self Mount Volume", NULL,                  /* name, stock id */
-    N_("_Mount Volume"), NULL,                /* label, accelerator */
-    N_("Mount the volume associated with the open folder"),                   /* tooltip */ 
-    G_CALLBACK (action_self_mount_volume_callback) },
-  { "Self Unmount Volume", NULL,                  /* name, stock id */
-    N_("_Unmount Volume"), NULL,                /* label, accelerator */
-    N_("Unmount the volume associated with the open folder"),                   /* tooltip */ 
-    G_CALLBACK (action_self_unmount_volume_callback) },
-  { "Self Eject Volume", NULL,                  /* name, stock id */
-    N_("_Eject"), NULL,                /* label, accelerator */
-    N_("Eject the volume associated with the open folder"),                   /* tooltip */ 
-    G_CALLBACK (action_self_eject_volume_callback) },
-  { "Self Format Volume", NULL,                  /* name, stock id */
-    N_("_Format"), NULL,                /* label, accelerator */
-    N_("Format the volume associated with the open folder"),                   /* tooltip */ 
-    G_CALLBACK (action_self_format_volume_callback) },
-  { "OpenCloseParent", NULL,                  /* name, stock id */
-    N_("Open File and Close window"), "<alt><shift>Down",                /* label, accelerator */
-    NULL,                   /* tooltip */ 
-    G_CALLBACK (action_open_close_parent_callback) },
-  { "Save Search", NULL,                     /* name, stock id */
-    N_("Sa_ve Search"), NULL,                /* label, accelerator */
-    N_("Save the edited search"),            /* tooltip */ 
-    G_CALLBACK (action_save_search_callback) },
-  { "Save Search As", NULL,                  /* name, stock id */
-    N_("Sa_ve Search As..."), NULL,             /* label, accelerator */
-    N_("Save the current search as a file"), /* tooltip */ 
-    G_CALLBACK (action_save_search_as_callback) },
+  /* name, stock id */         { "Paste Files Into", GTK_STOCK_PASTE,
+  /* label, accelerator */       N_("_Paste Into Folder"), "",
+  /* tooltip */                  N_("Move or copy files previously selected by a Cut or Copy command into the selected folder"),
+                                 G_CALLBACK (action_paste_files_into_callback) },
+  /* name, stock id */         { "Select All", NULL,
+  /* label, accelerator */       N_("Select _All"), "<control>A",
+  /* tooltip */                  N_("Select all items in this window"),
+                                 G_CALLBACK (action_select_all_callback) },
+  /* name, stock id */         { "Select Pattern", NULL,
+  /* label, accelerator */       N_("Select _Pattern"), "<control>S",
+  /* tooltip */                  N_("Select items in this window matching a given pattern"),
+                                 G_CALLBACK (action_select_pattern_callback) },
+  /* name, stock id */         { "Duplicate", NULL,
+  /* label, accelerator */       N_("D_uplicate"), NULL,
+  /* tooltip */                  N_("Duplicate each selected item"),
+                                 G_CALLBACK (action_duplicate_callback) },
+  /* name, stock id */         { "Create Link", NULL,
+  /* label, accelerator */       N_("Ma_ke Link"), "<control>M",
+  /* tooltip */                  N_("Create a symbolic link for each selected item"),
+                                 G_CALLBACK (action_create_link_callback) },
+  /* name, stock id */         { "Rename", NULL,
+  /* label, accelerator */       N_("_Rename..."), "F2",
+  /* tooltip */                  N_("Rename selected item"),
+                                 G_CALLBACK (action_rename_callback) },
+  /* name, stock id */         { "RenameSelectAll", NULL,
+  /* label, accelerator */       "RenameSelectAll", "<shift>F2",
+  /* tooltip */                  NULL,
+                                 G_CALLBACK (action_rename_select_all_callback) },
+  /* name, stock id */         { "Trash", NAUTILUS_ICON_TRASH,
+  /* label, accelerator */       N_("Mo_ve to Trash"), "<control>T",
+  /* tooltip */                  N_("Move each selected item to the Trash"),
+                                 G_CALLBACK (action_trash_callback) },
+  /* name, stock id */         { "Delete", NULL,
+  /* label, accelerator */       N_("_Delete"), "<shift>Delete",
+  /* tooltip */                  N_("Delete each selected item, without moving to the Trash"),
+                                 G_CALLBACK (action_delete_callback) },
+  /* name, stock id */         { "Reset to Defaults", NULL,
+  /* label, accelerator */       N_("Reset View to _Defaults"), NULL,
+  /* tooltip */                  N_("Reset sorting order and zoom level to match preferences for this view"),
+                                 G_CALLBACK (action_reset_to_defaults_callback) },
+  /* name, stock id */         { "Connect To Server Link", NULL,
+  /* label, accelerator */       N_("Connect To This Server"), NULL,
+  /* tooltip */                  N_("Make a permanent connection to this server"),
+                                 G_CALLBACK (action_connect_to_server_link_callback) },
+  /* name, stock id */         { "Mount Volume", NULL,
+  /* label, accelerator */       N_("_Mount Volume"), NULL,
+  /* tooltip */                  N_("Mount the selected volume"),
+                                 G_CALLBACK (action_mount_volume_callback) },
+  /* name, stock id */         { "Unmount Volume", NULL,
+  /* label, accelerator */       N_("_Unmount Volume"), NULL,
+  /* tooltip */                  N_("Unmount the selected volume"),
+                                 G_CALLBACK (action_unmount_volume_callback) },
+  /* name, stock id */         { "Eject Volume", NULL,
+  /* label, accelerator */       N_("_Eject"), NULL,
+  /* tooltip */                  N_("Eject the selected volume"),
+                                 G_CALLBACK (action_eject_volume_callback) },
+  /* name, stock id */         { "Format Volume", NULL,
+  /* label, accelerator */       N_("_Format"), NULL,
+  /* tooltip */                  N_("Format the selected volume"),
+                                 G_CALLBACK (action_format_volume_callback) },
+  /* name, stock id */         { "Self Mount Volume", NULL,
+  /* label, accelerator */       N_("_Mount Volume"), NULL,
+  /* tooltip */                  N_("Mount the volume associated with the open folder"),
+                                 G_CALLBACK (action_self_mount_volume_callback) },
+  /* name, stock id */         { "Self Unmount Volume", NULL,
+  /* label, accelerator */       N_("_Unmount Volume"), NULL,
+  /* tooltip */                  N_("Unmount the volume associated with the open folder"),
+                                 G_CALLBACK (action_self_unmount_volume_callback) },
+  /* name, stock id */         { "Self Eject Volume", NULL,
+  /* label, accelerator */       N_("_Eject"), NULL,
+  /* tooltip */                  N_("Eject the volume associated with the open folder"),
+                                 G_CALLBACK (action_self_eject_volume_callback) },
+  /* name, stock id */         { "Self Format Volume", NULL,
+  /* label, accelerator */       N_("_Format"), NULL,
+  /* tooltip */                  N_("Format the volume associated with the open folder"),
+                                 G_CALLBACK (action_self_format_volume_callback) },
+  /* name, stock id */         { "OpenCloseParent", NULL,
+  /* label, accelerator */       N_("Open File and Close window"), "<alt><shift>Down",
+  /* tooltip */                  NULL,
+                                 G_CALLBACK (action_open_close_parent_callback) },
+  /* name, stock id */         { "Save Search", NULL,
+  /* label, accelerator */       N_("Sa_ve Search"), NULL,
+  /* tooltip */                  N_("Save the edited search"),
+                                 G_CALLBACK (action_save_search_callback) },
+  /* name, stock id */         { "Save Search As", NULL,
+  /* label, accelerator */       N_("Sa_ve Search As..."), NULL,
+  /* tooltip */                  N_("Save the current search as a file"),
+                                 G_CALLBACK (action_save_search_as_callback) },
 
   /* Location-specific actions */
-  { FM_ACTION_LOCATION_OPEN_ALTERNATE, NULL,                  /* name, stock id */
-    N_("Open in Navigation Window"), "",                /* label, accelerator */
-    N_("Open this folder in a navigation window"),                   /* tooltip */ 
-    G_CALLBACK (action_location_open_alternate_callback) },
-
-  { FM_ACTION_LOCATION_OPEN_FOLDER_WINDOW, NULL,                  /* name, stock id */
-    N_("Open in Folder Window"), "",                /* label, accelerator */
-    N_("Open this folder in a folder window"),                   /* tooltip */ 
-    G_CALLBACK (action_location_open_folder_window_callback) },
-
-  { FM_ACTION_LOCATION_CUT, GTK_STOCK_CUT,                  /* name, stock id */
-    NULL, "",                /* label, accelerator */
-    N_("Prepare this folder to be moved with a Paste command"),                   /* tooltip */ 
-    G_CALLBACK (action_location_cut_callback) },
-  { FM_ACTION_LOCATION_COPY, GTK_STOCK_COPY,                  /* name, stock id */
-    NULL, "",                /* label, accelerator */
-    N_("Prepare this folder to be copied with a Paste command"),                   /* tooltip */ 
-    G_CALLBACK (action_location_copy_callback) },
-
-  { FM_ACTION_LOCATION_TRASH, NAUTILUS_ICON_TRASH,                  /* name, stock id */
-    N_("Mo_ve to Trash"), "",                /* label, accelerator */
-    N_("Move this folder to the Trash"),                   /* tooltip */ 
-    G_CALLBACK (action_location_trash_callback) },
-  { FM_ACTION_LOCATION_DELETE, NULL,                  /* name, stock id */
-    N_("_Delete"), "",                /* label, accelerator */
-    N_("Delete this folder, without moving to the Trash"),                   /* tooltip */ 
-    G_CALLBACK (action_location_delete_callback) },
+  /* name, stock id */         { FM_ACTION_LOCATION_OPEN_ALTERNATE, NULL,
+  /* label, accelerator */       N_("Open in Navigation Window"), "",
+  /* tooltip */                  N_("Open this folder in a navigation window"),
+                                 G_CALLBACK (action_location_open_alternate_callback) },
+
+  /* name, stock id */         { FM_ACTION_LOCATION_OPEN_FOLDER_WINDOW, NULL,
+  /* label, accelerator */       N_("Open in Folder Window"), "",
+  /* tooltip */                  N_("Open this folder in a folder window"),
+                                 G_CALLBACK (action_location_open_folder_window_callback) },
+
+  /* name, stock id */         { FM_ACTION_LOCATION_CUT, GTK_STOCK_CUT,
+  /* label, accelerator */       NULL, "",
+  /* tooltip */                  N_("Prepare this folder to be moved with a Paste command"),
+                                 G_CALLBACK (action_location_cut_callback) },
+  /* name, stock id */         { FM_ACTION_LOCATION_COPY, GTK_STOCK_COPY,
+  /* label, accelerator */       NULL, "",
+  /* tooltip */                  N_("Prepare this folder to be copied with a Paste command"),
+                                 G_CALLBACK (action_location_copy_callback) },
+
+  /* name, stock id */         { FM_ACTION_LOCATION_TRASH, NAUTILUS_ICON_TRASH,
+  /* label, accelerator */       N_("Mo_ve to Trash"), "",
+  /* tooltip */                  N_("Move this folder to the Trash"),
+                                 G_CALLBACK (action_location_trash_callback) },
+  /* name, stock id */         { FM_ACTION_LOCATION_DELETE, NULL,
+  /* label, accelerator */       N_("_Delete"), "",
+  /* tooltip */                  N_("Delete this folder, without moving to the Trash"),
+                                 G_CALLBACK (action_location_delete_callback) },
 };
 
 static const GtkToggleActionEntry directory_view_toggle_entries[] = {
-  { "Show Hidden Files", NULL,                  /* name, stock id */
-    N_("Show _Hidden Files"), "<control>H",                /* label, accelerator */
-    N_("Toggle the display of hidden files in the current window"),                   /* tooltip */ 
-    G_CALLBACK (action_show_hidden_files_callback),
-    TRUE },
+  /* name, stock id */         { "Show Hidden Files", NULL,
+  /* label, accelerator */       N_("Show _Hidden Files"), "<control>H",
+  /* tooltip */                  N_("Toggle the display of hidden files in the current window"),
+                                 G_CALLBACK (action_show_hidden_files_callback),
+                                 TRUE },
 };
 
 static void
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 321b397cb..f3024e685 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -1421,37 +1421,37 @@ fm_icon_view_start_renaming_file (FMDirectoryView *view,
 }
 
 static const GtkActionEntry icon_view_entries[] = {
-  { "Arrange Items", NULL, N_("Arran_ge Items") }, /* name, stock id, label */
-  { "Stretch", NULL,                               /* name, stock id */
-    N_("Str_etch Icon"), NULL,                     /* label, accelerator */
-    N_("Make the selected icon stretchable"),      /* tooltip */ 
-    G_CALLBACK (action_stretch_callback) },
-  { "Unstretch", NULL,                               /* name, stock id */
-    N_("Restore Icons' Original Si_zes"), NULL,                     /* label, accelerator */
-    N_("Restore each selected icon to its original size"),      /* tooltip */ 
-    G_CALLBACK (action_unstretch_callback) },
-  { "Clean Up", NULL,                               /* name, stock id */
-    N_("Clean _Up by Name"), NULL,                     /* label, accelerator */
-    N_("Reposition icons to better fit in the window and avoid overlapping"),      /* tooltip */ 
-    G_CALLBACK (action_clean_up_callback) },
+  /* name, stock id, label */  { "Arrange Items", NULL, N_("Arran_ge Items") }, 
+  /* name, stock id */         { "Stretch", NULL,
+  /* label, accelerator */       N_("Str_etch Icon"), NULL,
+  /* tooltip */                  N_("Make the selected icon stretchable"),
+                                 G_CALLBACK (action_stretch_callback) },
+  /* name, stock id */         { "Unstretch", NULL,
+  /* label, accelerator */       N_("Restore Icons' Original Si_zes"), NULL,
+  /* tooltip */                  N_("Restore each selected icon to its original size"),
+                                 G_CALLBACK (action_unstretch_callback) },
+  /* name, stock id */         { "Clean Up", NULL,
+  /* label, accelerator */       N_("Clean _Up by Name"), NULL,
+  /* tooltip */                  N_("Reposition icons to better fit in the window and avoid overlapping"),
+                                 G_CALLBACK (action_clean_up_callback) },
 };
 
 static const GtkToggleActionEntry icon_view_toggle_entries[] = {
-  { "Tighter Layout", NULL,                               /* name, stock id */
-    N_("Compact _Layout"), NULL,                     /* label, accelerator */
-    N_("Toggle using a tighter layout scheme"),      /* tooltip */ 
-    G_CALLBACK (action_tighter_layout_callback),
-    0 },
-  { "Reversed Order", NULL,                               /* name, stock id */
-    N_("Re_versed Order"), NULL,                     /* label, accelerator */
-    N_("Display icons in the opposite order"),      /* tooltip */ 
-    G_CALLBACK (action_reversed_order_callback),
-    0 },
-  { "Keep Aligned", NULL,                               /* name, stock id */
-    N_("_Keep Aligned"), NULL,                     /* label, accelerator */
-    N_("Keep icons lined up on a grid"),      /* tooltip */ 
-    G_CALLBACK (action_keep_aligned_callback),
-    0 },
+  /* name, stock id */      { "Tighter Layout", NULL,
+  /* label, accelerator */    N_("Compact _Layout"), NULL,
+  /* tooltip */               N_("Toggle using a tighter layout scheme"),
+                              G_CALLBACK (action_tighter_layout_callback),
+                              0 },
+  /* name, stock id */      { "Reversed Order", NULL,
+  /* label, accelerator */    N_("Re_versed Order"), NULL,
+  /* tooltip */               N_("Display icons in the opposite order"),
+                              G_CALLBACK (action_reversed_order_callback),
+                              0 },
+  /* name, stock id */      { "Keep Aligned", NULL,
+  /* label, accelerator */    N_("_Keep Aligned"), NULL,
+  /* tooltip */               N_("Keep icons lined up on a grid"),
+                              G_CALLBACK (action_keep_aligned_callback),
+                              0 },
 };
 
 static const GtkRadioActionEntry arrange_radio_entries[] = {
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 2e9ea8b0b..48a0be30e 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -2091,10 +2091,10 @@ action_visible_columns_callback (GtkAction *action,
 }
 
 static const GtkActionEntry list_view_entries[] = {
-  { "Visible Columns", NULL,                  /* name, stock id */
-    N_("Visible _Columns..."), NULL,                /* label, accelerator */
-    N_("Select the columns visible in this folder"),                   /* tooltip */ 
-    G_CALLBACK (action_visible_columns_callback) },
+  /* name, stock id */     { "Visible Columns", NULL,
+  /* label, accelerator */   N_("Visible _Columns..."), NULL,
+  /* tooltip */              N_("Select the columns visible in this folder"),
+                             G_CALLBACK (action_visible_columns_callback) },
 };
 
 static void
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 2ab18bec2..3d9e445fc 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -470,56 +470,56 @@ action_search_callback (GtkAction *action,
 }
 
 static const GtkActionEntry navigation_entries[] = {
-  { "Go", NULL, N_("_Go") },               /* name, stock id, label */
-  { "Bookmarks", NULL, N_("_Bookmarks") },               /* name, stock id, label */
-  { "New Window", "window-new", N_("New _Window"),               /* name, stock id, label */
-    "<control>N", N_("Open another Nautilus window for the displayed location"),
-    G_CALLBACK (action_new_window_callback) },
-  { "Folder Window", "folder", N_("Open Folder W_indow"),               /* name, stock id, label */
-    NULL, N_("Open a folder window for the displayed location"),
-    G_CALLBACK (action_folder_window_callback) },
-  { "Close All Windows", NULL, N_("Close _All Windows"),               /* name, stock id, label */
-    "<control><shift>W", N_("Close all Navigation windows"),
-    G_CALLBACK (action_close_all_windows_callback) },
-  { "Go to Location", NULL, N_("_Location..."), /* name, stock id, label */
-    "<control>L", N_("Specify a location to open"),
-    G_CALLBACK (action_go_to_location_callback) },
-  { "Clear History", NULL, N_("Clea_r History"), /* name, stock id, label */
-    NULL, N_("Clear contents of Go menu and Back/Forward lists"),
-    G_CALLBACK (action_clear_history_callback) },
-  { "Add Bookmark", GTK_STOCK_ADD, N_("_Add Bookmark"), /* name, stock id, label */
-    "<control>d", N_("Add a bookmark for the current location to this menu"),
-    G_CALLBACK (action_add_bookmark_callback) },
-  { "Edit Bookmarks", NULL, N_("_Edit Bookmarks"), /* name, stock id, label */
-    "<control>b", N_("Display a window that allows editing the bookmarks in this menu"),
-    G_CALLBACK (action_edit_bookmarks_callback) },
-  { "Search", "gtk-find", N_("_Search for Files..."), /* name, stock id, label */
-    "<control>F", N_("Locate documents and folders on this computer by name or content"),
-    G_CALLBACK (action_search_callback) },
+  /* name, stock id, label */  { "Go", NULL, N_("_Go") },
+  /* name, stock id, label */  { "Bookmarks", NULL, N_("_Bookmarks") },
+  /* name, stock id, label */  { "New Window", "window-new", N_("New _Window"),
+                                 "<control>N", N_("Open another Nautilus window for the displayed location"),
+                                 G_CALLBACK (action_new_window_callback) },
+  /* name, stock id, label */  { "Folder Window", "folder", N_("Open Folder W_indow"),
+                                 NULL, N_("Open a folder window for the displayed location"),
+                                 G_CALLBACK (action_folder_window_callback) },
+  /* name, stock id, label */  { "Close All Windows", NULL, N_("Close _All Windows"),
+                                 "<control><shift>W", N_("Close all Navigation windows"),
+                                 G_CALLBACK (action_close_all_windows_callback) },
+  /* name, stock id, label */  { "Go to Location", NULL, N_("_Location..."),
+                                 "<control>L", N_("Specify a location to open"),
+                                 G_CALLBACK (action_go_to_location_callback) },
+  /* name, stock id, label */  { "Clear History", NULL, N_("Clea_r History"),
+                                 NULL, N_("Clear contents of Go menu and Back/Forward lists"),
+                                 G_CALLBACK (action_clear_history_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"),
+                                 G_CALLBACK (action_add_bookmark_callback) },
+  /* name, stock id, label */  { "Edit Bookmarks", NULL, N_("_Edit Bookmarks"),
+                                 "<control>b", N_("Display a window that allows editing the bookmarks in this menu"),
+                                 G_CALLBACK (action_edit_bookmarks_callback) },
+  /* name, stock id, label */  { "Search", "gtk-find", N_("_Search for Files..."),
+                                 "<control>F", N_("Locate documents and folders on this computer by name or content"),
+                                 G_CALLBACK (action_search_callback) },
 		     
 };
 
 static const GtkToggleActionEntry navigation_toggle_entries[] = {
-  { "Show Hide Toolbar", NULL,                 /* name, stock id */
-    N_("_Main Toolbar"), NULL,                    /* label, accelerator */     
-    N_("Change the visibility of this window's main toolbar"),                       /* tooltip */
-    G_CALLBACK (action_show_hide_toolbar_callback),
-    TRUE}, /* is_active */
-  { "Show Hide Sidebar", NULL,                 /* name, stock id */
-    N_("_Side Pane"), "F9",                    /* label, accelerator */     
-    N_("Change the visibility of this window's side pane"),                       /* tooltip */
-    G_CALLBACK (action_show_hide_sidebar_callback),
-    TRUE}, /* is_active */
-  { "Show Hide Location Bar", NULL,                 /* name, stock id */
-    N_("Location _Bar"), NULL,                    /* label, accelerator */     
-    N_("Change the visibility of this window's location bar"),                    /* tooltip */
-    G_CALLBACK (action_show_hide_location_bar_callback),
-    TRUE},                                    /* is_active */
-  { "Show Hide Statusbar", NULL,                 /* name, stock id */
-    N_("St_atusbar"), NULL,                    /* label, accelerator */     
-    N_("Change the visibility of this window's statusbar"),                    /* tooltip */
-    G_CALLBACK (action_show_hide_statusbar_callback),
-    TRUE},                                    /* is_active */
+  /* name, stock id */     { "Show Hide Toolbar", NULL,
+  /* label, accelerator */   N_("_Main Toolbar"), NULL,
+  /* tooltip */              N_("Change the visibility of this window's main toolbar"),
+                             G_CALLBACK (action_show_hide_toolbar_callback),
+  /* is_active */            TRUE }, 
+  /* name, stock id */     { "Show Hide Sidebar", NULL,
+  /* label, accelerator */   N_("_Side Pane"), "F9",
+  /* tooltip */              N_("Change the visibility of this window's side pane"),
+                             G_CALLBACK (action_show_hide_sidebar_callback),
+  /* is_active */            TRUE }, 
+  /* name, stock id */     { "Show Hide Location Bar", NULL,
+  /* label, accelerator */   N_("Location _Bar"), NULL,
+  /* tooltip */              N_("Change the visibility of this window's location bar"),
+                             G_CALLBACK (action_show_hide_location_bar_callback),
+  /* is_active */            TRUE }, 
+  /* name, stock id */     { "Show Hide Statusbar", NULL,
+  /* label, accelerator */   N_("St_atusbar"), NULL,
+  /* tooltip */              N_("Change the visibility of this window's statusbar"),
+                             G_CALLBACK (action_show_hide_statusbar_callback),
+  /* is_active */            TRUE }, 
 };
 
 void 
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 5093bc8d1..38b173fa4 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -878,25 +878,25 @@ action_search_callback (GtkAction *action,
 }
 
 static const GtkActionEntry spatial_entries[] = {
-  { SPATIAL_ACTION_PLACES, NULL, N_("_Places") },               /* name, stock id, label */
-  { SPATIAL_ACTION_GO_TO_LOCATION, NULL, N_("Open _Location..."), /* name, stock id, label */
-    "<control>L", N_("Specify a location to open"),
-    G_CALLBACK (action_go_to_location_callback) },
-  { SPATIAL_ACTION_CLOSE_PARENT_FOLDERS, NULL, N_("Close P_arent Folders"), /* name, stock id, label */
-    "<control><shift>W", N_("Close this folder's parents"),
-    G_CALLBACK (action_close_parent_folders_callback) },
-  { SPATIAL_ACTION_CLOSE_ALL_FOLDERS, NULL, N_("Clos_e All Folders"), /* name, stock id, label */
-    "<control>Q", N_("Close all folder windows"),
-    G_CALLBACK (action_close_all_folders_callback) },
-  { "Add Bookmark", GTK_STOCK_ADD, N_("_Add Bookmark"), /* name, stock id, label */
-    "<control>d", N_("Add a bookmark for the current location to this menu"),
-    G_CALLBACK (action_add_bookmark_callback) },
-  { "Edit Bookmarks", NULL, N_("_Edit Bookmarks"), /* name, stock id, label */
-    "<control>b", N_("Display a window that allows editing the bookmarks in this menu"),
-    G_CALLBACK (action_edit_bookmarks_callback) },
-  { "Search", "gtk-find", N_("_Search for Files..."), /* name, stock id, label */
-    "<control>F", N_("Locate documents and folders on this computer by name or content"),
-    G_CALLBACK (action_search_callback) },
+  /* name, stock id, label */  { SPATIAL_ACTION_PLACES, NULL, N_("_Places") },
+  /* name, stock id, label */  { SPATIAL_ACTION_GO_TO_LOCATION, NULL, N_("Open _Location..."),
+                                 "<control>L", N_("Specify a location to open"),
+                                 G_CALLBACK (action_go_to_location_callback) },
+  /* name, stock id, label */  { SPATIAL_ACTION_CLOSE_PARENT_FOLDERS, NULL, N_("Close P_arent Folders"),
+                                 "<control><shift>W", N_("Close this folder's parents"),
+                                 G_CALLBACK (action_close_parent_folders_callback) },
+  /* name, stock id, label */  { SPATIAL_ACTION_CLOSE_ALL_FOLDERS, NULL, N_("Clos_e All Folders"), 
+                                 "<control>Q", N_("Close all folder windows"),
+                                 G_CALLBACK (action_close_all_folders_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"),
+                                 G_CALLBACK (action_add_bookmark_callback) },
+  /* name, stock id, label */  { "Edit Bookmarks", NULL, N_("_Edit Bookmarks"),
+                                 "<control>b", N_("Display a window that allows editing the bookmarks in this menu"),
+                                 G_CALLBACK (action_edit_bookmarks_callback) },
+  /* name, stock id, label */  { "Search", "gtk-find", N_("_Search for Files..."),
+                                 "<control>F", N_("Locate documents and folders on this computer by name or content"),
+                                 G_CALLBACK (action_search_callback) },
 };
 
 static void
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index e13a7bf23..de660ba9c 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -595,101 +595,101 @@ connect_proxy_cb (GtkUIManager *manager,
 }
 
 static const GtkActionEntry main_entries[] = {
-  { "File", NULL, N_("_File") },               /* name, stock id, label */
-  { "Edit", NULL, N_("_Edit") },               /* name, stock id, label */
-  { "View", NULL, N_("_View") },               /* name, stock id, label */
-  { "Help", NULL, N_("_Help") },               /* name, stock id, label */
-  { "Close", GTK_STOCK_CLOSE,                  /* name, stock id */
-    N_("_Close"), "<control>W",                /* label, accelerator */
-    N_("Close this folder"),                   /* tooltip */ 
-    G_CALLBACK (action_close_window_callback) },
-  { "Backgrounds and Emblems", NULL,
-    N_("_Backgrounds and Emblems..."),               
-    NULL, N_("Display patterns, colors, and emblems that can be used to customize appearance"),
-    G_CALLBACK (action_backgrounds_and_emblems_callback) },
-  { "Preferences", GTK_STOCK_PREFERENCES,
-    N_("Prefere_nces"),               
-    NULL, N_("Edit Nautilus preferences"),
-    G_CALLBACK (action_preferences_callback) },
-  { "Undo", NULL, N_("_Undo"),               /* name, stock id, label */
-    "<control>Z", N_("Undo the last text change"),
-    G_CALLBACK (action_undo_callback) },
-  { "Up", GTK_STOCK_GO_UP, N_("Open _Parent"),               /* name, stock id, label */
-    "<alt>Up", N_("Open the parent folder"),
-    G_CALLBACK (action_up_callback) },
-  { "UpAccel", NULL, "UpAccel",               /* name, stock id, label */
-    "", NULL,
-    G_CALLBACK (action_up_callback) },
-  { "Stop", GTK_STOCK_STOP,                        /* name, stock id */
-    N_("_Stop"), NULL,           /* label, accelerator */
-    N_("Stop loading the current location"), /* tooltip */
-    G_CALLBACK (action_stop_callback) },
-  { "Reload", GTK_STOCK_REFRESH,                        /* name, stock id */
-    N_("_Reload"), "<control>R",           /* label, accelerator */
-    N_("Reload the current location"),     /* tooltip */
-    G_CALLBACK (action_reload_callback) },
-  { "Nautilus Manual", GTK_STOCK_HELP,                        /* name, stock id */
-    N_("_Contents"), "F1",           /* label, accelerator */
-    N_("Display Nautilus help"),                                      /* tooltip */ 
-    G_CALLBACK (action_nautilus_manual_callback) },
-  { "About Nautilus", GTK_STOCK_ABOUT,                        /* name, stock id */
-    N_("_About"), NULL,           /* label, accelerator */
-    N_("Display credits for the creators of Nautilus"),                                      /* tooltip */ 
-    G_CALLBACK (action_about_nautilus_callback) },
-  { "Zoom In", GTK_STOCK_ZOOM_IN,                        /* name, stock id */
-    N_("Zoom _In"), "<control>plus",           /* label, accelerator */
-    N_("Show the contents in more detail"),                                      /* tooltip */ 
-    G_CALLBACK (action_zoom_in_callback) },
-  { "ZoomInAccel", NULL,                        /* name, stock id */
-    "ZoomInAccel", "<control>equal",           /* label, accelerator */
-    NULL,                                      /* tooltip */ 
-    G_CALLBACK (action_zoom_in_callback) },
-  { "ZoomInAccel2", NULL,                        /* name, stock id */
-    "ZoomInAccel2", "<control>KP_Add",           /* label, accelerator */
-    NULL,                                      /* tooltip */ 
-    G_CALLBACK (action_zoom_in_callback) },
-  { "Zoom Out", GTK_STOCK_ZOOM_OUT,                        /* name, stock id */
-    N_("Zoom _Out"), "<control>minus",           /* label, accelerator */
-    N_("Show the contents in less detail"),                                      /* tooltip */ 
-    G_CALLBACK (action_zoom_out_callback) },
-  { "ZoomOutAccel", NULL,                        /* name, stock id */
-    "ZoomOutAccel", "<control>KP_Subtract",           /* label, accelerator */
-    NULL,                                      /* tooltip */ 
-    G_CALLBACK (action_zoom_out_callback) },
-  { "Zoom Normal", GTK_STOCK_ZOOM_100,                        /* name, stock id */
-    N_("Normal Si_ze"), "<control>0",           /* label, accelerator */
-    N_("Show the contents at the normal size"),                                      /* tooltip */ 
-    G_CALLBACK (action_zoom_normal_callback) },
+  /* name, stock id, label */  { "File", NULL, N_("_File") },
+  /* name, stock id, label */  { "Edit", NULL, N_("_Edit") },
+  /* name, stock id, label */  { "View", NULL, N_("_View") },
+  /* name, stock id, label */  { "Help", NULL, N_("_Help") },
+  /* name, stock id */         { "Close", GTK_STOCK_CLOSE,
+  /* label, accelerator */       N_("_Close"), "<control>W",
+  /* tooltip */                  N_("Close this folder"),
+                                 G_CALLBACK (action_close_window_callback) },
+                               { "Backgrounds and Emblems", NULL,
+                                 N_("_Backgrounds and Emblems..."),               
+                                 NULL, N_("Display patterns, colors, and emblems that can be used to customize appearance"),
+                                 G_CALLBACK (action_backgrounds_and_emblems_callback) },
+                               { "Preferences", GTK_STOCK_PREFERENCES,
+                                 N_("Prefere_nces"),               
+                                 NULL, N_("Edit Nautilus preferences"),
+                                 G_CALLBACK (action_preferences_callback) },
+  /* name, stock id, label */  { "Undo", NULL, N_("_Undo"),
+                                 "<control>Z", N_("Undo the last text change"),
+                                 G_CALLBACK (action_undo_callback) },
+  /* name, stock id, label */  { "Up", GTK_STOCK_GO_UP, N_("Open _Parent"),
+                                 "<alt>Up", N_("Open the parent folder"),
+                                 G_CALLBACK (action_up_callback) },
+  /* name, stock id, label */  { "UpAccel", NULL, "UpAccel",
+                                 "", NULL,
+                                 G_CALLBACK (action_up_callback) },
+  /* name, stock id */         { "Stop", GTK_STOCK_STOP,
+  /* label, accelerator */       N_("_Stop"), NULL,
+  /* tooltip */                  N_("Stop loading the current location"),
+                                 G_CALLBACK (action_stop_callback) },
+  /* name, stock id */         { "Reload", GTK_STOCK_REFRESH,
+  /* label, accelerator */       N_("_Reload"), "<control>R",
+  /* tooltip */                  N_("Reload the current location"),
+                                 G_CALLBACK (action_reload_callback) },
+  /* name, stock id */         { "Nautilus Manual", GTK_STOCK_HELP,
+  /* label, accelerator */       N_("_Contents"), "F1",
+  /* tooltip */                  N_("Display Nautilus help"),
+                                 G_CALLBACK (action_nautilus_manual_callback) },
+  /* name, stock id */         { "About Nautilus", GTK_STOCK_ABOUT,
+  /* label, accelerator */       N_("_About"), NULL,
+  /* tooltip */                  N_("Display credits for the creators of Nautilus"),
+                                 G_CALLBACK (action_about_nautilus_callback) },
+  /* name, stock id */         { "Zoom In", GTK_STOCK_ZOOM_IN,
+  /* label, accelerator */       N_("Zoom _In"), "<control>plus",
+  /* tooltip */                  N_("Show the contents in more detail"),
+                                 G_CALLBACK (action_zoom_in_callback) },
+  /* name, stock id */         { "ZoomInAccel", NULL,
+  /* label, accelerator */       "ZoomInAccel", "<control>equal",
+  /* tooltip */                  NULL,
+                                 G_CALLBACK (action_zoom_in_callback) },
+  /* name, stock id */         { "ZoomInAccel2", NULL,
+  /* label, accelerator */       "ZoomInAccel2", "<control>KP_Add",
+  /* tooltip */                  NULL,
+                                 G_CALLBACK (action_zoom_in_callback) },
+  /* name, stock id */         { "Zoom Out", GTK_STOCK_ZOOM_OUT,
+  /* label, accelerator */       N_("Zoom _Out"), "<control>minus",
+  /* tooltip */                  N_("Show the contents in less detail"),
+                                 G_CALLBACK (action_zoom_out_callback) },
+  /* name, stock id */         { "ZoomOutAccel", NULL,
+  /* label, accelerator */       "ZoomOutAccel", "<control>KP_Subtract",
+  /* tooltip */                  NULL,
+                                 G_CALLBACK (action_zoom_out_callback) },
+  /* name, stock id */         { "Zoom Normal", GTK_STOCK_ZOOM_100,
+  /* label, accelerator */       N_("Normal Si_ze"), "<control>0",
+  /* tooltip */                  N_("Show the contents at the normal size"),
+                                 G_CALLBACK (action_zoom_normal_callback) },
 #ifdef GIO_CONVERSION_DONE
-  { "Connect to Server", NULL,                        /* name, stock id */
-    N_("Connect to _Server..."), NULL,           /* label, accelerator */
-    N_("Connect to a remote computer or shared disk"),                                      /* tooltip */ 
-    G_CALLBACK (action_connect_to_server_callback) },
+  /* name, stock id */         { "Connect to Server", NULL, 
+  /* label, accelerator */       N_("Connect to _Server..."), NULL,
+  /* tooltip */                  N_("Connect to a remote computer or shared disk"),
+                                 G_CALLBACK (action_connect_to_server_callback) },
 #endif
-  { "Home", NAUTILUS_ICON_HOME,                        /* name, stock id */
-    N_("_Home Folder"), "<alt>Home",           /* label, accelerator */
-    N_("Open your personal folder"),                                  /* tooltip */ 
-    G_CALLBACK (action_home_callback) },
-  { "Go to Computer", NAUTILUS_ICON_COMPUTER,                        /* name, stock id */
-    N_("_Computer"), NULL,           /* label, accelerator */
-    N_("Browse all local and remote disks and folders accessible from this computer"),                                  /* tooltip */ 
-    G_CALLBACK (action_go_to_computer_callback) },
-  { "Go to Network", NAUTILUS_ICON_NETWORK,                        /* name, stock id */
-    N_("_Network"), NULL,           /* label, accelerator */
-    N_("Browse bookmarked and local network locations"),                                  /* tooltip */ 
-    G_CALLBACK (action_go_to_network_callback) },
-  { "Go to Templates", NAUTILUS_ICON_TEMPLATE,                        /* name, stock id */
-    N_("T_emplates"), NULL,           /* label, accelerator */
-    N_("Open your personal templates folder"),                                  /* tooltip */ 
-    G_CALLBACK (action_go_to_templates_callback) },
-  { "Go to Trash", NAUTILUS_ICON_TRASH,                        /* name, stock id */
-    N_("_Trash"), NULL,           /* label, accelerator */
-    N_("Open your personal trash folder"),                                  /* tooltip */ 
-    G_CALLBACK (action_go_to_trash_callback) },
-  { "Go to Burn CD", NAUTILUS_ICON_BURN,                        /* name, stock id */
-    N_("CD/_DVD Creator"), NULL,           /* label, accelerator */
-    N_("Open a folder into which you can drag files to burn to a CD or DVD"),                                  /* tooltip */ 
-    G_CALLBACK (action_go_to_burn_cd_callback) },
+  /* name, stock id */         { "Home", NAUTILUS_ICON_HOME,
+  /* label, accelerator */       N_("_Home Folder"), "<alt>Home",
+  /* tooltip */                  N_("Open your personal folder"),
+                                 G_CALLBACK (action_home_callback) },
+  /* name, stock id */         { "Go to Computer", NAUTILUS_ICON_COMPUTER,
+  /* label, accelerator */       N_("_Computer"), NULL,
+  /* tooltip */                  N_("Browse all local and remote disks and folders accessible from this computer"),
+                                 G_CALLBACK (action_go_to_computer_callback) },
+  /* name, stock id */         { "Go to Network", NAUTILUS_ICON_NETWORK,
+  /* label, accelerator */       N_("_Network"), NULL,
+  /* tooltip */                  N_("Browse bookmarked and local network locations"),
+                                 G_CALLBACK (action_go_to_network_callback) },
+  /* name, stock id */         { "Go to Templates", NAUTILUS_ICON_TEMPLATE,
+  /* label, accelerator */       N_("T_emplates"), NULL,
+  /* tooltip */                  N_("Open your personal templates folder"),
+                                 G_CALLBACK (action_go_to_templates_callback) },
+  /* name, stock id */         { "Go to Trash", NAUTILUS_ICON_TRASH,
+  /* label, accelerator */       N_("_Trash"), NULL,
+  /* tooltip */                  N_("Open your personal trash folder"),
+                                 G_CALLBACK (action_go_to_trash_callback) },
+  /* name, stock id */         { "Go to Burn CD", NAUTILUS_ICON_BURN,
+  /* label, accelerator */       N_("CD/_DVD Creator"), NULL,
+  /* tooltip */                  N_("Open a folder into which you can drag files to burn to a CD or DVD"),
+                                 G_CALLBACK (action_go_to_burn_cd_callback) },
 };
 
 /**