network-manager-applet r928 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Sat Oct  4 22:59:09 2008
New Revision: 928
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=928&view=rev

Log:
2008-10-04  Dan Williams  <dcbw redhat com>

	* src/wireless-dialog.c
		- (internal_init): use 'authentication' instead of secrets (bgo #548130);
			use 'hidden' instead of 'other' (bgo #544381)

	* src/applet-device-wifi.c
	  src/applet-device-wifi.h
	  src/applet.c
		- (nma_menu_show_cb, nma_menu_add_hidden_network_item): use 'hidden'
			instead of 'other' (bgo #544381)



Modified:
   trunk/ChangeLog
   trunk/src/applet-device-wifi.c
   trunk/src/applet-device-wifi.h
   trunk/src/applet.c
   trunk/src/wireless-dialog.c

Modified: trunk/src/applet-device-wifi.c
==============================================================================
--- trunk/src/applet-device-wifi.c	(original)
+++ trunk/src/applet-device-wifi.c	Sat Oct  4 22:59:09 2008
@@ -78,13 +78,13 @@
 }
 
 void
-nma_menu_add_other_network_item (GtkWidget *menu, NMApplet *applet)
+nma_menu_add_hidden_network_item (GtkWidget *menu, NMApplet *applet)
 {
 	GtkWidget *menu_item;
 	GtkWidget *label;
 
 	menu_item = gtk_menu_item_new ();
-	label = gtk_label_new_with_mnemonic (_("_Connect to Other Wireless Network..."));
+	label = gtk_label_new_with_mnemonic (_("_Connect to Hidden Wireless Network..."));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_container_add (GTK_CONTAINER (menu_item), label);
 	gtk_widget_show_all (menu_item);

Modified: trunk/src/applet-device-wifi.h
==============================================================================
--- trunk/src/applet-device-wifi.h	(original)
+++ trunk/src/applet-device-wifi.h	Sat Oct  4 22:59:09 2008
@@ -28,7 +28,7 @@
 
 NMADeviceClass *applet_device_wifi_get_class (NMApplet *applet);
 
-void nma_menu_add_other_network_item (GtkWidget *menu, NMApplet *applet);
+void nma_menu_add_hidden_network_item (GtkWidget *menu, NMApplet *applet);
 void nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet);
 
 #endif /* __APPLET_DEVICE_WIFI_H__ */

Modified: trunk/src/applet.c
==============================================================================
--- trunk/src/applet.c	(original)
+++ trunk/src/applet.c	Sat Oct  4 22:59:09 2008
@@ -1144,9 +1144,9 @@
 	nma_menu_add_vpn_submenu (menu, applet);
 
 	if (n_wireless > 0 && nm_client_wireless_get_enabled (applet->nm_client)) {
-		/* Add the "Other wireless network..." entry */
+		/* Add the "Hidden wireless network..." entry */
 		nma_menu_add_separator_item (menu);
-		nma_menu_add_other_network_item (menu, applet);
+		nma_menu_add_hidden_network_item (menu, applet);
 		nma_menu_add_create_network_item (menu, applet);
 	}
 

Modified: trunk/src/wireless-dialog.c
==============================================================================
--- trunk/src/wireless-dialog.c	(original)
+++ trunk/src/wireless-dialog.c	Sat Oct  4 22:59:09 2008
@@ -934,9 +934,9 @@
 
 		tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
 		                       esc_ssid ? esc_ssid : "<unknown>");
-		gtk_window_set_title (GTK_WINDOW (self), _("Wireless Network Secrets Required"));
+		gtk_window_set_title (GTK_WINDOW (self), _("Wireless Network Authentication Required"));
 		label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
-		                         _("Secrets required by wireless network"),
+		                         _("Authentication required by wireless network"),
 		                         tmp);
 		g_free (esc_ssid);
 		g_free (tmp);
@@ -946,10 +946,10 @@
 		                         _("New wireless network"),
 		                         _("Enter a name for the wireless network you wish to create."));
 	} else {
-		gtk_window_set_title (GTK_WINDOW (self), _("Connect to Other Wireless Network"));
+		gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wireless Network"));
 		label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
-		                         _("Existing wireless network"),
-		                         _("Enter the name of the wireless network to which you wish to connect."));
+		                         _("Hidden wireless network"),
+		                         _("Enter the name and security details of the hidden wireless network you wish to connect to."));
 	}
 
 	widget = glade_xml_get_widget (priv->xml, "caption_label");