aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2008-12-17 17:23:37 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2008-12-17 17:23:37 +0000
commit183dedb82546d00edc485353d413a52a3be28976 (patch)
treed506f25dfc17f3054d84127c2731ad8db790ae2b /epan
parent1cd4f318b00253d062d874906ae433660b26d639 (diff)
Fix some typos and spelling (mostly in text strings)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27037 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
-rwxr-xr-xepan/dissectors/ncp2222.py18
-rw-r--r--epan/dissectors/packet-3g-a11.c10
-rw-r--r--epan/dissectors/packet-ansi_map.c2
-rw-r--r--epan/dissectors/packet-armagetronad.c2
-rw-r--r--epan/dissectors/packet-bacapp.c2
-rw-r--r--epan/dissectors/packet-bssgp.c2
-rw-r--r--epan/dissectors/packet-btl2cap.c6
-rw-r--r--epan/dissectors/packet-camel.c2
-rw-r--r--epan/dissectors/packet-cigi.c2
-rw-r--r--epan/dissectors/packet-cip.c2
-rw-r--r--epan/dissectors/packet-dcerpc-dce122.c4
-rw-r--r--epan/dissectors/packet-dcerpc-netlogon.c16
-rw-r--r--epan/dissectors/packet-dlsw.c6
-rw-r--r--epan/dissectors/packet-dpnss.c2
-rw-r--r--epan/dissectors/packet-edonkey.c2
-rw-r--r--epan/dissectors/packet-fc.c2
-rw-r--r--epan/dissectors/packet-giop.c38
-rw-r--r--epan/dissectors/packet-gsm_a_rr.c2
-rw-r--r--epan/dissectors/packet-gsm_map.c4
-rw-r--r--epan/dissectors/packet-gtp.c2
-rw-r--r--epan/dissectors/packet-h248.c2
-rw-r--r--epan/dissectors/packet-ieee80211.c4
-rw-r--r--epan/dissectors/packet-ieee8021ah.c2
-rw-r--r--epan/dissectors/packet-image-png.c2
-rw-r--r--epan/dissectors/packet-ipmi-se.c22
-rw-r--r--epan/dissectors/packet-isis-lsp.c2
-rw-r--r--epan/dissectors/packet-isup.c2
-rw-r--r--epan/dissectors/packet-kdp.c2
-rw-r--r--epan/dissectors/packet-kerberos.c8
-rw-r--r--epan/dissectors/packet-mgcp.c2
-rw-r--r--epan/dissectors/packet-mp4ves.c2
-rw-r--r--epan/dissectors/packet-mysql.c2
-rw-r--r--epan/dissectors/packet-nfs.c2
-rw-r--r--epan/dissectors/packet-rmt-lct.c8
-rw-r--r--epan/dissectors/packet-rtps2.c2
-rw-r--r--epan/dissectors/packet-s5066.c4
-rw-r--r--epan/dissectors/packet-scsi-osd.c2
-rw-r--r--epan/dissectors/packet-scsi-sbc.c2
-rw-r--r--epan/dissectors/packet-sctp.c2
-rw-r--r--epan/dissectors/packet-smpp.c2
-rw-r--r--epan/dissectors/packet-snmp.c10
-rw-r--r--epan/dissectors/packet-snmp.h2
-rw-r--r--epan/dissectors/packet-srvloc.c2
-rw-r--r--epan/dissectors/packet-sua.c2
44 files changed, 109 insertions, 109 deletions
diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index 91a52b7804..48db633d2b 100755
--- a/epan/dissectors/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
@@ -2025,7 +2025,7 @@ ExtAttrDataSize = uint32("ext_attr_data_size", "Extended Attributes Data Size"
ExtAttrCount = uint32("ext_attr_count", "Extended Attributes Count")
ExtAttrKeySize = uint32("ext_attr_key_size", "Extended Attributes Key Size")
ExtendedAttributesDefined = uint32("extended_attributes_defined", "Extended Attributes Defined")
-ExtendedAttributeExtantsUsed = uint32("extended_attribute_extants_used", "Extended Attribute Extants Used")
+ExtendedAttributeExtentsUsed = uint32("extended_attribute_extents_used", "Extended Attribute Extents Used")
ExtendedInfo = bitfield16("ext_info", "Extended Return Information", [
bf_boolean16(0x0001, "ext_info_update", "Last Update"),
bf_boolean16(0x0002, "ext_info_dos_name", "DOS Name"),
@@ -2794,7 +2794,7 @@ ModifyDOSInfoMask = bitfield16("modify_dos_info_mask", "Modify DOS Info Mask",
])
Month = val_string8("s_month", "Month", [
[ 0x01, "January"],
- [ 0x02, "Febuary"],
+ [ 0x02, "February"],
[ 0x03, "March"],
[ 0x04, "April"],
[ 0x05, "May"],
@@ -3807,7 +3807,7 @@ TotalDataStreamDiskSpaceAlloc = uint32("ttl_data_str_size_space_alloc", "Total D
TotalDirectorySlots = uint16("total_directory_slots", "Total Directory Slots")
TotalDirectoryEntries = uint32("total_dir_entries", "Total Directory Entries")
TotalDynamicSpace = uint32("total_dynamic_space", "Total Dynamic Space")
-TotalExtendedDirectoryExtants = uint32("total_extended_directory_extants", "Total Extended Directory Extants")
+TotalExtendedDirectoryExtents = uint32("total_extended_directory_extents", "Total Extended Directory Extents")
TotalFileServicePackets = uint32("total_file_service_packets", "Total File Service Packets")
TotalFilesOpened = uint32("total_files_opened", "Total Files Opened")
TotalLFSCounters = uint32("total_lfs_counters", "Total LFS Counters")
@@ -3885,7 +3885,7 @@ Unused = uint8("un_used", "Unused")
UnusedBlocks = uint32("unused_blocks", "Unused Blocks")
UnUsedDirectoryEntries = uint32("un_used_directory_entries", "Unused Directory Entries")
UnusedDiskBlocks = uint32("unused_disk_blocks", "Unused Disk Blocks")
-UnUsedExtendedDirectoryExtants = uint32("un_used_extended_directory_extants", "Unused Extended Directory Extants")
+UnUsedExtendedDirectoryExtents = uint32("un_used_extended_directory_extents", "Unused Extended Directory Extents")
UpdateDate = uint16("update_date", "Update Date")
UpdateDate.NWDate()
UpdateID = uint32("update_id", "Update ID", BE)
@@ -5244,10 +5244,10 @@ VolInfoStructure = struct("vol_info_struct", [
ClustersUsedByExtendedDirectories,
TotalDirectoryEntries,
UnUsedDirectoryEntries,
- TotalExtendedDirectoryExtants,
- UnUsedExtendedDirectoryExtants,
+ TotalExtendedDirectoryExtents,
+ UnUsedExtendedDirectoryExtents,
ExtendedAttributesDefined,
- ExtendedAttributeExtantsUsed,
+ ExtendedAttributeExtentsUsed,
DirectoryServicesObjectID,
VolumeLastModifiedTime,
VolumeLastModifiedDate,
@@ -7616,7 +7616,7 @@ proto_register_ncp2222(void)
{ "RDN", "ncp.nds_rdn", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
{ &hf_delim_string,
- { "Delimeter", "ncp.nds_delim", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+ { "Delimiter", "ncp.nds_delim", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
{ &hf_nds_dn_output_type,
{ "Output Entry Specifier Type", "ncp.nds_out_es_type", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
@@ -8174,7 +8174,7 @@ proto_register_ncp2222(void)
{ "Client is a Server", "ncp.nds_prot_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, "", HFILL }},
{ &hf_nds_svr_dst_name,
- { "Server Distiguished Name", "ncp.nds_svr_dist_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+ { "Server Distinguished Name", "ncp.nds_svr_dist_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
{ &hf_nds_tune_mark,
{ "Tune Mark", "ncp.ndstunemark", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index d3176665e8..0ab500892e 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -100,7 +100,7 @@ static int hf_a11_ase_gre_proto_type = -1;
static int hf_a11_ase_gre_key = -1;
static int hf_a11_ase_pcf_addr_key = -1;
-/* Foward QoS Information */
+/* Forward QoS Information */
static int hf_a11_fqi_length = -1;
static int hf_a11_fqi_srid = -1;
static int hf_a11_fqi_flags = -1;
@@ -2007,14 +2007,14 @@ proto_register_a11(void)
"Reverse QoS Update Flow Count.", HFILL }
},
{ &hf_a11_fqui_updated_qoslen,
- { "Foward Updated QoS Sub-Blob Length", "a11.ext.fqui.updatedqoslen",
+ { "Forward Updated QoS Sub-Blob Length", "a11.ext.fqui.updatedqoslen",
FT_UINT8, BASE_DEC, NULL, 0,
- "Foward Updated QoS Sub-Blob Length.", HFILL }
+ "Forward Updated QoS Sub-Blob Length.", HFILL }
},
{ &hf_a11_fqui_updated_qos,
- { "Foward Updated QoS Sub-Blob", "a11.ext.fqui.updatedqos",
+ { "Forward Updated QoS Sub-Blob", "a11.ext.fqui.updatedqos",
FT_BYTES, BASE_NONE, NULL, 0,
- "Foward Updated QoS Sub-Blob.", HFILL }
+ "Forward Updated QoS Sub-Blob.", HFILL }
},
{ &hf_a11_rqui_updated_qoslen,
{ "Reverse Updated QoS Sub-Blob Length", "a11.ext.rqui.updatedqoslen",
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 19f5aa493a..a888eb3493 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -3637,7 +3637,7 @@ static const range_string cdmaserviceoption_vals[] = {
{ 32828, 32831, "Denso International" },
{ 32832, 32835, "Denso International" },
{ 32836, 32839, "NEC America" },
- { 32840, 32843, "Samsung Electrnics" },
+ { 32840, 32843, "Samsung Electronics" },
{ 32844, 32847, "Texas Instruments Incorporated" },
{ 32848, 32851, "Toshiba Corporation" },
{ 32852, 32855, "LG Electronics Inc." },
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index 1a82dc37c4..5f275bc769 100644
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.c
@@ -103,7 +103,7 @@ static const value_string descriptors[] = {
{310, "game"},
{311, "client_gamestate"},
{320, "cycle"},
- {321, "destinaton"},
+ {321, "destination"},
{330, "gAIPlayer"},
{331, "gAITeam"},
{340, "zone"},
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index b2271f8732..8c71750634 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -462,7 +462,7 @@ BACnetEngineeringUnits [] = {
{60,"Centimeters Of Mercury"},
{61,"Inches Of Mercury"},
{62,"Degrees Celsius"},
- {63,"Degress Kelvin"},
+ {63,"Degrees Kelvin"},
{64,"Degrees Fahrenheit"},
{65,"Degree Days Celsius"},
{66,"Degree Days Fahrenheit"},
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index e4b282d58a..50bdb5e9b5 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -2540,7 +2540,7 @@ decode_msrac_access_capabilities(proto_tree *tree, tvbuff_t *tvb,
value = bssgp_tvb_get_bits8(tvb, bo, bl);
pi = bit_proto_tree_add_bit_field8(tree, tvb, bo, bl);
bo += bl;
- proto_item_append_text(pi, "Donwlink Advanced Receiver Performance: Downlink Advanced Receiver Performance %s supported",
+ proto_item_append_text(pi, "Downlink Advanced Receiver Performance: Downlink Advanced Receiver Performance %s supported",
value == 0 ? "not" : "- phase 1");
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 95d3596215..9a6134fb2c 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -1073,7 +1073,7 @@ proto_register_btl2cap(void)
{ &hf_btl2cap_info_mtu,
{ "Remote Entity MTU", "btl2cap.info_mtu",
FT_UINT16, BASE_DEC, NULL, 0x0,
- "Remote entitiys acceptable connectionless MTU", HFILL }
+ "Remote entity acceptable connectionless MTU", HFILL }
},
{ &hf_btl2cap_info_flowcontrol,
{ "Flow Control Mode", "btl2cap.info_flowcontrol",
@@ -1163,10 +1163,10 @@ proto_register_btl2cap(void)
{ &hf_btl2cap_option_latency,
{ "Latency (microseconds)", "btl2cap.option_latency",
FT_UINT32, BASE_DEC, NULL, 0x0,
- "Maximal acceptable dealy (microseconds)", HFILL }
+ "Maximal acceptable delay (microseconds)", HFILL }
},
{ &hf_btl2cap_option_delayvariation,
- { "Delay Variation (microseconds)", "btl2cap.option_dealyvar",
+ { "Delay Variation (microseconds)", "btl2cap.option_delayvar",
FT_UINT32, BASE_DEC, NULL, 0x0,
"Difference between maximum and minimum delay (microseconds)", HFILL }
},
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index c74830bef8..418092186c 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -4327,7 +4327,7 @@ static const value_string camel_GPRSEventType_vals[] = {
{ 3, "detached" },
{ 11, "pdp-ContextEstablishment" },
{ 12, "pdp-ContextEstablishmentAcknowledgement" },
- { 13, "disonnect" },
+ { 13, "disconnect" },
{ 14, "pdp-ContextChangeOfPosition" },
{ 0, NULL }
};
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index bcb3fc1fdb..feb0e95083 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -6931,7 +6931,7 @@ proto_register_cigi(void)
{ &hf_cigi3_wave_control_period,
{ "Period (s)", "cigi.wave_control.period",
FT_FLOAT, BASE_DEC, NULL, 0x0,
- "Specifies the time required fro one complete oscillation of the wave", HFILL }
+ "Specifies the time required for one complete oscillation of the wave", HFILL }
},
{ &hf_cigi3_wave_control_direction,
{ "Direction (degrees)", "cigi.wave_control.direction",
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 236aa6168a..67f30f6597 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -352,7 +352,7 @@ const value_string cip_devtype_vals[] = {
{ DP_LIMIT_SWITCH, "Limit Switch" },
{ DP_IND_PROX_SWITCH, "Inductive Proximity Switch" },
{ DP_PHOTO_SENSOR, "Photoelectric Sensor" },
- { DP_GENP_DISC_IO, "General Purpose Dicrete I/O" },
+ { DP_GENP_DISC_IO, "General Purpose Discrete I/O"},
{ DP_RESOLVER, "Resolver" },
{ DP_COM_ADAPTER, "Communications Adapter" },
{ DP_POS_CNT, "Position Controller", },
diff --git a/epan/dissectors/packet-dcerpc-dce122.c b/epan/dissectors/packet-dcerpc-dce122.c
index ee6804dba9..61717a0967 100644
--- a/epan/dissectors/packet-dcerpc-dce122.c
+++ b/epan/dissectors/packet-dcerpc-dce122.c
@@ -458,7 +458,7 @@ const value_string dce_error_vals[] = {
{ 585773059, "Only some of the tokens are revoked." },
{ 585773060, "Unrecognized host pointer (not used)." },
{ 585773061, "Revoke operation failed." },
-{ 585773062, "Dont need the token issued by async grant." },
+{ 585773062, "Don't need the token issued by async grant." },
{ 585773063, "Revocation failed but host isn't down yet." },
{ 585773064, "Interface is no longer supported." },
{ 589672449, "specified set not found" },
@@ -4122,7 +4122,7 @@ const value_string dce_error_vals[] = {
{ 704028741, "recovery fetching database version .ld..ld from server .s" },
{ 704028742, "recovery fetched db version .ld..ld, errorcode=.ld" },
{ 704028743, "recovery already has latest db version .ld..ld, state 0x.x" },
-{ 704028744, "recovery labelling db .ld..ld, errocode=.ld" },
+{ 704028744, "recovery labelling db .ld..ld, errorcode=.ld" },
{ 704028745, "recovery sending db to .s, errorcode=.ld" },
{ 704028746, "recovery aborting all open transactions" },
{ 704028747, "recovery noticed server going down, db to be sent on wake up" },
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 315317045e..16599988d6 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -295,7 +295,7 @@ static guint16 ver_dcerpc_netlogon = 1;
static const true_false_string user_account_control_dont_require_preauth= {
- "This account DONT_REQUIRE_PREAUTHENTICATION",
+ "This account DOESN'T_REQUIRE_PREAUTHENTICATION",
"This account REQUIRES preauthentication",
};
static const true_false_string user_account_control_use_des_key_only= {
@@ -323,7 +323,7 @@ static const true_false_string user_account_control_account_auto_locked= {
"This account is NOT auto_locked",
};
static const true_false_string user_account_control_dont_expire_password= {
- "This account DONT_EXPIRE_PASSWORDs",
+ "This account DOESN'T_EXPIRE_PASSWORDs",
"This account might expire_passwords",
};
static const true_false_string user_account_control_server_trust_account= {
@@ -4607,7 +4607,7 @@ static const true_false_string trust_attribs_uplevel_only = {
"This is a normal trust"
};
static const true_false_string trust_attribs_quarantined_domain = {
- "This is a QUARANTINED DOMAIN (so dont expect lookupsids to work)",
+ "This is a QUARANTINED DOMAIN (so don't expect lookupsids to work)",
"This is a normal trust"
};
static const true_false_string trust_attribs_forest_transitive = {
@@ -4733,12 +4733,12 @@ static const true_false_string get_dcname_request_flags_good_timeserv_preferred
"we do NOT have a preference for good timeserv servers"
};
static const true_false_string get_dcname_request_flags_avoid_self = {
- "do NOT return self as dc, return someone else",
+ "do NOT return self as dc; return someone else",
"you may return yourSELF as the dc"
};
static const true_false_string get_dcname_request_flags_only_ldap_needed = {
- "we ONLY NEED LDAP, you dont have to return a dc",
- "we need a normal dc, an ldap only server will not do"
+ "we ONLY NEED LDAP; you don't have to return a dc",
+ "we need a normal dc; an ldap only server will not do"
};
static const true_false_string get_dcname_request_flags_is_flat_name = {
"the name we specify is a NetBIOS name",
@@ -7657,7 +7657,7 @@ static hf_register_info hf[] = {
"The user flags RESOURCE_GROUPS", HFILL }},
{ &hf_netlogon_user_account_control_dont_require_preauth,
- { "Dont Require PreAuth", "netlogon.user.account_control.dont_require_preauth",
+ { "Don't Require PreAuth", "netlogon.user.account_control.dont_require_preauth",
FT_BOOLEAN, 32, TFS(&user_account_control_dont_require_preauth), 0x00010000,
"The user account control DONT_REQUIRE_PREAUTH flag ", HFILL }},
@@ -7692,7 +7692,7 @@ static hf_register_info hf[] = {
"The user account control account_auto_locked flag ", HFILL }},
{ &hf_netlogon_user_account_control_dont_expire_password,
- { "Dont Expire Password", "netlogon.user.account_control.dont_expire_password",
+ { "Don't Expire Password", "netlogon.user.account_control.dont_expire_password",
FT_BOOLEAN, 32, TFS(&user_account_control_dont_expire_password), 0x00000200,
"The user account control dont_expire_password flag ", HFILL }},
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 09a3c26592..505d101481 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -198,7 +198,7 @@ static const value_string dlsw_refuse_vals[] = {
{ 0x3 , "vendor Id control vector is missing"},
{ 0x4 , "DLSw Version control vector is missing"},
{ 0x5 , "initial Pacing Window control vector is missing"},
- { 0x6 , "length of control vectors doewn't correlate to the length of the GDS variable"},
+ { 0x6 , "length of control vectors doesn't correlate to the length of the GDS variable"},
{ 0x7 , "invalid control vector id"},
{ 0x8 , "length of control vector invalid"},
{ 0x9 , "invalid control vector data value"},
@@ -393,8 +393,8 @@ dissect_dlsw_capex(tvbuff_t *tvb, proto_tree *tree, proto_tree *ti2)
case DLSW_GDSID_ACK:
break;
case DLSW_GDSID_REF:
- proto_tree_add_text (tree,tvb,4,2,"Erorr pointer = %d",tvb_get_ntohs(tvb,4));
- proto_tree_add_text (tree,tvb,6,2,"Erorr cause = %s",
+ proto_tree_add_text (tree,tvb,4,2,"Error pointer = %d",tvb_get_ntohs(tvb,4));
+ proto_tree_add_text (tree,tvb,6,2,"Error cause = %s",
val_to_str(tvb_get_ntohs(tvb,6), dlsw_refuse_vals, "Unknown refuse cause"));
break;
case DLSW_GDSID_SEND:
diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c
index dd8ebc2ba4..027fe92374 100644
--- a/epan/dissectors/packet-dpnss.c
+++ b/epan/dissectors/packet-dpnss.c
@@ -2,7 +2,7 @@
* Routines for DPNNS/DASS2 dissection
* Copyright 2007, Anders Broman <anders.broman[at]ericsson.com>
*
- * Supplementarry string parameter table and testing by Tomas Muehlhoff.
+ * Supplementary string parameter table and testing by Tomas Muehlhoff.
*
* $Id$
*
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 9e65c743fc..cb6d7d55e4 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -322,7 +322,7 @@ static const value_string edonkey_tcp_msgs[] = {
{ EDONKEY_MSG_FILE_REQUEST_ANSWER, "File Request Answer" },
{ EDONKEY_MSG_GET_SHARED_DIRS, "Get Shared Directories" },
{ EDONKEY_MSG_GET_SHARED_FILES, "Get Shared Files" },
- { EDONKEY_MSG_SHARED_DIRS, "Shared Directores" },
+ { EDONKEY_MSG_SHARED_DIRS, "Shared Directories" },
{ EDONKEY_MSG_SHARED_FILES, "Shared Files" },
{ EDONKEY_MSG_SHARED_DENIED, "Shared Denied" },
{ 0, NULL }
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index ae6a2ad65d..f732dc0be2 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -1285,7 +1285,7 @@ proto_register_fc(void)
{"Reason", "fc.bls_reason", FT_UINT8, BASE_HEX, VALS(fc_bls_barjt_val),
0x0, "", HFILL}},
{ &hf_fc_bls_rjtdetail,
- {"Reason Explanantion", "fc.bls_rjtdetail", FT_UINT8, BASE_HEX,
+ {"Reason Explanation", "fc.bls_rjtdetail", FT_UINT8, BASE_HEX,
VALS (fc_bls_barjt_det_val), 0x0, "", HFILL}},
{ &hf_fc_bls_vendor,
{"Vendor Unique Reason", "fc.bls_vnduniq", FT_UINT8, BASE_HEX, NULL,
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 2b2aeb7f24..1ae82fa129 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -89,7 +89,7 @@
* 34. For complex TypeCodes need to check final offset against original offset + sequence length.
* 35. Update REQUEST/REPLY 1_2 according to IDL (eg; ServiceContextList etc).
* 36. Adding decode_ServiceContextList, incomplete.
- * 37. Helper functions should not ALWAYS rely on header to find current endianess. It should
+ * 37. Helper functions should not ALWAYS rely on header to find current endianness. It should
* be passed from user, eg Use stream_is_big_endian. [started]
* 38. Remove unwanted/unused function parameters, see decode_IOR [started]
* 40. Add sequence <IOP::TaggedComponent> components to IIOP IOR profile. Perhaps
@@ -318,7 +318,7 @@
static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset,
- guint32 boundary, gboolean new_endianess, gchar *repobuf,
+ guint32 boundary, gboolean new_endianness, gchar *repobuf,
gboolean store_flag);
static void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *tree, int *offset,
@@ -408,7 +408,7 @@ static int hf_giop_profile_id = -1;
static int hf_giop_type_id = -1;
static int hf_giop_iiop_v_maj = -1;
static int hf_giop_iiop_v_min = -1;
-static int hf_giop_endianess = -1; /* esp encapsulations */
+static int hf_giop_endianness = -1; /* esp encapsulations */
static int hf_giop_compressed = -1;
static int hf_giop_IOR_tag = -1;
static int hf_giop_IIOP_tag = -1;
@@ -464,9 +464,9 @@ static gint ett_giop_ior = -1; /* IOR */
static dissector_handle_t data_handle;
static dissector_handle_t giop_tcp_handle;
-/* GIOP endianess */
+/* GIOP endianness */
-static const value_string giop_endianess_vals[] = {
+static const value_string giop_endianness_vals[] = {
{ 0x0, "Big Endian" },
{ 0x1, "Little Endian" },
{ 0, NULL}
@@ -4168,9 +4168,9 @@ proto_register_giop (void)
FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
},
- { &hf_giop_endianess,
- { "Endianess", "giop.endianess",
- FT_UINT8, BASE_DEC, VALS(giop_endianess_vals), 0x0, "", HFILL }
+ { &hf_giop_endianness,
+ { "Endianness", "giop.endianness",
+ FT_UINT8, BASE_DEC, VALS(giop_endianness_vals), 0x0, "", HFILL }
},
{ &hf_giop_IIOP_tag,
@@ -4534,7 +4534,7 @@ static void decode_TaggedProfile(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
gchar *p_profile_data; /* printable profile_data pointer */
guint32 new_boundary; /* for encapsulations encountered */
- gboolean new_big_endianess; /* for encapsulations encountered */
+ gboolean new_big_endianness; /* for encapsulations encountered */
/* Get ProfileId tag */
@@ -4549,7 +4549,7 @@ static void decode_TaggedProfile(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
seqlen_pd = get_CDR_encap_info(tvb, tree, offset,
stream_is_big_endian, boundary,
- &new_big_endianess, &new_boundary);
+ &new_big_endianness, &new_boundary);
/* return if zero length sequence */
@@ -4569,12 +4569,12 @@ static void decode_TaggedProfile(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
switch(pidtag) {
case IOP_TAG_INTERNET_IOP:
- decode_IIOP_IOR_profile(tvb, pinfo, tree, offset, new_boundary, new_big_endianess, repobuf, TRUE);
+ decode_IIOP_IOR_profile(tvb, pinfo, tree, offset, new_boundary, new_big_endianness, repobuf, TRUE);
break;
default:
- /* fetch all octets in this sequence , but skip endianess */
+ /* fetch all octets in this sequence , but skip endianness */
get_CDR_octet_seq(tvb, &profile_data, offset, seqlen_pd -1);
@@ -5723,7 +5723,7 @@ static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree
* we come across, useful helper function
*
* Also, should return immediately if seqlen == 0.
- * ie: Forget about trying to grab endianess for
+ * ie: Forget about trying to grab endianness for
* zero length sequence.
*
* Caller must always check seqlen == 0, and not assume its value
@@ -5743,7 +5743,7 @@ guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset,
gboolean *new_stream_is_big_endian_ptr, guint32 *new_boundary_ptr ) {
guint32 seqlen; /* sequence length */
- guint8 giop_endianess;
+ guint8 giop_endianness;
/* Get sequence length of parameter list */
seqlen = get_CDR_ulong(tvb,offset,old_stream_is_big_endian,old_boundary);
@@ -5755,7 +5755,7 @@ guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset,
/*
- * seqlen == 0, implies no endianess and no data
+ * seqlen == 0, implies no endianness and no data
* so just return. Populate new_boundary_ptr and
* new_stream_is_big_endian_ptr with current (old)
* values, just to keep everyone happy. -- FS
@@ -5773,9 +5773,9 @@ guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset,
/* Start of encapsulation of parameter list */
*new_boundary_ptr = *offset; /* remember */
- giop_endianess = get_CDR_octet(tvb,offset);
+ giop_endianness = get_CDR_octet(tvb,offset);
- *new_stream_is_big_endian_ptr = ! giop_endianess;
+ *new_stream_is_big_endian_ptr = ! giop_endianness;
/*
* Glib: typedef gint gboolean;
@@ -5785,8 +5785,8 @@ guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset,
if (tree) {
- proto_tree_add_uint(tree,hf_giop_endianess,tvb,
- *offset-1,1,giop_endianess);
+ proto_tree_add_uint(tree,hf_giop_endianness,tvb,
+ *offset-1,1,giop_endianness);
}
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index c182c83d27..7d138858eb 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -9882,7 +9882,7 @@ proto_register_gsm_a_rr(void)
{ &hf_gsm_a_rr_drx_timer_max,
{ "DRX Timer Max", "gsm_a.rr.drx_timer_max",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_drx_timer_max_vals), 0x0,
- "Discontinous Reception Timer Max (DRX Timer Max)", HFILL }
+ "Discontinuous Reception Timer Max (DRX Timer Max)", HFILL }
},
{ &hf_gsm_a_rr_access_burst_type,
{ "Access Burst Type", "gsm_a.rr.access_burst_type",
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 364c764339..7273b99c75 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -2861,7 +2861,7 @@ if (!actx->value_ptr)
/* TODO: There may be more than one IE */
break;
default:
- proto_tree_add_text(subtree, actx->value_ptr, 0, length, "If you want this decdoded send the packet to Wireshark dev");
+ proto_tree_add_text(subtree, actx->value_ptr, 0, length, "If you want this decoded send the packet to Wireshark-dev");
break;
}/* switch(octet) */
break;
@@ -14068,7 +14068,7 @@ if (!actx->value_ptr)
/* TODO: There may be more than one IE */
break;
default:
- proto_tree_add_text(subtree, actx->value_ptr, 0, length, "If you want this decdoded send the packet to Wireshark dev");
+ proto_tree_add_text(subtree, actx->value_ptr, 0, length, "If you want this decoded send the packet to Wireshark-dev");
break;
}/* switch(octet) */
break;
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 5d8ae84178..dc8463a369 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -1192,7 +1192,7 @@ static const value_string ranap_cause_type[] = {
{5, "Tqueing Expiry"},
{6, "Relocation Triggered"},
{7, "TRELOCalloc Expiry"},
- {8, "Unable to Estabish During Relocation"},
+ {8, "Unable to Establish During Relocation"},
{9, "Unknown Target RNC"},
{10, "Relocation Cancelled"},
{11, "Successful Relocation"},
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index f726e05cff..98706cbf37 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -635,7 +635,7 @@ static const value_string package_name_vals[] = {
{ 0x003e, "H.248.23Multi-Frequency Tone Detection Package H.248.24" }, /* H.248.24 */
{ 0x003f, "Basic CAS Package H.248.25" }, /* H.248.25 */
{ 0x0040, "Robbed Bit Signalling Package H.248.25" }, /* H.248.25 */
- { 0x0041, "Operator Services and Emgergency Services Package H.248.25" },
+ { 0x0041, "Operator Services and Emergency Services Package H.248.25" },
{ 0x0042, "Operator Services Extension Package H.248.25" },
{ 0x0043, "Extended Analog Line Supervision Package H.248.26" },
{ 0x0044, "Automatic Metering Package H.248.26" },
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index c3b0108c29..7fcac97437 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -10812,9 +10812,9 @@ proto_register_ieee80211 (void)
"Max antennae station can support when compressed Beamforming feedback required", HFILL }},
{&txbf_csi_max_rows_bf,
- {"Maximum number of rows of CSI explicit feeback", "wlan_mgt.txbf.csi.maxrows",
+ {"Maximum number of rows of CSI explicit feedback", "wlan_mgt.txbf.csi.maxrows",
FT_UINT32, BASE_HEX, VALS (&txbf_csi_max_rows_bf_flags), 0x06000000,
- "Maximum number of rows of CSI explicit feeback", HFILL }},
+ "Maximum number of rows of CSI explicit feedback", HFILL }},
{&txbf_chan_est,
{"Maximum number of space time streams for which channel dimensions can be simultaneously estimated", "wlan_mgt.txbf.channelest",
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c
index 3f4cb612d6..444a30d779 100644
--- a/epan/dissectors/packet-ieee8021ah.c
+++ b/epan/dissectors/packet-ieee8021ah.c
@@ -385,7 +385,7 @@ proto_register_ieee8021ah(void)
0, 0xE000, "Priority", HFILL }},
{ &hf_ieee8021ad_cfi, {
"DEI", "ieee8021ad.dei", FT_UINT16, BASE_DEC,
- 0, 0x1000, "Drop Eligiblity", HFILL }},
+ 0, 0x1000, "Drop Eligibility", HFILL }},
{ &hf_ieee8021ad_id, {
"ID", "ieee8021ad.id", FT_UINT16, BASE_DEC,
0, 0x0FFF, "Vlan ID", HFILL }},
diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c
index 018ca026d8..e70c47ed49 100644
--- a/epan/dissectors/packet-image-png.c
+++ b/epan/dissectors/packet-image-png.c
@@ -280,7 +280,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
cd++;
}
if(chunk_tree){
- proto_item_append_text(chunk_tree, " %s", cd?cd->name:"(dont know how to dissect this)");
+ proto_item_append_text(chunk_tree, " %s", cd?cd->name:"(don't know how to dissect this)");
}
if(!cd){
diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c
index 37c45a6846..3e469baea7 100644
--- a/epan/dissectors/packet-ipmi-se.c
+++ b/epan/dissectors/packet-ipmi-se.c
@@ -566,17 +566,17 @@ get_evtype_info(unsigned int evtype)
struct evtype_info eti;
} eti_tab[] = {
{ 0x01, { etb2_thr, etb3_thr, etoff_01, eti_thr_2, eti_thr_3, "Threshold" }},
- { 0x02, { etb2_dscr, etb3_dscr, etoff_02, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x03, { etb2_dscr, etb3_dscr, etoff_03, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x04, { etb2_dscr, etb3_dscr, etoff_04, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x05, { etb2_dscr, etb3_dscr, etoff_05, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x06, { etb2_dscr, etb3_dscr, etoff_06, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x07, { etb2_dscr, etb3_dscr, etoff_07, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x08, { etb2_dscr, etb3_dscr, etoff_08, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x09, { etb2_dscr, etb3_dscr, etoff_09, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x0a, { etb2_dscr, etb3_dscr, etoff_0a, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x0b, { etb2_dscr, etb3_dscr, etoff_0b, eti_2_pst_sev, NULL, "Discreet" }},
- { 0x0c, { etb2_dscr, etb3_dscr, etoff_0c, eti_2_pst_sev, NULL, "Discreet" }},
+ { 0x02, { etb2_dscr, etb3_dscr, etoff_02, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x03, { etb2_dscr, etb3_dscr, etoff_03, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x04, { etb2_dscr, etb3_dscr, etoff_04, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x05, { etb2_dscr, etb3_dscr, etoff_05, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x06, { etb2_dscr, etb3_dscr, etoff_06, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x07, { etb2_dscr, etb3_dscr, etoff_07, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x08, { etb2_dscr, etb3_dscr, etoff_08, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x09, { etb2_dscr, etb3_dscr, etoff_09, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x0a, { etb2_dscr, etb3_dscr, etoff_0a, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x0b, { etb2_dscr, etb3_dscr, etoff_0b, eti_2_pst_sev, NULL, "Discrete" }},
+ { 0x0c, { etb2_dscr, etb3_dscr, etoff_0c, eti_2_pst_sev, NULL, "Discrete" }},
{ 0x6f, { etb2_dscr, etb3_dscr, NULL, eti_2_pst_sev, NULL, "Sensor-specific" }}
};
static const struct evtype_info eti_oem = {
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index e3e878d4d5..e53be4b757 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -597,7 +597,7 @@ dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
if (ISIS_LSP_CLV_METRIC_SUPPORTED(tvb_get_guint8(tvb, offset+2))) {
proto_tree_add_text (ntree, tvb, offset+2, 1, "Expense Metric: Not supported");
} else {
- proto_tree_add_text (ntree, tvb, offset+2, 1, "Exense Metric: %d, %s",
+ proto_tree_add_text (ntree, tvb, offset+2, 1, "Expense Metric: %d, %s",
ISIS_LSP_CLV_METRIC_VALUE(tvb_get_guint8(tvb, offset+2)),
ISIS_LSP_CLV_METRIC_IE(tvb_get_guint8(tvb, offset+2)) ? "External" : "Internal");
}
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 90b6c438cb..720952b488 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -8069,7 +8069,7 @@ proto_register_isup(void)
FT_UINT8, BASE_HEX, VALS(isup_cvr_cg_car_ind_value), BA_8BIT_MASK,
"", HFILL }},
{&hf_isup_cvr_cg_double_seize,
- {"Doube Seize Control", "cg_char_ind.doubleSeize",
+ {"Double Seize Control", "cg_char_ind.doubleSeize",
FT_UINT8, BASE_HEX, VALS(isup_cvr_cg_double_seize_value), DC_8BIT_MASK,
"", HFILL }},
{&hf_isup_cvr_cg_alarm_car_ind,
diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index b4494d2bd6..872df15cbd 100644
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -329,7 +329,7 @@ void proto_register_kdp(void) {
FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
},
{ &hf_kdp_body,
- { "Encyrpted Body", "kdp.body",
+ { "Encrypted Body", "kdp.body",
FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
},
{ &hf_kdp_xml_body,
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 303083e7ad..dd42446d7c 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -506,7 +506,7 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
static krb5_data data = {0,0,NULL};
krb5_keytab_entry key;
- /* dont do anything if we are not attempting to decrypt data */
+ /* don't do anything if we are not attempting to decrypt data */
if(!krb_decrypt){
return NULL;
}
@@ -642,7 +642,7 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
krb5_data data;
enc_key_t *ek;
- /* dont do anything if we are not attempting to decrypt data */
+ /* don't do anything if we are not attempting to decrypt data */
if(!krb_decrypt){
return NULL;
}
@@ -831,7 +831,7 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
struct des3_ctx ctx;
- /* dont do anything if we are not attempting to decrypt data */
+ /* don't do anything if we are not attempting to decrypt data */
if(!krb_decrypt){
return NULL;
}
@@ -1781,7 +1781,7 @@ static int dissect_krb5_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn
g_snprintf(address_str, 256, "%s", ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset, INET6_ADDRLEN)));
break;
default:
- proto_tree_add_text(tree, tvb, offset, len, "KRB Address: I dont know how to parse this type of address yet");
+ proto_tree_add_text(tree, tvb, offset, len, "KRB Address: I don't know how to parse this type of address yet");
}
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 3f9ae724e5..c490f08470 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -824,7 +824,7 @@ void proto_register_mgcp(void)
"Specific Endpoint ID", HFILL }},
{ &hf_mgcp_param_secondendpointid,
{ "SecondEndpointID (Z2)", "mgcp.param.secondendpointid", FT_STRING, BASE_DEC, NULL, 0x0,
- "Second Endpoing ID", HFILL }},
+ "Second Endpoint ID", HFILL }},
{ &hf_mgcp_param_reqinfo,
{ "RequestedInfo (F)", "mgcp.param.reqinfo", FT_STRING, BASE_DEC, NULL, 0x0,
"Requested Info", HFILL }},
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index c039ca700e..ad9fdfd61e 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -483,7 +483,7 @@ dissect_mp4ves_VideoObjectLayer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
}
}
if(bit_offset-current_bit_offset > 0)
- proto_tree_add_text(tree, tvb, current_bit_offset>>3, (bit_offset+7)>>3, "Not disected bits");
+ proto_tree_add_text(tree, tvb, current_bit_offset>>3, (bit_offset+7)>>3, "Not dissected bits");
/* video_object_layer_shape 2 uimsbf */
video_object_layer_shape = tvb_get_bits8(tvb,bit_offset, 2);
proto_tree_add_bits_item(tree, hf_mp4ves_video_object_layer_shape, tvb, bit_offset, 2, FALSE);
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 8830aeed89..8c3ca42228 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -669,7 +669,7 @@ void proto_register_mysql(void)
"", HFILL }},
{ &hf_mysql_cap_no_schema,
- { "Dont Allow database.table.column","mysql.caps.ns",
+ { "Don't Allow database.table.column","mysql.caps.ns",
FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_NS,
"", HFILL }},
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index a328a12570..c445f4ec2f 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -10914,7 +10914,7 @@ proto_register_nfs(void)
"Prot Info hash algorithm", "nfs.prot_info4_hash_alg", FT_UINT32, BASE_HEX,
NULL, 0, NULL, HFILL }},
{ &hf_nfs_prot_info4_encr_alg, {
- "Prot Info encription algorithm", "nfs.prot_info4_encr_alg", FT_UINT32, BASE_HEX,
+ "Prot Info encryption algorithm", "nfs.prot_info4_encr_alg", FT_UINT32, BASE_HEX,
NULL, 0, NULL, HFILL }},
{ &hf_nfs_prot_info4_svv_length, {
"Prot Info svv_length", "nfs.prot_info4_svv_length", FT_UINT32, BASE_HEX,
diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index 0ff10454c0..eea5d87d41 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -504,16 +504,16 @@ void lct_prefs_register(struct _lct_prefs *prefs, module_t *module)
prefs_register_enum_preference(module,
"lct.ext.192",
- "LCT header extention 192",
- "How to decode LCT header extention 192",
+ "LCT header extension 192",
+ "How to decode LCT header extension 192",
&prefs->ext_192,
enum_lct_ext_192,
FALSE);
prefs_register_enum_preference(module,
"lct.ext.193",
- "LCT header extention 193",
- "How to decode LCT header extention 193",
+ "LCT header extension 193",
+ "How to decode LCT header extension 193",
&prefs->ext_193,
enum_lct_ext_193,
FALSE);
diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c
index 44ebcc4947..e660448349 100644
--- a/epan/dissectors/packet-rtps2.c
+++ b/epan/dissectors/packet-rtps2.c
@@ -8069,7 +8069,7 @@ static void dissect_RTPS_DATA_BATCH(tvbuff_t *tvb,
tvb,
offset-4,
4,
- "Error: not enough bytes to dissec sample inof");
+ "Error: not enough bytes to dissect sample inof");
return;
}
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index 29406c0901..f71a0c065f 100644
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -785,8 +785,8 @@ proto_register_s5066(void)
&s5066_desegment);
prefs_register_bool_preference(s5066_module, "edition_one",
"Dissect edition 1.0 of STANAG 5066",
- "Whether the S5066 dissector should dissect editon 1 of the STANAG."
- " This editon was never formally approved and is very rare. The common edition is editon 1.2.",
+ "Whether the S5066 dissector should dissect this edition of the STANAG."
+ " This edition was never formally approved and is very rare. The common edition is edition 1.2.",
&s5066_edition_one);
prefs_register_uint_preference(s5066_module, "tcp.port",
"STANAG 5066 TCP Port",
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 7cf715c09b..e9dd30464e 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -374,7 +374,7 @@ dissect_osd_attributes_list(packet_info *pinfo, tvbuff_t *tvb, int offset, proto
offset+=attribute_length;
break;
default:
- proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "Dont know how to decode this attribute list type:0x%02x",type);
+ proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "Don't know how to decode this attribute list type:0x%02x",type);
return;
}
}
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index f7c03b6bb5..fbb107b687 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -146,7 +146,7 @@ static gint ett_scsi_writesame = -1;
static const true_false_string dpo_tfs = {
- "Disable Page Out (dont cache this data)",
+ "Disable Page Out (don't cache this data)",
"Disable page out is DISABLED (cache this data)"
};
static const true_false_string fua_tfs = {
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 8b63d426fc..a7e53c265c 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -2605,7 +2605,7 @@ static const true_false_string sctp_data_chunk_b_bit_value = {
static const true_false_string sctp_data_chunk_u_bit_value = {
"Unordered delivery",
- "Ordered deliviery"
+ "Ordered delivery"
};
static const true_false_string sctp_data_chunk_i_bit_value = {
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 31c32e032c..b717fea6b2 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -351,7 +351,7 @@ static const value_string vals_command_status[] = { /* Status */
{ 0x00000059, "[Reserved]" },
{ 0x00000060, "[Reserved]" },
{ 0x00000061, "Invalid scheduled delivery time" },
- { 0x00000062, "Invalid message validity period (expirey time)" },
+ { 0x00000062, "Invalid message validity period (expiry time)" },
{ 0x00000063, "Predefined message invalid or not found" },
{ 0x00000064, "ESME receiver temporary app error code" },
{ 0x00000065, "ESME receiver permanent app error code" },
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 974b0d4a24..a22aba361f 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-snmp.c */
-/* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . snmp.asn */
+/* ../../tools/asn2wrs.py -b -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn */
/* Input file: packet-snmp-template.c */
@@ -648,7 +648,7 @@ extern int dissect_snmp_VarBind(gboolean implicit_tag _U_,
switch(k->key_type) {
case OID_KEY_TYPE_WRONG: {
- proto_item* pi = proto_tree_add_text(pt_name,tvb,0,0,"OID instaces not handled, if you want this implemented please contact the wireshark developpers");
+ proto_item* pi = proto_tree_add_text(pt_name,tvb,0,0,"OID instaces not handled, if you want this implemented please contact the wireshark developers");
expert_add_info_format(actx->pinfo, pi, PI_UNDECODED, PI_WARN, "Unimplemented instance index");
oid_info_is_ok = FALSE;
goto indexing_done;
@@ -2214,13 +2214,13 @@ dissect_snmp_T_encryptedPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
if (! check_ScopedPdu(cleartext_tvb)) {
proto_item* cause = proto_tree_add_text(encryptedpdu_tree, cleartext_tvb, 0, -1,
- "Decrypted data not formated as expected, wrong key?");
+ "Decrypted data not formatted as expected, wrong key?");
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN,
- "Decrypted data not formated as expected");
+ "Decrypted data not formatted as expected");
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_set_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Decrypted data not formated as expected");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Decrypted data not formatted as expected");
return offset;
}
diff --git a/epan/dissectors/packet-snmp.h b/epan/dissectors/packet-snmp.h
index d246561083..3aa0d29323 100644
--- a/epan/dissectors/packet-snmp.h
+++ b/epan/dissectors/packet-snmp.h
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-snmp.h */
-/* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . snmp.asn */
+/* ../../tools/asn2wrs.py -b -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn */
/* Input file: packet-snmp-template.h */
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 394490424e..a9e5750a1c 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -370,7 +370,7 @@ dissect_authblk(tvbuff_t *tvb, int offset, proto_tree *tree)
} else {
proto_tree_add_text(tree, tvb, offset, 8, "Timestamp not representable");
}
- proto_tree_add_text(tree, tvb, offset + 8, 2, "Block Structure Desciptor: %u",
+ proto_tree_add_text(tree, tvb, offset + 8, 2, "Block Structure Descriptor: %u",
tvb_get_ntohs(tvb, offset + 8));
length = tvb_get_ntohs(tvb, offset + 10);
proto_tree_add_text(tree, tvb, offset + 10, 2, "Authenticator length: %u",
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 7fc4c3afde..b861b5165b 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -175,7 +175,7 @@ static const value_string message_class_type_values[] = {
{ MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_REQ , "Registration Request (REG_REQ)" },
{ MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_RSP , "Registartion Response (REG_RSP)" },
{ MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_DEREG_REQ , "Deregistration Request (DEREG_REQ)" },
- { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_DEREG_RSP , "Deregistartion Response (DEREG_RSP)" },
+ { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_DEREG_RSP , "Deregistration Response (DEREG_RSP)" },
{ 0, NULL } };
static const value_string message_class_type_acro_values[] = {