Restored merge conflicts delete assets

This commit is contained in:
Matteo Biscosi 2025-01-29 12:47:01 +01:00
parent 572ee83cbc
commit d87f8c2817
3 changed files with 20 additions and 11 deletions

View file

@ -216,11 +216,8 @@ local lang = {
["delete"] = "Delete",
["delete_alerts"] = "Delete Alerts",
["delete_all_entries"] = "Delete All",
["delete_all_inactive_hosts"] = "Are you sure to delete all Inactive Hosts? This action cannot be undone.",
["delete_all_vs_hosts"] = "Are you sure to delete all Hosts to Scan? This action cannot be undone.",
["delete_disabled_alerts"] = "Delete Alerts",
["delete_inactive_host"] = "Are you sure to delete the selected host from Inactive Hosts? This action cannot be undone.",
["delete_inactive_host_title"] = "Delete Inactive Host",
["delete_obs_point"] = "Delete Observation Point",
["delete_older"] = "Delete Older Than",
["delete_since"] = "Are you sure to remove ALL Inactive Hosts older than:",
@ -283,7 +280,7 @@ local lang = {
["fin"] = "FIN",
["engaged_alert"] = "Engaged Alert",
["enterpriseOnly"] = "This feature is only available in the ntopng Enterprise edition",
["err_del_inactive_hosts"] = "Error while deleting Inactive Hosts",
["err_del_assets"] = "Error while deleting Assets",
["error"] = "Error",
["error_no_search_results"] = "No results found. Please modify your search criteria.",
["error_not_granted"] = "Request not granted",
@ -392,12 +389,12 @@ local lang = {
["in_bytes"] = "In Bytes",
["in_usage"] = "In Usage",
["inactive"] = "Inactive",
["inactive_hosts"] = "Inactive Local Hosts",
["inactive_hosts_navbar"] = "Inactive (Local)",
["active"] = "Active",
["assets_navbar"] = "Assets",
["inactivity_period"] = "Inactive Since",
["incomingflows"] = "Active Incoming Flows",
["increase_num_flows_hosts"] = "Increase Number",
["inactive_host_details"] = {
["asset_details"] = {
["dns_server"] = "DNS Server",
["dhcp_server"] = "DHCP Server",
["smtp_server"] = "SMTP Server",
@ -411,7 +408,14 @@ local lang = {
["tls_name"] = "TLS",
["http_name"] = "HTTP",
["dns_name"] = "DNS Resolved",
["tcp_fingerprint"] = "TCP Fingerprint",
["tcp_fingerprint"] = "TCP Fingerprint",
["delete_asset"] = "Are you sure to delete the selected host from Assets? This action cannot be undone.",
["delete_asset_title"] = "Delete Assets",
["last_time_seen"] = "Last Time Seen",
["preference_disabled"] = "Assets collection is disabled by preferences. Please enable it <a href='" .. ntop.getHttpPrefix() .. "/lua/admin/prefs.lua?tab=in_memory'><i class='fas fa-cog fa-sm'></i></a>",
["delete_asset_older_title"] = "Delete Older Than",
["delete_asset_older"] = "Please select a date. All Assets not seen since the selected date are going to be removed. This action cannot be undone.",
["delete_all_assets"] = "Are you sure to delete all Assets? This action cannot be undone.",
},
["info"] = "Info",
["information"] = "Information",
@ -726,7 +730,7 @@ local lang = {
["status"] = "Status",
["stop"] = "Stop",
["subjectDN"] = "SubjectDN",
["succ_del_inactive_hosts"] = "Successfully deleted Inactive Hosts",
["succ_del_assets"] = "Successfully deleted Assets",
["success"] = "Success",
["summary"] = "Summary",
["suspicious_payload"] = "Suspicious Payload",
@ -959,6 +963,7 @@ local lang = {
["advanced_settings"] = "Advanced Settings",
["created_rule_time"] = "Creation Date",
["delete_acl_rule"] = "Delete Rule",
["check_disabled"] = "The ACL Violation checks are disabled. Please enable at least one between ACL Violation (ARP) and ACL Violation (ICMP/TCP/UDP).",
["delete_all_rules"] = "Delete All Rules",
["delete_confirmation"] = "Are you sure you want to delete the selected rule",
["delete_all_confirmation"] = "Are you sure you want to delete all the rules configured?",
@ -4253,7 +4258,7 @@ local lang = {
["host_unreachable_flows"] = "Total Host Unreachable Flows",
["hosts_anomalies"] = "Hosts Anomalies",
["http_stats"] = "HTTP Stats",
["inactive_hosts"] = "Inactive Hosts",
["assets"] = "Assets",
["influxdb_not_responding"] = "Query has been aborted as InfluxDB is not responding. Query timeout can be configured from the <a href=\"%{url}\">%{flask_icon} Preferences</a> .",
["interface_label"] = "Interface %{if_name}",
["interface_label_packets"] = "%{if_name} Packets",