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

5 files changed, 11 insertions, 9 deletions

diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c
index 8e57dfcf66..8c2e21092b 100644
--- a/widgets/misc/e-account-tree-view.c
+++ b/widgets/misc/e-account-tree-view.c
@@ -121,7 +121,7 @@ account_tree_view_refresh_cb (EAccountList *account_list,
 		if (url != NULL && url->protocol != NULL)
 			protocol = url->protocol;
 		else
-			protocol = _("None");
+			protocol = C_("mail-receiving", "None");
 
 		gtk_list_store_append (store, &tree_iter);
 		gtk_list_store_set (
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 03af596bc2..975018ef27 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -1674,7 +1674,8 @@ field_set_to_none (const gchar *text)
 	while (n = (gint)((guchar)*pos), isspace (n))
 		pos++;
 
-	none_string = _("None");
+	/* Translators: "None" for date field of a date edit, shown when there is no date set */
+	none_string = C_("date", "None");
 
 	if (*pos == '\0' || !strncmp (pos, none_string, strlen (none_string)))
 		return TRUE;
@@ -1891,7 +1892,7 @@ e_date_edit_update_date_entry		(EDateEdit	*dedit)
 	priv = dedit->priv;
 
 	if (priv->date_set_to_none || !priv->date_is_valid) {
-		gtk_entry_set_text (GTK_ENTRY (priv->date_entry), _("None"));
+		gtk_entry_set_text (GTK_ENTRY (priv->date_entry), C_("date", "None"));
 	} else {
 		/* This is a strftime() format for a short date.
 		   %x the preferred date representation for the current locale without the time,
diff --git a/widgets/misc/e-send-options.ui b/widgets/misc/e-send-options.ui
index d02393b82f..c5911d456a 100644
--- a/widgets/misc/e-send-options.ui
+++ b/widgets/misc/e-send-options.ui
@@ -66,7 +66,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">None</col>
+        <col id="0" translatable="yes" context="send-options" comments="Translators: Used in send options dialog">None</col>
       </row>
       <row>
         <col id="0" translatable="yes">Mail Receipt</col>
@@ -79,7 +79,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">None</col>
+        <col id="0" translatable="yes" context="send-options">None</col>
       </row>
       <row>
         <col id="0" translatable="yes">Mail Receipt</col>
@@ -92,7 +92,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">None</col>
+        <col id="0" translatable="yes" context="send-options">None</col>
       </row>
       <row>
         <col id="0" translatable="yes">Mail Receipt</col>
@@ -105,7 +105,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">None</col>
+        <col id="0" translatable="yes" context="send-options">None</col>
       </row>
       <row>
         <col id="0" translatable="yes">Mail Receipt</col>
diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c
index fe4e474729..a70c9cc38a 100644
--- a/widgets/misc/e-signature-combo-box.c
+++ b/widgets/misc/e-signature-combo-box.c
@@ -72,7 +72,7 @@ signature_combo_box_refresh_cb (ESignatureList *signature_list,
 	gtk_list_store_append (store, &tree_iter);
 	gtk_list_store_set (
 		store, &tree_iter,
-		COLUMN_STRING, _("None"),
+		COLUMN_STRING, C_("mail-signature", "None"),
 		COLUMN_SIGNATURE, NULL, -1);
 
 	if (signature_list == NULL)
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 1848b2808a..88b077595e 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -309,7 +309,8 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 			    ecde);
 	ecde->today_button = today_button;
 
-	none_button = gtk_button_new_with_label (_("None"));
+	/* Translators: "None" as a label of a button to unset date in a date table cell */
+	none_button = gtk_button_new_with_label (C_("table-date", "None"));
 	gtk_container_add (GTK_CONTAINER (bbox), none_button);
         gtk_widget_show (none_button);
 	g_signal_connect((none_button), "clicked",