diff options
author | Renato Botelho <renato@netgate.com> | 2016-12-19 13:22:40 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-12-19 13:22:40 -0200 |
commit | 0e95f736f54f75200988cc0ce1cfe4fc12c8fe2f (patch) | |
tree | 30f8ab44ca3368c2bdda82e04a35cd653df4b473 /src/usr | |
parent | 91650d98e10e509c9c71d27fe7e15e9ce9012aca (diff) | |
parent | 66fa78b63b3fc9f47063026afa4f3edfed15360d (diff) | |
download | pfsense-0e95f736f54f75200988cc0ce1cfe4fc12c8fe2f.zip pfsense-0e95f736f54f75200988cc0ce1cfe4fc12c8fe2f.tar.gz |
Merge pull request #3289 from doktornotor/patch-2
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot | 36 | ||||
-rw-r--r-- | src/usr/local/www/services_router_advertisements.php | 24 |
2 files changed, 36 insertions, 24 deletions
diff --git a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index 224cfc7..f611160 100644 --- a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -21768,23 +21768,29 @@ msgid "Only interfaces configured with a static IP will be shown." msgstr "" #: src/usr/local/www/services_router_advertisements.php:108 -msgid "Router Only" +msgid "Router Only - RA Flags [none], Prefix Flags [router]" msgstr "" #: src/usr/local/www/services_router_advertisements.php:109 -msgid "Unmanaged" +msgid "Unmanaged - RA Flags [none], Prefix Flags [onlink, auto, router]" msgstr "" #: src/usr/local/www/services_router_advertisements.php:110 -msgid "Managed" +msgid "" +"Managed - RA Flags [managed, other stateful], Prefix Flags " +"[onlink, router]" msgstr "" #: src/usr/local/www/services_router_advertisements.php:111 -msgid "Assisted" +msgid "" +"Assisted - RA Flags [managed, other stateful], Prefix Flags " +"[onlink, auto, router]" msgstr "" #: src/usr/local/www/services_router_advertisements.php:112 -msgid "Stateless DHCP" +msgid "" +"Stateless DHCP - RA Flags [other stateful], Prefix Flags " +"[onlink, auto, router]" msgstr "" #: src/usr/local/www/services_router_advertisements.php:114 @@ -21853,14 +21859,18 @@ msgstr "" #: src/usr/local/www/services_router_advertisements.php:296 msgid "" -"Select the Operating Mode for the Router Advertisement (RA) Daemon. Use:<br /" -"> <strong>Router Only</strong> to only advertise this router<br /> " -"<strong>Unmanaged</strong> for Router Advertising with Stateless " -"Autoconfig<br /> <strong>Managed</strong> for assignment through a " -"DHCPv6 Server<br /> <strong>Assisted</strong> for DHCPv6 Server " -"assignment combined with Stateless Autoconfig. It is not required to " -"activate this DHCPv6 server when set to \"Managed\", this can be another " -"host on the network" +"Select the Operating Mode for the Router Advertisement (RA) Daemon.<br />" +"<br /><strong>Disabled</strong> - RADVD will not be enabled on this " +"interface.<br /><strong>Router Only</strong> - Will advertise this " +"router.<br /><strong>Unmanaged</strong> - Will advertise this router with " +"stateless autoconfig.<br /><strong>Managed</strong> - Will advertise this " +"router with all configuration through a DHCPv6 server.<br /><strong>Assisted" +"</strong> - Will advertise this router with configuration through a DHCPv6 " +"server and/or stateless autoconfig.<br /><strong>Stateless DHCP</strong> - " +"Will advertise this router with stateless autoconfig and other configuration " +"information available via DHCPv6.<br /><br />It is not required to activate " +"DHCPv6 server on pfSense when set to \"Managed\", \"Assisted\" or " +"\"Stateless DHCP\", it can be another host on the network." msgstr "" #: src/usr/local/www/services_router_advertisements.php:305 diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index c805876..ba7a075 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -105,11 +105,11 @@ if (!is_array($pconfig['subnets'])) { $advertise_modes = array( "disabled" => gettext("Disabled"), - "router" => gettext("Router Only"), - "unmanaged" => gettext("Unmanaged"), - "managed" => gettext("Managed"), - "assist" => gettext("Assisted"), - "stateless_dhcp" => gettext("Stateless DHCP")); + "router" => gettext("Router Only - RA Flags [none], Prefix Flags [router]"), + "unmanaged" => gettext("Unmanaged - RA Flags [none], Prefix Flags [onlink, auto, router]"), + "managed" => gettext("Managed - RA Flags [managed, other stateful], Prefix Flags [onlink, router]"), + "assist" => gettext("Assisted - RA Flags [managed, other stateful], Prefix Flags [onlink, auto, router]"), + "stateless_dhcp" => gettext("Stateless DHCP - RA Flags [other stateful], Prefix Flags [onlink, auto, router]")); $priority_modes = array( "low" => gettext("Low"), "medium" => gettext("Normal"), @@ -293,12 +293,14 @@ $section->addInput(new Form_Select( 'Router mode', $pconfig['ramode'], $advertise_modes -))->setHelp('Select the Operating Mode for the Router Advertisement (RA) Daemon. Use:' . '<br />' . - ' <strong>Router Only</strong> to only advertise this router' . '<br />' . - ' <strong>Unmanaged</strong> for Router Advertising with Stateless Autoconfig' . '<br />' . - ' <strong>Managed</strong> for assignment through a DHCPv6 Server' . '<br />' . - ' <strong>Assisted</strong> for DHCPv6 Server assignment combined with Stateless Autoconfig. ' . - 'It is not required to activate this DHCPv6 server when set to "Managed", this can be another host on the network'); +))->setHelp('Select the Operating Mode for the Router Advertisement (RA) Daemon.' . '<br /><br />' . + '<strong>Disabled</strong> - RADVD will not be enabled on this interface.' . '<br />' . + '<strong>Router Only</strong> - Will advertise this router.' . '<br />' . + '<strong>Unmanaged</strong> - Will advertise this router with stateless autoconfig.' . '<br />' . + '<strong>Managed</strong> - Will advertise this router with all configuration through a DHCPv6 server.' . '<br />' . + '<strong>Assisted</strong> - Will advertise this router with configuration through a DHCPv6 server and/or stateless autoconfig.' . '<br />' . + '<strong>Stateless DHCP</strong> - Will advertise this router with stateless autoconfig and other configuration information available via DHCPv6.' . '<br /><br />' . + 'It is not required to activate DHCPv6 server on pfSense when set to "Managed", "Assisted" or "Stateless DHCP", it can be another host on the network.'); $section->addInput(new Form_Select( 'rapriority', |