src: regenerate for 17.7

scripts/plugins/wizards.py

@@ -51,6 +51,6 @@ def getTranslations(root):
                 filename = '%s/%s'%(rootdir,name)
                 tree = ET.parse(filename)
                 rootObj = tree.getroot()
-                if rootObj.tag == 'opnsensewizard':
+                if rootObj.tag == 'wizard':
                     for tag in recursiveParseWizard(rootObj):
                         yield tag

src/wizards.php

@@ -43,6 +43,11 @@ echo gettext('A Windows Internet Name Service (WINS) server to provide for conne
 echo gettext('A name for this OpenVPN instance, for your reference. It can be set however you like, but is often used to distinguish the purpose of the service (e.g. "Remote Technical Staff").');
 echo gettext('A name for your reference, to identify this certificate. This is also known as the certificate\'s "Common Name."');
 echo gettext('A name for your reference, to identify this certificate. This is the same as common-name field for other Certificates.');
+echo gettext('A reload is now in progress. The wizard will redirect you to the dashboard once the reload is completed.');
+echo gettext('Add Certificate Authority');
+echo gettext('Add LDAP Server');
+echo gettext('Add RADIUS Server');
+echo gettext('Add a Server Certificate');
 echo gettext('Add a rule to allow all traffic from connected clients to pass across the VPN tunnel.');
 echo gettext('Add a rule to permit traffic from clients on the Internet to the OpenVPN server process.');
 echo gettext('Add new CA');
@@ -62,20 +67,21 @@ echo gettext('Allow connected clients to retain their connections if their IP ad
 echo gettext('Auth Digest Algorithm');
 echo gettext('Authentication Containers');
 echo gettext('Authentication Port');
+echo gettext('Authentication Type Selection');
 echo gettext('Automatically generate a shared TLS authentication key.');
 echo gettext('Block RFC1918 Private Networks');
 echo gettext('Block bogon networks');
 echo gettext('Certificate');
 echo gettext('Certificate Authority');
+echo gettext('Certificate Authority Selection');
 echo gettext('Choose a Certificate Authority (CA)');
 echo gettext('Choose a Server Certificate');
 echo gettext('City');
 echo gettext('City or other Locality name (e.g. Middelharnis, Leipzig, Louisville).');
-echo gettext('Click \'Reload\' to reload OPNsense with new changes.');
+echo gettext('Click \'Reload\' to reload to apply the changes.');
 echo gettext('Client Settings');
 echo gettext('Compression');
 echo gettext('Concurrent Connections');
-echo gettext('Configuration Complete!');
 echo gettext('Configure LAN Interface');
 echo gettext('Configure WAN Interface');
 echo gettext('Country Code');
@@ -111,6 +117,7 @@ echo gettext('Enter any additional options you would like to add to the OpenVPN
 echo gettext('Enter the hostname (FQDN) of the time server.');
 echo gettext('Entire Subtree');
 echo gettext('Finish');
+echo gettext('Finished!');
 echo gettext('Firewall Rule');
 echo gettext('Firewall Rule Configuration');
 echo gettext('Firewall Rules control what network traffic is permitted. You must add rules to allow traffic to the OpenVPN server\'s IP and port, as well as allowing traffic from connected clients through the tunnel. These rules can be automatically added here, or configured manually after completing the wizard.');
@@ -119,6 +126,7 @@ echo gettext('Full State of Province name, not abbreviated (e.g. Zuid Holland, S
 echo gettext('Gateway IP Address field is invalid');
 echo gettext('General Information');
 echo gettext('General OpenVPN Server Information');
+echo gettext('General Setup');
 echo gettext('General configuration');
 echo gettext('Generate TLS Key');
 echo gettext('Group Naming Attribute');
@@ -143,6 +151,7 @@ echo gettext('LDAP Authentication Server List');
 echo gettext('LDAP Authentication Server Parameters');
 echo gettext('LDAP Bind Password');
 echo gettext('LDAP Bind User DN');
+echo gettext('LDAP Server Selection');
 echo gettext('LDAP Server port, leave blank for the default (389 for TCP, 636 for SSL).');
 echo gettext('LDAP servers');
 echo gettext('Language');
@@ -165,25 +174,8 @@ echo gettext('NetBIOS Options');
 echo gettext('NetBIOS Scope ID');
 echo gettext('Network Time Protocol server to provide for connecting client systems.');
 echo gettext('Next');
-echo gettext('OPNsense Setup Wizard');
 echo gettext('On this screen we will configure the Local Area Network information.');
-echo gettext('On this screen we will configure the Wide Area Network information.');
-echo gettext('On this screen we will set the admin password, which is used to access the WebGUI and also SSH services if you wish to enable them.');
-echo gettext('On this screen you will set the general OPNsense parameters.');
 echo gettext('One Level');
-echo gettext('OpenVPN Remote Access Server Setup Wizard');
-echo gettext('OpenVPN Wizard: Add Certificate Authority');
-echo gettext('OpenVPN Wizard: Add LDAP Server');
-echo gettext('OpenVPN Wizard: Add RADIUS Server');
-echo gettext('OpenVPN Wizard: Add a Server Certificate');
-echo gettext('OpenVPN Wizard: Authentication Type Selection');
-echo gettext('OpenVPN Wizard: Certificate Authority Selection');
-echo gettext('OpenVPN Wizard: Finished!');
-echo gettext('OpenVPN Wizard: Firewall Rule Configuration');
-echo gettext('OpenVPN Wizard: LDAP Server Selection');
-echo gettext('OpenVPN Wizard: RADIUS Server Selection');
-echo gettext('OpenVPN Wizard: Server Certificate Selection');
-echo gettext('OpenVPN Wizard: Server Setup');
 echo gettext('OpenVPN rule');
 echo gettext('Organization');
 echo gettext('Organization name, often the Company or Group name.');
@@ -206,7 +198,6 @@ echo gettext('PPTP Remote IP Address field is invalid');
 echo gettext('PPTP Username');
 echo gettext('PPTP configuration');
 echo gettext('Paste in a shared TLS key if one has already been generated.');
-echo gettext('Please enter the time, date and time zone.');
 echo gettext('Port');
 echo gettext('Port used by the RADIUS server for accepting Authentication requests, typically 1812.');
 echo gettext('Primary DNS Server');
@@ -216,12 +207,13 @@ echo gettext('Provide a default domain name to clients.');
 echo gettext('Provide a virtual adapter IP address to clients (see Tunnel Network).');
 echo gettext('RADIUS Authentication Server List');
 echo gettext('RADIUS Authentication Server Parameters');
+echo gettext('RADIUS Server Selection');
 echo gettext('RADIUS servers');
 echo gettext('RFC1918 Networks');
 echo gettext('Radius');
 echo gettext('Redirect Gateway');
 echo gettext('Reload');
-echo gettext('Reload configuration');
+echo gettext('Reload Configuration');
 echo gettext('Reload in progress');
 echo gettext('SSL - Encrypted');
 echo gettext('Search Scope Base DN');
@@ -230,7 +222,9 @@ echo gettext('Secondary DNS Server');
 echo gettext('Secondary DNS Server field is invalid');
 echo gettext('Select an Authentication Backend Type');
 echo gettext('SelectedType');
-echo gettext('Set Admin WebGUI Password');
+echo gettext('Server Certificate Selection');
+echo gettext('Server Setup');
+echo gettext('Set Admin Web GUI Password');
 echo gettext('Set the MTU of the WAN interface. If you leave this field blank, an MTU of 1492 bytes for PPPoE and 1500 bytes for all other connection types will be assumed.');
 echo gettext('Set the TOS IP header value of tunnel packets to match the encapsulated packet value.');
 echo gettext('Shared Secret');
@@ -249,6 +243,7 @@ echo gettext('This field can be used to modify ("spoof") the MAC address of the
 echo gettext('This is the IPv4 virtual network used for private communications between this server and client hosts expressed using CIDR notation (eg. 10.0.8.0/24). The first network address will be assigned to the server virtual interface. The remaining network addresses can optionally be assigned to connecting clients. (see Address Pool)');
 echo gettext('This is the network that will be accessible from the remote endpoint, expressed as a CIDR range. You may leave this blank if you don\'t want to add a route to the local network through this tunnel on the remote machine. This is generally set to your LAN network.');
 echo gettext('This option causes the interface to operate in dial-on-demand mode, allowing you to have a virtual full time connection. The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected.');
+echo gettext('This wizard will guide you through the initial system configuration. The wizard may be stopped at any time by clicking the logo image at the top of the screen.');
 echo gettext('Time Server Information');
 echo gettext('Time server hostname');
 echo gettext('Timezone');
@@ -270,7 +265,6 @@ echo gettext('WINS Server 1');
 echo gettext('WINS Server 2');
 echo gettext('When set, this option blocks traffic from IP addresses that are reserved (but not RFC 1918) or not yet assigned by IANA. Bogons are prefixes that should never appear in the Internet routing table, and obviously should not appear as the source address in any packets you receive.');
 echo gettext('When set, this option blocks traffic from IP addresses that are reserved for private networks as per RFC 1918 (10/8, 172.16/12, 192.168/16) as well as loopback addresses (127/8). You should generally leave this option turned on, unless your WAN network lies in such a private address space, too.');
-echo gettext('Wizard completed.');
 echo gettext('Your configuration is now complete.');
 echo gettext('addrpool');
 echo gettext('authscope');
@@ -289,10 +283,10 @@ echo gettext('descr');
 echo gettext('description');
 echo gettext('dhparameters');
 echo gettext('digest');
-echo gettext('dnserver2');
-echo gettext('dnserver3');
-echo gettext('dnserver4');
 echo gettext('dnsserver1');
+echo gettext('dnsserver2');
+echo gettext('dnsserver3');
+echo gettext('dnsserver4');
 echo gettext('dummy');
 echo gettext('duplicate_cn');
 echo gettext('dynip');