diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu index cd2af7cbb..4af77c603 100644 --- a/config/menu/50-firewall.menu +++ b/config/menu/50-firewall.menu @@ -26,12 +26,6 @@ 'title' => "$Lang::tr{'ipblocklist'}", 'enabled' => 1, }; - $subfirewall->{'60.locationblock'} = { - 'caption' => $Lang::tr{'locationblock'}, - 'uri' => '/cgi-bin/location-block.cgi', - 'title' => $Lang::tr{'locationblock'}, - 'enabled' => 1, - }; $subfirewall->{'70.wireless'} = { 'caption' => $Lang::tr{'blue access'}, 'uri' => '/cgi-bin/wireless.cgi', diff --git a/config/menu/60-ipfire.menu b/config/menu/60-ipfire.menu index 76e9783bc..ca8d6d080 100644 --- a/config/menu/60-ipfire.menu +++ b/config/menu/60-ipfire.menu @@ -13,6 +13,12 @@ 'title' => "$Lang::tr{'xdpsni domain'}", 'enabled' => 1, }; + $subipfire->{'17.locationblock'} = { + 'caption' => $Lang::tr{'locationblock'}, + 'uri' => '/cgi-bin/location-block.cgi', + 'title' => $Lang::tr{'locationblock'}, + 'enabled' => 1, + }; $subipfire->{'20.loxilb'} = { 'caption' => $Lang::tr{'loxilb enable'}, 'uri' => '/cgi-bin/loxilb.cgi', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 2beeb14b8..fc5e5f6b2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1703,7 +1703,7 @@ 'localkey' => 'Localkey', 'localkeyfile' => 'Localkeyfile', 'location' => 'Location', -'locationblock' => 'Location Block', +'locationblock' => 'XDP Location Block', 'locationblock block countries' => 'Block countries/regions', 'locationblock configuration' => 'XDP Location Configuration', 'locationblock country code' => 'Country Code', diff --git a/langs/zh/cgi-bin/zh.pl b/langs/zh/cgi-bin/zh.pl index e2009dba4..347861c27 100644 --- a/langs/zh/cgi-bin/zh.pl +++ b/langs/zh/cgi-bin/zh.pl @@ -698,7 +698,7 @@ 'could not retrieve common name from certificate' => '无法从证书中检索通用名称。', 'count' => '计数', 'countries' => '国别', -'country' => '国家', +'country' => '国家/地区', 'country codes and flags' => '国家代码和国旗:', 'countrycode' => '代码', 'cpu frequency' => 'CPU frequency', @@ -1674,7 +1674,7 @@ 'localkey' => '本地密钥', 'localkeyfile' => '本地密钥文件', 'location' => '地区', -'locationblock' => '地区阻止', +'locationblock' => 'XDP加速地区阻止', 'locationblock block countries' => '阻止条目', 'locationblock configuration' => '地区配置', 'locationblock country code' => '国家代码',