Index: libnautilus-private/nautilus-desktop-link-monitor.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-desktop-link-monitor.c,v
retrieving revision 1.15
diff -u -p -r1.15 nautilus-desktop-link-monitor.c
--- libnautilus-private/nautilus-desktop-link-monitor.c10 Dec 2005 02:40:34 -00001.15
+++ libnautilus-private/nautilus-desktop-link-monitor.c16 Dec 2005 13:49:45 -0000
@@ -124,7 +124,7 @@ volume_delete_dialog (GtkWidget *parent_
  dialog_str,
  _("If you want to eject the volume, please use \"Eject\" in the "
    "popup menu of the volume."),
- NULL, GTK_STOCK_OK, NULL);
+ GTK_STOCK_OK, NULL);
 } else {
 eel_run_simple_dialog
 (parent_view, 
@@ -133,7 +133,7 @@ volume_delete_dialog (GtkWidget *parent_
  dialog_str,
  _("If you want to unmount the volume, please use \"Unmount Volume\" in the "
    "popup menu of the volume."),
- NULL, GTK_STOCK_OK, NULL);
+ GTK_STOCK_OK, NULL);
 }
 
 gnome_vfs_volume_unref (volume);
Index: libnautilus-private/nautilus-file-operations.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file-operations.c,v
retrieving revision 1.202
diff -u -p -r1.202 nautilus-file-operations.c
--- libnautilus-private/nautilus-file-operations.c9 Dec 2005 14:35:32 -00001.202
+++ libnautilus-private/nautilus-file-operations.c16 Dec 2005 13:49:46 -0000
@@ -1140,8 +1140,10 @@ handle_transfer_overwrite (const GnomeVF
    "to copy the item, rename it and try again.");
 }
 
-eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, GTK_MESSAGE_ERROR, primary_text, secondary_text,
-       _("Unable to Replace File"), GTK_STOCK_OK, NULL, NULL);
+eel_run_simple_dialog (parent_for_error_dialog (transfer_info),
+       TRUE, GTK_MESSAGE_ERROR,
+       primary_text, secondary_text,
+       GTK_STOCK_OK, NULL);
 
 g_free (primary_text);
 g_free (formatted_name);
@@ -1183,7 +1185,6 @@ handle_transfer_overwrite (const GnomeVF
  GTK_MESSAGE_QUESTION, 
  text, 
  secondary_text, 
- _("Conflict While Copying"),
  _("_Skip"), _("_Replace"), NULL);
 g_free (text); 
 
@@ -1202,7 +1203,6 @@ handle_transfer_overwrite (const GnomeVF
 result = eel_run_simple_dialog
 (parent_for_error_dialog (transfer_info), TRUE, GTK_MESSAGE_QUESTION, text, 
  secondary_text, 
- _("Conflict While Copying"),
  _("S_kip All"), _("Replace _All"), _("_Skip"), _("_Replace"), NULL);
 g_free (text);
 
@@ -2078,7 +2079,6 @@ nautilus_file_operations_copy_move (cons
  ? _("You cannot copy items into the trash.")
  : _("You cannot create links inside the trash."),
  _("Files and folders can only be moved into the trash."), 
- NULL,
  GTK_STOCK_OK, NULL);
 result = GNOME_VFS_ERROR_NOT_PERMITTED;
 }
@@ -2104,9 +2104,6 @@ nautilus_file_operations_copy_move (cons
  ? _("You cannot move this trash folder.")
  : _("You cannot copy this trash folder."),
  _("A trash folder is used for storing items moved to the trash."),
- ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0)
- ? _("Can't Change Trash Location")
- : _("Can't Copy Trash"),
  GTK_STOCK_OK, NULL, NULL);
 
 result = GNOME_VFS_ERROR_NOT_PERMITTED;
@@ -2133,10 +2130,7 @@ nautilus_file_operations_copy_move (cons
  ? _("You cannot move a folder into itself.")
  : _("You cannot copy a folder into itself."), 
  _("The destination folder is inside the source folder."), 
- ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0) 
- ? _("Can't Move Into Self")
- : _("Can't Copy Into Self"),
- GTK_STOCK_OK, NULL, NULL);
+ GTK_STOCK_OK, NULL, NULL);
 
 result = GNOME_VFS_ERROR_NOT_PERMITTED;
 break;
