From 37d6184312c9d4cdf9ae134c6408da6a88520c39 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 14 Jul 2010 15:46:20 -0700
Subject: [PATCH 01/17] policy: don't tear down user connections on VT switch
 (rh #614556)

PK's "allow_inactive" actually means "allow inactive *local* users", so
we do want to allow inactive local users to provide user connections.
We don't want to allow non-local inactive users to provide user connections.

So make the use-user-connections privilege match for both active and
inactive so we get the behavior we want.
---
 policy/org.freedesktop.NetworkManager.policy.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/policy/org.freedesktop.NetworkManager.policy.in b/policy/org.freedesktop.NetworkManager.policy.in
index e6540655d4..3e7db0588e 100644
--- a/policy/org.freedesktop.NetworkManager.policy.in
+++ b/policy/org.freedesktop.NetworkManager.policy.in
@@ -49,7 +49,7 @@
     <_description>Allow use of user-specific connections</_description>
     <_message>System policy prevents use of user-specific connections</_message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_inactive>yes</allow_inactive>
       <allow_active>yes</allow_active>
     </defaults>
   </action>

From 72399bfa2cab6de881518b4b473c5b2a76f058b8 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 14 Jul 2010 17:49:20 -0700
Subject: [PATCH 02/17] examples: add device disconnect example

---
 examples/python/Makefile.am          |  3 +-
 examples/python/disconnect-device.py | 62 ++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100755 examples/python/disconnect-device.py

diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am
index 179e2f3c9a..dec8b571f7 100644
--- a/examples/python/Makefile.am
+++ b/examples/python/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST = \
 	add-system-connection.py \
 	vpn.py \
 	list-connections.py \
-	show-bssids.py
+	show-bssids.py \
+	disconnect-device.py
 
 
diff --git a/examples/python/disconnect-device.py b/examples/python/disconnect-device.py
new file mode 100755
index 0000000000..f885495140
--- /dev/null
+++ b/examples/python/disconnect-device.py
@@ -0,0 +1,62 @@
+#!/bin/env python
+# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright (C) 2010 Red Hat, Inc.
+#
+
+import dbus, sys
+
+# This example takes a device interface name as a parameter and tells
+# NetworkManager to disconnect that device, closing down any network
+# connection it may have
+
+if len(sys.argv) != 2:
+    raise Exception("Usage: %s <interface>" % sys.argv[0])
+
+bus = dbus.SystemBus()
+
+# Get a proxy for the base NetworkManager object
+proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager")
+manager = dbus.Interface(proxy, "org.freedesktop.NetworkManager")
+
+dpath = None
+
+# Find the device the user wants to disconnect
+devices = manager.GetDevices()
+for d in devices:
+    dev_proxy = bus.get_object("org.freedesktop.NetworkManager", d)
+    prop_iface = dbus.Interface(dev_proxy, "org.freedesktop.DBus.Properties")
+    iface = prop_iface.Get("org.freedesktop.NetworkManager.Device", "Interface")
+    if iface == sys.argv[1]:
+        dpath = d
+        break
+
+if not dpath or not len(dpath):
+    raise Exception("NetworkManager knows nothing about %s" % sys.argv[1])
+
+dev_proxy = bus.get_object("org.freedesktop.NetworkManager", dpath)
+dev_iface = dbus.Interface(dev_proxy, "org.freedesktop.NetworkManager.Device")
+prop_iface = dbus.Interface(dev_proxy, "org.freedesktop.DBus.Properties")
+
+# Make sure the device is connected before we try to disconnect it
+state = prop_iface.Get("org.freedesktop.NetworkManager.Device", "State")
+if state <= 3:
+    raise Exception("Device %s isn't connected" % sys.argv[1])
+
+# Tell NM to disconnect it
+dev_iface.Disconnect()
+

From 4880cc68b2e1a6580f30318c660c2f669b8f5708 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 15 Jul 2010 00:00:42 -0700
Subject: [PATCH 03/17] wifi: work around wl.o frequency reporting for active
 AP matching

Some proprietary drivers (wl.o) report tuned frequency (like when
scanning) instead of the associated AP's frequency.  This is a great
example of how WEXT is underspecified.  We use frequency to find the
active AP in the scan list because some configurations use the same
SSID/BSSID on the 2GHz and 5GHz bands simultaneously, and we need to
make sure we get the right AP in the right band.  This configuration
is uncommon though, and the frequency check penalizes closed drivers we
can't fix.  Because we're not total dicks, ignore the frequency condition
if the associated BSSID/SSID exists only in one band since that's most
likely the AP we want.
---
 src/nm-device-wifi.c | 48 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index dc76dc29db..895d4d1765 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -829,6 +829,11 @@ get_active_ap (NMDeviceWifi *self,
 	const GByteArray *ssid;
 	GSList *iter;
 	int i = 0;
+	NMAccessPoint *match_nofreq = NULL;
+	gboolean found_a_band = FALSE;
+	gboolean found_bg_band = FALSE;
+	NM80211Mode devmode;
+	guint32 devfreq;
 
 	nm_device_wifi_get_bssid (self, &bssid);
 	nm_log_dbg (LOGD_WIFI, "(%s): active BSSID: %02x:%02x:%02x:%02x:%02x:%02x",
@@ -847,6 +852,9 @@ get_active_ap (NMDeviceWifi *self,
 	            ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)",
 	            ssid ? "'" : "");
 
+	devmode = nm_device_wifi_get_mode (self);
+	devfreq = nm_device_wifi_get_frequency (self);
+
 	/* When matching hidden APs, do a second pass that ignores the SSID check,
 	 * because NM might not yet know the SSID of the hidden AP in the scan list
 	 * and therefore it won't get matched the first time around.
@@ -859,8 +867,8 @@ get_active_ap (NMDeviceWifi *self,
 			NMAccessPoint *ap = NM_AP (iter->data);
 			const struct ether_addr	*ap_bssid = nm_ap_get_address (ap);
 			const GByteArray *ap_ssid = nm_ap_get_ssid (ap);
-			NM80211Mode devmode, apmode;
-			guint32 devfreq, apfreq;
+			NM80211Mode apmode;
+			guint32 apfreq;
 
 			nm_log_dbg (LOGD_WIFI, "    AP: %s%s%s  %02x:%02x:%02x:%02x:%02x:%02x",
 			            ap_ssid ? "'" : "",
@@ -885,7 +893,6 @@ get_active_ap (NMDeviceWifi *self,
 				continue;
 			}
 
-			devmode = nm_device_wifi_get_mode (self);
 			apmode = nm_ap_get_mode (ap);
 			if (devmode != apmode) {
 				nm_log_dbg (LOGD_WIFI, "      mode mismatch (device %d, ap %d)",
@@ -893,11 +900,18 @@ get_active_ap (NMDeviceWifi *self,
 				continue;
 			}
 
-			devfreq = nm_device_wifi_get_frequency (self);
 			apfreq = nm_ap_get_freq (ap);
 			if (devfreq != apfreq) {
 				nm_log_dbg (LOGD_WIFI, "      frequency mismatch (device %u, ap %u)",
 				            devfreq, apfreq);
+
+				if (match_nofreq == NULL)
+					match_nofreq = ap;
+
+				if (apfreq > 4000)
+					found_a_band = TRUE;
+				else if (apfreq > 2000)
+					found_bg_band = TRUE;
 				continue;
 			}
 
@@ -907,6 +921,32 @@ get_active_ap (NMDeviceWifi *self,
 		}
 	}
 
+	/* Some proprietary drivers (wl.o) report tuned frequency (like when
+	 * scanning) instead of the associated AP's frequency.  This is a great
+	 * example of how WEXT is underspecified.  We use frequency to find the
+	 * active AP in the scan list because some configurations use the same
+	 * SSID/BSSID on the 2GHz and 5GHz bands simultaneously, and we need to
+	 * make sure we get the right AP in the right band.  This configuration
+	 * is uncommon though, and the frequency check penalizes closed drivers we
+	 * can't fix.  Because we're not total dicks, ignore the frequency condition
+	 * if the associated BSSID/SSID exists only in one band since that's most
+	 * likely the AP we want.
+	 */
+	if (match_nofreq && (found_a_band != found_bg_band)) {
+		const struct ether_addr	*ap_bssid = nm_ap_get_address (match_nofreq);
+		const GByteArray *ap_ssid = nm_ap_get_ssid (match_nofreq);
+
+		nm_log_dbg (LOGD_WIFI, "    matched %s%s%s  %02x:%02x:%02x:%02x:%02x:%02x",
+		            ap_ssid ? "'" : "",
+		            ap_ssid ? nm_utils_escape_ssid (ap_ssid->data, ap_ssid->len) : "(none)",
+		            ap_ssid ? "'" : "",
+		            ap_bssid->ether_addr_octet[0], ap_bssid->ether_addr_octet[1],
+		            ap_bssid->ether_addr_octet[2], ap_bssid->ether_addr_octet[3],
+		            ap_bssid->ether_addr_octet[4], ap_bssid->ether_addr_octet[5]);
+
+		return match_nofreq;
+	}
+
 	nm_log_dbg (LOGD_WIFI, "  No matching AP found.");
 	return NULL;
 }

From e780145a8f58a97114642b24d65bc39185181c2e Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 16 Jul 2010 11:28:39 -0700
Subject: [PATCH 04/17] dhcp4: handle NIS servers and domains

---
 src/dhcp-manager/nm-dhcp-client.c | 21 ++++++++
 src/nm-ip4-config.c               | 79 +++++++++++++++++++++++++++++++
 src/nm-ip4-config.h               | 11 +++++
 3 files changed, 111 insertions(+)

diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index 1ed62ab9df..1d50d4221b 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -893,6 +893,27 @@ ip4_options_to_config (NMDHCPClient *self)
 			nm_ip4_config_set_mtu (ip4_config, int_mtu);
 	}
 
+	str = g_hash_table_lookup (priv->options, "new_nis_domain");
+	if (str) {
+		nm_log_info (LOGD_DHCP4, "  NIS domain '%s'", str);
+		nm_ip4_config_set_nis_domain (ip4_config, str);
+	}
+
+	str = g_hash_table_lookup (priv->options, "new_nis_servers");
+	if (str) {
+		char **searches = g_strsplit (str, " ", 0);
+		char **s;
+
+		for (s = searches; *s; s++) {
+			if (inet_pton (AF_INET, *s, &tmp_addr) > 0) {
+				nm_ip4_config_add_nis_server (ip4_config, tmp_addr.s_addr);
+				nm_log_info (LOGD_DHCP4, "  nis '%s'", *s);
+			} else
+				nm_log_warn (LOGD_DHCP4, "ignoring invalid NIS server '%s'", *s);
+		}
+		g_strfreev (searches);
+	}
+
 	return ip4_config;
 
 error:
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 6dcc2dbcfe..0ae3d1bee4 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -56,6 +56,9 @@ typedef struct {
 
 	GArray *wins;
 
+	GArray *nis;
+	char * nis_domain;
+
 	GSList *routes;
 
 	gboolean never_default;
@@ -488,6 +491,70 @@ nm_ip4_config_set_never_default (NMIP4Config *config, gboolean never_default)
 	NM_IP4_CONFIG_GET_PRIVATE (config)->never_default = never_default;
 }
 
+void nm_ip4_config_add_nis_server (NMIP4Config *config, guint32 nis)
+{
+	NMIP4ConfigPrivate *priv;
+	int i;
+
+	g_return_if_fail (NM_IS_IP4_CONFIG (config));
+	g_return_if_fail (nis > 0);
+
+	priv = NM_IP4_CONFIG_GET_PRIVATE (config);
+	for (i = 0; i < priv->nis->len; i++) {
+		guint32 s = g_array_index (priv->nis, guint32, i);
+
+		/* No dupes */
+		g_return_if_fail (nis != s);
+	}
+
+	g_array_append_val (priv->nis, nis);
+}
+
+guint32 nm_ip4_config_get_nis_server (NMIP4Config *config, guint i)
+{
+	g_return_val_if_fail (NM_IS_IP4_CONFIG (config), 0);
+
+	return g_array_index (NM_IP4_CONFIG_GET_PRIVATE (config)->nis, guint32, i);
+}
+
+guint32 nm_ip4_config_get_num_nis_servers (NMIP4Config *config)
+{
+	g_return_val_if_fail (NM_IS_IP4_CONFIG (config), 0);
+
+	return NM_IP4_CONFIG_GET_PRIVATE (config)->nis->len;
+}
+
+void nm_ip4_config_reset_nis_servers (NMIP4Config *config)
+{
+	NMIP4ConfigPrivate *priv;
+
+	g_return_if_fail (NM_IS_IP4_CONFIG (config));
+
+	priv = NM_IP4_CONFIG_GET_PRIVATE (config);
+	if (priv->nis->len)
+		g_array_remove_range (priv->nis, 0, priv->nis->len);
+}
+
+void
+nm_ip4_config_set_nis_domain (NMIP4Config *config, const char *domain)
+{
+	NMIP4ConfigPrivate *priv;
+
+	g_return_if_fail (NM_IS_IP4_CONFIG (config));
+
+	priv = NM_IP4_CONFIG_GET_PRIVATE (config);
+	g_free (priv->nis_domain);
+	priv->nis_domain = g_strdup (domain);
+}
+
+const char *
+nm_ip4_config_get_nis_domain (NMIP4Config *config)
+{
+	g_return_val_if_fail (NM_IS_IP4_CONFIG (config), 0);
+
+	return NM_IP4_CONFIG_GET_PRIVATE (config)->nis_domain;
+}
+
 /* libnl convenience/conversion functions */
 
 static int ip4_addr_to_rtnl_local (guint32 ip4_address, struct rtnl_addr *addr)
@@ -700,6 +767,15 @@ nm_ip4_config_diff (NMIP4Config *a, NMIP4Config *b)
 	    || !addr_array_compare (b_priv->wins, a_priv->wins))
 		flags |= NM_IP4_COMPARE_FLAG_WINS_SERVERS;
 
+	if (   (a_priv->nis->len != b_priv->nis->len)
+	    || !addr_array_compare (a_priv->nis, b_priv->nis)
+	    || !addr_array_compare (b_priv->nis, a_priv->nis))
+		flags |= NM_IP4_COMPARE_FLAG_NIS_SERVERS;
+
+	if (   (a_priv->nis_domain || b_priv->nis_domain)
+		&& (g_strcmp0 (a_priv->nis_domain, b_priv->nis_domain) != 0))
+		flags |= NM_IP4_COMPARE_FLAG_NIS_DOMAIN;
+
 	if (   !route_slist_compare (a_priv->routes, b_priv->routes)
 	    || !route_slist_compare (b_priv->routes, a_priv->routes))
 		flags |= NM_IP4_COMPARE_FLAG_ROUTES;
@@ -732,6 +808,7 @@ nm_ip4_config_init (NMIP4Config *config)
 	priv->wins = g_array_new (FALSE, TRUE, sizeof (guint32));
 	priv->domains = g_ptr_array_sized_new (3);
 	priv->searches = g_ptr_array_sized_new (3);
+	priv->nis = g_array_new (FALSE, TRUE, sizeof (guint32));
 }
 
 static void
