From Ville Skyttä: Spelling Fixes

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591


svn path=/trunk/; revision=54387

25 files changed, 37 insertions, 36 deletions

diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index eb4ba9f7d3..2ee0ffdad7 100644
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -188,7 +188,7 @@ call_foreach_count_ip_id(gpointer value, gpointer arg)
 		/* Detect ongoing package hits, special behavior if start is set to 0 */
 		if((cs->last_hit||(compare_start==0))&&(cs->start_ongoing_hits<compare_start||(compare_start==0))){
 			if((compare_start==0)&&(cs->start_ongoing_hits!=0)){
-				/* start from the first packet so allready set */
+				/* start from the first packet so already set */
 			} else {
 				cs->start_ongoing_hits++;
 				/* Take the lower number */
@@ -449,7 +449,7 @@ comparestat_draw(void *prs)
 	const gchar *statis_string;
 	guint32 first_file_amount, second_file_amount;
 
-	/* inital steps, clear all data before start*/
+	/* initial steps, clear all data before start*/
 	cs->zebra_time.secs=0;
 	cs->zebra_time.nsecs=1;
 	nstime_set_unset(&cs->current_time);
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index 65ea9dc31f..1beb7a6413 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -25,7 +25,7 @@
 /*
  * This TAP enables extraction of most important diameter fields in text format.
  * - much more performance than -T text and -T pdml
- * - more powerfull than -T field and -z proto,colinfo
+ * - more powerful than -T field and -z proto,colinfo
  * - exacltly one text line per diameter message
  * - multiple diameter messages in one frame supported
  *   E.g. one device watchdog answer and two credit control answers
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index cb8a418e15..e17feebfb5 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -496,7 +496,7 @@ followDraw(
   void *        contextp
   )
 {
-  static const char     seperator[] =
+  static const char     separator[] =
     "===================================================================\n";
 
   follow_t *            fp      = (follow_t *)contextp;
@@ -586,7 +586,7 @@ followDraw(
     port[1] = fp->port[0];
   }
 
-  printf("\n%s", seperator);
+  printf("\n%s", separator);
   printf("Follow: %s,%s\n", followStrType(fp), followStrMode(fp));
   printf("Filter: %s\n", followStrFilter(fp));
 
@@ -716,7 +716,7 @@ followDraw(
 
 done:
 
-  printf("%s", seperator);
+  printf("%s", separator);
 
   followFileClose(fp);
 }
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 56b511a5dc..ddce9f408f 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -97,7 +97,7 @@ wspstat_reset(void *psp)
  * the window to be redrawn, return 1 and (*draw) will be called sometime
  * later.
  *
- * We didnt apply a filter when we registered so we will be called for
+ * We didn't apply a filter when we registered so we will be called for
  * ALL packets and not just the ones we are collecting stats for.
  *
  */
diff --git a/ui/export_object_smb.c b/ui/export_object_smb.c
index 59ccaa2cb2..91d47060b0 100644
--- a/ui/export_object_smb.c
+++ b/ui/export_object_smb.c
@@ -155,7 +155,7 @@ gpointer    dest_memory_addr;
 			continue;
 		}
 		/* 2. data chunk overlaps the first part of free_chunk */
-		/* -> free chunk shrinks from the beggining */
+		/* -> free chunk shrinks from the beginning */
 		if (chunk_offset<=current_free_chunk->start_offset && chunk_end_offset>=current_free_chunk->start_offset && chunk_end_offset<current_free_chunk->end_offset) {
 			file->data_gathered += chunk_end_offset-current_free_chunk->start_offset+1;
 			current_free_chunk->start_offset=chunk_end_offset+1;
diff --git a/ui/follow.c b/ui/follow.c
index 4756bb6279..4fcef382cc 100644
--- a/ui/follow.c
+++ b/ui/follow.c
@@ -65,7 +65,8 @@ parse_http_header(char *data, size_t len, size_t *content_start)
      * In order to parse header, we duplicate data and tokenize lines.
      * We aren't interested in actual data, so use g_strndup instead of memcpy
      * to (possibly) copy fewer bytes (e.g., if a nul byte exists in data)
-     * This also ensures that we have a terminated string for futher processing.
+     * This also ensures that we have a terminated string for further
+     * processing.
      */
     tmp = copy = g_strndup(data, len);
     if (!tmp) {
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index 3687e66917..c245ee0b10 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -83,7 +83,7 @@
 
 #include "ui/gtk/old-gtk-compat.h"
 
-/* From colorize convertion */
+/* From colorize conversion */
 #define COLOR_N	1
 
 /* For checksum */
@@ -272,7 +272,7 @@ call_foreach_count_ip_id(gpointer value, gpointer arg)
 		/* Detect ongoing package hits, special behavior if start is set to 0 */
 		if((cs->last_hit||(compare_start==0))&&(cs->start_ongoing_hits<compare_start||(compare_start==0))){
 			if((compare_start==0)&&(cs->start_ongoing_hits!=0)){
-				/* start from the first packet so allready set */
+				/* start from the first packet so already set */
 			} else {
 				cs->start_ongoing_hits++;
 				/* Take the lower number */
@@ -543,7 +543,7 @@ comparestat_draw(void *arg)
 	frame_info *fInfo;
 	guint32 first_file_amount, second_file_amount;
 
-	/* inital steps, clear all data before start*/
+	/* initial steps, clear all data before start*/
 	cs->zebra_time.secs=0;
 	cs->zebra_time.nsecs=1;
 	nstime_set_unset(&cs->current_time);
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
index c4c04af07f..5a3e384dba 100644
--- a/ui/gtk/dcerpc_stat.c
+++ b/ui/gtk/dcerpc_stat.c
@@ -485,7 +485,7 @@ dcerpcstat_find_next_program(gpointer *key, gpointer *value, gpointer *user_data
 	/* searching for the next one we are only interested in those
 	   that sorts alphabetically after the current one */
 	if(strcmp(current_uuid_value->name, v->name) >= 0){
-		/* this one doesnt so just skip it */
+		/* this one doesn't so just skip it */
 		return;
 	}
 
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 40f0285c48..03f84388a6 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -953,7 +953,7 @@ dialog_graph_draw(user_data_t* user_data)
 	 * so we know how large arrays we need to malloc()
 	 */
 	num_time_intervals = user_data->dlg.dialog_graph.num_items;
-	/* if there isnt anything to do, just return */
+	/* if there isn't anything to do, just return */
 	if (num_time_intervals == 0) {
 		return;
 	}
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index 008cc65b42..5e78b9e65b 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -953,7 +953,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean reference, gboolean editable _
 		return;
 	}
 
-	/* With the new packetlists "lazy columns" it's neccesary to reread the frame */
+	/* With the new packetlists "lazy columns" it's necessary to reread the frame */
 	if (!cf_read_frame(&cfile, fd)) {
 		/* error reading the frame */
 		return;
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index baabd00ede..9960d40c6b 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -436,7 +436,7 @@ colopts_edit_cb(GtkWidget *w, gpointer data _U_)
 	gtk_widget_show(col_link_lb);
 	row++;
 
-	/* create "Promiscous Mode" label and button */
+	/* create "Promiscuous Mode" label and button */
 	col_pmode_cb = gtk_check_button_new();
 	ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_pmode_cb, 0, row, 1, 1);
 	if (!prefs.capture_columns || prefs_capture_options_dialog_column_is_visible("PMODE"))
@@ -445,7 +445,7 @@ colopts_edit_cb(GtkWidget *w, gpointer data _U_)
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(col_pmode_cb), FALSE);
 	gtk_widget_show(col_pmode_cb);
 
-	col_pmode_lb = gtk_label_new("Promiscous Mode");
+	col_pmode_lb = gtk_label_new("Promiscuous Mode");
 	ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_pmode_lb, 1, row, 1, 1);
 	gtk_misc_set_alignment(GTK_MISC(col_pmode_lb), 0, 0.5f);
 	gtk_widget_show(col_pmode_lb);
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 5af2c4eca0..b894fc7565 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -999,7 +999,7 @@ dialog_graph_draw(user_data_t* user_data)
 	 * so we know how large arrays we need to malloc()
 	 */
 	num_time_intervals = user_data->dlg.dialog_graph.num_items;
-	/* if there isnt anything to do, just return */
+	/* if there isn't anything to do, just return */
 	if (num_time_intervals == 0) {
 		return;
 	}
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
index acee55f804..63c9eca427 100644
--- a/ui/gtk/rtp_player.c
+++ b/ui/gtk/rtp_player.c
@@ -2287,7 +2287,7 @@ rtp_player_on_destroy(GObject *object _U_, gpointer user_data _U_)
 	PaError err;
 	GtkWidget *dialog;
 
-	/* Stop the channels if necesary */
+	/* Stop the channels if necessary */
 	if(rtp_channels && (!rtp_channels->stop)){
 		stop_channels();
 	}
diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c
index 1b5d610288..2cb38895f8 100644
--- a/ui/gtk/stats_tree_stat.c
+++ b/ui/gtk/stats_tree_stat.c
@@ -80,7 +80,7 @@ struct _tree_pres {
 
 /* Define fixed column indexes */
 #define	NODEPTR_COLUMN	0		/* Always first column */
-#define	N_RESERVED_COL	1		/* Number of columns for internal use - added before visable cols */
+#define	N_RESERVED_COL	1		/* Number of columns for internal use - added before visible cols */
 
 
 static void
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index 08489796c2..448bfcec0d 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -1558,7 +1558,7 @@ q931_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
 				}
 
 				/* check if there is an LRQ/LCF that match this Setup */
-				/* TODO: we are just checking the DialedNumer in LRQ/LCF agains the Setup
+				/* TODO: we are just checking the DialedNumer in LRQ/LCF against the Setup
 					we should also check if the h225 signaling IP and port match the destination
 					Setup ip and port */
 				list = g_list_first(tapinfo->callsinfo_list);
diff --git a/ui/preference_utils.h b/ui/preference_utils.h
index 34c77d1b58..c2165d5c93 100644
--- a/ui/preference_utils.h
+++ b/ui/preference_utils.h
@@ -87,7 +87,7 @@ extern void prefs_main_write(void);
  * @param fmt column format
  * @param title column title
  * @param custom_field column custom field
- * @param custom_occurrence custom occurence
+ * @param custom_occurrence custom occurrence
  */
 void column_prefs_add_custom(gint fmt, const gchar *title,
 			     const gchar *custom_field,
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index 7cd571fe44..9566327267 100644
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -278,7 +278,7 @@ void CaptureInterfacesDialog::UpdateInterfaces()
             hassnap = capture_dev_user_hassnap_find(device.name);
             snaplen = capture_dev_user_snaplen_find(device.name);
             if(snaplen != -1 && hassnap != -1) {
-              /* Default snap lenght set in preferences */
+              /* Default snap length set in preferences */
               device.snaplen = snaplen;
               device.has_snaplen = hassnap;
             } else {
diff --git a/ui/qt/column_preferences_frame.ui b/ui/qt/column_preferences_frame.ui
index 195ae004ef..0b0bc02083 100644
--- a/ui/qt/column_preferences_frame.ui
+++ b/ui/qt/column_preferences_frame.ui
@@ -47,7 +47,7 @@
      </column>
      <column>
       <property name="text">
-       <string>Field occurence</string>
+       <string>Field occurrence</string>
       </property>
      </column>
     </widget>
diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp
index 4e071282c0..c7b42126c2 100644
--- a/ui/qt/decode_as_dialog.cpp
+++ b/ui/qt/decode_as_dialog.cpp
@@ -358,7 +358,7 @@ void DecodeAsDialog::fillTypeColumn(QTreeWidgetItem *item)
             type_desc.append("16");
             break;
         default:
-            type_desc.append(tr("unkown"));
+            type_desc.append(tr("unknown"));
         }
         item->setText(type_col_, type_desc);
     }
diff --git a/ui/qt/qcustomplot.cpp b/ui/qt/qcustomplot.cpp
index 1585755c9b..789eec05b0 100644
--- a/ui/qt/qcustomplot.cpp
+++ b/ui/qt/qcustomplot.cpp
@@ -5595,7 +5595,7 @@ int QCPAxis::calculateAutoSubTickCount(double tickStep) const
         case 9: result = 4; break; // 9.5 -> 1.9 substep
       }
     }
-    // if mantissa fraction isnt 0.0 or 0.5, don't bother finding good sub tick marks, leave default
+    // if mantissa fraction isn't 0.0 or 0.5, don't bother finding good sub tick marks, leave default
   }
 
   return result;
