Don't yell at the user quite so much. Remove exclamation points from

some error messages and rephrase some others.

svn path=/trunk/; revision=47787

diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c
index 6e9661fb4b77450dfbaa53d4476ef40217e77fdb..8f39f0be0d7f9b65d4aa09cf70631b5ab5f9f06c 100644 (file)
--- a/ui/gtk/airpcap_dlg.c
+++ b/ui/gtk/airpcap_dlg.c
@@ -737,7 +737,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data)
     }
     else /* Should never happen!!! */
     {
-        simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Unknown error in the key \"Type\" field!");
+        simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Unknown error in the key \"Type\" field.");
     }
 
     g_string_free(new_type_string,TRUE);
@@ -926,7 +926,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data)
     }
     else /* Should never happen!!! */
     {
-        simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Unknown error in the key \"Type\" field!");
+        simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Unknown error in the key \"Type\" field.");
     }
 
     g_string_free(new_type_string,TRUE);
@@ -1695,7 +1695,7 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
     }
     else
     {
-        interface_name_lb = gtk_label_new("No airpcap interface found!");
+        interface_name_lb = gtk_label_new("Couldn't find an airpcap interface.");
         gtk_widget_set_sensitive(main_box,FALSE);
     }
 

diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c
index a8216ae64766a3cb9e68d7c4c95c2bfb8c441d0e..50c1ce2b71dec0706ed4ba856cd08836b7ebba37 100644 (file)
--- a/ui/gtk/capture_if_details_dlg_win32.c
+++ b/ui/gtk/capture_if_details_dlg_win32.c
@@ -2284,7 +2284,7 @@ capture_if_details_open_win(char *iface)
 
     wpcap_packet_close(adapter);
 
-    label = gtk_label_new("Note: the accuracy of all of these values relies only on the network card driver!");
+    label = gtk_label_new("Some drivers may not provide accurate values.");
     gtk_box_pack_start(GTK_BOX(main_vb), label, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/);
 
     /* Button row. */
@@ -2336,9 +2336,9 @@ capture_if_details_open(char *iface)
         /* couldn't even get the packet.dll version, must be a very old one or just not existing -> give up */
         /* (this seems to be the case for 2.3 beta and all previous releases) */
         simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
-            "%sCouldn't obtain WinPcap packet.dll version!%s"
-            "\n\nThe WinPcap packet.dll is not installed or the version you use seems to be very old!"
-            "\n\nPlease update/install WinPcap.",
+            "%sCouldn't obtain WinPcap packet.dll version.%s"
+            "\n\nThe WinPcap packet.dll is not installed or the version you use seems to be very old."
+            "\n\nPlease update or install WinPcap.",
             simple_dialog_primary_start(), simple_dialog_primary_end());
         return;
     }
@@ -2368,10 +2368,9 @@ capture_if_details_open(char *iface)
     if (!version_ok) {
         /* packet.dll version not known to us, warn user but try to continue */
         dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK | ESD_BTN_CANCEL,
-            "%sUnknown WinPcap version might crash or fail!%s"
-            "\n\nThe WinPcap packet.dll version \"%s\" is unknown if it supports required functions!"
-            "\n\nOnly WinPcap versions 3.0 and 3.1 are known to work with this feature."
-            "\n\nCrashes or unexpected behaviour might occur, you have been warned!"
+            "%sUnknown WinPcap version.%s"
+            "\n\nThe WinPcap packet.dll version \"%s\" is unknown. It may not"
+            "\nprovide functions that we need and might even crash."
             "\n\nContinue anyway?",
             simple_dialog_primary_start(), simple_dialog_primary_end(), version);
         simple_dialog_set_cb(dialog, capture_if_details_open_answered_cb, iface);

diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
index 7d0183dc0ff18b0b2181107c90b9f0fdcba1560d..2d1c302e5636ec38943ad9a418b70b9809347be9 100644 (file)
--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@@ -110,7 +110,7 @@ savesslkeys_save_clicked_cb(GtkWidget * w _U_, gpointer data _U_)
 
     if (ssl_session_key_count() < 1) {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                      "No SSL Session Keys to export!");
