Bill Meier:

  Spelling fixes.

svn path=/trunk/; revision=16956

diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index ea65a9c46746b55d033e0c73f8ab21f8e4116bec..5052113cae01657cb8ffe28db54ac21c8857a9fb 100644 (file)
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -1542,11 +1542,11 @@ void proto_register_gsm_map(void) {
         FT_UINT8, BASE_HEX, VALS(gsm_map_number_plan_values), 0x0f,
         "Number plan", HFILL }},
        { &hf_gsm_map_isdn_address_digits,
-      { "ISDN Address digits", "gsm_map.isdn.adress.digits",
+      { "ISDN Address digits", "gsm_map.isdn.address.digits",
         FT_STRING, BASE_NONE, NULL, 0,
         "ISDN Address digits", HFILL }},
        { &hf_gsm_map_address_digits,
-      { "Address digits", "gsm_map.adress.digits",
+      { "Address digits", "gsm_map.address.digits",
         FT_STRING, BASE_NONE, NULL, 0,
         "Address digits", HFILL }},
        { &hf_gsm_map_servicecentreaddress_digits,

diff --git a/asn1/mms/mms.asn b/asn1/mms/mms.asn
index 5caaa4d6b6726ec2717e9776580309830fca5a37..d6ba3a3402287141933714889ee1c7c086034e9a 100644 (file)
--- a/asn1/mms/mms.asn
+++ b/asn1/mms/mms.asn
@@ -1368,7 +1368,7 @@ DataAccessError ::= INTEGER
        {
        object-invalidated              (0),
        hardware-fault                  (1),
-       temporarly-unavailable          (2),
+       temporarily-unavailable         (2),
        object-access-denied            (3),
        object-undefined                (4),
        invalid-address                 (5),

diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index cea92200ab2977b7469319c27ef4f9879cea9625..f7a841277f48b0b1d9d8d2bb850084bf363675f8 100644 (file)
--- a/epan/dissectors/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
@@ -5399,8 +5399,8 @@ def define_errors():
        errors[0xc501] = "Login lockout"
        errors[0xc502] = "Server Login Locked"
 
-       errors[0xc600] = "The caller does not have operator priviliges"
-       errors[0xc601] = "The client does not have operator priviliges"
+       errors[0xc600] = "The caller does not have operator privileges"
+       errors[0xc601] = "The client does not have operator privileges"
 
        errors[0xc800] = "Missing EA Key"
        errors[0xc900] = "EA Not Found"

diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index b8d1e76ab40735d8c477f3ba994cabfd98cd1460..aa57a2414a0a47d8ffdb88b19bb55bb4115c17f3 100644 (file)
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -1401,7 +1401,7 @@ void proto_register_a11(void)
                   "Broadcast Datagrams requested", HFILL }
          },
          { &hf_a11_d,
-                { "Co-lcated Care-of Address",           "a11.d",
+                { "Co-located Care-of Address",           "a11.d",
                   FT_BOOLEAN, 8, NULL, 32,          
                   "MN using Co-located Care-of address", HFILL }
          },

diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index ed210ab8876931e94aa78989ec4c85b906245c45..39a4802381ebe51347b4a5417e428673fb91f94b 100644 (file)
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -4621,7 +4621,7 @@ proto_register_afp(void)
     { &hf_afp_dir_bitmap_UTF8Name,
       { "UTF-8 name",         "afp.dir_bitmap.UTF8_name",
        FT_BOOLEAN, 16, NULL,  kFPUTF8NameBit,
-       "Return UTF-8 name if diectory", HFILL }},
+       "Return UTF-8 name if directory", HFILL }},
 
     { &hf_afp_dir_bitmap_UnixPrivs,
       { "UNIX privileges",         "afp.dir_bitmap.unix_privs",

diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index 105cb7105a089cc9c9f039d76f298a940e02e85a..1f1e6b340db9811ef2e4746597298074ff6bd257 100644 (file)
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -428,8 +428,8 @@ static gchar* dissect_fields_cau(packet_info* pinfo, tvbuff_t *tvb, proto_tree *
     proto_item* pi;
     
     if (len < 2) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -497,8 +497,8 @@ static gchar* dissect_fields_ceid(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
     proto_item* pi;
     
     if (len != 5) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }        
     
@@ -532,8 +532,8 @@ static gchar* dissect_fields_desea(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
     e164_info_t* e164;
 
     if (len < 2) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }        
     
@@ -560,8 +560,8 @@ static gchar* dissect_fields_oesea(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
     e164_info_t* e164;
     
     if (len < 2) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }        
     
@@ -586,8 +586,8 @@ static gchar* dissect_fields_dnsea(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      */
     
     if (len < 1) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }        
     
@@ -607,8 +607,8 @@ static gchar* dissect_fields_onsea(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      */
     
     if (len < 1) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -631,8 +631,8 @@ static gchar* dissect_fields_alc(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tr
      */
     
     if (len != 12) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -659,8 +659,8 @@ static gchar* dissect_fields_plc(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tr
      */
     
     if (len != 12) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -683,8 +683,8 @@ static gchar* dissect_fields_osaid(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      * 7.4.2 Signalling Association Identifier -> Originating Signalling Association
      */
     if (len != 4) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -702,8 +702,8 @@ static gchar* dissect_fields_sugr(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
      * 7.4.10 Served User Generated Reference
      */
     if (len != 4) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -721,8 +721,8 @@ static gchar* dissect_fields_suci(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
      * 7.4.22 Served user correlation ID
      */
     if (len != 4) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -738,8 +738,8 @@ static gchar* dissect_fields_ssia(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
      * 7.4.5 Organizational Unique Identifier
      */
     if (len != 8) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -770,8 +770,8 @@ static gchar* dissect_fields_ssim(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
      * 7.4.7 Multirate Service
      */
     if (len != 3) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -789,8 +789,8 @@ static gchar* dissect_fields_ssisa(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      * 7.4.8 Segmentation and Reassembly (Assured Data Transfer)
      */
     if (len != 14) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
 
@@ -813,8 +813,8 @@ static gchar* dissect_fields_ssisu(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      * 7.4.9 Segmentation and Reassembly (Unassured Data Transfer)
      */
     if (len != 7) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -837,8 +837,8 @@ static gchar* dissect_fields_none(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
      *
      */
     if (len != 0) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -853,8 +853,8 @@ static gchar* dissect_fields_ssiae(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      * 7.4.5 Organizational unique identifier
      */
     if (len != 8) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -889,8 +889,8 @@ static gchar* dissect_fields_pssiae(packet_info* pinfo _U_, tvbuff_t *tvb, proto
      * 7.4.5 Organizational unique identifier
      */
     if (len != 8) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -924,8 +924,8 @@ static gchar* dissect_fields_ssime(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      * 7.4.20 Multirate extended service
      */
     if (len != 3) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -944,8 +944,8 @@ static gchar* dissect_fields_pssime(packet_info* pinfo _U_, tvbuff_t *tvb, proto
      * 7.4.20 Multirate extended service
      */
     if (len != 3) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -964,8 +964,8 @@ static gchar* dissect_fields_acc(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tr
      * 7.4.23 AAL type 2 Node Automatic Congestion Level
      */
     if (len != 1) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -981,8 +981,8 @@ static gchar* dissect_fields_cp(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tre
      * 7.4.24 Priority
      */
     if (len != 1) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -997,8 +997,8 @@ static gchar* dissect_fields_pt(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tre
      * 7.4.21 AAL Type 2 Path QoS Codepoint
      */
     if (len != 1) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -1014,8 +1014,8 @@ static gchar* dissect_fields_hc(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tre
      * 7.4.25 AAL type 2 Hop Counter
      */
     if (len != 1) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -1033,8 +1033,8 @@ static gchar* dissect_fields_fbw(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tr
      * 7.4.28 Maximum allowed CPS packet size
      */
     if (len != 12) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -1057,8 +1057,8 @@ static gchar* dissect_fields_pfbw(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
      * 7.4.28 Maximum allowed CPS packet size
      */
     if (len != 12) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -1082,8 +1082,8 @@ static gchar* dissect_fields_vbws(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
      * 7.4.29 Source Traffic Type
      */
     if (len != 13) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -1109,8 +1109,8 @@ static gchar* dissect_fields_pvbws(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      * 7.4.29 Source Traffic Type
      */
     if (len != 13) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -1139,8 +1139,8 @@ static gchar* dissect_fields_pvbwt(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
      */
     
     if (len != 22) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -1173,8 +1173,8 @@ static gchar* dissect_fields_vbwt(packet_info* pinfo _U_, tvbuff_t *tvb, proto_t
      * 7.4.28 Maximum allowed CPS packet size
      */
     if (len != 22) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     
@@ -1205,8 +1205,8 @@ static gchar* dissect_fields_sut(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tr
     guint sut_len;
     
     if (len < 2) {
-        proto_item* bad_lenght = proto_tree_add_text(tree, tvb, offset, len,"[Wrong lenght for parameter fields]");
-        proto_item_set_expert_flags(bad_lenght, PI_MALFORMED, PI_WARN);
+        proto_item* bad_length = proto_tree_add_text(tree, tvb, offset, len,"[Wrong length for parameter fields]");
+        proto_item_set_expert_flags(bad_length, PI_MALFORMED, PI_WARN);
         return NULL;
     }
     

diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 079599f6e37631ee8a7022726d7c26cc1e5a584b..494c4fd330e7eb3bc62ea60b6b2225f5f5b63fc2 100644 (file)
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -445,7 +445,7 @@ proto_register_amr(void)
 
        prefs_register_uint_preference(amr_module, "dynamic.payload.type",
                                                                   "AMR dynamic payload type",
-                                                                  "The dynamic payload type which will be interpretyed as AMR",
+                                                                  "The dynamic payload type which will be interpreted as AMR",
                                                                   10,
                                                                   &temp_dynamic_payload_type);
 

diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index c42c2c6940921e27b96fed559ec023e65133f59c..5f009b2ac7934e2de166ce3e0cb6cadc3d8b7f48 100644 (file)
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -9517,7 +9517,7 @@ param_dereg(ASN1_SCK *asn1, proto_tree *tree, guint len, gchar *add_string _U_,
     {
     case 0: str = "Not used"; break;
     case 1: str = "Deregister for an unspecified reason"; break;
-    case 2: str = "Deregister for an adminstrative reason"; break;
+    case 2: str = "Deregister for an administrative reason"; break;
     case 3: str = "Deregister due to MS power down"; break;
     default:
        if ((value >= 4) && (value <= 223)) { str = "Reserved, treat as Deregister for an unspecified reason"; }

diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index 74929af3b912a4f07f7ece362da11a3cbe1a36e5..34664ba05b92789b1dae078a879415041f911b5b 100644 (file)
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -147,7 +147,7 @@ static const value_string ata_cmd_vals[] = {
   { 0xc8, "Read dma (with retry)" },
   { 0xc9, "Read dma (no retry)" },
   { 0xca, "Write dma (with retry)" },
-  { 0xcb, "Write dma (no retru)" },
+  { 0xcb, "Write dma (no retry)" },
   { 0xde, "Door lock" },
   { 0xdf, "Door unlock" },
   { 0xe0, "Standy immediate" },

diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 676c4f5f6bf975b7574ef9783436a5e756cf7f26..4d4fdcb9aaf6ae04a9cf452ae15d97daffcb5fac 100644 (file)
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -781,7 +781,7 @@ proto_register_bpdu(void)
        FT_UINT8,       BASE_DEC,       NULL,   0x0,
        "", HFILL }},
     { &hf_bpdu_msti_port_identifier_priority,
-      { "Port identifier prority",             "mstp.msti.port_priority",
+      { "Port identifier priority",            "mstp.msti.port_priority",
        FT_UINT8,       BASE_DEC,       NULL,   0x0,
        "", HFILL }},
     { &hf_bpdu_msti_remaining_hops,

diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index 953cde014bf21f202632d033121ca3307f7a2dae..3ce60b84044bce10af93dc8112dd1c0cda4b3784 100644 (file)
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
@@ -129,7 +129,7 @@ static const true_false_string tfs_error_ef = {
 };
 static const true_false_string tfs_error_nd = {
        "This Frame has NO Data",
-       "This frame carriues data"
+       "This frame carries data"
 };
 static const true_false_string tfs_error_tr = {
        "This frame is TRUNCATED",

diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 1688d397feb0951b23a738fd4d21d3a9788cddb6..480387e18372f0e5361b0cd1ab8da98aa181f28f 100644 (file)
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -1736,7 +1736,7 @@ decode_iei_cause(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) {
     { 0x2a, "Unknown destination address" },
     { 0x2b, "Unknown RIM application identity" },
     { 0x2c, "Invalid container unit information" },
-    { 0x2d, "PFC queing" },
+    { 0x2d, "PFC queuing" },
     { 0x2e, "PFC created successfully" },
     { 0,    NULL },
   };
@@ -3264,7 +3264,7 @@ decode_iei_feature_bitmap(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset)
 
   value = get_masked_guint8(data, MASK_INR);
   pi = proto_tree_add_bitfield8(tf, bi->tvb, bi->offset, MASK_INR);
-  proto_item_append_text(pi, "INR: Inter-NSE re-routeing%s supoprted",
+  proto_item_append_text(pi, "INR: Inter-NSE re-routeing%s supported",
                         value == 0 ? " not" : "");
   
   value = get_masked_guint8(data, MASK_CBL);
@@ -3715,7 +3715,7 @@ decode_iei_positioning_data(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offse
     value = get_masked_guint8(data, MASK_USAGE);
 
     switch (value) {
-    case 0: proto_item_append_text(pi, " attempted unsuccessfully due to failure or interuption "); break;
+    case 0: proto_item_append_text(pi, " attempted unsuccessfully due to failure or interruption "); break;
     case 1: proto_item_append_text(pi, " attempted successfully: results not used to generate location"); break;
     case 2: proto_item_append_text(pi, " attempted successfully: results used to verify but not generate location"); break;
     case 3: proto_item_append_text(pi, "attempted successfully: results used to generate location"); break;

diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c
index 5320601e080485d61380df6053db5c602120b3e5..f244c19bb0711cfd1334ea64fb82a271de677eb0 100644 (file)
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@@ -60,7 +60,7 @@
 
 
 #define CSM_ENCAPS_CTRL_ACK                     0x80
-#define CSM_ENCAPS_CTRL_ACK_SUPRESS             0x40
+#define CSM_ENCAPS_CTRL_ACK_SUPPRESS            0x40
 #define CSM_ENCAPS_CTRL_ACK_TO_HOST         0x20
 #define CSM_ENCAPS_CTRL_ENDIAN              0x01
 
@@ -116,7 +116,7 @@ static int hf_csm_encaps_seq              = -1;
 static int hf_csm_encaps_ctrl             = -1;
 static int hf_csm_encaps_ctrl_endian      = -1;
 static int hf_csm_encaps_ctrl_ack         = -1;
-static int hf_csm_encaps_ctrl_ack_supress = -1;
+static int hf_csm_encaps_ctrl_ack_suppress = -1;
 static int hf_csm_encaps_channel          = -1;
 static int hf_csm_encaps_index            = -1;
 static int hf_csm_encaps_length           = -1;
@@ -288,7 +288,7 @@ dissect_csm_encaps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                csm_encaps_control_tree = proto_item_add_subtree(subitem, ett_csm_encaps_control);
 
                    proto_tree_add_boolean(csm_encaps_control_tree, hf_csm_encaps_ctrl_ack, tvb, 3, 1, control);
-               proto_tree_add_boolean(csm_encaps_control_tree, hf_csm_encaps_ctrl_ack_supress, tvb, 3, 1, control);
+               proto_tree_add_boolean(csm_encaps_control_tree, hf_csm_encaps_ctrl_ack_suppress, tvb, 3, 1, control);
                    proto_tree_add_boolean(csm_encaps_control_tree, hf_csm_encaps_ctrl_endian, tvb, 3, 1, control);
 
                proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_channel, tvb, 4, 2, FALSE);
@@ -360,7 +360,7 @@ proto_register_csm_encaps(void)
 {
        static struct true_false_string control_endian_bit      = {"Little Endian","Big Endian"};
        static struct true_false_string control_ack_bit         = {"ACK Packet", "Message Packet"};
-       static struct true_false_string control_ack_supress_bit = {"ACK Supressed", "ACK Required"};
+       static struct true_false_string control_ack_suppress_bit = {"ACK Suppressed", "ACK Required"};
 
 
        static hf_register_info hf[] = {
@@ -386,10 +386,10 @@ proto_register_csm_encaps(void)
                        FT_BOOLEAN, 8, TFS(&control_ack_bit), CSM_ENCAPS_CTRL_ACK,
                        "Message Packet/ACK Packet", HFILL }
                },
-               { &hf_csm_encaps_ctrl_ack_supress,
-                  { "ACK Supress Bit", "csm_encaps.ctrl.ack_supress",
-                       FT_BOOLEAN, 8, TFS(&control_ack_supress_bit), CSM_ENCAPS_CTRL_ACK_SUPRESS,
-                       "ACK Required/ACK Supressed", HFILL }
+               { &hf_csm_encaps_ctrl_ack_suppress,
+                  { "ACK Suppress Bit",        "csm_encaps.ctrl.ack_suppress",
+                       FT_BOOLEAN, 8, TFS(&control_ack_suppress_bit), CSM_ENCAPS_CTRL_ACK_SUPPRESS,
+                       "ACK Required/ACK Suppressed", HFILL }
                },
                { &hf_csm_encaps_ctrl_endian,
                   { "Endian Bit",      "csm_encaps.ctrl.endian",

diff --git a/epan/dissectors/packet-dcerpc-dce122.c b/epan/dissectors/packet-dcerpc-dce122.c
index d86869e92773dccd16a69fd64a981f847ee1130c..fad4da9d34e06a230673627ebf2dd19ed51563fc 100644 (file)
--- a/epan/dissectors/packet-dcerpc-dce122.c
+++ b/epan/dissectors/packet-dcerpc-dce122.c
@@ -31,7 +31,7 @@ const value_string dce_error_vals[] = {
 { 0, "SUCCESS", },
 { 539918337, "event already in set" },
 { 539918338, "event still part of some set" },
-{ 539918339, "illegal invalid or inconsistent arguments" },
+{ 539918339, "illegal, invalid or inconsistent arguments" },
 { 539918340, "too many initialized devices" },
 { 539918341, "no such device" },
 { 539918342, "device no longer available" },
@@ -449,7 +449,7 @@ const value_string dce_error_vals[] = {
 { 572833819, "The restored fileset is inconsistent" },
 { 572833820, "Validation failure for the ACL being restored" },
 { 572833821, "ACL being restored has a bad entry type" },
-{ 572833822, "Mismatch betwwen aggregate minor version number and DM management status; run salvage" },
+{ 572833822, "Mismatch between aggregate minor version number and DM management status; run salvage" },
 { 572833823, "DM aggregate being attached as native Episode aggregate and without -force switch; check dfstab file" },
 { 572833824, "Non-DM aggregate being attached as DM aggregate; check dfstab file" },
 { 572833825, "Validation failure for the extended attribute list being restored" },
@@ -615,7 +615,7 @@ const value_string dce_error_vals[] = {
 { 668147722, "problems with host name" },
 { 668147723, "bad operation for this transaction type" },
 { 668147724, "two commits or aborts done to transaction" },
-{ 668147725, "operation done after abort (or commmit)" },
+{ 668147725, "operation done after abort (or commit)" },
 { 668147726, "no servers appear to be up" },
 { 668147727, "premature EOF" },
 { 668147728, "error writing log file" },
@@ -995,7 +995,7 @@ const value_string dce_error_vals[] = {
 { 700887066, "principal: .s expires: .s" },
 { 700887067, "cred file: .s" },
 { 700887068, "no flservers available" },
-{ 700887069, "freelist exhausted, queueing call" },
+{ 700887069, "freelist exhausted, queuing call" },
 { 700887070, "License server sent event:.d " },
 { 700887071, "license event type .d .s" },
 { 700887072, "condensing request: .d" },
@@ -1420,7 +1420,7 @@ const value_string dce_error_vals[] = {
 { 701088139, "CM cm_RefreshKeepAlives(): overwriting expr of .x (fid .x..x..x..x), was .d" },
 { 701088140, "CM cm_StoreDCache: storing chunk without tokens, fid .x..x..x..x, from .lu,,.lu for .lu (scp = .x)" },
 { 701088141, "CM cm_StoreDCache: storing offline chunk, fid .x..x..x..x, from .lu,,.lu for .lu (dcp = .x)" },
-{ 701088142, "CM cm_ReclaimVDirs: Vdir count is .d, so reclaming" },
+{ 701088142, "CM cm_ReclaimVDirs: Vdir count is .d, so reclaiming" },
 { 701088143, "CM cm_ReclaimVDirs: scp .x, name '.s', giving vp .x; vdirp states .#lx" },
 { 701088144, "CM cm_ReclaimVDirs: Ending; inspected .d vdirs; freed .d vdirs; count .d" },
 { 701088145, "CM cm_GCVDirs: Ending; vdir count is now .d, after .d loops" },
@@ -2146,7 +2146,7 @@ const value_string dce_error_vals[] = {
 { 701219176, "dmefs_BusyCode(pairid .d): raw delay .d, log4 .d, truncDelay .d" },
 { 701219177, "dmepi_setRetDestroy aggrp .#x, attr '.s', doEnable .d" },
 { 701219178, "dmepi_setRetDestroy returning code .d" },
-{ 701219179, "dmvn_inactive: enqueueing locked vnode .#x" },
+{ 701219179, "dmvn_inactive: enqueuing locked vnode .#x" },
 { 701219180, "dmvn_inactive: vp .#x, getVol errors with code .d" },
 { 701219181, "dmvn_inactive: vp .#x, getHdl errors with code .d" },
 { 701219182, "makeDestroy(vp .#x, evtset .x,,.x) called" },
@@ -2364,7 +2364,7 @@ const value_string dce_error_vals[] = {
 { 701247631, "dacl_From_SecAcl: unrecognized entry type, .d, found in secAclP" },
 { 701247632, "dacl_From_SecAcl: error allocating extended entry array buffer" },
 { 701247633, "dacl_From_SecAcl: error incorrect ACL manager uuid in secAclP" },
-{ 701247634, "dacl_To_SecAcl_ExtendedInfo: error allocating buttfer for extended info for secAclEntryP" },
+{ 701247634, "dacl_To_SecAcl_ExtendedInfo: error allocating buffer for extended info for secAclEntryP" },
 { 701247635, "dacl_To_SecAcl: unrecoginzed entry type, .d, found in daclP" },
 { 701247636, "dacl_To_SecAcl: error allocating buffer for secAclP entries" },
 { 701247637, "dacl_InitPac: no passwd file entry found for .s" },
@@ -2452,7 +2452,7 @@ const value_string dce_error_vals[] = {
 { 701272071, "dmrpc_finish: .d reqs allocated .d on free list" },
 { 701272072, "dmrpc_finish: returning 0" },
 { 701272073, "dmrpc_close: clearing .d opens" },
-{ 701272074, "dmrpc_close: returing 0" },
+{ 701272074, "dmrpc_close: returning 0" },
 { 701272075, "dmrpc_read: starting; uiop .x" },
 { 701272076, "dmrpc_read: done; uiop .x returning .d" },
 { 701272077, "dmrpc_write: interrupted code .d; returning EINTR" },
@@ -3390,7 +3390,7 @@ const value_string dce_error_vals[] = {
 { 701931629, "FSHS fshs_AddrReact: host .x: ip addr .x redirected to .x" },
 { 701931630, "FSHS fshs_AddrReact: host .x: ip addr .x got err .d, no replacement" },
 { 701931631, "FSHS fshs_AddrReact: host .x: ip addr .x got err .d, so moving to ip .x" },
-{ 701931632, "FSHS newSAddr: Host .x: reviving exising IP .x (killed at .d with .d)" },
+{ 701931632, "FSHS newSAddr: Host .x: reviving existing IP .x (killed at .d with .d)" },
 { 701931633, "FSHS TKN_TokenRevoke to address .x rtns code .d in .d secs" },
 { 702357505, "TKC gettoken start vcp 0x.x type 0x.x" },
 { 702357506, "TKC gettoken back, code .d" },

diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index c5a848a18e0ec478b8d6bab013d54f6a124cb041..0204735299a0ef79aaf890a7d5617d6e2460dfe3 100644 (file)
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -4586,7 +4586,7 @@ static const true_false_string get_dcname_request_flags_pdc_required = {
        "pdc server is NOT required"
 };
 static const true_false_string get_dcname_request_flags_background_only = {
-       "Only returned cahced data, even if it has expired",
+       "Only return cached data, even if it has expired",
        "Return cached data unless it has expired"
 };
 static const true_false_string get_dcname_request_flags_ip_required = {
@@ -7270,7 +7270,7 @@ static hf_register_info hf[] = {
        { &hf_netlogon_get_dcname_request_flags_timeserv_required,
                { "Timeserv Required", "netlogon.get_dcname.request.flags.timeserv_required",
                  FT_BOOLEAN, 32, TFS(&get_dcname_request_flags_timeserv_required), DS_TIMESERV_REQUIRED,
-                 "If we require the retruned server to be a NTP serveruns WindowsTimeServicer", HFILL }},
+                 "If we require the returned server to be a NTP serveruns WindowsTimeServicer", HFILL }},
 
        { &hf_netlogon_get_dcname_request_flags_writable_required,
                { "Writable Required", "netlogon.get_dcname.request.flags.writable_required",

diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c
index 8c6e17d77fd59164718d903383584d6f78cf57e5..91685be5b10437778c9422033996d9e4d48bd64f 100644 (file)
--- a/epan/dissectors/packet-dcerpc-wkssvc.c
+++ b/epan/dissectors/packet-dcerpc-wkssvc.c
@@ -1131,7 +1131,7 @@ static const true_false_string unjoin_flags_acct_delete = {
 };
 
 static const true_false_string join_flags_win9x_upgrade = {
-       "The join operation is occuring as part of an upgrade of Windows 9x",
+       "The join operation is occurring as part of an upgrade of Windows 9x",
        "The join operation is not part of a Windows 9x upgrade"
 };
 

diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 9ae8b337afc9e4796a3fe79e41e098c3e95c9a35..15e96839a4be90c542c3e9f3d79f68e6ac02d64d 100644 (file)
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -243,7 +243,7 @@ static gboolean gbl_diameter_desegment = TRUE;
 /* Allow zero as a valid application ID */
 static gboolean allow_zero_as_app_id = TRUE;
 
-/* Supress console output at unknown AVP:s,Flags etc */
+/* Suppress console output at unknown AVP:s,Flags etc */
 static gboolean suppress_console_output = TRUE;
 
 #define DICT_FN  "diameter/dictionary.xml"
@@ -2269,7 +2269,7 @@ proto_register_diameter(void)
                        &allow_zero_as_app_id);
        /* Register some preferences we no longer support, so we can report
           them as obsolete rather than just illegal. */
-       /* Supress console output or not */
+       /* Suppress console output or not */
        prefs_register_bool_preference(diameter_module, "suppress_console_output",
                        "Suppress console output for unknown AVP:s Flags etc.",
                        "If console output for errors should be suppressed or not",

diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index c79e5b4b209f8fb2d32dacfae0286641a3af16c9..e60d0130f242d57eedd1d984cb4606e6e4caa3a6 100644 (file)
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -245,7 +245,7 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
    dlsw_header_tree = proto_item_add_subtree(ti2, ett_dlsw_header);
    proto_tree_add_text (dlsw_header_tree,tvb,0 ,1,"Version        = %s",
-    val_to_str(version , dlsw_version_vals, "Unknown Version, dissection may be innacurate"));
+    val_to_str(version , dlsw_version_vals, "Unknown Version, dissection may be inaccurate"));
    proto_tree_add_text (dlsw_header_tree,tvb,1 ,1,"Header Length  = %u",hlen) ;
    mlen=tvb_get_ntohs(tvb,2);
    proto_tree_add_text (dlsw_header_tree,tvb,2 ,2,"Message Length = %u",mlen);

diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c
index 6a6345b27b556e8bcbe6d384a32ba60021594c2f..b5f62fc6e0d39d2d11d9ecfde235a557bb6a59af 100644 (file)
--- a/epan/dissectors/packet-gsm_a.c
+++ b/epan/dissectors/packet-gsm_a.c
@@ -482,7 +482,7 @@ static const value_string gsm_bssmap_elem_strings[] = {
     { 0x2f,    "Time Indication" },
     { 0x30,    "Resource Situation" },
     { 0x31,    "Current Channel Type 1" },
-    { 0x32,    "Queueing Indicator" },
+    { 0x32,    "Queuing Indicator" },
     { 0x40,    "Speech Version" },
     { 0x33,    "Assignment Requirement" },
     { 0x35,    "Talker Flag" },

diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 33a7316e7a18d5176d58ddf57decaa222c953422..4bac6a9e80fcf97025ef8e89009becbc7f30497e 100644 (file)
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -15583,11 +15583,11 @@ void proto_register_gsm_map(void) {
         FT_UINT8, BASE_HEX, VALS(gsm_map_number_plan_values), 0x0f,
         "Number plan", HFILL }},
        { &hf_gsm_map_isdn_address_digits,
-      { "ISDN Address digits", "gsm_map.isdn.adress.digits",
+      { "ISDN Address digits", "gsm_map.isdn.address.digits",
         FT_STRING, BASE_NONE, NULL, 0,
         "ISDN Address digits", HFILL }},
        { &hf_gsm_map_address_digits,
-      { "Address digits", "gsm_map.adress.digits",
+      { "Address digits", "gsm_map.address.digits",
         FT_STRING, BASE_NONE, NULL, 0,
         "Address digits", HFILL }},
        { &hf_gsm_map_servicecentreaddress_digits,

diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 9862b5982248502c2baa5b9dccbe509661c26c45..266e016d072d7eecc55e14ef22459aa0c6411d05 100644 (file)
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -2043,7 +2043,7 @@ proto_register_iax2 (void)
 
     {&hf_iax2_iseqno,
      {"Inbound seq.no.", "iax2.iseqno", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "iseqno is the sequence no of the last successfully recieved packet",
+      "iseqno is the sequence no of the last successfully received packet",
       HFILL}},
 
     {&hf_iax2_type,

diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index dcc31cfdd0fb03a3ac18e2baf720260e8bf67eaa..9b76e207d4a54762db2c8246fb8d0c0c52e31892 100644 (file)
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -126,7 +126,7 @@ static int hf_access_key = -1;
 static int hf_max_resp = -1;
 static int hf_max_resp_exp = -1;
 static int hf_max_resp_mant = -1;
-static int hf_supress = -1;
+static int hf_suppress = -1;
 static int hf_qrv = -1;
 static int hf_qqic = -1;
 static int hf_num_src = -1;
@@ -243,8 +243,8 @@ static const value_string vs_reply_code[] = {
 };
 
 static const true_false_string tfs_s = {
-       "SUPRESS router side processing",
-       "Do not supress router side processing"
+       "SUPPRESS router side processing",
+       "Do not suppress router side processing"
 };
 
 #define IGMP_V3_MODE_IS_INCLUDE                1
@@ -428,7 +428,7 @@ dissect_v3_sqrv_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
        tree = proto_item_add_subtree(item, ett_sqrv_bits);
 
        /* S flag */
-       proto_tree_add_boolean(tree, hf_supress, tvb, offset, 1, bits);
+       proto_tree_add_boolean(tree, hf_suppress, tvb, offset, 1, bits);
        /* QRV */
        proto_tree_add_uint(tree, hf_qrv, tvb, offset, 1, bits);
        offset += 1;
@@ -945,9 +945,9 @@ proto_register_igmp(void)
                        { "Max Resp Time", "igmp.max_resp", FT_UINT8, BASE_DEC,
                          NULL, 0, "Max Response Time", HFILL }},
 
-               { &hf_supress,
+               { &hf_suppress,
                        { "S", "igmp.s", FT_BOOLEAN, 8,
-                         TFS(&tfs_s), IGMP_V3_S, "Supress Router Side Processing", HFILL }},
+                         TFS(&tfs_s), IGMP_V3_S, "Suppress Router Side Processing", HFILL }},
 
                { &hf_qrv,
                        { "QRV", "igmp.qrv", FT_UINT8, BASE_DEC,

diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c
index 555e2dbe3d7d85ff0ea6c6804f425a185d041b0f..565ac02a22907e1973667ec6ed6f06c9ccae9a01 100644 (file)
--- a/epan/dissectors/packet-igrp.c
+++ b/epan/dissectors/packet-igrp.c
@@ -95,7 +95,7 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       version = (ver_and_opcode&0xf0)>>4 ; /* version is the fist half of the byte */
       opcode = ver_and_opcode&0x0f ;       /* opcode is the last half of the byte */
 
-      proto_tree_add_text(igrp_tree,  tvb, 0,1,"IGRP Version  : %d %s",version,(version==1?" ":" -  Unknown Version, The dissection may be innacurate"));
+      proto_tree_add_text(igrp_tree,  tvb, 0,1,"IGRP Version  : %d %s",version,(version==1?" ":" -  Unknown Version, The dissection may be inaccurate"));
       proto_tree_add_text(igrp_tree,  tvb, 0,1,"Command       : %d %s",opcode,(opcode==1?"(Response)":"(Request)"));
       proto_tree_add_uint(igrp_tree, hf_igrp_update, tvb, 1,1, update);
       proto_tree_add_uint(igrp_tree, hf_igrp_as, tvb, 2,2,as);

diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 858dfa43f2bbdeea23a0e99875743d6d55dafa88..d1d70a69d28f12b88ce0db6c4dbf82d93f86ac92 100644 (file)
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -644,7 +644,7 @@ static const value_string isup_numbering_plan_ind_value[] = {
 static const value_string isup_address_presentation_restricted_ind_value[] = {
   { ADDRESS_PRESETATION_ALLOWED,     "presentation allowed"},
   { ADDRESS_PRESETATION_RESTRICTED,  "presentation restricted"},
-  { ADDRESS_NOT_AVAILABLE,           "address not availabe (national use)"},
+  { ADDRESS_NOT_AVAILABLE,           "address not available (national use)"},
   { 3,                                 "spare"},
   { 0,                                 NULL}};
 
@@ -3793,9 +3793,9 @@ static const value_string OECD_inf_ind_vals[] = {
 };
 static const value_string IECD_inf_ind_vals[] = {
        {0x00, "no information"},
-       {0x01, "incomming echo control device not included and not available"},
-       {0x02, "incomming echo control device included"},
-       {0x03, "incomming echo control device not included but available"},
+       {0x01, "incoming echo control device not included and not available"},
+       {0x02, "incoming echo control device included"},
+       {0x03, "incoming echo control device not included but available"},
        { 0,    NULL }
 };
 
@@ -3809,8 +3809,8 @@ static const value_string OECD_req_ind_vals[] = {
 
 static const value_string IECD_req_ind_vals[] = {
        {0x00, "no information"},
-       {0x01, "incomming echo control device activation request"},
-       {0x02, "incomming echo control device deactivation request"},
+       {0x01, "incoming echo control device activation request"},
+       {0x02, "incoming echo control device deactivation request"},
        {0x03, "spare"},
        { 0,    NULL }
 };

diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index f8a6d769d6f7b31a4e7af976c5f8b43184d15c2b..2fe6a71caf492ad53eefc234243ccf25a86efce1 100644 (file)
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -474,12 +474,12 @@ dissect_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_
 
 #define UNKNOWN_UNAVAIL_CAUSE                  0
 #define UNEQUIPPED_REMOTE_USER_UNAVAIL_CAUSE   1
-#define INACCESSABLE_REMOTE_USER_UNAVAIL_CAUSE 2
+#define INACCESSIBLE_REMOTE_USER_UNAVAIL_CAUSE 2
 
 static const value_string unavailability_cause_values[] = {
   { UNKNOWN_UNAVAIL_CAUSE,                  "Unknown"                  },
   { UNEQUIPPED_REMOTE_USER_UNAVAIL_CAUSE,   "Unequipped remote user"   },
-  { INACCESSABLE_REMOTE_USER_UNAVAIL_CAUSE, "Inaccessable remote user" },
+  { INACCESSIBLE_REMOTE_USER_UNAVAIL_CAUSE, "Inaccessible remote user" },
   {0,                                       NULL } };
 
 #define RESERVED_0_USER_ID                0

diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index 04266f2463f106cedc4504746ae339e08eb0e218..589b0496d26e326e62997c1430005bf057ad9240 100644 (file)
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -403,7 +403,7 @@ void proto_register_mip(void)
                   "Broadcast Datagrams requested", HFILL }
          },
          { &hf_mip_d,
-                { "Co-lcated Care-of Address",           "mip.d",
+                { "Co-located Care-of Address",           "mip.d",
                   FT_BOOLEAN, 8, NULL, 32,
                   "MN using Co-located Care-of address", HFILL }
          },

diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index d28ac4d713067878bc7d1c535044482df0cadbe9..048605be322bb9480497842aff7717b490052717 100644 (file)
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -5534,7 +5534,7 @@ static int dissect_rename1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 static const value_string mms_DataAccessError_vals[] = {
   {   0, "object-invalidated" },
   {   1, "hardware-fault" },
-  {   2, "temporarly-unavailable" },
+  {   2, "temporarily-unavailable" },
   {   3, "object-access-denied" },
   {   4, "object-undefined" },
   {   5, "invalid-address" },

diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index 83a4ea7f04e7672755148baff8710ad93f79f113..b43fcb26496124ffba9bde7624d98e89a808a43b 100644 (file)
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -58,7 +58,7 @@ static const value_string msdp_types[] = {
         { MSDP_KEEP_ALIVE,        "KeepAlive"                    },
         { MSDP_NOTIFICATION,      "Notification"                 },
 
-        { MSDP_TRACE_IN_PROGRESS, "MSDP traceroute in progresss" },
+        { MSDP_TRACE_IN_PROGRESS, "MSDP traceroute in progress"  },
         { MSDP_TRACE_REPLY,       "MSDP traceroute reply"        },
         { 0, NULL },
 };

diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 8c343d48fd5b99ba1ae46de0f594454ce9b7a5ca..17702998e76c130f9a2df9d758a57747360ee18d 100644 (file)
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -8027,7 +8027,7 @@ proto_register_nfs(void)
                        "maxfilesize", "nfs.fsinfo.maxfilesize", FT_UINT64, BASE_DEC,
                        NULL, 0, "Maximum file size", HFILL }},
                { &hf_nfs_fsinfo_properties, {
-                       "Properties", "nfs.fsinfo.propeties", FT_UINT32, BASE_HEX,
+                       "Properties", "nfs.fsinfo.properties", FT_UINT32, BASE_HEX,
                        NULL, 0, "File System Properties", HFILL }},
                { &hf_nfs_pathconf_linkmax, {
                        "linkmax", "nfs.pathconf.linkmax", FT_UINT32, BASE_DEC,

diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index ed2975986e448e881139f9d4a8b43372d73352dc..0497013b1d3ed375a2ba69fa74c26235b0fe2d15 100644 (file)
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -932,7 +932,7 @@ static const value_string nis_error[] = {
 #define NIS_NOTEMPTY           37
        {       NIS_NOTEMPTY,           "Attempt to remove a non-empty tbl"     },
 #define NIS_COLDSTART_ERR      38
-       {       NIS_COLDSTART_ERR,      "Error accesing the cold start file"    },
+       {       NIS_COLDSTART_ERR,      "Error accessing the cold start file"   },
 #define NIS_RESYNC             39
        {       NIS_RESYNC,             "Transaction log too far out of date"   },
 #define NIS_FAIL               40

diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c
index 68c09c4af85597c4a95d067c03aae93ba681e49c..b0726d8a6016bb735e82a3caac654977e8a4ac60 100644 (file)
--- a/epan/dissectors/packet-nt-sonmp.c
+++ b/epan/dissectors/packet-nt-sonmp.c
@@ -171,11 +171,11 @@ static value_string sonmp_backplane_val[] =
        {4, "ethernet and FDDI"},
        {5, "ethernet, tokenring and FDDI"},
        {6, "ethernet and tokenring with redundant power"},
-       {7, "ethernet, tokenring, FDDI with redunadant power"},
+       {7, "ethernet, tokenring, FDDI with redundant power"},
        {8, "token ring"},
        {9, "ethernet, tokenring and fast ethernet"},
        {10, "ethernet and fast ethernet"},
-       {11, "ethernet, tokenring, fast ethernet with redunant power"},
+       {11, "ethernet, tokenring, fast ethernet with redundant power"},
        {12, "ethernet, fast ethernet and gigabit ethernet"},
        {0, NULL}
 };

diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 6d1b33ad44a56bc07216f27e5d2fbbab6275d846..6bd3313ba34a7b7342c30d264d0816f933cec8ee 100644 (file)
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -279,7 +279,7 @@ const value_string ppp_vals[] = {
        {PPP_RTP_CRDP16,"RTP IPHC Compressed RTP 16" },
        {PPP_CCCP,      "Cray Communications Control Protocol" },
        {PPP_CDPD_MNRP, "CDPD Mobile Network Registration Protocol" },
-       {PPP_EXPANDAP,  "Expand accelarator protocol" },
+       {PPP_EXPANDAP,  "Expand accelerator protocol" },
        {PPP_ODSICP,    "ODSICP NCP" },
        {PPP_DOCSIS,    "DOCSIS DLL" },
        {PPP_LZS,       "Stacker LZS" },

diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 372540f024096b6ed283fa2d3b50b988ec222d4b..08c4faaac0a3a2716e5261a2de5723f2a75704d0 100644 (file)
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -1153,8 +1153,8 @@ proto_register_radius(void)
        prefs_register_string_preference(radius_module,"shared_secret","Shared Secret",
                                      "Shared secret used to decode User Passwords",
                                      &shared_secret);
-       prefs_register_bool_preference(radius_module,"show_length","Show AVP Lenghts",
-                                     "Whether to add or not to the tree the AVP's payload lenght",
+       prefs_register_bool_preference(radius_module,"show_length","Show AVP Lengths",
+                                     "Whether to add or not to the tree the AVP's payload length",
                                      &show_length);
     prefs_register_uint_preference(radius_module, "alternate_port","Alternate Port",
                                    "An alternate UDP port to decode as RADIUS", 10, &alt_port_pref);

diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index e2a602e1bad042c76574a4168e599a3966e9eee9..e10475b722dc9d8daeb56f2d12abe800ba0f0855 100644 (file)
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -7645,8 +7645,8 @@ static int dissect_pre_emptionVulnerability(tvbuff_t *tvb, int offset, packet_in
 
 
 static const value_string ranap_QueuingAllowed_vals[] = {
-  {   0, "queueing-not-allowed" },
-  {   1, "queueing-allowed" },
+  {   0, "queuing-not-allowed" },
+  {   1, "queuing-allowed" },
   { 0, NULL }
 };
 

diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 0b461b0080522d3546139336c6d04e7913c29624..db8b6388628d497d6133cde92a09fd673e42379e 100644 (file)
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -596,7 +596,7 @@ static char *
 IP_to_string(gint offset,tvbuff_t *tvb,gboolean little_endian,char *buff, int buff_len)
 {
   IPAddress         ip;
-  guint8  a = 0, b = 0, c = 0, d = 0; /* IP Adresss = a.b.c.d */
+  guint8  a = 0, b = 0, c = 0, d = 0; /* IP Address = a.b.c.d */
 
   ip = get_guint32(tvb, offset, little_endian);
      /* get_guint32() - reads + endian conversion */
@@ -1836,7 +1836,7 @@ dissect_INFO_REPLY(tvbuff_t *tvb, gint offset, guint8 flags,
                       tvb, offset, 1, flags);
   offset +=1;
 
- /*  'multicastReplyAdress' and 'multicastReplyPort' are    *
+ /*  'multicastReplyAddress' and 'multicastReplyPort' are   *
   *   parts of submessage INFO REPLY which are available    *
   *   only when FLAG  M=1  flags: XXXX XXME                 */
 
@@ -1859,7 +1859,7 @@ dissect_INFO_REPLY(tvbuff_t *tvb, gint offset, guint8 flags,
 
   /* Unicat Reply IPAddress */
   proto_tree_add_text(rtps_submessage_tree, tvb, offset, 4,
-                      "Unicast Reply IP Adress: %s",
+                      "Unicast Reply IP Address: %s",
                       IP_to_string(offset, tvb, little_endian, buff_ip, 200));
   offset +=4;
 
@@ -1871,7 +1871,7 @@ dissect_INFO_REPLY(tvbuff_t *tvb, gint offset, guint8 flags,
   offset +=4;
 
 
- /*  'multicastReplyAdress' and 'multicastReplyPort' are    *
+ /*  'multicastReplyAddress' and 'multicastReplyPort' are   *
   *   parts of submessage INFO REPLY which are available    *
   *   only when FLAG  M=1  flags: XXXX XXME                 */
 
@@ -1879,7 +1879,7 @@ dissect_INFO_REPLY(tvbuff_t *tvb, gint offset, guint8 flags,
   {
     /* Multicast Reply IPAddress */
     proto_tree_add_text(rtps_submessage_tree, tvb, offset, 4,
-                        "Multicast Reply IP Adress: %s",
+                        "Multicast Reply IP Address: %s",
                         IP_to_string(offset, tvb, little_endian, buff_ip, 200));
     offset +=4;
 

diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index ebf66dc15316ba1ce241a0d63639d35ea683b7e5..9e383a11f3fad814fb577a3d325971d70eb038b0 100644 (file)
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -125,14 +125,14 @@ static guint SigCompUDPPort2 = 6666;
 static guint SigCompTCPPort1 = 5555;
 static guint SigCompTCPPort2 = 6666;
 
-/* Default preference wether to display the bytecode in UDVM operands or not */
+/* Default preference whether to display the bytecode in UDVM operands or not */
 static gboolean display_udvm_bytecode = FALSE;
-/* Default preference wether to dissect the UDVM code or not */
+/* Default preference whether to dissect the UDVM code or not */
 static gboolean dissect_udvm_code = TRUE;
 static gboolean display_raw_txt = FALSE;
-/* Default preference wether to decompress the message or not */
+/* Default preference whether to decompress the message or not */
 static gboolean decompress = TRUE;
-/* Default preference wether to print debug info at execution of UDVM 
+/* Default preference whether to print debug info at execution of UDVM 
  * 0 = No printout
  * 1 = details level 1
  * 2 = details level 2
@@ -2602,24 +2602,24 @@ proto_register_sigcomp(void)
                                                                   &SigCompTCPPort2);
        prefs_register_bool_preference(sigcomp_module, "display.udvm.code",
                                                                   "Dissect the UDVM code",
-                                                                  "Preference wether to Dissect the UDVM code or not",
+                                                                  "Preference whether to Dissect the UDVM code or not",
                                                                   &dissect_udvm_code);
 
        prefs_register_bool_preference(sigcomp_module, "display.bytecode",
                                                                   "Display the bytecode of operands",
-                                                                  "preference wether to display the bytecode in UDVM operands or not",
+                                                                  "preference whether to display the bytecode in UDVM operands or not",
                                                                   &display_udvm_bytecode);
        prefs_register_bool_preference(sigcomp_module, "decomp.msg",
                                                                   "Decompress message",
-                                                                  "preference wether to decompress message or not",
+                                                                  "preference whether to decompress message or not",
                                                                   &decompress);
        prefs_register_bool_preference(sigcomp_module, "display.decomp.msg.as.txt",
                                                                   "Displays the decompressed message as text",
-                                                                  "preference wether to display the decompressed message as raw text or not",
+                                                                  "preference whether to display the decompressed message as raw text or not",
                                                                   &display_raw_txt);
     prefs_register_enum_preference(sigcomp_module, "show.udvm.execution",
       "Level of detail of UDVM execution",
-      "0 = UDVM executes silently, then incrising detail about execution of UDVM instructions, Warning! CPU intense at high detail",
+      "0 = UDVM executes silently, then increasing detail about execution of UDVM instructions, Warning! CPU intense at high detail",
       &udvm_print_detail_level, udvm_detail_vals, FALSE);
 
        register_init_routine(&sigcomp_init_protocol);

diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index ad8676f157f66de18566db5bde148bd6ec0471a4..74d33c429634e40fa2183717ce264f3345d68395 100644 (file)
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -692,8 +692,8 @@ static const value_string vals_dcs_cbs_language[] = {
        { 0x0D, "Hungarian" },
        { 0x0E, "Polish" },
        { 0x0F, "Language not specified" },
-       { 0x10, "GSM 7-bit default alphabet - message preceeded by language indication" },
-       { 0x11, "UCS-2 (16-bit) - message preceeded by language indication" },
+       { 0x10, "GSM 7-bit default alphabet - message preceded by language indication" },
+       { 0x11, "UCS-2 (16-bit) - message preceded by language indication" },
        { 0x20, "Czech" },
        { 0x21, "Hebrew" },
        { 0x22, "Arabic" },
@@ -2227,9 +2227,9 @@ proto_register_smpp(void)
            }
        },
        {   &hf_smpp_dlist_resp,
-           {   "Unsuccesfull delivery list", "smpp.dlist_resp",
+           {   "Unsuccessfull delivery list", "smpp.dlist_resp",
                FT_NONE, BASE_NONE, NULL, 0x00,
-               "The list of unsuccesfull deliveries to destinations.",
+               "The list of unsuccessfull deliveries to destinations.",
                HFILL
            }
        },

diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 0467d8ab0d4442785ec7dce571e2ce19e577ceb0..0b2158a40037ed87e67accb98b6ce59814f24e3c 100644 (file)
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -913,7 +913,7 @@ dissect_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot
 static const value_string cause_values[] = {
   { 0x0,  "Remote SCCP unavailable, Reason unknown" },
   { 0x2,  "Remote SCCP unequipped" },
-  { 0x3,  "Remote SCCP inaccessable" },
+  { 0x3,  "Remote SCCP inaccessible" },
   { 0,    NULL } };
 
 static void

diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 11c4adc5bb18708ea04f9a3bfcfeb5c27b2887b3..98331a176613ebc2387a318bf31407968db9c334 100644 (file)
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -395,7 +395,7 @@ static const value_string vals_parm_Rsn[] = {
     {  108, "Delivery fail" },
     {  109, "Sc congestion" },
     {  110, "Protocol error" },
-    {  111, "MS not equiped" },
+    {  111, "MS not equipped" },
     {  112, "Unknown SC" },
     {  113, "SC congestion" },
     {  114, "Illegal MS" },

diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index 5b9599a4bbce12ad4b742eeeb8e501f8adb35994..a75771b1af4663678badc7196a5897620c1e0faf 100644 (file)
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -206,7 +206,7 @@ proto_register_vnc(void)
 /* Register a sample preference */        
 /*        prefs_register_bool_preference(vnc_module, "showHex", 
              "Display numbers in Hex",
-            "Enable to display numerical values in hexidecimal.",
+            "Enable to display numerical values in hexadecimal.",
             &gPREF_HEX );        */
 }
 

diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index 0e11c5fcc3d95b2db115b13c6aedd4c603d6bdc9..fb9fe77885a00f09811c4406e8ffdcb53e65b400 100644 (file)
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -698,7 +698,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
 
                    tmpbuf=ep_alloc(80);
                    ti = proto_tree_add_text(fac_tree, tvb, *offset, 1, "Code : %02X "
-                           "(Throughput class negociation)", fac);
+                           "(Throughput class negotiation)", fac);
                    fac_subtree = proto_item_add_subtree(ti, ett_x25_fac_throughput);
                    byte1 = tvb_get_guint8(tvb, *offset + 1);
                    switch (byte1 >> 4)
@@ -796,7 +796,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
            case X25_FAC_EXPRESS_DATA:
                if (fac_tree) {
                    ti = proto_tree_add_text(fac_tree, tvb, *offset, 1, "Code : %02X "
-                           "(Negociation of express data)", fac);
+                           "(Negotiation of express data)", fac);
                    fac_subtree = proto_item_add_subtree(ti,
                            ett_x25_fac_express_data);
                    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,

diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c
index ef960a74b72fd3b5bff22f95fe99393f954a0c28..dc11c8fc6491f174691ff0ae1f715c3b64b66bb2 100644 (file)
--- a/epan/sigcomp-udvm.c
+++ b/epan/sigcomp-udvm.c
@@ -92,7 +92,7 @@ static gint show_instr_detail_level;
 
 /* Internal result code values of decompression failures */
 const value_string result_code_vals[] = {
-       { 0,    "No decomprssion failure" },
+       { 0,    "No decompression failure" },
        { 1,    "Partial state length less than 6 or greater than 20 bytes long" },
        { 2,    "No state match" },
        { 3,    "state_begin + state_length > size of state" },
@@ -1817,7 +1817,7 @@ execute_next_instruction:
 
                        if (k + handle_now >= UDVM_MEMORY_SIZE)
                                goto decompression_failure;
-                       result = crc16_ccitt_seed(&buff[k], handle_now, result ^ 0xffff);
+                       result = crc16_ccitt_seed(&buff[k], handle_now, (guint16) (result ^ 0xffff));
 
                        k = ( k + handle_now ) & 0xffff;
                        n = ( n + handle_now ) & 0xffff;

diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index f9c006639bb113331893028bc7cd4c412a32264a..e78e9f8f84c8473960fbb29060aea4bd06fb8ee6 100644 (file)
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -700,9 +700,9 @@ proto_register_docsis (void)
       "Version", HFILL}
      },
     {&hf_docsis_ehdr_phsi,
-     {"Payload Header Supression Index", "docsis.ehdr.phsi",
+     {"Payload Header Suppression Index", "docsis.ehdr.phsi",
       FT_UINT8, BASE_DEC, NULL, 0x0,
-      "Payload Header Supression Index", HFILL}
+      "Payload Header Suppression Index", HFILL}
      },
     {&hf_docsis_ehdr_qind,
      {"Queue Indicator", "docsis.ehdr.qind",

diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index 08989d87c9bf74d41246922b3e3cf61376257bce..c54ef5e389b1816f3c494f8ff42b01760794d82d 100644 (file)
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -255,7 +255,7 @@ static const value_string dsc_act_vals[] = {
 
 static const value_string qos_param_vals[] = {
   {0x01, "Apply to provisioned set only"},
-  {0x02, "Perform admission control add apply to addmitted set"},
+  {0x02, "Perform admission control add apply to admitted set"},
   {0x03, "Apply to provisioned and admitted set; Perform admission control"},
   {0x04, "Perform admission control if needed and apply to active set"},
   {0x05,

diff --git a/plugins/lwres/packet-lwres.c b/plugins/lwres/packet-lwres.c
index b75b18ebc07e4151cfaa68be76ca13cf927f1a57..f1df60f4e26e43215267aef1acab82fb670bde93 100644 (file)
--- a/plugins/lwres/packet-lwres.c
+++ b/plugins/lwres/packet-lwres.c
@@ -1320,7 +1320,7 @@ proto_register_lwres(void)
 
     { &hf_version,
       { "Version", "lwres.version", FT_UINT16, BASE_DEC, NULL, 0x0,
-        "lwres legth", HFILL }},
+        "lwres version", HFILL }},
 
     { &hf_flags,
       { "Packet Flags", "lwres.flags", FT_UINT16, BASE_HEX, NULL, 0x0,

diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c
index 4b3fe1a9dea1c822976f7cba3039926a8e24c94d..89752be8cd4648bffcb0ff797e7d77abf3b5edf2 100644 (file)
--- a/plugins/mate/mate_setup.c
+++ b/plugins/mate/mate_setup.c
@@ -293,7 +293,7 @@ static void analyze_pdu_config(mate_cfg_pdu* cfg) {
        g_array_append_val(matecfg->hfrs,hfri);
        
        hfri.p_id = &(cfg->hfid_pdu_time_in_gop);
-       hfri.hfinfo.name = g_strdup_printf("%s time since begining of Gop",cfg->name);
+       hfri.hfinfo.name = g_strdup_printf("%s time since beginning of Gop",cfg->name);
        hfri.hfinfo.abbrev = g_strdup_printf("mate.%s.TimeInGop",cfg->name);
        hfri.hfinfo.type = FT_FLOAT;
        hfri.hfinfo.display = BASE_DEC;
@@ -333,7 +333,7 @@ static void analyze_gop_config(gpointer k _U_, gpointer v, gpointer p _U_) {
        hfri.hfinfo.abbrev = g_strdup_printf("mate.%s.StartTime",cfg->name);
        hfri.hfinfo.type = FT_FLOAT;
        hfri.hfinfo.display = BASE_DEC;
-       hfri.hfinfo.blurb = g_strdup_printf("Seconds passed since the begining of caputre to the start of this %s",cfg->name);
+       hfri.hfinfo.blurb = g_strdup_printf("Seconds passed since the beginning of capture to the start of this %s",cfg->name);
 
        g_array_append_val(matecfg->hfrs,hfri);
 
@@ -475,7 +475,7 @@ static void analyze_gog_config(gpointer k _U_, gpointer v, gpointer p _U_) {
        hfri.hfinfo.name = g_strdup_printf("%s start time",cfg->name);
        hfri.hfinfo.abbrev = g_strdup_printf("mate.%s.StartTime",cfg->name);
        hfri.hfinfo.type = FT_FLOAT;
-       hfri.hfinfo.blurb = g_strdup_printf("Seconds passed since the begining of caputre to the start of this %s",cfg->name);
+       hfri.hfinfo.blurb = g_strdup_printf("Seconds passed since the beginning of capture to the start of this %s",cfg->name);
        
        g_array_append_val(matecfg->hfrs,hfri);
                
@@ -919,7 +919,7 @@ extern mate_config* mate_make_config(const gchar* filename, int mate_hfid) {
                analyze_config();
        } else {
                report_failure("MATE failed to configue!\n"
-                                          "It is recomended that you fix your config and restart ethereal.\n"
+                                          "It is recommended that you fix your config and restart ethereal.\n"
                                           "The reported error is:\n%s\n",matecfg->config_error->str);
                
                /* if (matecfg) destroy_mate_config(matecfg,FALSE); */

diff --git a/plugins/v5ua/packet-v5ua.c b/plugins/v5ua/packet-v5ua.c
index e559deb8a7d9c5c87544238be932dbcb49e51caa..7dc1e1e7aa617546cf8ae88ec8e272924cb5824e 100644 (file)
--- a/plugins/v5ua/packet-v5ua.c
+++ b/plugins/v5ua/packet-v5ua.c
@@ -238,10 +238,10 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree
 }
 /*----------------------Text Interface Identifier (RFC)------------------------*/
 
-/*----------------------DLCI & Envelope Function Adress-------------------------*/
+/*----------------------DLCI & Envelope Function Address------------------------*/
 
 
-/* interpretaion of EFA-values */
+/* interpretation of EFA-values */
 static const value_string efa_values[] = {
        { 8175, "ISDN Protocol" },
        { 8176, "PSTN Protocol" },
@@ -297,7 +297,7 @@ dissect_dlci_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot
   }
 
 }
-/*----------------------DLCI & Envelope Function Adress-------------------------*/
+/*----------------------DLCI & Envelope Function Address------------------------*/
 
 /*----------------------Error Indication (Draft)-------------------------------*/
 
@@ -315,9 +315,9 @@ static const value_string draft_error_code_values[] = {
   { MGMT_ERROR_INVALID_IFID_DRAFT,    "Invalid interface ID" },
   { MGMT_ERROR_UNDEFINIED_MSG_DRAFT,  "An unexpected message was received" },
   { MGMT_ERROR_VERSION_ERR_DRAFT,     "The IUA layers are of different version" },
-  { MGMT_ERROR_INVALID_STID_DRAFT,    "Invalid SCTP stream idetifier" },
+  { MGMT_ERROR_INVALID_STID_DRAFT,    "Invalid SCTP stream identifier" },
   { MGMT_ERROR_INVALID_SCNV_DRAFT,    "Invalid SCN version" },
-  { MGMT_ERROR_INVALID_ALI_DRAFT,     "Invalid Adapiotion Layer Identifier" },
+  { MGMT_ERROR_INVALID_ALI_DRAFT,     "Invalid Adaptation Layer Identifier" },
   { 0,                                NULL } };
 
 #define MGMT_ERROR_MSG_LENGTH_OFFSET PARAMETER_LENGTH_OFFSET
@@ -2160,11 +2160,11 @@ proto_register_v5ua(void)
                FT_UINT8,    BASE_HEX, NULL,                             0x0,
                           "", HFILL } },
                { &hf_l3_adress,
-                       { "Layer3 adress",         "v5ua.l3_adress",
+                       { "Layer3 address",        "v5ua.l3_address",
                           FT_UINT8,    BASE_HEX, NULL,                             0xfe,
                           "", HFILL } },
                { &hf_l3_low_adress,
-                       { "Layer3 low adress",     "v5ua.l3_low_adress",
+                       { "Layer3 low address",    "v5ua.l3_low_address",
                           FT_UINT8,    BASE_HEX, NULL,                             0x0,
                           "", HFILL } },
                {&hf_l3_msg_type,