Merge branch 'staging' into nightly

data/web/lang/lang.it-it.json

@@ -494,7 +494,6 @@
         "external_logs": "Log esterni",
         "history_all_servers": "Cronologia (tutti i server)",
         "in_memory_logs": "In-memory logs",
-        "jvm_memory_solr": "JVM memory usage",
         "last_modified": "Ultima modifica",
         "log_info": "<p>mailcow <b>in-memory logs</b> are collected in Redis lists and trimmed to LOG_LINES (%d) every minute to reduce hammering.\r\n  <br>In-memory logs are not meant to be persistent. All applications that log in-memory, also log to the Docker daemon and therefore to the default logging driver.\r\n  <br>The in-memory log type should be used for debugging minor issues with containers.</p>\r\n  <p><b>External logs</b> are collected via API of the given application.</p>\r\n  <p><b>Static logs</b> are mostly activity logs, that are not logged to the Dockerd but still need to be persistent (except for API logs).</p>",
         "login_time": "Orario",
@@ -503,8 +502,6 @@
         "restart_container": "Riavvio",
         "service": "Servizio",
         "size": "Dimensione",
-        "solr_dead": "Solr sta partendo, è disabilitato o morto.",
-        "solr_status": "Stato Solr",
         "started_at": "Iniziato alle",
         "started_on": "Iniziato",
         "static_logs": "Log statici",
@@ -1126,6 +1123,7 @@
         "created_on": "Creato il",
         "daily": "Giornaliero",
         "day": "giorno",
+        "description": "Descrizione",
         "delete_ays": "Please confirm the deletion process.",
         "direct_aliases": "Direct alias addresses",
         "direct_aliases_desc": "Direct alias addresses are affected by spam filter and TLS policy settings.",
@@ -1308,4 +1306,4 @@
         },
         "decimal": "."
     }
-}
+}