+                      "No SSL Session Keys to export.");
         g_free(file);
         return TRUE;
     }
@@ -172,7 +172,7 @@ savesslkeys_cb(GtkWidget * w _U_, gpointer data _U_)
     /* don't show up the dialog, if no data has to be saved */
     if (keylist_len==0) {
         /* shouldn't happen as the menu item should have been greyed out */
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "There are no SSL Session Keys to save!");
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "There are no SSL Session Keys to save.");
         return;
     }
 

diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index 62e1fcc221cb89a4b438e502666486cf5c6a2e39..e2178a056582c4952faee6a02363addf3e6502b0 100644 (file)
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -272,7 +272,7 @@ fileset_init_table(GtkWidget *parent_vb)
 
     gtk_window_set_title(GTK_WINDOW(fs_w), "Wireshark: 0 Files in Set");
 
-    gtk_label_set_text(GTK_LABEL(fs_dir_lb), "No capture file loaded!");
+    gtk_label_set_text(GTK_LABEL(fs_dir_lb), "No capture file loaded.");
 
     row++;
 }

diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 01720edc39b59598a97eea6c6ff4c95fa869d308..3ebaece893ca52ea310f712f7d09c2a87016cf76 100644 (file)
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -2728,18 +2728,18 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                if ((user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC) ||
                        (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC))
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: Unsupported codec!");
+                       "Can't save in a file: Unsupported codec.");
                else if ((user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_LENGTH) ||
                        (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_LENGTH))
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: Wrong length of captured packets!");
+                       "Can't save in a file: Wrong length of captured packets.");
                else if ((user_data->forward.saveinfo.error_type == TAP_RTP_SHORT_FRAME) ||
                        (user_data->reversed.saveinfo.error_type == TAP_RTP_SHORT_FRAME))
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: Not all data in all packets was captured!");
+                       "Can't save in a file: Not all data in all packets was captured.");
                else
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: File I/O problem!");
+                       "Can't save in a file: File I/O problem.");
                g_free(g_dest);
                return TRUE; /* we're done */
        }
@@ -2748,16 +2748,16 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both))))) {
                if (user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: Unsupported codec!");
+                       "Can't save forward direction in a file: Unsupported codec.");
                else if (user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_LENGTH)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: Wrong length of captured packets!");
+                       "Can't save forward direction in a file: Wrong length of captured packets.");
                else if (user_data->forward.saveinfo.error_type == TAP_RTP_SHORT_FRAME)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: Not all data in all packets was captured!");
+                       "Can't save forward direction in a file: Not all data in all packets was captured.");
                else
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: File I/O problem!");
+                       "Can't save forward direction in a file: File I/O problem.");
                g_free(g_dest);
                return TRUE; /* we're done */
        }
@@ -2766,19 +2766,19 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both))))) {
                if (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: Unsupported codec!");
+                       "Can't save reversed direction in a file: Unsupported codec.");
                else if (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_LENGTH)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: Wrong length of captured packets!");
+                       "Can't save reversed direction in a file: Wrong length of captured packets.");
                else if (user_data->reversed.saveinfo.error_type == TAP_RTP_SHORT_FRAME)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: Not all data in all packets was captured!");
+                       "Can't save reversed direction in a file: Not all data in all packets was captured.");
                else if (user_data->reversed.saveinfo.error_type == TAP_RTP_NO_DATA)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: No IAX2 data!");
+                       "Can't save reversed direction in a file: No IAX2 data.");
                else
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: File I/O problem!");
+                       "Can't save reversed direction in a file: File I/O problem.");
                g_free(g_dest);
                return TRUE; /* we're done */
        }
