cli: don't translate device details in terse mode

https://bugzilla.gnome.org/show_bug.cgi?id=794329

34 files changed, 114 insertions, 110 deletions

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 8e9fa15319..3ca6e2bd9c 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -124,12 +124,16 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 		return (*out_to_free = g_strdup_printf ("%u", (guint) nm_device_get_mtu (d)));
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE:
 		state = nm_device_get_state (d);
-		// FIXME: wrong use of translation
-		return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state, gettext (nmc_device_state_to_string (state))));
+		return (*out_to_free = nmc_meta_generic_get_enum_with_detail (NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES,
+		                                                              state,
+		                                                              nmc_device_state_to_string (state),
+		                                                              get_type));
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON:
 		state_reason = nm_device_get_state_reason (d);
-		// FIXME: wrong use of translation
-		return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state_reason, gettext (nmc_device_reason_to_string (state_reason))));
+		return (*out_to_free = nmc_meta_generic_get_enum_with_detail (NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES,
+		                                                              state_reason,
+		                                                              nmc_device_reason_to_string (state_reason),
+		                                                              get_type));
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI:
 		return nm_device_get_udi (d);
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE:
@@ -156,8 +160,8 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 		ac = nm_device_get_active_connection (d);
 		return ac ? nm_object_get_path (NM_OBJECT (ac)) : NULL;
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_METERED:
-		// FIXME: wrong use of translation
-		return gettext (nmc_device_metered_to_string (nm_device_get_metered (d)));
+		return nmc_meta_generic_get_str_i18n (nmc_device_metered_to_string (nm_device_get_metered (d)),
+		                                      get_type);
 	default:
 		break;
 	}
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 9c5c973e28..eba78584a0 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: 2031 bytes
+stdout: 2024 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 32847571b0..97e54473fe 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: 2031 bytes
+stdout: 2024 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 bdfb514617..e66fba072e 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: 2031 bytes
+stdout: 2024 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 801199b530..4f6e635ae3 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: 2031 bytes
+stdout: 2024 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 3d3d31c9cf..fe7aeadcaf 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,9 +2,9 @@ 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: 1196 bytes
+stdout: 1189 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
+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
 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
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 361c4b2f90..680fa73a9f 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,9 +2,9 @@ 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: 1196 bytes
+stdout: 1189 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
+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
 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
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 36b71525f7..1805330259 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: 2031 bytes
+stdout: 2024 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 7198c5d0d1..61e1b1923c 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: 2031 bytes
+stdout: 2024 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 9a9722aa31..7bec06ab29 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: 1999 bytes
+stdout: 1992 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 abea0ebed2..ade04f397d 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: 1999 bytes
+stdout: 1992 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 0dea943f49..059172f7e0 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,9 +2,9 @@ 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: 1164 bytes
+stdout: 1157 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
+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
 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
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 d81e583fc6..b318159056 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,9 +2,9 @@ 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: 1164 bytes
+stdout: 1157 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
+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
 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
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 0632217b41..7fca7218e7 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: 1999 bytes
+stdout: 1992 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
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 e034b3cbbe..5709c0d21b 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: 1999 bytes
+stdout: 1992 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:ethernet
 GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:nie
diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected
index a40112a3d4..17560ee4d2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-040.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-040.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:963:test_004()/40
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 940 bytes
+stdout: 933 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 WIFI-PROPERTIES.WEP:tak
 WIFI-PROPERTIES.WPA:tak
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 d9bbfc1a4a..62dddf96ac 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: 2507 bytes
+stdout: 2500 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:nieznane
 CAPABILITIES.IS-SOFTWARE:nie
diff --git a/clients/tests/test-client.check-on-disk/test_004-130.expected b/clients/tests/test-client.check-on-disk/test_004-130.expected
index a15eeb5fc1..722e99365a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-130.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-130.expected
@@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/130
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 740 bytes
+stdout: 739 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
+GENERAL.STATE:20 (unavailable)
 GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:192.168.228.18/32
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 69a445e05d..240bac22ad 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: 2507 bytes
+stdout: 2500 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:nieznane
 CAPABILITIES.IS-SOFTWARE:nie
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 c934addd05..fe875057c6 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: 2723 bytes
+stdout: 2716 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:nieznane
 CAPABILITIES.IS-SOFTWARE:nie
diff --git a/clients/tests/test-client.check-on-disk/test_004-148.expected b/clients/tests/test-client.check-on-disk/test_004-148.expected
index 6ae2ebaed7..aca6d84b03 100644
--- a/clients/tests/test-client.check-on-disk/test_004-148.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-148.expected
@@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/148
 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 740 bytes
+stdout: 739 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
+GENERAL.STATE:20 (unavailable)
 GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:192.168.228.18/32
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 0fa20ed767..272d5373a9 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: 2723 bytes
+stdout: 2716 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:nieznane
 CAPABILITIES.IS-SOFTWARE:nie
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 8f017e3b42..12962d4464 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,9 +2,9 @@ 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: 1204 bytes
+stdout: 1197 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+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
 WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
diff --git a/clients/tests/test-client.check-on-disk/test_004-238.expected b/clients/tests/test-client.check-on-disk/test_004-238.expected
index dd78d13094..9812c98e6f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-238.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-238.expected
@@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/238
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 447 bytes
+stdout: 446 bytes
 >>>
 wlan0
 wifi
 13\:E0\:74\:85\:7C\:D9
 0
-20 (niedostępne)
+20 (unavailable)
 con-vpn-1
 /org/freedesktop/NetworkManager/ActiveConnection/2
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
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 d06a02a8b2..a59dee741a 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,9 +2,9 @@ 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: 1204 bytes
+stdout: 1197 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+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
 WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****: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 2095db4ea9..4a20e69bca 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,9 +2,9 @@ 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: 1447 bytes
+stdout: 1440 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+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
 WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
diff --git a/clients/tests/test-client.check-on-disk/test_004-256.expected b/clients/tests/test-client.check-on-disk/test_004-256.expected
index c29a93b849..d8656df7e6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-256.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-256.expected
@@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/256
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 447 bytes
+stdout: 446 bytes
 >>>
 wlan0
 wifi
 13\:E0\:74\:85\:7C\:D9
 0
-20 (niedostępne)
+20 (unavailable)
 con-vpn-1
 /org/freedesktop/NetworkManager/ActiveConnection/2
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
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 7d3651d4a5..6cd013166e 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,9 +2,9 @@ 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: 1447 bytes
+stdout: 1440 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+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
 WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****: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 dea67c7f93..4e34f933b5 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: 2507 bytes
+stdout: 2500 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:nieznane
 CAPABILITIES.IS-SOFTWARE:nie
diff --git a/clients/tests/test-client.check-on-disk/test_004-346.expected b/clients/tests/test-client.check-on-disk/test_004-346.expected
index b728a32e71..4ebd610a6a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-346.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-346.expected
@@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/346
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 740 bytes
+stdout: 739 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
+GENERAL.STATE:20 (unavailable)
 GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:192.168.228.18/32
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 b4d1301c01..726ddabd6d 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: 2507 bytes
+stdout: 2500 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:nieznane
 CAPABILITIES.IS-SOFTWARE:nie
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 5b18cfa09e..8458fc9ec9 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: 2723 bytes
+stdout: 2716 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:nieznane
 CAPABILITIES.IS-SOFTWARE:nie
diff --git a/clients/tests/test-client.check-on-disk/test_004-364.expected b/clients/tests/test-client.check-on-disk/test_004-364.expected
index 9e406882a3..39399a1854 100644
--- a/clients/tests/test-client.check-on-disk/test_004-364.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-364.expected
@@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/364
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 740 bytes
+stdout: 739 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
+GENERAL.STATE:20 (unavailable)
 GENERAL.CONNECTION:con-vpn-1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:192.168.228.18/32
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 c22fe4d46a..4b32e98e59 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: 2723 bytes
+stdout: 2716 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID:
 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:nieznane
+GENERAL.METERED:unknown
 CAPABILITIES.CARRIER-DETECT:nie
 CAPABILITIES.SPEED:nieznane
 CAPABILITIES.IS-SOFTWARE:nie