@@ -745,6 +822,8 @@ finalize (GObject *object)
 	g_array_free (priv->nameservers, TRUE);
 	g_ptr_array_free (priv->domains, TRUE);
 	g_ptr_array_free (priv->searches, TRUE);
+	g_array_free (priv->nis, TRUE);
+	g_free (priv->nis_domain);
 
 	G_OBJECT_CLASS (nm_ip4_config_parent_class)->finalize (object);
 }
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
index 04999f8779..2d27acff03 100644
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@@ -99,6 +99,15 @@ void          nm_ip4_config_set_mss             (NMIP4Config *config, guint32 ms
 gboolean      nm_ip4_config_get_never_default   (NMIP4Config *config);
 void          nm_ip4_config_set_never_default   (NMIP4Config *config, gboolean never_default);
 
+void          nm_ip4_config_add_nis_server      (NMIP4Config *config, guint32 nis);
+guint32       nm_ip4_config_get_nis_server      (NMIP4Config *config, guint i);
+guint32       nm_ip4_config_get_num_nis_servers (NMIP4Config *config);
+void          nm_ip4_config_reset_nis_servers   (NMIP4Config *config);
+
+void          nm_ip4_config_set_nis_domain      (NMIP4Config *config, const char *domain);
+const char *  nm_ip4_config_get_nis_domain      (NMIP4Config *config);
+
+
 /* Flags for nm_ip4_config_to_rtnl_addr() */
 #define NM_RTNL_ADDR_NONE		0x0000
 #define NM_RTNL_ADDR_ADDR		0x0001
@@ -122,6 +131,8 @@ typedef enum {
 	NM_IP4_COMPARE_FLAG_MTU         = 0x00000040,
 	NM_IP4_COMPARE_FLAG_MSS         = 0x00000080,
 	NM_IP4_COMPARE_FLAG_WINS_SERVERS= 0x00000100,
+	NM_IP4_COMPARE_FLAG_NIS_SERVERS = 0x00000200,
+	NM_IP4_COMPARE_FLAG_NIS_DOMAIN  = 0x00000400,
 	NM_IP4_COMPARE_FLAG_ALL         = 0xFFFFFFFF   /* match everything */
 } NMIP4ConfigCompareFlags;
 

From 786ac623ab4b40e7a71fb384785e5091a101ba9f Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 16 Jul 2010 12:44:50 -0700
Subject: [PATCH 05/17] dns: send NIS servers and domain to SUSE's netconfig

---
 src/named-manager/nm-named-manager.c | 50 ++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/named-manager/nm-named-manager.c b/src/named-manager/nm-named-manager.c
index dc1a6c1db6..44a056f3c4 100644
--- a/src/named-manager/nm-named-manager.c
+++ b/src/named-manager/nm-named-manager.c
@@ -105,6 +105,8 @@ typedef struct {
 	GPtrArray *nameservers;
 	const char *domain;
 	GPtrArray *searches;
+	const char *nis_domain;
+	GPtrArray *nis_servers;
 } NMResolvConfData;
 
 static void
@@ -155,6 +157,23 @@ merge_one_ip4_config (NMResolvConfData *rc, NMIP4Config *src)
 	num = nm_ip4_config_get_num_searches (src);
 	for (i = 0; i < num; i++)
 		add_string_item (rc->searches, nm_ip4_config_get_search (src, i));
+
+	/* NIS stuff */
+	num = nm_ip4_config_get_num_nis_servers (src);
+	for (i = 0; i < num; i++) {
+		struct in_addr addr;
+		char buf[INET_ADDRSTRLEN];
+
+		addr.s_addr = nm_ip4_config_get_nis_server (src, i);
+		if (inet_ntop (AF_INET, &addr, buf, INET_ADDRSTRLEN) > 0)
+			add_string_item (rc->nis_servers, buf);
+	}
+
+	if (nm_ip4_config_get_nis_domain (src)) {
+		/* FIXME: handle multiple domains */
+		if (!rc->nis_domain)
+			rc->nis_domain = nm_ip4_config_get_nis_domain (src);
+	}
 }
 
 static void
@@ -246,6 +265,8 @@ static gboolean
 dispatch_netconfig (const char *domain,
                     char **searches,
                     char **nameservers,
+                    const char *nis_domain,
+                    char **nis_servers,
                     const char *iface,
                     GError **error)
 {
@@ -290,6 +311,15 @@ dispatch_netconfig (const char *domain,
 		g_free (str);
 	}
 
+	if (nis_domain)
+		write_to_netconfig (fd, "NISDOMAIN", nis_domain);
+
+	if (nis_servers) {
+		str = g_strjoinv (" ", nis_servers);
+		write_to_netconfig (fd, "NISSERVERS", str);
+		g_free (str);
+	}
+
 	close (fd);
 
 	/* Wait until the process exits */
@@ -509,8 +539,10 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
 	NMResolvConfData rc;
 	GSList *iter;
 	const char *domain = NULL;
+	const char *nis_domain = NULL;
 	char **searches = NULL;
 	char **nameservers = NULL;
+	char **nis_servers = NULL;
 	int num, i, len;
 	gboolean success = FALSE;
 
@@ -527,6 +559,7 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
 	rc.nameservers = g_ptr_array_new ();
 	rc.domain = NULL;
 	rc.searches = g_ptr_array_new ();
+	rc.nis_servers = g_ptr_array_new ();
 
 	if (priv->ip4_vpn_config)
 		merge_one_ip4_config (&rc, priv->ip4_vpn_config);
@@ -595,13 +628,24 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
 	} else
 		g_ptr_array_free (rc.nameservers, TRUE);
 
+	if (rc.nis_servers->len) {
+		g_ptr_array_add (rc.nis_servers, NULL);
+		nis_servers = (char **) g_ptr_array_free (rc.nis_servers, FALSE);
+	} else
+		g_ptr_array_free (rc.nis_servers, TRUE);
+
+	nis_domain = rc.nis_domain;
+
 #ifdef RESOLVCONF_PATH
 	success = dispatch_resolvconf (domain, searches, nameservers, iface, error);
 #endif
 
 #ifdef TARGET_SUSE
-	if (success == FALSE)
-		success = dispatch_netconfig (domain, searches, nameservers, iface, error);
+	if (success == FALSE) {
+		success = dispatch_netconfig (domain, searches, nameservers,
+		                              nis_domain, nis_servers,
+		                              iface, error);
+	}
 #endif
 
 	if (success == FALSE)
@@ -614,6 +658,8 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
 		g_strfreev (searches);
 	if (nameservers)
 		g_strfreev (nameservers);
+	if (nis_servers)
+		g_strfreev (nis_servers);
 
 	return success;
 }

From ce7d37ad808e78931dd9e12642a9c31fac3c1c05 Mon Sep 17 00:00:00 2001
From: Bin Li <libin.charles@gmail.com>
Date: Fri, 16 Jul 2010 12:54:39 -0700
Subject: [PATCH 06/17] dns: fix race waiting for netconfig

---
 src/named-manager/nm-named-manager.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/named-manager/nm-named-manager.c b/src/named-manager/nm-named-manager.c
index 44a056f3c4..aea23b4e3b 100644
--- a/src/named-manager/nm-named-manager.c
+++ b/src/named-manager/nm-named-manager.c
@@ -329,6 +329,10 @@ dispatch_netconfig (const char *domain,
 	ret = waitpid (pid, NULL, 0);
 	if (ret < 0 && errno == EINTR)
 		goto again;
+	else if (ret < 0 && errno == ECHILD) {
+		/* When the netconfig exist, the errno is ECHILD, it should return TRUE */
+		return TRUE;
+	}
 
 	return ret > 0;
 }

