Fix some typos and spelling (mostly in text strings)

svn path=/trunk/; revision=27085

20 files changed, 54 insertions, 54 deletions

diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c
index 1ebe60d3f2..323b925ca1 100644
--- a/plugins/artnet/packet-artnet.c
+++ b/plugins/artnet/packet-artnet.c
@@ -2276,7 +2276,7 @@ proto_register_artnet(void) {
         "Block ID", HFILL }},
 
     { &hf_artnet_firmware_master_length,
-      { "Lentgh",
+      { "Length",
         "artnet.firmware_master.length",
         FT_UINT32, BASE_DEC, NULL, 0x0,
         "Length", HFILL }},
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 9c0eb9b9ce..a44fc2f115 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -3757,7 +3757,7 @@ my_signal_handler(GtkTreeView *treeview, GtkTreePath *spath, GtkTreeViewColumn *
 	newpath = gtk_tree_path_to_string(path);
 
 	if (asn1_debug)
-		g_message("my_signal_handler: treeview=%p, moveing from %s to %s",
+		g_message("my_signal_handler: treeview=%p, moving from %s to %s",
 			  treeview, oldpath, newpath);
 
 	g_free(text);
@@ -3816,7 +3816,7 @@ menuitem_cb (gpointer             callback_data,
 		  } else
 			  newpath = g_strdup("** no path **");
 		  if (asn1_debug)
-			  g_message("menueitem_cb: treeview=%p, moveing from %s to %s",
+			  g_message("menueitem_cb: treeview=%p, moving from %s to %s",
 				    treeview, oldpath, newpath);
 		  break;
 
@@ -5006,7 +5006,7 @@ proto_register_asn1(void) {
 				 type_recursion_opts, FALSE);
   prefs_register_bool_preference(asn1_module, "debug",
 				 "ASN.1 debug mode",
-				 "Extra output useful for debuging",
+				 "Extra output useful for debugging",
 				 &asn1_debug);
 #if 0
   prefs_register_bool_preference(asn1_module, "message_win",
diff --git a/plugins/infiniband/packet-infiniband.h b/plugins/infiniband/packet-infiniband.h
index 04cbd444aa..b76425942d 100644
--- a/plugins/infiniband/packet-infiniband.h
+++ b/plugins/infiniband/packet-infiniband.h
@@ -1377,7 +1377,7 @@ static hf_register_info hf[] = {
 
 	/* Reliable Datagram Extended Transport Header (RDETH) */
 	{&hf_infiniband_RDETH,
-	{"Reliable Datagram Extentded Transport Header", "infiniband.rdeth", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}
+	{"Reliable Datagram Extended Transport Header", "infiniband.rdeth", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}
 	},
 	{&hf_infiniband_reserved8_RDETH,
 	{"Reserved (8 bits)", "infiniband.rdeth.reserved8", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index b981b0d8ba..dc5669ae05 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -2217,11 +2217,11 @@ void proto_register_irda(void)
                 FT_UINT_STRING, BASE_NONE, NULL, 0x0,
                 "", HFILL }},
         { &hf_iap_invaloctet,
-            { "Mailformed IAP result: \"", "iap.invaloctet",
+            { "Malformed IAP result: \"", "iap.invaloctet",
                 FT_NONE, BASE_NONE, NULL, 0,
                 "", HFILL }},
         { &hf_iap_invallsap,
-            { "Mailformed IAP result: \"", "iap.invallsap",
+            { "Malformed IAP result: \"", "iap.invallsap",
                 FT_NONE, BASE_NONE, NULL, 0,
                 "", HFILL }}
     };
diff --git a/plugins/lwres/packet-lwres.c b/plugins/lwres/packet-lwres.c
index 1b53be2129..e4cd212f87 100644
--- a/plugins/lwres/packet-lwres.c
+++ b/plugins/lwres/packet-lwres.c
@@ -109,7 +109,7 @@ static const value_string result_values[]  = {
 	{ LWRES_R_IOERROR,			"I/O Error" },
 	{ LWRES_R_UNEXPECTED,		"Unexpected" },
 	{ LWRES_R_TRAILINGDATA,		"Trailing data" },
-	{ LWRES_R_INCOMPLETE,		"Incompete" },
+	{ LWRES_R_INCOMPLETE,		"Incomplete" },
 	{ LWRES_R_RETRY,			"Retry" },
 	{ LWRES_R_TYPENOTFOUND,		"Type not found" },
 	{ LWRES_R_TOOLARGE,			"Too large" },
diff --git a/plugins/mate/mate_runtime.c b/plugins/mate/mate_runtime.c
index 7416ec873e..5d48bf174d 100644
--- a/plugins/mate/mate_runtime.c
+++ b/plugins/mate/mate_runtime.c
@@ -859,7 +859,7 @@ extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree) {
 			
 			cfg = g_ptr_array_index(mc->pducfglist,i);
 			
-			dbg_print (dbg_pdu,4,dbg_facility,"mate_analyze_frame: tryning to extract: %s",cfg->name);
+			dbg_print (dbg_pdu,4,dbg_facility,"mate_analyze_frame: trying to extract: %s",cfg->name);
 			protos = (GPtrArray*) g_hash_table_lookup(tree->tree_data->interesting_hfids,GINT_TO_POINTER(cfg->hfid_proto));
 			
 			if (protos)  {
diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c
index efe454e1ba..972f0304e5 100644
--- a/plugins/mate/mate_setup.c
+++ b/plugins/mate/mate_setup.c
@@ -628,8 +628,8 @@ extern mate_config* mate_make_config(const gchar* filename, int mate_hfid) {
 	if ( mate_load_config(filename,matecfg) ) {
 		analyze_config();
 	} else {
-		report_failure("MATE failed to configue!\n"
-					   "It is recommended that you fix your config and restart wireshark.\n"
+		report_failure("MATE failed to configure!\n"
+					   "It is recommended that you fix your config and restart Wireshark.\n"
 					   "The reported error is:\n%s\n",matecfg->config_error->str);
 		
 		/* if (matecfg) destroy_mate_config(matecfg,FALSE); */
diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c
index 39a0eb71d1..caec284d16 100644
--- a/plugins/mate/mate_util.c
+++ b/plugins/mate/mate_util.c
@@ -224,7 +224,7 @@ void scs_unsubscribe(SCS_collection* c, gchar* s) {
 			(*ip)--;
 		}
 	} else {
-		g_warning("unsusbcribe: not subscribed");
+		g_warning("unsubscribe: not subscribed");
 	}
 }
 
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c
index 4428128542..5863ca3db4 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/opcua/opcua_simpletypes.c
@@ -255,7 +255,7 @@ static hf_register_info hf[] =
     { &hf_opcua_variant_encodingmask, { "Variant Type", "", FT_UINT8, BASE_HEX, VALS(g_VariantTypes), 0x0, "", HFILL } },
     { &hf_opcua_SourceTimestamp, { "SourceTimestamp", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL } },
     { &hf_opcua_ServerTimestamp, { "ServerTimestamp", "", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL } },
-    { &hf_opcua_diag_symbolicid,      { "SymblicId", "",       FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL } },
+    { &hf_opcua_diag_symbolicid,      { "SymbolicId", "",       FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL } },
     { &hf_opcua_diag_namespace,       { "Namespace", "",       FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL } },
     { &hf_opcua_diag_localizedtext,   { "LocaliezdText", "",   FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL } },
     { &hf_opcua_diag_additionalinfo,  { "AdditionalInfo", "",  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } },
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 5a60c097f5..df55805356 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -1466,7 +1466,7 @@ static const value_string pn_io_control_properties_vals[] = {
     { 0, NULL }
 };
 
-static const value_string pn_io_control_properties_aplication_ready_vals[] = {
+static const value_string pn_io_control_properties_application_ready_vals[] = {
     { 0x0000, "Wait for explicit ControlCommand.ReadyForCompanion" },
     { 0x0001, "Implicit ControlCommand.ReadyForCompanion" },
     { 0, NULL }
@@ -7032,7 +7032,7 @@ proto_register_pn_io (void)
     { &hf_pn_io_control_block_properties_applready,
       { "ControlBlockProperties", "pn_io.control_block_properties.appl_ready", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
     { &hf_pn_io_control_block_properties_applready0,
-      { "AppicationReady", "pn_io.control_block_properties.appl_ready0", FT_UINT16, BASE_HEX, VALS(pn_io_control_properties_aplication_ready_vals), 0x0001, "", HFILL }},
+      { "ApplicationReady", "pn_io.control_block_properties.appl_ready0", FT_UINT16, BASE_HEX, VALS(pn_io_control_properties_application_ready_vals), 0x0001, "", HFILL }},
 
     { &hf_pn_io_error_code,
       { "ErrorCode  ", "pn_io.error_code", FT_UINT8, BASE_HEX, VALS(pn_io_error_code), 0x0, "", HFILL }},
diff --git a/plugins/sbus/packet-sbus.c b/plugins/sbus/packet-sbus.c
index 63ef37e9b7..2cd607f37d 100644
--- a/plugins/sbus/packet-sbus.c
+++ b/plugins/sbus/packet-sbus.c
@@ -411,7 +411,7 @@ static const value_string sbus_command_vals[] = {
 };
 
 static const value_string webserver_aid_vals[] = {
-       {0x01, "Partitial request"},
+       {0x01, "Partial request"},
        {0x02, "Request end"},
        {0x07, "Get Data"},
        {0x10, "Transfer OK"},
diff --git a/plugins/unistim/audio.h b/plugins/unistim/audio.h
index 60b431ec84..a1a2645146 100644
--- a/plugins/unistim/audio.h
+++ b/plugins/unistim/audio.h
@@ -176,7 +176,7 @@ static const value_string audio_switch_msgs[]={
  {0x39,"Query RTCP Bucket's SDES Information"},
  {0x3a,"Jitter Buffer Parameters Configuration"},
  {0x3b,"Resolve Port Mapping"},
- {0x3c,"Port Mpping Discovery"},
+ {0x3c,"Port Mapping Discovery"},
  {0x3d,"Query Audio Stream Status"},
  {0xff,"Reserved"},
  {0,NULL}
@@ -458,7 +458,7 @@ static const value_string stream_based_tone_vals[]={
  {0x01,"Recall Dial Tone F1=0x0B33 - 350 Hz F2=0x0E14 - 440 Hz F3=0x00 - not present F4=0x00 - not present"},
  {0x02,"Line Busy F1 = 0x0F5C - 480 Hz F2 = 0x13D7 - 620 Hz F3 = 0x00 - not present F4 = 0x00 - not present"},
  {0x03,"Reorder F1 = 0x0F5C - 480 Hz F2 = 0x13D7 - 620 Hz F3 = 0x00 - not present F4 = 0x00 - not present"},
- {0x04,"Audible Ringing F1=0x0E14 - 440 Hz F2=0x0F5C - 480 Hz F3=0x00 - not presen F4=0x00 - not present"},
+ {0x04,"Audible Ringing F1=0x0E14 - 440 Hz F2=0x0F5C - 480 Hz F3=0x00 - not present F4=0x00 - not present"},
  {0x05,"Receiver Off Hook (ROH) F1=0x2CCC-1400 Hz F2=0x4851-2260 Hz F3=0x4E66-2450 Hz F4=0x5333 - 2600 Hz"},
  {0x06,"No Tone F1=0x00-0 Hz F2=0x00-0 Hz F3=0x00-0 Hz F4=0x00-0 Hz 0x00 C1=0x00 C2=0x00 C3=0x0 c4=0x0"},
  {0x07,"No Tone F1=0x00-0 Hz F2=0x00-0 Hz F3=0x00-0 Hz F4=0x00-0 Hz 0x00 C1=0x00 C2=0x00 C3=0x0 c4=0x0"},
diff --git a/plugins/unistim/display.h b/plugins/unistim/display.h
index e8e7dd73e5..073abfecd3 100644
--- a/plugins/unistim/display.h
+++ b/plugins/unistim/display.h
@@ -169,7 +169,7 @@ static const value_string display_switch_msgs[]={
   {0x17,"Time and Date Format"},
   {0x18,"Display Data Write address|no control|no tag|no"},
   {0x19,"Display Data Write address|yes control|no tag|no"},
-  {0x1a,"Display Data Write address|no contral|yes tag|no"},
+  {0x1a,"Display Data Write address|no control|yes tag|no"},
   {0x1b,"Display Data Write address|yes control|yes tag|no"},
   {0x1c,"Display Data Write address|no control|no tag|yes"},
   {0x1d,"Display Data Write address|yes control|no tag|yes"},
diff --git a/plugins/unistim/header_field.h b/plugins/unistim/header_field.h
index 054e0823e6..5a9ecbb469 100644
--- a/plugins/unistim/header_field.h
+++ b/plugins/unistim/header_field.h
@@ -86,7 +86,7 @@ static hf_register_info hf[] = {
             BASE_HEX,VALS(broadcast_switch_msgs),0x0,NULL,HFILL}
       },
       { &hf_broadcast_phone_cmd ,
-         {"Broadcas Cmd (phone)","unistim.broadcast.phone",FT_UINT8,
+         {"Broadcast Cmd (phone)","unistim.broadcast.phone",FT_UINT8,
             BASE_HEX,VALS(broadcast_phone_msgs),0x0,NULL,HFILL}
       },
       { &hf_audio_switch_cmd ,
@@ -273,7 +273,7 @@ static hf_register_info hf[] = {
       },
       { &hf_basic_switch_query_attr,
          {"Query Basic Manager Attributes","unistim.basic.attrs",FT_BOOLEAN,
-           8,NULL,BASIC_QUERY_ATTRIBUTES,"Basic Query Atrributes",HFILL}
+           8,NULL,BASIC_QUERY_ATTRIBUTES,"Basic Query Attributes",HFILL}
       },
       { &hf_basic_switch_query_opts,
          {"Query Basic Manager Options","unistim.basic.opts",FT_BOOLEAN,
@@ -528,7 +528,7 @@ static hf_register_info hf[] = {
             BASE_HEX,NULL,0x00,NULL,HFILL}
       },
       { &hf_display_write_address_numeric,
-         {"Is Address Numberic","unistim.write.address.numeric",FT_BOOLEAN,
+         {"Is Address Numeric","unistim.write.address.numeric",FT_BOOLEAN,
             8,NULL,DISPLAY_WRITE_ADDRESS_NUMERIC_FLAG,NULL,HFILL}
       },
       { &hf_display_write_address_context,
@@ -580,7 +580,7 @@ static hf_register_info hf[] = {
             8,NULL,DISPLAY_WRITE_SHIFT_RIGHT,NULL,HFILL}
       },
       { &hf_display_write_highlight,
-         {"Highlight","unistim.display.hightlight",FT_BOOLEAN,
+         {"Highlight","unistim.display.highlight",FT_BOOLEAN,
             8,NULL,DISPLAY_WRITE_HIGHLIGHT,NULL,HFILL}
       },
       { &hf_display_write_tag,
@@ -864,7 +864,7 @@ static hf_register_info hf[] = {
             8,NULL,AUDIO_SIDETONE_DISABLE,NULL,HFILL}
       },
       { &hf_audio_destruct_additive,
-         {"Distructive/Additive","unistim.distructive.active",FT_BOOLEAN,
+         {"Destructive/Additive","unistim.destructive.active",FT_BOOLEAN,
             8,TFS(&destruct_additive),AUDIO_DESTRUCT_ADD,NULL,HFILL}
       },
       { &hf_audio_dont_force_active,
@@ -952,7 +952,7 @@ static hf_register_info hf[] = {
             BASE_DEC,NULL,DISPLAY_CURSOR_SKEY_ID,NULL,HFILL}
       },
       { &hf_display_cursor_char_pos,
-         {"Character Postition","unistim.phone.char.pos",FT_UINT8,
+         {"Character Position","unistim.phone.char.pos",FT_UINT8,
             BASE_DEC,NULL,DISPLAY_CURSOR_CHAR_POS,NULL,HFILL}
       },
       { &hf_display_cursor_line_number,
@@ -1016,7 +1016,7 @@ static hf_register_info hf[] = {
             BASE_DEC,NULL,0x00,NULL,HFILL}
       },
       { &hf_key_programmable_keys,
-         {"Number of Programable Keys","unistim.num.prog.keys",FT_UINT8,
+         {"Number of Programmable Keys","unistim.num.prog.keys",FT_UINT8,
             BASE_DEC,NULL,KEY_NUM_PROG_KEYS,NULL,HFILL}
       },
       { &hf_keys_soft_keys,
@@ -1072,7 +1072,7 @@ static hf_register_info hf[] = {
             BASE_HEX,VALS(local_dialpad_feedback),KEY_LOCAL_DIAL_PAD_FEED,NULL,HFILL}
       },
       { &hf_audio_source_descr,
-         {"Source Desription Item","unistim.source.desc.item",FT_UINT8,
+         {"Source Description Item","unistim.source.desc.item",FT_UINT8,
             BASE_HEX,VALS(source_descriptions),AUDIO_SOURCE_DESCRIPTION,NULL,HFILL}
       },
       { &hf_audio_sdes_rtcp_bucket,
diff --git a/plugins/unistim/network.h b/plugins/unistim/network.h
index b44bf45138..bbfe343038 100644
--- a/plugins/unistim/network.h
+++ b/plugins/unistim/network.h
@@ -220,7 +220,7 @@ static const value_string network_elements[]={
  {0x06,"Second Server Port Number"},
  {0x07,"First Server Action"},
  {0x08,"First Server Retry Count"},
- {0x09,"Boot Modea"},
+ {0x09,"Boot Mode"},
  {0x0b,"Second Server Action"},
  {0x0c,"Second Server Retry Count"},
  {0x0e,"8-byte User PIN"},
diff --git a/plugins/v5ua/packet-v5ua.c b/plugins/v5ua/packet-v5ua.c
index 28cd0280e0..a4f50c2472 100644
--- a/plugins/v5ua/packet-v5ua.c
+++ b/plugins/v5ua/packet-v5ua.c
@@ -240,7 +240,7 @@ static const value_string efa_values[] = {
 	{ 8177, "CC Protocol" },
 	{ 8178, "BCC Protocol" },
 	{ 8179, "PROT Protocol" },
-	{ 8180, "Link Contol Protocol" },
+	{ 8180, "Link Control Protocol" },
 	{ 8191, "VALUE RESERVED" },
 	{ 0,    NULL } };
 
@@ -347,7 +347,7 @@ dissect_draft_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete
 static const value_string error_code_values[] = {
   { MGMT_ERROR_INVALID_VERSION,                       "Invalid version" },
   { MGMT_ERROR_INVALID_IF_ID,                         "Invalid interface identifier" },
-  { MGMT_ERROR_UNSUPPORTED_MSG_CLASS,                 "Unsuported message class" },
+  { MGMT_ERROR_UNSUPPORTED_MSG_CLASS,                 "Unsupported message class" },
   { MGMT_ERROR_UNSUPPORTED_MSG_TYPE,                  "Unsupported message type" },
   { MGMT_ERROR_UNSUPPORTED_TRAFFIC_HANDLING_MODE,     "Unsupported traffic handling mode" },
   { MGMT_ERROR_UNEXPECTED_MSG,                        "Unexpected message" },
@@ -638,7 +638,7 @@ static const value_string l3_msg_type_values [] = {
 	{ SIGNAL_ACK,            "Signal Ack" },
 	{ DISCONNECT,            "Disconnect" },
 	{ DISCONNECT_COMPLETE,   "Disconnect Complete" },
-	{ STATUS_ENQUIRY,        "Status Enqueiry" },
+	{ STATUS_ENQUIRY,        "Status Enquiry" },
 	{ STATUS,                "Status" },
 	{ PROTOCOL_PARAMETER,    "Protocol Parameter" },
 	{ PORT_CONTROL,          "Port Control" },
@@ -757,7 +757,7 @@ static const value_string l3_steady_signal_values [] = {
 	{ 0x86, "Battery on a-wire" },
 	{ 0x87, "A-wire on earth" },
 	{ 0x88, "No battery on a-wire" },
-	{ 0x89, "No batery on b-wire" },
+	{ 0x89, "No battery on b-wire" },
 	{ 0x8a, "Reduced battery" },
 	{ 0x8b, "No battery" },
 	{ 0x8c, "Alternate reduced power / no power" },
@@ -810,15 +810,15 @@ static const value_string l3_reject_cause_type_values [] = {
 	{ 0x04, "Connection already present at the V5 time slot(s) to a different port or ISDN user port time slot(s)" },
 	{ 0x05, "Connection already present at the ISDN user port time slot(s) to a different V5 time slot(s)" },
 	{ 0x06, "User port unavailable (blocked)" },
-	{ 0x07, "De-allocation cannot completeddue to incompatible data content" },
-	{ 0x08, "De-allocation cannot completeddue to V5 time slot(s) data incompatibility" },
-	{ 0x09, "De-allocation cannot completeddue to port data incompatibility" },
-	{ 0x0a, "De-allocation cannot completeddue to user port time slot(s) data incompatibility" },
+	{ 0x07, "De-allocation cannot complete due to incompatible data content" },
+	{ 0x08, "De-allocation cannot complete due to V5 time slot(s) data incompatibility" },
+	{ 0x09, "De-allocation cannot complete due to port data incompatibility" },
+	{ 0x0a, "De-allocation cannot complete due to user port time slot(s) data incompatibility" },
 	{ 0x0b, "User port not provisioned" },
 	{ 0x0c, "Invalid V5 time slot(s) indication(s)" },
 	{ 0x0d, "Invalid V5 2048 kbit/s link indication" },
 	{ 0x0e, "Invalid user time slot(s) indication(s)" },
-	{ 0x0f, "V5 time slot(s) being used as physikal C-channel(s)" },
+	{ 0x0f, "V5 time slot(s) being used as physical C-channel(s)" },
 	{ 0x10, "V5 link unavailable (blocked)" },
 	{ 0,    NULL } };
 
@@ -830,7 +830,7 @@ static const value_string l3_bcc_protocol_error_cause_type_values [] = {
 	{ 0x07, "Mandatory information element missing" },
 	{ 0x08, "Unrecognized information element" },
 	{ 0x09, "Mandatory information element content error" },
-	{ 0x0a, "Optional infromation element content error" },
+	{ 0x0a, "Optional information element content error" },
 	{ 0x0b, "Message not compatible with the BCC protocol state" },
 	{ 0x0c, "Repeated mandatory information element" },
 	{ 0x0d, "Too many information element" },
@@ -843,7 +843,7 @@ static const value_string l3_connection_incomplete_reason_values [] = {
 	{ 0x02, "User port not provisioned" },
 	{ 0x03, "Invalid V5 time slot identification" },
 	{ 0x04, "Invalid V5 2048 kbit/s link identification" },
-	{ 0x05, "Time slot being used as physikal C-channel" },
+	{ 0x05, "Time slot being used as physical C-channel" },
 	{ 0,    NULL } };
 
 
@@ -937,7 +937,7 @@ static const value_string l3_info_element_values [] = {
 	{ CONTROL_FUNCTION_ID,     "Control function ID" },
 	{ VARIANT,                 "Variant" },
 	{ INTERFACE_ID,            "Interface ID" },
-	{ LINK_CONTROL_FUNCTION,   "Link control funktion" },
+	{ LINK_CONTROL_FUNCTION,   "Link control function" },
 	{ USER_PORT_ID,            "User port ID" },
 	{ ISDN_PORT_CHNL_ID,       "ISDN port channel ID" },
 	{ V5_TIME_SLOT_ID,         "V5 time slot ID" },
@@ -1466,7 +1466,7 @@ static const value_string parameter_tag_values[] = {
   { DLCI_PARAMETER_TAG,                                  "DLCI" },
   { DIAGNOSTIC_INFORMATION_PARAMETER_TAG,                "Diagnostic information" },
   { INTEGER_RANGE_INTERFACE_IDENTIFIER_PARAMETER_TAG,    "Integer range interface identifier" },
-  { HEARTBEAT_DATA_PARAMETER_TAG,                        "Hearbeat data" },
+  { HEARTBEAT_DATA_PARAMETER_TAG,                        "Heartbeat data" },
   { ASP_DOWN_REASON_PARAMETER_TAG,                       "ASP DOWN Reason" },
   { TRAFFIC_MODE_TYPE_PARAMETER_TAG,                     "Traffic mode type" },
   { ERROR_CODE_PARAMETER_TAG,                            "Error code" },
@@ -1761,7 +1761,7 @@ static const value_string msg_class_type_values[] = {
   { MSG_CLASS_MGMT_MSG  * 256 + MGMT_MSG_TYPE_TEI_STATUS_IND,              "TEI status indication" },
 
   { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_REQ,   "TEI status request" },
-  { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_CON,   "TEI status confimation" },
+  { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_CON,   "TEI status confirmation" },
   { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_IND,   "TEI status indication" },
 
   { MSG_CLASS_ASPSM_MSG * 256 + ASPSM_MSG_TYPE_UP,                         "ASP up" },
diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c
index be613ec1e6..280d781a73 100644
--- a/plugins/wimax/mac_hd_type2_decoder.c
+++ b/plugins/wimax/mac_hd_type2_decoder.c
@@ -495,7 +495,7 @@ static hf_register_info hf[] =
 	{
 		&hf_mac_header_type_2_mimo_coef_ai,
 		{
-			"Occurences of Antenna Index", "wmx.type2MimoCoefAi",
+			"Occurrences of Antenna Index", "wmx.type2MimoCoefAi",
 			FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF_AI,
 			"", HFILL
 		}
@@ -519,7 +519,7 @@ static hf_register_info hf[] =
 	{
 		&hf_mac_header_type_2_dl_chan_diuc,
 		{
-			"Prefered DIUC", "wmx.type2DlChanDiuc",
+			"Preferred DIUC", "wmx.type2DlChanDiuc",
 			FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_DIUC,
 			"", HFILL
 		}
diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/wimax/msg_clk_cmp.c
index 291ff2b92c..33c935a09e 100644
--- a/plugins/wimax/msg_clk_cmp.c
+++ b/plugins/wimax/msg_clk_cmp.c
@@ -54,7 +54,7 @@ static gint hf_clk_cmp_message_type = -1;
 static gint hf_clk_cmp_clock_count = -1;
 static gint hf_clk_cmp_clock_id = -1;
 static gint hf_clk_cmp_seq_number = -1;
-static gint hf_clk_cmp_comparision_value = -1;
+static gint hf_clk_cmp_comparison_value = -1;
 static gint hf_clk_cmp_invalid_tlv = -1;
 
 /* CLK_CMP fields display */
@@ -82,9 +82,9 @@ static hf_register_info hf_clk_cmp[] =
 		}
 	},
 	{
-		&hf_clk_cmp_comparision_value,
+		&hf_clk_cmp_comparison_value,
 		{
-			"Comparision Value", "wmx.clk_cmp.comparision_value",
+			"Comparison Value", "wmx.clk_cmp.comparison_value",
 			FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL
 		}
 	},
@@ -142,7 +142,7 @@ void dissect_mac_mgmt_msg_clk_cmp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_,
 		/* Get the tvb reported length */
 		tvb_len =  tvb_reported_length(tvb);
 		/* display MAC payload type CLK_CMP */
-		clk_cmp_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_clk_cmp_decoder, tvb, offset, tvb_len, "Clock Comparision (CLK-CMP) (%u bytes)", tvb_len);
+		clk_cmp_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_clk_cmp_decoder, tvb, offset, tvb_len, "Clock Comparison (CLK-CMP) (%u bytes)", tvb_len);
 		/* add MAC CLK_CMP subtree */
 		clk_cmp_tree = proto_item_add_subtree(clk_cmp_item, ett_mac_mgmt_msg_clk_cmp_decoder);
 		/* display the Message Type */
@@ -153,15 +153,15 @@ void dissect_mac_mgmt_msg_clk_cmp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_,
 		clock_count = tvb_get_guint8(tvb, offset);
 		/* display the clock count */
 		proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_clock_count, tvb, offset, 1, FALSE);
-		/* set the offset for clock comparision */
+		/* set the offset for clock comparison */
 		offset++;
 		for (i = 0; i < clock_count; i++ )
 		{	/* display the Clock ID */
 			proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_clock_id, tvb, offset++, 1, FALSE);
 			/* display the sequence number */
 			proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_seq_number, tvb, offset++, 1, FALSE);
-			/* display the comparision value */
-			proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_comparision_value, tvb, offset++, 1, FALSE);
+			/* display the comparison value */
+			proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_comparison_value, tvb, offset++, 1, FALSE);
 		}
 	}
 }
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c
index 30b4675064..e6905af213 100644
--- a/plugins/wimax/msg_ulmap.c
+++ b/plugins/wimax/msg_ulmap.c
@@ -1149,7 +1149,7 @@ gint AAS_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint le
     XBIT(data, 7, "UL_PermBase");
     XBIT(data, 8, "OFDMA symbol offset");
     XBIT(data, 8, "AAS zone length");
-    XBIT(data, 2, "Uplink peramble config");
+    XBIT(data, 2, "Uplink preamble config");
     XBIT(data, 1, "Preamble type");
     XBIT(data, 4, "Reserved");
     return BIT_TO_NIB(bit);
@@ -1202,7 +1202,7 @@ gint CQICH_Alloc_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gi
             XBIT(data, 2, "Zone type");
             XBIT(data, 2, "Zone PRBS_ID");
             if (zperm == 0 || zperm == 1) {
-                XBIT(mgi, 1, "Major group indicatioon");
+                XBIT(mgi, 1, "Major group indication");
                 if (mgi == 1) {
                     /* PUSC major group bitmap*/
                     XBIT(data, 6, "PUSC Major group bitmap");
diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c
index 2436e7fd5e..294eb53bf6 100644
--- a/plugins/wimax/wimax_utils.c
+++ b/plugins/wimax/wimax_utils.c
@@ -758,7 +758,7 @@ static hf_register_info hf_sfe[] =
 	},
 	{	/* 26 ARQ Block Size for Corrigendum 2 */
 		&hf_sfe_arq_min_block_size,
-		{"ARQ Minumum Block Size", "wmx.arq.min_block_size", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL}
+		{"ARQ Minimum Block Size", "wmx.arq.min_block_size", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL}
 	},
 	{	/* 26 ARQ Block Size for Corrigendum 2 */
 		&hf_sfe_arq_max_block_size,