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

[msuman svn gnome org]

Author: msuman
Date: Thu Jan 15 06:11:46 2009
New Revision: 57
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=57&view=rev

Log:
Part of fix for bug #565964 - String changes for some translation issues.

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-provider.c
   trunk/src/camel/camel-mapi-store.c
   trunk/src/camel/camel-mapi-transport.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	Thu Jan 15 06:11:46 2009
@@ -381,7 +381,9 @@
 	if (percent > 100)
 		percent = 99; 
 
-	progress_string = g_strdup_printf (_("Loading %s items"), get_element_type (e_cal_backend_get_kind (E_CAL_BACKEND (cbmapi)))); 
+	/* To translators: This message is displayed on the status bar when calendar/tasks/memo items are being fetched from the server. */
+	progress_string = g_strdup_printf (_("Loading items in folder %s"), 
+				e_source_get_property (e_cal_backend_get_source (E_CAL_BACKEND (cbmapi)), "name")); 
 
 	e_cal_backend_notify_view_progress (E_CAL_BACKEND (cbmapi), progress_string, percent);
 

Modified: trunk/src/camel/camel-mapi-folder.c
==============================================================================
--- trunk/src/camel/camel-mapi-folder.c	(original)
+++ trunk/src/camel/camel-mapi-folder.c	Thu Jan 15 06:11:46 2009
@@ -653,7 +653,7 @@
 		camel_operation_end (NULL);
 
 		if (!status) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Fetch items failed"));
+			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Fetching items failed"));
 			goto end2;
 		}
 

Modified: trunk/src/camel/camel-mapi-provider.c
==============================================================================
--- trunk/src/camel/camel-mapi-provider.c	(original)
+++ trunk/src/camel/camel-mapi-provider.c	Thu Jan 15 06:11:46 2009
@@ -48,7 +48,7 @@
 
 static CamelProviderConfEntry mapi_conf_entries[] = {
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
-	  N_("Checking for New Mail") },
+	  N_("Checking for new mail") },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,
 	  N_("C_heck for new messages in all folders"), "1" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },

Modified: trunk/src/camel/camel-mapi-store.c
==============================================================================
--- trunk/src/camel/camel-mapi-store.c	(original)
+++ trunk/src/camel/camel-mapi-store.c	Thu Jan 15 06:11:46 2009
@@ -58,7 +58,7 @@
 /* This definition should be in-sync with those in exchange-mapi-account-setup.c and exchange-account-listener.c */
 #define E_PASSWORD_COMPONENT "ExchangeMAPI"
 
-#define DISPLAY_NAME_FAVOURITES _("Favourites")
+#define DISPLAY_NAME_FAVOURITES _("Favorites")
 #define DISPLAY_NAME_ALL_PUBLIC_FOLDERS _("All Public Folders")
 
 #include <sys/types.h>
@@ -261,7 +261,7 @@
 	if (brief) {
 		return g_strdup_printf(_("Exchange MAPI server %s"), service->url->host);
 	} else {
-		return g_strdup_printf(_("Exchange MAPI for %s on %s"),
+		return g_strdup_printf(_("Exchange MAPI service for %s on %s"),
 				       service->url->user, service->url->host);
 	}
 }
@@ -317,8 +317,7 @@
 		exchange_mapi_connection_new (NULL,service->url->passwd);
 
 		if (!exchange_mapi_connection_exists ()) {
-			errbuf = g_strdup_printf (_("Unable to authenticate "
-					    "to Exchange MAPI server. "));
+			errbuf = g_strdup_printf (_("Unable to authenticate to Exchange MAPI server."));
 						  
 			camel_exception_clear (ex);
 		} else 
@@ -660,7 +659,7 @@
 
 	folder_id = camel_mapi_store_folder_id_lookup (mapi_store, temp);
 	if (!folder_id) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename MAPI folder `%s'. Folder doesn't exist"),
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename MAPI folder `%s'. Folder does not exist."),
 				      old_name);
 		CAMEL_SERVICE_REC_UNLOCK (mapi_store, connect_lock);
 		return;
@@ -668,7 +667,7 @@
 
 	/*Do not allow rename for system folders.*/
 	if (mapi_fid_is_system_folder (mapi_store, folder_id)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Mapi folder `%s' to `%s'. Default folder."),
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename MAPI folder `%s' to `%s'. Default folder."),
 				      old_name, new_name);
 		return;
 	}

Modified: trunk/src/camel/camel-mapi-transport.c
==============================================================================
--- trunk/src/camel/camel-mapi-transport.c	(original)
+++ trunk/src/camel/camel-mapi-transport.c	Thu Jan 15 06:11:46 2009
@@ -342,9 +342,9 @@
 mapi_transport_get_name(CamelService *service, gboolean brief)
 {
 	if (brief) {
-		return g_strdup_printf (_("MAPI server %s"), service->url->host);
+		return g_strdup_printf (_("Exchange MAPI server %s"), service->url->host);
 	} else {
-		return g_strdup_printf (_("MAPI service for %s on %s"),
+		return g_strdup_printf (_("Exchange MAPI service for %s on %s"),
 					service->url->user, service->url->host);
 	}
 }