Commit 89bf7c0a authored by Dan Winship's avatar Dan Winship
Browse files

applet, connection-editor: Use "Ethernet" and "Wi-Fi" in the UI

Change "Wired" to "Ethernet" and "Wireless" to "Wi-Fi" everywhere in
the UI, to more clearly reflect what they mean. (ie, "Wired" did not
include DSL or InfiniBand, and "Wireless" did not include mobile
broadband or WiMAX.)

Also, fix some places that used "wifi"/"Wifi"/"WiFi" instead of
"Wi-Fi".
parent 307b3a70
......@@ -19,7 +19,7 @@
<key name="suppress-wireless-networks-available" type="b">
<default>false</default>
<_summary>Suppress networks available notifications</_summary>
<_description>Set this to true to disable notifications when wireless networks are available.</_description>
<_description>Set this to true to disable notifications when Wi-Fi networks are available.</_description>
</key>
<key name="stamp" type="i">
<default>0</default>
......
......@@ -94,7 +94,7 @@ nma_menu_add_hidden_network_item (GtkWidget *menu, NMApplet *applet)
GtkWidget *label;
menu_item = gtk_menu_item_new ();
label = gtk_label_new_with_mnemonic (_("_Connect to Hidden Wireless Network..."));
label = gtk_label_new_with_mnemonic (_("_Connect to Hidden Wi-Fi 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);
......@@ -145,7 +145,7 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet)
GtkWidget *label;
menu_item = gtk_menu_item_new ();
label = gtk_label_new_with_mnemonic (_("Create _New Wireless Network..."));
label = gtk_label_new_with_mnemonic (_("Create _New Wi-Fi 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);
......@@ -787,11 +787,11 @@ wireless_add_menu_item (NMDevice *device,
g_assert (desc);
if (aps && aps->len > 1)
text = g_strdup_printf (_("Wireless Networks (%s)"), desc);
text = g_strdup_printf (_("Wi-Fi Networks (%s)"), desc);
else
text = g_strdup_printf (_("Wireless Network (%s)"), desc);
text = g_strdup_printf (_("Wi-Fi Network (%s)"), desc);
} else
text = g_strdup (ngettext ("Wireless Network", "Wireless Networks", aps ? aps->len : 0));
text = g_strdup (ngettext ("Wi-Fi Network", "Wi-Fi Networks", aps ? aps->len : 0));
widget = applet_menu_item_create_device_item_helper (device, applet, text);
g_free (text);
......@@ -1065,8 +1065,8 @@ idle_check_avail_access_point_notification (gpointer datap)
applet_do_notify (applet,
NOTIFY_URGENCY_LOW,
_("Wireless Networks Available"),
_("Use the network menu to connect to a wireless network"),
_("Wi-Fi Networks Available"),
_("Use the network menu to connect to a Wi-Fi network"),
"nm-device-wireless",
"dont-show",
_("Don't show this message again"),
......@@ -1260,7 +1260,7 @@ wireless_device_state_changed (NMDevice *device,
return;
esc_ssid = get_ssid_utf8 (new);
msg = g_strdup_printf (_("You are now connected to the wireless network '%s'."), esc_ssid);
msg = g_strdup_printf (_("You are now connected to the Wi-Fi network '%s'."), esc_ssid);
applet_do_notify_with_pref (applet, _("Connection Established"),
msg, "nm-device-wireless",
PREF_DISABLE_CONNECTED_NOTIFICATIONS);
......@@ -1291,16 +1291,16 @@ wireless_get_icon (NMDevice *device,
switch (state) {
case NM_DEVICE_STATE_PREPARE:
*tip = g_strdup_printf (_("Preparing wireless network connection '%s'..."), id);
*tip = g_strdup_printf (_("Preparing Wi-Fi network connection '%s'..."), id);
break;
case NM_DEVICE_STATE_CONFIG:
*tip = g_strdup_printf (_("Configuring wireless network connection '%s'..."), id);
*tip = g_strdup_printf (_("Configuring Wi-Fi network connection '%s'..."), id);
break;
case NM_DEVICE_STATE_NEED_AUTH:
*tip = g_strdup_printf (_("User authentication required for wireless network '%s'..."), id);
*tip = g_strdup_printf (_("User authentication required for Wi-Fi network '%s'..."), id);
break;
case NM_DEVICE_STATE_IP_CONFIG:
*tip = g_strdup_printf (_("Requesting a wireless network address for '%s'..."), id);
*tip = g_strdup_printf (_("Requesting a Wi-Fi network address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
if (ap) {
......@@ -1321,12 +1321,12 @@ wireless_get_icon (NMDevice *device,
pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet);
ssid = get_ssid_utf8 (ap);
*tip = g_strdup_printf (_("Wireless network connection '%s' active: %s (%d%%)"),
*tip = g_strdup_printf (_("Wi-Fi network connection '%s' active: %s (%d%%)"),
id, ssid, strength);
g_free (ssid);
} else {
pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet);
*tip = g_strdup_printf (_("Wireless network connection '%s' active"), id);
*tip = g_strdup_printf (_("Wi-Fi network connection '%s' active"), id);
}
break;
default:
......@@ -1590,7 +1590,7 @@ get_secrets_dialog_response_cb (GtkDialog *foo,
g_set_error (&error,
NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
"%s.%d (%s): couldn't get connection from wireless dialog.",
"%s.%d (%s): couldn't get connection from Wi-Fi dialog.",
__FILE__, __LINE__, __func__);
goto done;
}
......
......@@ -202,14 +202,14 @@ wired_add_menu_item (NMDevice *device,
g_assert (desc);
if (g_slist_length (connections) > 1)
text = g_strdup_printf (_("Wired Networks (%s)"), desc);
text = g_strdup_printf (_("Ethernet Networks (%s)"), desc);
else
text = g_strdup_printf (_("Wired Network (%s)"), desc);
text = g_strdup_printf (_("Ethernet Network (%s)"), desc);
} else {
if (g_slist_length (connections) > 1)
text = g_strdup (_("Wired Networks"));
text = g_strdup (_("Ethernet Networks"));
else
text = g_strdup (_("Wired Network"));
text = g_strdup (_("Ethernet Network"));
}
item = applet_menu_item_create_device_item_helper (device, applet, text);
......@@ -271,7 +271,7 @@ wired_device_state_changed (NMDevice *device,
applet_do_notify_with_pref (applet,
_("Connection Established"),
str ? str : _("You are now connected to the wired network."),
str ? str : _("You are now connected to the ethernet network."),
"nm-device-wired",
PREF_DISABLE_CONNECTED_NOTIFICATIONS);
g_free (str);
......@@ -297,20 +297,20 @@ wired_get_icon (NMDevice *device,
switch (state) {
case NM_DEVICE_STATE_PREPARE:
*tip = g_strdup_printf (_("Preparing wired network connection '%s'..."), id);
*tip = g_strdup_printf (_("Preparing ethernet network connection '%s'..."), id);
break;
case NM_DEVICE_STATE_CONFIG:
*tip = g_strdup_printf (_("Configuring wired network connection '%s'..."), id);
*tip = g_strdup_printf (_("Configuring ethernet network connection '%s'..."), id);
break;
case NM_DEVICE_STATE_NEED_AUTH:
*tip = g_strdup_printf (_("User authentication required for wired network connection '%s'..."), id);
*tip = g_strdup_printf (_("User authentication required for ethernet network connection '%s'..."), id);
break;
case NM_DEVICE_STATE_IP_CONFIG:
*tip = g_strdup_printf (_("Requesting a wired network address for '%s'..."), id);
*tip = g_strdup_printf (_("Requesting an ethernet network address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->wired_icon, applet);
*tip = g_strdup_printf (_("Wired network connection '%s' active"), id);
*tip = g_strdup_printf (_("Ethernet network connection '%s' active"), id);
break;
default:
break;
......@@ -557,7 +557,7 @@ get_8021x_secrets_cb (GtkDialog *dialog, gint response, gpointer user_data)
g_set_error (&error,
NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
"%s.%d (%s): couldn't get connection from wired dialog.",
"%s.%d (%s): couldn't get connection from ethernet dialog.",
__FILE__, __LINE__, __func__);
goto done;
}
......@@ -631,7 +631,7 @@ wired_get_secrets (SecretsRequest *req, GError **error)
g_set_error (error,
NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
"%s.%d (%s): unhandled wired connection type '%s'",
"%s.%d (%s): unhandled ethernet connection type '%s'",
__FILE__, __LINE__, __func__, ctype);
}
......
......@@ -95,7 +95,7 @@ impl_dbus_connect_to_hidden_network (NMApplet *applet, GError **error)
g_set_error_literal (error,
NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
"Failed to create wireless dialog");
"Failed to create Wi-Fi dialog");
return FALSE;
}
......@@ -109,7 +109,7 @@ impl_dbus_create_wifi_network (NMApplet *applet, GError **error)
g_set_error_literal (error,
NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED,
"Creation of wifi networks has been disabled by system policy.");
"Creation of Wi-Fi networks has been disabled by system policy.");
return FALSE;
}
......@@ -117,7 +117,7 @@ impl_dbus_create_wifi_network (NMApplet *applet, GError **error)
g_set_error_literal (error,
NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
"Failed to create wireless dialog");
"Failed to create Wi-Fi dialog");
return FALSE;
}
......@@ -165,7 +165,7 @@ impl_dbus_connect_to_8021x_network (NMApplet *applet,
g_set_error_literal (error,
NM_SECRET_AGENT_ERROR,
NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
"Failed to create wireless dialog");
"Failed to create Wi-Fi dialog");
return FALSE;
}
......@@ -1836,7 +1836,7 @@ static void nma_menu_show_cb (GtkWidget *menu, NMApplet *applet)
nma_menu_add_vpn_submenu (menu, applet);
if (n_wireless > 0 && nm_client_wireless_get_enabled (applet->nm_client)) {
/* Add the "Hidden wireless network..." entry */
/* Add the "Hidden Wi-Fi network..." entry */
nma_menu_add_separator_item (menu);
nma_menu_add_hidden_network_item (menu, applet);
nma_menu_add_create_network_item (menu, applet);
......
......@@ -283,7 +283,7 @@
<object class="GtkEntry" id="wireless_bssid">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">This option locks this connection to the wireless access point (AP) specified by the BSSID entered here. Example: 00:11:22:33:44:55</property>
<property name="tooltip_text" translatable="yes">This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here. Example: 00:11:22:33:44:55</property>
</object>
<packing>
<property name="left_attach">1</property>
......
......@@ -85,13 +85,13 @@ get_connection_type_list (void)
array = g_array_new (TRUE, FALSE, sizeof (ConnectionTypeData));
theme = gtk_icon_theme_get_default ();
data.name = _("Wired");
data.name = _("Ethernet");
ICON_LOAD (data.icon, "nm-device-wired");
data.new_connection_func = wired_connection_new;
data.setting_type = NM_TYPE_SETTING_WIRED;
g_array_append_val (array, data);
data.name = _("Wireless");
data.name = _("Wi-Fi");
ICON_LOAD (data.icon, "nm-device-wireless");
data.new_connection_func = wifi_connection_new;
data.setting_type = NM_TYPE_SETTING_WIRELESS;
......
......@@ -80,7 +80,7 @@ finish_setup (CEPageWiredSecurity *self, gpointer unused, GError *error, gpointe
priv->security = (WirelessSecurity *) ws_wpa_eap_new (parent->connection, TRUE, FALSE);
if (!priv->security) {
g_warning ("Could not load wired 802.1x user interface.");
g_warning ("Could not load 802.1x user interface.");
return;
}
......@@ -118,7 +118,7 @@ ce_page_wired_security_new (NMConnection *connection,
NULL,
_("802.1x Security")));
if (!self) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load Wired Security security user interface."));
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load 802.1x Security user interface."));
return NULL;
}
......
......@@ -270,9 +270,9 @@ ce_page_wired_new (NMConnection *connection,
client,
UIDIR "/ce-page-wired.ui",
"WiredPage",
_("Wired")));
_("Ethernet")));
if (!self) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load wired user interface."));
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load ethernet user interface."));
return NULL;
}
......@@ -448,7 +448,7 @@ wired_connection_new (GtkWindow *parent,
{
NMConnection *connection;
connection = ce_page_new_connection (_("Wired connection %d"),
connection = ce_page_new_connection (_("Ethernet connection %d"),
NM_SETTING_WIRED_SETTING_NAME,
TRUE,
settings,
......
......@@ -392,7 +392,7 @@ ce_page_wireless_security_new (NMConnection *connection,
s_wireless = nm_connection_get_setting_wireless (connection);
if (!s_wireless) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load WiFi security user interface; missing WiFi setting."));
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load Wi-Fi security user interface; missing Wi-Fi setting."));
return NULL;
}
......@@ -402,9 +402,9 @@ ce_page_wireless_security_new (NMConnection *connection,
client,
UIDIR "/ce-page-wireless-security.ui",
"WirelessSecurityPage",
_("Wireless Security")));
_("Wi-Fi Security")));
if (!self) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load WiFi security user interface."));
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load Wi-Fi security user interface."));
return NULL;
}
......@@ -492,7 +492,7 @@ validate (CEPage *page, NMConnection *connection, GError **error)
if (valid)
wireless_security_fill_connection (sec, connection);
else
g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, "Invalid wireless security");
g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, "Invalid Wi-Fi security");
} else {
g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, "Missing SSID");
valid = FALSE;
......
......@@ -459,9 +459,9 @@ ce_page_wireless_new (NMConnection *connection,
client,
UIDIR "/ce-page-wireless.ui",
"WirelessPage",
_("Wireless")));
_("Wi-Fi")));
if (!self) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load WiFi user interface."));
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load Wi-Fi user interface."));
return NULL;
}
......@@ -666,7 +666,7 @@ wifi_connection_new (GtkWindow *parent,
NMConnection *connection;
NMSetting *s_wifi;
connection = ce_page_new_connection (_("Wireless connection %d"),
connection = ce_page_new_connection (_("Wi-Fi connection %d"),
NM_SETTING_WIRELESS_SETTING_NAME,
TRUE,
settings,
......
......@@ -347,7 +347,7 @@ connection_combo_changed (GtkWidget *combo,
C_NEW_COLUMN, &is_new, -1);
if (!security_combo_init (self, priv->secrets_only)) {
g_warning ("Couldn't change wireless security combo box.");
g_warning ("Couldn't change Wi-Fi security combo box.");
return;
}
security_combo_changed (priv->sec_combo, self);
......@@ -566,7 +566,7 @@ device_combo_changed (GtkWidget *combo,
}
if (!security_combo_init (self, priv->secrets_only)) {
g_warning ("Couldn't change wireless security combo box.");
g_warning ("Couldn't change Wi-Fi security combo box.");
return;
}
......@@ -1096,7 +1096,7 @@ internal_init (NMAWirelessDialog *self,
gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, FALSE);
if (!device_combo_init (self, specific_device)) {
g_warning ("No wireless devices available.");
g_warning ("No Wi-Fi devices available.");
return FALSE;
}
......@@ -1106,7 +1106,7 @@ internal_init (NMAWirelessDialog *self,
}
if (!security_combo_init (self, priv->secrets_only)) {
g_warning ("Couldn't set up wireless security combo box.");
g_warning ("Couldn't set up Wi-Fi security combo box.");
return FALSE;
}
......@@ -1138,24 +1138,24 @@ internal_init (NMAWirelessDialog *self,
if (ssid)
esc_ssid = nm_utils_ssid_to_utf8 (ssid);
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network '%s'."),
esc_ssid ? esc_ssid : "<unknown>");
gtk_window_set_title (GTK_WINDOW (self), _("Wireless Network Authentication Required"));
gtk_window_set_title (GTK_WINDOW (self), _("Wi-Fi Network Authentication Required"));
label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
_("Authentication required by wireless network"),
_("Authentication required by Wi-Fi network"),
tmp);
g_free (esc_ssid);
g_free (tmp);
} else if (priv->adhoc_create) {
gtk_window_set_title (GTK_WINDOW (self), _("Create New Wireless Network"));
gtk_window_set_title (GTK_WINDOW (self), _("Create New Wi-Fi Network"));
label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
_("New wireless network"),
_("Enter a name for the wireless network you wish to create."));
_("New Wi-Fi network"),
_("Enter a name for the Wi-Fi network you wish to create."));
} else {
gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wireless Network"));
gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wi-Fi Network"));
label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
_("Hidden wireless network"),
_("Enter the name and security details of the hidden wireless network you wish to connect to."));
_("Hidden Wi-Fi network"),
_("Enter the name and security details of the hidden Wi-Fi network you wish to connect to."));
}
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "caption_label"));
......@@ -1284,7 +1284,7 @@ nma_wireless_dialog_new (NMClient *client,
priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
if (!internal_init (self, connection, device, secrets_only, FALSE)) {
g_warning ("Couldn't create wireless security dialog.");
g_warning ("Couldn't create Wi-Fi security dialog.");
gtk_widget_destroy (GTK_WIDGET (self));
self = NULL;
}
......@@ -1315,7 +1315,7 @@ internal_new_other (NMClient *client, NMRemoteSettings *settings, gboolean creat
priv->adhoc_create = create;
if (!internal_init (self, NULL, NULL, FALSE, create)) {
g_warning ("Couldn't create wireless security dialog.");
g_warning ("Couldn't create Wi-Fi security dialog.");
gtk_widget_destroy (GTK_WIDGET (self));
return NULL;
}
......
......@@ -80,7 +80,7 @@
<object class="GtkLabel" id="security_combo_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Wireless _security:</property>
<property name="label" translatable="yes">Wi-Fi _security:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">security_combo</property>
</object>
......@@ -172,7 +172,7 @@
<object class="GtkLabel" id="device_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Wireless _adapter:</property>
<property name="label" translatable="yes">Wi-Fi _adapter:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">device_combo</property>
</object>
......
......@@ -4,7 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="wired_8021x_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Wired 802.1X authentication</property>
<property name="title" translatable="yes">802.1X authentication</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-always</property>
......
......@@ -101,7 +101,7 @@ nma_wired_dialog_new (NMConnection *connection)
return NULL;
}
gtk_window_set_title (GTK_WINDOW (dialog), _("Wired 802.1X authentication"));
gtk_window_set_title (GTK_WINDOW (dialog), _("802.1X authentication"));
gtk_window_set_icon_name (GTK_WINDOW (dialog), "dialog-password");
dialog_set_network_name (connection, GTK_ENTRY (gtk_builder_get_object (builder, "network_name_entry")));
......
......@@ -273,7 +273,7 @@ eap_method_nag_init (EAPMethod *method,
text = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
_("No Certificate Authority certificate chosen"),
_("Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks. Would you like to choose a Certificate Authority certificate?"));
_("Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate Authority certificate?"));
gtk_label_set_markup (GTK_LABEL (widget), text);
g_free (text);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment