cli: use designated initializers for setting NmcOutputField fields

Otherwise, changing the structure is difficult because it all depends
on the order (and you don't immdiately see which field is used where).

Also, drop the name_l10n field.

7 files changed, 271 insertions, 264 deletions

diff --git a/clients/cli/common.c b/clients/cli/common.c
index 61a0ef3559..7fd445a8cc 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -37,44 +37,46 @@
 
 extern GMainLoop *loop;
 
+#define OUTPUT_FIELD_WITH_NAME(n) { .name = N_ (n), }
+
 /* Available fields for IPv4 group */
 NmcOutputField nmc_fields_ip4_config[] = {
-	{"GROUP",      N_("GROUP")},    /* 0 */
-	{"ADDRESS",    N_("ADDRESS")},  /* 1 */
-	{"GATEWAY",    N_("GATEWAY")},  /* 2 */
-	{"ROUTE",      N_("ROUTE")},    /* 3 */
-	{"DNS",        N_("DNS")},      /* 4 */
-	{"DOMAIN",     N_("DOMAIN")},   /* 5 */
-	{"WINS",       N_("WINS")},     /* 6 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("GROUP"),     /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("ADDRESS"),   /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("GATEWAY"),   /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("ROUTE"),     /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("DNS"),       /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("DOMAIN"),    /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("WINS"),      /* 6 */
+	{ 0 }
 };
 #define NMC_FIELDS_IP4_CONFIG_ALL     "GROUP,ADDRESS,GATEWAY,ROUTE,DNS,DOMAIN,WINS"
 
 /* Available fields for DHCPv4 group */
 NmcOutputField nmc_fields_dhcp4_config[] = {
-	{"GROUP",      N_("GROUP")},   /* 0 */
-	{"OPTION",     N_("OPTION")},  /* 1 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("GROUP"),    /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("OPTION"),   /* 1 */
+	{ 0 }
 };
 #define NMC_FIELDS_DHCP4_CONFIG_ALL     "GROUP,OPTION"
 
 /* Available fields for IPv6 group */
 NmcOutputField nmc_fields_ip6_config[] = {
-	{"GROUP",      N_("GROUP")},    /* 0 */
-	{"ADDRESS",    N_("ADDRESS")},  /* 1 */
-	{"GATEWAY",    N_("GATEWAY")},  /* 2 */
-	{"ROUTE",      N_("ROUTE")},    /* 3 */
-	{"DNS",        N_("DNS")},      /* 4 */
-	{"DOMAIN",     N_("DOMAIN")},   /* 5 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("GROUP"),     /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("ADDRESS"),   /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("GATEWAY"),   /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("ROUTE"),     /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("DNS"),       /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("DOMAIN"),    /* 5 */
+	{ 0 }
 };
 #define NMC_FIELDS_IP6_CONFIG_ALL     "GROUP,ADDRESS,GATEWAY,ROUTE,DNS,DOMAIN"
 
 /* Available fields for DHCPv6 group */
 NmcOutputField nmc_fields_dhcp6_config[] = {
-	{"GROUP",      N_("GROUP")},   /* 0 */
-	{"OPTION",     N_("OPTION")},  /* 1 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("GROUP"),    /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("OPTION"),   /* 1 */
+	{ 0 }
 };
 #define NMC_FIELDS_DHCP6_CONFIG_ALL     "GROUP,OPTION"
 
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 5caa143779..5261389104 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -40,6 +40,9 @@
 #include "polkit-agent.h"
 #include "nm-vpn-helpers.h"
 
+#define OUTPUT_FIELD_WITH_NAME(n) { .name = N_ (n), }
+#define OUTPUT_FIELD_WITH_FIELDS(n, fields) { .name = N_ (n), .group_list = fields + 1,  }
+
 typedef struct _OptionInfo OptionInfo;
 struct _OptionInfo {
 	const char *setting_name;
@@ -129,69 +132,68 @@ struct _OptionInfo {
 
 /* Available fields for 'connection show' */
 NmcOutputField nmc_fields_con_show[] = {
-	{"NAME",                 N_("NAME")},                  /* 0 */
-	{"UUID",                 N_("UUID")},                  /* 1 */
-	{"TYPE",                 N_("TYPE")},                  /* 2 */
-	{"TIMESTAMP",            N_("TIMESTAMP")},             /* 3 */
-	{"TIMESTAMP-REAL",       N_("TIMESTAMP-REAL")},        /* 4 */
-	{"AUTOCONNECT",          N_("AUTOCONNECT")},           /* 5 */
-	{"AUTOCONNECT-PRIORITY", N_("AUTOCONNECT-PRIORITY")},  /* 6 */
-	{"READONLY",             N_("READONLY")},              /* 7 */
-	{"DBUS-PATH",            N_("DBUS-PATH")},             /* 8 */
-	{"ACTIVE",               N_("ACTIVE")},                /* 9 */
-	{"DEVICE",               N_("DEVICE")},                /* 10 */
-	{"STATE",                N_("STATE")},                 /* 11 */
-	{"ACTIVE-PATH",          N_("ACTIVE-PATH")},           /* 12 */
-	{"SLAVE",                N_("SLAVE")},                 /* 13 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),                  /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("UUID"),                  /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("TYPE"),                  /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("TIMESTAMP"),             /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("TIMESTAMP-REAL"),        /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("AUTOCONNECT"),           /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("AUTOCONNECT-PRIORITY"),  /* 6 */
+	OUTPUT_FIELD_WITH_NAME ("READONLY"),              /* 7 */
+	OUTPUT_FIELD_WITH_NAME ("DBUS-PATH"),             /* 8 */
+	OUTPUT_FIELD_WITH_NAME ("ACTIVE"),                /* 9 */
+	OUTPUT_FIELD_WITH_NAME ("DEVICE"),                /* 10 */
+	OUTPUT_FIELD_WITH_NAME ("STATE"),                 /* 11 */
+	OUTPUT_FIELD_WITH_NAME ("ACTIVE-PATH"),           /* 12 */
+	OUTPUT_FIELD_WITH_NAME ("SLAVE"),                 /* 13 */
+	{ 0 }
 };
 #define NMC_FIELDS_CON_SHOW_ALL     "NAME,UUID,TYPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,AUTOCONNECT-PRIORITY,READONLY,DBUS-PATH,"\
                                     "ACTIVE,DEVICE,STATE,ACTIVE-PATH,SLAVE"
 #define NMC_FIELDS_CON_SHOW_COMMON  "NAME,UUID,TYPE,DEVICE"
 
 /* Helper macro to define fields */
-#define SETTING_FIELD_TYPE(setting, setting_type) \
+#define OUTPUT_FIELD_WITH_SETTING(setting, setting_type) \
 	{ \
 		.name = setting, \
-		.name_l10n = N_ (setting), \
 		.setting_info = &nm_meta_setting_infos_editor[setting_type], \
 	}
 
 /* Available settings for 'connection show <con>' - profile part */
 NmcOutputField nmc_fields_settings_names[] = {
-	SETTING_FIELD_TYPE (NM_SETTING_CONNECTION_SETTING_NAME,   NM_META_SETTING_TYPE_CONNECTION),          /* 0 */
-	SETTING_FIELD_TYPE (NM_SETTING_WIRED_SETTING_NAME,        NM_META_SETTING_TYPE_WIRED),               /* 1 */
-	SETTING_FIELD_TYPE (NM_SETTING_802_1X_SETTING_NAME,       NM_META_SETTING_TYPE_802_1X),              /* 2 */
-	SETTING_FIELD_TYPE (NM_SETTING_WIRELESS_SETTING_NAME,     NM_META_SETTING_TYPE_WIRELESS),            /* 3 */
-	SETTING_FIELD_TYPE (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_META_SETTING_TYPE_WIRELESS_SECURITY), /* 4 */
-	SETTING_FIELD_TYPE (NM_SETTING_IP4_CONFIG_SETTING_NAME,   NM_META_SETTING_TYPE_IP4_CONFIG),          /* 5 */
-	SETTING_FIELD_TYPE (NM_SETTING_IP6_CONFIG_SETTING_NAME,   NM_META_SETTING_TYPE_IP6_CONFIG),          /* 6 */
-	SETTING_FIELD_TYPE (NM_SETTING_SERIAL_SETTING_NAME,       NM_META_SETTING_TYPE_SERIAL),              /* 7 */
-	SETTING_FIELD_TYPE (NM_SETTING_PPP_SETTING_NAME,          NM_META_SETTING_TYPE_PPP),                 /* 8 */
-	SETTING_FIELD_TYPE (NM_SETTING_PPPOE_SETTING_NAME,        NM_META_SETTING_TYPE_PPPOE),               /* 9 */
-	SETTING_FIELD_TYPE (NM_SETTING_GSM_SETTING_NAME,          NM_META_SETTING_TYPE_GSM),                 /* 10 */
-	SETTING_FIELD_TYPE (NM_SETTING_CDMA_SETTING_NAME,         NM_META_SETTING_TYPE_CDMA),                /* 11 */
-	SETTING_FIELD_TYPE (NM_SETTING_BLUETOOTH_SETTING_NAME,    NM_META_SETTING_TYPE_BLUETOOTH),           /* 12 */
-	SETTING_FIELD_TYPE (NM_SETTING_OLPC_MESH_SETTING_NAME,    NM_META_SETTING_TYPE_OLPC_MESH),           /* 13 */
-	SETTING_FIELD_TYPE (NM_SETTING_VPN_SETTING_NAME,          NM_META_SETTING_TYPE_VPN),                 /* 14 */
-	SETTING_FIELD_TYPE (NM_SETTING_WIMAX_SETTING_NAME,        NM_META_SETTING_TYPE_WIMAX),               /* 15 */
-	SETTING_FIELD_TYPE (NM_SETTING_INFINIBAND_SETTING_NAME,   NM_META_SETTING_TYPE_INFINIBAND),          /* 16 */
-	SETTING_FIELD_TYPE (NM_SETTING_BOND_SETTING_NAME,         NM_META_SETTING_TYPE_BOND),                /* 17 */
-	SETTING_FIELD_TYPE (NM_SETTING_VLAN_SETTING_NAME,         NM_META_SETTING_TYPE_VLAN),                /* 18 */
-	SETTING_FIELD_TYPE (NM_SETTING_ADSL_SETTING_NAME,         NM_META_SETTING_TYPE_ADSL),                /* 19 */
-	SETTING_FIELD_TYPE (NM_SETTING_BRIDGE_SETTING_NAME,       NM_META_SETTING_TYPE_BRIDGE),              /* 20 */
-	SETTING_FIELD_TYPE (NM_SETTING_BRIDGE_PORT_SETTING_NAME,  NM_META_SETTING_TYPE_BRIDGE_PORT),         /* 21 */
-	SETTING_FIELD_TYPE (NM_SETTING_TEAM_SETTING_NAME,         NM_META_SETTING_TYPE_TEAM),                /* 22 */
-	SETTING_FIELD_TYPE (NM_SETTING_TEAM_PORT_SETTING_NAME,    NM_META_SETTING_TYPE_TEAM_PORT),           /* 23 */
-	SETTING_FIELD_TYPE (NM_SETTING_DCB_SETTING_NAME,          NM_META_SETTING_TYPE_DCB),                 /* 24 */
-	SETTING_FIELD_TYPE (NM_SETTING_TUN_SETTING_NAME,          NM_META_SETTING_TYPE_TUN),                 /* 25 */
-	SETTING_FIELD_TYPE (NM_SETTING_IP_TUNNEL_SETTING_NAME,    NM_META_SETTING_TYPE_IP_TUNNEL),           /* 26 */
-	SETTING_FIELD_TYPE (NM_SETTING_MACSEC_SETTING_NAME,       NM_META_SETTING_TYPE_MACSEC),              /* 27 */
-	SETTING_FIELD_TYPE (NM_SETTING_MACVLAN_SETTING_NAME,      NM_META_SETTING_TYPE_MACVLAN),             /* 28 */
-	SETTING_FIELD_TYPE (NM_SETTING_VXLAN_SETTING_NAME,        NM_META_SETTING_TYPE_VXLAN),               /* 29 */
-	SETTING_FIELD_TYPE (NM_SETTING_PROXY_SETTING_NAME,        NM_META_SETTING_TYPE_PROXY),               /* 30 */
-	SETTING_FIELD_TYPE (NM_SETTING_DUMMY_SETTING_NAME,        NM_META_SETTING_TYPE_DUMMY),               /* 31 */
-	{NULL, NULL, 0, NULL, NULL, FALSE, FALSE, 0}
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_CONNECTION_SETTING_NAME,   NM_META_SETTING_TYPE_CONNECTION),          /* 0 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_WIRED_SETTING_NAME,        NM_META_SETTING_TYPE_WIRED),               /* 1 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_802_1X_SETTING_NAME,       NM_META_SETTING_TYPE_802_1X),              /* 2 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_WIRELESS_SETTING_NAME,     NM_META_SETTING_TYPE_WIRELESS),            /* 3 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_META_SETTING_TYPE_WIRELESS_SECURITY), /* 4 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_IP4_CONFIG_SETTING_NAME,   NM_META_SETTING_TYPE_IP4_CONFIG),          /* 5 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_IP6_CONFIG_SETTING_NAME,   NM_META_SETTING_TYPE_IP6_CONFIG),          /* 6 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_SERIAL_SETTING_NAME,       NM_META_SETTING_TYPE_SERIAL),              /* 7 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_PPP_SETTING_NAME,          NM_META_SETTING_TYPE_PPP),                 /* 8 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_PPPOE_SETTING_NAME,        NM_META_SETTING_TYPE_PPPOE),               /* 9 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_GSM_SETTING_NAME,          NM_META_SETTING_TYPE_GSM),                 /* 10 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_CDMA_SETTING_NAME,         NM_META_SETTING_TYPE_CDMA),                /* 11 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_BLUETOOTH_SETTING_NAME,    NM_META_SETTING_TYPE_BLUETOOTH),           /* 12 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_OLPC_MESH_SETTING_NAME,    NM_META_SETTING_TYPE_OLPC_MESH),           /* 13 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_VPN_SETTING_NAME,          NM_META_SETTING_TYPE_VPN),                 /* 14 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_WIMAX_SETTING_NAME,        NM_META_SETTING_TYPE_WIMAX),               /* 15 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_INFINIBAND_SETTING_NAME,   NM_META_SETTING_TYPE_INFINIBAND),          /* 16 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_BOND_SETTING_NAME,         NM_META_SETTING_TYPE_BOND),                /* 17 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_VLAN_SETTING_NAME,         NM_META_SETTING_TYPE_VLAN),                /* 18 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_ADSL_SETTING_NAME,         NM_META_SETTING_TYPE_ADSL),                /* 19 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_BRIDGE_SETTING_NAME,       NM_META_SETTING_TYPE_BRIDGE),              /* 20 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_BRIDGE_PORT_SETTING_NAME,  NM_META_SETTING_TYPE_BRIDGE_PORT),         /* 21 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_TEAM_SETTING_NAME,         NM_META_SETTING_TYPE_TEAM),                /* 22 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_TEAM_PORT_SETTING_NAME,    NM_META_SETTING_TYPE_TEAM_PORT),           /* 23 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_DCB_SETTING_NAME,          NM_META_SETTING_TYPE_DCB),                 /* 24 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_TUN_SETTING_NAME,          NM_META_SETTING_TYPE_TUN),                 /* 25 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_IP_TUNNEL_SETTING_NAME,    NM_META_SETTING_TYPE_IP_TUNNEL),           /* 26 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_MACSEC_SETTING_NAME,       NM_META_SETTING_TYPE_MACSEC),              /* 27 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_MACVLAN_SETTING_NAME,      NM_META_SETTING_TYPE_MACVLAN),             /* 28 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_VXLAN_SETTING_NAME,        NM_META_SETTING_TYPE_VXLAN),               /* 29 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_PROXY_SETTING_NAME,        NM_META_SETTING_TYPE_PROXY),               /* 30 */
+	OUTPUT_FIELD_WITH_SETTING (NM_SETTING_DUMMY_SETTING_NAME,        NM_META_SETTING_TYPE_DUMMY),               /* 31 */
+	{ 0 }
 };
 #define NMC_FIELDS_SETTINGS_NAMES_ALL    NM_SETTING_CONNECTION_SETTING_NAME","\
                                          NM_SETTING_WIRED_SETTING_NAME","\
@@ -229,20 +231,20 @@ NmcOutputField nmc_fields_settings_names[] = {
 /* Active connection data */
 /* Available fields for GENERAL group */
 NmcOutputField nmc_fields_con_active_details_general[] = {
-	{"GROUP",         N_("GROUP")},        /* 0 */
-	{"NAME",          N_("NAME")},         /* 1 */
-	{"UUID",          N_("UUID")},         /* 2 */
-	{"DEVICES",       N_("DEVICES")},      /* 3 */
-	{"STATE",         N_("STATE")},        /* 4 */
-	{"DEFAULT",       N_("DEFAULT")},      /* 5 */
-	{"DEFAULT6",      N_("DEFAULT6")},     /* 6 */
-	{"SPEC-OBJECT",   N_("SPEC-OBJECT")},  /* 7 */
-	{"VPN",           N_("VPN")},          /* 8 */
-	{"DBUS-PATH",     N_("DBUS-PATH")},    /* 9 */
-	{"CON-PATH",      N_("CON-PATH")},     /* 10 */
-	{"ZONE",          N_("ZONE")},         /* 11 */
-	{"MASTER-PATH",   N_("MASTER-PATH")},  /* 12 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("GROUP"),        /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("NAME"),         /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("UUID"),         /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("DEVICES"),      /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("STATE"),        /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("DEFAULT"),      /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("DEFAULT6"),     /* 6 */
+	OUTPUT_FIELD_WITH_NAME ("SPEC-OBJECT"),  /* 7 */
+	OUTPUT_FIELD_WITH_NAME ("VPN"),          /* 8 */
+	OUTPUT_FIELD_WITH_NAME ("DBUS-PATH"),    /* 9 */
+	OUTPUT_FIELD_WITH_NAME ("CON-PATH"),     /* 10 */
+	OUTPUT_FIELD_WITH_NAME ("ZONE"),         /* 11 */
+	OUTPUT_FIELD_WITH_NAME ("MASTER-PATH"),  /* 12 */
+	{ 0 }
 };
 #define NMC_FIELDS_CON_ACTIVE_DETAILS_GENERAL_ALL  "GROUP,NAME,UUID,DEVICES,STATE,DEFAULT,DEFAULT6,"\
                                                    "VPN,ZONE,DBUS-PATH,CON-PATH,SPEC-OBJECT,MASTER-PATH"
@@ -251,14 +253,14 @@ NmcOutputField nmc_fields_con_active_details_general[] = {
 
 /* Available fields for VPN group */
 NmcOutputField nmc_fields_con_active_details_vpn[] = {
-	{"GROUP",     N_("GROUP")},      /* 0 */
-	{"TYPE",      N_("TYPE")},       /* 1 */
-	{"USERNAME",  N_("USERNAME")},   /* 2 */
-	{"GATEWAY",   N_("GATEWAY")},    /* 3 */
-	{"BANNER",    N_("BANNER")},     /* 4 */
-	{"VPN-STATE", N_("VPN-STATE")},  /* 5 */
-	{"CFG",       N_("CFG")},        /* 6 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("GROUP"),      /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("TYPE"),       /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("USERNAME"),   /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("GATEWAY"),    /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("BANNER"),     /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("VPN-STATE"),  /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("CFG"),        /* 6 */
+	{ 0 }
 };
 #define NMC_FIELDS_CON_ACTIVE_DETAILS_VPN_ALL  "GROUP,TYPE,USERNAME,GATEWAY,BANNER,VPN-STATE,CFG"
 
@@ -270,13 +272,13 @@ extern NmcOutputField nmc_fields_dhcp6_config[];
 
 /* Available fields for 'connection show <con>' - active part */
 NmcOutputField nmc_fields_con_active_details_groups[] = {
-	{"GENERAL",  N_("GENERAL"), 0, nmc_fields_con_active_details_general + 1},  /* 0 */
-	{"IP4",      N_("IP4"),     0, nmc_fields_ip4_config + 1                },  /* 1 */
-	{"DHCP4",    N_("DHCP4"),   0, nmc_fields_dhcp4_config + 1              },  /* 2 */
-	{"IP6",      N_("IP6"),     0, nmc_fields_ip6_config + 1                },  /* 3 */
-	{"DHCP6",    N_("DHCP6"),   0, nmc_fields_dhcp6_config + 1              },  /* 4 */
-	{"VPN",      N_("VPN"),     0, nmc_fields_con_active_details_vpn + 1    },  /* 5 */
-	{NULL, NULL, 0, NULL}
+	OUTPUT_FIELD_WITH_FIELDS ("GENERAL", nmc_fields_con_active_details_general), /* 0 */
+	OUTPUT_FIELD_WITH_FIELDS ("IP4",     nmc_fields_ip4_config),                 /* 1 */
+	OUTPUT_FIELD_WITH_FIELDS ("DHCP4",   nmc_fields_dhcp4_config),               /* 2 */
+	OUTPUT_FIELD_WITH_FIELDS ("IP6",     nmc_fields_ip6_config),                 /* 3 */
+	OUTPUT_FIELD_WITH_FIELDS ("DHCP6",   nmc_fields_dhcp6_config),               /* 4 */
+	OUTPUT_FIELD_WITH_FIELDS ("VPN",     nmc_fields_con_active_details_vpn),     /* 5 */
+	{ 0 }
 };
 #define NMC_FIELDS_CON_ACTIVE_DETAILS_ALL  "GENERAL,IP4,DHCP4,IP6,DHCP6,VPN"
 
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index f49eabba9e..1701a1f992 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -38,16 +38,19 @@
 #define PROMPT_INTERFACE  _("Interface: ")
 #define PROMPT_INTERFACES _("Interface(s): ")
 
+#define OUTPUT_FIELD_WITH_NAME(n) { .name = N_ (n), }
+#define OUTPUT_FIELD_WITH_FIELDS(n, fields) { .name = N_ (n), .group_list = fields + 1,  }
+
 /* Available fields for 'device status' */
 NmcOutputField nmc_fields_dev_status[] = {
-	{"DEVICE",     N_("DEVICE")},      /* 0 */
-	{"TYPE",       N_("TYPE")},        /* 1 */
-	{"STATE",      N_("STATE")},       /* 2 */
-	{"DBUS-PATH",  N_("DBUS-PATH")},   /* 3 */
-	{"CONNECTION", N_("CONNECTION")},  /* 4 */
-	{"CON-UUID",   N_("CON-UUID")},    /* 5 */
-	{"CON-PATH",   N_("CON-PATH")},    /* 6 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("DEVICE"),       /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("TYPE"),         /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("STATE"),        /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("DBUS-PATH"),    /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("CONNECTION"),   /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("CON-UUID"),     /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("CON-PATH"),     /* 6 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_STATUS_ALL     "DEVICE,TYPE,STATE,DBUS-PATH,CONNECTION,CON-UUID,CON-PATH"
 #define NMC_FIELDS_DEV_STATUS_COMMON  "DEVICE,TYPE,STATE,CONNECTION"
@@ -55,32 +58,32 @@ NmcOutputField nmc_fields_dev_status[] = {
 
 /* Available fields for 'device show' - GENERAL part */
 NmcOutputField nmc_fields_dev_show_general[] = {
-	{"NAME",              N_("NAME")},               /* 0 */
-	{"DEVICE",            N_("DEVICE")},             /* 1 */
-	{"TYPE",              N_("TYPE")},               /* 2 */
-	{"NM-TYPE",           N_("NM-TYPE")},            /* 3 */
-	{"VENDOR",            N_("VENDOR")},             /* 4 */
-	{"PRODUCT",           N_("PRODUCT")},            /* 5 */
-	{"DRIVER",            N_("DRIVER")},             /* 6 */
-	{"DRIVER-VERSION",    N_("DRIVER-VERSION")},     /* 7 */
-	{"FIRMWARE-VERSION",  N_("FIRMWARE-VERSION")},   /* 8 */
-	{"HWADDR",            N_("HWADDR")},             /* 9 */
-	{"MTU",               N_("MTU")},                /* 10 */
-	{"STATE",             N_("STATE")},              /* 11 */
-	{"REASON",            N_("REASON")},             /* 12 */
-	{"UDI",               N_("UDI")},                /* 13 */
-	{"IP-IFACE",          N_("IP-IFACE")},           /* 14 */
-	{"IS-SOFTWARE",       N_("IS-SOFTWARE")},        /* 15 */
-	{"NM-MANAGED",        N_("NM-MANAGED")},         /* 16 */
-	{"AUTOCONNECT",       N_("AUTOCONNECT")},        /* 17 */
-	{"FIRMWARE-MISSING",  N_("FIRMWARE-MISSING")},   /* 18 */
-	{"NM-PLUGIN-MISSING", N_("NM-PLUGIN-MISSING")},  /* 19 */
-	{"PHYS-PORT-ID",      N_("PHYS-PORT-ID")},       /* 20 */
-	{"CONNECTION",        N_("CONNECTION")},         /* 21 */
-	{"CON-UUID",          N_("CON-UUID")},           /* 22 */
-	{"CON-PATH",          N_("CON-PATH")},           /* 23 */
-	{"METERED",           N_("METERED")},            /* 24 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),                /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("DEVICE"),              /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("TYPE"),                /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("NM-TYPE"),             /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("VENDOR"),              /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("PRODUCT"),             /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("DRIVER"),              /* 6 */
+	OUTPUT_FIELD_WITH_NAME ("DRIVER-VERSION"),      /* 7 */
+	OUTPUT_FIELD_WITH_NAME ("FIRMWARE-VERSION"),    /* 8 */
+	OUTPUT_FIELD_WITH_NAME ("HWADDR"),              /* 9 */
+	OUTPUT_FIELD_WITH_NAME ("MTU"),                 /* 10 */
+	OUTPUT_FIELD_WITH_NAME ("STATE"),               /* 11 */
+	OUTPUT_FIELD_WITH_NAME ("REASON"),              /* 12 */
+	OUTPUT_FIELD_WITH_NAME ("UDI"),                 /* 13 */
+	OUTPUT_FIELD_WITH_NAME ("IP-IFACE"),            /* 14 */
+	OUTPUT_FIELD_WITH_NAME ("IS-SOFTWARE"),         /* 15 */
+	OUTPUT_FIELD_WITH_NAME ("NM-MANAGED"),          /* 16 */
+	OUTPUT_FIELD_WITH_NAME ("AUTOCONNECT"),         /* 17 */
+	OUTPUT_FIELD_WITH_NAME ("FIRMWARE-MISSING"),    /* 18 */
+	OUTPUT_FIELD_WITH_NAME ("NM-PLUGIN-MISSING"),   /* 19 */
+	OUTPUT_FIELD_WITH_NAME ("PHYS-PORT-ID"),        /* 20 */
+	OUTPUT_FIELD_WITH_NAME ("CONNECTION"),          /* 21 */
+	OUTPUT_FIELD_WITH_NAME ("CON-UUID"),            /* 22 */
+	OUTPUT_FIELD_WITH_NAME ("CON-PATH"),            /* 23 */
+	OUTPUT_FIELD_WITH_NAME ("METERED"),             /* 24 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_GENERAL_ALL     "NAME,DEVICE,TYPE,NM-TYPE,VENDOR,PRODUCT,DRIVER,DRIVER-VERSION,FIRMWARE-VERSION,HWADDR,MTU,"\
                                             "STATE,REASON,UDI,IP-IFACE,IS-SOFTWARE,NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,NM-PLUGIN-MISSING,"\
@@ -89,85 +92,85 @@ NmcOutputField nmc_fields_dev_show_general[] = {
 
 /* Available fields for 'device show' - CONNECTIONS part */
 NmcOutputField nmc_fields_dev_show_connections[] = {
-	{"NAME",                       N_("NAME")},                        /* 0 */
-	{"AVAILABLE-CONNECTION-PATHS", N_("AVAILABLE-CONNECTION-PATHS")},  /* 1 */
-	{"AVAILABLE-CONNECTIONS",      N_("AVAILABLE-CONNECTIONS")},       /* 2 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),                         /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("AVAILABLE-CONNECTION-PATHS"),   /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("AVAILABLE-CONNECTIONS"),        /* 2 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_CONNECTIONS_ALL     "NAME,AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS"
 #define NMC_FIELDS_DEV_SHOW_CONNECTIONS_COMMON  "NAME,AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS"
 
 /* Available fields for 'device show' - CAPABILITIES part */
 NmcOutputField nmc_fields_dev_show_cap[] = {
-	{"NAME",            N_("NAME")},            /* 0 */
-	{"CARRIER-DETECT",  N_("CARRIER-DETECT")},  /* 1 */
-	{"SPEED",           N_("SPEED")},           /* 2 */
-	{"IS-SOFTWARE",     N_("IS-SOFTWARE")},     /* 3 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),             /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("CARRIER-DETECT"),   /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("SPEED"),            /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("IS-SOFTWARE"),      /* 3 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_CAP_ALL     "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE"
 #define NMC_FIELDS_DEV_SHOW_CAP_COMMON  "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE"
 
 /* Available fields for 'device show' - wired properties part */
 NmcOutputField nmc_fields_dev_show_wired_prop[] = {
-	{"NAME",             N_("NAME")},              /* 0 */
-	{"CARRIER",          N_("CARRIER")},           /* 1 */
-	{"S390-SUBCHANNELS", N_("S390-SUBCHANNELS")},  /* 2 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),               /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("CARRIER"),            /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("S390-SUBCHANNELS"),   /* 2 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_WIRED_PROP_ALL     "NAME,CARRIER,S390-SUBCHANNELS"
 #define NMC_FIELDS_DEV_SHOW_WIRED_PROP_COMMON  "NAME,CARRIER,S390-SUBCHANNELS"
 
 /* Available fields for 'device show' - wireless properties part */
 NmcOutputField nmc_fields_dev_show_wifi_prop[] = {
-	{"NAME",       N_("NAME")},   /* 0 */
-	{"WEP",        N_("WEP")},    /* 1 */
-	{"WPA",        N_("WPA")},    /* 2 */
-	{"WPA2",       N_("WPA2")},   /* 3 */
-	{"TKIP",       N_("TKIP")},   /* 4 */
-	{"CCMP",       N_("CCMP")},   /* 5 */
-	{"AP",         N_("AP")},     /* 6 */
-	{"ADHOC",      N_("ADHOC")},  /* 7 */
-	{"2GHZ",       N_("2GHZ")},   /* 8 */
-	{"5GHZ",       N_("5GHZ")},   /* 9 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),    /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("WEP"),     /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("WPA"),     /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("WPA2"),    /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("TKIP"),    /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("CCMP"),    /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("AP"),      /* 6 */
+	OUTPUT_FIELD_WITH_NAME ("ADHOC"),   /* 7 */
+	OUTPUT_FIELD_WITH_NAME ("2GHZ"),    /* 8 */
+	OUTPUT_FIELD_WITH_NAME ("5GHZ"),    /* 9 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_WIFI_PROP_ALL     "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC,2GHZ,5GHZ"
 #define NMC_FIELDS_DEV_SHOW_WIFI_PROP_COMMON  "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC"
 
 /* Available fields for 'device show' - wimax properties part */
 NmcOutputField nmc_fields_dev_show_wimax_prop[] = {
-	{"NAME",       N_("NAME")},      /* 0 */
-	{"CTR-FREQ",   N_("CTR-FREQ")},  /* 1 */
-	{"RSSI",       N_("RSSI")},      /* 2 */
-	{"CINR",       N_("CINR")},      /* 3 */
-	{"TX-POW",     N_("TX-POW")},    /* 4 */
-	{"BSID",       N_("BSID")},      /* 5 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),       /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("CTR-FREQ"),   /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("RSSI"),       /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("CINR"),       /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("TX-POW"),     /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("BSID"),       /* 5 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_WIMAX_PROP_ALL     "NAME,CTR-FREQ,RSSI,CINR,TX-POW,BSID"
 #define NMC_FIELDS_DEV_SHOW_WIMAX_PROP_COMMON  "NAME,CTR-FREQ,RSSI,CINR,TX-POW,BSID"
 
 /* Available fields for 'device wifi list' */
 NmcOutputField nmc_fields_dev_wifi_list[] = {
-	{"NAME",       N_("NAME")},       /* 0 */
-	{"SSID",       N_("SSID")},       /* 1 */
-	{"SSID-HEX",   N_("SSID-HEX")},   /* 2 */
-	{"BSSID",      N_("BSSID")},      /* 3 */
-	{"MODE",       N_("MODE")},       /* 4 */
-	{"CHAN",       N_("CHAN")},       /* 5 */
-	{"FREQ",       N_("FREQ")},       /* 6 */
-	{"RATE",       N_("RATE")},       /* 7 */
-	{"SIGNAL",     N_("SIGNAL")},     /* 8 */
-	{"BARS",       N_("BARS")},       /* 9 */
-	{"SECURITY",   N_("SECURITY")},   /* 10 */
-	{"WPA-FLAGS",  N_("WPA-FLAGS")},  /* 11 */
-	{"RSN-FLAGS",  N_("RSN-FLAGS")},  /* 12 */
-	{"DEVICE",     N_("DEVICE")},     /* 13 */
-	{"ACTIVE",     N_("ACTIVE")},     /* 14 */
-	{"IN-USE",     N_("*")},          /* 15 */
-	{"DBUS-PATH",  N_("DBUS-PATH")},  /* 16 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),        /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("SSID"),        /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("SSID-HEX"),    /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("BSSID"),       /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("MODE"),        /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("CHAN"),        /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("FREQ"),        /* 6 */
+	OUTPUT_FIELD_WITH_NAME ("RATE"),        /* 7 */
+	OUTPUT_FIELD_WITH_NAME ("SIGNAL"),      /* 8 */
+	OUTPUT_FIELD_WITH_NAME ("BARS"),        /* 9 */
+	OUTPUT_FIELD_WITH_NAME ("SECURITY"),    /* 10 */
+	OUTPUT_FIELD_WITH_NAME ("WPA-FLAGS"),   /* 11 */
+	OUTPUT_FIELD_WITH_NAME ("RSN-FLAGS"),   /* 12 */
+	OUTPUT_FIELD_WITH_NAME ("DEVICE"),      /* 13 */
+	OUTPUT_FIELD_WITH_NAME ("ACTIVE"),      /* 14 */
+	OUTPUT_FIELD_WITH_NAME ("*"),           /* 15 */
+	OUTPUT_FIELD_WITH_NAME ("DBUS-PATH"),   /* 16 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_WIFI_LIST_ALL           "SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,"\
                                                "WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH"
@@ -176,14 +179,14 @@ NmcOutputField nmc_fields_dev_wifi_list[] = {
 
 /* Available fields for 'device wimax list' */
 NmcOutputField nmc_fields_dev_wimax_list[] = {
-	{"NAME",       N_("NAME")},       /* 0 */
-	{"NSP",        N_("NSP")},        /* 1 */
-	{"SIGNAL",     N_("SIGNAL")},     /* 2 */
-	{"TYPE",       N_("TYPE")},       /* 3 */
-	{"DEVICE",     N_("DEVICE")},     /* 4 */
-	{"ACTIVE",     N_("ACTIVE")},     /* 5 */
-	{"DBUS-PATH",  N_("DBUS-PATH")},  /* 6 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),        /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("NSP"),         /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("SIGNAL"),      /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("TYPE"),        /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("DEVICE"),      /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("ACTIVE"),      /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("DBUS-PATH"),   /* 6 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_WIMAX_LIST_ALL           "NSP,SIGNAL,TYPE,DEVICE,ACTIVE,DBUS-PATH"
 #define NMC_FIELDS_DEV_WIMAX_LIST_COMMON        "NSP,SIGNAL,TYPE,DEVICE,ACTIVE"
@@ -191,38 +194,38 @@ NmcOutputField nmc_fields_dev_wimax_list[] = {
 
 /* Available fields for 'device show' - BOND, BRIDGE part */
 NmcOutputField nmc_fields_dev_show_master_prop[] = {
-	{"NAME",       N_("NAME")},    /* 0 */
-	{"SLAVES",     N_("SLAVES")},  /* 1 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),     /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("SLAVES"),   /* 1 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_MASTER_PROP_ALL     "NAME,SLAVES"
 #define NMC_FIELDS_DEV_SHOW_MASTER_PROP_COMMON  "NAME,SLAVES"
 
 /* Available fields for 'device show' - TEAM part */
 NmcOutputField nmc_fields_dev_show_team_prop[] = {
-	{"NAME",       N_("NAME")},    /* 0 */
-	{"SLAVES",     N_("SLAVES")},  /* 1 */
-	{"CONFIG",     N_("CONFIG")},  /* 2 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),     /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("SLAVES"),   /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("CONFIG"),   /* 2 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_TEAM_PROP_ALL     "NAME,SLAVES,CONFIG"
 #define NMC_FIELDS_DEV_SHOW_TEAM_PROP_COMMON  "NAME,SLAVES,CONFIG"
 
 /* Available fields for 'device show' - VLAN part */
 NmcOutputField nmc_fields_dev_show_vlan_prop[] = {
-	{"NAME",           N_("NAME")},    /* 0 */
-	{"PARENT",         N_("PARENT")},  /* 1 */
-	{"ID",             N_("ID")},      /* 2 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),     /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("PARENT"),   /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("ID"),       /* 2 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_VLAN_PROP_ALL     "NAME,PARENT,ID"
 #define NMC_FIELDS_DEV_SHOW_VLAN_PROP_COMMON  "NAME,PARENT,ID"
 
 /* Available fields for 'device show' - BLUETOOTH part */
 NmcOutputField nmc_fields_dev_show_bluetooth[] = {
-	{"NAME",           N_("NAME")},          /* 0 */
-	{"CAPABILITIES",   N_("CAPABILITIES")},  /* 1 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),           /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("CAPABILITIES"),   /* 1 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_BLUETOOTH_ALL     "NAME,CAPABILITIES"
 #define NMC_FIELDS_DEV_SHOW_BLUETOOTH_COMMON  "NAME,CAPABILITIES"
@@ -235,24 +238,24 @@ extern NmcOutputField nmc_fields_dhcp6_config[];
 
 /* Available sections for 'device show' */
 NmcOutputField nmc_fields_dev_show_sections[] = {
-	{"GENERAL",           N_("GENERAL"),           0, nmc_fields_dev_show_general + 1     },  /* 0 */
-	{"CAPABILITIES",      N_("CAPABILITIES"),      0, nmc_fields_dev_show_cap + 1         },  /* 1 */
-	{"WIFI-PROPERTIES",   N_("WIFI-PROPERTIES"),   0, nmc_fields_dev_show_wifi_prop + 1   },  /* 2 */
-	{"AP",                N_("AP"),                0, nmc_fields_dev_wifi_list + 1        },  /* 3 */
-	{"WIRED-PROPERTIES",  N_("WIRED-PROPERTIES"),  0, nmc_fields_dev_show_wired_prop + 1  },  /* 4 */
-	{"WIMAX-PROPERTIES",  N_("WIMAX-PROPERTIES"),  0, nmc_fields_dev_show_wimax_prop + 1  },  /* 5 */
-	{"NSP",               N_("NSP"),               0, nmc_fields_dev_wimax_list + 1       },  /* 6 */
-	{"IP4",               N_("IP4"),               0, nmc_fields_ip4_config + 1           },  /* 7 */
-	{"DHCP4",             N_("DHCP4"),             0, nmc_fields_dhcp4_config + 1         },  /* 8 */
-	{"IP6",               N_("IP6"),               0, nmc_fields_ip6_config + 1           },  /* 9 */
-	{"DHCP6",             N_("DHCP6"),             0, nmc_fields_dhcp6_config + 1         },  /* 10 */
-	{"BOND",              N_("BOND"),              0, nmc_fields_dev_show_master_prop + 1 },  /* 11 */
-	{"TEAM",              N_("TEAM"),              0, nmc_fields_dev_show_team_prop + 1   },  /* 12 */
-	{"BRIDGE",            N_("BRIDGE"),            0, nmc_fields_dev_show_master_prop + 1 },  /* 13 */
-	{"VLAN",              N_("VLAN"),              0, nmc_fields_dev_show_vlan_prop  + 1  },  /* 14 */
-	{"BLUETOOTH",         N_("BLUETOOTH"),         0, nmc_fields_dev_show_bluetooth + 1   },  /* 15 */
-	{"CONNECTIONS",       N_("CONNECTIONS"),       0, nmc_fields_dev_show_connections + 1 },  /* 16 */
-	{NULL,                NULL,                    0, NULL                                }
+	OUTPUT_FIELD_WITH_FIELDS ("GENERAL",           nmc_fields_dev_show_general),      /* 0 */
+	OUTPUT_FIELD_WITH_FIELDS ("CAPABILITIES",      nmc_fields_dev_show_cap),          /* 1 */
+	OUTPUT_FIELD_WITH_FIELDS ("WIFI-PROPERTIES",   nmc_fields_dev_show_wifi_prop),    /* 2 */
+	OUTPUT_FIELD_WITH_FIELDS ("AP",                nmc_fields_dev_wifi_list),         /* 3 */
+	OUTPUT_FIELD_WITH_FIELDS ("WIRED-PROPERTIES",  nmc_fields_dev_show_wired_prop),   /* 4 */
+	OUTPUT_FIELD_WITH_FIELDS ("WIMAX-PROPERTIES",  nmc_fields_dev_show_wimax_prop),   /* 5 */
+	OUTPUT_FIELD_WITH_FIELDS ("NSP",               nmc_fields_dev_wimax_list),        /* 6 */
+	OUTPUT_FIELD_WITH_FIELDS ("IP4",               nmc_fields_ip4_config),            /* 7 */
+	OUTPUT_FIELD_WITH_FIELDS ("DHCP4",             nmc_fields_dhcp4_config),          /* 8 */
+	OUTPUT_FIELD_WITH_FIELDS ("IP6",               nmc_fields_ip6_config),            /* 9 */
+	OUTPUT_FIELD_WITH_FIELDS ("DHCP6",             nmc_fields_dhcp6_config),          /* 10 */
+	OUTPUT_FIELD_WITH_FIELDS ("BOND",              nmc_fields_dev_show_master_prop),  /* 11 */
+	OUTPUT_FIELD_WITH_FIELDS ("TEAM",              nmc_fields_dev_show_team_prop),    /* 12 */
+	OUTPUT_FIELD_WITH_FIELDS ("BRIDGE",            nmc_fields_dev_show_master_prop),  /* 13 */
+	OUTPUT_FIELD_WITH_FIELDS ("VLAN",              nmc_fields_dev_show_vlan_prop),    /* 14 */
+	OUTPUT_FIELD_WITH_FIELDS ("BLUETOOTH",         nmc_fields_dev_show_bluetooth),    /* 15 */
+	OUTPUT_FIELD_WITH_FIELDS ("CONNECTIONS",       nmc_fields_dev_show_connections),  /* 16 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_SHOW_SECTIONS_ALL     "GENERAL,CAPABILITIES,BOND,TEAM,BRIDGE,VLAN,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,"\
                                              "BLUETOOTH,CONNECTIONS,IP4,DHCP4,IP6,DHCP6"
@@ -261,23 +264,23 @@ NmcOutputField nmc_fields_dev_show_sections[] = {
 
 /* Available fields for 'device lldp' */
 NmcOutputField nmc_fields_dev_lldp_list[] = {
-	{"NAME",                    N_("NAME")},                     /* 0 */
-	{"DEVICE",                  N_("DEVICE")},                   /* 1 */
-	{"CHASSIS-ID",              N_("CHASSIS-ID")},               /* 2 */
-	{"PORT-ID",                 N_("PORT-ID")},                  /* 3 */
-	{"PORT-DESCRIPTION",        N_("PORT-DESCRIPTION")},         /* 4 */
-	{"SYSTEM-NAME",             N_("SYSTEM-NAME")},              /* 5 */
-	{"SYSTEM-DESCRIPTION",      N_("SYSTEM-DESCRIPTION")},       /* 6 */
-	{"SYSTEM-CAPABILITIES",     N_("SYSTEM-CAPABILITIES")},      /* 7 */
-	{"IEEE-802-1-PVID",         N_("IEEE-802-1-PVID")},          /* 8 */
-	{"IEEE-802-1-PPVID",        N_("IEEE-802-1-PPVID")},         /* 9 */
-	{"IEEE-802-1-PPVID-FLAGS",  N_("IEEE-802-1-PPVID-FLAGS")},   /* 10 */
-	{"IEEE-802-1-VID",          N_("IEEE-802-1-VID")},           /* 11 */
-	{"IEEE-802-1-VLAN-NAME",    N_("IEEE-802-1-VLAN-NAME")},     /* 12 */
-	{"DESTINATION",             N_("DESTINATION")},              /* 13 */
-	{"CHASSIS-ID-TYPE",         N_("CHASSIS-ID-TYPE")},          /* 14 */
-	{"PORT-ID-TYPE",            N_("PORT-ID-TYPE")},             /* 15 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("NAME"),                      /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("DEVICE"),                    /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("CHASSIS-ID"),                /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("PORT-ID"),                   /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("PORT-DESCRIPTION"),          /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("SYSTEM-NAME"),               /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("SYSTEM-DESCRIPTION"),        /* 6 */
+	OUTPUT_FIELD_WITH_NAME ("SYSTEM-CAPABILITIES"),       /* 7 */
+	OUTPUT_FIELD_WITH_NAME ("IEEE-802-1-PVID"),           /* 8 */
+	OUTPUT_FIELD_WITH_NAME ("IEEE-802-1-PPVID"),          /* 9 */
+	OUTPUT_FIELD_WITH_NAME ("IEEE-802-1-PPVID-FLAGS"),    /* 10 */
+	OUTPUT_FIELD_WITH_NAME ("IEEE-802-1-VID"),            /* 11 */
+	OUTPUT_FIELD_WITH_NAME ("IEEE-802-1-VLAN-NAME"),      /* 12 */
+	OUTPUT_FIELD_WITH_NAME ("DESTINATION"),               /* 13 */
+	OUTPUT_FIELD_WITH_NAME ("CHASSIS-ID-TYPE"),           /* 14 */
+	OUTPUT_FIELD_WITH_NAME ("PORT-ID-TYPE"),              /* 15 */
+	{ 0 }
 };
 #define NMC_FIELDS_DEV_LLDP_LIST_ALL     "DEVICE,CHASSIS-ID,PORT-ID,PORT-DESCRIPTION,SYSTEM-NAME,SYSTEM-DESCRIPTION," \
                                          "SYSTEM-CAPABILITIES,IEEE-802-1-PVID,IEEE-802-1-PPVID,IEEE-802-1-PPVID-FLAGS," \
diff --git a/clients/cli/general.c b/clients/cli/general.c
index 7724f38021..386327711d 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -34,21 +34,23 @@
 #include "devices.h"
 #include "connections.h"
 
+#define OUTPUT_FIELD_WITH_NAME(n) { .name = N_ (n), }
+
 /* Available fields for 'general status' */
 static NmcOutputField nmc_fields_nm_status[] = {
-	{"RUNNING",      N_("RUNNING")},       /* 0 */
-	{"VERSION",      N_("VERSION")},       /* 1 */
-	{"STATE",        N_("STATE")},         /* 2 */
-	{"STARTUP",      N_("STARTUP")},       /* 3 */
-	{"CONNECTIVITY", N_("CONNECTIVITY")},  /* 4 */
-	{"NETWORKING",   N_("NETWORKING")},    /* 5 */
-	{"WIFI-HW",      N_("WIFI-HW")},       /* 6 */
-	{"WIFI",         N_("WIFI")},          /* 7 */
-	{"WWAN-HW",      N_("WWAN-HW")},       /* 8 */
-	{"WWAN",         N_("WWAN")},          /* 9 */
-	{"WIMAX-HW",     N_("WIMAX-HW")},      /* 10 */
-	{"WIMAX",        N_("WIMAX")},         /* 11 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("RUNNING"),        /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("VERSION"),        /* 1 */
+	OUTPUT_FIELD_WITH_NAME ("STATE"),          /* 2 */
+	OUTPUT_FIELD_WITH_NAME ("STARTUP"),        /* 3 */
+	OUTPUT_FIELD_WITH_NAME ("CONNECTIVITY"),   /* 4 */
+	OUTPUT_FIELD_WITH_NAME ("NETWORKING"),     /* 5 */
+	OUTPUT_FIELD_WITH_NAME ("WIFI-HW"),        /* 6 */
+	OUTPUT_FIELD_WITH_NAME ("WIFI"),           /* 7 */
+	OUTPUT_FIELD_WITH_NAME ("WWAN-HW"),        /* 8 */
+	OUTPUT_FIELD_WITH_NAME ("WWAN"),           /* 9 */
+	OUTPUT_FIELD_WITH_NAME ("WIMAX-HW"),       /* 10 */
+	OUTPUT_FIELD_WITH_NAME ("WIMAX"),          /* 11 */
+	{ 0 }
 };
 #define NMC_FIELDS_NM_STATUS_ALL     "RUNNING,VERSION,STATE,STARTUP,CONNECTIVITY,NETWORKING,WIFI-HW,WIFI,WWAN-HW,WWAN"
 #define NMC_FIELDS_NM_STATUS_SWITCH  "NETWORKING,WIFI-HW,WIFI,WWAN-HW,WWAN"
@@ -63,18 +65,18 @@ static NmcOutputField nmc_fields_nm_status[] = {
 
 /* Available fields for 'general permissions' */
 static NmcOutputField nmc_fields_nm_permissions[] = {
-	{"PERMISSION", N_("PERMISSION")},  /* 0 */
-	{"VALUE",      N_("VALUE")},       /* 1 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("PERMISSION"),   /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("VALUE"),        /* 1 */
+	{ 0 }
 };
 #define NMC_FIELDS_NM_PERMISSIONS_ALL     "PERMISSION,VALUE"
 #define NMC_FIELDS_NM_PERMISSIONS_COMMON  "PERMISSION,VALUE"
 
 /* Available fields for 'general logging' */
 static NmcOutputField nmc_fields_nm_logging[] = {
-	{"LEVEL",   N_("LEVEL")},    /* 0 */
-	{"DOMAINS", N_("DOMAINS")},  /* 1 */
-	{NULL, NULL}
+	OUTPUT_FIELD_WITH_NAME ("LEVEL"),     /* 0 */
+	OUTPUT_FIELD_WITH_NAME ("DOMAINS"),   /* 1 */
+	{ 0 }
 };
 #define NMC_FIELDS_NM_LOGGING_ALL     "LEVEL,DOMAINS"
 #define NMC_FIELDS_NM_LOGGING_COMMON  "LEVEL,DOMAINS"
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index f150179d24..51cfaee21d 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -108,7 +108,6 @@ struct _NMMetaSettingInfoEditor;
 
 typedef struct _NmcOutputField {
 	const char *name;               /* Field's name */
-	const char *name_l10n;          /* Field's name for translation */
 	int width;                      /* Width in screen columns */
 	const struct _NmcOutputField *group_list; /* Points to an array with available section field names if this is a section (group) field */
 	void *value;                    /* Value of current field - char* or char** (NULL-terminated array) */
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 210c226c89..7dca9474a2 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -167,7 +167,6 @@ _get_nmc_output_fields (const NMMetaSettingInfoEditor *setting_info)
 			NmcOutputField *f = &(*field)[i];
 
 			f->name = setting_info->properties[i].property_name;
-			f->name_l10n = setting_info->properties[i].property_name;
 		}
 	}
 
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 5db9a08217..804e520bd4 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -831,7 +831,7 @@ get_value_to_print (NmCli *nmc,
 	gboolean free_value;
 
 	if (field_name)
-		value = _(field->name_l10n);
+		value = _(field->name);
 	else
 		value = field->value
 		            ? (is_array
@@ -941,7 +941,7 @@ print_required_fields (NmCli *nmc, const NmcOutputField field_values[])
 					tmp = g_strdup_printf ("%s%s%s[%d]:",
 					                       section_prefix ? (const char*) field_values[0].value : "",
 					                       section_prefix ? "." : "",
-					                       _(field_values[idx].name_l10n),
+					                       _(field_values[idx].name),
 					                       j);
 					width1 = strlen (tmp);
 					width2 = nmc_string_screen_width (tmp, NULL);
@@ -961,7 +961,7 @@ print_required_fields (NmCli *nmc, const NmcOutputField field_values[])
 				tmp = g_strdup_printf ("%s%s%s:",
 				                       section_prefix ? hdr_name : "",
 				                       section_prefix ? "." : "",
-				                       _(field_values[idx].name_l10n));
+				                       _(field_values[idx].name));
 				width1 = strlen (tmp);
 				width2 = nmc_string_screen_width (tmp, NULL);
 				g_print ("%-*s%s\n", terse ? 0 : ML_VALUE_INDENT+width1-width2, tmp, print_val);