@@ -6313,7 +6313,7 @@ int QCPAxis::calculateMargin()
   if (mCachedMarginValid)
     return mCachedMargin;
 
-  // run through similar steps as QCPAxis::draw, and caluclate margin needed to fit axis and its labels
+  // run through similar steps as QCPAxis::draw, and calculate margin needed to fit axis and its labels
   int margin = 0;
 
   if (mVisible)
@@ -10415,7 +10415,7 @@ void QCustomPlot::draw(QCPPainter *painter)
   the viewport with the provided \a painter. The scaled version is buffered in
   mScaledBackgroundPixmap to prevent expensive rescaling at every redraw. It is only updated, when
   the axis rect has changed in a way that requires a rescale of the background pixmap (this is
-  dependant on the \ref setBackgroundScaledMode), or when a differend axis backgroud pixmap was
+  dependent on the \ref setBackgroundScaledMode), or when a different axis background pixmap was
   set.
 
   Note that this function does not draw a fill with the background brush (\ref setBackground(const
@@ -17364,7 +17364,7 @@ void QCPAxisRect::setRangeZoomFactor(double factor)
   the axis rect with the provided \a painter. The scaled version is buffered in
   mScaledBackgroundPixmap to prevent expensive rescaling at every redraw. It is only updated, when
   the axis rect has changed in a way that requires a rescale of the background pixmap (this is
-  dependant on the \ref setBackgroundScaledMode), or when a differend axis backgroud pixmap was
+  dependent on the \ref setBackgroundScaledMode), or when a different axis background pixmap was
   set.
 
   \see setBackground, setBackgroundScaled, setBackgroundScaledMode
@@ -17528,7 +17528,7 @@ void QCPAxisRect::mouseReleaseEvent(QMouseEvent *event)
   Event handler for mouse wheel events. If rangeZoom is Qt::Horizontal, Qt::Vertical or both, the
   ranges of the axes defined as rangeZoomHorzAxis and rangeZoomVertAxis are scaled. The center of
   the scaling operation is the current cursor position inside the axis rect. The scaling factor is
-  dependant on the mouse wheel delta (which direction the wheel was rotated) to provide a natural
+  dependent on the mouse wheel delta (which direction the wheel was rotated) to provide a natural
   zooming feel. The Strength of the zoom can be controlled via \ref setRangeZoomFactor.
 
   Note, that event->delta() is usually +/-120 for single rotation steps. However, if the mouse
@@ -18241,7 +18241,7 @@ bool QCPLegend::hasItemWithPlottable(const QCPAbstractPlottable *plottable) cons
 /*!
   Adds \a item to the legend, if it's not present already.
 
-  Returns true on sucess, i.e. if the item wasn't in the list already and has been successfuly added.
+  Returns true on success, i.e. if the item wasn't in the list already and has been successfuly added.
 
   The legend takes ownership of the item.
 */
diff --git a/ui/qt/qtshark_de.ts b/ui/qt/qtshark_de.ts
index 65f175083e..c9f1750d01 100644
--- a/ui/qt/qtshark_de.ts
+++ b/ui/qt/qtshark_de.ts
@@ -237,7 +237,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field occurence</source>
+        <source>Field occurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/ui/qt/qtshark_fr.ts b/ui/qt/qtshark_fr.ts
index 8cc3f9bf43..34cc818c1a 100644
--- a/ui/qt/qtshark_fr.ts
+++ b/ui/qt/qtshark_fr.ts
@@ -302,7 +302,7 @@
     </message>
     <message>
         <location filename="column_preferences_frame.ui" line="50"/>
-        <source>Field occurence</source>
+        <source>Field occurrence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h
index 14c484bbd9..38244f51c2 100644
--- a/ui/rtp_stream.h
+++ b/ui/rtp_stream.h
@@ -94,7 +94,7 @@ typedef struct _rtpstream_tapinfo {
     int     nstreams;                      /**< number of streams in the list */
     GList*  strinfo_list;                  /**< list with all streams */
     int     npackets;                      /**< total number of rtp packets of all streams */
-    /* used while tapping. user shouldnt modify these */
+    /* used while tapping. user shouldn't modify these */
     tap_mode_t mode;
     rtp_stream_info_t* filter_stream_fwd;  /**< used as filter in some tap modes */
     rtp_stream_info_t* filter_stream_rev;  /**< used as filter in some tap modes */
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c
index a4a62171bb..26919603b3 100644
--- a/ui/tap-rtp-common.c
+++ b/ui/tap-rtp-common.c
@@ -542,7 +542,7 @@ int rtp_packet_analyse(tap_rtp_stat_t *statinfo,
 	/* If the first one is 65535 we wrap */
 	else if ( (statinfo->seq_num == 65535) && (rtpinfo->info_seq_num == 0) )
 		statinfo->seq_num = rtpinfo->info_seq_num;
-	/* Lost packets. If the prev seq is enourmously larger than the cur seq
+	/* Lost packets. If the prev seq is enormously larger than the cur seq
 	 * we assume that instead of being massively late we lost the packet(s)
 	 * that would have indicated the sequence number wrapping. An imprecise
 	 * heuristic at best, but it seems to work well enough.
diff --git a/ui/text_import.c b/ui/text_import.c
index 966363bcb6..391b5446cb 100644
--- a/ui/text_import.c
+++ b/ui/text_import.c
@@ -634,7 +634,7 @@ parse_preamble (void)
     timecode = timecode_default;
     ts_usec = 0;
 
-    /* Ensure preamble has more than two chars before atempting to parse.
+    /* Ensure preamble has more than two chars before attempting to parse.
      * This should cover line breaks etc that get counted.
      */
     if ( strlen(packet_preamble) > 2 ) {