[network-manager-applet/NMA_0_8] po: clean up translator context (bgo #627488)

[Dan Williams <dcbw src gnome org>]

commit d77581aaf87babc6e28f63735bf94dac1ea379a2
Author: Claude Paroz <claude 2xlibre net>
Date:   Tue Aug 24 11:37:23 2010 -0500

    po: clean up translator context (bgo #627488)

 src/applet-device-gsm.c                        |   18 ++++++++++++------
 src/applet-dialogs.c                           |   16 ++++++++--------
 src/connection-editor/page-wireless-security.c |    2 +-
 src/wireless-dialog.c                          |    2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/src/applet-device-gsm.c b/src/applet-device-gsm.c
index bf68adf..f1b593a 100644
--- a/src/applet-device-gsm.c
+++ b/src/applet-device-gsm.c
@@ -970,24 +970,30 @@ unlock_dialog_new (NMDevice *device, GsmDeviceInfo *info)
 		header = _("SIM PIN Unlock Required");
 		/* FIXME: some warning about # of times you can enter incorrect PIN */
 		desc = g_strdup_printf (_("The mobile broadband device '%s' requires a SIM PIN code before it can be used."), device_desc);
-		label1 = C_("PIN code entry label", "PIN code:");
+		/* Translators: PIN code entry label */
+		label1 = _("PIN code:");
 		label1_min = 4;
 		label1_max = 8;
-		show_pass_label = C_("Show/obscure PIN checkbox label", "Show PIN code");
+		/* Translators: Show/obscure PIN checkbox label */
+		show_pass_label = _("Show PIN code");
 		unlock_code = UNLOCK_CODE_PIN;
 	} else if (!strcmp (info->unlock_required, "sim-puk")) {
 		title = _("SIM PUK unlock required");
 		header = _("SIM PUK Unlock Required");
 		/* FIXME: some warning about # of times you can enter incorrect PUK */
 		desc = g_strdup_printf (_("The mobile broadband device '%s' requires a SIM PUK code before it can be used."), device_desc);
-		label1 = C_("PUK code entry label", "PUK code:");
+		/* Translators: PUK code entry label */
+		label1 = _("PUK code:");
 		label1_min = label1_max = 8;
-		label2 = C_("New PIN entry label", "New PIN code:");
-		label3 = C_("New PIN verification entry label", "Re-enter new PIN code:");
+		/* Translators: New PIN entry label */
+		label2 = _("New PIN code:");
+		/* Translators: New PIN verification entry label */
+		label3 = _("Re-enter new PIN code:");
 		label2_min = label3_min = 4;
 		label2_max = label3_max = 8;
 		match23 = TRUE;
-		show_pass_label = C_("Show/obscure PIN/PUK checkbox label", "Show PIN/PUK codes");
+		/* Translators: Show/obscure PIN/PUK checkbox label */
+		show_pass_label = _("Show PIN/PUK codes");
 		unlock_code = UNLOCK_CODE_PUK;
 	} else {
 		g_warning ("Unhandled unlock request for '%s'", info->unlock_required);
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index b906178..58ad88b 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -195,7 +195,7 @@ create_info_label_security (NMConnection *connection)
 			else
 				label = get_eap_label (s_wireless_sec, s_8021x);
 		} else {
-			label = g_strdup (C_("No wifi security used", "None"));
+			label = g_strdup (C_("Wifi/wired security", "None"));
 		}
 	} else if (!strcmp (connection_type, NM_SETTING_WIRED_SETTING_NAME)) {
 		NMSetting8021x *s_8021x;
@@ -204,10 +204,10 @@ create_info_label_security (NMConnection *connection)
 		if (s_8021x)
 			label = get_eap_label (NULL, s_8021x);
 		else
-			label = g_strdup (C_("No wired security used", "None"));
+			label = g_strdup (C_("Wifi/wired security", "None"));
 	}
 
-	w = create_info_label (label ? label : C_("Unknown/unrecognized wired or wifi security", "Unknown"), TRUE);
+	w = create_info_label (label ? label : C_("Wifi/wired security", "Unknown"), TRUE);
 	g_free (label);
 
 	return w;
@@ -279,7 +279,7 @@ bitrate_changed_cb (GObject *device, GParamSpec *pspec, gpointer user_data)
 	if (bitrate)
 		str = g_strdup_printf (_("%u Mb/s"), bitrate);
 
