Fix various typos and spelling errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35126 f5534014-38df-0310-8fa8-9805f1628bb7

49 files changed, 102 insertions, 102 deletions

diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index 70102146ca..30879250df 100644
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -1805,7 +1805,7 @@ const value_string ssCode_vals[] = {
   { 0x13 ,"colp - connected line identification presentation" },
   { 0x14 ,"colr - connected line identification restriction" },
   { 0x15 ,"mci - malicious call identification" },
-  { 0x18 ,"allNameIdentificationSS - all name indentification SS" },
+  { 0x18 ,"allNameIdentificationSS - all name identification SS" },
   { 0x19 ,"cnap - calling name presentation" },
   { 0x20 ,"allForwardingSS - all forwarding SS" },
   { 0x21 ,"cfu - call forwarding unconditional" },
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c
index 4313952a01..c83c5678be 100644
--- a/asn1/mpeg-pes/packet-mpeg-pes-template.c
+++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c
@@ -261,7 +261,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
 		guint8 control;
 		proto_tree *trick_tree;
 		proto_item *trick_item;
-		
+
 		trick_item = proto_tree_add_item(item,
 			hf_mpeg_pes_dsm_trick_mode, tvb,
 				offset, 1, FALSE);
@@ -274,7 +274,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
 			hf_mpeg_pes_dsm_trick_mode_control, tvb,
 			offset, 1,
 			control);
-	
+
 		if (control == FAST_FORWARD_CONTROL
 			|| control == FAST_REVERSE_CONTROL)
 		{
@@ -508,12 +508,12 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 			offset = dissect_mpeg_pes_Stream(tvb, offset, &asn1_ctx,
 					tree, hf_mpeg_pes_extension);
-			/* https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2229 
-			 * A value of 0 indicates that the PES packet length is neither specified nor 
-			 * bounded and is allowed only in PES packets whose payload is a video elementary 
-			 * stream contained in Transport Stream packets. 
-			 * XXX Some one with access to the spec should check this 
-			 */ 
+			/* https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2229
+			 * A value of 0 indicates that the PES packet length is neither specified nor
+			 * bounded and is allowed only in PES packets whose payload is a video elementary
+			 * stream contained in Transport Stream packets.
+			 * XXX Some one with access to the spec should check this
+			 */
 			 if(length !=0 && stream != STREAM_VIDEO){
 				 length -= 5 * 8;
 			 }
@@ -525,14 +525,14 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 						header_length, header_length);
 				dissect_mpeg_pes_header_data(header_data, pinfo, tree, flags);
 				offset += header_length * 8;
-				 /* lenght may be zero for Video stream */
+				 /* length may be zero for Video stream */
 				if(length !=0 && stream != STREAM_VIDEO){
 					length -= header_length * 8;
 				}
 			}
 
-			/* lenght may be zero for Video stream */ 
-			if(length==0){ 
+			/* length may be zero for Video stream */
+			if(length==0){
 				proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, (offset>>3),-1, FALSE);
 				return TRUE;
 			}
diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c
index ba6f9de5fc..b5ff7f74ce 100644
--- a/asn1/sabp/packet-sabp-template.c
+++ b/asn1/sabp/packet-sabp-template.c
@@ -125,9 +125,9 @@ get_sabp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
 	/* Get the length of the sabp packet. offset in bits  */
 	offset = dissect_per_length_determinant(tvb, bit_offset, &asn1_ctx, NULL, -1, &type_length);
 
-	/* 
+	/*
 	 * Return the length of the PDU
-	 * which is 3 + the length of the length, we only care about lenght up to 16K
+	 * which is 3 + the length of the length, we only care about length up to 16K
 	 * ("n" less than 128) a single octet containing "n" with bit 8 set to zero;
 	 * ("n" less than 16K) two octets containing "n" with bit 8 of the first octet set to 1 and bit 7 set to zero;
 	 */
@@ -150,7 +150,7 @@ dissect_sabp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	/* create the sbap protocol tree */
 	sabp_item = proto_tree_add_item(tree, proto_sabp, tvb, 0, -1, FALSE);
 	sabp_tree = proto_item_add_subtree(sabp_item, ett_sabp);
-	
+
 	dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree);
 }
 
