? evolution-data-server_groupwise-naming-consistency.patch
Index: addressbook/libebook/e-contact.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.c,v
retrieving revision 1.40
diff -u -r1.40 e-contact.c
--- addressbook/libebook/e-contact.c	27 Jan 2005 18:14:50 -0000	1.40
+++ addressbook/libebook/e-contact.c	28 Jan 2005 10:40:44 -0000
@@ -154,7 +154,7 @@
 
 	/* Instant messaging fields */
 	MULTI_LIST_FIELD (E_CONTACT_IM_AIM,       EVC_X_AIM,       "im_aim",       N_("AIM Screen Name List"),    FALSE),
-        MULTI_LIST_FIELD (E_CONTACT_IM_GROUPWISE, EVC_X_GROUPWISE, "im_groupwise", N_("Groupwise Id List"),       FALSE),
+        MULTI_LIST_FIELD (E_CONTACT_IM_GROUPWISE, EVC_X_GROUPWISE, "im_groupwise", N_("GroupWise Id List"),       FALSE),
 	MULTI_LIST_FIELD (E_CONTACT_IM_JABBER, 	  EVC_X_JABBER,    "im_jabber",    N_("Jabber Id List"),          FALSE),
 	MULTI_LIST_FIELD (E_CONTACT_IM_YAHOO,  	  EVC_X_YAHOO,     "im_yahoo",     N_("Yahoo! Screen Name List"), FALSE),
 	MULTI_LIST_FIELD (E_CONTACT_IM_MSN,    	  EVC_X_MSN,       "im_msn",       N_("MSN Screen Name List"),    FALSE),
@@ -166,12 +166,12 @@
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_WORK_1,    EVC_X_AIM,    "im_aim_work_1",    N_("AIM Work Screen Name 1"),    FALSE, "WORK", 0),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_WORK_2,    EVC_X_AIM,    "im_aim_work_2",    N_("AIM Work Screen Name 2"),    FALSE, "WORK", 1),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_AIM_WORK_3,    EVC_X_AIM,    "im_aim_work_3",    N_("AIM Work Screen Name 3"),    FALSE, "WORK", 2),
-	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_1, EVC_X_GROUPWISE, "im_groupwise_home_1", N_("Groupwise Home Screen Name 1"),    FALSE, "HOME", 0),
-	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_2, EVC_X_GROUPWISE, "im_groupwise_home_2", N_("Groupwise Home Screen Name 2"),    FALSE, "HOME", 1),
-	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_3, EVC_X_GROUPWISE, "im_groupwise_home_3", N_("Groupwise Home Screen Name 3"),    FALSE, "HOME", 2),
-	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_1, EVC_X_GROUPWISE, "im_groupwise_work_1", N_("Groupwise Work Screen Name 1"),    FALSE, "WORK", 0),
-	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_2, EVC_X_GROUPWISE, "im_groupwise_work_2", N_("Groupwise Work Screen Name 2"),    FALSE, "WORK", 1),
-	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_3, EVC_X_GROUPWISE, "im_groupwise_work_3", N_("Groupwise Work Screen Name 3"),    FALSE, "WORK", 2),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_1, EVC_X_GROUPWISE, "im_groupwise_home_1", N_("GroupWise Home Screen Name 1"),    FALSE, "HOME", 0),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_2, EVC_X_GROUPWISE, "im_groupwise_home_2", N_("GroupWise Home Screen Name 2"),    FALSE, "HOME", 1),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_HOME_3, EVC_X_GROUPWISE, "im_groupwise_home_3", N_("GroupWise Home Screen Name 3"),    FALSE, "HOME", 2),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_1, EVC_X_GROUPWISE, "im_groupwise_work_1", N_("GroupWise Work Screen Name 1"),    FALSE, "WORK", 0),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_2, EVC_X_GROUPWISE, "im_groupwise_work_2", N_("GroupWise Work Screen Name 2"),    FALSE, "WORK", 1),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GROUPWISE_WORK_3, EVC_X_GROUPWISE, "im_groupwise_work_3", N_("GroupWise Work Screen Name 3"),    FALSE, "WORK", 2),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_JABBER_HOME_1, EVC_X_JABBER, "im_jabber_home_1", N_("Jabber Home Id 1"),          FALSE, "HOME", 0),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_JABBER_HOME_2, EVC_X_JABBER, "im_jabber_home_2", N_("Jabber Home Id 2"),          FALSE, "HOME", 1),
 	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_JABBER_HOME_3, EVC_X_JABBER, "im_jabber_home_3", N_("Jabber Home Id 3"),          FALSE, "HOME", 2),
Index: camel/providers/groupwise/camel-groupwise-provider.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-provider.c,v
retrieving revision 1.24
diff -u -r1.24 camel-groupwise-provider.c
--- camel/providers/groupwise/camel-groupwise-provider.c	18 Jan 2005 09:58:01 -0000	1.24
+++ camel/providers/groupwise/camel-groupwise-provider.c	28 Jan 2005 10:40:45 -0000
@@ -64,7 +64,7 @@
 	  N_("Automatically synchronize account locally"), "0" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 
-	/* extra Groupwise  configuration settings */
+	/* extra GroupWise  configuration settings */
 	{CAMEL_PROVIDER_CONF_SECTION_START, "soapport", NULL,
 	  N_("Address Book and Calendar") },
 
@@ -84,7 +84,7 @@
 	"groupwise",
 	N_("Novell GroupWise"),
 
-	N_("For accessing Novell Groupwise servers"),
+	N_("For accessing Novell GroupWise servers"),
 
 	"mail",
 
Index: camel/providers/groupwise/camel-groupwise-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.c,v
retrieving revision 1.17
diff -u -r1.17 camel-groupwise-store.c
--- camel/providers/groupwise/camel-groupwise-store.c	28 Jan 2005 09:47:04 -0000	1.17
+++ camel/providers/groupwise/camel-groupwise-store.c	28 Jan 2005 10:40:46 -0000
@@ -359,7 +359,7 @@
 		if (!service->url->passwd) {
 			char *prompt;
 			
-			prompt = g_strdup_printf (_("%sPlease enter the Groupwise "
+			prompt = g_strdup_printf (_("%sPlease enter the GroupWise "
 						    "password for %s@%s"),
 						  errbuf ? errbuf : "",
 						  service->url->user,
@@ -991,7 +991,7 @@
 	
 	container_id = camel_groupwise_store_container_id_lookup (groupwise_store, old_name) ;
 	if (!container_id || e_gw_connection_rename_folder (priv->cnc, container_id , new_name) != E_GW_CONNECTION_STATUS_OK) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder `%s' to `%s'"),
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename GroupWise folder `%s' to `%s'"),
 				      old_name, new_name);
 		return ;
 	}
Index: camel/providers/groupwise/camel-groupwise-transport.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-transport.c,v
retrieving revision 1.10
diff -u -r1.10 camel-groupwise-transport.c
--- camel/providers/groupwise/camel-groupwise-transport.c	11 Jan 2005 07:49:58 -0000	1.10
+++ camel/providers/groupwise/camel-groupwise-transport.c	28 Jan 2005 10:40:46 -0000
@@ -118,9 +118,9 @@
 static char *groupwise_transport_get_name (CamelService *service, gboolean brief)
 {
 	if (brief)
-		return g_strdup_printf (_("Groupwise server %s"), service->url->host);
+		return g_strdup_printf (_("GroupWise server %s"), service->url->host);
 	else {
-		return g_strdup_printf (_("Groupwise mail delivery via %s"),
+		return g_strdup_printf (_("GroupWise mail delivery via %s"),
 				service->url->host);
 	}
 }