-	gtk_label_set_text (GTK_LABEL (speed_label), str ? str : _("Unknown"));
+	gtk_label_set_text (GTK_LABEL (speed_label), str ? str : C_("Speed", "Unknown"));
 	g_free (str);
 }
 
@@ -381,7 +381,7 @@ info_dialog_add_page (GtkNotebook *notebook,
 	if (speed)
 		str = g_strdup_printf (_("%u Mb/s"), speed);
 
-	gtk_label_set_text (GTK_LABEL(speed_label), str ? str : _("Unknown"));
+	gtk_label_set_text (GTK_LABEL(speed_label), str ? str : C_("Speed", "Unknown"));
 	g_free (str);
 
 	gtk_table_attach_defaults (table,
@@ -418,7 +418,7 @@ info_dialog_add_page (GtkNotebook *notebook,
 	gtk_table_attach_defaults (table,
 							   create_info_label (_("IP Address:"), FALSE),
 							   0, 1, row, row + 1);
-	str = def_addr ? ip4_address_as_string (nm_ip4_address_get_address (def_addr)) : g_strdup (_("Unknown"));
+	str = def_addr ? ip4_address_as_string (nm_ip4_address_get_address (def_addr)) : g_strdup (C_("Address", "Unknown"));
 	gtk_table_attach_defaults (table,
 							   create_info_label (str, TRUE),
 							   1, 2, row, row + 1);
@@ -436,7 +436,7 @@ info_dialog_add_page (GtkNotebook *notebook,
 	gtk_table_attach_defaults (table,
 							   create_info_label (_("Broadcast Address:"), FALSE),
 							   0, 1, row, row + 1);
-	str = def_addr ? ip4_address_as_string (bcast) : g_strdup (_("Unknown"));
+	str = def_addr ? ip4_address_as_string (bcast) : g_strdup (C_("Address", "Unknown"));
 	gtk_table_attach_defaults (table,
 							   create_info_label (str, TRUE),
 							   1, 2, row, row + 1);
@@ -447,7 +447,7 @@ info_dialog_add_page (GtkNotebook *notebook,
 	gtk_table_attach_defaults (table,
 							   create_info_label (_("Subnet Mask:"), FALSE),
 							   0, 1, row, row + 1);
-	str = def_addr ? ip4_address_as_string (netmask) : g_strdup (_("Unknown"));
+	str = def_addr ? ip4_address_as_string (netmask) : g_strdup (C_("Subnet Mask", "Unknown"));
 	gtk_table_attach_defaults (table,
 							   create_info_label (str, TRUE),
 							   1, 2, row, row + 1);
diff --git a/src/connection-editor/page-wireless-security.c b/src/connection-editor/page-wireless-security.c
index d403cf6..a484031 100644
--- a/src/connection-editor/page-wireless-security.c
+++ b/src/connection-editor/page-wireless-security.c
@@ -235,7 +235,7 @@ finish_setup (CEPageWirelessSecurity *self, gpointer unused, GError *error, gpoi
 	if (nm_utils_security_valid (NMU_SEC_NONE, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
 		gtk_list_store_append (sec_model, &iter);
 		gtk_list_store_set (sec_model, &iter,
-		                    S_NAME_COLUMN, C_("No wifi security used", "None"),
+		                    S_NAME_COLUMN, C_("Wifi/wired security", "None"),
 		                    -1);
 		if (default_type == NMU_SEC_NONE)
 			active = item;
diff --git a/src/wireless-dialog.c b/src/wireless-dialog.c
index d312744..98b684c 100644
--- a/src/wireless-dialog.c
+++ b/src/wireless-dialog.c
@@ -916,7 +916,7 @@ security_combo_init (NMAWirelessDialog *self, gboolean auth_only)
 	if (nm_utils_security_valid (NMU_SEC_NONE, dev_caps, !!priv->ap, is_adhoc, ap_flags, ap_wpa, ap_rsn)) {
 		gtk_list_store_append (sec_model, &iter);
 		gtk_list_store_set (sec_model, &iter,
-		                    S_NAME_COLUMN, C_("No wifi security used", "None"),
+		                    S_NAME_COLUMN, C_("Wifi/wired security", "None"),
 		                    -1);
 		if (default_type == NMU_SEC_NONE)
 			active = item;