diff options
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/share/locale/en/LC_MESSAGES/pfSense.pot | 16 | ||||
| -rwxr-xr-x | usr/local/www/firewall_aliases_edit.php | 10 |
2 files changed, 14 insertions, 12 deletions
diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index 7c01160..eaecb8a 100644 --- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -258,8 +258,12 @@ msgstr "" msgid "VLAN interfaces:" msgstr "" -#: etc/inc/config.console.inc:201 -msgid "Enter the WAN interface name or 'a' for auto-detection:" +#: etc/inc/config.console.inc:203 +msgid "Enter the WAN interface name or 'a' for auto-detection" +msgstr "" + +#: etc/inc/config.console.inc:204 +msgid "%s(%s or a): " msgstr "" #: etc/inc/config.console.inc:209 etc/inc/config.console.inc:234 @@ -268,11 +272,11 @@ msgstr "" msgid "%sInvalid interface name '%s'%s" msgstr "" -#: etc/inc/config.console.inc:216 +#: etc/inc/config.console.inc:220 #, php-format msgid "" "%sEnter the LAN interface name or 'a' for auto-detection %sNOTE: this " -"enables full Firewalling/NAT mode.%s(or nothing if finished):%s" +"enables full Firewalling/NAT mode.%s(%s a or nothing if finished):%s" msgstr "" #: etc/inc/config.console.inc:251 @@ -280,10 +284,10 @@ msgstr "" msgid "%sOptional interface %s description found: %s" msgstr "" -#: etc/inc/config.console.inc:253 +#: etc/inc/config.console.inc:258 #, php-format msgid "" -"%sEnter the Optional %s interface name or 'a' for auto-detection%s(or " +"%sEnter the Optional %s interface name or 'a' for auto-detection%s(%s a or " "nothing if finished):%s" msgstr "" diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index ded7a85..2455d65 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -146,12 +146,10 @@ if ($_POST) { $input_errors[] = gettext("The alias name must be less than 32 characters long, may not consist of only numbers, and may only contain the following characters") . " a-z, A-Z, 0-9, _."; } /* check for name conflicts */ - if (empty($a_aliases[$id])) { - foreach ($a_aliases as $alias) { - if ($alias['name'] == $_POST['name']) { - $input_errors[] = gettext("An alias with this name already exists."); - break; - } + foreach ($a_aliases as $key => $alias) { + if (($alias['name'] == $_POST['name']) && (empty($a_aliases[$id]) || ($key != $id))) { + $input_errors[] = gettext("An alias with this name already exists."); + break; } } |
