From ee26fd79e85c463c092c42073bfa569bb4f58e79 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 2 Jul 2015 15:57:13 +0200 Subject: [PATCH] lang: regenerate dynamic string translations, but leaving out the excessive use of html tags in the descriptions. --- lang/dynamic/helpers/acl.php | 18 ++-- lang/dynamic/helpers/controllers.php | 88 ++++--------------- lang/dynamic/helpers/models.php | 25 ++++-- .../OPNsense/Core/ACL_Legacy_Page_Map.json | 4 +- 4 files changed, 43 insertions(+), 92 deletions(-) diff --git a/lang/dynamic/helpers/acl.php b/lang/dynamic/helpers/acl.php index a3cb69c69..d0f261e63 100644 --- a/lang/dynamic/helpers/acl.php +++ b/lang/dynamic/helpers/acl.php @@ -42,7 +42,7 @@ echo gettext('Allow access to the \'Services: Wake on LAN\' page.'); echo gettext('Allow access to the \'Status: IPsec\' page.'); echo gettext('Allow access to the \'VPN: PPTP: User: Edit\' page.'); echo gettext('Show all items on help menu'); -echo gettext('Allow access to the \'System: Package Manager: Install Package\' page.'); +echo gettext('Allow access to the \'Services: Intrusion Detection\' page\''); echo gettext('Allow access to the \'System: Firmware: Settings\' page.'); echo gettext('Allow access to the \'System: User Manager: Add Privileges\' page.'); echo gettext('Allow access to the \'Services: NTP\' page.'); @@ -64,14 +64,13 @@ echo gettext('Allow access to the \'VPN: L2TP: Users : Edit\' page.'); echo gettext('Allow access to the \'Firewall: Schedules\' page.'); echo gettext('Allow access to the \'Diagnostics: Logs: Settings\' page.'); echo gettext('Allow access to the \'Services: Captive portal: Vouchers\' page.'); +echo gettext('Allow access to the \'Service: Univeral Plug and Play\' page.'); echo gettext('Allow access to the \'Firewall: Virtual IP Addresses\' page.'); echo gettext('Allow access to the \'System: Firmware: Manual Update\' page.'); echo gettext('Allow access to the \'Status: System logs: System: Routing\' page.'); echo gettext('Allow access to the \'Status: Services\' page.'); echo gettext('Allow access to the \'Status: IPsec: Leases\' page.'); -echo gettext('Indicates whether the user is allowed to copy files onto the appliance via SCP/SFTP. If you are going to use this privilege, you must install scponly on the appliance (Hint: pkg_add -r scponly).'); echo gettext('Allow access to the \'Services: DNS Forwarder: Edit Domain Override\' page.'); -echo gettext('Allow access to the \'Status: System logs: OpenVPN\' page.'); echo gettext('Allow access to the \'System: Advanced: Networking\' page.'); echo gettext('Allow access to the \'Status: CPU load\' page.'); echo gettext('Allow access to the \'Diagnostics: ARP Table\' page.'); @@ -79,7 +78,6 @@ echo gettext('Allow access to the \'Interfaces: ppps\' page.'); echo gettext('Allow access to the \'Firewall: NAT: 1:1\' page.'); echo gettext('Indicates whether the user is allowed to use the proxy'); echo gettext('Allow access to the \'Status: System logs: IPsec VPN\' page.'); -echo gettext('Allow access to the \'Status: Package logs\' page.'); echo gettext('Allow access to the \'Services: DHCP Server : Edit static mapping\' page.'); echo gettext('Allow access to the \'Services: DHCPv6 server\' page.'); echo gettext('Allow access to the \'Status: Captive portal: Test Vouchers\' page.'); @@ -91,7 +89,6 @@ echo gettext('Allow access to the \'Services: SNMP\' page.'); echo gettext('Allow access to the \'Settings: Load Balancer: Settings\' page.'); echo gettext('Allow access to the \'Diagnostics: Show States\' page.'); echo gettext('Allow access to the \'VPN: OpenVPN: Client Export Utility\' page.'); -echo gettext('Allow access to the \'Package: Settings\' page.'); echo gettext('Indicates whether the user is able to login for example via SSH.'); echo gettext('Allow access to the \'Status: Traffic Graph\' page.'); echo gettext('Allow access to the \'Firewall: Aliases\' page.'); @@ -102,9 +99,9 @@ echo gettext('Allow access to the \'Services: Captive portal: Edit MAC Addresses echo gettext('Allow access to the \'Diagnostics: Interface Traffic\' page.'); echo gettext('Allow access to the \'System: Firmware: Auto Update\' page.'); echo gettext('Allow access to the \'Diagnostics: Sockets\' page.'); -echo gettext('Allow access to the \'Status: UPnP Status\' page.'); +echo gettext('Allow access to the \'Status: Univeral Plug and Play Status\' page.'); echo gettext('Allow access to the \'Services: PPPoE Server\' page.'); -echo gettext('Allow access to the \'Package: Edit\' page.'); +echo gettext('Allow access to the \'Status: System logs: OpenVPN\' page.'); echo gettext('Allow access to the \'Status: OpenVPN\' page.'); echo gettext('Allow access to the \'Services: RFC 2136 clients\' page.'); echo gettext('Uploads crash reports to pfSense and or deletes crash reports.'); @@ -126,7 +123,6 @@ echo gettext('Allow access to the \'VPN: IPsec: Edit Phase 1\' page.'); echo gettext('Allow access to the \'Interfaces: VLAN\' page.'); echo gettext('Allow access to the \'Services: Load Balancer: Relay Action: Edit\' page.'); echo gettext('Allow access to the \'Firewall: NAT: Port Forward: Edit\' page.'); -echo gettext('Allow access to the \'System: Package Manager\' page.'); echo gettext('Allow access to the \'Services: DNS Resolver: Edit Domain Override\' page.'); echo gettext('Allow access to the \'Firewall: Alias: Import\' page.'); echo gettext('Allow access to the \'Diagnostics: Reset state\' page.'); @@ -161,7 +157,6 @@ echo gettext('Allow access to the \'Diagnostics: Logs: DHCP\' page.'); echo gettext('Allow access to the \'System: Gateway Groups\' page.'); echo gettext('Allow access to the \'pfSense wizard subsystem\' page.'); echo gettext('Allow access to the \'Diagnostics: Restore Full Backup\' page.'); -echo gettext('Allow access to the \'System: Package Manager: Installed\' page.'); echo gettext('Allow access to the \'Status: CARP\' page.'); echo gettext('Allow access to the \'Diagnostics: Authentication\' page.'); echo gettext('Allow access to the \'Services: Captive portal: File Manager\' page.'); @@ -226,7 +221,7 @@ echo gettext('Allow access to the \'Status: NTP Serial GPS\' page.'); echo gettext('Indicates whether the user is allowed to dial in via L2TP'); echo gettext('Allow access to the \'Status: Load Balancer: Pool\' page.'); echo gettext('Allow access to the \'Services: Load Balancer: Relay Protocols\' page.'); -echo gettext('Allow access to the \'Interfaces: QinQ\' page.'); +echo gettext('Allow access to the \'Interfaces: Bridge\' page.'); echo gettext('Allow access to the \'Interfaces: Bridge : Edit\' page.'); echo gettext('Allow access to the \'Interfaces: Wireless\' page.'); echo gettext('Allow access to the \'Services: Dynamic DNS clients\' page.'); @@ -243,7 +238,6 @@ echo gettext('Allow access to the \'Services: DNS Resolver\' page.'); echo gettext('Allows access to the \'Diagnostics: pfTop\' page'); echo gettext('Allow access to the \'Status: RRD Graphs: settings\' page.'); echo gettext('Allow access to the \'Services: DNS Resolver: Access Lists: Edit\' page.'); -echo gettext('Allow access to the \'Packages: Settings\' page.'); echo gettext('Allow access to the \'Interfaces: GIF\' page.'); echo gettext('Allow access to the \'VPN: IPsec: Edit Pre-Shared Keys\' page.'); echo gettext('Allow access to the \'Services: Dynamic DNS client\' page.'); @@ -264,7 +258,7 @@ echo gettext('Allow access to the \'Firewall: Easy Rule\' add/status page.'); echo gettext('Allows access to the \'Diagnostics: System Activity\' page'); echo gettext('Allow access to the \'System: Static Routes\' page.'); echo gettext('Allow access to the \'XMLRPC Interface Stats\' page.'); -echo gettext('Allow access to the \'Interfaces: Bridge\' page.'); +echo gettext('Allow access to the \'Interfaces: QinQ\' page.'); echo gettext('Allow access to the \'System: High Availability\' page.'); echo gettext('Allow access to the \'Diagnostics: Factory defaults\' page.'); echo gettext('Allow access to the \'Services: DHCP Relay\' page.'); diff --git a/lang/dynamic/helpers/controllers.php b/lang/dynamic/helpers/controllers.php index 641b95f14..be1a84275 100644 --- a/lang/dynamic/helpers/controllers.php +++ b/lang/dynamic/helpers/controllers.php @@ -38,23 +38,8 @@ echo gettext('The port number where Squid sends and receives ICP queries to '); echo gettext('Enable access logging.'); echo gettext('Enable store logging.'); -echo gettext(' - Type IPs of alternative DNS servers you like to use.
TIP: You can also paste a comma seperated list into this field.
'); -echo gettext('This option reverses the order of preference to make Squid contact dual-stack websites over IPv4 first. - Squid will still perform both IPv6 and IPv4 DNS lookups before connecting. -
Warning: This option will restrict the situations under which IPv6 - connectivity is used (and tested). Hiding network problems - which would otherwise be detected and warned about.
'); -echo gettext('If set (default), Squid will include a Via header in requests and - replies as required by RFC2616.'); echo gettext('Select what to do with X-Forwarded for header.'); echo gettext('Suppress Squid version string info in HTTP headers and HTML error pages.'); -echo gettext('Select what to do with URI that contain whitespaces.
-
NOTE: the current Squid implementation of encode and chop violates - RFC2616 by not using a 301 redirect after altering the URL.
'); -echo gettext('Enable or disable the local cache.
- Curently only ufs directory cache type is supported.
- Do not enable on embedded systems with SD or CF cards as this may break your drive.'); echo gettext('Enter the storage size for the local cache (default is 100).'); echo gettext(' Enter the number of first-level subdirectories for the local cache (default is 16).'); @@ -73,79 +58,36 @@ echo gettext(' When enabled the subnets of the selected interfaces will be added to the allow access list.'); echo gettext('Select interface(s) the ftp proxy will bind to.'); echo gettext('The port the proxy service will listen to.'); -echo gettext(' - Type subnets you want to allow acces to the proxy server, use a comma or press Enter for new item.
TIP: You can also paste a comma separated list into this field.
'); -echo gettext(' - Type IP adresses you want to allow acces to the proxy server, use a comma or press Enter for new item.
TIP: You can also paste a comma separated list into this field.
'); -echo gettext(' - Type IP adresses you want to deny acces to the proxy server, use a comma or press Enter for new item.
TIP: You can also paste a comma separated list into this field.
'); -echo gettext('Whitelist destination domains.
- You may use a regular expression, use a comma or press Enter for new item.
-
- Examples:
- .mydomain.com -> matches on *.mydomain.com
- ^http(s|)://([a-zA-Z]+)\.mydomain\.* -> matches on http(s)://*.mydomain.*
- \\.+\.gif$ -> matches on \*.gif but not on \*.gif\test
- \\.+[0-9]+\.gif$ -> matches on \123.gif but not on \test.gif
-
-
TIP: You can also paste a comma separated list into this field.
'); -echo gettext('Blacklist destination domains.
- You may use a regular expression, use a comma or press Enter for new item.
-
- Examples:
- .mydomain.com -> matches on *.mydomain.com
- ^http(s|)://([a-zA-Z]+)\.mydomain\.* -> matches on http(s)://*.mydomain.*
- \\.+\.gif$ -> matches on \*.gif but not on \*.gif\test
- \\.+[0-9]+\.gif$ -> matches on \123.gif but not on \test.gif
-
-
TIP: You can also paste a comma separated list into this field.
'); -echo gettext('Block user-agents.
- You may use a regular expression, use a comma or press Enter for new item.
-
- Examples:
- ^(.)+Macintosh(.)+Firefox/37\.0 -> matches on Macintosh version of Firefox revision 37.0
- ^Mozilla -> matches on all Mozilla based browsers
-
-
TIP: You can also paste a comma separated list into this field.
'); -echo gettext('Block specific MIME type reply.
- You may use a regular expression, use a comma or press Enter for new item.
-
- Examples:
- video/flv -> matches on Flash Video
- application/x-javascript -> matches on javascripts
-
-
TIP: You can also paste a comma separated list into this field.
'); -echo gettext('Allowed destination TCP ports, you may use ranges (ex. 222-226) and add comments with collon (ex. 22:ssh).
-
TIP: You can also paste a comma separated list into this field.
'); -echo gettext('Allowed destination SSL ports, you may use ranges (ex. 222-226) and add comments with collon (ex. 22:ssh).
-
TIP: You can also paste a comma separated list into this field.
'); echo gettext('Select Authentication method'); echo gettext('The prompt will be displayed in the autherntication request window.'); -echo gettext('This specifies for how long (in hours) the proxy server assumes an externally validated username and password combination is valid (Time To Live).
- When the TTL expires, the user will be prompted for credentials again.'); echo gettext('The total number of authenticator processes to spawn.'); +echo gettext('Select if job is enabled or not'); +echo gettext('Enter a filename for storing the blacklist.'); +echo gettext('Enter an url to fetch the blacklist from.'); +echo gettext('Enter a description to explain what this blacklist is intended for.'); +echo gettext('enable IDS'); +echo gettext('Select interface(s) to use.'); echo gettext('enable this pipe and it\'s related queues and rules'); echo gettext('Total bandwidth for this pipe'); echo gettext('number of dynamic queues, leave empty for default'); -echo gettext('Dynamic queue creation by source or destination address. -
  • choose destination here to share the total bandwidth of this pipe among all connected clients.
    • -
  • choose source to provide all connected clients up to a maximum of this pipe configured bandwidth
    • - '); echo gettext('Description to identify this pipe.'); echo gettext('enable this queue and it\'s related rules'); echo gettext('connected pipe for this queue'); echo gettext('Weight of this queue (1..100), used to prioritize within a pipe. (1 is low, 100 is high)'); -echo gettext('Dynamic queue creation by source or destination address. -
  • choose destination here to share the total bandwidth of this pipe among all connected clients.
    • -
  • choose source to provide all connected clients up to a maximum of this pipe configured bandwidth
    • - '); echo gettext('Description to identify this pipe.'); echo gettext('order in which the rule will be evaluated (lowest first)'); -echo gettext('secondary interface, matches packets going traveling from interface (1) to interface (2). - '); echo gettext('source ip or network, examples 10.0.0.0/24, 10.0.0.1'); echo gettext('source port number or well known name (imap,imaps, http,https,...)'); echo gettext('destination ip or network, examples 10.0.0.0/24, 10.0.0.1'); echo gettext('destination port number or well known name (imap,imaps, http,https,...)'); echo gettext('matches incomming or outgoing packets or both (default)'); echo gettext('target pipe or queue'); +echo gettext('Select if job is enabled or not'); +echo gettext('Enter the minutes for the job to act, can also be a comma separated list, * (each) or a range (ex. 10,20,30 or 10-30)'); +echo gettext('Enter the hours for the job to act, can also be a comma separated list, * (each) or a range (ex. 10,11,12 or 10-12)'); +echo gettext('Enter the days of the month for the job to act, can also be a comma separated list, * (each) or a range (ex. 1,20,28 or 1-28)'); +echo gettext('Enter the months for the job to act, can also be a comma separated list, * (each) or a range (ex. 1,2,3 or 1-3)'); +echo gettext('Enter the days of the week for the job to act, can also be a comma separated list, * (each) or a range (ex. 1,2,3 or 1-3)'); +echo gettext('Select the command that needs to be executed at given time frame.'); +echo gettext('Enter parameters for this job if required.'); +echo gettext('Enter a description to explain what this job is intended for.'); diff --git a/lang/dynamic/helpers/models.php b/lang/dynamic/helpers/models.php index a4dd6b093..72a465fb6 100644 --- a/lang/dynamic/helpers/models.php +++ b/lang/dynamic/helpers/models.php @@ -101,6 +101,7 @@ echo gettext('Advanced'); echo gettext('ACLs'); echo gettext('DNS Resolver'); echo gettext('DynamicDNSRFC2136Clients'); +echo gettext('DynamicDNSEdit'); echo gettext('Dynamic DNS'); echo gettext('IGMP Proxy'); echo gettext('VirtualServer'); @@ -111,8 +112,9 @@ echo gettext('Network Time Protocol'); echo gettext('PPPoE Server'); echo gettext('Proxy Server'); echo gettext('SNMP'); -echo gettext('Universal P&P / NAT-PMP'); +echo gettext('Universal Plug and Play'); echo gettext('Wake on LAN'); +echo gettext('Intrusion Detection'); echo gettext('Services'); echo gettext('MobileClients'); echo gettext('Keys'); @@ -168,7 +170,7 @@ echo gettext('Proxy'); echo gettext('Settings'); echo gettext('System Logs'); echo gettext('Traffic Graphs'); -echo gettext('UPnP & NAT-PMP'); +echo gettext('Universal Plug and Play'); echo gettext('Status'); echo gettext('ARP Table'); echo gettext('Authentication'); @@ -203,6 +205,10 @@ echo gettext('Paid Support'); echo gettext('UserForum'); echo gettext('Help'); echo gettext('menu'); +echo gettext('test'); +echo gettext('you should input a valid email address'); +echo gettext('sid should be a number'); +echo gettext('Related cron not found'); echo gettext('ICP port needs to be an integer value between 1 and 65535'); echo gettext('Specify a positive cache size. (number of MB\'s)'); echo gettext('Specify a positive number of first-level subdirectories.'); @@ -213,13 +219,14 @@ echo gettext('Specify the overall bandwidth for downloads in kilobits per second echo gettext('Specify the per host bandwidth for downloads in kilobits per second.'); echo gettext('Proxy port needs to be an integer value between 1 and 65535'); echo gettext('FTP Proxy port needs to be an integer value between 1 and 65535'); +echo gettext('The filename may only contain letters,digits and one dot (not required).'); +echo gettext('This does not look like a valid url.'); echo gettext('Credentials TTL needs to be an integer value above 0'); echo gettext('Number of children needs to be an integer value above 0'); -echo gettext('test'); -echo gettext('you should input a valid email address'); echo gettext('Pipe number must be between 1...65535'); echo gettext('Bandwidth out of range'); echo gettext('Bandwidth metric should be one of bit,Kbit,Mbit'); +echo gettext('The burst value is an integer and represent a number of bytes.'); echo gettext('queue size should be between 2...100'); echo gettext('origin should be regular text of max 30 characters'); echo gettext('Description should be a string between 1 and 255 characters'); @@ -231,4 +238,12 @@ echo gettext('origin should be regular text of max 30 characters'); echo gettext('provide a valid sequence for sorting'); echo gettext('Related pipe or queue not found'); echo gettext('origin should be regular text of max 30 characters'); -echo gettext('sid should be a number'); +echo gettext('Origin should be regular text of max 30 characters'); +echo gettext('Value needs to be between 0 and 59, multiple values, ranges and * are supported (ex. 1,10,20,30 or 1-30 )'); +echo gettext('Value needs to be between 0 and 23, multiple values, ranges and * are supported (ex. 1,2,8 or 0-8 )'); +echo gettext('Value needs to be between 1 and 31, multiple values, ranges, L (last day of month) and * are supported (ex. 1,2,8 or 1-28 )'); +echo gettext('Value needs to be between 1 and 12 or JAN to DEC, multiple values, ranges and * are supported (ex. JAN,2,10 or 3-8 )'); +echo gettext('Value needs to be between 0 and 6 ( Sunday to Saturday), multiple values, ranges and * are supported (ex. 1,2,4 or 0-4 ) '); +echo gettext('Select a command from the list.'); +echo gettext('Enter valid parameter(s) for the chosen command (Found illegal characters).'); +echo gettext('Enter a description.'); diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json index 9eaba881b..cd36d4f8a 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json +++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json @@ -1606,8 +1606,8 @@ ] }, "page-services-ids": { - "name": "WebCfg - Services: Intrusion detection", - "descr": "Allow access to the 'Services: IDS' page'", + "name": "WebCfg - Services: Intrusion Detection page", + "descr": "Allow access to the 'Services: Intrusion Detection' page'", "match": [ "ui/ids/*", "api/ids/*"