Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.3096
diff -u -p -r1.3096 ChangeLog
--- calendar/ChangeLog	31 Jul 2006 10:17:19 -0000	1.3096
+++ calendar/ChangeLog	24 Aug 2006 08:21:05 -0000
@@ -1,3 +1,11 @@
+2006-08-24 Ushveen Kaur <kushveen@novell.com>
+	
+        ** Fixes bug #329693
+	
+	* gui/e-cal-model-tasks.c (set_status) :
+	* gui/e-itip-control.c (write_html) :
+	Translator comment added.
+
 2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #335276
Index: calendar/gui/e-cal-model-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-tasks.c,v
retrieving revision 1.37
diff -u -p -r1.37 e-cal-model-tasks.c
--- calendar/gui/e-cal-model-tasks.c	14 Jul 2006 05:23:19 -0000	1.37
+++ calendar/gui/e-cal-model-tasks.c	24 Aug 2006 08:21:05 -0000
@@ -646,6 +646,7 @@ set_status (ECalModelComponent *comp_dat
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_STATUS_PROPERTY);
 
 	/* an empty string is the same as 'None' */
+	/* For Translators : 'None' is task status:None */
 	if (!value[0] || !e_util_utf8_strcasecmp (value, _("None")))
 		status = ICAL_STATUS_NONE;
 	else if (!e_util_utf8_strcasecmp (value, _("Not Started")))
