Merge branch 'ui-ipset' into 1.2.0-rc-hotfix

web/inc/i18n/en.php

@@ -785,20 +785,22 @@ $LANG['en'] = array(
     'Fm' => 'Files',
     //PHP Cli
     'PHP CLI Version' => 'PHP CLI Version',
+
     //Ipset Firewall rules
-    'Adding Firewall Ipset List' => 'Adding Firewall Ipset List',
-    'Ip List Name' => 'Ip List Name',
+    'Adding Firewall Ipset List' => 'Add New IP list',
+    'Ip List Name' => 'IP List Name',
     'Data Source' => 'Data Source',
-    'Ip Version' => 'Ip Version',
-    'Autoupdate' => 'Autoupdate',
+    'Ip Version' => 'IP Version',
+    'Autoupdate' => 'Auto Update',
+    'Add IP list' => 'Add IP list',
     'BLACKLIST' => 'BLACKLIST',
     'IPVERSE' => 'IPVERSE',
-    'IPSET_CREATED_OK' => 'Ipset created',
-    'DELETE_IPSET_CONFIRMATION' => 'Are you sure you want to delete Ipset %2',
-    '1 Ipset list' => '1 Ipset list',
-    '%s Ipset lists' => '%s Ipset lists',
-    'There are currently no Ipset lists defined.' => 'There are currently no Ipset lists defined.',
-    'list ipset' => 'Ipset',
+    'IPSET_CREATED_OK' => 'IP list created successfully',
+    'DELETE_IPSET_CONFIRMATION' => 'Are you sure you want to delete IP list %2',
+    '1 Ipset list' => '1 IP list',
+    '%s Ipset lists' => '%s IP lists',
+    'There are currently no IP lists defined.' => 'There are currently no IP lists defined.',
+    'list ipset' => 'Manage IP lists',
     
     //Backup
     'File Name' => 'File Name',

web/templates/admin/list_firewall_ipset.html

@@ -2,7 +2,7 @@
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
           <a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
-          <a href="/add/firewall/ipset/" id="btn-create" class="ui-button cancel" title="<?=__('Add Ipset List')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Ipset List')?></a>
+          <a href="/add/firewall/ipset/" id="btn-create" class="ui-button cancel" title="<?=__('Add IP list')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add IP list')?></a>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>
@@ -32,10 +32,10 @@
                     <div class="clearfix l-unit__stat-col--left super-compact">
                         <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                     </div>
-                    <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Ipset Name');?></b></div>
+                    <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Ip List Name');?></b></div>
                     <div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>  
                     <div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?php print __('Autoupdate');?></b></div>
-                    <div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Ip Ver');?></b></div>
+                    <div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Ip Version');?></b></div>
                     <div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Date');?></b></div>
                     <div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Time');?></b></div>
                </div>