@@ -2150,7 +2144,6 @@ nautilus_file_operations_copy_move (cons
  GTK_MESSAGE_ERROR,
  _("You cannot copy a file over itself."),
  _("The destination and source are the same file."), 
- _("Can't Copy Over Self"), 
  GTK_STOCK_OK, NULL, NULL);
 
 result = GNOME_VFS_ERROR_NOT_PERMITTED;
Index: libnautilus-private/nautilus-icon-dnd.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-dnd.c,v
retrieving revision 1.150
diff -u -p -r1.150 nautilus-icon-dnd.c
--- libnautilus-private/nautilus-icon-dnd.c19 Sep 2005 09:59:50 -00001.150
+++ libnautilus-private/nautilus-icon-dnd.c16 Dec 2005 13:49:52 -0000
@@ -788,7 +788,7 @@ confirm_switch_to_manual_layout (Nautilu
 }
 
 dialog = eel_show_yes_no_dialog (message, detail, _("Switch to Manual Layout?"),
- _("Switch"), GTK_STOCK_CANCEL,
+ GTK_STOCK_CANCEL,
  GTK_WINDOW (gtk_widget_get_toplevel(GTK_WIDGET(container))));
 
 response = gtk_dialog_run (dialog);
Index: libnautilus-private/nautilus-link-desktop-file.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-link-desktop-file.c,v
retrieving revision 1.33
diff -u -p -r1.33 nautilus-link-desktop-file.c
--- libnautilus-private/nautilus-link-desktop-file.c1 Dec 2005 19:51:56 -00001.33
+++ libnautilus-private/nautilus-link-desktop-file.c16 Dec 2005 13:49:52 -0000
@@ -34,17 +34,12 @@
 #include "nautilus-file.h"
 #include "nautilus-metadata.h"
 #include "nautilus-program-choosing.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gnome-extensions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-xml-extensions.h>
-#include <eel/eel-vfs-extensions.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libxml/parser.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define NAUTILUS_LINK_GENERIC_TAG"Link"
 #define NAUTILUS_LINK_TRASH_TAG "X-nautilus-trash"
Index: libnautilus-private/nautilus-program-choosing.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-choosing.c,v
retrieving revision 1.81
diff -u -p -r1.81 nautilus-program-choosing.c
--- libnautilus-private/nautilus-program-choosing.c9 Dec 2005 14:35:32 -00001.81
+++ libnautilus-private/nautilus-program-choosing.c16 Dec 2005 13:49:52 -0000
@@ -147,7 +147,6 @@ application_cannot_open_location (GnomeV
 
 message_dialog = eel_show_yes_no_dialog (prompt, 
                                          message,
- _("Can't Open Location"), 
  GTK_STOCK_OK,
  GTK_STOCK_CANCEL,
  parent_window);
@@ -180,7 +179,7 @@ application_cannot_open_location (GnomeV
     "it.");
 }
 
-eel_show_info_dialog (prompt, message, _("Can't Open Location"), parent_window);
+eel_show_info_dialog (prompt, message, parent_window);
 g_free (prompt);
 }
 
Index: libnautilus-private/nautilus-trash-directory.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-trash-directory.c,v
retrieving revision 1.38
diff -u -p -r1.38 nautilus-trash-directory.c
--- libnautilus-private/nautilus-trash-directory.c8 Sep 2005 19:31:30 -00001.38
+++ libnautilus-private/nautilus-trash-directory.c16 Dec 2005 13:49:53 -0000
@@ -29,7 +29,6 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-trash-monitor.h"
 #include <eel/eel-glib-extensions.h>
-#include <eel/eel-stock-dialogs.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.727
diff -u -p -r1.727 fm-directory-view.c
--- src/file-manager/fm-directory-view.c12 Dec 2005 16:59:11 -00001.727
+++ src/file-manager/fm-directory-view.c16 Dec 2005 13:49:57 -0000
@@ -7677,7 +7711,7 @@ report_broken_symbolic_link (FMDirectory
 
 if (nautilus_file_is_in_trash (file)) {
 eel_run_simple_dialog (GTK_WIDGET (view), FALSE, GTK_MESSAGE_WARNING,
-       prompt, detail, "", GTK_STOCK_CANCEL, NULL);
+       prompt, detail, GTK_STOCK_CANCEL, NULL);
 goto out;
 }
