[evolution-data-server] Bug #633557 - Translation comments needed

[Milan Crha <mcrha src gnome org>]

commit 83b39d4b61e52e7d5e1aeb77a4abd8b1add244c2
Author: Milan Crha <mcrha redhat com>
Date:   Fri Dec 10 18:37:10 2010 +0100

    Bug #633557 - Translation comments needed

 addressbook/backends/ldap/e-book-backend-ldap.c    |    1 +
 addressbook/libedata-book/e-data-book.c            |    1 +
 .../backends/groupwise/e-cal-backend-groupwise.c   |   12 +++--
 calendar/libecal/e-cal.c                           |    1 +
 calendar/libedata-cal/e-data-cal.c                 |    1 +
 camel/camel-smime-context.c                        |    1 +
 camel/providers/pop3/camel-pop3-provider.c         |    1 +
 libedataserver/e-categories.c                      |   46 ++++++++++----------
 8 files changed, 37 insertions(+), 27 deletions(-)
---
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index b2fa80a..6f20b2a 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -169,6 +169,7 @@ typedef struct LDAPOp LDAPOp;
 
 #define EDB_ERROR(_code) e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, NULL)
 #define EDB_ERROR_EX(_code, _msg) e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, _msg)
+/* Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server */
 #define EDB_ERROR_NOT_CONNECTED() e_data_book_create_error (E_DATA_BOOK_STATUS_OTHER_ERROR, _("Not connected"))
 #define EDB_ERROR_MSG_TYPE(_msg_type) e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_INVALID_ARG, "Incorrect msg type %d passed to %s", _msg_type, G_STRFUNC)
 
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 2a48c18..64081dd 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -192,6 +192,7 @@ e_data_book_status_to_string (EDataBookStatus status)
 		{ E_DATA_BOOK_STATUS_INVALID_SERVER_VERSION,		N_("Invalid server version") },
 		{ E_DATA_BOOK_STATUS_NO_SPACE,				N_("No space") },
 		{ E_DATA_BOOK_STATUS_INVALID_ARG,			N_("Invalid argument") },
+		/* Translators: The string for NOT_SUPPORTED error */
 		{ E_DATA_BOOK_STATUS_NOT_SUPPORTED,			N_("Not supported") }
 	};
 
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index a7b7c0e..651914a 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -311,7 +311,6 @@ populate_cache (ECalBackendGroupwise *cbgw)
 			}
 			for (l = list; l != NULL; l = g_list_next (l)) {
 				EGwItem *item;
-				gchar *progress_string = NULL;
 
 				item = E_GW_ITEM (l->data);
 				comp = e_gw_item_to_cal_component (item, cbgw);
@@ -327,8 +326,14 @@ populate_cache (ECalBackendGroupwise *cbgw)
 				if (percent > 100)
 					percent = 99;
 
-				progress_string = g_strdup_printf (_("Loading %s items"), type);
-				e_cal_backend_notify_view_progress (E_CAL_BACKEND (cbgw), progress_string, percent);
+				if (g_str_equal (type, "Appointment"))
+					e_cal_backend_notify_view_progress (E_CAL_BACKEND (cbgw), _("Loading Appointment items"), percent);
+				else if (g_str_equal (type, "Task"))
+					e_cal_backend_notify_view_progress (E_CAL_BACKEND (cbgw), _("Loading Task items"), percent);
+				else if (g_str_equal (type, "Note"))
+					e_cal_backend_notify_view_progress (E_CAL_BACKEND (cbgw), _("Loading Note items"), percent);
+				else
+					e_cal_backend_notify_view_progress (E_CAL_BACKEND (cbgw), _("Loading items"), percent);
 
 				if (E_IS_CAL_COMPONENT (comp)) {
 					gchar *comp_str;
@@ -340,7 +345,6 @@ populate_cache (ECalBackendGroupwise *cbgw)
 					put_component_to_store (cbgw, comp);
 					g_object_unref (comp);
 				}
-				g_free (progress_string);
 			}
 
 			if (!list  || g_list_length (list) == 0)
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index ecbcd49..686f190 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -4181,6 +4181,7 @@ e_cal_get_error_message (ECalendarStatus status)
 	case E_CALENDAR_STATUS_OK :
 		return _("No error");
 	case E_CALENDAR_STATUS_NOT_SUPPORTED :
+		/* Translators: The string for NOT_SUPPORTED error */
 		return _("Not supported");
 	default:
 		/* ignore everything else */
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 9736e6d..f03e104 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -131,6 +131,7 @@ e_data_cal_status_to_string (EDataCalCallStatus status)
 		/* { OtherError,			N_("Other error") }, */
 		{ InvalidServerVersion,			N_("Invalid server version") },
 		{ InvalidArg,				N_("Invalid argument") },
+		/* Translators: The string for NOT_SUPPORTED error */
 		{ NotSupported,				N_("Not supported") }
 	};
 
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index 309eef1..e28d12f 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -503,6 +503,7 @@ sm_status_description (NSSCMSVerificationStatus status)
 	switch (status) {
 	case NSSCMSVS_Unverified:
 	default:
+		/* Translators: A fallback message when couldn't verify an SMIME signature */
 		return _("Unverified");
 	case NSSCMSVS_GoodSignature:
 		return _("Good signature");
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 8f99731..0c8633a 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -40,6 +40,7 @@ static CamelProviderConfEntry pop3_conf_entries[] = {
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "keep_on_server", NULL,
 	  N_("_Leave messages on server"), "0" },
 	{ CAMEL_PROVIDER_CONF_CHECKSPIN, "delete_after", "keep_on_server",
+	  /* Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server */
 	  N_("_Delete after %s day(s)"), "0:1:7:365" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "delete_expunged", "keep_on_server",
 	  N_("Delete _expunged from local Inbox"), "0" },
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
index b6b50fc..436952f 100644
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
@@ -44,30 +44,30 @@ typedef struct {
 } DefaultCategory;
 
 static DefaultCategory default_categories[] = {
-	{ N_("Anniversary") },
-	{ N_("Birthday"), "category_birthday_16.png" },
-	{ N_("Business"), "category_business_16.png" },
-	{ N_("Competition") },
-	{ N_("Favorites"), "category_favorites_16.png" },
-	{ N_("Gifts"), "category_gifts_16.png" },
-	{ N_("Goals/Objectives"), "category_goals_16.png" },
-	{ N_("Holiday"), "category_holiday_16.png" },
-	{ N_("Holiday Cards"), "category_holiday-cards_16.png" },
+	{ NC_("CategoryName", "Anniversary") },
+	{ NC_("CategoryName", "Birthday"), "category_birthday_16.png" },
+	{ NC_("CategoryName", "Business"), "category_business_16.png" },
+	{ NC_("CategoryName", "Competition") },
+	{ NC_("CategoryName", "Favorites"), "category_favorites_16.png" },
+	{ NC_("CategoryName", "Gifts"), "category_gifts_16.png" },
+	{ NC_("CategoryName", "Goals/Objectives"), "category_goals_16.png" },
+	{ NC_("CategoryName", "Holiday"), "category_holiday_16.png" },
+	{ NC_("CategoryName", "Holiday Cards"), "category_holiday-cards_16.png" },
 	/* important people (e.g. new business partners) */
-	{ N_("Hot Contacts"), "category_hot-contacts_16.png" },
-	{ N_("Ideas"), "category_ideas_16.png" },
-	{ N_("International"), "category_international_16.png" },
-	{ N_("Key Customer"), "category_key-customer_16.png" },
-	{ N_("Miscellaneous"), "category_miscellaneous_16.png" },
-	{ N_("Personal"), "category_personal_16.png" },
-	{ N_("Phone Calls"), "category_phonecalls_16.png" },
+	{ NC_("CategoryName", "Hot Contacts"), "category_hot-contacts_16.png" },
+	{ NC_("CategoryName", "Ideas"), "category_ideas_16.png" },
+	{ NC_("CategoryName", "International"), "category_international_16.png" },
+	{ NC_("CategoryName", "Key Customer"), "category_key-customer_16.png" },
+	{ NC_("CategoryName", "Miscellaneous"), "category_miscellaneous_16.png" },
+	{ NC_("CategoryName", "Personal"), "category_personal_16.png" },
+	{ NC_("CategoryName", "Phone Calls"), "category_phonecalls_16.png" },
 	/* Translators: "Status" is a category name; it can mean anything user wants to */
-	{ N_("Status"), "category_status_16.png" },
-	{ N_("Strategies"), "category_strategies_16.png" },
-	{ N_("Suppliers"), "category_suppliers_16.png" },
-	{ N_("Time & Expenses"), "category_time-and-expenses_16.png" },
-	{ N_("VIP") },
-	{ N_("Waiting") },
+	{ NC_("CategoryName", "Status"), "category_status_16.png" },
+	{ NC_("CategoryName", "Strategies"), "category_strategies_16.png" },
+	{ NC_("CategoryName", "Suppliers"), "category_suppliers_16.png" },
+	{ NC_("CategoryName", "Time & Expenses"), "category_time-and-expenses_16.png" },
+	{ NC_("CategoryName", "VIP") },
+	{ NC_("CategoryName", "Waiting") },
 	{ NULL }
 };
 
@@ -296,7 +296,7 @@ categories_add_full (const gchar *category,
 	cat_info = g_slice_new (CategoryInfo);
 	if (is_default) {
 		const gchar *display_name;
-		display_name = g_dgettext (GETTEXT_PACKAGE, category);
+		display_name = g_dpgettext2 (GETTEXT_PACKAGE, "CategoryName", category);
 		cat_info->display_name = g_strdup (display_name);
 		cat_info->clocale_name = g_strdup (category);
 	} else {