Bug #329693 - Add contexts to translated "None" words

6 files changed, 14 insertions, 7 deletions

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index fafa308ff9..dde359dcba 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -103,7 +103,8 @@ update_day_second_zone_caption (CalendarPrefsDialog *prefs)
 
 	g_return_if_fail (prefs != NULL);
 
-	caption = _("None");
+	/* Translators: "None" indicates no second time zone set for a day view */
+	caption = C_("cal-second-zone", "None");
 
 	location = calendar_config_get_day_second_zone ();
 	if (location && *location) {
@@ -152,7 +153,7 @@ day_second_zone_clicked (GtkWidget *widget, CalendarPrefsDialog *prefs)
 	g_free (location);
 
 	group = NULL;
-	item = gtk_radio_menu_item_new_with_label (group, _("None"));
+	item = gtk_radio_menu_item_new_with_label (group, C_("cal-second-zone", "None"));
 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
 	if (!second_zone)
 		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui
index be78a8f828..d3478a2590 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.ui
+++ b/calendar/gui/dialogs/cal-prefs-dialog.ui
@@ -188,7 +188,7 @@
                     <property name="visible">True</property>
                     <child>
                       <object class="GtkButton" id="day_second_zone">
-                        <property name="label" translatable="yes">None</property>
+                        <property name="label" translatable="yes" context="cal-second-zone">None</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index f47ce3a0fd..61ebb081e8 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2937,7 +2937,8 @@ init_widgets (EventPage *epage)
 	}
 
 	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->alarm_time_combo), _("Customize"));
-	gtk_combo_box_prepend_text (GTK_COMBO_BOX (priv->alarm_time_combo), _("None"));
+	/* Translators: "None" for "No alarm set" */
+	gtk_combo_box_prepend_text (GTK_COMBO_BOX (priv->alarm_time_combo), C_("cal-alarms", "None"));
 
 	g_signal_connect_swapped (
 		priv->alarm_time_combo, "changed",
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index f189ac27db..2e80975e9f 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -724,7 +724,11 @@ set_status (ECalModelComponent *comp_data, const gchar *value)
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_STATUS_PROPERTY);
 
 	/* an empty string is the same as 'None' */
-	if (!value[0] || !e_util_utf8_strcasecmp (value, _("None")))
+	if (!value[0])
+		return;
+
+	/* Translators: "None" for task's status */
+	if (!e_util_utf8_strcasecmp (value, C_("cal-task-status", "None")))
 		return;
 	else if (!e_util_utf8_strcasecmp (value, _("Not Started")))
 		status = ICAL_STATUS_NEEDSACTION;
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index ff0f6406a4..0e7fdfb304 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -795,7 +795,7 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *time_item,
 	gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
 
 	group = NULL;
-	item = gtk_radio_menu_item_new_with_label (group, _("None"));
+	item = gtk_radio_menu_item_new_with_label (group, C_("cal-second-zone", "None"));
 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
 	if (!time_item->priv->second_zone)
 		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index a91812ce0c..44ac2215e4 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -1144,7 +1144,8 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 
 	/* Summary */
 	e_cal_component_get_summary (priv->comp, &text);
-	str = g_strdup_printf ("<i>%s:</i>", _("None"));
+	/* Translators: "None" used as a default value for events without Summary received by mail */
+	str = g_strdup_printf ("<i>%s</i>", C_("cal-itip", "None"));
 
 	html = text.value ? e_text_to_html_full (text.value, E_TEXT_TO_HTML_CONVERT_NL, 0) : str;
 	g_string_append_printf (