@@ -2855,7 +2855,7 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
        if (!copy_file(g_dest, channels, format, user_data)) {
                /* XXX - report the error type! */
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "An error occurred while saving voice in a file!");
+                       "An error occurred while saving voice in a file.");
                g_free(g_dest);
                return TRUE; /* we're done */
        }
@@ -3500,7 +3500,7 @@ process_node(proto_node *ptree_node, header_field_info *hfinformation,
                hfssrc = proto_registrar_get_byname(proto_field);
                if (hfssrc == NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                                     "Bad field name!");
+                                     "Bad field name.");
                        return FALSE;
                        }
                for (ptree_node = ptree_node->first_child;
@@ -3544,14 +3544,14 @@ get_int_value_from_proto_tree(proto_tree *protocol_tree,
        hfinformation = proto_registrar_get_byname(proto_name);
        if (hfinformation == NULL) {
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                             "Bad proto!");
+                             "Bad proto.");
                return FALSE;
                }
 
        ptree_node = ((proto_node *)protocol_tree)->first_child;
        if (!ptree_node) {
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                             "No info!");
+                             "No info.");
                return FALSE;
                }
        return process_node(ptree_node, hfinformation, proto_field, p_result);
@@ -3722,14 +3722,14 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
        if (frame_matched != 1) {
                epan_dissect_cleanup(&edt);
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                   "You didn't choose a IAX2 packet!");
+                   "Please select an IAX2 packet.");
                return;
        }
 #if 0
        /* check if it is Voice or MiniPacket */
        if (!get_int_value_from_proto_tree(edt->tree, "iax2", "iax2.call", &ptype)) {
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                   "Please select a Voice packet!");
+                   "Please select a Voice packet.");
                return;
        }
 #endif
@@ -3737,7 +3737,7 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
        /* check if it is part of a Call */
        if (edt.pi.circuit_id == 0) {
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                   "Please select a Call packet!");
+                   "Please select a Call packet.");
                return;
        }
 

diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 313e52a2c0c0b7ff2b5d83b955192205938e5b41..90e396f8f65580f92e8951e4402b22538b2a4f6f 100644 (file)
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2264,7 +2264,7 @@ main(int argc, char *argv[])
 
     if (airpcap_if_list == NULL || g_list_length(airpcap_if_list) == 0){
       if (err == CANT_GET_AIRPCAP_INTERFACE_LIST && err_str != NULL) {
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", "Failed to open Airpcap Adapters!");
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", "Failed to open Airpcap Adapters.");
         g_free(err_str);
       }
       airpcap_if_active = NULL;

diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c
index 7db4ff216377df606c54df39998a99a56959ecf1..b51e06c9204c2140e9c587a37df42ee2ebb82335 100644 (file)
--- a/ui/gtk/main_airpcap_toolbar.c
+++ b/ui/gtk/main_airpcap_toolbar.c
@@ -117,7 +117,7 @@ airpcap_toolbar_encryption_cb(GtkWidget *entry _U_, gpointer user_data _U_)
       }
     }
   } else {
-    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No active AirPcap Adapter selected!");
+    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No active AirPcap Adapter selected.");
     return;
   }
 
@@ -136,14 +136,18 @@ airpcap_toolbar_encryption_cb(GtkWidget *entry _U_, gpointer user_data _U_)
           airpcap_if_set_decryption_state(ad,curr_if->DecryptionOn);
           /* Save configuration for the curr_if */
           if(!airpcap_if_store_cur_config_as_adapter_default(ad)) {
-            simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Cannot save configuration!!!\nRemember that in order to store the configuration in the registry you have to:\n\n- Close all the airpcap-based applications.\n- Be sure to have administrative privileges.");
+            simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+              "Unable to save configuration."
+              "\nIn order to store the configuration in the registry you"
+              "\nhave to close all other AirPcap-based applications and"
+              "\nhave Administrator privileges.");
           }
           airpcap_if_close(ad);
         }
       }
     }
   } else {
-    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "AirPcap Adapter Error!");
+    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "AirPcap Adapter Error.");
     return;
   }
 }

diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c
index 1e75ac8605df28458940db70678a2bad01ded0be..ff903e63a2de3a6a7d113f2cb8cd4aeb29000263 100644 (file)
--- a/ui/gtk/packet_panes.c
+++ b/ui/gtk/packet_panes.c
@@ -639,7 +639,7 @@ copy_hex_cb(GtkWidget * w _U_, gpointer data _U_, copy_data_type data_type)
     bv = get_notebook_bv_ptr(byte_nb_ptr_gbl);
     if (bv == NULL) {
         /* shouldn't happen */
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window!");
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window.");
         return;
     }
 
@@ -718,7 +718,7 @@ savehex_save_clicked_cb(GtkWidget * w _U_, gpointer data _U_)
 
 #if 0 /* Not req'd: GtkFileChooserWidget currently being used won't return with a Null filename */
     if (!file ||! *file) {
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Please enter a filename!");
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Please enter a filename.");
         g_free(file);
         return TRUE;
     }
@@ -738,7 +738,7 @@ savehex_save_clicked_cb(GtkWidget * w _U_, gpointer data _U_)
     bv = get_notebook_bv_ptr(byte_nb_ptr_gbl);
     if (bv == NULL) {
         /* shouldn't happen */
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window!");
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window.");
         g_free(file);
         return TRUE;
     }
@@ -751,7 +751,7 @@ savehex_save_clicked_cb(GtkWidget * w _U_, gpointer data _U_)
 
     if (data_p == NULL || start == -1 || start > end) {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                      "No data selected to save!");
+                      "No data selected to save.");
         g_free(file);
         return TRUE;
     }
@@ -805,7 +805,7 @@ savehex_cb(GtkWidget * w _U_, gpointer data _U_)
     bv = get_notebook_bv_ptr(byte_nb_ptr_gbl);
     if (bv == NULL) {
         /* shouldn't happen */
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window!");
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window.");
         return;
     }
     start = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_START_KEY));
@@ -813,7 +813,7 @@ savehex_cb(GtkWidget * w _U_, gpointer data _U_)
     data_p = get_byte_view_data_and_length(bv, &len);
 
     if (data_p == NULL || start == -1 || start > end) {
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No data selected to save!");
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No data selected to save.");
         return;
     }
 

diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 2b538db1c38fb1a572ca6a58f744ed478a9744ff..65e9bb5a1a85d65874c22d5e1237e492fc67ddd7 100644 (file)
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -1359,9 +1359,9 @@ dialog_graph_draw(user_data_t* user_data)
                                   * ((last_interval-interval)/user_data->dlg.dialog_graph.interval + 1))
                                + left_x_border;
 
-                       if (user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags & 
+                       if (user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags &
                                (STAT_FLAG_WRONG_SEQ|STAT_FLAG_MARKER|STAT_FLAG_DUP_PKT)) {
-                               if (user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags & 
+                               if (user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags &
                                        (STAT_FLAG_WRONG_SEQ|STAT_FLAG_DUP_PKT)) {
                                        g_strlcpy(label_string, "x", sizeof(label_string));
                                } else {
@@ -2799,22 +2799,22 @@ save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                if ((user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                    || (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC))
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: Unsupported codec!");
+                       "Can't save in a file: Unsupported codec.");
                else if ((user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_LENGTH)
                         || (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_LENGTH))
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: Wrong length of captured packets!");
+                       "Can't save in a file: Wrong length of captured packets.");
                else if ((user_data->forward.saveinfo.error_type == TAP_RTP_PADDING_ERROR)
                         || (user_data->reversed.saveinfo.error_type == TAP_RTP_PADDING_ERROR))
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: RTP data with padding!");
+                       "Can't save in a file: RTP data with padding.");
                else if ((user_data->forward.saveinfo.error_type == TAP_RTP_SHORT_FRAME)
                         || (user_data->reversed.saveinfo.error_type == TAP_RTP_SHORT_FRAME))
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: Not all data in all packets was captured!");
+                       "Can't save in a file: Not all data in all packets was captured.");
                else
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save in a file: File I/O problem!");
+                       "Can't save in a file: File I/O problem.");
                g_free(g_dest);
                return TRUE; /* we're done */
        }
@@ -2824,19 +2824,19 @@ save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                     || (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both))))) {
                if (user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: Unsupported codec!");
+                       "Can't save forward direction in a file: Unsupported codec.");
                else if (user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_LENGTH)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: Wrong length of captured packets!");
+                       "Can't save forward direction in a file: Wrong length of captured packets.");
                else if (user_data->forward.saveinfo.error_type == TAP_RTP_PADDING_ERROR)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: RTP data with padding!");
+                       "Can't save forward direction in a file: RTP data with padding.");
                else if (user_data->forward.saveinfo.error_type == TAP_RTP_SHORT_FRAME)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: Not all data in all packets was captured!");
+                       "Can't save forward direction in a file: Not all data in all packets was captured.");
                else
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save forward direction in a file: File I/O problem!");
+                       "Can't save forward direction in a file: File I/O problem.");
                g_free(g_dest);
                return TRUE; /* we're done */
        }
@@ -2846,22 +2846,22 @@ save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                     || (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both))))) {
                if (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: Unsupported codec!");
+                       "Can't save reversed direction in a file: Unsupported codec.");
                else if (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_LENGTH)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: Wrong length of captured packets!");
+                       "Can't save reversed direction in a file: Wrong length of captured packets.");
                else if (user_data->reversed.saveinfo.error_type == TAP_RTP_PADDING_ERROR)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: RTP data with padding!");
+                       "Can't save reversed direction in a file: RTP data with padding.");
                else if (user_data->reversed.saveinfo.error_type == TAP_RTP_SHORT_FRAME)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: Not all data in all packets was captured!");
+                       "Can't save reversed direction in a file: Not all data in all packets was captured.");
                else if (user_data->reversed.saveinfo.error_type == TAP_RTP_NO_DATA)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: No RTP data!");
+                       "Can't save reversed direction in a file: No RTP data.");
                else
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "Can't save reversed direction in a file: File I/O problem!");
+                       "Can't save reversed direction in a file: File I/O problem.");
                g_free(g_dest);
                return TRUE; /* we're done */
        }
@@ -2939,7 +2939,7 @@ save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
        if (!copy_file(g_dest, channels, format, user_data)) {
                /* XXX - report the error type! */
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                       "An error occurred while saving voice in a file!");
+                       "An error occurred while saving voice in a file.");
                g_free(g_dest);
                return TRUE; /* we're done */
        }
@@ -3955,7 +3955,7 @@ rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
        if (frame_matched != TRUE) {
                epan_dissect_cleanup(&edt);
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                   "You didn't choose a RTP packet!");
+                   "Please select an RTP packet.");
                return;
        }
 
@@ -3974,14 +3974,14 @@ rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
        /* check if it is RTP Version 2 */
        if (!get_int_value_from_proto_tree(edt.tree, "rtp", "rtp.version", &version_fwd) || version_fwd != 2) {
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                             "RTP Version != 2 isn't supported!");
+                             "Only RTP version 2 is supported.");
                return;
        }
 
        /* now we need the SSRC value of the current frame */
        if (!get_int_value_from_proto_tree(edt.tree, "rtp", "rtp.ssrc", &ssrc_fwd)) {
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                   "SSRC value couldn't be found!");
+                   "SSRC value not found.");
                return;
        }
 

diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index fdb036cb38410c226e77ac6e40167d0bfa8d64ec..776615f25c94e6a9ce47d9a7465a57742d8514fe 100644 (file)
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -979,7 +979,7 @@ sctp_analyse_cb(struct sctp_analyse *u_data, gboolean ext)
        if (frame_matched != 1) {
                epan_dissect_cleanup(&edt);
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                   "Please choose an SCTP packet!");
+                   "Please choose an SCTP packet.");
                return;
        }
 
@@ -1026,7 +1026,7 @@ sctp_analyse_cb(struct sctp_analyse *u_data, gboolean ext)
 
        }
        if (!frame_found)
-               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Assoc not found!");
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Assoc not found.");
 }
 
 void

diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index 364d6016d2f71a226b690638fd244dfe3aed5ea3..599d8e49ae9c59d884b553bd68572b5dcfaa8b70 100644 (file)
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -115,8 +115,8 @@ static GtkWidget *zoomout_bt;
 
 static void draw_sack_graph(struct sctp_udata *u_data)
 {
-       GdkRGBA red_color =    {1.0, 0.0, 0.0, 1.0}; 
-       GdkRGBA green_color =  {0.0, 1.0, 0.0, 1.0}; 
+       GdkRGBA red_color =    {1.0, 0.0, 0.0, 1.0};
+       GdkRGBA green_color =  {0.0, 1.0, 0.0, 1.0};
        gint diff;
        GPtrArray *array = NULL;
        guint32 i, size = 0, start=0, end;
@@ -186,7 +186,7 @@ static void draw_sack_graph(struct sctp_udata *u_data)
                                LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff+0.5,
                                u_data->io->surface_height-BOTTOM_BORDER-u_data->io->offset-((SUB_32(end,min_tsn))*u_data->io->y_interval)+0.5);
                                cairo_stroke(cr);
-                               cairo_destroy(cr);                      
+                               cairo_destroy(cr);
                        if (more == TRUE)
                        {
 #if GTK_CHECK_VERSION(2,22,0)
@@ -377,7 +377,7 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
        cairo_line_to(cr, u_data->io->surface_width - RIGHT_BORDER + u_data->io->offset - 5.5, u_data->io->surface_height - BOTTOM_BORDER + 5.5);
        cairo_stroke(cr);
        cairo_destroy(cr);
-       
+
        u_data->io->axis_width = u_data->io->surface_width - LEFT_BORDER - RIGHT_BORDER - u_data->io->offset;
 
        if(u_data->io->tmp_width>0){
@@ -863,7 +863,7 @@ on_zoomin_bt (GtkWidget *widget _U_, struct sctp_udata *u_data)
        }
        else
        {
-               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Please draw a rectangle around the area you want to zoom in!");
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Please draw a rectangle around the area you want to zoom in.");
        }
 }
 

diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c
index 50052906e8c95913d8592e6e12d89c86a636de46..34d3b8a67d2c2bcec4eed7260716f7737df8015d 100644 (file)
--- a/ui/gtk/sctp_error_dlg.c
+++ b/ui/gtk/sctp_error_dlg.c
@@ -298,5 +298,5 @@ void sctp_error_dlg_show(sctp_assoc_info_t* assoc)
        }
        else
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                   "No errors found!");
+                   "No errors found.");
 }

diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index 9160e3a09eb1defb73a798bd4a6c7ed5bd315dd5..62fac929aee02a6a671b9939ff8629b9a6c2d106 100644 (file)
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -338,7 +338,7 @@ draw_nr_sack_graph(struct sctp_udata *u_data)
        guint8 type;
        guint32 tsnumber, j;
        gint xvalue, yvalue;
-       GdkRGBA red_color =    {1.0, 0.0, 0.0, 1.0}; 
+       GdkRGBA red_color =    {1.0, 0.0, 0.0, 1.0};
        GdkRGBA green_color =  {0.0, 1.0, 0.0, 1.0};
        GdkRGBA blue_color  =  {0.0, 0.0, 1.0, 1.0};
        struct nr_sack_chunk_header *nr_sack_header;
@@ -1252,7 +1252,7 @@ on_zoomin_bt (GtkWidget *widget _U_, gpointer user_data)
        }
        else
        {
-               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Please draw a rectangle around the area you want to zoom in!");
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Please draw a rectangle around the area you want to zoom in.");
        }
 }