From 5ac451a8d9673e962e0ca06fa719e82f85f5e36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=BDygimantas=20Beru=C4=8Dka?= <uid0@akl.lt>
Date: Fri, 16 Jul 2010 15:08:03 -0700
Subject: [PATCH 07/17] po: updated Lithuanian translation (bgo #624439)

---
 po/lt.po | 1507 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 1010 insertions(+), 497 deletions(-)

diff --git a/po/lt.po b/po/lt.po
index 3ef27117ff..70212c828f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,19 +6,90 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-04-30 03:24+0000\n"
-"PO-Revision-Date: 2010-06-25 18:30+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
+"kManager&component=general\n"
+"POT-Creation-Date: 2010-06-28 08:52+0000\n"
+"PO-Revision-Date: 2010-07-15 14:09+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
-"Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
+"Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: UTF-8\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.6.1\n"
 
-#: ../cli/src/connections.c:86
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:74
+#: ../cli/src/devices.c:85 ../cli/src/devices.c:98 ../cli/src/devices.c:108
+#: ../cli/src/devices.c:118 ../cli/src/devices.c:131 ../cli/src/devices.c:142
+#: ../cli/src/devices.c:152
+msgid "NAME"
+msgstr "PAVADINIMAS"
+
+#. 0
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+msgid "UUID"
+msgstr "UUID"
+
+#. 1
+#: ../cli/src/connections.c:61
+msgid "DEVICES"
+msgstr "ĮRENGINIAI"
+
+#. 2
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
+msgid "SCOPE"
+msgstr "SRITIS"
+
+#. 3
+#: ../cli/src/connections.c:63
+msgid "DEFAULT"
+msgstr "NUMATYTASIS"
+
+#. 4
+#: ../cli/src/connections.c:64
+msgid "DBUS-SERVICE"
+msgstr "DBUS-TARNYBA"
+
+#. 5
+#: ../cli/src/connections.c:65
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECTAS"
+
+#. 6
+#: ../cli/src/connections.c:66
+msgid "VPN"
+msgstr "VPN"
+
+#. 1
+#. 0
+#. 1
+#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+msgid "TYPE"
+msgstr "TIPAS"
+
+#. 3
+#: ../cli/src/connections.c:78
+msgid "TIMESTAMP"
+msgstr "LAIKO-ŽYMA"
+
+#. 4
+#: ../cli/src/connections.c:79
+msgid "TIMESTAMP-REAL"
+msgstr "LAIKO-ŽYMA-TIKROJI"
+
+#. 5
+#: ../cli/src/connections.c:80
+msgid "AUTOCONNECT"
+msgstr "AUTOPRISIJUNGIMAS"
+
+#. 6
+#: ../cli/src/connections.c:81
+msgid "READONLY"
+msgstr "TIKSKAITOMA"
+
+#: ../cli/src/connections.c:157
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
@@ -39,310 +110,514 @@ msgstr ""
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 
-#: ../cli/src/connections.c:158
-msgid "Connections"
-msgstr "Ryšiai"
-
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/devices.c:298 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "Type"
-msgstr "Tipas"
-
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "UUID"
-msgstr "UUID"
-
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Name"
-msgstr "Pavadinimas"
-
-#: ../cli/src/connections.c:163
+#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
 #, c-format
-msgid "System connections:\n"
-msgstr "Sistemos ryšiai:\n"
+msgid "Error: 'con list': %s"
+msgstr "Klaida: „con list“: %s"
 
-#: ../cli/src/connections.c:167
+#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
 #, c-format
-msgid "User connections:\n"
-msgstr "Naudotojo ryšiai:\n"
+msgid "Error: 'con list': %s; allowed fields: %s"
+msgstr "Klaida: „con list“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/connections.c:178 ../cli/src/connections.c:967
-#: ../cli/src/connections.c:983 ../cli/src/connections.c:992
-#: ../cli/src/connections.c:1003 ../cli/src/connections.c:1085
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:614 ../cli/src/devices.c:699
-#: ../cli/src/devices.c:785 ../cli/src/devices.c:792
+#: ../cli/src/connections.c:207
+msgid "Connection details"
+msgstr "Ryšio informacija"
+
+#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
+msgid "system"
+msgstr "sisteminis"
+
+#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
+msgid "user"
+msgstr "naudotojo"
+
+#: ../cli/src/connections.c:383
+msgid "never"
+msgstr "niekada"
+
+#. "CAPABILITIES"
+#. Print header
+#. "WIFI-PROPERTIES"
+#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
+#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
+#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
+#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
+#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
+#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
+#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
+#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
+#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
+#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
+#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
+#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
+#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
+#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1224
+msgid "yes"
+msgstr "taip"
+
+#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
+#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
+#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
+#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
+#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
+#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
+#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
+#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
+#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
+#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
+#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
+#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
+#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
+#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
+msgid "no"
+msgstr "ne"
+
+#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
+msgid "System connections"
+msgstr "Sistemos ryšiai"
+
+#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
+msgid "User connections"
+msgstr "Naudotojo ryšiai"
+
+#: ../cli/src/connections.c:474 ../cli/src/connections.c:1334
+#: ../cli/src/connections.c:1350 ../cli/src/connections.c:1359
+#: ../cli/src/connections.c:1370 ../cli/src/connections.c:1452
+#: ../cli/src/devices.c:864 ../cli/src/devices.c:874 ../cli/src/devices.c:973
+#: ../cli/src/devices.c:980
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Klaida: trūksta argumento %s."
 
-#: ../cli/src/connections.c:189
+#: ../cli/src/connections.c:487
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Klaida: ryšio %s nėra."
 
-#: ../cli/src/connections.c:196
-msgid "System-wide connections"
-msgstr "Sistemos ryšiai"
-
-#: ../cli/src/connections.c:205
-msgid "User connections"
-msgstr "Naudotojo ryšiai"
-
-#: ../cli/src/connections.c:212 ../cli/src/connections.c:1016
-#: ../cli/src/connections.c:1103 ../cli/src/devices.c:446
-#: ../cli/src/devices.c:494 ../cli/src/devices.c:628 ../cli/src/devices.c:706
-#: ../cli/src/devices.c:798
+#: ../cli/src/connections.c:519 ../cli/src/connections.c:1383
+#: ../cli/src/connections.c:1470 ../cli/src/devices.c:687
+#: ../cli/src/devices.c:754 ../cli/src/devices.c:888 ../cli/src/devices.c:986
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Nežinomas parametras: %s\n"
 
-#: ../cli/src/connections.c:221
+#: ../cli/src/connections.c:528
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Klaida: nenurodyta tinkamų parametrų."
 
-#. FIXME: Fix the output
-#: ../cli/src/connections.c:268 ../cli/src/devices.c:302
-#: ../cli/src/devices.c:321 ../cli/src/devices.c:353 ../cli/src/devices.c:355
-#: ../cli/src/devices.c:357 ../cli/src/devices.c:359 ../cli/src/devices.c:361
-msgid "yes"
-msgstr "taip"
+#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
+#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#, c-format
+msgid "Error: %s."
+msgstr "Klaida: %s"
 
-#: ../cli/src/connections.c:268 ../cli/src/devices.c:304
-msgid "no"
-msgstr "ne"
+#: ../cli/src/connections.c:649
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "Klaida: „con status“: %s"
 
-#: ../cli/src/connections.c:297
+#: ../cli/src/connections.c:651
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "Klaida: „con status“: %s; leidžiami laukai: %s"
+
+#: ../cli/src/connections.c:658
 msgid "Active connections"
 msgstr "Aktyvūs ryšiai"
 
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-#: ../cli/src/devices.c:302 ../cli/src/devices.c:304
-msgid "Default"
-msgstr "Numatyta"
-
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Service"
-msgstr "Tarnyba"
-
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Devices"
-msgstr "Įrenginiai"
-
-#: ../cli/src/connections.c:659
+#: ../cli/src/connections.c:1026
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "nėra aktyvaus ryšio įrenginyje „%s“"
 
-#: ../cli/src/connections.c:667
+#: ../cli/src/connections.c:1034
 #, c-format
 msgid "no active connection or device"
 msgstr "nėra aktyvaus ryšio įrenginyje"
 
-#: ../cli/src/connections.c:730
+#: ../cli/src/connections.c:1084
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "įrenginys „%s“ nesuderinamas su ryšiu „%s“"
+
+#: ../cli/src/connections.c:1086
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "nerastas įrenginys ryšiui „%s“"
+
+#: ../cli/src/connections.c:1097
 msgid "activating"
 msgstr "aktyvuojama"
 
-#: ../cli/src/connections.c:732
+#: ../cli/src/connections.c:1099
 msgid "activated"
 msgstr "aktyvuota"
 
-#: ../cli/src/connections.c:735 ../cli/src/connections.c:758
-#: ../cli/src/connections.c:791 ../cli/src/devices.c:111
-#: ../cli/src/network-manager.c:76 ../cli/src/network-manager.c:98
+#: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
+#: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
+#: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
+#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
 msgid "unknown"
 msgstr "nežinoma"
 
-#: ../cli/src/connections.c:744
+#: ../cli/src/connections.c:1111
 msgid "VPN connecting (prepare)"
 msgstr "VPN jungiamasi (ruošiama)"
 
-#: ../cli/src/connections.c:746
+#: ../cli/src/connections.c:1113
 msgid "VPN connecting (need authentication)"
 msgstr "VPN jungiamasi (reikia nustatyti tapatybę)"
 
-#: ../cli/src/connections.c:748
+#: ../cli/src/connections.c:1115
 msgid "VPN connecting"
 msgstr "VPN jungiamasi"
 
-#: ../cli/src/connections.c:750
+#: ../cli/src/connections.c:1117
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN jungiamasi (gaunama IP konfigūracija)"
 
-#: ../cli/src/connections.c:752
+#: ../cli/src/connections.c:1119
 msgid "VPN connected"
 msgstr "VPN prisijungta"
 
-#: ../cli/src/connections.c:754
+#: ../cli/src/connections.c:1121
 msgid "VPN connection failed"
 msgstr "VPN prisijungti nepavyko"
 
-#: ../cli/src/connections.c:756
+#: ../cli/src/connections.c:1123
 msgid "VPN disconnected"
 msgstr "VPN atsijungta"
 
-#: ../cli/src/connections.c:767
+#: ../cli/src/connections.c:1134
 msgid "unknown reason"
 msgstr "nežinoma priežastis"
 
-#: ../cli/src/connections.c:769
+#: ../cli/src/connections.c:1136
 msgid "none"
 msgstr "jokia"
 
-#: ../cli/src/connections.c:771
+#: ../cli/src/connections.c:1138
 msgid "the user was disconnected"
 msgstr "naudotojas buvo atjungtas"
 
-#: ../cli/src/connections.c:773
+#: ../cli/src/connections.c:1140
 msgid "the base network connection was interrupted"
 msgstr "bazinis tinklo ryšys buvo pertrauktas"
 
-#: ../cli/src/connections.c:775
+#: ../cli/src/connections.c:1142
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN tarnyba netikėtai sustojo"
 
-#: ../cli/src/connections.c:777
+#: ../cli/src/connections.c:1144
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN tarnyba grąžino netinkamą konfigūraciją"
 
-#: ../cli/src/connections.c:779
+#: ../cli/src/connections.c:1146
 msgid "the connection attempt timed out"
 msgstr "bandymo jungtis laikas baigėsi"
 
-#: ../cli/src/connections.c:781
+#: ../cli/src/connections.c:1148
 msgid "the VPN service did not start in time"
 msgstr "VPN tarnyba nebuvo paleista laiku"
 
-#: ../cli/src/connections.c:783
+#: ../cli/src/connections.c:1150
 msgid "the VPN service failed to start"
 msgstr "nepavyko paleisti VPN tarnybos"
 
-#: ../cli/src/connections.c:785
+#: ../cli/src/connections.c:1152
 msgid "no valid VPN secrets"
 msgstr "nėra tinkamų VPN paslapčių"
 
-#: ../cli/src/connections.c:787
+#: ../cli/src/connections.c:1154
 msgid "invalid VPN secrets"
 msgstr "netinkamos VPN paslaptys"
 
-#: ../cli/src/connections.c:789
+#: ../cli/src/connections.c:1156
 msgid "the connection was removed"
 msgstr "ryšys buvo pašalintas"
 
-#: ../cli/src/connections.c:803
+#: ../cli/src/connections.c:1170
 #, c-format
 msgid "state: %s\n"
 msgstr "būsena: %s\n"
 
-#: ../cli/src/connections.c:806 ../cli/src/connections.c:832
+#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
 #, c-format
 msgid "Connection activated\n"
 msgstr "Ryšys aktyvuotas\n"
 
-#: ../cli/src/connections.c:809
+#: ../cli/src/connections.c:1176
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Klaida: nepavyko aktyvuoti ryšio."
 
-#: ../cli/src/connections.c:828
+#: ../cli/src/connections.c:1195
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "būsena: %s (%d)\n"
 
-#: ../cli/src/connections.c:838
+#: ../cli/src/connections.c:1205
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Klaida: nepavyko aktyvuoti ryšio: %s."
 
-#: ../cli/src/connections.c:855 ../cli/src/devices.c:551
+#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Klaida: baigėsi %d sek. laikas."
 
-#: ../cli/src/connections.c:898
+#: ../cli/src/connections.c:1265
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Klaida: nepavyko aktyvuoti ryšio: %s"
 
-#: ../cli/src/connections.c:912
+#: ../cli/src/connections.c:1279
 #, c-format
 msgid "Error: Obtaining active connection for '%s' failed."
 msgstr "Klaida: nepavyko „%s“ gauti aktyvaus ryšio."
 
-#: ../cli/src/connections.c:921
+#: ../cli/src/connections.c:1288
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "Aktyvaus ryšio būsena: %s\n"
 
-#: ../cli/src/connections.c:922
+#: ../cli/src/connections.c:1289
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "Aktyvaus ryšio kelias: %s\n"
 
-#: ../cli/src/connections.c:976 ../cli/src/connections.c:1094
+#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Klaida: nežinomas ryšys: %s"
 
-#: ../cli/src/connections.c:1011 ../cli/src/devices.c:622
+#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Klaida: netinkama laukimo laiko reikšmė „%s“."
 
-#: ../cli/src/connections.c:1024 ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Klaida: id arba uuid turi būti nurodytas."
 
-#: ../cli/src/connections.c:1044
+#: ../cli/src/connections.c:1411
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Klaida: nerastas tinkamas įrenginys: %s."
 
-#: ../cli/src/connections.c:1046
+#: ../cli/src/connections.c:1413
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Klaida: nerastas tinkamas įrenginys."
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1505
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Įspėjimas: ryšys neaktyvus\n"
 
-#: ../cli/src/connections.c:1189
+#: ../cli/src/connections.c:1561
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Klaida: netinkama „con“ komanda „%s“."
 
-#: ../cli/src/connections.c:1216
+#: ../cli/src/connections.c:1597
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Klaida: nepavyko prisijungti prie D-Bus."
 
-#: ../cli/src/connections.c:1223
+#: ../cli/src/connections.c:1604
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Klaida: nepavyko gauti sistemos nustatymų."
 
-#: ../cli/src/connections.c:1231
+#: ../cli/src/connections.c:1612
 #, c-format
 msgid "Error: Could not get user settings."
 msgstr "Klaida: nepavyko gauti naudotojo nustatymų."
 
-#: ../cli/src/connections.c:1241
+#: ../cli/src/connections.c:1622
 #, c-format
 msgid "Error: Can't obtain connections: settings services are not running."
 msgstr "Klaida: nepavyko gauti ryšių: nustatymų tarnybos neveikia."
 
+#. 0
+#. 9
+#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+msgid "DEVICE"
+msgstr "ĮRENGINYS"
+
+#. 1
+#. 4
+#. 0
+#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#: ../cli/src/network-manager.c:36
+msgid "STATE"
+msgstr "BŪSENA"
+
+#: ../cli/src/devices.c:71
+msgid "GENERAL"
+msgstr "BENDRA"
+
+#. 0
+#: ../cli/src/devices.c:72
+msgid "CAPABILITIES"
+msgstr "GEBOS"
+
+#. 1
 #: ../cli/src/devices.c:73
+msgid "WIFI-PROPERTIES"
+msgstr "WIFI-SAVYBĖS"
+
+#. 2
+#: ../cli/src/devices.c:74
+msgid "AP"
+msgstr "AP"
+
+#. 3
+#: ../cli/src/devices.c:75
+msgid "WIRED-PROPERTIES"
+msgstr "LAIDINIO-TINKLO-SAVYBĖS"
+
+#. 4
+#: ../cli/src/devices.c:76
+msgid "IP4-SETTINGS"
+msgstr "IP4-PARAMETRAI"
+
+#. 5
+#: ../cli/src/devices.c:77
+msgid "IP4-DNS"
+msgstr "IP4-DNS"
+
+#. 2
+#: ../cli/src/devices.c:88
+msgid "DRIVER"
+msgstr "TVARKYKLĖ"
+
+#. 3
+#: ../cli/src/devices.c:89
+msgid "HWADDR"
+msgstr "APARATINIS-ADRESAS"
+
+#. 0
+#: ../cli/src/devices.c:99
+msgid "CARRIER-DETECT"
+msgstr "NEŠLIO-APTIKIMAS"
+
+#. 1
+#: ../cli/src/devices.c:100
+msgid "SPEED"
+msgstr "SPARTA"
+
+#. 0
+#: ../cli/src/devices.c:109
+msgid "CARRIER"
+msgstr "NEŠLYS"
+
+#. 0
+#: ../cli/src/devices.c:119
+msgid "WEP"
+msgstr "WEP"
+
+#. 1
+#: ../cli/src/devices.c:120
+msgid "WPA"
+msgstr "WPA"
+
+#. 2
+#: ../cli/src/devices.c:121
+msgid "WPA2"
+msgstr "WPA2"
+
+#. 3
+#: ../cli/src/devices.c:122
+msgid "TKIP"
+msgstr "TKIP"
+
+#. 4
+#: ../cli/src/devices.c:123
+msgid "CCMP"
+msgstr "CCMP"
+
+#. 0
+#: ../cli/src/devices.c:132
+msgid "ADDRESS"
+msgstr "ADRESAS"
+
+#. 1
+#: ../cli/src/devices.c:133
+msgid "PREFIX"
+msgstr "PRIEŠDĖLIS"
+
+#. 2
+#: ../cli/src/devices.c:134
+msgid "GATEWAY"
+msgstr "ŠLIUZAS"
+
+#. 0
+#: ../cli/src/devices.c:143
+msgid "DNS"
+msgstr "DNS"
+
+#. 0
+#: ../cli/src/devices.c:153
+msgid "SSID"
+msgstr "SSID"
+
+#. 1
+#: ../cli/src/devices.c:154
+msgid "BSSID"
+msgstr "BSSID"
+
+#. 2
+#: ../cli/src/devices.c:155
+msgid "MODE"
+msgstr "VEIKSENA"
+
+#. 3
+#: ../cli/src/devices.c:156
+msgid "FREQ"
+msgstr "DAŽNIS"
+
+#. 4
+#: ../cli/src/devices.c:157
+msgid "RATE"
+msgstr "DAŽNUMAS"
+
+#. 5
+#: ../cli/src/devices.c:158
+msgid "SIGNAL"
+msgstr "SIGNALAS"
+
+#. 6
+#: ../cli/src/devices.c:159
+msgid "SECURITY"
+msgstr "SAUGA"
+
+#. 7
+#: ../cli/src/devices.c:160
+msgid "WPA-FLAGS"
+msgstr "WPA-ŽYMOS"
+
+#. 8
+#: ../cli/src/devices.c:161
+msgid "RSN-FLAGS"
+msgstr "RSN-ŽYMOS"
+
+#. 10
+#: ../cli/src/devices.c:163
+msgid "ACTIVE"
+msgstr "AKTYVUS"
+
+#: ../cli/src/devices.c:186
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
@@ -352,7 +627,7 @@ msgid ""
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-"  wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+"  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
 "\n"
 msgstr ""
 "Naudojimas: nmcli dev { KOMANDA | help }\n"
@@ -362,349 +637,236 @@ msgstr ""
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-"  wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+"  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:93
+#: ../cli/src/devices.c:206
 msgid "unmanaged"
 msgstr "nevaldomas"
 
-#: ../cli/src/devices.c:95
+#: ../cli/src/devices.c:208
 msgid "unavailable"
 msgstr "neprieinamas"
 
-#: ../cli/src/devices.c:97 ../cli/src/network-manager.c:73
+#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
 msgid "disconnected"
 msgstr "atjungtas"
 
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:212
 msgid "connecting (prepare)"
 msgstr "jungiamasi (ruošiama)"
 
-#: ../cli/src/devices.c:101
+#: ../cli/src/devices.c:214
 msgid "connecting (configuring)"
 msgstr "jungiamasi (konfigūruojama)"
 
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:216
 msgid "connecting (need authentication)"
 msgstr "jungiamasi (reikia nustatyti tapatybę)"
 
-#: ../cli/src/devices.c:105
+#: ../cli/src/devices.c:218
 msgid "connecting (getting IP configuration)"
 msgstr "jungiamasi (gaunama IP konfigūracija)"
 
-#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:71
+#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
 msgid "connected"
 msgstr "prisijungta"
 
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:222
 msgid "connection failed"
 msgstr "prisijungti nepavyko"
 
-#: ../cli/src/devices.c:132 ../cli/src/devices.c:876
+#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#. print them
-#: ../cli/src/devices.c:164 ../cli/src/devices.c:266 ../cli/src/devices.c:861
-#: ../cli/src/devices.c:879
+#: ../cli/src/devices.c:277
 msgid "(none)"
 msgstr "(jokios)"
 
-#: ../cli/src/devices.c:209
+#: ../cli/src/devices.c:302
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s: klaida konvertuojant IP4 adresą 0x%X"
 
-#: ../cli/src/devices.c:238
-#, c-format
-msgid "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d"
-msgstr "%s, %s, dažnis %d MHz, sparta %d Mb/s, stiprumas %d"
-
-#: ../cli/src/devices.c:239
-msgid "Ad-Hoc"
-msgstr "Ad-Hoc"
-
-#: ../cli/src/devices.c:248
-msgid ", Encrypted: "
-msgstr ", šifruota: "
-
-#: ../cli/src/devices.c:253
-msgid " WEP"
-msgstr " WEP"
-
-#: ../cli/src/devices.c:255
-msgid " WPA"
-msgstr " WPA"
-
-#: ../cli/src/devices.c:257
-msgid " WPA2"
-msgstr " WPA2"
-
-#: ../cli/src/devices.c:260
-msgid " Enterprise"
-msgstr " Kompanija"
-
-#: ../cli/src/devices.c:294 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "Device"
-msgstr "Įrenginys"
-
-#: ../cli/src/devices.c:299
-msgid "Driver"
-msgstr "Tvarkyklė"
-
-#: ../cli/src/devices.c:299 ../cli/src/devices.c:567
-msgid "(unknown)"
-msgstr "(nežinoma)"
-
-#: ../cli/src/devices.c:300 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "State"
-msgstr "Būsena"
-
-#: ../cli/src/devices.c:313
-msgid "HW Address"
-msgstr "Aparatinis adresas"
-
-#: ../cli/src/devices.c:319
-#, c-format
-msgid ""
-"\n"
-"  Capabilities:\n"
-msgstr ""
-"\n"
-"Galimybės:\n"
-
-#: ../cli/src/devices.c:321
-msgid "Carrier Detect"
-msgstr "Perdavimo aptikimas"
-
-#: ../cli/src/devices.c:336
-#, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
-
-#: ../cli/src/devices.c:337
-msgid "Speed"
-msgstr "Sparta"
-
-#: ../cli/src/devices.c:348
-#, c-format
-msgid ""
-"\n"
-"  Wireless Properties\n"
-msgstr ""
-"\n"
-"  Belaidžio ryšio savybės\n"
-
-#: ../cli/src/devices.c:353
-msgid "WEP Encryption"
-msgstr "WEP šifravimas"
-
-#: ../cli/src/devices.c:355
-msgid "WPA Encryption"
-msgstr "WPA šifravimas"
-
-#: ../cli/src/devices.c:357
-msgid "WPA2 Encryption"
-msgstr "WPA2 šifravimas"
-
-#: ../cli/src/devices.c:359
-msgid "TKIP cipher"
-msgstr "TKIP šifras"
-
-#: ../cli/src/devices.c:361
-msgid "CCMP cipher"
-msgstr "CCMP šifras"
-
-#: ../cli/src/devices.c:368
-#, c-format
-msgid ""
-"\n"
-"  Wireless Access Points %s\n"
-msgstr ""
-"\n"
-"  Belaidžiai prieigos taškai %s\n"
-
-#: ../cli/src/devices.c:368
-msgid "(* = current AP)"
-msgstr "(* = dabartinis prieigos taškas)"
-
-#: ../cli/src/devices.c:374
-#, c-format
-msgid ""
-"\n"
-"  Wired Properties\n"
-msgstr ""
-"\n"
-"Laidinio ryšio savybės\n"
-
-#: ../cli/src/devices.c:377 ../cli/src/devices.c:379
-msgid "Carrier"
-msgstr "Perdavimas"
-
-#: ../cli/src/devices.c:377
-msgid "on"
-msgstr "įjungta"
-
-#: ../cli/src/devices.c:379
-msgid "off"
-msgstr "išjungta"
-
-#: ../cli/src/devices.c:387
-#, c-format
-msgid ""
-"\n"
-"  IPv4 Settings:\n"
-msgstr ""
-"\n"
-"  IPv4 nustatymai:\n"
-
-#: ../cli/src/devices.c:395
-msgid "Address"
-msgstr "Adresas"
-
-#: ../cli/src/devices.c:401
-msgid "Prefix"
-msgstr "Priešdėlis"
-
-#: ../cli/src/devices.c:405
-msgid "Gateway"
-msgstr "Šliuzas"
-
-#: ../cli/src/devices.c:416
-msgid "DNS"
-msgstr "DNS"
-
-#: ../cli/src/devices.c:458
-msgid "Status of devices"
-msgstr "Įrenginių būsena"
-
-#: ../cli/src/devices.c:487
-#, c-format
-msgid "Error: '%s' argument is missing."
-msgstr "Klaida: trūksta argumento „%s“."
-
-#: ../cli/src/devices.c:516 ../cli/src/devices.c:655 ../cli/src/devices.c:729
-#, c-format
-msgid "Error: Device '%s' not found."
-msgstr "Klaida: nerastas įrenginys „%s“."
-
-#: ../cli/src/devices.c:539
-#, c-format
-msgid "Success: Device '%s' successfully disconnected."
-msgstr "Pavyko: sėkmingai atjungtas įrenginys „%s“."
-
-#: ../cli/src/devices.c:564
-#, c-format
-msgid "Error: Device '%s' (%s) disconnecting failed: %s"
-msgstr "Klaida: įrenginio „%s“ (%s) atjungti nepavyko: %s"
-
-#: ../cli/src/devices.c:572
-#, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "Įrenginio būsena: %d (%s)\n"
-
-#: ../cli/src/devices.c:636
-#, c-format
-msgid "Error: iface has to be specified."
-msgstr "Klaida: turi būti nurodytas iface."
-
-#: ../cli/src/devices.c:736 ../cli/src/devices.c:746
-msgid "WiFi scan list"
-msgstr "WiFi skenavimo sąrašas"
-
-#: ../cli/src/devices.c:740
-#, c-format
-msgid "Error: Device '%s' is not a WiFi device."
-msgstr "Klaida: „%s“ nėra WiFi įrenginys "
-
-#: ../cli/src/devices.c:754
-msgid "Device:"
-msgstr "Įrenginys:"
-
-#: ../cli/src/devices.c:806
-#, c-format
-msgid "Error: hwaddr has to be specified."
-msgstr "Klaida: turi būti nurodytas hwaddr."
-
-#: ../cli/src/devices.c:844
-#, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "Klaida: nerastas prieigos taškas su hwaddr „%s“."
-
-#: ../cli/src/devices.c:862
+#: ../cli/src/devices.c:349
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:863
+#: ../cli/src/devices.c:350
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:869 ../cli/src/devices.c:871
-msgid "AP parameters"
-msgstr "Prieigos taško parametrai"
+#: ../cli/src/devices.c:359
+msgid "Encrypted: "
+msgstr "Šifruota: "
 
-#: ../cli/src/devices.c:873
-msgid "SSID:"
-msgstr "SSID:"
+#: ../cli/src/devices.c:364
+msgid "WEP "
+msgstr "WEP"
 
-#: ../cli/src/devices.c:874
-msgid "BSSID:"
-msgstr "BSSID:"
+#: ../cli/src/devices.c:366
+msgid "WPA "
+msgstr "WPA"
 
-#: ../cli/src/devices.c:875
-msgid "Frequency:"
-msgstr "Dažnis:"
+#: ../cli/src/devices.c:368
+msgid "WPA2 "
+msgstr "WPA2"
 
-#: ../cli/src/devices.c:876
-msgid "Mode:"
-msgstr "Veiksena:"
+#: ../cli/src/devices.c:371
+msgid "Enterprise "
+msgstr "Kompanija "
 
-#: ../cli/src/devices.c:876
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
+#: ../cli/src/devices.c:380
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:876
+#: ../cli/src/devices.c:380
 msgid "Infrastructure"
 msgstr "Infrastruktūra"
 
-#: ../cli/src/devices.c:877
-msgid "Maximal bitrate:"
-msgstr "Didžiausias galimas bitų dažnis:"
+#: ../cli/src/devices.c:442
+#, c-format
+msgid "Error: 'dev list': %s"
+msgstr "Klaida: „dev list“: %s"
 
-#: ../cli/src/devices.c:878
-msgid "Strength:"
-msgstr "Stiprumas:"
+#: ../cli/src/devices.c:444
+#, c-format
+msgid "Error: 'dev list': %s; allowed fields: %s"
+msgstr "Klaida: „dev list“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/devices.c:879
-msgid "Flags:"
-msgstr "Požymiai:"
+#: ../cli/src/devices.c:453
+msgid "Device details"
+msgstr "Įrenginio informacija"
 
-#: ../cli/src/devices.c:879
-msgid "privacy"
-msgstr "privatumas"
+#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+msgid "(unknown)"
+msgstr "(nežinoma)"
 
-#: ../cli/src/devices.c:880
-msgid "WPA flags:"
-msgstr "WPA požymiai:"
+#: ../cli/src/devices.c:484
+msgid "unknown)"
+msgstr "nežinoma)"
 
-#: ../cli/src/devices.c:881
-msgid "RSN flags:"
-msgstr "RSN požymiai:"
+#: ../cli/src/devices.c:510
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
 
-#: ../cli/src/devices.c:907
+#. Print header
+#. "WIRED-PROPERTIES"
+#: ../cli/src/devices.c:583
+msgid "on"
+msgstr "įjungta"
+
+#: ../cli/src/devices.c:583
+msgid "off"
+msgstr "išjungta"
+
+#: ../cli/src/devices.c:710
+#, c-format
+msgid "Error: 'dev status': %s"
+msgstr "Klaida: „dev status“: %s"
+
+#: ../cli/src/devices.c:712
+#, c-format
+msgid "Error: 'dev status': %s; allowed fields: %s"
+msgstr "Klaida: „dev status“: %s; leidžiami laukai: %s"
+
+#: ../cli/src/devices.c:719
+msgid "Status of devices"
+msgstr "Įrenginių būsena"
+
+#: ../cli/src/devices.c:747
+#, c-format
+msgid "Error: '%s' argument is missing."
+msgstr "Klaida: trūksta argumento „%s“."
+
+#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#, c-format
+msgid "Error: Device '%s' not found."
+msgstr "Klaida: nerastas įrenginys „%s“."
+
+#: ../cli/src/devices.c:799
+#, c-format
+msgid "Success: Device '%s' successfully disconnected."
+msgstr "Pavyko: sėkmingai atjungtas įrenginys „%s“."
+
+#: ../cli/src/devices.c:824
+#, c-format
+msgid "Error: Device '%s' (%s) disconnecting failed: %s"
+msgstr "Klaida: įrenginio „%s“ (%s) atjungti nepavyko: %s"
+
+#: ../cli/src/devices.c:832
+#, c-format
+msgid "Device state: %d (%s)\n"
+msgstr "Įrenginio būsena: %d (%s)\n"
+
+#: ../cli/src/devices.c:896
+#, c-format
+msgid "Error: iface has to be specified."
+msgstr "Klaida: turi būti nurodytas iface."
+
+#: ../cli/src/devices.c:1011
+#, c-format
+msgid "Error: 'dev wifi': %s"
+msgstr "Klaida: „dev wifi“: %s"
+
+#: ../cli/src/devices.c:1013
+#, c-format
+msgid "Error: 'dev wifi': %s; allowed fields: %s"
+msgstr "Klaida: „dev wifi“: %s; leidžiami laukai: %s"
+
+#: ../cli/src/devices.c:1020
+msgid "WiFi scan list"
+msgstr "WiFi skenavimo sąrašas"
+
+#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#, c-format
+msgid "Error: Access point with hwaddr '%s' not found."
+msgstr "Klaida: nerastas prieigos taškas su hwaddr „%s“."
+
+#: ../cli/src/devices.c:1072
+#, c-format
+msgid "Error: Device '%s' is not a WiFi device."
+msgstr "Klaida: „%s“ nėra WiFi įrenginys "
+
+#: ../cli/src/devices.c:1136
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Klaida: netinkama „dev wifi“ komanda „%s“."
 
-#: ../cli/src/devices.c:943
+#: ../cli/src/devices.c:1183
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Klaida: netinkama „dev“ komanda „%s“."
 
-#: ../cli/src/network-manager.c:46
+#: ../cli/src/network-manager.c:35
+msgid "RUNNING"
+msgstr "VEIKIA"
+
+#. 1
+#: ../cli/src/network-manager.c:37
+msgid "WIFI-HARDWARE"
+msgstr "WIFI-APARATINĖ-ĮRANGA"
+
+#. 2
+#: ../cli/src/network-manager.c:38
+msgid "WIFI"
+msgstr "WIFI"
+
+#. 3
+#: ../cli/src/network-manager.c:39
+msgid "WWAN-HARDWARE"
+msgstr "WWAN-APARATINĖ-ĮRANGA"
+
+#. 4
+#: ../cli/src/network-manager.c:40
+msgid "WWAN"
+msgstr "WWAN"
+
+#: ../cli/src/network-manager.c:62
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
@@ -729,89 +891,91 @@ msgstr ""
 "  wwan [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:67
+#: ../cli/src/network-manager.c:83
 msgid "asleep"
 msgstr "miegantis"
 
-#: ../cli/src/network-manager.c:69
+#: ../cli/src/network-manager.c:85
 msgid "connecting"
 msgstr "jungiamasi"
 
-#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
-#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
-msgid "enabled"
-msgstr "įjungta"
+#: ../cli/src/network-manager.c:125
+#, c-format
+msgid "Error: 'nm status': %s"
+msgstr "Klaida: „nm status“: %s"
 
-#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
-#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
-msgid "disabled"
-msgstr "išjungta"
+#: ../cli/src/network-manager.c:127
+#, c-format
+msgid "Error: 'nm status': %s; allowed fields: %s"
+msgstr "Klaida: „nm status“: %s; leidžiami laukai: %s"
 
-#: ../cli/src/network-manager.c:102
+#: ../cli/src/network-manager.c:134
 msgid "NetworkManager status"
 msgstr "NetworkManager būsena"
 
-#: ../cli/src/network-manager.c:104
-msgid "NM running:"
-msgstr "NM veikimas:"
+#. Print header
+#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
+#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
+#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+msgid "enabled"
+msgstr "įjungta"
 
-#: ../cli/src/network-manager.c:104
+#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
+#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
+#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+msgid "disabled"
+msgstr "išjungta"
+
+#: ../cli/src/network-manager.c:148
 msgid "running"
 msgstr "veikia"
 
-#: ../cli/src/network-manager.c:104
+#: ../cli/src/network-manager.c:148
 msgid "not running"
 msgstr "neveikia"
 
-#: ../cli/src/network-manager.c:105
-msgid "NM state:"
-msgstr "NM būsena"
+#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#, c-format
+msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
+msgstr "Klaida: „--fields“ reikšmė „%s“ čia netinkama; leidžiami laukai: %s"
 
-#: ../cli/src/network-manager.c:106
-msgid "NM wireless hardware:"
-msgstr "NM belaidė įranga:"
+#: ../cli/src/network-manager.c:209
+msgid "WiFi enabled"
+msgstr "WiFi įjungtas"
 
-#. no argument, show current state
-#: ../cli/src/network-manager.c:107 ../cli/src/network-manager.c:143
-msgid "NM wireless:"
-msgstr "NM belaidis:"
-
-#: ../cli/src/network-manager.c:108
-msgid "NM WWAN hardware:"
-msgstr "NM WWAN įranga:"
-
-#. no argument, show current state
-#: ../cli/src/network-manager.c:109 ../cli/src/network-manager.c:160
-msgid "NM WWAN:"
-msgstr "NM WWAN:"
-
-#: ../cli/src/network-manager.c:150
+#: ../cli/src/network-manager.c:220
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "Klaida: netinkamas „wifi“ parametras: „%s“."
 
-#: ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:241
+msgid "WWAN enabled"
+msgstr "WWAN įjungta"
+
+#: ../cli/src/network-manager.c:252
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "Klaida: netinkamas „wwan“ parametras: „%s“."
 
-#: ../cli/src/network-manager.c:178
+#: ../cli/src/network-manager.c:263
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Klaida: netinkama „nm“ komanda „%s“."
 
-#: ../cli/src/nmcli.c:65
+#: ../cli/src/nmcli.c:69
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -t[erse]    terse output\n"
-"  -p[retty]   pretty output\n"
-"  -v[ersion]  show program version\n"
-"  -h[elp]     print this help\n"
+"  -t[erse]                                   terse output\n"
+"  -p[retty]                                  pretty output\n"
+"  -m[ode] tabular|multiline                  output mode\n"
+"  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
+"  -e[scape] yes|no                           escape columns separators in "
+"values\n"
+"  -v[ersion]                                 show program version\n"
+"  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
 "  nm          NetworkManager status\n"
@@ -822,10 +986,14 @@ msgstr ""
 "Naudojimas: %s [PARINKTYS] OBJEKTAS { KOMANDA | help }\n"
 "\n"
 "PARINKTYS\n"
-"  -t[erse]    trumpa išvestis\n"
-"  -p[retty]   graži išvestis\n"
-"  -v[ersion]  rodyti programos versiją\n"
-"  -h[elp]     išvesti šią pagalbą\n"
+"  -t[erse]                                   trumpa išvestis\n"
+"  -p[retty]                                  graži išvestis\n"
+"  -m[ode] tabular|multiline                  išvedimo veiksena\n"
+"  -f[fields] <field1,field2,...>|all|common  nurodyti išvedamus laukus\n"
+"  -e[scape] yes|no                           atlikti stulpelių skirtukų "
+"kaitą\n"
+"  -v[ersion]                                 rodyti programos versiją\n"
+"  -h[elp]                                    išvesti šią pagalbą\n"
 "\n"
 "OBJEKTAS\n"
 "  nm          NetworkManager būsena\n"
@@ -833,35 +1001,168 @@ msgstr ""
 "  dev         NetworkManager valdomi įrenginiai\n"
 "\n"
 
-#: ../cli/src/nmcli.c:106
+#: ../cli/src/nmcli.c:113
 #, c-format
-msgid "Object '%s' is unknown, try 'nmcli help'."
-msgstr "Nežinomas objektas „%s“, bandykite „nmcli help“."
+msgid "Error: Object '%s' is unknown, try 'nmcli help'."
+msgstr "Klaida: nežinomas objektas „%s“, bandykite „nmcli help“."
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:143
+#, c-format
+msgid "Error: Option '--terse' is specified the second time."
+msgstr "Klaida: parinktis „--terse“ nurodyta antrą kartą."
+
+#: ../cli/src/nmcli.c:148
+#, c-format
+msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
+msgstr "Klaida: parinktis „--terse“ yra tarpusavyje nesuderinama su „--pretty“."
+
+#: ../cli/src/nmcli.c:156
+#, c-format
+msgid "Error: Option '--pretty' is specified the second time."
+msgstr "Klaida: parinktis „--pretty“ nurodyta antrą kartą."
+
+#: ../cli/src/nmcli.c:161
+#, c-format
+msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
+msgstr "Klaida: parinktis „--pretty“ yra tarpusavyje nesuderinama su „--terse“."
+
+#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#, c-format
+msgid "Error: missing argument for '%s' option."
+msgstr "Klaida: trūksta argumento parinkčiai „%s“."
+
+#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#, c-format
+msgid "Error: '%s' is not valid argument for '%s' option."
+msgstr "Klaida: „%s“ yra netinkamas argumentas parinkčiai „%s“."
+
+#: ../cli/src/nmcli.c:203
+#, c-format
+msgid "Error: fields for '%s' options are missing."
+msgstr "Klaida: trūksta laukų parinktims „%s“."
+
+#: ../cli/src/nmcli.c:209
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli įrankis, versija %s\n"
 
-#: ../cli/src/nmcli.c:145
+#: ../cli/src/nmcli.c:215
 #, c-format
-msgid "Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Nežinoma parinktis „%s“, bandykite „nmcli help“."
+msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
+msgstr "Klaida: nežinoma parinktis „%s“, bandykite „nmcli -help“."
 
-#: ../cli/src/nmcli.c:164
+#: ../cli/src/nmcli.c:234
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Gautas signalas %d, išjungiama..."
 
-#: ../cli/src/nmcli.c:189
+#: ../cli/src/nmcli.c:259
 #, c-format
 msgid "Error: Could not connect to NetworkManager."
 msgstr "Klaida: nepavyko prisijungti prie NetworkManager."
 
-#: ../cli/src/nmcli.c:205
+#: ../cli/src/nmcli.c:275
 msgid "Success"
 msgstr "Pavyko"
 
+#: ../cli/src/settings.c:411
+#, c-format
+msgid "%d (hex-ascii-key)"
+msgstr "%d (šešioliktainis ascii raktas)"
+
+#: ../cli/src/settings.c:413
+#, c-format
+msgid "%d (104/128-bit passphrase)"
+msgstr "%d (104/128 bitų slaptažodis)"
+
+#: ../cli/src/settings.c:416
+#, c-format
+msgid "%d (unknown)"
+msgstr "%d (nežinoma)"
+
+#: ../cli/src/settings.c:442
+msgid "0 (unknown)"
+msgstr "0 (nežinoma)"
+
+#: ../cli/src/settings.c:448
+msgid "any, "
+msgstr "bet koks, "
+
+#: ../cli/src/settings.c:450
+msgid "900 MHz, "
+msgstr "900 MHz, "
+
+#: ../cli/src/settings.c:452
+msgid "1800 MHz, "
+msgstr "1800 MHz, "
+
+#: ../cli/src/settings.c:454
+msgid "1900 MHz, "
+msgstr "1900 MHz, "
+
+#: ../cli/src/settings.c:456
+msgid "850 MHz, "
+msgstr "850 MHz, "
+
+#: ../cli/src/settings.c:458
+msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 2100 MHz, "
+
+#: ../cli/src/settings.c:460
+msgid "WCDMA 3GPP UMTS 1800 MHz, "
+msgstr "WCDMA 3GPP UMTS 1800 MHz, "
+
+#: ../cli/src/settings.c:462
+msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
+
+#: ../cli/src/settings.c:464
+msgid "WCDMA 3GPP UMTS 800 MHz, "
+msgstr "WCDMA 3GPP UMTS 800 MHz, "
+
+#: ../cli/src/settings.c:466
+msgid "WCDMA 3GPP UMTS 850 MHz, "
+msgstr "WCDMA 3GPP UMTS 850 MHz, "
+
+#: ../cli/src/settings.c:468
+msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgstr "WCDMA 3GPP UMTS 900 MHz, "
+
+#: ../cli/src/settings.c:470
+msgid "WCDMA 3GPP UMTS 1700 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+
+#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+msgid "auto"
+msgstr "automatinis"
+
+#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
+#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
+msgid "not set"
+msgstr "nenustatyta"
+
+#: ../cli/src/utils.c:124
+#, c-format
+msgid "field '%s' has to be alone"
+msgstr "laukas „%s“ turi būti vienintelis"
+
+#: ../cli/src/utils.c:127
+#, c-format
+msgid "invalid field '%s'"
+msgstr "netinkamas laukas „%s“"
+
+#: ../cli/src/utils.c:146
+#, c-format
+msgid "Option '--terse' requires specifying '--fields'"
+msgstr "Parinktis „--terse“ reikalauja nurodyti „--fields“"
+
+#: ../cli/src/utils.c:150
+#, c-format
+msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
+msgstr ""
+"Parinktis „--terse“ reikalauja konkrečių parinkties „--fields“ reikšmių, ne "
+"„%s“"
+
 #: ../libnm-util/crypto.c:120
 #, c-format
 msgid "PEM key file had no end tag '%s'."
@@ -1179,30 +1480,120 @@ msgstr "Nepavyko patvirtinti PKCS#12 failo: %d"
 msgid "Could not generate random data."
 msgstr "Nepavyko sugeneruoti atsitiktinių duomenų."
 
-#: ../libnm-util/nm-utils.c:1924
+#: ../libnm-util/nm-utils.c:1925
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Nepakanka atminties šifravimo raktui sukurti."
 
-#: ../libnm-util/nm-utils.c:2034
+#: ../libnm-util/nm-utils.c:2035
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Nepakanka atminties PEM failui sukurti."
 
-#: ../libnm-util/nm-utils.c:2046
+#: ../libnm-util/nm-utils.c:2047
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Nepakanka atminties IV įrašyti į PEM failą."
 
-#: ../libnm-util/nm-utils.c:2058
+#: ../libnm-util/nm-utils.c:2059
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "Nepakanka atminties šifruotam raktui įrašyti į PEM failą."
 
-#: ../libnm-util/nm-utils.c:2077
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Nepakanka atminties PEM failo duomenims."
 
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Dalijimasis ryšiu naudojant apsaugotą WiFi tinklą"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
+msgid "Connection sharing via an open WiFi network"
+msgstr "Dalijimasis ryšiu naudojant atvirą WiFi tinklą"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
+msgid "Modify persistent system hostname"
+msgstr "Keisti pastovų sistemos vardą"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
+msgid "Modify system connections"
+msgstr "Keisti sistemos ryšius"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
+msgid "System policy prevents modification of system settings"
+msgstr "Sistemos politika neleidžia keisti sistemos nustatymų"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "Sistemos politika neleidžia keisti įsiminto sistemos vardo"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"Sistemos politika nelaidžia dalytis ryšiais naudojant apsaugotą WiFi tinklą"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"Sistemos politika neleidžia dalytis ryšiais naudojant atvirą WiFi tinklą"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "Leisti valdyti tinklo ryšius"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Allow use of user-specific connections"
+msgstr "Leisti naudoti pasirinktinius naudotojo ryšius"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Enable or disable WiFi devices"
+msgstr "Įjungti arba išjungti WiFi įrenginius"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable mobile broadband devices"
+msgstr "Įjungti arba išjungti mobiliojo plačiajuosčio ryšio įrenginius"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable system networking"
+msgstr "Įjungti arba išjungti sistemos prieigą prie tinklo"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"Užmigdyti arba pažadinti NetworkManager (tai turėtų naudoti tik sistemos "
+"energijos valdymo posistemė)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "System policy prevents control of network connections"
+msgstr "Sistemos politika neleidžia valdyti tinklo ryšių"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "Sistemos politika neleidžia įjungti arba išjungti WiFi įrenginių"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"Sistemos politika neleidžia įjungti arba išjungti mobiliojo plačiajuosčio "
+"ryšio įrenginių"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"Sistemos politika neleidžia įjungti arba išjungti sistemos prieigos prie "
+"tinklo"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "Sistemos politika neleidžia užmigdyti arba pažadinti NetworkManager"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents use of user-specific connections"
+msgstr "Sistemos politika neleidžia naudoti pasirinktinių naudotojo ryšių"
+
 #: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
 #: ../src/nm-netlink-monitor.c:653
 #, c-format
@@ -1250,7 +1641,7 @@ msgstr ""
 "Netinkama parinktis. Galimų parinkčių sąrašą galite pamatyti naudodami "
 "parametrą --help.\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:568
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s.  Naudokite --help, galimų parinkčių sąrašui gauti.\n"
@@ -1293,14 +1684,15 @@ msgstr "Nežinomas žurnalo vedimo lygis „%s“"
 #: ../src/logging/nm-logging.c:171
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "Nežinomas žurnalo domenas „%s“"
+msgstr "Nežinoma žurnalo sritis „%s“"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/named-manager/nm-named-manager.c:350
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
-"PASTABA: libc sprendiklis gali nepalaikyti daugiau nei 3 vardų serverių."
+"PASTABA: libc adresų nustatymo funkcija gali nepalaikyti daugiau nei 3 vardų "
+"serverių."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/named-manager/nm-named-manager.c:352
 msgid "The nameservers listed below may not be recognized."
 msgstr "Žemiau pateikti vardų serveriai gali būti neatpažinti."
 
@@ -1309,40 +1701,161 @@ msgstr "Žemiau pateikti vardų serveriai gali būti neatpažinti."
 msgid "Auto %s"
 msgstr "Automatinis %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3254
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3275
 msgid "System"
 msgstr "Sistema"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Dalijimasis ryšiu naudojant apsaugotą WiFi tinklą"
+#~ msgid "Type"
+#~ msgstr "Tipas"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Dalijimasis ryšiu naudojant atvirą WiFi tinklą"
+#~ msgid "Name"
+#~ msgstr "Pavadinimas"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Keisti pastovų sistemos vardą"
+#~ msgid "User connections:\n"
+#~ msgstr "Naudotojo ryšiai:\n"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Keisti sistemos ryšius"
+#~ msgid "System-wide connections"
+#~ msgstr "Sistemos ryšiai"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "Sistemos politika neleidžia keisti sistemos nustatymų"
+#~ msgid "Default"
+#~ msgstr "Numatyta"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "Sistemos politika neleidžia keisti įsiminto sistemos vardo"
+#~ msgid "Service"
+#~ msgstr "Tarnyba"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"Sistemos politika nelaidžia dalytis ryšiais naudojant apsaugotą WiFi tinklą"
+#~ msgid "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d"
+#~ msgstr "%s, %s, dažnis %d MHz, sparta %d Mb/s, stiprumas %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"Sistemos politika neleidžia dalytis ryšiais naudojant atvirą WiFi tinklą"
+#~ msgid "Device"
+#~ msgstr "Įrenginys"
+
+#~ msgid "Driver"
+#~ msgstr "Tvarkyklė"
+
+#~ msgid "State"
+#~ msgstr "Būsena"
+
+#~ msgid "HW Address"
+#~ msgstr "Aparatinis adresas"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Capabilities:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Galimybės:\n"
+
+#~ msgid "Carrier Detect"
+#~ msgstr "Perdavimo aptikimas"
+
+#~ msgid "Speed"
+#~ msgstr "Sparta"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Wireless Properties\n"
+#~ msgstr ""
+#~ "\n"
+#~ "  Belaidžio ryšio savybės\n"
+
+#~ msgid "WEP Encryption"
+#~ msgstr "WEP šifravimas"
+
+#~ msgid "WPA Encryption"
+#~ msgstr "WPA šifravimas"
+
+#~ msgid "WPA2 Encryption"
+#~ msgstr "WPA2 šifravimas"
+
+#~ msgid "TKIP cipher"
+#~ msgstr "TKIP šifras"
+
+#~ msgid "CCMP cipher"
+#~ msgstr "CCMP šifras"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Wireless Access Points %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "  Belaidžiai prieigos taškai %s\n"
+
+#~ msgid "(* = current AP)"
+#~ msgstr "(* = dabartinis prieigos taškas)"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Wired Properties\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Laidinio ryšio savybės\n"
+
+#~ msgid "Carrier"
+#~ msgstr "Perdavimas"
+
+#~ msgid ""
+#~ "\n"
+#~ "  IPv4 Settings:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "  IPv4 nustatymai:\n"
+
+#~ msgid "Address"
+#~ msgstr "Adresas"
+
+#~ msgid "Prefix"
+#~ msgstr "Priešdėlis"
+
+#~ msgid "Gateway"
+#~ msgstr "Šliuzas"
+
+#~ msgid "Device:"
+#~ msgstr "Įrenginys:"
+
+#~ msgid "Error: hwaddr has to be specified."
+#~ msgstr "Klaida: turi būti nurodytas hwaddr."
+
+#~ msgid "AP parameters"
+#~ msgstr "Prieigos taško parametrai"
+
+#~ msgid "Frequency:"
+#~ msgstr "Dažnis:"
+
+#~ msgid "Mode:"
+#~ msgstr "Veiksena:"
+
+#~ msgid "Ad-hoc"
+#~ msgstr "Ad-hoc"
+
+#~ msgid "Maximal bitrate:"
+#~ msgstr "Didžiausias galimas bitų dažnis:"
+
+#~ msgid "Strength:"
+#~ msgstr "Stiprumas:"
+
+#~ msgid "Flags:"
+#~ msgstr "Požymiai:"
+
+#~ msgid "privacy"
+#~ msgstr "privatumas"
+
+#~ msgid "WPA flags:"
+#~ msgstr "WPA požymiai:"
+
+#~ msgid "RSN flags:"
+#~ msgstr "RSN požymiai:"
+
+#~ msgid "NM running:"
+#~ msgstr "NM veikimas:"
+
+#~ msgid "NM state:"
+#~ msgstr "NM būsena"
+
+#~ msgid "NM wireless hardware:"
+#~ msgstr "NM belaidė įranga:"
+
+#~ msgid "NM wireless:"
+#~ msgstr "NM belaidis:"
+
+#~ msgid "NM WWAN hardware:"
+#~ msgstr "NM WWAN įranga:"

From 1ba6dcacbf794b678f32838471400aca0b14e8ed Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 21 Jul 2010 15:37:00 -0700
Subject: [PATCH 08/17] settings: add InvalidSetting error

To be used when the requested setting (for secrets, etc) doesn't
exist in the connection.
---
 libnm-glib/nm-settings-interface.c | 4 +++-
 libnm-glib/nm-settings-interface.h | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libnm-glib/nm-settings-interface.c b/libnm-glib/nm-settings-interface.c
index a1d548ed15..3bd4037a1e 100644
--- a/libnm-glib/nm-settings-interface.c
+++ b/libnm-glib/nm-settings-interface.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2007 - 2008 Novell, Inc.
- * Copyright (C) 2007 - 2008 Red Hat, Inc.
+ * Copyright (C) 2007 - 2010 Red Hat, Inc.
  */
 
 #include "nm-settings-interface.h"
@@ -62,6 +62,8 @@ nm_settings_interface_error_get_type (void)
 			ENUM_ENTRY (NM_SETTINGS_INTERFACE_ERROR_SECRETS_REQUEST_CANCELED, "SecretsRequestCanceled"),
 			/* The request could not be completed because permission was denied. */
 			ENUM_ENTRY (NM_SETTINGS_INTERFACE_ERROR_PERMISSION_DENIED, "PermissionDenied"),
+			/* The requested setting does not existing in this connection. */
+			ENUM_ENTRY (NM_SETTINGS_INTERFACE_ERROR_INVALID_SETTING, "InvalidSetting"),
 			{ 0, 0, 0 },
 		};
 		etype = g_enum_register_static ("NMSettingsInterfaceError", values);
