po: substitute keys with english text, cleanup and unify translations

1 files changed, 176 insertions, 176 deletions

diff --git a/po/ru/coovachilli.po b/po/ru/coovachilli.po
index f9e02ff30..dd6495d6f 100644
--- a/po/ru/coovachilli.po
+++ b/po/ru/coovachilli.po
@@ -14,882 +14,882 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr ""
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr ""
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr ""
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr ""
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr ""
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr ""
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr ""
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr ""
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr ""
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr ""
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr ""
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr ""
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr ""
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr ""
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr ""
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr ""
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr ""
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr ""
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr ""
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr ""
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr ""
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr ""
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr ""
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr ""
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr ""
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr ""
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device "system" session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device "system" session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of "input octets" and "output octets" as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr ""
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr ""
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr ""
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr ""
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server