diff -rup ../nautilus-2.13.3-old/libnautilus-private/nautilus-desktop-link-monitor.c ./libnautilus-private/nautilus-desktop-link-monitor.c
--- ../nautilus-2.13.3-old/libnautilus-private/nautilus-desktop-link-monitor.c	2005-12-12 17:29:46.000000000 +0100
+++ ./libnautilus-private/nautilus-desktop-link-monitor.c	2006-01-07 17:45:51.000000000 +0100
@@ -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);
diff -rup ../nautilus-2.13.3-old/libnautilus-private/nautilus-file-operations.c ./libnautilus-private/nautilus-file-operations.c
--- ../nautilus-2.13.3-old/libnautilus-private/nautilus-file-operations.c	2005-12-12 17:29:47.000000000 +0100
+++ ./libnautilus-private/nautilus-file-operations.c	2006-01-07 19:59:18.000000000 +0100
@@ -1140,8 +1140,9 @@ 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 +1184,6 @@ handle_transfer_overwrite (const GnomeVF
 			 GTK_MESSAGE_QUESTION, 
 			 text, 
 			 secondary_text, 
-			 _("Conflict While Copying"),
 			 _("_Skip"), _("_Replace"), NULL);
 		g_free (text);	 
 
@@ -1202,7 +1202,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 +2077,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,10 +2102,7 @@ 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);
+					 GTK_STOCK_OK, NULL);
 
 				result = GNOME_VFS_ERROR_NOT_PERMITTED;
 				break;
@@ -2133,10 +2128,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);			
 
 				result = GNOME_VFS_ERROR_NOT_PERMITTED;
 				break;
@@ -2150,8 +2142,7 @@ 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);			
+					 GTK_STOCK_OK, NULL);			
 
 				result = GNOME_VFS_ERROR_NOT_PERMITTED;
 				break;
diff -rup ../nautilus-2.13.3-old/libnautilus-private/nautilus-icon-dnd.c ./libnautilus-private/nautilus-icon-dnd.c
--- ../nautilus-2.13.3-old/libnautilus-private/nautilus-icon-dnd.c	2005-12-12 17:29:48.000000000 +0100
+++ ./libnautilus-private/nautilus-icon-dnd.c	2006-01-07 17:46:20.000000000 +0100
@@ -787,7 +787,7 @@ confirm_switch_to_manual_layout (Nautilu
 		}
 	}
 
-	dialog = eel_show_yes_no_dialog (message, detail, _("Switch to Manual Layout?"),
+	dialog = eel_show_yes_no_dialog (message, detail,
 					 _("Switch"), GTK_STOCK_CANCEL,
 					 GTK_WINDOW (gtk_widget_get_toplevel(GTK_WIDGET(container))));
 
diff -rup ../nautilus-2.13.3-old/libnautilus-private/nautilus-program-choosing.c ./libnautilus-private/nautilus-program-choosing.c
--- ../nautilus-2.13.3-old/libnautilus-private/nautilus-program-choosing.c	2005-12-12 17:29:48.000000000 +0100
+++ ./libnautilus-private/nautilus-program-choosing.c	2006-01-07 17:46:32.000000000 +0100
@@ -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);
 	}	
 
diff -rup ../nautilus-2.13.3-old/src/file-manager/fm-directory-view.c ./src/file-manager/fm-directory-view.c
--- ../nautilus-2.13.3-old/src/file-manager/fm-directory-view.c	2005-12-12 17:29:54.000000000 +0100
+++ ./src/file-manager/fm-directory-view.c	2006-01-07 17:46:47.000000000 +0100
@@ -7677,7 +7677,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;
 	}
 
diff -rup ../nautilus-2.13.3-old/src/nautilus-location-bar.c ./src/nautilus-location-bar.c
--- ../nautilus-2.13.3-old/src/nautilus-location-bar.c	2005-12-12 17:29:53.000000000 +0100
+++ ./src/nautilus-location-bar.c	2006-01-07 17:47:01.000000000 +0100
@@ -167,7 +167,6 @@ drag_data_received_callback (GtkWidget *
 			 GTK_MESSAGE_QUESTION,
 			 prompt,
 			 detail,
-			 _("View in Multiple Windows?"),
 			 GTK_STOCK_CANCEL, GTK_STOCK_OK,
 			 NULL) != 0 /* GNOME_OK */;
 