diff --git a/libnm-glib/nm-settings-interface.h b/libnm-glib/nm-settings-interface.h
index dc7bd0eb82..5920bd8255 100644
--- a/libnm-glib/nm-settings-interface.h
+++ b/libnm-glib/nm-settings-interface.h
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2007 - 2008 Novell, Inc.
- * Copyright (C) 2007 - 2009 Red Hat, Inc.
+ * Copyright (C) 2007 - 2010 Red Hat, Inc.
  */
 
 #ifndef NM_SETTINGS_INTERFACE_H
@@ -36,7 +36,8 @@ typedef enum {
 	NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
 	NM_SETTINGS_INTERFACE_ERROR_SECRETS_UNAVAILABLE,
 	NM_SETTINGS_INTERFACE_ERROR_SECRETS_REQUEST_CANCELED,
-	NM_SETTINGS_INTERFACE_ERROR_PERMISSION_DENIED
+	NM_SETTINGS_INTERFACE_ERROR_PERMISSION_DENIED,
+	NM_SETTINGS_INTERFACE_ERROR_INVALID_SETTING,
 } NMSettingsInterfaceError;
 
 #define NM_SETTINGS_INTERFACE_ERROR (nm_settings_interface_error_quark ())

From fe869a35e6c8481c20b26ca3eb5ae913a7d0f9c1 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 21 Jul 2010 15:37:53 -0700
Subject: [PATCH 09/17] libnm-glib: ensure invalids secrets hash isn't used on
 error condition

