Yet more spelling fixes.

Includes small updates to the script and wireshark dictionary.
Probably the last spelling fixes from me for a while.

40 files changed, 114 insertions, 79 deletions

diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c
index 685b0a526f..a6d69ae015 100644
--- a/epan/dissectors/file-elf.c
+++ b/epan/dissectors/file-elf.c
@@ -2008,7 +2008,7 @@ proto_register_elf(void)
             NULL, HFILL }
         },
         { &hf_elf_p_flags_reserved,
-            { "Reserrved Flags",                           "elf.p_flags.reserved",
+            { "Reserved Flags",                            "elf.p_flags.reserved",
             FT_BOOLEAN, 32, NULL, 0x000FFFF8,
             NULL, HFILL }
         },
@@ -2054,7 +2054,7 @@ proto_register_elf(void)
             "This member categorizes the section's contents and semantics.", HFILL }
         },
         { &hf_elf_sh_type_processor_specific,
-            { "Type: Procesor Specific",                   "elf.sh_type",
+            { "Type: Processor Specific",                  "elf.sh_type",
             FT_UINT32, BASE_HEX_DEC, NULL, 0x00,
             "This member categorizes the section's contents and semantics.", HFILL }
         },
diff --git a/epan/dissectors/packet-bmp.c b/epan/dissectors/packet-bmp.c
index 02bb282144..310448ca59 100644
--- a/epan/dissectors/packet-bmp.c
+++ b/epan/dissectors/packet-bmp.c
@@ -146,7 +146,7 @@ static const value_string down_reason_typevals[] = {
     { BMP_PEER_DOWN_REMOTE_NOTIFY,      "Remote System, Notification" },
     { BMP_PEER_DOWN_REMOTE_NO_NOTIFY,   "Remote System, No Notification" },
     { BMP_PEER_DOWN_INFO_NO_LONGER,     "Peer no longer be sent INformation (Configuration reasons)" },
-    { BMP_LOCAL_SYSTEM_CLOSED,          "Local system CLosed, TLV data Follows" },
+    { BMP_LOCAL_SYSTEM_CLOSED,          "Local system Closed, TLV data Follows" },
     { 0, NULL }
 };
 
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index c51c5dafac..854b9dd789 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -7028,7 +7028,7 @@ proto_register_bthci_cmd(void)
             NULL, HFILL }
         },
         { &hf_bthci_cmd_le_simultaneous_host,
-          { "Simultaneous LE Host", "bthci_cmd.le_simlutaneous_host",
+          { "Simultaneous LE Host", "bthci_cmd.le_simultaneous_host",
             FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x0,
             "Support for both LE and BR/EDR to same device", HFILL }
         },
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index 69a855cf31..7bba17b88c 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -8297,7 +8297,7 @@ proto_register_bthci_evt(void)
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_simultaneous_host,
-          { "Simultaneous LE Host", "bthci_evt.le_simlutaneous_host",
+          { "Simultaneous LE Host", "bthci_evt.le_simultaneous_host",
             FT_BOOLEAN, 8, NULL, 0x0,
             "Support for both LE and BR/EDR to same device", HFILL }
         },
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index 6e65ec48ca..5d46c21b4f 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -1347,7 +1347,7 @@ proto_register_cast(void)
     { &hf_cast_maxStreams,
       { "MaxStreams", "cast.maxStreams",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "32 bit unsigned integer indicating the maximum number of simultansous RTP duplex streams that the client can handle.",
+        "32 bit unsigned integer indicating the maximum number of simultaneous RTP duplex streams that the client can handle.",
         HFILL }
     },
 
diff --git a/epan/dissectors/packet-cbor.c b/epan/dissectors/packet-cbor.c
index b063721f13..dd1c541f82 100644
--- a/epan/dissectors/packet-cbor.c
+++ b/epan/dissectors/packet-cbor.c
@@ -646,7 +646,7 @@ dissect_cbor_float_simple_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cb
 			return item;
 		}
 		expert_add_info_format(pinfo, cbor_tree, &ei_cbor_invalid_minor_type,
-				"invalid minor type %i in fimple data and float", type_minor);
+				"invalid minor type %i in simple data and float", type_minor);
 		return NULL;
 	}
 }
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index 631ecc92ed..d2fed50e41 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -392,7 +392,7 @@ static const value_string table_cops_reason_subcode_close[] =
 /* PacketCable Error */
 static const value_string table_cops_packetcable_error[] =
 {
-    { 0x1,  "No gates urrently available" },
+    { 0x1,  "No gates currently available" },
     { 0x2,  "Unknown Gate ID" },
     { 0x3,  "Illegal Session Class value" },
     { 0x4,  "Subscriber exceeded gate limit" },
diff --git a/epan/dissectors/packet-dcerpc-dce122.c b/epan/dissectors/packet-dcerpc-dce122.c
index 1cfd9c478e..0e97dfb363 100644
--- a/epan/dissectors/packet-dcerpc-dce122.c
+++ b/epan/dissectors/packet-dcerpc-dce122.c
@@ -2353,7 +2353,7 @@ static const value_string dce_error_vals[] = {
     { 701247632, "dacl_From_SecAcl: error allocating extended entry array buffer" },
     { 701247633, "dacl_From_SecAcl: error incorrect ACL manager uuid in secAclP" },
     { 701247634, "dacl_To_SecAcl_ExtendedInfo: error allocating buffer for extended info for secAclEntryP" },
-    { 701247635, "dacl_To_SecAcl: unrecoginzed entry type, .d, found in daclP" },
+    { 701247635, "dacl_To_SecAcl: unrecognized entry type, .d, found in daclP" },
     { 701247636, "dacl_To_SecAcl: error allocating buffer for secAclP entries" },
     { 701247637, "dacl_InitPac: no passwd file entry found for .s" },
     { 701247638, "dacl_InitPac: no group file entry found for .s" },
diff --git a/epan/dissectors/packet-ebhscr.c b/epan/dissectors/packet-ebhscr.c
index abf10fa69b..97bb088668 100644
--- a/epan/dissectors/packet-ebhscr.c
+++ b/epan/dissectors/packet-ebhscr.c
@@ -598,7 +598,7 @@ proto_register_ebhscr(void)
 			NULL, HFILL }
 		},
 		{ &hf_can_ERRP,
-			{ "CAN Counters reached Error pasive limit", "ebhscr.can.errp",
+			{ "CAN Counters reached Error passive limit", "ebhscr.can.errp",
 			FT_UINT64, BASE_DEC | BASE_VAL64_STRING,
 			VALS64(can_ERRP_strings), 0x0000002000000000,
 			NULL, HFILL }
diff --git a/epan/dissectors/packet-ecmp.c b/epan/dissectors/packet-ecmp.c
index 6f43532862..8445726aa6 100644
--- a/epan/dissectors/packet-ecmp.c
+++ b/epan/dissectors/packet-ecmp.c
@@ -633,7 +633,7 @@ static int hf_ecmp_param_format_parameter_has_no_default = -1;
 static int hf_ecmp_param_format_number_of_decimal_places = -1;
 static int hf_ecmp_param_format_variable_maximum_and_minimum = -1;
 static int hf_ecmp_param_format_string_parameter = -1;
-static int hf_ecmp_param_format_desitination_set_up_parameter = -1;
+static int hf_ecmp_param_format_destination_set_up_parameter = -1;
 static int hf_ecmp_param_format_filtered_when_displayed = -1;
 static int hf_ecmp_param_format_pseudo_read_only = -1;
 static int hf_ecmp_param_format_display_format = -1;
@@ -1580,7 +1580,7 @@ static void get_object_info_response(packet_info* pinfo, int offset, tvbuff_t *t
 							&hf_ecmp_param_format_number_of_decimal_places,
 							&hf_ecmp_param_format_variable_maximum_and_minimum,
 							&hf_ecmp_param_format_string_parameter,
-							&hf_ecmp_param_format_desitination_set_up_parameter,
+							&hf_ecmp_param_format_destination_set_up_parameter,
 							&hf_ecmp_param_format_filtered_when_displayed,
 							&hf_ecmp_param_format_pseudo_read_only,
 							&hf_ecmp_param_format_display_format,
@@ -3394,7 +3394,7 @@ void proto_register_ecmp (void)
 	{ &hf_ecmp_param_format_number_of_decimal_places, { "DP- Number of Decimal places", "ecmp.param_format.number_of_decimal_places", FT_UINT32, BASE_DEC, NULL, 0x00000F00, NULL, HFILL }},
 	{ &hf_ecmp_param_format_variable_maximum_and_minimum, { "VM- Variable maximum and minimum", "ecmp.param_format.variable_maximum_and_minimum", FT_UINT32, BASE_DEC, NULL, 0x00001000, NULL, HFILL }},
 	{ &hf_ecmp_param_format_string_parameter, { "TE- String parameter", "ecmp.param_format.string_parameter", FT_UINT32, BASE_DEC, NULL, 0x00002000, NULL, HFILL }},
-	{ &hf_ecmp_param_format_desitination_set_up_parameter, { "DE- Desitination set-up parameter", "ecmp.param_format.desitination_set_up_parameter", FT_UINT32, BASE_DEC, NULL, 0x00004000, NULL, HFILL }},
+	{ &hf_ecmp_param_format_destination_set_up_parameter, { "DE- destination set-up parameter", "ecmp.param_format.destination_set_up_parameter", FT_UINT32, BASE_DEC, NULL, 0x00004000, NULL, HFILL }},
 	{ &hf_ecmp_param_format_filtered_when_displayed, { "FI- Filtered when displayed", "ecmp.param_format.filtered_when_displayed", FT_UINT32, BASE_DEC, NULL, 0x00008000, NULL, HFILL }},
 	{ &hf_ecmp_param_format_pseudo_read_only, { "PR- Pseudo read only", "ecmp.param_format.pseudo_read_only", FT_UINT32, BASE_DEC, NULL, 0x00010000, NULL, HFILL }},
 	{ &hf_ecmp_param_format_display_format, { "DF- Display Format", "ecmp.param_format.display_format", FT_UINT32, BASE_DEC, VALS(display_format), 0x001E0000, NULL, HFILL }},
diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c
index 781f7db9a7..5e932f063e 100644
--- a/epan/dissectors/packet-f5ethtrailer.c
+++ b/epan/dissectors/packet-f5ethtrailer.c
@@ -4040,7 +4040,7 @@ proto_register_f5ethtrailer(void)
 
     prefs_register_bool_preference(f5ethtrailer_module, "generate_keylog",
         "Generate KEYLOG records from TLS f5ethtrailer",
-        "If enabled, KEYLOG entires will be added to the TLS decode"
+        "If enabled, KEYLOG entries will be added to the TLS decode"
         " in the f5ethtrailer protocol tree.  It will populate the"
         " f5ethtrailer.tls.keylog field.",
         &pref_generate_keylog);
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index d563250a4a..0db88bc29c 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -722,7 +722,7 @@ static int hf_gsm_a_geo_loc_uncertainty_semi_minor = -1;
 static int hf_gsm_a_geo_loc_orientation_of_major_axis = -1;
 static int hf_gsm_a_geo_loc_uncertainty_altitude = -1;
 static int hf_gsm_a_geo_loc_confidence = -1;
-static int hf_gsm_a_geo_loc_horisontal_confidence = -1;
+static int hf_gsm_a_geo_loc_horizontal_confidence = -1;
 static int hf_gsm_a_geo_loc_vertical_confidence = -1;
 static int hf_gsm_a_geo_loc_high_acc_uncertainty_alt = -1;
 static int hf_gsm_a_geo_loc_no_of_points = -1;
@@ -1018,11 +1018,11 @@ dissect_geographical_description(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
         proto_item_append_text(long_item, " (%s degrees)", deg_lon_str);
 
         offset += 4;
-        /* High accuracy uncertanty semi-major*/
+        /* High accuracy uncertainty semi-major*/
         major_item = proto_tree_add_item_ret_uint(tree, hf_gsm_a_geo_loc_high_acc_uncertainty_semi_major, tvb, offset, 1, ENC_BIG_ENDIAN, &uvalue32);
         proto_item_append_text(major_item, " (%.5f m)", 0.3 * (pow(1.02, (double)uvalue32) - 1));
         offset++;
-        /* High accuracy uncertanty semi-minor*/
+        /* High accuracy uncertainty semi-minor*/
         minor_item = proto_tree_add_item_ret_uint(tree, hf_gsm_a_geo_loc_high_acc_uncertainty_semi_minor, tvb, offset, 1, ENC_BIG_ENDIAN, &uvalue32);
         proto_item_append_text(minor_item, " (%.5f m)", 0.3 * (pow(1.02, (double)uvalue32) - 1));
         offset++;
@@ -1056,11 +1056,11 @@ dissect_geographical_description(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
         proto_tree_add_item(tree, hf_gsm_a_geo_loc_high_acc_alt, tvb, offset, 3, ENC_BIG_ENDIAN);
         offset += 3;
 
-        /* High accuracy uncertanty semi-major*/
+        /* High accuracy uncertainty semi-major*/
         major_item = proto_tree_add_item_ret_uint(tree, hf_gsm_a_geo_loc_high_acc_uncertainty_semi_major, tvb, offset, 1, ENC_BIG_ENDIAN, &uvalue32);
         proto_item_append_text(major_item, " (%.5f m)", 0.3 * (pow(1.02, (double)uvalue32) - 1));
         offset++;
-        /* High accuracy uncertanty semi-minor*/
+        /* High accuracy uncertainty semi-minor*/
         minor_item = proto_tree_add_item_ret_uint(tree, hf_gsm_a_geo_loc_high_acc_uncertainty_semi_minor, tvb, offset, 1, ENC_BIG_ENDIAN, &uvalue32);
         proto_item_append_text(minor_item, " (%.5f m)", 0.3 * (pow(1.02, (double)uvalue32) - 1));
         offset++;
@@ -1068,8 +1068,8 @@ dissect_geographical_description(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
         proto_tree_add_item(tree, hf_gsm_a_geo_loc_orientation_of_major_axis, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset++;
 
-        /* Horisontal confidence */
-        proto_tree_add_item(tree, hf_gsm_a_geo_loc_horisontal_confidence, tvb, offset, 1, ENC_BIG_ENDIAN);
+        /* Horizontal confidence */
+        proto_tree_add_item(tree, hf_gsm_a_geo_loc_horizontal_confidence, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset++;
 
         /* High accuracy uncertenty altitude */
@@ -4677,8 +4677,8 @@ proto_register_gsm_a_common(void)
         FT_UINT8, BASE_DEC, NULL, 0x7f,
         NULL, HFILL }
     },
-    { &hf_gsm_a_geo_loc_horisontal_confidence,
-        { "Horisontal confidence(%)", "gsm_a.gad.horisontal_confidence",
+    { &hf_gsm_a_geo_loc_horizontal_confidence,
+        { "Horizontal confidence(%)", "gsm_a.gad.horizontal_confidence",
         FT_UINT8, BASE_DEC, NULL, 0x7f,
         NULL, HFILL }
     },
@@ -4688,7 +4688,7 @@ proto_register_gsm_a_common(void)
         NULL, HFILL }
     },
     { &hf_gsm_a_geo_loc_high_acc_uncertainty_alt,
-        { "High accuracy uncertanty altitude", "gsm_a.gad.high_acc_uncertainty_alt",
+        { "High accuracy uncertainty altitude", "gsm_a.gad.high_acc_uncertainty_alt",
         FT_UINT8, BASE_DEC, NULL, 0x0,
         NULL, HFILL }
     },
diff --git a/epan/dissectors/packet-h248_7.c b/epan/dissectors/packet-h248_7.c
index 581eb4c454..7d46fa24f8 100644
--- a/epan/dissectors/packet-h248_7.c
+++ b/epan/dissectors/packet-h248_7.c
@@ -49,7 +49,7 @@ static const value_string h248_an_prop_vals[] = {
 };
 
 static const value_string  h248_an_signals_vals[] = {
-	{ 0x0001, "Annoumcement Play Fixed (apf)"},
+	{ 0x0001, "Announcement Play Fixed (apf)"},
 	{ 0x0002, "Announcement Play Variable (apv)"},
 	{0,NULL}
 };
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index 073907b8c2..1b5b5b9440 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.c
@@ -54,7 +54,7 @@ static const value_string h248_pkg_generic_props_vals[] = {
 
 static const value_string h248_pkg_generic_cause_vals[] _U_ = {
 	{1, "General Cause (gencause)"},
-	{2, "Faiure Cause (failurecause)"},
+	{2, "Failure Cause (failurecause)"},
 	{ 0, NULL }
 };
 
diff --git a/epan/dissectors/packet-hiqnet.c b/epan/dissectors/packet-hiqnet.c
index 4f1dd0e1aa..a3449e4a18 100644
--- a/epan/dissectors/packet-hiqnet.c
+++ b/epan/dissectors/packet-hiqnet.c
@@ -131,7 +131,7 @@ static const value_string messageidnames[] = {
 #if 0
 static const value_string flagnames[] = {
     { HIQNET_REQACK_FLAG, "Request Acknowledgement" },
-    { HIQNET_ACK_FLAG, "Acknowlegement" },
+    { HIQNET_ACK_FLAG, "Acknowledgement" },
     { HIQNET_INFO_FLAG, "Information" },
     { HIQNET_ERROR_FLAG, "Error" },
     { HIQNET_GUARANTEED_FLAG, "Guaranteed" },
diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c
index f7b447cfe0..e753c64f53 100644
--- a/epan/dissectors/packet-ieee1905.c
+++ b/epan/dissectors/packet-ieee1905.c
@@ -959,7 +959,7 @@ static const value_string ieee1905_message_type_vals[] = {
   { AP_AUTOCONFIGURATION_WSC_MESSAGE,            "AP autoconfiguration Wi-Fi simple configuration (WSC)" },
   { AP_AUTOCONFIGURATION_RENEW_MESSAGE,          "AP autoconfiguration renew" },
   { IEEE1905_PUSH_BUTTON_EVENT_NOTIFICATION_MESSAGE, "1905 push button event notification" },
-  { IEEE1905_PUSH_BUTTON_JOIN_NOTIFICATION_MESSAGE,  "1905 push button join notificaton" },
+  { IEEE1905_PUSH_BUTTON_JOIN_NOTIFICATION_MESSAGE,  "1905 push button join notification" },
   { HIGHER_LAYER_QUERY_MESSAGE,                  "Higher layer query" },
   { HIGHER_LAYER_RESPONSE_MESSAGE,               "Higher layer response" },
   { INTERFACE_POWER_CHANGE_REQUEST_MESSAGE,      "Interface power change request" },
@@ -980,9 +980,9 @@ static const value_string ieee1905_message_type_vals[] = {
   { AP_METRICS_QUERY_MESSAGE,                    "AP Metrics Query" },
   { AP_METRICS_RESPONSE_MESSAGE,                 "AP Metrics Response" },
   { ASSOCIATED_STA_LINK_METRICS_QUERY_MESSAGE,   "Associated STA Link Metrics Query" },
-  { ASSOCIATED_STA_LINK_METRICS_RESPONSE_MESSAGE, "Associated STA Link Metrics Resonse" },
+  { ASSOCIATED_STA_LINK_METRICS_RESPONSE_MESSAGE, "Associated STA Link Metrics Response" },
   { UNASSOCIATED_STA_LINK_METRICS_QUERY_MESSAGE, "Unassociated STA Link Metrics Query" },
-  { UNASSOCIATED_STA_LINK_METRICS_RESPONSE_MESSAGE, "Unassociated STA Link Metrics Resonse" },
+  { UNASSOCIATED_STA_LINK_METRICS_RESPONSE_MESSAGE, "Unassociated STA Link Metrics Response" },
   { BEACON_METRICS_QUERY_MESSAGE,                "Beacon Metrics Query" },
   { BEACON_METRICS_REPONSE_METRICS,              "Beacon Metrics Response" },
   { COMBINED_INFRASTRUCTURE_METRICS_MESSAGE,     "Combined Infrastructure Metrics" },
@@ -1118,7 +1118,7 @@ static value_string_ext ieee1905_message_type_vals_ext = VALUE_STRING_EXT_INIT(i
 #define PROFILE_2_ERROR_CODE_ERROR_TLV          0xBC
 #define BSS_CONFIGURATION_RESPONSE_TLV          0xBD /* FIX */
 #define AP_RADIO_ADVANCED_CAPABILITIES_TLV      0xBE
-#define ASSOCIATION_STATUS_NOTIFICATON_TLV      0xBF
+#define ASSOCIATION_STATUS_NOTIFICATION_TLV     0xBF
 #define SOURCE_INFO_TLV                         0xC0
 #define TUNNELED_MESSAGE_TYPE_TLV               0xC1
 #define TUNNELED_TLV                            0xC2
@@ -1241,7 +1241,7 @@ static const value_string ieee1905_tlv_types_vals[] = {
   { PROFILE_2_ERROR_CODE_ERROR_TLV,          "Profile 2 Error Code" },
   { BSS_CONFIGURATION_RESPONSE_TLV,          "BSS Configuration Response" },
   { AP_RADIO_ADVANCED_CAPABILITIES_TLV,      "AP Radio Advanced Capabilities" },
-  { ASSOCIATION_STATUS_NOTIFICATON_TLV,      "Associated Status Notification" },
+  { ASSOCIATION_STATUS_NOTIFICATION_TLV,     "Associated Status Notification" },
   { SOURCE_INFO_TLV,                         "Source Info" },
   { TUNNELED_MESSAGE_TYPE_TLV,               "Tunneled Message Type" },
   { TUNNELED_TLV,                            "Tunneled" },
@@ -1526,7 +1526,7 @@ static const value_string channel_preference_reason_vals[] = {
 static const value_string ieee1905_channel_select_resp_code_vals[] = {
   { 0x00, "Accept" },
   { 0x01, "Declined because request violates current preferences" },
-  { 0x02, "Declined because request violates most recently reported preferencs" },
+  { 0x02, "Declined because request violates most recently reported preferences" },
   { 0x02, "Declined because request would prevent operation of a current backhaul link" },
   { 0, NULL }
 };
@@ -8104,7 +8104,7 @@ dissect_ieee1905_tlv_data(tvbuff_t *tvb, packet_info *pinfo _U_,
                                                         offset, tlv_len);
         break;
 
-    case ASSOCIATION_STATUS_NOTIFICATON_TLV:
+    case ASSOCIATION_STATUS_NOTIFICATION_TLV:
         offset = dissect_association_status_notification(tvb, pinfo, tree,
                                                          offset, tlv_len);
         break;
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index ab1e81597c..d6db634fa4 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -32038,7 +32038,7 @@ proto_register_ieee80211(void)
       NULL, HFILL }},
 
     {&hf_ieee80211_tag_symbol_proprietary_oui,
-     {"Symbol Propritary OUI", "wlan.tag.symbol_proprietary.oui",
+     {"Symbol Proprietary OUI", "wlan.tag.symbol_proprietary.oui",
       FT_UINT24, BASE_OUI, NULL, 0,
       NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index ed299b5b50..e7ecb75f5f 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -3159,7 +3159,7 @@ static expert_field ei_isup_message_type_no_optional_parameters = EI_INIT;
 static expert_field ei_isup_status_subfield_not_present = EI_INIT;
 static expert_field ei_isup_empty_number = EI_INIT;
 static expert_field ei_isup_too_many_digits = EI_INIT;
-static expert_field ei_isup_opt_par_lengt_err = EI_INIT;
+static expert_field ei_isup_opt_par_length_err = EI_INIT;
 
 static dissector_handle_t bicc_handle;
 
@@ -7934,7 +7934,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *
     if (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS) {
       parameter_length = tvb_get_guint8(optional_parameters_tvb, offset + PARAMETER_TYPE_LENGTH);
       if (parameter_length + PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_IND_LENGTH > (guint)(tvb_reported_length_remaining(optional_parameters_tvb, offset))) {
-        proto_tree_add_expert_format(isup_tree, pinfo, &ei_isup_opt_par_lengt_err, optional_parameters_tvb, offset, -1,
+        proto_tree_add_expert_format(isup_tree, pinfo, &ei_isup_opt_par_length_err, optional_parameters_tvb, offset, -1,
           "Wrong parameter length %u, should be %u",
           parameter_length,
           tvb_reported_length_remaining(optional_parameters_tvb, offset)- (PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_IND_LENGTH));
@@ -12092,7 +12092,7 @@ proto_register_isup(void)
     { &ei_isup_message_type_no_optional_parameters, { "isup.message_type.no_optional_parameters", PI_PROTOCOL, PI_NOTE, "No optional parameters are possible with this message type", EXPFILL }},
     { &ei_isup_empty_number, { "isup.empty_number", PI_PROTOCOL, PI_NOTE, "(empty) number", EXPFILL }},
     { &ei_isup_too_many_digits, { "isup.too_many_digits", PI_MALFORMED, PI_ERROR, "Too many digits", EXPFILL }},
-    { &ei_isup_opt_par_lengt_err, { "isup.opt_par_lengt_err", PI_MALFORMED, PI_ERROR, "Optional parameter length is wrong", EXPFILL }}
+    { &ei_isup_opt_par_length_err, { "isup.opt_par_length_err", PI_MALFORMED, PI_ERROR, "Optional parameter length is wrong", EXPFILL }}
   };
 
   static const enum_val_t isup_variants[] = {
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index e685bfd20f..630a76b13c 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -3878,7 +3878,7 @@ void proto_register_mq(void)
         { &hf_mq_id_SeqWrapVal , {"SeqWrapVal", "mq.id.seqwrap", FT_UINT32, BASE_DEC, NULL, 0x0, "ID seq wrap value", HFILL }},
         { &hf_mq_id_channel    , {"ChannelNme", "mq.id.channelname", FT_STRING, STR_UNICODE, NULL, 0x0, "ID channel name", HFILL }},
         { &hf_mq_id_icf2       , {"CapFlag2..", "mq.id.idflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability flags 2", HFILL }},
-        { &hf_mq_id_Eicf2      , {"ECapFlag2.", "mq.id.ideflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capabitlity flags 2", HFILL }},
+        { &hf_mq_id_Eicf2      , {"ECapFlag2.", "mq.id.ideflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capability flags 2", HFILL }},
         { &hf_mq_id_ccsid      , {"ccsid.....", "mq.id.ccsid", FT_INT16, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "ID Coded Character Set ID", HFILL }},
         { &hf_mq_id_qmgrname   , {"QMgrName..", "mq.id.qm", FT_STRING, STR_UNICODE, NULL, 0x0, "ID Queue Manager Name", HFILL }},
         { &hf_mq_id_HBInterval , {"HBInterval", "mq.id.hbint", FT_UINT32, BASE_DEC, NULL, 0x0, "ID Heartbeat interval", HFILL }},
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index a034308622..b9dda20dd5 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -17207,7 +17207,7 @@ proto_register_netflow(void)
         },
         /* plixer, 13745 / 112 */
         {&hf_pie_plixer_encryption,
-         {"Cncryption", "cflow.pie.plixer.encryption",
+         {"Encryption", "cflow.pie.plixer.encryption",
           FT_UINT32, BASE_DEC, NULL, 0x0,
           NULL, HFILL}
         },
diff --git a/epan/dissectors/packet-nfapi.c b/epan/dissectors/packet-nfapi.c
index c03378cfd1..57911bdb22 100644
--- a/epan/dissectors/packet-nfapi.c
+++ b/epan/dissectors/packet-nfapi.c
@@ -4704,7 +4704,7 @@ static void dissect_ul_config_ulsch_pdu_rel13_value(ptvcursor_t * ptvc, packet_i
 		expert_add_info_format(pinfo, item, &ei_invalid_range, "Invalid repetition number value [0..10239, 0xFFFF]");
 	}
 
-	// Empy symbols due to re-tunning
+	// Empty symbols due to re-tunning
 	// todo : decode as a bitmap
 	ptvcursor_add(ptvc, hf_nfapi_empty_symbols_due_to_retunning, 1, ENC_BIG_ENDIAN);
 }
@@ -9697,7 +9697,7 @@ void proto_register_nfapi(void)
 			"Indicates if PHY supports beamforming (FD-MIMO Class B). Equivalent to beamformed-r13 in TS36.306", HFILL }
 		},
 		{ &hf_nfapi_csi_rs_enhancements_supported,
-			{ "CSI-RS enhancements supported", "nfapi.pnf.phy_rel13.csi_rs_enchancements_supported",
+			{ "CSI-RS enhancements supported", "nfapi.pnf.phy_rel13.csi_rs_enhancements_supported",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
 			"Indicates if PHY supports CSI-RS enhancements (FD-MIMO Class A). Equivalent to csi-RS-EnhancementsTDD-r13 in TS36.306", HFILL }
 		},
@@ -10629,7 +10629,7 @@ void proto_register_nfapi(void)
 			"Absolute Sub-Frame of the initial transmission", HFILL }
 		},
 		{ &hf_nfapi_empty_symbols_due_to_retunning,
-			{ "Empy symbols due to re-tunning", "nfapi.empty.symbols.due.to.retunning",
+			{ "Empty symbols due to re-tunning", "nfapi.empty.symbols.due.to.retunning",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
 			"Indicates the symbols that are left empty due to eMTC retuning.", HFILL }
 		},
diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c
index cd8d83323f..5b223bce69 100644
--- a/epan/dissectors/packet-qnet6.c
+++ b/epan/dissectors/packet-qnet6.c
@@ -656,12 +656,12 @@ static const value_string qnet6_layer_vals[] = {
 };
 
 #define QNET_L4_QOS_TYPE_LOADBALANCE  0
-#define QNET_L4_QOS_TYPE_REDUDANT     1
+#define QNET_L4_QOS_TYPE_REDUNDANT    1
 #define QNET_L4_QOS_TYPE_EXCLUSIVE    2
 #define QNET_L4_QOS_TYPE_PREFERRED    3
 static const value_string qnet6_qos_type_vals[] = {
   {QNET_L4_QOS_TYPE_LOADBALANCE, "Load balance"},
-  {QNET_L4_QOS_TYPE_REDUDANT,    "Redudant"},
+  {QNET_L4_QOS_TYPE_REDUNDANT,   "Redundant"},
   {QNET_L4_QOS_TYPE_EXCLUSIVE,   "Exclusive or Sequential"},
   {QNET_L4_QOS_TYPE_PREFERRED,   "Preferred link"},
   {0, NULL}
diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c
index f4ab6b9cee..75b04b30ae 100644
--- a/epan/dissectors/packet-rtp-midi.c
+++ b/epan/dissectors/packet-rtp-midi.c
@@ -1699,8 +1699,8 @@ static const value_string rtp_midi_manu_long_values[] = {
 	{ RTP_MIDI_MANU_LONG_ZERO_88_LIGHTING_LIMITED,			"Zero 88 Lighting Limited" },
 	{ RTP_MIDI_MANU_LONG_MICON_AUDIO_ELECTRONICS_GMBH,		"Micon Audio Electronics GmbH" },
 	{ RTP_MIDI_MANU_LONG_FOREFRONT_TECHNOLOGY,			"Forefront Technology" },
-	{ RTP_MIDI_MANU_LONG_STUDIO_AUDIO_AND_VIDEO_LTD,		"Stduio Audio and Video Ltd" },
-	{ RTP_MIDI_MANU_LONG_KENTON_ELECTRONICS,			"Kenton Electroncs" },
+	{ RTP_MIDI_MANU_LONG_STUDIO_AUDIO_AND_VIDEO_LTD,		"Studio Audio and Video Ltd" },
+	{ RTP_MIDI_MANU_LONG_KENTON_ELECTRONICS,			"Kenton Electronics" },
 	{ RTP_MIDI_MANU_LONG_CELCO_DIVISON_OF_ELECTRONICS,		"Celco Division of Electrosonic" },
 	{ RTP_MIDI_MANU_LONG_ADB,					"ADB" },
 	{ RTP_MIDI_MANU_LONG_MARSHALL_PRODUCTS,				"Marshall Products" },
diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c
index f08e9c6e16..a938ab3507 100644
--- a/epan/dissectors/packet-rtpproxy.c
+++ b/epan/dissectors/packet-rtpproxy.c
@@ -202,7 +202,7 @@ static const value_string oktypenames[] = {
 
 static const string_string errortypenames[] = {
     { "E0", "Syntax error: unknown command (CMDUNKN)" },
-    { "E1", "Syntax error: wrond number of arguments (PARSE_NARGS)" },
+    { "E1", "Syntax error: wrong number of arguments (PARSE_NARGS)" },
     { "E2", "Syntax error: unknown modifiers (PARSE_MODS)" },
     { "E5", "PARSE_1" },
     { "E6", "PARSE_2" },
@@ -1132,7 +1132,7 @@ proto_register_rtpproxy(void)
         {
             &hf_rtpproxy_command_parameter_proto,
             {
-                "RTP transmsission protocol",
+                "RTP transmission protocol",
                 "rtpproxy.command_parameter_proto",
                 FT_CHAR,
                 BASE_HEX,
diff --git a/epan/dissectors/packet-s5066dts.c b/epan/dissectors/packet-s5066dts.c
index 23b61ec40e..a8f5ac4c5a 100644
--- a/epan/dissectors/packet-s5066dts.c
+++ b/epan/dissectors/packet-s5066dts.c
@@ -1207,7 +1207,7 @@ void proto_register_s5066dts (void)
                 { "Acknowledgment", "s5066dts.management.ack", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }
             },
             { &hf_s5066dts_management_management_frame_id,
-                { "Management frame ID number", "s5066dts.management.manegement_frame_id", FT_UINT8, BASE_DEC,
+                { "Management frame ID number", "s5066dts.management.management_frame_id", FT_UINT8, BASE_DEC,
                         NULL, 0x0, NULL, HFILL }
             },
             { &hf_s5066dts_management_extended_message,
diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c
index fa71f20b92..5d5cba61a9 100644
--- a/epan/dissectors/packet-sercosiii.c
+++ b/epan/dissectors/packet-sercosiii.c
@@ -507,7 +507,7 @@ static const value_string siii_mdt_idn_text[]=
   {IDN(0,0,0,0, 417), "Positioning velocity threshold in modulo mode"},
   {IDN(0,0,0,0, 418), "Target position window in modulo mode"},
   {IDN(0,0,0,0, 419), "Positioning acknowledge"},
-  {IDN(0,0,0,0, 420), "Activate parametrization level procedure command (PL)"},
+  {IDN(0,0,0,0, 420), "Activate parameterization level procedure command (PL)"},
   {IDN(0,0,0,0, 422), "Exit parameterization level procedure command"},
   {IDN(0,0,0,0, 423), "IDN-list of invalid data for parameterization level"},
   {IDN(0,0,0,0, 426), "Measuring data allocation 1"},
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index aea2d41aa0..fc63bf3aad 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -1330,10 +1330,10 @@ dissect_sflow_5_extended_80211_payload(tvbuff_t *tvb, proto_tree *tree, gint off
         offset += 3;
         proto_tree_add_item(tree, hf_sflow_5_extended_80211_suite_type, tvb, offset, 1, ENC_BIG_ENDIAN);
     } else {
-        proto_tree_add_uint_format_value(tree, hf_sflow_5_extended_80211_oui, tvb, offset, 3, OUI, "Other vender (0x%X)", OUI);
+        proto_tree_add_uint_format_value(tree, hf_sflow_5_extended_80211_oui, tvb, offset, 3, OUI, "Other vendor (0x%X)", OUI);
         offset += 3;
         proto_tree_add_uint_format_value(tree, hf_sflow_5_extended_80211_suite_type, tvb, offset, 1,
-            suite_type, "Vender specific (%u)", suite_type);
+            suite_type, "vendor specific (%u)", suite_type);
     }
     offset++;
 
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index 48c8500709..1c4fd20f5e 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -8919,7 +8919,7 @@ proto_register_skinny(void)
     { &hf_skinny_maxConferences,
       {
         "Maximum Number of Concurrent Conferences", "skinny.maxConferences", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Indicates the maximum number of simultansous Conferences, which this client/appliance can handle", HFILL }},
+        "Indicates the maximum number of simultaneous Conferences, which this client/appliance can handle", HFILL }},
     { &hf_skinny_maxFramesPerPacket,
       {
         "maxFramesPerPacket", "skinny.maxFramesPerPacket", FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -8947,7 +8947,7 @@ proto_register_skinny(void)
     { &hf_skinny_maxStreams,
       {
         "Maximum Number of Concurrent RTP Streams", "skinny.maxStreams", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Indicates the maximum number of simultansous RTP duplex streams, which this client/appliance can handle.", HFILL }},
+        "Indicates the maximum number of simultaneous RTP duplex streams, which this client/appliance can handle.", HFILL }},
     { &hf_skinny_maxStreamsPerConf,
       {
         "maxStreamsPerConf", "skinny.maxStreamsPerConf", FT_UINT32, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index bfa966fef2..9199e23f65 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -13340,7 +13340,7 @@ proto_register_smb2(void)
 
 		{ &hf_smb2_fscc_file_attr_integrity_stream,
 			{ "Integrity Stream", "smb2.file_attribute.integrity_stream", FT_BOOLEAN, 32,
-			TFS(&tfs_fscc_file_attribute_integrity_stream), SMB2_FSCC_FILE_ATTRIBUTE_INTEGRITY_STREAM, "Is this file configured with inegrity support?", HFILL } },
+			TFS(&tfs_fscc_file_attribute_integrity_stream), SMB2_FSCC_FILE_ATTRIBUTE_INTEGRITY_STREAM, "Is this file configured with integrity support?", HFILL } },
 
 		{ &hf_smb2_fscc_file_attr_no_scrub_data,
 			{ "No Scrub Data", "smb2.file_attribute.no_scrub_data", FT_BOOLEAN, 32,
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 67fa1fa35b..89a74f6d7f 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -352,7 +352,7 @@ static gint ett_sua_sequence_number_rec_number = -1;
 static gint ett_sua_sequence_number_sent_number = -1;
 static gint ett_sua_receive_sequence_number_number = -1;
 static gint ett_sua_return_on_error_bit_and_protocol_class = -1;
-static gint ett_sua_protcol_classes = -1;
+static gint ett_sua_protocol_classes = -1;
 static gint ett_sua_assoc = -1;
 
 static int sua_tap = -1;
@@ -1115,7 +1115,7 @@ dissect_asp_capabilities_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete
    };
 
   proto_tree_add_item(parameter_tree, hf_sua_asp_capabilities_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, ENC_NA);
-  proto_tree_add_bitmask(parameter_tree, parameter_tvb, PROTOCOL_CLASSES_OFFSET, hf_sua_protocol_classes, ett_sua_protcol_classes, capabilities, ENC_BIG_ENDIAN);
+  proto_tree_add_bitmask(parameter_tree, parameter_tvb, PROTOCOL_CLASSES_OFFSET, hf_sua_protocol_classes, ett_sua_protocol_classes, capabilities, ENC_BIG_ENDIAN);
   proto_tree_add_item(parameter_tree, hf_sua_asp_capabilities_interworking, parameter_tvb, INTERWORKING_OFFSET, INTERWORKING_LENGTH, ENC_BIG_ENDIAN);
 }
 
@@ -2398,7 +2398,7 @@ proto_register_sua(void)
     { &hf_sua_importance,                            { "Importance",                   "sua.importance_importance",                     FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
     { &hf_sua_message_priority_reserved,             { "Reserved",                     "sua.message_priority_reserved",                 FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
     { &hf_sua_message_priority,                      { "Message Priority",             "sua.message_priority_priority",                 FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
-    { &hf_sua_protocol_class_reserved,               { "Reserved",                     "sua.protcol_class_reserved",                    FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_sua_protocol_class_reserved,               { "Reserved",                     "sua.protocol_class_reserved",                    FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
     { &hf_sua_return_on_error_bit,                   { "Return On Error Bit",          "sua.protocol_class_return_on_error_bit",        FT_BOOLEAN, 8,         TFS(&return_on_error_bit_value),    RETURN_ON_ERROR_BIT_MASK, NULL, HFILL } },
     { &hf_sua_protocol_class,                        { "Protocol Class",               "sua.protocol_class_class",                      FT_UINT8,   BASE_DEC,  NULL,                               PROTOCOL_CLASS_MASK,      NULL, HFILL } },
     { &hf_sua_sequence_control,                      { "Sequence Control",             "sua.sequence_control_sequence_control",         FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
@@ -2428,7 +2428,7 @@ proto_register_sua(void)
     &ett_sua_sequence_number_rec_number,
     &ett_sua_sequence_number_sent_number,
     &ett_sua_receive_sequence_number_number,
-    &ett_sua_protcol_classes,
+    &ett_sua_protocol_classes,
     &ett_sua_first_remaining,
     &ett_sua_return_on_error_bit_and_protocol_class,
     &ett_sua_assoc
diff --git a/epan/dissectors/packet-sysex.c b/epan/dissectors/packet-sysex.c
index 37b2201aa8..d22ef9cd3b 100644
--- a/epan/dissectors/packet-sysex.c
+++ b/epan/dissectors/packet-sysex.c
@@ -124,7 +124,7 @@ static const value_string sysex_manufacturer_id_vals[] = {
     {0x5F, "SD Card Association"},
     /* Three special IDs specified in MIDI 1.0 Detailed Specification */
     {0x7D, "Educational/Non-Commercial Use"},
-    {0x7E, "Non-Real Time Universal System Exlusive"},
+    {0x7E, "Non-Real Time Universal System Exclusive"},
     {0x7F, "Real Time Universal System Exclusive"},
     {0,NULL}
 };
@@ -270,7 +270,7 @@ static const value_string sysex_extended_manufacturer_id_vals[] = {
     {0x000109, "Cast Lighting"},
     {0x00010A, "Microsoft"},
     {0x00010B, "Sonic Foundry"},
-    {0x00010C, "Line 6 (Fast Forward) (Yamaha)"},
+    {0x00010C, "Line 6 (Fast Forward) (Yamaha)"},
     {0x00010D, "Beatnik Inc"},
     {0x00010E, "Van Koevering Company"},
     {0x00010F, "Altech Systems"},
@@ -354,7 +354,7 @@ static const value_string sysex_extended_manufacturer_id_vals[] = {
     {0x00015D, "Sonarcana LLC / Highly Liquid"},
     {0x00015E, "Centrance"},
     {0x00015F, "Kesumo LLC"},
-    {0x000160, "Stanton (Gibson Brands)"},
+    {0x000160, "Stanton (Gibson Brands)"},
     {0x000161, "Livid Instruments"},
     {0x000162, "First Act / 745 Media"},
     {0x000163, "Pygraphics, Inc."},
@@ -424,9 +424,9 @@ static const value_string sysex_extended_manufacturer_id_vals[] = {
     {0x000223, "Red Panda LLC"},
     {0x000224, "OnSong LLC"},
     {0x000225, "Jamboxx Inc."},
-    {0x000226, "Electro-Harmonix "},
+    {0x000226, "Electro-Harmonix "},
     {0x000227, "RnD64 Inc"},
-    {0x000228, "Neunaber Technology LLC "},
+    {0x000228, "Neunaber Technology LLC "},
     {0x000229, "Kaom Inc."},
     {0x00022A, "Hallowell EMC"},
     {0x00022B, "Sound Devices, LLC"},
@@ -501,7 +501,7 @@ static const value_string sysex_extended_manufacturer_id_vals[] = {
     {0x002042, "DSP Arts"},
     {0x002043, "Phil Rees Music Tech"},
     {0x002044, "Stamer Musikanlagen GmbH"},
-    {0x002045, "Musical Muntaner S.A. dba Soundart"},
+    {0x002045, "Musical Muntaner S.A. dba Soundart"},
     {0x002046, "C-Mexx Software"},
     {0x002047, "Klavis Technologies"},
     {0x002048, "Noteheads AB"},
@@ -516,7 +516,7 @@ static const value_string sysex_extended_manufacturer_id_vals[] = {
     {0x002051, "Lion's Tracs"},
     {0x002052, "Analogue Systems"},
     {0x002053, "Focal-JMlab"},
-    {0x002054, "Ringway Electronics (Chang-Zhou) Co Ltd"},
+    {0x002054, "Ringway Electronics (Chang-Zhou) Co Ltd"},
     {0x002055, "Faith Technologies (Digiplug)"},
     {0x002056, "Showworks"},
     {0x002057, "Manikin Electronic"},
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c
index b0b1f66dd0..1e963fc603 100644
--- a/epan/dissectors/packet-usb-audio.c
+++ b/epan/dissectors/packet-usb-audio.c
@@ -559,7 +559,7 @@ static const value_string terminal_types_vals[] = {
     {0x0201, "Microphone"},
     {0x0202, "Desktop Microphone"},
     {0x0203, "Personal microphone"},
-    {0x0204, "Omni-directional icrophone"},
+    {0x0204, "Omni-directional microphone"},
     {0x0205, "Microphone array"},
     {0x0206, "Processing microphone array"},
     {0x0300, "Output Undefined"},
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
index f2403c73b5..5888ef1ce4 100644
--- a/epan/dissectors/packet-usb-hid.c
+++ b/epan/dissectors/packet-usb-hid.c
@@ -1444,7 +1444,7 @@ static const value_string usb_hid_consumer_usage_page_vals[] = {
     {0x298, "AC Rename"},
     {0x299, "AC Merge"},
     {0x29A, "AC Split"},
-    {0x29B, "AC Disribute Horizontally"},
+    {0x29B, "AC Distribute Horizontally"},
     {0x29C, "AC Distribute Vertically"},
     {0, NULL}
 };
diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c
index d265d435bf..2bcd2dfeea 100644
--- a/epan/dissectors/packet-wai.c
+++ b/epan/dissectors/packet-wai.c
@@ -545,7 +545,7 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree)
     alg_id = tvb_get_guint8(tvb, offset);
 
     if (1 == alg_id) {
-        proto_item_set_text(alg_name_item, "Algorithm Idendifier: SHA-256  (0x01)");
+        proto_item_set_text(alg_name_item, "Algorithm Identifier: SHA-256  (0x01)");
     }
 
     offset += 1;
diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c
index d9723843ff..7beb0e597d 100644
--- a/epan/dissectors/packet-wassp.c
+++ b/epan/dissectors/packet-wassp.c
@@ -1284,7 +1284,7 @@ static const value_string wassp_tlv_types[] =
 	{ EID_LOCATOR_STATE_DATA, "Location State Data"},
 	{ EID_LOCATOR_POINT_SET, "Location Point Set"},
 	{ EID_FILTER_RULE_FIXED_APP_ID, "Filter Rule Fixed Application ID"},
-	{ EID_FILTER_RULES_EXT_BLOCK, "Filter Rule Extented Block"},
+	{ EID_FILTER_RULES_EXT_BLOCK, "Filter Rule Extended Block"},
 	{ EID_MU_AREA_BLOCK, "MU Area Block"},
 	{ EID_MU_LOCATION, "MU Location"},
 	{ EID_MU_LOCATION_TS, "MU Location Time Stamp"},
@@ -1396,7 +1396,7 @@ const TLV_PARSER_ENTRY tlvMainTable[]  =
 	{ EID_RU_SCAN_TIMES, "AccessPoint Scan Times", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_RU_SCAN_DELAY, "AccessPoint Scan Delay", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_RU_SCAN_REQ_ID, "AccessPoint Scan Request ID", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ EID_STATIC_CONFIG, "Static Configuation", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ EID_STATIC_CONFIG, "Static Configuration", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_LOCAL_BRIDGING, "Local Bridging", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_STATIC_BP_IPADDR, "Static AccessPoint IP Address", TLV_TYPE_IP_ADDR, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_STATIC_BP_NETMASK, "Static AccessPoint NetMask", TLV_TYPE_IP_ADDR, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -1697,7 +1697,7 @@ const TLV_PARSER_ENTRY tlvMainTable[]  =
 	{ EID_LOCATOR_STATE_DATA, "Location State Data", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_LOCATOR_POINT_SET, "Location Point Set", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_FILTER_RULE_FIXED_APP_ID, "Filter Rule Fixed Application ID", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ EID_FILTER_RULES_EXT_BLOCK, "Filter Rule Extented Block", TLV_TYPE_BLOCK_TLV, TAB_FILTER_RULES_EXT_BLOCK, 0, 0, 0, 0, 0, 0, 0},
+	{ EID_FILTER_RULES_EXT_BLOCK, "Filter Rule Extended Block", TLV_TYPE_BLOCK_TLV, TAB_FILTER_RULES_EXT_BLOCK, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_MU_AREA_BLOCK, "MU Area Block", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_MU_LOCATION, "MU Location", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_MU_LOCATION_TS, "MU Location Time Stamp", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -2004,7 +2004,7 @@ const TLV_PARSER_ENTRY tlvGlobalConfigTable[]  =
 	{ EID_MCAST_SLP_RETRY_DELAY, "Delay Between Multicast SLP Retries", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_DISC_RETRY_COUNT, "Retry Count for Discovery", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_DISC_RETRY_DELAY, "Delay Between Discovery Retries", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ EID_LOGGING_ALARM_SEV, "Minumum Severity of Event to Report", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ EID_LOGGING_ALARM_SEV, "Minimum Severity of Event to Report", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_BLACKLIST_ADD, "Add Clients to MAC Access List", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_FAILOVER_AC_IP_ADDR, "Array of Controllers IP Addresses for Legacy Failover", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_STATIC_AC_IP_ADDR, "Array of Static Controller IP Addresses", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -2117,9 +2117,9 @@ const TLV_PARSER_ENTRY tlvGlobalConfigTable[]  =
 	{ EID_IOT_BLE_SCAN_INTERVAL, "IOT BLE Scan Interval In Milliseconds", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_IOT_BLE_SCAN_WINDOW, "IOT BLE Scan Window In Milliseconds", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_IOT_BLE_SCAN_MIN_RSSI, "IOT BLE Scan Min RSSI", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ EID_LISENSE_SERVER, "Lisense Server", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ EID_LISENSE_SERVER, "License Server", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_LISENSE_MIN_RSSI, "Lisense Min RSSI", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ EID_LISENSE_REP_FREQ, "Lisense Report Frequency", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ EID_LISENSE_REP_FREQ, "License Report Frequency", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_DPI_SIG_HASH, "Deep Packet Inspection Signature Hash", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_ANT_MODELS_IOT, "Antanna Type for IOT Radio", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_FABRICATTACH_ARRAY, "Array Of FabricAttach ID", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0},
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index 7e9c718f0e..5486ef8615 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -6519,7 +6519,7 @@ proto_register_zbee_zcl_analog_output_basic(void)
             ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } },
 
         { &hf_zbee_zcl_analog_output_basic_status_fault,
-            { "Fault Status", "zbee_zcl_general.analog_output_basic.attr.status.falut", FT_UINT8, BASE_DEC, VALS(zbee_zcl_status_values),
+            { "Fault Status", "zbee_zcl_general.analog_output_basic.attr.status.fault", FT_UINT8, BASE_DEC, VALS(zbee_zcl_status_values),
             ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } },
 
         { &hf_zbee_zcl_analog_output_basic_status_overridden,
diff --git a/tools/check_spelling.py b/tools/check_spelling.py
index 493e0ae49e..0f4eb054bc 100755
--- a/tools/check_spelling.py
+++ b/tools/check_spelling.py
@@ -163,6 +163,7 @@ class File:
             v = v.replace('%u', '')
             v = v.replace('%d', '')
             v = v.replace('%s', '')
+            v = v.replace('\\n', ' ')
 
             # Split into words.
             value_words = v.split()
diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt
index 11ac4155e3..576516527b 100644
--- a/tools/wireshark_words.txt
+++ b/tools/wireshark_words.txt
@@ -8,6 +8,7 @@ accelerometer
 accessors
 acknowledgement
 acp133
+activations
 actuator
 adwin
 aes128
@@ -39,6 +40,7 @@ attrib
 attrs
 authenticates
 authenticator
+authenticators
 authtoken
 authtype
 autoconfiguration
@@ -73,6 +75,7 @@ bthci
 btmesh
 btsdp
 btsnoop
+bugzilla
 byte
 byteorder
 cablelabs
@@ -89,6 +92,7 @@ capsa
 capwap
 carrierfreq
 carrierid
+categorizes
 cccid
 ccpch
 cctrch
@@ -362,6 +366,7 @@ ipsec
 iptrace
 ipv4addr
 isobus
+iterating
 iterator
 itunes
 iwarp
@@ -400,7 +405,9 @@ macaddr
 macaddress
 mailto
 malloc
+mappable
 mcast
+measurements
 megaco
 mellanox
 memcache
@@ -480,6 +487,7 @@ nprach
 nsapi
 nstime
 nstrace
+obfuscated
 objectid
 objkey
 obsoleted
@@ -495,6 +503,7 @@ onduration
 onoff
 ontime
 opcode
+opcodes
 openvpn
 opnum
 optimizations
@@ -575,11 +584,17 @@ reachability
 readme
 realloc
 realtime
+reassembles
 reassigning
+reassignments
+reassigns
+reassociation
 reauth
+reauthenticate
 reauthentication
 reauthorize
 rebinding
+rebooted
 recalculate
 recalculating
 recognizer
@@ -587,12 +602,16 @@ reconf
 reconfig
 reconfigure
 reconfigured
+reconfigures
 reconfrqst
+redelivered
 redelivery
+redirector
 redistributable
 redistributables
 reencyption
 reentry
+reestablishing
 reestablishment
 referer
 referrer
@@ -602,6 +621,8 @@ reinitialize
 reinitializing
 rekey
 rekeying
+relocatable
+remapping
 reoptimization
 reordercap
 reorigination
@@ -610,8 +631,10 @@ reprogrammable
 reprogramming
 requester
 requestor
+rerouted
 rerouting
 resend
+resequencing
 reservable
 reserved
 reserved0
@@ -621,6 +644,7 @@ reserved3
 reserved4
 reserved5
 resize
+resized
 resolver
 resynchronization
 retrans
@@ -631,7 +655,9 @@ retransmits
 retransmitted
 retries
 retry
+retrying
 retyping
+revalidate
 rfcomm
 rlcmac
 rnsap
@@ -646,6 +672,7 @@ scannable
 scell
 scoped
 scrollbar
+sectorized
 segno
 semiautomatic
 seqno
@@ -754,6 +781,7 @@ tooltip
 touchlink
 traceroute
 transcoder
+truncatable
 truncate
 tshark
 tspec
@@ -777,7 +805,9 @@ unadvise
 unaligned
 unassign
 unauthenticated
+unbuffered
 uncalculated
+uncategorized
 unciphered
 uncompress
 uncompressing
@@ -797,6 +827,7 @@ underrun
 undissected
 unencrypted
 unescaped
+unformatted
 unfragmented
 unhandled
 unicast
@@ -813,6 +844,7 @@ unparsable
 unparsed
 unpunctuated
 unreassembled
+unreceived
 unrecoverable
 unrecovered
 unregister
@@ -824,11 +856,13 @@ unsecure
 unsegmented
 unsequenced
 unsubscribe
+unsubscribed
 unsynchronized
 untagged
 untruncated
 untrusted
 untunelled
+untunneled
 uplink
 upload
 uploaded
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 1cc7676f2e..40a408cdc6 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -1513,7 +1513,7 @@ pcap_read_erf_pseudoheader(FILE_T fh, wtap_rec *rec,
 		}
 		if (packet_size < (guint)(phdr_len + (int)sizeof(erf_aal2_header_t))) {
 			*err = WTAP_ERR_BAD_FILE;
-			*err_info = g_strdup_printf("pcap/pcapng: ERF file has a %u-byte packet, too small to include the AAL2 headerr",
+			*err_info = g_strdup_printf("pcap/pcapng: ERF file has a %u-byte packet, too small to include the AAL2 header",
 			    packet_size);
 			return -1;
 		}
diff --git a/wsutil/privileges.c b/wsutil/privileges.c
index 7166b46c58..cdca48b249 100644
--- a/wsutil/privileges.c
+++ b/wsutil/privileges.c
@@ -203,7 +203,7 @@ running_with_special_privs(void)
 static void
 setxid_fail(const gchar *str)
 {
-	g_error("Attempt to relinguish privileges failed [%s()] - aborting: %s\n",
+	g_error("Attempt to relinquish privileges failed [%s()] - aborting: %s\n",
 		str, g_strerror(errno));
 }