cli: rework printing of "capabilities" device details

30 files changed, 175 insertions, 152 deletions

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 0d86d3e5e1..931ad785d6 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -328,15 +328,58 @@ const NmcMetaGenericInfo *const metagen_device_detail_connections[_NMC_GENERIC_I
 
 /*****************************************************************************/
 
-const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[] = {
-	NMC_META_GENERIC ("NAME"),             /* 0 */
-	NMC_META_GENERIC ("CARRIER-DETECT"),   /* 1 */
-	NMC_META_GENERIC ("SPEED"),            /* 2 */
-	NMC_META_GENERIC ("IS-SOFTWARE"),      /* 3 */
-	NMC_META_GENERIC ("SRIOV"),            /* 4 */
-	NULL,
+static gconstpointer
+_metagen_device_detail_capabilities_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+{
+	NMDevice *d = target;
+	NMDeviceCapabilities caps;
+	guint32 speed;
+
+	NMC_HANDLE_COLOR (NM_META_COLOR_NONE);
+
+	caps = nm_device_get_capabilities (d);
+
+	switch (info->info_type) {
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT:
+		return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_CARRIER_DETECT), get_type);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED:
+		speed = 0;
+		if (NM_IS_DEVICE_ETHERNET (d)) {
+			/* Speed in Mb/s */
+			speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (d));
+		} else if (NM_IS_DEVICE_WIFI (d)) {
+			/* Speed in b/s */
+			speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (d));
+			speed /= 1000;
+		}
+
+		if (speed) {
+			if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
+				return (*out_to_free = g_strdup_printf (_("%u Mb/s"), (guint) speed));
+			return (*out_to_free = g_strdup_printf ("%u Mb/s", (guint) speed));
+		}
+		return nmc_meta_generic_get_str_i18n (N_("unknown"), get_type);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE:
+		return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_IS_SOFTWARE), get_type);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV:
+		return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_SRIOV), get_type);
+	default:
+		break;
+	}
+
+	g_return_val_if_reached (NULL);
+}
+
+const NmcMetaGenericInfo *const metagen_device_detail_capabilities[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_NUM + 1] = {
+#define _METAGEN_DEVICE_DETAIL_CAPABILITIES(type, name) \
+	[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_capabilities_get_fcn)
+	_METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT, "CARRIER-DETECT"),
+	_METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED,          "SPEED"),
+	_METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE,    "IS-SOFTWARE"),
+	_METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV,          "SRIOV"),
 };