Apparently dbus-glib just sends through a random address for the
hash table even if 'error' is set.  Make sure we don't pass that down
to subclasses.
---
 libnm-glib/nm-remote-connection.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index 5d104d0680..1039a7d188 100644
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -164,7 +164,7 @@ get_secrets_cb (DBusGProxy *proxy, GHashTable *secrets, GError *error, gpointer
 	RemoteCall *call = user_data;
 	NMSettingsConnectionInterfaceGetSecretsFunc func = (NMSettingsConnectionInterfaceGetSecretsFunc) call->callback;
 
-	(*func)(NM_SETTINGS_CONNECTION_INTERFACE (call->self), secrets, error, call->user_data);
+	(*func)(NM_SETTINGS_CONNECTION_INTERFACE (call->self), error ? NULL : secrets, error, call->user_data);
 	remote_call_complete (call->self, call);
 }
 

From d533c807e6387fc4439af860ed5e52ce7a52a425 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 21 Jul 2010 15:54:44 -0700
Subject: [PATCH 10/17] system-settings: return InvalidSetting when secrets
 setting doesn't exist (bgo #623744)

So that clients can handle the error intelligently; it's not
really a fatal error.
---
 src/system-settings/nm-sysconfig-connection.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system-settings/nm-sysconfig-connection.c b/src/system-settings/nm-sysconfig-connection.c
index 09cec4000f..f46895accc 100644
--- a/src/system-settings/nm-sysconfig-connection.c
+++ b/src/system-settings/nm-sysconfig-connection.c
@@ -209,7 +209,7 @@ get_secrets (NMSettingsConnectionInterface *connection,
 	setting = nm_connection_get_setting_by_name (priv->secrets, setting_name);
 	if (!setting) {
 		error = g_error_new (NM_SETTINGS_INTERFACE_ERROR,
-		                     NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION,
+		                     NM_SETTINGS_INTERFACE_ERROR_INVALID_SETTING,
 		                     "%s.%d - Connection didn't have requested setting '%s'.",
 		                     __FILE__, __LINE__, setting_name);
 		(*callback) (connection, NULL, error, user_data);

From 81f030fe5b8a4362d2274b4799d50238a16a26bb Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 21 Jul 2010 15:55:33 -0700
Subject: [PATCH 11/17] core: don't require PPP setting for PPPoE connections
 (bgo #623744)

The PPP setting will usually be all defaults anyway, so lets just
created it when needed if it doesn't yet exist.  Fixes an error
where the connection editor couldn't edit system DSL connections
because it tried to request secrets for the PPP setting that didn't
actually exist in the connection because the 'keyfile' plugin
wouldn't save all-default settings, thus that setting wouldn't
exist when read back in.
---
 libnm-util/nm-setting-pppoe.c    | 19 +------------------
 src/ppp-manager/nm-ppp-manager.c | 32 +++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c
index 6b0241b475..d1aba43d30 100644
--- a/libnm-util/nm-setting-pppoe.c
+++ b/libnm-util/nm-setting-pppoe.c
@@ -19,7 +19,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2007 - 2008 Red Hat, Inc.
+ * (C) Copyright 2007 - 2010 Red Hat, Inc.
  * (C) Copyright 2007 - 2008 Novell, Inc.
  */
 
@@ -112,15 +112,6 @@ nm_setting_pppoe_get_password (NMSettingPPPOE *setting)
 	return NM_SETTING_PPPOE_GET_PRIVATE (setting)->password;
 }
 
-static gint
-find_setting_by_name (gconstpointer a, gconstpointer b)
-{
-	NMSetting *setting = NM_SETTING (a);
-	const char *str = (const char *) b;
-
-	return strcmp (nm_setting_get_name (setting), str);
-}
-
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
@@ -148,14 +139,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
-	if (!g_slist_find_custom (all_settings, NM_SETTING_PPP_SETTING_NAME, find_setting_by_name)) {
-		g_set_error (error,
-		             NM_SETTING_PPPOE_ERROR,
-		             NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING,
-		             NULL);
-		return FALSE;
-	}
-
 	return TRUE;
 }
 
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index de905b49db..148ad2cf63 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2008 Red Hat, Inc.
+ * Copyright (C) 2008 - 2010 Red Hat, Inc.
  */
 
 #include <sys/types.h>
@@ -883,7 +883,8 @@ nm_ppp_manager_start (NMPPPManager *manager,
 {
 	NMPPPManagerPrivate *priv;
 	NMConnection *connection;
-	NMSettingPPP *ppp_setting;
+	NMSettingPPP *s_ppp;
+	gboolean s_ppp_created = FALSE;
 	NMSettingPPPOE *pppoe_setting;
 	NMCmdLine *ppp_cmd;
 	char *cmd_str;
@@ -893,26 +894,36 @@ nm_ppp_manager_start (NMPPPManager *manager,
 	g_return_val_if_fail (NM_IS_PPP_MANAGER (manager), FALSE);
 	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
 
+	priv = NM_PPP_MANAGER_GET_PRIVATE (manager);
+
+	priv->pid = 0;
+
 	/* Make sure /dev/ppp exists (bgo #533064) */
 	if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
 		ignored = system ("/sbin/modprobe ppp_generic");
 
 	connection = nm_act_request_get_connection (req);
-	ppp_setting = NM_SETTING_PPP (nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP));
-	g_return_val_if_fail (ppp_setting != NULL, FALSE);
+	g_assert (connection);
+
+	s_ppp = (NMSettingPPP *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP);
+	if (!s_ppp) {
+		/* If the PPP settings are all default we may not have a PPP setting yet,
+		 * so just make a default one here.
+		 */
+		s_ppp = NM_SETTING_PPP (nm_setting_ppp_new ());
+		s_ppp_created = TRUE;
+	}
 	
 	pppoe_setting = (NMSettingPPPOE *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE);
 	if (pppoe_setting)
-		pppoe_fill_defaults (ppp_setting);
+		pppoe_fill_defaults (s_ppp);
 
-	ppp_cmd = create_pppd_cmd_line (manager, ppp_setting, pppoe_setting, ppp_name, err);
+	ppp_cmd = create_pppd_cmd_line (manager, s_ppp, pppoe_setting, ppp_name, err);
 	if (!ppp_cmd)
-		return FALSE;
+		goto out;
 
 	g_ptr_array_add (ppp_cmd->array, NULL);
 
-	priv = NM_PPP_MANAGER_GET_PRIVATE (manager);
-
 	nm_log_info (LOGD_PPP, "starting PPP connection");
 
 	cmd_str = nm_cmd_line_to_str (ppp_cmd);
@@ -934,6 +945,9 @@ nm_ppp_manager_start (NMPPPManager *manager,
 	priv->act_req = g_object_ref (req);
 
  out:
+	if (s_ppp_created)
+		g_object_unref (s_ppp);
+
 	if (ppp_cmd)
 		nm_cmd_line_destroy (ppp_cmd);
 

From 0a700de04727855c2f5c0b122ad817f6430d8e09 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 21 Jul 2010 16:47:31 -0700
Subject: [PATCH 12/17] core: read nm-system-settings.conf first (rh #606160)

Even though we prefer NetworkManager.conf, we need to check the
old nm-system-settings.conf first to preserve compat with older
setups.  In package managed systems dropping a NetworkManager.conf
onto the system would make NM use it instead of nm-system-settings.conf,
changing behavior during an upgrade.  We don't want that.
---
 src/main.c | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/main.c b/src/main.c
index f76cea9473..c2fb58be77 100644
--- a/src/main.c
+++ b/src/main.c
@@ -528,8 +528,30 @@ main (int argc, char *argv[])
 	} else {
 		gboolean parsed = FALSE;
 
-		/* Try NetworkManager.conf first */
-		if (g_file_test (NM_DEFAULT_SYSTEM_CONF_FILE, G_FILE_TEST_EXISTS)) {
+		/* Even though we prefer NetworkManager.conf, we need to check the
+		 * old nm-system-settings.conf first to preserve compat with older
+		 * setups.  In package managed systems dropping a NetworkManager.conf
+		 * onto the system would make NM use it instead of nm-system-settings.conf,
+		 * changing behavior during an upgrade.  We don't want that.
+		 */
+
+		/* Try deprecated nm-system-settings.conf first */
+		if (g_file_test (NM_OLD_SYSTEM_CONF_FILE, G_FILE_TEST_EXISTS)) {
+			config = g_strdup (NM_OLD_SYSTEM_CONF_FILE);
+			parsed = parse_config_file (config, &conf_plugins, &dhcp, &cfg_log_level, &cfg_log_domains, &error);
+			if (!parsed) {
+				fprintf (stderr, "Default config file %s invalid: (%d) %s\n",
+				         config,
+				         error ? error->code : -1,
+				         (error && error->message) ? error->message : "unknown");
+				g_free (config);
+				config = NULL;
+				g_clear_error (&error);
+			}
+		}
+
+		/* Try the preferred NetworkManager.conf last */
+		if (!parsed && g_file_test (NM_DEFAULT_SYSTEM_CONF_FILE, G_FILE_TEST_EXISTS)) {
 			config = g_strdup (NM_DEFAULT_SYSTEM_CONF_FILE);
 			parsed = parse_config_file (config, &conf_plugins, &dhcp, &cfg_log_level, &cfg_log_domains, &error);
 			if (!parsed) {
@@ -540,26 +562,9 @@ main (int argc, char *argv[])
 				g_free (config);
 				config = NULL;
 				g_clear_error (&error);
-				/* Not a hard failure */
-			}
-		}
-
-		/* Try old nm-system-settings.conf next */
-		if (!parsed) {
-			config = g_strdup (NM_OLD_SYSTEM_CONF_FILE);
-			if (!parse_config_file (config, &conf_plugins, &dhcp, &cfg_log_level, &cfg_log_domains, &error)) {
-				fprintf (stderr, "Default config file %s invalid: (%d) %s\n",
-				         config,
-				         error ? error->code : -1,
-				         (error && error->message) ? error->message : "unknown");
-				g_free (config);
-				config = NULL;
-				g_clear_error (&error);
-				/* Not a hard failure */
 			}
 		}
 	}
-
 	/* Logging setup */
 	if (!nm_logging_setup (log_level ? log_level : cfg_log_level,
 	                       log_domains ? log_domains : cfg_log_domains,
@@ -629,6 +634,9 @@ main (int argc, char *argv[])
 	nm_log_info (LOGD_CORE, "NetworkManager (version " NM_DIST_VERSION ") is starting...");
 	success = FALSE;
 
+	if (config)
+		nm_log_info (LOGD_CORE, "Read config file %s", config);
+
 	main_loop = g_main_loop_new (NULL, FALSE);
 
 	/* Create watch functions that monitor cards for link status. */

From fbdb963f04068de1fe1a61558ed8793cc57b4661 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 22 Jul 2010 16:26:34 -0700
Subject: [PATCH 13/17] ifcfg-rh: fix testcase format string

From Andrey Borzenkov <arvidjaar@gmail.com>
---
 system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 6e873fe82b..1271928d9f 100644
--- a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -6435,7 +6435,7 @@ test_write_wifi_open (void)
 	ASSERT (tmp != NULL,
 	        "wifi-open-write-reread", "failed to read ESSID key from %s", testfile);
 
-	g_message (tmp);
+	g_message ("%s", tmp);
 	ASSERT (strncmp (tmp, "\"\"", 2) != 0,
 	        "wifi-open-write-reread", "unexpected ESSID double-quote in %s", testfile);
 

From ead5ed849a61ebf4fe98632d92289b245b5a7d20 Mon Sep 17 00:00:00 2001
From: Sandeep Shedmake <sshedmak@redhat.com>
Date: Tue, 27 Jul 2010 14:44:24 -0700
Subject: [PATCH 14/17] po: update Marathi translation (bgo #625312)

---
 po/mr.po | 221 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 137 insertions(+), 84 deletions(-)

diff --git a/po/mr.po b/po/mr.po
index d2bc41c869..c608ace4b3 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-10 10:40+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2010-06-28 08:52+0000\n"
+"PO-Revision-Date: 2010-07-26 18:24+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -141,19 +141,19 @@ msgstr "कधिच नाही"
 #: ../cli/src/connections.c:602 ../cli/src/connections.c:605
 #: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
 #: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:544 ../cli/src/settings.c:643
-#: ../cli/src/settings.c:912 ../cli/src/settings.c:913
-#: ../cli/src/settings.c:915 ../cli/src/settings.c:917
-#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1043
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1123
-#: ../cli/src/settings.c:1124 ../cli/src/settings.c:1125
-#: ../cli/src/settings.c:1126 ../cli/src/settings.c:1127
-#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1131
-#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1133
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1210
+#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
+#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
+#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
+#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
+#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
+#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
+#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
+#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
+#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
+#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1224
 msgid "yes"
 msgstr "होय"
 
@@ -161,19 +161,19 @@ msgstr "होय"
 #: ../cli/src/connections.c:602 ../cli/src/connections.c:605
 #: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
 #: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:506 ../cli/src/settings.c:544
-#: ../cli/src/settings.c:643 ../cli/src/settings.c:912
-#: ../cli/src/settings.c:913 ../cli/src/settings.c:915
-#: ../cli/src/settings.c:917 ../cli/src/settings.c:1042
-#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1123 ../cli/src/settings.c:1124
-#: ../cli/src/settings.c:1125 ../cli/src/settings.c:1126
-#: ../cli/src/settings.c:1127 ../cli/src/settings.c:1128
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1210
+#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
+#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
+#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
+#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
+#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
+#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
+#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
+#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
+#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
+#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
 msgid "no"
 msgstr "नाही"
 
@@ -262,7 +262,7 @@ msgstr "सक्रिय केले"
 #: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
 #: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
 #: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:469
+#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
 msgid "unknown"
 msgstr "अपरिचीत"
 
@@ -1063,78 +1063,79 @@ msgstr "त्रुटी: NetworkManager सह जोडणी करण्
 msgid "Success"
 msgstr "यश"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:411
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:413
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-बीट पासफ्रेज)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:416
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (अपरिचीत)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:442
 msgid "0 (unknown)"
 msgstr "0 (अपरिचीत)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:448
 msgid "any, "
 msgstr "कुठलेही, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:450
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:452
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:454
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:456
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:458
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:460
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:462
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:464
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:466
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:468
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
 msgid "auto"
 msgstr "स्वयं"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
+#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
 msgid "not set"
 msgstr "सेट केले नाही"
 
@@ -1497,6 +1498,90 @@ msgstr "एनक्रिप्टेड किला PEM फाइलवर 
 msgid "Could not allocate memory for PEM file data."
 msgstr "PEM फाइल डाटाकरीता मेमरीचे वाटप करणे अशक्य."
 
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
+msgid "Connection sharing via a protected WiFi network"
+msgstr "सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग करा"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
+msgid "Connection sharing via an open WiFi network"
+msgstr "ओपन WiFi नेटवर्क द्वारे कनेक्शन शेअरींग करा"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
+msgid "Modify persistent system hostname"
+msgstr "पर्सिस्टंट प्रणाली यजमाननाव संपादीत करा"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
+msgid "Modify system connections"
+msgstr "प्रणाली जुळवणी संपादीत करा"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
+msgid "System policy prevents modification of system settings"
+msgstr "प्रणाली करार, प्रणाली संयोजना संपादीत करण्यापासून रोखतो"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "प्रणाली करार पर्सिस्टंट प्रणाली यजमाननावाचे संपादन रोखत आहे"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "प्रणाली करार सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "प्रणाली करार ओपन WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "नेटवर्क जोडणींचे नियंत्रण स्वीकारा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Allow use of user-specific connections"
+msgstr "वापरकर्ता-निर्देशीत जोडणींचा वापर स्वीकारा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Enable or disable WiFi devices"
+msgstr "WiFi साधने सुरू किंवा बंद करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable mobile broadband devices"
+msgstr "मोबाईल ब्रॉडबँड साधने सुरू किंवा बंद करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable system networking"
+msgstr "प्रणाली नेटवर्किंग सुरू किंवा बंद करा"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager ला स्लीप किंवा वेकअप स्तरात न्या (फक्त प्रणाली पावर मॅनेजमेंटनेच याचा "
+"वापर करावा)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "System policy prevents control of network connections"
+msgstr "प्रणाली करार नेटवर्क जोडणीचे नियंत्रण रोखते"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "प्रणाली करार WiFi साधणांना सुरू किंवा बंद होण्यापासून रोखते"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr "प्रणाली करार मोबाईल ब्रॉडबँड साधणांना सुरू किंवा बंद होण्यापासून रोखते"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "प्रणाली करार प्रणाली नेटवर्किंगसा सुरू किंवा बंद होण्यापासून रोखते"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "प्रणाली करार NetworkManager ला स्लीप किंवा वेकअप मध्ये जाण्यापासून रोखते"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents use of user-specific connections"
+msgstr "प्रणाली करार वापरकर्ता-निर्देशीत जोडणींचे वापर रोखते"
+
 #: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
 #: ../src/nm-netlink-monitor.c:653
 #, c-format
@@ -1542,7 +1627,7 @@ msgstr "दुवा कॅशे अद्ययावत करतेवेळ
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "अवैध पर्याय.  वैध पर्यायची यादी पहाण्याकरीता कृपया --help वापरा.\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:568
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s.  वैध पर्यायची सूची पहाण्याकरीता कृपया --help वापरा.\n"
@@ -1587,11 +1672,11 @@ msgstr "अपरिचीत लॉग स्तर '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "अपरिचीत लॉग डोमेन '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/named-manager/nm-named-manager.c:350
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "NOTE: libc रिजॉलव्हर 3 पेक्षा जास्त नेमसर्व्हर्स् करीता समर्थन पुरवू शकणार नाही."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/named-manager/nm-named-manager.c:352
 msgid "The nameservers listed below may not be recognized."
 msgstr "खालिल यादीतील नेमसर्व्हर्स् अनोळखी राहतील."
 
@@ -1600,39 +1685,7 @@ msgstr "खालिल यादीतील नेमसर्व्हर्
 msgid "Auto %s"
 msgstr "स्वयं %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3275
 msgid "System"
 msgstr "प्रणाली"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग करा"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "ओपन WiFi नेटवर्क द्वारे कनेक्शन शेअरींग करा"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "पर्सिस्टंट प्रणाली यजमाननाव संपादीत करा"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "प्रणाली जुळवणी संपादीत करा"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "प्रणाली करार, प्रणाली संयोजना संपादीत करण्यापासून रोखतो"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "प्रणाली करार पर्सिस्टंट प्रणाली यजमाननावाचे संपादन रोखत आहे"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "प्रणाली करार सुरक्षीत WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "प्रणाली करार ओपन WiFi नेटवर्क द्वारे जोडणीचे शेअरींग रोखत आहे"
-

From ba3dcc2b0872566f89133a940bab237d18cb8402 Mon Sep 17 00:00:00 2001
From: shankar <prasad.mvs@gmail.com>
Date: Tue, 27 Jul 2010 15:25:56 -0700
Subject: [PATCH 15/17] po: update Kannada translation (bgo #625283)

---
 po/kn.po | 235 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 148 insertions(+), 87 deletions(-)

diff --git a/po/kn.po b/po/kn.po
index be51ba0dec..fcdec5dd0e 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.po.master.kn\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-07 10:54+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2010-06-28 08:52+0000\n"
+"PO-Revision-Date: 2010-07-26 12:55+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
-"Language-Team: kn-IN <>\n"
+"Language-Team: kn_IN <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -141,19 +142,19 @@ msgstr "ಎಂದಿಗೂ ಬೇಡ"
 #: ../cli/src/connections.c:602 ../cli/src/connections.c:605
 #: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
 #: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:544 ../cli/src/settings.c:643
-#: ../cli/src/settings.c:912 ../cli/src/settings.c:913
-#: ../cli/src/settings.c:915 ../cli/src/settings.c:917
-#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1043
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1123
-#: ../cli/src/settings.c:1124 ../cli/src/settings.c:1125
-#: ../cli/src/settings.c:1126 ../cli/src/settings.c:1127
-#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1131
-#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1133
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1210
+#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
+#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
+#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
+#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
+#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
+#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
+#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
+#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
+#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
+#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1224
 msgid "yes"
 msgstr "ಹೌದು"
 
@@ -161,19 +162,19 @@ msgstr "ಹೌದು"
 #: ../cli/src/connections.c:602 ../cli/src/connections.c:605
 #: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
 #: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:506 ../cli/src/settings.c:544
-#: ../cli/src/settings.c:643 ../cli/src/settings.c:912
-#: ../cli/src/settings.c:913 ../cli/src/settings.c:915
-#: ../cli/src/settings.c:917 ../cli/src/settings.c:1042
-#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1123 ../cli/src/settings.c:1124
-#: ../cli/src/settings.c:1125 ../cli/src/settings.c:1126
-#: ../cli/src/settings.c:1127 ../cli/src/settings.c:1128
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1210
+#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
+#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
+#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
+#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
+#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
+#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
+#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
+#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
+#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
+#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
 msgid "no"
 msgstr "ಇಲ್ಲ"
 
@@ -262,7 +263,7 @@ msgstr "ಸಕ್ರಿಯಗೊಂಡಿದೆ"
 #: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
 #: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
 #: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:469
+#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
 msgid "unknown"
 msgstr "ಗೊತ್ತಿಲ್ಲದ"
 
@@ -1063,78 +1064,79 @@ msgstr "ದೋಷ: NetworkManager ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾ
 msgid "Success"
 msgstr "ಯಶಸ್ವಿಯಾಗಿದೆ"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:411
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:413
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-ಬಿಟ್‌ ಗುಪ್ತವಾಕ್ಯಾಂಶ)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:416
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (ಅಜ್ಞಾತ)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:442
 msgid "0 (unknown)"
 msgstr "0 (ಗೊತ್ತಿರದ)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:448
 msgid "any, "
 msgstr "ಯಾವುದಾದರೂ, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:450
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:452
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:454
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:456
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:458
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:460
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:462
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:464
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:466
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:468
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
 msgid "auto"
 msgstr "ಸ್ವಯಂಚಾಲಿತ"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
+#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
 msgid "not set"
 msgstr "ಹೊಂದಿಸಲಾಗಿಲ್ಲ"
 
@@ -1157,8 +1159,8 @@ msgstr "'--terse' ಎಂಬ ಆಯ್ಕೆಗೆ '--fields' ಅನ್ನು ಸ
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
-"'--terse' ಎಂಬ ಆಯ್ಕೆಗೆ ನಿಶ್ಚಿತವಾದ '--fields' ಆಯ್ಕೆಯ ಮೌಲ್ಯದ ಅಗತ್ಯವಿರುತ್ತದೆಯೆ ಹೊರತು, '%s' "
-"ಎಂಬುದಲ್ಲ"
+"'--terse' ಎಂಬ ಆಯ್ಕೆಗೆ ನಿಶ್ಚಿತವಾದ '--fields' ಆಯ್ಕೆಯ ಮೌಲ್ಯದ ಅಗತ್ಯವಿರುತ್ತದೆಯೆ ಹೊರತು, '%"
+"s' ಎಂಬುದಲ್ಲ"
 
 #: ../libnm-util/crypto.c:120
 #, c-format
@@ -1501,6 +1503,97 @@ msgstr "ಗೂಢಲಿಪೀಕರಿಸಲಾದ ಕೀಲಿಯನ್ನು P
 msgid "Could not allocate memory for PEM file data."
 msgstr "PEM ಕಡತ ದತ್ತಾಂಶಕ್ಕಾಗಿ ಮೆಮೊರಿಯನ್ನು ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
+msgid "Connection sharing via a protected WiFi network"
+msgstr "ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
+msgid "Connection sharing via an open WiFi network"
+msgstr "ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
+msgid "Modify persistent system hostname"
+msgstr "ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸಿ"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
+msgid "Modify system connections"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸು"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
+msgid "System policy prevents modification of system settings"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ಅನುಮತಿಸಿ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Allow use of user-specific connections"
+msgstr "ಬಳಕೆದಾರ-ನಿಶ್ಚಿತ ಸಂಪರ್ಕಗಳನ್ನು  ಬಳಸುವುದನ್ನು ಅನುಮತಿಸು"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Enable or disable WiFi devices"
+msgstr "WiFi ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable mobile broadband devices"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable system networking"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸಿ (ಇದನ್ನು ಕೇವಲ ವ್ಯವಸ್ಥೆಯ "
+"ವಿದ್ಯುಚ್ಛಕ್ತಿ ನಿರ್ವಹಣೆಯಿಂದ ಮಾತ್ರ ಬಳಸಬೇಕು)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents control of network connections"
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#| msgid "System policy prevents sharing connections via an open WiFi network"
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "WiFi ಸಾಧನವನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ಪಾಲಿಸಿಯು ತಡೆಯುತ್ತಿದೆ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮವು "
+"ತಡೆಯುತ್ತಿದೆ"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+#| msgid "System policy prevents modification of system settings"
+msgid "System policy prevents use of user-specific connections"
+msgstr "ಬಳಕೆದಾರ-ನಿಶ್ಚಿತ ಸಂಪರ್ಕಗಳನ್ನು ಬಳಸುವುದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮವು ತಡೆಯುತ್ತಿದೆ"
+
 #: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
 #: ../src/nm-netlink-monitor.c:653
 #, c-format
@@ -1552,7 +1645,7 @@ msgstr "ಕೊಂಡಿ ಕ್ಯಾಶೆಯನ್ನು ಅಪ್‌ಡೇಟ
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "ಅಮಾನ್ಯವಾದ ಆಯ್ಕೆ.  ಮಾನ್ಯವಾದ ಆಯ್ಕೆಗಳಿಗಾಗಿ ದಯವಿಟ್ಟು --help ಅನ್ನು ನೋಡಿ.\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:568
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s.  ಮಾನ್ಯವಾದ ಆಯ್ಕೆಗಳಿಗಾಗಿ ದಯವಿಟ್ಟು --help ಅನ್ನು ನೋಡಿ.\n"
@@ -1597,13 +1690,13 @@ msgstr "ಗೊತ್ತಿರದ ದಾಖಲೆ ಮಟ್ಟ '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "ಗೊತ್ತಿರದ ದಾಖಲೆ ಡೊಮೈನ್ '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/named-manager/nm-named-manager.c:350
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "ಸೂಚನೆ: libc ಪರಿಹಾರಕವು(ರಿಸಾಲ್ವರ್) ೩ ನಾಮಪರಿಚಾರಕಗಳಿಗಿಂತ ಹೆಚ್ಚಿನವುಗಳನ್ನು "
 "ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/named-manager/nm-named-manager.c:352
 msgid "The nameservers listed below may not be recognized."
 msgstr "ಈ ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ನಾಮಪರಿಚಾರಕಗಳನ್ನು ಗುರುತಿಸಲಾಗಿಲ್ಲ."
 
@@ -1612,42 +1705,10 @@ msgstr "ಈ ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ನಾಮಪರಿಚಾರ
 msgid "Auto %s"
 msgstr "ಸ್ವಯಂ %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3275
 msgid "System"
 msgstr "ವ್ಯವಸ್ಥೆ"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸಿ"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸು"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತವೆ"
-
 #~ msgid "Type"
 #~ msgstr "ಬಗೆ"
 

From af2be00b8cae5e20ffb89f68c86c001a35a0f844 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 27 Jul 2010 20:31:27 -0700
Subject: [PATCH 16/17] Revert "core: fail connections if IP configuration
 expires" (rh #616084) (rh #590874)

This reverts commit b172519045e5ea4825f85fca81de8395e92600c1.

When something like NTP updates the system clock, that can cause
dhclient to expire the lease, and at that point we just want NM
to let dhclient re-aquire the lease instead of failing the
whole connection.
---
 src/nm-device.c | 16 ----------------
 src/nm-policy.c | 21 ++++-----------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/nm-device.c b/src/nm-device.c
index 84eb97730a..98be23cd00 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1439,22 +1439,6 @@ dhcp_state_changed (NMDHCPClient *client,
 		} else if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED)
 			nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED);
 		break;
-	case DHC_STOP:
-	case DHC_STOP6:
-	case DHC_EXPIRE:
-	case DHC_EXPIRE6:
-		if (dev_state == NM_DEVICE_STATE_ACTIVATED) {
-			if (ipv6)
-				nm_dhcp6_config_reset (priv->dhcp6_config);
-			else
-				nm_dhcp4_config_reset (priv->dhcp4_config);
-
-			/* dhclient quit and can't get/renew a lease; so kill the connection */
-			nm_device_state_changed (device,
-			                         NM_DEVICE_STATE_FAILED,
-			                         NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED);
-		}
-		break;
 	default:
 		break;
 	}
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 833a58764c..ddf48ad877 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -892,23 +892,10 @@ device_state_changed (NMDevice *device,
 		/* Mark the connection invalid if it failed during activation so that
 		 * it doesn't get automatically chosen over and over and over again.
 		 */
-		if (connection) {
-			gboolean fail = FALSE;
-
-			if (IS_ACTIVATING_STATE (old_state)) {
-				nm_log_info (LOGD_DEVICE, "Marking connection '%s' invalid.", get_connection_id (connection));
-				fail = TRUE;
-			} else if (   (old_state == NM_DEVICE_STATE_ACTIVATED)
-			         && (reason == NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED)) {
-				nm_log_info (LOGD_DEVICE, "Marking connection '%s' invalid because IP configuration expired.",
-				             get_connection_id (connection));
-				fail = TRUE;
-			}
-
-			if (fail) {
-				g_object_set_data (G_OBJECT (connection), INVALID_TAG, GUINT_TO_POINTER (TRUE));
-				nm_connection_clear_secrets (connection);
-			}
+		if (connection && IS_ACTIVATING_STATE (old_state)) {
+			g_object_set_data (G_OBJECT (connection), INVALID_TAG, GUINT_TO_POINTER (TRUE));
+			nm_log_info (LOGD_DEVICE, "Marking connection '%s' invalid.", get_connection_id (connection));
+			nm_connection_clear_secrets (connection);
 		}
 		schedule_activate_check (policy, device, 3);
 		break;

From bebf8d48b0e9fe57f9961f56214b0d9034614dd7 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 27 Jul 2010 21:43:42 -0700
Subject: [PATCH 17/17] Revert "ip6: remove standalone DHCP method since DHCPv6
 can't provide gateways" (rh #612445)

This reverts commit a729d2f649fefc77fcff7ad250c5c403a4dd59b7.

Turns out this is a valid IP config method that some sites use.
---
 libnm-util/nm-setting-ip6-config.c        | 71 ++++++++++++-----------
 libnm-util/nm-setting-ip6-config.h        |  1 +
 src/nm-device.c                           | 10 +++-
 system-settings/plugins/ifcfg-rh/reader.c |  5 +-
 system-settings/plugins/ifcfg-rh/writer.c |  4 ++
 5 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 32c3a4a2a2..e8af058041 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -471,7 +471,8 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 			             NM_SETTING_IP6_CONFIG_ADDRESSES);
 			return FALSE;
 		}
-	} else if (!strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)) {
+	} else if (   !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)
+	           || !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
 		/* nothing to do */
 	} else {
 		g_set_error (error,
@@ -612,30 +613,34 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 	 * NMSettingIP6Config:method:
 	 *
 	 * IPv6 configuration method.  If 'auto' is specified then the appropriate
-	 * automatic method (DHCP, PPP, router advertisement, etc) is used for the
-	 * interface and most other properties can be left unset.  If 'link-local'
-	 * is specified, then an IPv6 link-local address will be assigned to the
-	 * interface.  If 'manual' is specified, static IP addressing is used and
-	 * at least one IP address must be given in the 'addresses' property.  If
-	 * 'ignored' is specified, IPv6 configuration is not done. This property
-	 * must be set.  NOTE: the 'shared' method are not yet supported.
+	 * automatic method (DHCP, PPP, advertisement, etc) is used for the
+	 * interface and most other properties can be left unset.  To force the use
+	 * of DHCP only, specify 'dhcp'; this  method is only valid for ethernet-
+	 * based hardware.  If 'link-local' is specified, then an IPv6 link-local
+	 * address will be assigned to the interface.  If 'manual' is specified,
+	 * static IP addressing is used and at least one IP address must be given
+	 * in the 'addresses' property.  If 'ignored' is specified, IPv6
+	 * configuration is not done. This property must be set.  NOTE: the 'shared'
+	 * method are not yet supported.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_METHOD,
 		 g_param_spec_string (NM_SETTING_IP6_CONFIG_METHOD,
 						      "Method",
 						      "IPv6 configuration method.  If 'auto' is specified "
-						      "then the appropriate automatic method (DHCP, PPP, "
-						      "router advertisement, etc) is used for the "
-						      "interface and most other properties can be left "
-						      "unset.  If 'link-local' is specified, then an "
-						      "IPv6 link-local address will be assigned to the "
-						      "interface.  If 'manual' is specified, static IP "
-						      "addressing is used and at least one IP address "
-						      "must be given in the 'addresses' property.  If "
-						      "'ignored' is specified, IPv6 configuration is not "
-						      "done. This property must be set.  NOTE: the "
-						      "'shared' method are not yet supported.",
+						      "then the appropriate automatic method (PPP, router "
+						      "advertisement, etc) is used for the device and "
+						      "most other properties can be left unset.  To force "
+						      "the use of DHCP only, specify 'dhcp'; this method "
+						      "is only valid for ethernet-based hardware.  If "
+						      "'link-local' is specified, then an IPv6 link-local "
+						      "address will be assigned to the interface.  If "
+						      "'manual' is specified, static IP addressing is "
+						      "used and at least one IP address must be given in "
+						      " the 'addresses' property.  If 'ignored' is "
+						      "specified, IPv6 configuration is not done. This "
+						      "property must be set.  NOTE: the 'shared' method"
+						      "is not yet supported.",
 						      NULL,
 						      G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
@@ -761,26 +766,26 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 	/**
 	 * NMSettingIP6Config:ignore-auto-routes:
 	 *
-	 * When the method is set to 'auto' and this property is set to TRUE,
-	 * automatically configured routes are ignored and only routes specified
-	 * in #NMSettingIP6Config:routes, if any, are used.
+	 * When the method is set to 'auto' or 'dhcp' and this property is set to
+	 * TRUE, automatically configured routes are ignored and only routes
+	 * specified in #NMSettingIP6Config:routes, if any, are used.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_IGNORE_AUTO_ROUTES,
 		 g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES,
 						   "Ignore automatic routes",
-						   "When the method is set to 'auto' and this property "
-						   "is set to TRUE, automatically configured routes are "
-						   "ignored and only routes specified in the 'routes' "
-						   "property, if any, are used.",
+						   "When the method is set to 'auto' or 'dhcp' and this "
+						   "property is set to TRUE, automatically configured "
+						   "routes are ignored and only routes specified in the "
+						   "'routes' property, if any, are used.",
 						   FALSE,
 						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 
 	/**
 	 * NMSettingIP6Config:ignore-auto-dns:
 	 *
-	 * When the method is set to 'auto' and this property is set to TRUE,
-	 * automatically configured nameservers and search domains are ignored
+	 * When the method is set to 'auto' or 'dhcp' and this property is set to
+	 * TRUE, automatically configured nameservers and search domains are ignored
 	 * and only nameservers and search domains specified in
 	 * #NMSettingIP6Config:dns and #NMSettingIP6Config:dns-search, if any, are
 	 * used.
@@ -789,11 +794,11 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 		(object_class, PROP_IGNORE_AUTO_DNS,
 		 g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS,
 						   "Ignore DHCPv6/RDNSS DNS",
-						   "When the method is set to 'auto' and this property "
-						   "is set to TRUE, automatically configured nameservers "
-						   "and search domains are ignored and only nameservers "
-						   "and search domains specified in 'dns' and 'dns-search' "
-						   "properties, if any, are used.",
+						   "When the method is set to 'auto' or 'dhcp' and this "
+						   "property is set to TRUE, automatically configured "
+						   "nameservers and search domains are ignored and only "
+						   "nameservers and search domains specified in the 'dns' "
+						   "and 'dns-search' properties, if any, are used.",
 						   FALSE,
 						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 
diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h
index 06e5c5c18f..e3e286e684 100644
--- a/libnm-util/nm-setting-ip6-config.h
+++ b/libnm-util/nm-setting-ip6-config.h
@@ -66,6 +66,7 @@ GQuark nm_setting_ip6_config_error_quark (void);
 
 #define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 #define NM_SETTING_IP6_CONFIG_METHOD_AUTO       "auto"
+#define NM_SETTING_IP6_CONFIG_METHOD_DHCP       "dhcp"
 #define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
 #define NM_SETTING_IP6_CONFIG_METHOD_MANUAL     "manual"
 #define NM_SETTING_IP6_CONFIG_METHOD_SHARED     "shared"
diff --git a/src/nm-device.c b/src/nm-device.c
index 98be23cd00..640ef62e30 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1656,6 +1656,13 @@ real_act_stage3_ip6_config_start (NMDevice *self, NMDeviceStateReason *reason)
 		}
 		nm_ip6_manager_begin_addrconf (priv->ip6_manager, nm_device_get_ip_ifindex (self));
 		ret = NM_ACT_STAGE_RETURN_POSTPONE;
+	} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
+		/* Router advertisements shouldn't be used in pure DHCP mode */
+		if (priv->ip6_accept_ra_path)
+			nm_utils_do_sysctl (priv->ip6_accept_ra_path, "0\n");
+
+		priv->dhcp6_mode = IP6_DHCP_OPT_MANAGED;
+		ret = dhcp6_start (self, connection, priv->dhcp6_mode, reason);
 	} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
 		/* reset the saved RA value when ipv6 is ignored */
 		if (priv->ip6_accept_ra_path) {
@@ -2109,7 +2116,8 @@ real_act_stage4_get_ip6_config (NMDevice *self,
 			*reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
 			goto out;
 		}
-	}
+	} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_DHCP))
+		g_assert (priv->dhcp6_client);  /* sanity check */
 
 	/* Autoconf might have triggered DHCPv6 too */
 	if (priv->dhcp6_client) {
diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c
index 01ac32d8ae..4787b85a47 100644
--- a/system-settings/plugins/ifcfg-rh/reader.c
+++ b/system-settings/plugins/ifcfg-rh/reader.c
@@ -1389,7 +1389,7 @@ make_ip6_setting (shvarFile *ifcfg,
 	char *value = NULL;
 	char *str_value;
 	char *route6_path = NULL;
-	gboolean bool_value, ipv6forwarding, ipv6_autoconf;
+	gboolean bool_value, ipv6forwarding, ipv6_autoconf, dhcp6 = FALSE;
 	char *method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
 	guint32 i;
 	shvarFile *network_ifcfg;
@@ -1466,9 +1466,12 @@ make_ip6_setting (shvarFile *ifcfg,
 	/* Find out method property */
 	ipv6forwarding = svTrueValue (ifcfg, "IPV6FORWARDING", FALSE);
 	ipv6_autoconf = svTrueValue (ifcfg, "IPV6_AUTOCONF", !ipv6forwarding);
+	dhcp6 = svTrueValue (ifcfg, "DHCPV6C", FALSE);
 
 	if (ipv6_autoconf)
 		method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
+	else if (dhcp6)
+		method = NM_SETTING_IP6_CONFIG_METHOD_DHCP;
 	else {
 		/* IPV6_AUTOCONF=no and no IPv6 address -> method 'link-local' */
 		str_value = svGetValue (ifcfg, "IPV6ADDR", FALSE);
diff --git a/system-settings/plugins/ifcfg-rh/writer.c b/system-settings/plugins/ifcfg-rh/writer.c
index 52ca518925..1058c71b80 100644
--- a/system-settings/plugins/ifcfg-rh/writer.c
+++ b/system-settings/plugins/ifcfg-rh/writer.c
@@ -1307,6 +1307,10 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 		svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
 		svSetValue (ifcfg, "IPV6_AUTOCONF", "yes", FALSE);
 		svSetValue (ifcfg, "DHCPV6C", NULL, FALSE);
+	} else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
+		svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
+		svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE);
+		svSetValue (ifcfg, "DHCPV6C", "yes", FALSE);
 	} else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
 		svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
 		svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE);