Use pcapng as the name of the file format.

At one point, I remember a discussion resulting in the official name of
the next-generation replacement for pcap format being changed to
"pcapng", with no hyphen.

Make Wireshark reflect that.

Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a
Reviewed-on: https://code.wireshark.org/review/25214
Reviewed-by: Guy Harris <guy@alum.mit.edu>

4 files changed, 11 insertions, 11 deletions

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 798bc0e5b9..bb68bbf918 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -822,7 +822,7 @@ capture_filter_check_syntax_cb(GtkWidget *w _U_, gpointer user_data _U_)
      * header types; we will not have it if, for example, we have a named
      * pipe rather than an interface, as a named pipe doesn't *have* a
      * link-layer header type until the capture is started and the
-     * pcap file header or pcap-ng interface description block is
+     * pcap file header or pcapng interface description block is
      * written, and we can't wait for that.  We won't have it if we can't
      * open the interface, either.
      *
@@ -5021,8 +5021,8 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   ws_gtk_grid_attach_extended(GTK_GRID (multi_grid), multi_files_on_cb, 0, row, 1, 1,
                               (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_FILL), 0, 0);
 
-  /* Pcap-NG row */
-  pcap_ng_cb = gtk_check_button_new_with_mnemonic("Use pcap-ng format");
+  /* Pcapng row */
+  pcap_ng_cb = gtk_check_button_new_with_mnemonic("Use pcapng format");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pcap_ng_cb), global_capture_opts.use_pcapng);
   gtk_widget_set_tooltip_text(pcap_ng_cb, "Capture packets in the next-generation capture file format. "
                        "This is still experimental.");
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 5738f232bf..291ba4b9e8 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -1350,8 +1350,8 @@ do_file_save(capture_file *cf, gboolean dont_reopen)
        it to a permanent file.  Prompt the user for a location
        to which to save it.  Don't require that the file format
        support comments - if it's a temporary capture file, it's
-       probably pcap-ng, which supports comments and, if it's
-       not pcap-ng, let the user decide what they want to do
+       probably pcapng, which supports comments and, if it's
+       not pcapng, let the user decide what they want to do
        if they've added comments. */
     return file_save_as_cmd(cf, FALSE, dont_reopen);
   } else {
@@ -1443,7 +1443,7 @@ file_save_cmd_cb(GtkWidget *w _U_, gpointer data _U_) {
 /* Attach a list of the valid 'save as' file types to a combo_box by
    checking what Wiretap supports.  Make the default type the first
    in the list.  If must_supprt_comments is true, restrict the list
-   to those formats that support comments (currently, just pcap-ng).
+   to those formats that support comments (currently, just pcapng).
 
    Returns the default file type. */
 static int
@@ -1589,7 +1589,7 @@ gtk_check_save_as_with_comments(GtkWidget *w, capture_file *cf, int file_type)
   switch (response) {
 
   case RESPONSE_SAVE_IN_ANOTHER_FORMAT:
-    /* OK, the only other format we support is pcap-ng.  Make that
+    /* OK, the only other format we support is pcapng.  Make that
        the one and only format in the combo box, and return to
        let the user continue with the dialog.
 
@@ -1597,7 +1597,7 @@ gtk_check_save_as_with_comments(GtkWidget *w, capture_file *cf, int file_type)
        the compressed checkbox; get the current value and restore
        it.
 
-       XXX - we know pcap-ng can be compressed; if we ever end up
+       XXX - we know pcapng can be compressed; if we ever end up
        supporting saving comments in a format that *can't* be
        compressed, such as NetMon format, we must check this. */
     /* XXX - need a compressed checkbox here! */
diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c
index a9a239683d..323f5dca0b 100644
--- a/ui/gtk/export_pdu_dlg.c
+++ b/ui/gtk/export_pdu_dlg.c
@@ -103,7 +103,7 @@ export_pdu_show_cb(GtkWidget *w _U_, gpointer d _U_)
     exp_pdu_dlg_data = (exp_pdu_dlg_t *)g_malloc(sizeof(exp_pdu_dlg_t));
     exp_pdu_dlg_data->exp_pdu_tap_data.pkt_encap = wtap_wtap_encap_to_pcap_encap(WTAP_ENCAP_WIRESHARK_UPPER_PDU);
 
-    export_pdu_dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Export PDUs to pcap-ng file");
+    export_pdu_dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Export PDUs to pcapng file");
 
     g_signal_connect(export_pdu_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
     g_signal_connect(export_pdu_dlg, "destroy", G_CALLBACK(export_pdu_destroy_cb), NULL);
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index 03a78a52cb..8e87baaf6e 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -211,9 +211,9 @@ capture_prefs_show(void)
 	g_signal_connect(promisc_cb, "toggled", G_CALLBACK(prom_mode_cb), NULL);
 	g_object_set_data(G_OBJECT(capture_window), PROM_MODE_KEY, promisc_cb);
 
-	/* Pcap-NG format */
+	/* Pcapng format */
 	pcap_ng_cb = create_preference_check_button(main_grid, row++,
-	    "Capture packets in pcap-ng format:",
+	    "Capture packets in pcapng format:",
 	    "Capture packets in the next-generation capture file format.",
 	    prefs.capture_pcap_ng);
 	g_object_set_data(G_OBJECT(capture_window), PCAP_NG_KEY, pcap_ng_cb);