Merge branch 'dev' of https://github.com/ntop/ntopng into dev

scripts/locales/en.lua

@@ -1639,16 +1639,16 @@ local lang = {
     ["nf_queue_total"] = "Queued Packets",
     ["nf_queue_user_dropped"] = "Dropped Packets (Couldn't Send to Userspace)",
     ["note"] = "NOTE",
-    ["note_probe_zmq_drops_export_queue_full"] = "Remote probe has successfully processed these flows but is was unable to enqueue them for the export as the export queue was full.",
     ["note_drop_ifstats_dynamic"] = "Drops are available in the main interface",
     ["note_drops_sflow"] = "Drops are shown only for sFlow as NetFlow does not report them.<br><A HREF=https://www.ietf.org/rfc/rfc3176.txt>sFlow</A> drops count the number of times the sFlow agent detected that a packet marked to be sampled was dropped due to lack of resources. The drops counter reports the total number of drops detected since the agent was last reset. A high drop rate indicates that the management agent is unable to process samples as fast as they are being generated by hardware. Increasing the sFlow sampling rate will reduce the drop rate. Note: An agent that cannot detect drops will always report zero.",
     ["note_packets"] = "In ethernet networks, each packet has an <A HREF=\"https://en.wikipedia.org/wiki/Ethernet_frame\">overhead of 24 bytes</A> [preamble (7 bytes), start of frame (1 byte), CRC (4 bytes), and <A HREF=\"http://en.wikipedia.org/wiki/Interframe_gap\">IFG</A> (12 bytes)]. Such overhead needs to be accounted to the interface traffic, but it is not added to the traffic being exchanged between IP addresses. This is because such data contributes to interface load, but it cannot be accounted in the traffic being exchanged by hosts, and thus expect little discrepancies between host and interface traffic values.",
+    ["note_probe_zmq_drops_export_queue_full"] = "Remote probe has successfully processed these flows but is was unable to enqueue them for the export as the export queue was full.",
     ["paused"] = "Paused",
     ["probe_ip"] = "Probe IP",
     ["probe_timeout_idle"] = "Idle Timeout",
     ["probe_timeout_lifetime"] = "Lifetime Timeout",
-    ["probe_zmq_num_endpoints"] = "Active Probe ZMQ Endpoints",
     ["probe_zmq_drops_export_queue_full"] = "Queue Full Dropped Flows",
+    ["probe_zmq_num_endpoints"] = "Active Probe ZMQ Endpoints",
     ["probe_zmq_num_flow_exports"] = "Exported Flows",
     ["public_probe_ip"] = "Public Probe IP",
     ["received_traffic"] = "Received Traffic",

tools/localization/localize.sh

@@ -63,6 +63,7 @@ missing)
   if [[ -z $lang ]]; then usage; fi
   get_lang_path "$lang"
 
+  lua "$base_path/sort_localization_file.lua" "en"
   lua "$base_path/sort_localization_file.lua" "$lang"
   missing_lines=`"$base_path/missing_localization.py" missing "$root_path/scripts/locales/en.lua" "$lang_path"`
   if [[ ! -z $missing_lines ]]; then