Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1936
diff -u -p -r1.1936 ChangeLog
--- addressbook/ChangeLog	6 May 2005 06:13:33 -0000	1.1936
+++ addressbook/ChangeLog	6 May 2005 13:14:33 -0000
@@ -1,3 +1,14 @@
+2005-05-06  Sushma Rai  <rsushma@novell.com>
+
+	* gui/widgets/eab-gui-util.c (eab_contact_save)(eab_contact_list_save):
+	Storing the number of contacts in SaveAsInfo structure. 
+	(save_it): Depending on number of contacts, forming a part of error 
+	message.
+
+	* addressbook-errors.xml: Changed the save-error message, to read 
+	string contact/contacts.
+	Fixes #261969.
+
 2005-05-06  Chenthill Palanisamy  <pchenthill@novell.com>
 	
 	Fixes #301459
Index: addressbook/gui/widgets/eab-gui-util.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-gui-util.c,v
retrieving revision 1.34
diff -u -p -r1.34 eab-gui-util.c
--- addressbook/gui/widgets/eab-gui-util.c	8 Apr 2005 06:24:38 -0000	1.34
+++ addressbook/gui/widgets/eab-gui-util.c	6 May 2005 13:15:15 -0000
@@ -323,6 +323,7 @@ file_exists(GtkWindow *window, const cha
 typedef struct {
 	GtkWidget *filesel;
 	char *vcard;
+	gint num_contacts; 
 } SaveAsInfo;
 
 static void
@@ -351,7 +352,9 @@ save_it(GtkWidget *widget, SaveAsInfo *i
 				return;
 		}
 	} else if (error != 0) {
-		e_error_run (GTK_WINDOW (info->filesel), "addressbook:save-error", filename, g_strerror (errno));
+		char *err_str_ext = ngettext ("contact", "contacts", info->num_contacts);
+
+		e_error_run (GTK_WINDOW (info->filesel), "addressbook:save-error", err_str_ext, filename, g_strerror (errno));
 		return;
 	}
 	
@@ -479,6 +482,8 @@ eab_contact_save (char *title, EContact 
 	name = e_contact_get (contact, E_CONTACT_FILE_AS);
 	file = make_safe_filename (name);
 
+	info->num_contacts = 1;
+
 #ifdef USE_GTKFILECHOOSER
 	filesel = gtk_file_chooser_dialog_new (title,
 					       parent_window,
@@ -542,6 +547,8 @@ eab_contact_list_save (char *title, GLis
 #else
 	filesel = gtk_file_selection_new(title);
 #endif
+
+	info->num_contacts = g_list_length (list);
 
 	/* This is a filename. Translators take note. */
 	if (list && list->data && list->next == NULL) {
Index: addressbook/addressbook-errors.xml
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/addressbook-errors.xml,v
retrieving revision 1.8
diff -u -p -r1.8 addressbook-errors.xml
--- addressbook/addressbook-errors.xml	6 May 2005 05:16:52 -0000	1.8
+++ addressbook/addressbook-errors.xml	6 May 2005 13:15:35 -0000
@@ -75,8 +75,8 @@
  </error>
 
  <error id="save-error" type="error">
-  <primary>Unable to save contact(s).</primary>
-  <secondary>Error saving contacts to {0}: {1}</secondary>
+  <primary>Unable to save {0}.</primary>
+  <secondary>Error saving {0} to {1}: {2}</secondary>
  </error>
 
  <error id="backend-died" type="error">