Index: calendar/gui/e-itip-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-itip-control.c,v
retrieving revision 1.174
diff -u -p -r1.174 e-itip-control.c
--- calendar/gui/e-itip-control.c	8 Feb 2006 13:06:02 -0000	1.174
+++ calendar/gui/e-itip-control.c	24 Aug 2006 08:21:05 -0000
@@ -1096,6 +1096,7 @@ write_html (EItipControl *itip, const gc
 
 	/* Summary */
 	e_cal_component_get_summary (priv->comp, &text);
+	/* For Translators : 'None' is summary:None (if summary is not there,'None' should be displayed */
 	str = g_strdup_printf ("<i>%s:</i>", _("None"));
 
 	html = text.value ? e_text_to_html_full (text.value, E_TEXT_TO_HTML_CONVERT_NL, 0) : str;
Index: composer/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.752
diff -u -p -r1.752 ChangeLog
--- composer/ChangeLog	21 Jul 2006 05:41:16 -0000	1.752
+++ composer/ChangeLog	24 Aug 2006 08:24:57 -0000
@@ -1,3 +1,14 @@
+2006-08-24  Ushveen Kaur <kushveen@novell.com>
+
+	** Fix for bug #329693
+
+	* e-msg-composer.c (setup_signatures_menu) : Translator comments added.
+
 2006-07-20  Devashish Sharma   <sdevashish@novell.com>
 
 	** Fixes bug 273921
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.539
diff -u -p -r1.539 e-msg-composer.c
--- composer/e-msg-composer.c	18 Jul 2006 09:19:23 -0000	1.539
+++ composer/e-msg-composer.c	24 Aug 2006 08:24:58 -0000
@@ -2290,6 +2290,7 @@ setup_signatures_menu (EMsgComposer *com
 	gtk_widget_show (menu);
 	gtk_option_menu_set_menu (p->sig_menu, menu);
 	
+	/* For Translator : 'None' is signature:none */
 	item = gtk_menu_item_new_with_label (_("None"));
 	gtk_widget_show (item);
 	
Index: filter/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/filter/ChangeLog,v
retrieving revision 1.435
diff -u -p -r1.435 ChangeLog
--- filter/ChangeLog	7 Jul 2006 23:48:18 -0000	1.435
+++ filter/ChangeLog	24 Aug 2006 08:27:56 -0000
@@ -1,3 +1,9 @@
+2006-08-24  Ushveen Kaur <kushveen@novell.com>
+
+	** Fix for bug #329693
+
+	* filter-rule.c (get_widget) : Translator comments added.
+
 2006-07-07  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes bug #341369
Index: filter/filter-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-rule.c,v
retrieving revision 1.71
diff -u -p -r1.71 filter-rule.c
--- filter/filter-rule.c	25 Jan 2006 08:35:36 -0000	1.71
+++ filter/filter-rule.c	24 Aug 2006 08:27:56 -0000
@@ -886,6 +886,7 @@ get_widget (FilterRule *fr, struct _Rule
 	}
 
 	if (f->flags & RULE_CONTEXT_THREADING) {
+		/* For Translators : 'None' is Thread:None, which is to be included for the filter */
 		const char *thread_types[] = { N_("None"), N_("All related"), N_("Replies"), N_("Replies and parents"), N_("No reply or parent") };
 
 		label = gtk_label_new (_("Include threads"));
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3887
diff -u -p -r1.3887 ChangeLog
--- mail/ChangeLog	2 Aug 2006 05:37:33 -0000	1.3887
+++ mail/ChangeLog	24 Aug 2006 08:52:02 -0000
@@ -1,3 +1,15 @@
+2006-08-24  Ushveen Kaur <kushveen@novell.com>
+
+	** Fix for bug #329693
+
+	* em-account-editor.c (emae_setup_signatures),(emae_refresh_providers):
+	* em-account-prefs.c (mail_accounts_load):
+	* em-folder-view.c: 
+	* em-junk-hook.c (em_junk_get_name):
+	* em-composer-prefs.c (sig_edit_cb), (sig_add_script_cb):
+	* mail-config.c (mail_config_signature_new):	
+	Translator comments added.
+
 2006-08-02  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fixes bug #335241
Index: mail/em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.47
diff -u -p -r1.47 em-account-editor.c
--- mail/em-account-editor.c	24 Jul 2006 11:29:51 -0000	1.47
+++ mail/em-account-editor.c	24 Aug 2006 08:52:02 -0000
@@ -698,6 +698,7 @@ emae_setup_signatures(EMAccountEditor *e
 	store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
 
 	gtk_list_store_append(store, &iter);
+	/* For Translator : 'None' is signature:none */
 	gtk_list_store_set(store, &iter, 0, _("None"), 1, NULL, -1);
 
 	signatures = mail_config_get_signatures ();
@@ -1385,6 +1386,7 @@ emae_refresh_providers(EMAccountEditor *
 	/* We just special case each type here, its just easier */
 	if (service->type == CAMEL_PROVIDER_STORE) {
 		gtk_list_store_append(store, &iter);
+		/* For Translators: 'None' is provider name:none */
 		gtk_list_store_set(store, &iter, 0, _("None"), 1, NULL, -1);
 		i++;
 	}
Index: mail/em-account-prefs.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-prefs.c,v
retrieving revision 1.27
diff -u -p -r1.27 em-account-prefs.c
--- mail/em-account-prefs.c	10 Jul 2006 10:56:07 -0000	1.27
+++ mail/em-account-prefs.c	24 Aug 2006 08:52:02 -0000
@@ -468,7 +468,7 @@ mail_accounts_load (EMAccountPrefs *pref
 				val = account->name;
 				name = NULL;
 			}
-
+			/* For Translators : 'None' is url->protocol:none */
 			gtk_list_store_set (model, &iter,
 					    0, account->enabled,
 					    1, val,
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.154
diff -u -p -r1.154 em-folder-view.c
--- mail/em-folder-view.c	11 Jul 2006 21:27:25 -0000	1.154
+++ mail/em-folder-view.c	24 Aug 2006 08:52:03 -0000
@@ -1138,6 +1138,7 @@ static EPopupItem emfv_popup_items[] = {
 	{ E_POPUP_ITEM, "50.emfv.06", N_("Mark for Follo_w Up..."), emfv_popup_flag_followup, NULL, "stock_mail-flag-for-followup",  EM_POPUP_SELECT_FLAG_FOLLOWUP|EM_FOLDER_VIEW_SELECT_LISTONLY },
 
 	{ E_POPUP_SUBMENU, "60.label.00", N_("_Label"), NULL, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	/* For Translators : 'None' is message label:none */
 	{ E_POPUP_ITEM, "60.label.00/00.label", N_("_None"), emfv_popup_label_clear, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_BAR, "60.label.00/00.label.00", NULL, NULL, NULL, NULL },
 
Index: mail/em-junk-hook.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-junk-hook.c,v
retrieving revision 1.3
diff -u -p -r1.3 em-junk-hook.c
--- mail/em-junk-hook.c	26 Oct 2005 10:25:42 -0000	1.3
+++ mail/em-junk-hook.c	24 Aug 2006 08:52:03 -0000
@@ -75,6 +75,7 @@ em_junk_get_name (CamelJunkPlugin *csp)
 	if (item->hook && item->hook->hook.plugin->enabled) {
 		return (item->hook->hook.plugin->name);
 	} else
+		/* For Translators : 'None' is name:none */
 		return 	_("None");
 
 }
Index: mail/em-composer-prefs.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-composer-prefs.c,v
retrieving revision 1.34
diff -u -p -r1.34 em-composer-prefs.c
--- mail/em-composer-prefs.c	11 Jul 2006 16:47:09 -0000	1.34
+++ mail/em-composer-prefs.c	24 Aug 2006 08:52:03 -0000
@@ -308,6 +308,7 @@ sig_edit_cb (GtkWidget *widget, EMCompos
 		/* normal signature */
 		if (!sig->filename || *sig->filename == '\0') {
 			g_free (sig->filename);
+			/* For Translator : 'unnamed' is signature:unnamed */
 			sig->filename = g_strdup (_("Unnamed"));
 		}
 		
@@ -434,6 +435,7 @@ sig_add_script_cb (GtkWidget *widget, EM
 	GtkWidget *entry;
 	
 	entry = glade_xml_get_widget (prefs->sig_script_gui, "entry_add_script_name");
+	/* For Translator : 'unnamed' is signature:unnamed */
 	gtk_entry_set_text (GTK_ENTRY (entry), _("Unnamed"));
 	
 	g_object_set_data ((GObject *) entry, "sig", NULL);
Index: mail/mail-config.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.c,v
retrieving revision 1.326
diff -u -p -r1.326 mail-config.c
--- mail/mail-config.c	25 May 2006 04:59:47 -0000	1.326
+++ mail/mail-config.c	24 Aug 2006 08:52:03 -0000
@@ -996,6 +996,7 @@ mail_config_signature_new (const char *f
 	ESignature *sig;
 	
 	sig = e_signature_new ();
+	/* For Translator : 'unnamed' is signature:unnamed */
 	sig->name = g_strdup (_("Unnamed"));
 	sig->script = script;
 	sig->html = html;
Index: plugins/calendar-weather/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-weather/ChangeLog,v
retrieving revision 1.16
diff -u -p -r1.16 ChangeLog
--- plugins/calendar-weather/ChangeLog	13 Jul 2005 10:05:42 -0000	1.16
+++ plugins/calendar-weather/ChangeLog	24 Aug 2006 08:57:28 -0000
@@ -1,3 +1,11 @@
+2006-08-24  Ushveen Kaur <kushveen@novell.com>
+
+	** Fix for bug #329693
+
+	* calendar-weather.c (location_clicked),
+	(e_calendar_weather_location):
+	Translator comments added.
+
 2005-07-13  Tor Lillqvist  <tml@novell.com>
 
 	* calendar-weather.c (e_calendar_weather_migrate): Don't return a
Index: plugins/calendar-weather/calendar-weather.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-weather/calendar-weather.c,v
retrieving revision 1.7
diff -u -p -r1.7 calendar-weather.c
--- plugins/calendar-weather/calendar-weather.c	13 Jul 2005 10:05:42 -0000	1.7
+++ plugins/calendar-weather/calendar-weather.c	24 Aug 2006 08:57:28 -0000
@@ -367,6 +367,7 @@ location_clicked (GtkButton *button, ESo
 
 		label = GTK_WIDGET (gtk_bin_get_child (GTK_BIN (button)));
 		text = gtk_label_get_text (GTK_LABEL (label));
+		/* For Translators : 'None' is label:none */
 		if (strcmp (text, _("None")) == 0)
 			e_source_set_relative_uri (source, "");
 	}
@@ -421,6 +422,7 @@ e_calendar_weather_location (EPlugin *ep
 		text = gtk_label_new (location);
 		g_free (location);
 	} else
+	    /* For Translators : 'None' is location:none */
 		text = gtk_label_new (_("None"));
 	gtk_widget_show (text);
 #if (GTK_CHECK_VERSION(2, 6, 0))
Index: plugins/itip-formatter/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/ChangeLog,v
retrieving revision 1.81
diff -u -p -r1.81 ChangeLog
--- plugins/itip-formatter/ChangeLog	22 Jul 2006 08:57:41 -0000	1.81
+++ plugins/itip-formatter/ChangeLog	24 Aug 2006 09:01:16 -0000
@@ -1,3 +1,9 @@
+2006-08-24  Ushveen Kaur <kushveen@novell.com>
+
+	** Fix for bug #329693
+
+	* itip-formatter.c (format_itip_object): Translator comments added.
+
 2006-07-22  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	* itip-formatter.c: (cal_opened_cb), (source_selected_cb),
Index: plugins/itip-formatter/itip-formatter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-formatter.c,v
retrieving revision 1.71
diff -u -p -r1.71 itip-formatter.c
--- plugins/itip-formatter/itip-formatter.c	22 Jul 2006 08:57:41 -0000	1.71
+++ plugins/itip-formatter/itip-formatter.c	24 Aug 2006 09:01:17 -0000
@@ -1732,6 +1732,7 @@ format_itip_object (EMFormatHTML *efh, G
 	}	
 
 	e_cal_component_get_summary (pitip->comp, &text);
+	/* For Translators : 'None' is summary:none */
 	itip_view_set_summary (ITIP_VIEW (pitip->view), text.value ? text.value : _("None"));
 
 	e_cal_component_get_location (pitip->comp, &string);
Index: plugins/exchange-operations/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/ChangeLog,v
retrieving revision 1.121
diff -u -p -r1.121 ChangeLog
--- plugins/exchange-operations/ChangeLog	24 Jul 2006 10:26:02 -0000	1.121
+++ plugins/exchange-operations/ChangeLog	24 Aug 2006 09:03:38 -0000
@@ -1,3 +1,9 @@
+2006-08-24  Ushveen Kaur <kushveen@novell.com>
+
+	** Fix for bug #329693
+
+	* exchange-delegates.glade: Translator comments added.
+
 2006-07-24  Sushma Rai  <rsushma@novell.com>
 
 	* exchange-folder-subscription.c (subscribe_to_folder): Handling the 
Index: plugins/exchange-operations/exchange-delegates.glade
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-delegates.glade,v
retrieving revision 1.2
diff -u -p -r1.2 exchange-delegates.glade
--- plugins/exchange-operations/exchange-delegates.glade	19 Dec 2005 14:55:41 -0000	1.2
+++ plugins/exchange-operations/exchange-delegates.glade	24 Aug 2006 09:03:38 -0000
@@ -419,7 +419,7 @@ and access your folders with the permiss
 		      <child>
 			<widget class="GtkMenuItem" id="convertwidget2">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">None</property>
+			  <property name="label" translatable="yes" context="yes" comments="For Translators : 'None' is calendar permissions:none ">None</property>
 			  <property name="use_underline">True</property>
 			</widget>
 		      </child>
@@ -472,7 +472,7 @@ and access your folders with the permiss
 		      <child>
 			<widget class="GtkMenuItem" id="convertwidget7">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">None</property>
+			  <property name="label" translatable="yes" context="yes" comments="For Translators : 'None' is task permissions:none ">None</property>
 			  <property name="use_underline">True</property>
 			</widget>
 		      </child>
@@ -525,7 +525,7 @@ and access your folders with the permiss
 		      <child>
 			<widget class="GtkMenuItem" id="convertwidget12">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">None</property>
+			  <property name="label" translatable="yes" context="yes" comments="For Translators : 'None' is inbox permissions:none ">None</property>
 			  <property name="use_underline">True</property>
 			</widget>
 		      </child>
@@ -578,7 +578,7 @@ and access your folders with the permiss
 		      <child>
 			<widget class="GtkMenuItem" id="convertwidget17">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">None</property>
+			  <property name="label" translatable="yes" context="yes" comments="For Translators : 'None' is contact permissions:none ">None</property>
 			  <property name="use_underline">True</property>
 			</widget>
 		      </child>
Index: widgets/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.175
diff -u -p -r1.175 ChangeLog
--- widgets/ChangeLog	21 Jul 2006 05:47:36 -0000	1.175
+++ widgets/ChangeLog	24 Aug 2006 09:11:07 -0000
@@ -1,3 +1,15 @@
+2006-08-24  Ushveen Kaur <kushveen@novell.com>
+
+	** Fix for bug #329693
+
+	* e-timezone-dialog/e-timezone-dialog.c
+	(e_timezone_dialog_add_timezones):
+	* misc/e-cell-date-edit.c (e_cell_date_edit_init):
+	* misc/e-dateedit.c (create_children), 
+	(field_set_to_none),
+	(e_date_edit_update_date_entry):
+	Translator comments added.
+
 2006-07-21  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes 342313.
Index: widgets/e-timezone-dialog/e-timezone-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/e-timezone-dialog/e-timezone-dialog.c,v
retrieving revision 1.22
diff -u -p -r1.22 e-timezone-dialog.c
--- widgets/e-timezone-dialog/e-timezone-dialog.c	20 Jun 2006 05:04:13 -0000	1.22
+++ widgets/e-timezone-dialog/e-timezone-dialog.c	24 Aug 2006 09:11:07 -0000
@@ -206,6 +206,7 @@ e_timezone_dialog_add_timezones (ETimezo
 	gtk_list_clear_items (GTK_LIST (combo->list), 0, -1);
 
 	/* Put the ""UTC" entry at the top of the combo's list. */
+	/* For Translators : 'UTC' is timezone:UTC */
 	listitem = gtk_list_item_new_with_label (_("UTC"));
 	gtk_widget_show (listitem);
 	gtk_container_add (GTK_CONTAINER (combo->list), listitem);
Index: widgets/misc/e-cell-date-edit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-cell-date-edit.c,v
retrieving revision 1.25
diff -u -p -r1.25 e-cell-date-edit.c
--- widgets/misc/e-cell-date-edit.c	30 Jan 2006 12:28:04 -0000	1.25
+++ widgets/misc/e-cell-date-edit.c	24 Aug 2006 09:11:08 -0000
@@ -246,6 +246,7 @@ e_cell_date_edit_init			(ECellDateEdit	*
 			    ecde);
 	ecde->today_button = today_button;
 
+	/* For Translators : 'None' is date:none */
 	none_button = gtk_button_new_with_label (_("None"));
 	gtk_container_add (GTK_CONTAINER (bbox), none_button);
         gtk_widget_show (none_button);
Index: widgets/misc/e-dateedit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-dateedit.c,v
retrieving revision 1.57
diff -u -p -r1.57 e-dateedit.c
--- widgets/misc/e-dateedit.c	14 Jul 2006 04:48:07 -0000	1.57
+++ widgets/misc/e-dateedit.c	24 Aug 2006 09:11:08 -0000
@@ -472,6 +510,7 @@ create_children			(EDateEdit	*dedit)
 
 	/* Note that we don't show this here, since by default a 'None' date
 	   is not permitted. */
+	/* For Translators : 'None' is date:none */
 	priv->none_button = gtk_button_new_with_mnemonic (_("_None"));
 	gtk_container_add (GTK_CONTAINER (bbox), priv->none_button);
 	g_signal_connect (priv->none_button, "clicked",
@@ -1503,7 +1560,7 @@ field_set_to_none (const char *text)
 	pos = text;
 	while (isspace (*pos))
 		pos++;
-
+	/* For Translators : 'None' is time:none and date:none */
 	none_string = _("None");
 
 	if (*pos == '\0' || !strncmp (pos, none_string, strlen (none_string)))
@@ -1718,7 +1800,8 @@ e_date_edit_update_date_entry		(EDateEdi
 	priv = dedit->priv;
 
 	if (priv->date_set_to_none || !priv->date_is_valid) {
-		gtk_entry_set_text (GTK_ENTRY (priv->date_entry), _("None"));
+		/* For Translators : 'None' is date:none */
+		   gtk_entry_set_text (GTK_ENTRY (priv->date_entry), _("None"));
 	} else {
 		tmp_tm.tm_year = priv->year;
 		tmp_tm.tm_mon = priv->month;
