evolution-mapi r116 - in trunk/src: calendar camel

[jjohnny svn gnome org]

Author: jjohnny
Date: Mon Feb 16 09:27:35 2009
New Revision: 116
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=116&view=rev

Log:
String improvements.

Modified:
   trunk/src/calendar/ChangeLog
   trunk/src/calendar/e-cal-backend-mapi.c
   trunk/src/camel/ChangeLog
   trunk/src/camel/camel-mapi-folder.c
   trunk/src/camel/camel-mapi-store.c

Modified: trunk/src/calendar/e-cal-backend-mapi.c
==============================================================================
--- trunk/src/calendar/e-cal-backend-mapi.c	(original)
+++ trunk/src/calendar/e-cal-backend-mapi.c	Mon Feb 16 09:27:35 2009
@@ -575,8 +575,8 @@
 						NULL, 0, NULL, NULL, 
 						mapi_cal_get_changes_cb, cbmapi, 
 						MAPI_OPTIONS_FETCH_ALL)) {
-			/* FIXME: better string please... */
-			e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Error fetching changes from the server. Removing the cache might help."));
+			/* FIXME: String : We need to restart evolution-data-server */
+			e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Error fetching changes from the server."));
 //			e_file_cache_thaw_changes (E_FILE_CACHE (priv->cache));
 			g_static_mutex_unlock (&updating);
 			return FALSE;
@@ -586,8 +586,8 @@
 						exchange_mapi_cal_util_build_name_id, GINT_TO_POINTER(kind), 
 						mapi_cal_get_changes_cb, cbmapi, 
 						MAPI_OPTIONS_FETCH_ALL)) {
-		/* FIXME: better string please... */
-		e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Error fetching changes from the server. Removing the cache might help."));
+		/* FIXME: String : We need to restart evolution-data-server */
+		e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Error fetching changes from the server."));
 //		e_file_cache_thaw_changes (E_FILE_CACHE (priv->cache));
 		g_static_mutex_unlock (&updating);
 		return FALSE;
@@ -612,8 +612,8 @@
 						NULL, NULL, 
 						handle_deleted_items_cb, cbmapi, 
 						0)) {
-		/* FIXME: better string please... */
-		e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Error fetching changes from the server. Removing the cache might help."));
+		/* FIXME: String : We need to restart evolution-data-server */
+		e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Error fetching changes from the server."));
 		priv->cache_keys = NULL;
 		g_static_mutex_unlock (&updating);
 		return FALSE;

Modified: trunk/src/camel/camel-mapi-folder.c
==============================================================================
--- trunk/src/camel/camel-mapi-folder.c	(original)
+++ trunk/src/camel/camel-mapi-folder.c	Mon Feb 16 09:27:35 2009
@@ -1195,7 +1195,7 @@
 		camel_stream_reset (stream);
 		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) msg, stream) == -1) {
 			if (errno == EINTR) {
-				camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
+				camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Message fetching cancelled by user."));
 				camel_object_unref (msg);
 				camel_object_unref (cache_stream);
 				camel_object_unref (stream);

Modified: trunk/src/camel/camel-mapi-store.c
==============================================================================
--- trunk/src/camel/camel-mapi-store.c	(original)
+++ trunk/src/camel/camel-mapi-store.c	Mon Feb 16 09:27:35 2009
@@ -261,6 +261,8 @@
 	if (brief) {
 		return g_strdup_printf(_("Exchange MAPI server %s"), service->url->host);
 	} else {
+		/*To translators : Example string : Exchange MAPI service for 
+		  _username_ on _server host name__*/
 		return g_strdup_printf(_("Exchange MAPI service for %s on %s"),
 				       service->url->user, service->url->host);
 	}
@@ -295,8 +297,11 @@
 		if (!service->url->passwd ){
 			char *prompt;
 			
-			prompt = g_strdup_printf (_("%sPlease enter the MAPI "
-						    "password for %s %s"),
+			/*To translators : First %s : is the error text or the reason
+			  for prompting the user if it is available.
+			 Second %s is : Username.
+			 Third %s is : Server host name.*/
+			prompt = g_strdup_printf (_("%s Please enter the MAPI password for %s %s"),
 						  errbuf ? errbuf : "",
 						  service->url->user,
 						  service->url->host);
@@ -649,6 +654,7 @@
 
 	folder_id = camel_mapi_store_folder_id_lookup (mapi_store, temp);
 	if (!folder_id) {
+		/*To translators : '%s' is current name of the folder */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, 
 				      _("Cannot rename MAPI folder `%s'. Folder does not exist."),
 				      old_name);
@@ -658,8 +664,10 @@
 
 	/*Do not allow rename for system folders.*/
 	if (mapi_fid_is_system_folder (mapi_store, folder_id)) {
+		/*To translators : '%s to %s' is current name of the folder  and
+		 new name of the folder.*/
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, 
-				      _("Cannot rename MAPI folder `%s' to `%s'. Default folder."),
+				      _("Cannot rename MAPI default folder `%s' to `%s'."),
 				      old_name, new_name);
 		return;
 	}
@@ -674,6 +682,8 @@
 	
 	if (!exchange_mapi_rename_folder (fid , temp))
 	{
+		/*To translators : '%s to %s' is current name of the folder  and
+		 new name of the folder.*/
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, 
 				      _("Cannot rename MAPI folder `%s' to `%s'"), old_name, new_name);