@@ -191,7 +191,7 @@ void proto_register_sabp(void) {
   /* Register fields and subtrees */
   proto_register_field_array(proto_sabp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
- 
+
   /* Register dissector */
   register_dissector("sabp", dissect_sabp, proto_sabp);
   register_dissector("sabp.tcp", dissect_sabp_tcp, proto_sabp);
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 4189b04a19..063aad6038 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1553,7 +1553,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		 * This is TCP, and we should, and can, do reassembly.
 		 *
 		 * Is the "Sequence Of" header split across segment
-		 * boundaries?  We requre at least 6 bytes for the
+		 * boundaries?  We require at least 6 bytes for the
 		 * header, which allows for a 4-byte length (ASN.1
 		 * BER).
 		 */
diff --git a/editcap.c b/editcap.c
index 7e0cb51564..0c54146401 100644
--- a/editcap.c
+++ b/editcap.c
@@ -913,7 +913,7 @@ main(int argc, char *argv[])
       dup_detect_by_time = FALSE;
       dup_window = strtol(optarg, &p, 10);
       if (p == optarg || *p != '\0') {
-        fprintf(stderr, "editcap: \"%s\" isn't a valid dupicate window value\n",
+        fprintf(stderr, "editcap: \"%s\" isn't a valid duplicate window value\n",
             optarg);
         exit(1);
       }
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index 64b848c1b2..3ff8c6b6f2 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -2544,9 +2544,9 @@ static hf_register_info hf [] =
   { &hf_r3_nvramchecksumvalue_fixup, { "Fixup", "r3.nvramchecksum.fixup", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
   { &hf_r3_capabilities,        { "Capability", "r3.capabilities",      FT_NONE,   BASE_NONE,    NULL, 0x0, NULL, HFILL }},
-  { &hf_r3_capabilities_length, { "Length",     "r3.capabilies.length", FT_UINT8,  BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
-  { &hf_r3_capabilities_type,   { "Type",       "r3.capabilies.type",   FT_UINT8,  BASE_HEX_DEC|BASE_EXT_STRING, &r3_capabilitiesnames_ext, 0x0, NULL, HFILL }},
-  { &hf_r3_capabilities_value,  { "Value",      "r3.capabilies.value",  FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
+  { &hf_r3_capabilities_length, { "Length",     "r3.capabilities.length", FT_UINT8,  BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
+  { &hf_r3_capabilities_type,   { "Type",       "r3.capabilities.type",   FT_UINT8,  BASE_HEX_DEC|BASE_EXT_STRING, &r3_capabilitiesnames_ext, 0x0, NULL, HFILL }},
+  { &hf_r3_capabilities_value,  { "Value",      "r3.capabilities.value",  FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
 
   { &hf_r3_lockstate_passage,            { "Passage",              "r3.lockstate.passage",            FT_BOOLEAN, 24, NULL, 0x00000001, NULL, HFILL }},
   { &hf_r3_lockstate_panic,              { "Panic",                "r3.lockstate.panic",              FT_BOOLEAN, 24, NULL, 0x00000002, NULL, HFILL }},
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c
index 1bac4f284a..e5653bcf1f 100644
--- a/epan/dissectors/packet-daap.c
+++ b/epan/dissectors/packet-daap.c
@@ -269,13 +269,13 @@ static const value_string vals_tag_code[] = {
    { daap_assa, "sort artist" },
    { daap_assc, "sort composer" },
    { daap_assn, "sort name" },
-   { daap_assp, "song stop time (miliseconds)" },
+   { daap_assp, "song stop time (milliseconds)" },
    { daap_assr, "song sample rate" },
    { daap_asss, "sort seriesname" },
-   { daap_asst, "song start time (miliseconds)" },
+   { daap_asst, "song start time (milliseconds)" },
    { daap_assz, "song size" },
    { daap_astc, "song track count" },
-   { daap_astm, "song time (miliseconds)" },
+   { daap_astm, "song time (milliseconds)" },
    { daap_astn, "song track number" },
    { daap_asul, "song data url" },
    { daap_asur, "song user rating" },
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index f3c2baab5f..4bc2a69406 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -5400,7 +5400,7 @@ static const true_false_string get_dcname_request_flags_is_flat_name = {
 };
 static const true_false_string get_dcname_request_flags_is_dns_name = {
     "the name we specify is a DNS name",
-    "ther name we specify is NOT a dns name"
+    "the name we specify is NOT a dns name"
 };
 static const true_false_string get_dcname_request_flags_return_dns_name = {
     "return a DNS name",
@@ -8877,7 +8877,7 @@ proto_register_dcerpc_netlogon(void)
           { "RC4 encryption", "ntlmssp.neg_flags.na4", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_4, "RC4", HFILL }},
 
         { &hf_netlogon_neg_flags_2,
-          { "NT3.5 BDC continious update", "ntlmssp.neg_flags.na2", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2, "NT3.5", HFILL }},
+          { "NT3.5 BDC continuous update", "ntlmssp.neg_flags.na2", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2, "NT3.5", HFILL }},
 
         { &hf_netlogon_neg_flags_1,
           { "Account lockout", "ntlmssp.neg_flags.na1", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1, NULL, HFILL }},
@@ -8988,7 +8988,7 @@ proto_register_dcerpc_netlogon(void)
         { &hf_netlogon_get_dcname_request_flags_ip_required,
           { "IP Required", "netlogon.get_dcname.request.flags.ip_required",
             FT_BOOLEAN, 32, TFS(&get_dcname_request_flags_ip_required), DS_IP_REQUIRED,
-            "If we requre the IP of the DC in the reply", HFILL }},
+            "If we require the IP of the DC in the reply", HFILL }},
 
         { &hf_netlogon_get_dcname_request_flags_kdc_required,
           { "KDC Required", "netlogon.get_dcname.request.flags.kdc_required",
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index a1a05660c0..6e9982558e 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -1933,7 +1933,7 @@ find_pointer_index(guint32 id)
  *   this is text is what text we should put in any created tree node.
  *
  *   hf_index is what hf value we want to pass to the callback function when
- *   it is called, the callback can later pich this one up from di->hf_index.
+ *   it is called, the callback can later pick this one up from di->hf_index.
  *
  *   callback is executed after the pointer has been dereferenced.
  *
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 4646c9a784..91540a89ab 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -439,7 +439,7 @@ typedef struct dcm_state_pdv {
 
     /* Used and filled for Export Object only */
     gpointer data;		/* Copy of PDV data without any PDU/PDV header */
-    guint32  data_len;		/* Length of this PDV buffer. If >0, memory has been alocated */
+    guint32  data_len;		/* Length of this PDV buffer. If >0, memory has been allocated */
 
     gchar   *sop_class_uid;	/* SOP Class UID.    Set in 1st PDV of a DICOM object. se_alloc() */
     gchar   *sop_instance_uid;	/* SOP Instance UID. Set in 1st PDV of a DICOM object. se_alloc() */
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index c3a0c8a6aa..84abe3de4d 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -779,7 +779,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, tvbuff_t *tvb, int voff, int
     int sub_off; /** The offset for the sub-option */
     proto_item *ti;
     int i;
-    int field_len; /* holds the lenght of one occurrence of a field */
+    int field_len; /* holds the length of one occurrence of a field */
     int field_value;
     proto_tree *subtree;
     struct e_in6_addr in6;
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index fb37494e76..f53b04234a 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -18271,7 +18271,7 @@ const value_string ssCode_vals[] = {
   { 0x13 ,"colp - connected line identification presentation" },
   { 0x14 ,"colr - connected line identification restriction" },
   { 0x15 ,"mci - malicious call identification" },
-  { 0x18 ,"allNameIdentificationSS - all name indentification SS" },
+  { 0x18 ,"allNameIdentificationSS - all name identification SS" },
   { 0x19 ,"cnap - calling name presentation" },
   { 0x20 ,"allForwardingSS - all forwarding SS" },
   { 0x21 ,"cfu - call forwarding unconditional" },
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index a17a37c486..22c16b1b08 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -96,7 +96,7 @@ static const value_string h248_3GUP_delerrsdu_vals[] = {
 
 static const value_string h248_3GUP_interface_vals[] = {
 	{   0x0001, "RAN (Iu interface)" },
-	{   0x0002, "CN (Nb interfac)" },
+	{   0x0002, "CN (Nb interface)" },
 	{0,     NULL}
 };
 
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index c988018f4f..eb946cd1c8 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -646,7 +646,7 @@ dissect_h264_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint
 
 }
 
-/* This funktion is adapted to parsing NAL units from SDP data where the
+/* This function is adapted to parsing NAL units from SDP data where the
  * base64 coding may add extra padding
  */
 
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
index 5e6809dc58..7947d61048 100644
--- a/epan/dissectors/packet-hsrp.c
+++ b/epan/dissectors/packet-hsrp.c
@@ -741,7 +741,7 @@ void proto_register_hsrp(void)
                 { &hf_hsrp2_identifier,
                   { "Identifier", "hsrp2.identifier",
                     FT_ETHER, BASE_NONE, NULL, 0x0,
-                    "BIA value of a sender interafce", HFILL }},
+                    "BIA value of a sender interface", HFILL }},
 
                 { &hf_hsrp2_hellotime,
                   { "Hellotime", "hsrp2.hellotime",
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 1c41bfd3bb..b05d44143c 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -2295,7 +2295,7 @@ proto_register_iax2 (void)
 
     {&hf_iax2_absts,
      {"Absolute Time", "iax2.abstime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
-      "The absoulte time of this packet (calculated by adding the IAX timestamp to  the start time of this call)",
+      "The absolute time of this packet (calculated by adding the IAX timestamp to  the start time of this call)",
       HFILL}},
 
     {&hf_iax2_lateness,
diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c
index 0b0bfb5bf7..301c825a78 100644
--- a/epan/dissectors/packet-ipmi-picmg.c
+++ b/epan/dissectors/packet-ipmi-picmg.c
@@ -515,7 +515,7 @@ static const value_string vals_35_override[] = {
 static const value_string vals_36_result[] = {
 	{ 0x55, "No error. All Self Tests Passed" },
 	{ 0x56, "Reserved, cannot be used" },
-	{ 0x57, "Corrupted or inaccesible data or devices" },
+	{ 0x57, "Corrupted or inaccessible data or devices" },
 	{ 0x58, "Fatal hardware error" },
 	{ 0x60, "Component failure" },
 	{ 0xff, "Reserved" },
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index aa45e59557..b8c73c1576 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -1902,7 +1902,7 @@ void proto_register_isns(void)
 	{ &hf_isns_node_next_index,
 	  { "Node Next Index","isns.node.next_index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Node INext ndex", HFILL }},
+	    "Node INext index", HFILL }},
 
 	{ &hf_isns_portal_index,
 	  { "Portal Index","isns.portal.index",
diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c
index cb72ea949e..b6ef4f5217 100644
--- a/epan/dissectors/packet-m2ua.c
+++ b/epan/dissectors/packet-m2ua.c
@@ -859,7 +859,7 @@ static const value_string parameter_tag_values[] = {
   { LINK_KEY_PARAMETER_TAG,                        "Link key" },
   { LOCAL_LK_IDENTIFIER_PARAMETER_TAG,             "Local LK identifier" },
   { SDT_IDENTIFIER_PARAMETER_TAG,                  "SDT identifier" },
-  { SDL_IDENTIFIER_PARAMETER_TAG,                  "SDL identifer" },
+  { SDL_IDENTIFIER_PARAMETER_TAG,                  "SDL identifier" },
   { REG_RESULT_PARAMETER_TAG,                      "Registration result" },
   { REG_STATUS_PARAMETER_TAG,                      "Registration status" },
   { DEREG_RESULT_PARAMETER_TAG,                    "Deregistration result" },
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c
index 0e2895b619..dd8153b86f 100644
--- a/epan/dissectors/packet-mpeg-pes.c
+++ b/epan/dissectors/packet-mpeg-pes.c
@@ -702,7 +702,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
 		guint8 control;
 		proto_tree *trick_tree;
 		proto_item *trick_item;
-		
+
 		trick_item = proto_tree_add_item(item,
 			hf_mpeg_pes_dsm_trick_mode, tvb,
 				offset, 1, FALSE);
@@ -715,7 +715,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
 			hf_mpeg_pes_dsm_trick_mode_control, tvb,
 			offset, 1,
 			control);
-	
+
 		if (control == FAST_FORWARD_CONTROL
 			|| control == FAST_REVERSE_CONTROL)
 		{
@@ -949,12 +949,12 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 			offset = dissect_mpeg_pes_Stream(tvb, offset, &asn1_ctx,
 					tree, hf_mpeg_pes_extension);
-			/* https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2229 
-			 * A value of 0 indicates that the PES packet length is neither specified nor 
-			 * bounded and is allowed only in PES packets whose payload is a video elementary 
-			 * stream contained in Transport Stream packets. 
-			 * XXX Some one with access to the spec should check this 
-			 */ 
+			/* https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2229
+			 * A value of 0 indicates that the PES packet length is neither specified nor
+			 * bounded and is allowed only in PES packets whose payload is a video elementary
+			 * stream contained in Transport Stream packets.
+			 * XXX Some one with access to the spec should check this
+			 */
 			 if(length !=0 && stream != STREAM_VIDEO){
 				 length -= 5 * 8;
 			 }
@@ -966,14 +966,14 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 						header_length, header_length);
 				dissect_mpeg_pes_header_data(header_data, pinfo, tree, flags);
 				offset += header_length * 8;
-				 /* lenght may be zero for Video stream */
+				 /* length may be zero for Video stream */
 				if(length !=0 && stream != STREAM_VIDEO){
 					length -= header_length * 8;
 				}
 			}
 
-			/* lenght may be zero for Video stream */ 
-			if(length==0){ 
+			/* length may be zero for Video stream */
+			if(length==0){
 				proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, (offset>>3),-1, FALSE);
 				return TRUE;
 			}
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 641adede38..462f074734 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -356,7 +356,7 @@ dissect_mtp2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea
 static void
 dissect_mtp2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  /* If the link extention indicate the FCS presence, then the Checkbits
+  /* If the link extension indicates the FCS presence, then the Checkbits
    * have to be proceeded in the MTP2 dissector */
   if ( pinfo->fd->lnk_t == WTAP_ENCAP_ERF ) {
     dissect_mtp2_common(tvb, pinfo, tree, TRUE);
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 39a67f22bd..660a13afc9 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -177,7 +177,7 @@ static const value_string mysql_opcode_vals[] = {
 };
 
 
-/* charset: pre-4.1 used ther term 'charset', later changed to 'collation' */
+/* charset: pre-4.1 used the term 'charset', later changed to 'collation' */
 static const value_string mysql_charset_vals[] = {
 	{1,  "big5"},
 	{2,  "czech"},
@@ -1074,7 +1074,7 @@ void proto_register_mysql(void)
 		{ &hf_mysql_row_length,
 		{ "length", "mysql.row.length",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Field: row packet text tength", HFILL }},
+		"Field: row packet text length", HFILL }},
 
 		{ &hf_mysql_row_text,
 		{ "text", "mysql.row.text",
diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c
index 8aa2c830d0..2f8cfc39f2 100644
--- a/epan/dissectors/packet-omron-fins.c
+++ b/epan/dissectors/packet-omron-fins.c
@@ -726,7 +726,7 @@ static const value_string response_codes[] = {
     { 0x2509, "SYSMAC BUS/2 error" },
     { 0x250A, "Special I/O Unit error" },
     { 0x250D, "Duplication in SYSMAC BUS word allocation" },
-    { 0x250F, "A memmory error has occurred" },
+    { 0x250F, "A memory error has occurred" },
     { 0x2510, "Terminator not connected in SYSMAC BUS system" },
     { 0x2601, "The specified area is not protected" },
     { 0x2602, "An incorrect password has been specified" },
@@ -3510,7 +3510,7 @@ proto_register_omron_fins(void)
         { &hf_omron_non_fatal_rv3,
         { "Reserved", "omron.non_fatal.rv3", FT_UINT16, BASE_DEC, NULL, 0x0080, NULL, HFILL }},
         { &hf_omron_non_fatal_io_verification_error,
-        { "I/O verfication error", "omron.non_fatal.io_verification_error", FT_UINT16, BASE_DEC, NULL, 0x0040, NULL, HFILL }},
+        { "I/O verification error", "omron.non_fatal.io_verification_error", FT_UINT16, BASE_DEC, NULL, 0x0040, NULL, HFILL }},
         { &hf_omron_non_fatal_rv4,
         { "Reserved", "omron.non_fatal.rv4", FT_UINT16, BASE_DEC, NULL, 0x0020, NULL, HFILL }},
         { &hf_omron_non_fatal_sfc_error,
diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c
index c5209a8122..36f9219171 100644
--- a/epan/dissectors/packet-pnrp.c
+++ b/epan/dissectors/packet-pnrp.c
@@ -1094,7 +1094,7 @@ void proto_register_pnrp(void)
 			{ "Header FieldID", "pnrp.header.fieldID", FT_UINT16, BASE_HEX, VALS(fieldID), 0x0,
 				NULL, HFILL }},
 		{ &hf_pnrp_header_length,
-			{ "Header length", "pnrp.header.lenght", FT_UINT16, BASE_DEC, NULL, 0x0,
+			{ "Header length", "pnrp.header.length", FT_UINT16, BASE_DEC, NULL, 0x0,
 				NULL, HFILL }},
 		{ &hf_pnrp_header_ident,
 			{ "Ident", "pnrp.ident", FT_UINT8, BASE_HEX, NULL, 0x0,
@@ -1207,7 +1207,7 @@ void proto_register_pnrp(void)
 			{ "Encoded CPA structure", "pnrp.encodedCPA", FT_NONE, BASE_NONE, NULL, 0x0,
 				NULL, HFILL }},
 		{ &hf_pnrp_encodedCPA_length,
-			{ "Length", "pnrp.encodedCPA.lenght", FT_UINT16, BASE_DEC, NULL, 0x0,
+			{ "Length", "pnrp.encodedCPA.length", FT_UINT16, BASE_DEC, NULL, 0x0,
 				NULL, HFILL }},
 		{ &hf_pnrp_encodedCPA_majorVersion,
 			{ "CPA Major Version", "pnrp.encodedCPA.vMajor", FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c
index 8aac3b9c3b..ec0b6333a8 100644
--- a/epan/dissectors/packet-ppi-antenna.c
+++ b/epan/dissectors/packet-ppi-antenna.c
@@ -50,7 +50,7 @@ enum ppi_antenna_type {
     PPI_ANTENNA_SERIALNUM   = 26,
     PPI_ANTENNA_MODELSTR    = 27, /*32 bytes, fixed length, null terminated model of antenna */
     PPI_ANTENNA_DESCSTR     = 28, /*32 bytes, fixed length, null terminated description of what the antenna is for */
-    PPI_ANTENNA_APPID       = 29, /*4-byte identifer*/
+    PPI_ANTENNA_APPID       = 29, /*4-byte identifier*/
     PPI_ANTENNA_APPDATA     = 30, /* 60-byte app-id specific data*/
     PPI_ANTENNA_EXT         = 31  /* Indicates n extended bitmap follows */
 };
@@ -231,12 +231,12 @@ proto_register_ppi_antenna(void) {
         { &hf_ppi_antennaflags_circpol_l,
           { "circularly polarized left", "ppi_antenna.antennaflags.circpol_l",
             FT_BOOLEAN, 32, NULL, PPI_ANTENNAFLAGS_MASK_CPOL_L,
-            "Specifies if the antenna is circulary polarized, left handed", HFILL } },
+            "Specifies if the antenna is circularly polarized, left handed", HFILL } },
 
         { &hf_ppi_antennaflags_circpol_r,
           { "circularly polarized right", "ppi_antenna.antennaflags.circpol_r",
             FT_BOOLEAN, 32, NULL, PPI_ANTENNAFLAGS_MASK_CPOL_R,
-            "Specifies if the antenna is circulary polarized, right handed", HFILL } },
+            "Specifies if the antenna is circularly polarized, right handed", HFILL } },
 
         { &hf_ppi_antennaflags_steer_elec,
           { "electrically steerable", "ppi_antenna.antennaflags.steer_elec",
diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c
index 809c1051a0..8bc2146311 100644
--- a/epan/dissectors/packet-ppi-vector.c
+++ b/epan/dissectors/packet-ppi-vector.c
@@ -331,15 +331,15 @@ void proto_register_ppi_vector(void) {
         { &hf_ppi_vector_rot_x,
           { "Pitch", "ppi_vector.pitch",
             FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            "Pitch (Rotation x) packet was receivd at", HFILL } },
+            "Pitch (Rotation x) packet was received at", HFILL } },
         { &hf_ppi_vector_rot_y,
           { "Roll", "ppi_vector.roll",
             FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            "Roll (Rotation y) packet was receivd at", HFILL } },
+            "Roll (Rotation y) packet was received at", HFILL } },
         { &hf_ppi_vector_rot_z,
           { "Heading", "ppi_vector.heading",
             FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            "Heading (Rotation z) packet was receivd at", HFILL } },
+            "Heading (Rotation z) packet was received at", HFILL } },
         { &hf_ppi_vector_off_r,
           { "Off-r", "ppi_vector.off_r",
             FT_DOUBLE, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c
index bf0b7eceb2..e29f07f66f 100644
--- a/epan/dissectors/packet-pptp.c
+++ b/epan/dissectors/packet-pptp.c
@@ -826,7 +826,7 @@ proto_register_pptp(void)
     { &hf_pptp_in_result,
       { "Result Code",			"pptp.in_result",
 	FT_UINT8,	BASE_DEC,	VALS(in_resulttype_vals),	0x0,
-      	"This value indicates the result of the Incoming-Call-Request attemp", HFILL }},
+      	"This value indicates the result of the Incoming-Call-Request attempt", HFILL }},
     { &hf_pptp_disc_result,
       { "Result Code",			"pptp.disc_result",
 	FT_UINT8,	BASE_DEC,	VALS(disc_resulttype_vals),	0x0,
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index ae84c8f3c2..f506f74749 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -2528,7 +2528,7 @@ void proto_register_rlc_lte(void)
     prefs_register_bool_preference(rlc_lte_module, "header_only_mode",
         "May see RLC headers only",
         "When enabled, if data is not present, don't report as an error, but instead "
-        "add expert info to indicate that headers were ommitted",
+        "add expert info to indicate that headers were omitted",
         &global_rlc_lte_headers_expected);
 
     register_init_routine(&rlc_lte_init_protocol);
diff --git a/epan/dissectors/packet-rmt-common.c b/epan/dissectors/packet-rmt-common.c
index 554ce19a8c..e0b12d7567 100644
--- a/epan/dissectors/packet-rmt-common.c
+++ b/epan/dissectors/packet-rmt-common.c
@@ -56,13 +56,13 @@ void rmt_ext_parse(GArray *a, tvbuff_t *tvb, guint *offset, guint offset_max)
 		e.het = tvb_get_guint8(tvb, *offset);
 
 		if (e.het <= 127) {
-			/* If HET <= 127, we have a variable-size extention */
+			/* If HET <= 127, we have a variable-size extension */
 			e.hel = tvb_get_guint8(tvb, *offset+1);
 			e.hec_offset = *offset + 2;
 			e.hec_size = e.hel * 4 - 2;
 			e.length = e.hel * 4;
 		} else {
-			/* If HET > 127, we have a short 32-bit extention */
+			/* If HET > 127, we have a short 32-bit extension */
 			e.hel = 1;	/* even if HEL field is not defined for HET > 127 */
 			e.hec_offset = *offset + 1;
 			e.hec_size = 3;
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index 5f688d673e..618e9949d8 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -1481,7 +1481,7 @@ static const value_string rsl_rlm_cause_vals[] = {
 	{  0x02,	"re-establishment request" },
 	{  0x03,	"unsolicited UA response" },
 	{  0x04,	"unsolicited DM response" },
-	{  0x05,	"unsolicated DM response, multiple frame established state" },
+	{  0x05,	"unsolicited DM response, multiple frame established state" },
 	{  0x06,	"unsolicited supervisory response" },
 	{  0x07,	"sequence error" },
 	{  0x08,	"U-frame with incorrect parameters" },
diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index 0de6055a37..783ccaeaf5 100644
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -1724,9 +1724,9 @@ get_sabp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
 	/* Get the length of the sabp packet. offset in bits  */
 	offset = dissect_per_length_determinant(tvb, bit_offset, &asn1_ctx, NULL, -1, &type_length);
 
-	/* 
+	/*
 	 * Return the length of the PDU
-	 * which is 3 + the length of the length, we only care about lenght up to 16K
+	 * which is 3 + the length of the length, we only care about length up to 16K
 	 * ("n" less than 128) a single octet containing "n" with bit 8 set to zero;
 	 * ("n" less than 16K) two octets containing "n" with bit 8 of the first octet set to 1 and bit 7 set to zero;
 	 */
@@ -1749,7 +1749,7 @@ dissect_sabp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	/* create the sbap protocol tree */
 	sabp_item = proto_tree_add_item(tree, proto_sabp, tvb, 0, -1, FALSE);
 	sabp_tree = proto_item_add_subtree(sabp_item, ett_sabp);
-	
+
 	dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree);
 }
 
@@ -2155,7 +2155,7 @@ void proto_register_sabp(void) {
   /* Register fields and subtrees */
   proto_register_field_array(proto_sabp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
- 
+
   /* Register dissector */
   register_dissector("sabp", dissect_sabp, proto_sabp);
   register_dissector("sabp.tcp", dissect_sabp_tcp, proto_sabp);
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 685c72139c..64370687e5 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -258,7 +258,7 @@ static const value_string scsi_read_dvd_formats[] = {
     {0x07, "Media Key block protected by a Bus Key"},
     {0x08, "DDS information"},
     {0x09, "DVD-RAM Medium status"},
-    {0x0a, "DVD-RAM Spare Area infomraiton"},
+    {0x0a, "DVD-RAM Spare Area information"},
     {0x0b, "DVD-RAM Recording Type information"},
     {0x0c, "DVD-R/-RW RMD"},
     {0x0d, "Specified RMD"},
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 73b93eaf5c..2199027780 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -236,7 +236,7 @@ void proto_reg_handoff_sdp(void);
 
 /* static functions */
 
-static void call_sdp_subdissector(tvbuff_t *tvb, packet_info *pinfo, int hf, proto_tree* ti, int lenght,
+static void call_sdp_subdissector(tvbuff_t *tvb, packet_info *pinfo, int hf, proto_tree* ti, int length,
                                   transport_info_t *transport_info);
 
 /* Subdissector functions */
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index aa049da412..9693056a00 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -1,4 +1,4 @@
-/* packet-sflow.c       < Last change made on 12/08/2009 13.00 >
+/* packet-sflow.c
  * Routines for sFlow v5 dissection implemented according to the specifications
  * at http://www.sflow.org/sflow_version_5.txt
  *
@@ -1658,7 +1658,7 @@ dissect_sflow_5_extended_80211_tx(tvbuff_t *tvb, proto_tree *tree, gint offset)
             break;
         case 1:
             proto_tree_add_text(tree, tvb, offset, 4,
-                    "Retransmission: Packet transmitted sucessfully on first attemp");
+                    "Retransmission: Packet transmitted sucessfully on first attempt");
             break;
         default:
             proto_tree_add_text(tree, tvb, offset, 4, "Retransmissions: %u", transmissions - 1);
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index c3a138935e..f106e5565d 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -2208,7 +2208,7 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in
 		if(dialect==0xffff){
 			proto_tree_add_uint_format(tree, hf_smb_dialect_index,
 				tvb, offset, 2, dialect,
-				"Selected Index: -1, PC NETWORK PROGRAM 1.0 choosen");
+				"Selected Index: -1, PC NETWORK PROGRAM 1.0 chosen");
 		} else {
 			proto_tree_add_uint(tree, hf_smb_dialect_index,
 				tvb, offset, 2, dialect);
@@ -18256,7 +18256,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_timeout,
 		{ "Timeout", "smb.timeout", FT_UINT32, BASE_DEC,
-		NULL, 0, "Timeout in miliseconds", HFILL }},
+		NULL, 0, "Timeout in milliseconds", HFILL }},
 
 	{ &hf_smb_high_offset,
 		{ "High Offset", "smb.offset_high", FT_UINT32, BASE_DEC,
@@ -18809,7 +18809,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_nt_create_options_sequential_only,
 		{ "Sequential Only", "smb.nt.create_options.sequential_only", FT_BOOLEAN, 32,
-		TFS(&tfs_nt_create_options_sequential_only), 0x00000004, "Will access to thsis file only be sequential?", HFILL }},
+		TFS(&tfs_nt_create_options_sequential_only), 0x00000004, "Will access to this file only be sequential?", HFILL }},
 
 	{ &hf_smb_nt_create_options_no_intermediate_buffering,
 		{ "Intermediate Buffering", "smb.nt.create_options.intermediate_buffering", FT_BOOLEAN, 32,
@@ -18956,19 +18956,19 @@ proto_register_smb(void)
 
 	{ &hf_smb_nt_qsd_owner,
 		{ "Owner", "smb.nt_qsd.owner", FT_BOOLEAN, 32,
-		TFS(&tfs_nt_qsd_owner), NT_QSD_OWNER, "Is owner security informaton being queried?", HFILL }},
+		TFS(&tfs_nt_qsd_owner), NT_QSD_OWNER, "Is owner security information being queried?", HFILL }},
 
 	{ &hf_smb_nt_qsd_group,
 		{ "Group", "smb.nt_qsd.group", FT_BOOLEAN, 32,
-		TFS(&tfs_nt_qsd_group), NT_QSD_GROUP, "Is group security informaton being queried?", HFILL }},
+		TFS(&tfs_nt_qsd_group), NT_QSD_GROUP, "Is group security information being queried?", HFILL }},
 
 	{ &hf_smb_nt_qsd_dacl,
 		{ "DACL", "smb.nt_qsd.dacl", FT_BOOLEAN, 32,
-		TFS(&tfs_nt_qsd_dacl), NT_QSD_DACL, "Is DACL security informaton being queried?", HFILL }},
+		TFS(&tfs_nt_qsd_dacl), NT_QSD_DACL, "Is DACL security information being queried?", HFILL }},
 
 	{ &hf_smb_nt_qsd_sacl,
 		{ "SACL", "smb.nt_qsd.sacl", FT_BOOLEAN, 32,
-		TFS(&tfs_nt_qsd_sacl), NT_QSD_SACL, "Is SACL security informaton being queried?", HFILL }},
+		TFS(&tfs_nt_qsd_sacl), NT_QSD_SACL, "Is SACL security information being queried?", HFILL }},
 
 	{ &hf_smb_extended_attributes,
 		{ "Extended Attributes", "smb.ext_attr", FT_BYTES, BASE_NONE,
@@ -19421,8 +19421,8 @@ proto_register_smb(void)
 		NULL, 0, "Number of actual free allocation units", HFILL }},
 
 	{ &hf_smb_soft_quota_limit,
-		{ "(Soft) Quota Treshold", "smb.quota.soft.default", FT_UINT64, BASE_DEC,
-		NULL, 0, "Soft Quota treshold", HFILL }},
+		{ "(Soft) Quota Threshold", "smb.quota.soft.default", FT_UINT64, BASE_DEC,
+		NULL, 0, "Soft Quota threshold", HFILL }},
 
 	{ &hf_smb_hard_quota_limit,
 		{ "(Hard) Quota Limit", "smb.quota.hard.default", FT_UINT64, BASE_DEC,
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 2b7cb82e44..3f68f04df2 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -3240,7 +3240,7 @@ proto_register_smpp(void)
         {   &hf_smpp_opt_param_tag,
             {   "Tag", "smpp.opt_param_tag",
                 FT_UINT16, BASE_HEX, NULL, 0x00,
-                "Optional parameter intentifier tag",
+                "Optional parameter identifier tag",
                 HFILL
             }
         },
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 268c9b9351..cd2549c986 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -2777,7 +2777,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		 * This is TCP, and we should, and can, do reassembly.
 		 *
 		 * Is the "Sequence Of" header split across segment
-		 * boundaries?  We requre at least 6 bytes for the
+		 * boundaries?  We require at least 6 bytes for the
 		 * header, which allows for a 4-byte length (ASN.1
 		 * BER).
 		 */
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index 8f7f85aa33..05c963942a 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -1313,7 +1313,7 @@ void proto_register_synphasor(void)
 		  TFS(&data_statb14names), 0x4000, NULL, HFILL }},
 
 		{ &hf_data_statb13,
-		{ "Time syncronized", PROTOCOL_ABBREV ".data.sync", FT_BOOLEAN, 16,
+		{ "Time synchronized", PROTOCOL_ABBREV ".data.sync", FT_BOOLEAN, 16,
 		  TFS(&data_statb13names), 0x2000, NULL, HFILL }},
 
 		{ &hf_data_statb12,
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 0dab865fde..b2a5abfe98 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -4044,7 +4044,7 @@ proto_register_tcp(void)
             BASE_DEC, NULL, 0x0, "Logarithmically encoded power of 2 scale factor", HFILL}},
 
         { &hf_tcp_option_wscale_multiplier,
-          { "Multiplier", "tcp.options.wscale.multipiler",  FT_UINT8,
+          { "Multiplier", "tcp.options.wscale.multiplier",  FT_UINT8,
             BASE_DEC, NULL, 0x0, "Multiply segment window size by this for scaled window size", HFILL}},
 
         { &hf_tcp_option_sack_perm,
diff --git a/epan/dissectors/packet-teklink.c b/epan/dissectors/packet-teklink.c
index e3c3257adc..3fec11eb09 100644
--- a/epan/dissectors/packet-teklink.c
+++ b/epan/dissectors/packet-teklink.c
@@ -343,7 +343,7 @@ static int dissect_teklink_vtc_mode(tvbuff_t *tvb, int offset, packet_info *pinf
 	offset = dissect_rpc_uint32(tvb, tree, hf_teklink_vtc_mode, offset);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO," %s, %s, %s",
-			val_to_str(sig, teklink_vtc_dstnames, "Unknown destinatin %d"),
+			val_to_str(sig, teklink_vtc_dstnames, "Unknown destination %d"),
 			val_to_str(edge, teklink_vtc_edge, "Unknown edge setting %d"),
 			val_to_str(mode, teklink_vtc_modes, "Unknown mode setting %d"));
 	return offset;
diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c
index 35c14a7748..c029bf6ab9 100644
--- a/epan/dissectors/packet-tn5250.c
+++ b/epan/dissectors/packet-tn5250.c
@@ -842,7 +842,7 @@ static const struct true_false_string tn5250_field_wdsf_ds_ct_flag1_2 = {
 };
 
 static const struct true_false_string tn5250_field_wdsf_ds_ct_flag1_3 = {
-	"Reserved (incorrectely set to on).",
+	"Reserved (incorrectly set to on).",
 	"Reserved (set to zero)."
 };
 
@@ -899,7 +899,7 @@ static const struct true_false_string tn5250_field_wdsf_ds_ct_flag2_5 = {
 };
 
 static const struct true_false_string tn5250_field_wdsf_ds_ct_flag2_6 = {
-	"Reserved (incorrectely set to on).",
+	"Reserved (incorrectly set to on).",
 	"Reserved (set to zero)."
 };
 
diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c
index c3fe8a62cf..e7ca9b24fd 100644
--- a/epan/dissectors/packet-v52.c
+++ b/epan/dissectors/packet-v52.c
@@ -312,7 +312,7 @@ static const value_string steady_signal_values [] = {
     { 0x06, "Battery on a-wire" },
     { 0x07, "A-wire on earth" },
     { 0x08, "No battery on a-wire" },
-    { 0x09, "No batery on b-wire" },
+    { 0x09, "No battery on b-wire" },
     { 0x0a, "Reduced battery" },
     { 0x0b, "No battery" },
     { 0x0c, "Alternate reduced power / no power" },
@@ -505,7 +505,7 @@ static const value_string 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" },
@@ -615,7 +615,7 @@ static const value_string 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_TS_ID,         "ISDN port TS ID" },
     { V5_TIME_SLOT_ID,         "V5 TS ID" },
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c
index c3b21b9bcf..29510b9cd4 100644
--- a/epan/dissectors/packet-wifi-p2p.c
+++ b/epan/dissectors/packet-wifi-p2p.c
@@ -199,7 +199,7 @@ static const value_string p2p_minor_reason_codes[] = {
     "Disconnected because concurrent device is not setting coexistence "
     "parameters" },
   { P2P_MINOR_DISCONNECT_DUE_TO_OUTSIDE_POLICY,
-    "Disconnected because P2P oepration is outside the IT defined policy" },
+    "Disconnected because P2P operation is outside the IT defined policy" },
   { 0, NULL }
 };
 
diff --git a/gtk/font_utils.h b/gtk/font_utils.h
index 441dcb7fb2..d31338eb5e 100644
--- a/gtk/font_utils.h
+++ b/gtk/font_utils.h
@@ -42,8 +42,8 @@ extern void font_init(void);
 /** Return value from font_apply() */
 typedef enum {
 	FA_SUCCESS,             /**< function succeeded */
-	FA_FONT_NOT_RESIZEABLE, /**< the choosen font isn't resizable */
-	FA_FONT_NOT_AVAILABLE   /**< the choosen font isn't available */
+	FA_FONT_NOT_RESIZEABLE, /**< the chosen font isn't resizable */
+	FA_FONT_NOT_AVAILABLE   /**< the chosen font isn't available */
 } fa_ret_t;
 
 /** Applies a new user font, corresponding to the preferences font name and recent zoom level. 
diff --git a/gtk/rtp_stream.h b/gtk/rtp_stream.h
index 13e241a743..e539b6ee4b 100644
--- a/gtk/rtp_stream.h
+++ b/gtk/rtp_stream.h
@@ -37,7 +37,7 @@
 /****************************************************************************/
 /* type for storing rtp frame information */
 typedef struct st_rtp_sample_header {
-	guint32 rec_time;	/* miliseconds since start of recording */
+	guint32 rec_time;	/* milliseconds since start of recording */
 	guint16 frame_length;   /* number of bytes in *frame */
 } rtp_sample_header_t;
 
diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 90fbcd57c7..8343955857 100644
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -315,7 +315,7 @@ srt_create_popup_menu(srt_stat_table *rst)
 	gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_service_resp_t_filter_popup, -1, &error);
 	if (error != NULL)
     {
-        fprintf (stderr, "Warning: building service responce time filter popup failed: %s\n",
+        fprintf (stderr, "Warning: building service response time filter popup failed: %s\n",
                 error->message);
         g_error_free (error);
         error = NULL;
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 5ac857a49b..b61165b5a8 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -515,7 +515,7 @@ static char helptext[] =
 #else /* !ORIGINAL_WIN32_BUTTONS */
 	"   Left Mouse Button			selects segment under cursor in Wireshark's packet list\n"
 	"\n"
-	"   Middle Mouse Button			zooms in (towards area under cousor)\n"
+	"   Middle Mouse Button			zooms in (towards area under cursor)\n"
 	"   <Shift>-Middle Mouse Button	zooms out\n"
 	"\n"
 	"   Right Mouse Button			moves the graph (if zoomed in)\n"
diff --git a/tap-diameter-avp.c b/tap-diameter-avp.c
index 2ea574dc29..7a7314da0e 100644
--- a/tap-diameter-avp.c
+++ b/tap-diameter-avp.c
@@ -121,7 +121,7 @@ diam_tree_to_csv(proto_node* node, gpointer data)
 			}
 		}
 		if(!val_str)
-			val_str=ep_strdup_printf("unsuprorted type: %s",ftype_name(ftype));
+			val_str=ep_strdup_printf("unsupported type: %s",ftype_name(ftype));
 
 		/*printf("traverse: name='%s', abbrev='%s',desc='%s', val='%s'\n",hfi->name,hfi->abbrev,ftype_name(hfi->type),val_str);*/
 		printf("%s='%s' ",hfi->name,val_str);
diff --git a/tap-rpcstat.c b/tap-rpcstat.c
index 580121ec10..ccc2045f7c 100644
--- a/tap-rpcstat.c
+++ b/tap-rpcstat.c
@@ -72,7 +72,7 @@ typedef struct _rpcstat_t {
  * to reset all state. Such as when wireshark opens a new file, when it
  * starts a new capture, when it rescans the packetlist after some prefs have
  * changed etc.
- * So if your aplication has some state it needs to clean up in those
+ * So if your application has some state it needs to clean up in those
  * situations, here is a good place to put that code.
  */
 static void