summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-07-25 09:34:58 -0500
committerDan Williams <dcbw@redhat.com>2014-07-25 09:34:58 -0500
commita5e16733640465502bed43e55a2e0fc605f41822 (patch)
tree894ac7c085436f5152a718301bd7f91481f69607
parentd998078e9457f74e57d954dd9c1e170a0b80cbd1 (diff)
downloadnetwork-manager-applet-a5e16733640465502bed43e55a2e0fc605f41822.tar.gz
editor: remove "(PPP)" from WWAN addressing modes
Most WWAN devices don't use PPP for addressing these days.
-rw-r--r--src/connection-editor/page-ip4.c4
-rw-r--r--src/connection-editor/page-ip6.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index 2e909c3c..fe1a5759 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -135,8 +135,8 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
str_auto_only = _("Automatic (VPN) addresses only");
} else if ( priv->connection_type == NM_TYPE_SETTING_GSM
|| priv->connection_type == NM_TYPE_SETTING_CDMA) {
- str_auto = _("Automatic (PPP)");
- str_auto_only = _("Automatic (PPP) addresses only");
+ str_auto = _("Automatic");
+ str_auto_only = _("Automatic, addresses only");
} else if (priv->connection_type == NM_TYPE_SETTING_PPPOE) {
str_auto = _("Automatic (PPPoE)");
str_auto_only = _("Automatic (PPPoE) addresses only");
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 7dfea809..57964417 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -139,10 +139,6 @@ ip6_private_init (CEPageIP6 *self, NMConnection *connection)
if (priv->connection_type == NM_TYPE_SETTING_VPN) {
str_auto = _("Automatic (VPN)");
str_auto_only = _("Automatic (VPN) addresses only");
- } else if ( priv->connection_type == NM_TYPE_SETTING_GSM
- || priv->connection_type == NM_TYPE_SETTING_CDMA) {
- str_auto = _("Automatic (PPP)");
- str_auto_only = _("Automatic (PPP) addresses only");
} else if (priv->connection_type == NM_TYPE_SETTING_PPPOE) {
str_auto = _("Automatic (PPPoE)");
str_auto_only = _("Automatic (PPPoE) addresses only");