-#define NMC_FIELDS_DEV_SHOW_CAP_COMMON  "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE"
+
+/*****************************************************************************/
 
 const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[] = {
 	NMC_META_GENERIC ("NAME"),               /* 0 */
@@ -441,7 +484,7 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_bluetooth[] = {
 /* Available sections for 'device show' */
 const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = {
 	NMC_META_GENERIC_WITH_NESTED ("GENERAL",           metagen_device_detail_general),        /* 0 */
-	NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES",      nmc_fields_dev_show_cap + 1),          /* 1 */
+	NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES",      metagen_device_detail_capabilities),   /* 1 */
 	NMC_META_GENERIC_WITH_NESTED ("WIFI-PROPERTIES",   nmc_fields_dev_show_wifi_prop + 1),    /* 2 */
 	NMC_META_GENERIC_WITH_NESTED ("AP",                nmc_fields_dev_wifi_list + 1),         /* 3 */
 	NMC_META_GENERIC_WITH_NESTED ("WIRED-PROPERTIES",  nmc_fields_dev_show_wired_prop + 1),   /* 4 */
@@ -1289,9 +1332,6 @@ show_device_info (NMDevice *device, NmCli *nmc)
 {
 	GError *error = NULL;
 	NMDeviceState state = NM_DEVICE_STATE_UNKNOWN;
-	NMDeviceCapabilities caps;
-	guint32 speed;
-	char *speed_str;
 	GArray *sections_array;
 	int k;
 	const char *fields_str = NULL;
@@ -1365,40 +1405,17 @@ show_device_info (NMDevice *device, NmCli *nmc)
 			continue;
 		}
 
+		if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_capabilities) {
+			gs_free char *f = section_fld ? g_strdup_printf ("CAPABILITIES.%s", section_fld) : NULL;
 
-		/* section CAPABILITIES */
-		if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[1]->name)) {
-			NMC_OUTPUT_DATA_DEFINE_SCOPED (out);
-
-			tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_cap;
-			out_indices = parse_output_fields (section_fld,
-			                                   tmpl, FALSE, NULL, NULL);
-			arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES);
-			g_ptr_array_add (out.output_data, arr);
-
-			caps = nm_device_get_capabilities (device);
-			speed = 0;
-			if (NM_IS_DEVICE_ETHERNET (device)) {
-				/* Speed in Mb/s */
-				speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (device));
-			} else if (NM_IS_DEVICE_WIFI (device)) {
-				/* Speed in b/s */
-				speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (device));
-				speed /= 1000;
-			}
-			speed_str = speed ? g_strdup_printf (_("%u Mb/s"), speed) : g_strdup (_("unknown"));
-
-			arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX);
-			set_val_strc (arr, 0, nmc_fields_dev_show_sections[1]->name);  /* "CAPABILITIES" */
-			set_val_strc (arr, 1, (caps & NM_DEVICE_CAP_CARRIER_DETECT) ? _("yes") : _("no"));
-			set_val_str  (arr, 2, speed_str);
-			set_val_strc (arr, 3, (caps & NM_DEVICE_CAP_IS_SOFTWARE) ? _("yes") : _("no"));
-			set_val_strc (arr, 4, (caps & NM_DEVICE_CAP_SRIOV) ? _("yes") : _("no"));
-			g_ptr_array_add (out.output_data, arr);
-
-			print_data_prepare_width (out.output_data);
-			print_data (&nmc->nmc_config, out_indices, NULL, 0, &out);
+			nmc_print (&nmc->nmc_config,
+			           (gpointer[]) { device, NULL },
+			           NULL,
+			           NMC_META_GENERIC_GROUP ("CAPABILITIES", metagen_device_detail_capabilities, N_("NAME")),
+			           f,
+			           NULL);
 			was_output = TRUE;
+			continue;
 		}
 
 		/* Wireless specific information */
diff --git a/clients/cli/devices.h b/clients/cli/devices.h
index ba2f2fb1ca..963f06b555 100644
--- a/clients/cli/devices.h
+++ b/clients/cli/devices.h
@@ -37,7 +37,7 @@ NMMetaColor nmc_device_state_to_color (NMDeviceState state);
 extern const NmcMetaGenericInfo *const metagen_device_status[];
 extern const NmcMetaGenericInfo *const metagen_device_detail_general[];
 extern const NmcMetaGenericInfo *const metagen_device_detail_connections[];
-extern const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[];
+extern const NmcMetaGenericInfo *const metagen_device_detail_capabilities[];
 extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[];
 extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wifi_prop[];
 extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wimax_prop[];
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 61d4556163..8dd214e31d 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -198,7 +198,7 @@ complete_fields (const char *option, const char *prefix)
 	complete_field (h, metagen_device_status);
 	complete_field (h, metagen_device_detail_general);
 	complete_field (h, metagen_device_detail_connections);
-	complete_field (h, nmc_fields_dev_show_cap);
+	complete_field (h, metagen_device_detail_capabilities);
 	complete_field (h, nmc_fields_dev_show_wired_prop);
 	complete_field (h, nmc_fields_dev_show_wifi_prop);
 	complete_field (h, nmc_fields_dev_show_wimax_prop);
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index 01dce2da04..23509d9825 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -202,6 +202,12 @@ typedef enum {
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTIONS,
 	_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_NUM,
 
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT = 0,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV,
+	_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_NUM,
+
 } NmcGenericInfoType;
 
 #define NMC_HANDLE_COLOR(color) \
diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected
index 9d8a1c9f22..43e602215c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-033.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-033.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:860:test_003()/33
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2035 bytes
+stdout: 2030 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected
index 8fd71b3524..69d8e0b76c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-056.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-056.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:860:test_003()/56
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2035 bytes
+stdout: 2030 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-106.expected b/clients/tests/test-client.check-on-disk/test_003-106.expected
index c91c52710e..d077e24518 100644
--- a/clients/tests/test-client.check-on-disk/test_003-106.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-106.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/106
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2035 bytes
+stdout: 2030 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-116.expected b/clients/tests/test-client.check-on-disk/test_003-116.expected
index 1e94d72cb0..6d0ca206e3 100644
--- a/clients/tests/test-client.check-on-disk/test_003-116.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-116.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/116
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2035 bytes
+stdout: 2030 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-166.expected b/clients/tests/test-client.check-on-disk/test_003-166.expected
index 8320d36637..93677ff833 100644
--- a/clients/tests/test-client.check-on-disk/test_003-166.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-166.expected
@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/166
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1200 bytes
+stdout: 1195 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
-CAPABILITIES:nie:100 Mb/s:nie:nie
+CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:wyłączone:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
diff --git a/clients/tests/test-client.check-on-disk/test_003-176.expected b/clients/tests/test-client.check-on-disk/test_003-176.expected
index 9d76bb5874..22de4e7f8a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-176.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-176.expected
@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/176
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1200 bytes
+stdout: 1195 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
-CAPABILITIES:nie:100 Mb/s:nie:nie
+CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:wyłączone:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
diff --git a/clients/tests/test-client.check-on-disk/test_003-226.expected b/clients/tests/test-client.check-on-disk/test_003-226.expected
index 3620a1552b..0bb90b02d9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-226.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-226.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/226
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2035 bytes
+stdout: 2030 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-236.expected b/clients/tests/test-client.check-on-disk/test_003-236.expected
index 6f258f9864..e1df214459 100644
--- a/clients/tests/test-client.check-on-disk/test_003-236.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-236.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/236
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2035 bytes
+stdout: 2030 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-286.expected b/clients/tests/test-client.check-on-disk/test_003-286.expected
index 3c508fe870..8f7d9ec237 100644
--- a/clients/tests/test-client.check-on-disk/test_003-286.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-286.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/286
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2055 bytes
+stdout: 2050 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-296.expected b/clients/tests/test-client.check-on-disk/test_003-296.expected
index 2b8ecd07ab..ec3211d084 100644
--- a/clients/tests/test-client.check-on-disk/test_003-296.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-296.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/296
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2055 bytes
+stdout: 2050 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-346.expected b/clients/tests/test-client.check-on-disk/test_003-346.expected
index 08d103d88b..75b91cbbf5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-346.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-346.expected
@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/346
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1220 bytes
+stdout: 1215 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
-CAPABILITIES:nie:100 Mb/s:nie:nie
+CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:wyłączone:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
diff --git a/clients/tests/test-client.check-on-disk/test_003-356.expected b/clients/tests/test-client.check-on-disk/test_003-356.expected
index 84e59c6a8c..b3f2e0a49c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-356.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-356.expected
@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/356
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1220 bytes
+stdout: 1215 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
-CAPABILITIES:nie:100 Mb/s:nie:nie
+CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:wyłączone:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
diff --git a/clients/tests/test-client.check-on-disk/test_003-406.expected b/clients/tests/test-client.check-on-disk/test_003-406.expected
index 4306f3f9f4..6b869b53ed 100644
--- a/clients/tests/test-client.check-on-disk/test_003-406.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-406.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/406
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2055 bytes
+stdout: 2050 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_003-416.expected b/clients/tests/test-client.check-on-disk/test_003-416.expected
index fb0fa542ca..ce4c7b0e9a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-416.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-416.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/416
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2055 bytes
+stdout: 2050 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIRED-PROPERTIES.CARRIER:wyłączone
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_004-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected
index 9b94b149cd..e17fa0fecb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-128.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-128.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/128
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2511 bytes
+stdout: 2507 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
 WIFI-PROPERTIES.WPA2:tak
diff --git a/clients/tests/test-client.check-on-disk/test_004-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected
index 18abe753a7..ee250375a8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-132.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-132.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/132
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2511 bytes
+stdout: 2507 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
 WIFI-PROPERTIES.WPA2:tak
diff --git a/clients/tests/test-client.check-on-disk/test_004-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected
index 535385ba92..4647f0b145 100644
--- a/clients/tests/test-client.check-on-disk/test_004-146.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-146.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/146
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2727 bytes
+stdout: 2723 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
 WIFI-PROPERTIES.WPA2:tak
diff --git a/clients/tests/test-client.check-on-disk/test_004-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected
index 84a6e98d60..b806e27cf4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-150.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-150.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/150
 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2727 bytes
+stdout: 2723 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
 WIFI-PROPERTIES.WPA2:tak
diff --git a/clients/tests/test-client.check-on-disk/test_004-236.expected b/clients/tests/test-client.check-on-disk/test_004-236.expected
index 3ed0c94318..d88b65fbe4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-236.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-236.expected
@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:984:test_004()/236
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1208 bytes
+stdout: 1204 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
-CAPABILITIES:nie:nieznane:nie:nie
+CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
diff --git a/clients/tests/test-client.check-on-disk/test_004-240.expected b/clients/tests/test-client.check-on-disk/test_004-240.expected
index 68d984bd80..01d7e17b95 100644
--- a/clients/tests/test-client.check-on-disk/test_004-240.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-240.expected
@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:988:test_004()/240
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1208 bytes
+stdout: 1204 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
-CAPABILITIES:nie:nieznane:nie:nie
+CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
diff --git a/clients/tests/test-client.check-on-disk/test_004-254.expected b/clients/tests/test-client.check-on-disk/test_004-254.expected
index 5c85e07d0c..745ac37d39 100644
--- a/clients/tests/test-client.check-on-disk/test_004-254.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-254.expected
@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:984:test_004()/254
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1451 bytes
+stdout: 1447 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
-CAPABILITIES:nie:nieznane:nie:nie
+CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
diff --git a/clients/tests/test-client.check-on-disk/test_004-258.expected b/clients/tests/test-client.check-on-disk/test_004-258.expected
index 1482e165a9..55b9213b0c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-258.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-258.expected
@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:988:test_004()/258
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1451 bytes
+stdout: 1447 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
-CAPABILITIES:nie:nieznane:nie:nie
+CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
diff --git a/clients/tests/test-client.check-on-disk/test_004-344.expected b/clients/tests/test-client.check-on-disk/test_004-344.expected
index cd6204f677..716128b8db 100644
--- a/clients/tests/test-client.check-on-disk/test_004-344.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-344.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/344
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2511 bytes
+stdout: 2507 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
 WIFI-PROPERTIES.WPA2:tak
diff --git a/clients/tests/test-client.check-on-disk/test_004-348.expected b/clients/tests/test-client.check-on-disk/test_004-348.expected
index 97361dc35f..ca91532302 100644
--- a/clients/tests/test-client.check-on-disk/test_004-348.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-348.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/348
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2511 bytes
+stdout: 2507 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
 WIFI-PROPERTIES.WPA2:tak
diff --git a/clients/tests/test-client.check-on-disk/test_004-362.expected b/clients/tests/test-client.check-on-disk/test_004-362.expected
index 60523c52ee..022e8fbacb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-362.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-362.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/362
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2727 bytes
+stdout: 2723 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
 WIFI-PROPERTIES.WPA2:tak
diff --git a/clients/tests/test-client.check-on-disk/test_004-366.expected b/clients/tests/test-client.check-on-disk/test_004-366.expected
index 4688beb010..5ee35cc3e4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-366.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-366.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/366
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2727 bytes
+stdout: 2723 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
 WIFI-PROPERTIES.WPA2:tak