String change in nautilus

[Ryan Lortie <desrt desrt ca>]

A small string change....

Cheers.

Index: nautilus-file-operations.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file-operations.c,v
retrieving revision 1.182
diff -u -r1.182 nautilus-file-operations.c
--- nautilus-file-operations.c	25 Jan 2005 09:21:30 -0000	1.182
+++ nautilus-file-operations.c	26 Jan 2005 05:23:37 -0000
@@ -1099,7 +1099,7 @@
 	is_merge =  target_is_dir && is_directory (progress_info->source_name);
 
 	if (is_merge) {
-		secondary_text = _("If you replace the existing folder, any files in it that conflicts with the files being copied will be overwritten.");
+		secondary_text = _("If you replace the existing folder, any files in it that conflict with the files being copied will be overwritten.");
 	} else {
 		secondary_text = _("If you replace an existing file, its contents will be overwritten.");
 	}