diff --git a/nftables/edit_manual.cgi b/nftables/edit_manual.cgi index 437f7f375..38792598d 100755 --- a/nftables/edit_manual.cgi +++ b/nftables/edit_manual.cgi @@ -9,7 +9,7 @@ our (%in, %text); ReadParse(); assert_manual_acl(); -ui_print_header(undef, $text{'manual_title'}, "", "intro", 1, 1); +ui_print_header(undef, $text{'index_edit_manual'}, "", "intro", 1, 1); my @files = unique(get_nftables_config_files()); @files || error($text{'manual_enofile'}); diff --git a/nftables/index.cgi b/nftables/index.cgi index cb5af2cae..b3cf50740 100755 --- a/nftables/index.cgi +++ b/nftables/index.cgi @@ -35,16 +35,16 @@ my $rules_html = ""; if (!@tables) { $rules_html .= ui_buttons_start(); - $rules_html .= ui_buttons_row("setup.cgi", $text{'index_setup'}, $text{'index_setupdesc'}) + $rules_html .= ui_buttons_row("setup.cgi", $text{'index_profile_setup'}, $text{'index_profile_setupdesc'}) if (check_acl('setup')); $rules_html .= ui_buttons_row("create_table.cgi", $text{'index_table_create'}, $text{'index_table_createdesc'}) if (check_acl('create')); - $rules_html .= ui_buttons_row("active.cgi", $text{'index_active'}, - $text{'index_activedesc'}) + $rules_html .= ui_buttons_row("active.cgi", $text{'index_ruleset_active'}, + $text{'index_ruleset_activedesc'}) if (check_acl('active')); - $rules_html .= ui_buttons_row("edit_manual.cgi", $text{'index_manual'}, - $text{'index_manualdesc'}) + $rules_html .= ui_buttons_row("edit_manual.cgi", $text{'index_edit_manual'}, + $text{'index_edit_manualdesc'}) if (check_manual_acl()); $rules_html .= ui_buttons_end(); } else { @@ -303,12 +303,12 @@ if (@tables && (check_acl('apply') || check_acl('active') || print ui_buttons_start(); print ui_buttons_row("restart.cgi", $text{'index_apply'}, $text{'index_applydesc'}) if (check_acl('apply')); - print ui_buttons_row("active.cgi", $text{'index_active'}, $text{'index_activedesc'}) + print ui_buttons_row("active.cgi", $text{'index_ruleset_active'}, $text{'index_ruleset_activedesc'}) if (check_acl('active')); - print ui_buttons_row("setup.cgi", $text{'index_setup'}, $text{'index_setupdesc'}) + print ui_buttons_row("setup.cgi", $text{'index_profile_setup'}, $text{'index_profile_setupdesc'}) if (check_acl('setup')); - print ui_buttons_row("edit_manual.cgi", $text{'index_manual'}, - $text{'index_manualdesc'}) + print ui_buttons_row("edit_manual.cgi", $text{'index_edit_manual'}, + $text{'index_edit_manualdesc'}) if (check_manual_acl()); print ui_buttons_end(); } diff --git a/nftables/lang/en b/nftables/lang/en index 61a60e3b8..92be1aba7 100644 --- a/nftables/lang/en +++ b/nftables/lang/en @@ -53,10 +53,10 @@ index_radd=Add Rule index_apply=Apply Configuration index_apply_changes=Apply Changes index_applydesc=Click this button to replace the saved Webmin-managed tables in the active nftables ruleset. -index_active=View Active Ruleset -index_activedesc=View active nftables tables and import copies into Webmin's saved configuration. -index_manual=Edit Config Files -index_manualdesc=Edit saved nftables configuration files manually. +index_ruleset_active=List Active Ruleset +index_ruleset_activedesc=View active nftables tables and import copies into Webmin's saved configuration. +index_edit_manual=Edit Config Files +index_edit_manualdesc=Edit saved nftables configuration files manually. index_allowip_go=Allow IP/CIDR index_blockip_go=Block IP/CIDR quick_ip_placeholder=$1 or $2 @@ -85,7 +85,6 @@ apply_err=Failed to apply configuration apply_enone=No saved nftables tables were found to apply. apply_eexternal=Cannot apply configuration because table $1 is currently marked as externally managed. apply_esettype=Set $1 in table $2 has type $3, but chain $4 uses it for $5. Use ipv4_addr or ipv6_addr sets for address fields, and inet_service sets for port fields. -setup_title=Create Ruleset Profile setup_header=Ruleset profile setup_err=Failed to create ruleset profile setup_table_name=Table name @@ -139,8 +138,8 @@ setup_invalid_type=Invalid ruleset type selected. setup_edup=Table $1 already exists in Webmin's saved nftables configuration. setup_eservice=Invalid service selected: $1 setup_failed=Failed to create ruleset profile:
$1
-index_setup=Create Ruleset Profile -index_setupdesc=Create a managed nftables table from a predefined profile. +index_profile_setup=Create Ruleset Profile +index_profile_setupdesc=Create a managed nftables table from a predefined profile. index_table_create=Create Table index_table_createdesc=Add a new nftables table. index_table_delete=Delete Table @@ -336,7 +335,6 @@ import_flags=Source flags import_external_note=This active table is marked as externally managed; importing creates a separate module-managed copy and does not change the active source table import_new_name=New table name import_ok=Import Copy -manual_title=Edit Config Files manual_editsel=Edit nftables configuration file manual_err=Failed to save config file manual_efile=Selected configuration file is not valid