diff options
| -rw-r--r-- | capchild/capture_ifinfo.c | 8 | ||||
| -rw-r--r-- | caputils/airpcap_loader.c | 2 | ||||
| -rw-r--r-- | editcap.c | 2 | ||||
| -rw-r--r-- | epan/uat.c | 2 | ||||
| -rw-r--r-- | extcap_spawn.c | 4 | ||||
| -rw-r--r-- | reordercap.c | 2 | ||||
| -rw-r--r-- | sharkd_session.c | 4 | ||||
| -rw-r--r-- | tfshark.c | 6 | ||||
| -rw-r--r-- | tshark.c | 2 | ||||
| -rw-r--r-- | ui/gtk/airpcap_dlg.c | 34 | ||||
| -rw-r--r-- | ui/gtk/main.c | 6 | ||||
| -rw-r--r-- | ui/gtk/main_airpcap_toolbar.c | 4 | ||||
| -rw-r--r-- | ui/gtk/main_welcome.c | 4 | ||||
| -rw-r--r-- | ui/gtk/proto_hier_stats_dlg.c | 4 | ||||
| -rw-r--r-- | ui/gtk/uat_gui.c | 2 | ||||
| -rw-r--r-- | ui/qt/capture_interfaces_dialog.cpp | 12 | ||||
| -rw-r--r-- | ui/qt/interface_tree_model.cpp | 2 |
17 files changed, 50 insertions, 50 deletions
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c index 15991ac357..539857b9d5 100644 --- a/capchild/capture_ifinfo.c +++ b/capchild/capture_ifinfo.c @@ -119,7 +119,7 @@ capture_interface_list(int *err, char **err_str, void (*update_cb)(void)) if ( g_list_length(if_list) == 0 ) { #endif - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed, error %d, %s (%s)!", + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed. Error %d, %s (%s)", *err, primary_msg ? primary_msg : "no message", secondary_msg ? secondary_msg : "no secondary message"); if (err_str) { @@ -251,7 +251,7 @@ capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode, err = sync_if_capabilities_open(ifname, monitor_mode, auth_string, &data, &primary_msg, &secondary_msg, update_cb); if (err != 0) { - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities failed, error %d, %s (%s)!", + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities failed. Error %d, %s (%s)", err, primary_msg ? primary_msg : "no message", secondary_msg ? secondary_msg : "no secondary message"); if (err_str) { @@ -275,7 +275,7 @@ capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode, * First line is 0 if monitor mode isn't supported, 1 if it is. */ if (raw_list[0] == NULL || *raw_list[0] == '\0') { - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities returned no information!"); + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities returned no information."); if (err_str) { *err_str = g_strdup("Dumpcap returned no interface capability information"); } @@ -298,7 +298,7 @@ capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode, break; default: - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities returned bad information!"); + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities returned bad information."); if (err_str) { *err_str = g_strdup_printf("Dumpcap returned \"%s\" for monitor-mode capability", raw_list[0]); diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 8a5c7e10af..8a9d10a5dc 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -642,7 +642,7 @@ airpcap_if_info_print(airpcap_if_info_t* if_info) guint i; if (if_info == NULL) { - g_print("\nWARNING : AirPcap Interface pointer is NULL!\n"); + g_print("\nWARNING : AirPcap Interface pointer is NULL.\n"); return; } @@ -277,7 +277,7 @@ add_selection(char *sel, guint* max_selection) if (max_selected >= MAX_SELECTIONS) { /* Let the user know we stopped selecting */ - fprintf(stderr, "Out of room for packet selections!\n"); + fprintf(stderr, "Out of room for packet selections.\n"); return(FALSE); } diff --git a/epan/uat.c b/epan/uat.c index ff8b6fb34a..92fac8f12f 100644 --- a/epan/uat.c +++ b/epan/uat.c @@ -635,7 +635,7 @@ gboolean uat_fld_chk_range(void* u1 _U_, const char* strptr, guint len, const vo ret_value = FALSE; break; default: - *err = g_strdup("This should not happen, it is a bug in wireshark! please report to wireshark-dev@wireshark.org"); + *err = g_strdup("Unable to convert range. Please report this to wireshark-dev@wireshark.org"); ret_value = FALSE; break; } diff --git a/extcap_spawn.c b/extcap_spawn.c index e486e4a15a..8b9b5988bf 100644 --- a/extcap_spawn.c +++ b/extcap_spawn.c @@ -333,11 +333,11 @@ extcap_wait_for_pipe(HANDLE pipe_h, HANDLE pid) else if (dw == (WAIT_OBJECT_0 + 1)) { /* extcap process terminated. */ - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "extcap terminated without connecting to pipe!"); + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "extcap terminated without connecting to pipe."); } else if (dw == WAIT_TIMEOUT) { - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "extcap didn't connect to pipe within 30 seconds!"); + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "extcap didn't connect to pipe within 30 seconds."); } else { diff --git a/reordercap.c b/reordercap.c index 006c33801e..edf853f32e 100644 --- a/reordercap.c +++ b/reordercap.c @@ -391,7 +391,7 @@ main(int argc, char *argv[]) ws_buffer_free(&buf); if (!write_output_regardless && (wrong_order_count == 0)) { - printf("Not writing output file because input file is already in order!\n"); + printf("Not writing output file because input file is already in order.\n"); } /* Free the whole array */ diff --git a/sharkd_session.c b/sharkd_session.c index 009e6d9755..d58c15e07f 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -1848,7 +1848,7 @@ sharkd_session_process(char *buf, const jsmntok_t *tokens, int count) if (!tok_req) { - fprintf(stderr, "sanity check(4): no \"req\"!\n"); + fprintf(stderr, "sanity check(4): no \"req\".\n"); return; } @@ -1909,7 +1909,7 @@ sharkd_session_main(void) jsmntok_t *tokens = NULL; int tokens_max = -1; - fprintf(stderr, "Hello in child!\n"); + fprintf(stderr, "Hello in child.\n"); while (fgets(buf, sizeof(buf), stdin)) { @@ -188,7 +188,7 @@ print_usage(FILE *output) /*fprintf(output, "\n");*/ fprintf(output, "Input file:\n"); - fprintf(output, " -r <infile> set the filename to read from (no pipes or stdin!)\n"); + fprintf(output, " -r <infile> set the filename to read from (no pipes or stdin)\n"); fprintf(output, "\n"); fprintf(output, "Processing:\n"); @@ -1026,9 +1026,9 @@ main(int argc, char *argv[]) } CATCH(OutOfMemoryError) { fprintf(stderr, - "Out Of Memory!\n" + "Out Of Memory.\n" "\n" - "Sorry, but TFShark has to terminate now!\n" + "Sorry, but TFShark has to terminate now.\n" "\n" "Some infos / workarounds can be found at:\n" "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); @@ -1354,7 +1354,7 @@ main(int argc, char *argv[]) GSList *export_pdu_tap_name_list = NULL; if (!*optarg) { - cmdarg_err("Tap name is required! Valid names are:"); + cmdarg_err("A tap name is required. Valid names are:"); for (export_pdu_tap_name_list = get_export_pdu_tap_list(); export_pdu_tap_name_list; export_pdu_tap_name_list = g_slist_next(export_pdu_tap_name_list)) { cmdarg_err("%s\n", (const char*)(export_pdu_tap_name_list->data)); } diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c index 6d85dea611..b3660b387f 100644 --- a/ui/gtk/airpcap_dlg.c +++ b/ui/gtk/airpcap_dlg.c @@ -503,7 +503,7 @@ on_key_management_apply_bt_clicked(GtkWidget *button _U_, gpointer data) key_list_store = GTK_LIST_STORE(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY)); toolbar_cb = GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_TOOLBAR_DECRYPTION_KEY)); -#define CANT_SAVE_ERR_STR "Cannot save configuration! Another application " \ +#define CANT_SAVE_ERR_STR "Cannot save configuration. Another application " \ "might be using AirPcap, or you might not have sufficient privileges." /* Set the Decryption Mode */ @@ -584,7 +584,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) if ( ((new_key_string->len) > WEP_KEY_MAX_CHAR_SIZE) || ((new_key_string->len) < WEP_KEY_MIN_CHAR_SIZE)) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WEP key size out of range!\nValid key size range is %d-%d characters (%d-%d bits).",WEP_KEY_MIN_CHAR_SIZE,WEP_KEY_MAX_CHAR_SIZE,WEP_KEY_MIN_BIT_SIZE,WEP_KEY_MAX_BIT_SIZE); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WEP key size out of range.\nValid key size range is %d-%d characters (%d-%d bits).",WEP_KEY_MIN_CHAR_SIZE,WEP_KEY_MAX_CHAR_SIZE,WEP_KEY_MIN_BIT_SIZE,WEP_KEY_MAX_BIT_SIZE); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -595,7 +595,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) if ((new_key_string->len % 2) != 0) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WEP key!\nThe number of characters must be even."); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WEP key.\nThe number of characters must be even."); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -608,7 +608,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) { if (!g_ascii_isxdigit(new_key_string->str[i])) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WEP key!\nA WEP key must be a hexadecimal number.\nThe valid characters are: 0123456789ABCDEF."); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WEP key.\nA WEP key must be a hexadecimal number.\nThe valid characters are: 0123456789ABCDEF."); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -630,7 +630,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) if ( ((new_key_string->len) > WPA_KEY_MAX_CHAR_SIZE) || ((new_key_string->len) < WPA_KEY_MIN_CHAR_SIZE)) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WPA key size out of range!\nValid key size range is %d-%d ASCII characters (%d-%d bits).",WPA_KEY_MIN_CHAR_SIZE,WPA_KEY_MAX_CHAR_SIZE,WPA_KEY_MIN_BIT_SIZE,WPA_KEY_MAX_BIT_SIZE); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WPA key size out of range.\nValid key size range is %d-%d ASCII characters (%d-%d bits).",WPA_KEY_MIN_CHAR_SIZE,WPA_KEY_MAX_CHAR_SIZE,WPA_KEY_MIN_BIT_SIZE,WPA_KEY_MAX_BIT_SIZE); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -644,7 +644,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) */ if ((new_ssid_string->len) > WPA_SSID_MAX_CHAR_SIZE) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"SSID key size out of range!\nValid SSID size range is %d-%d ASCII characters (%d-%d bits).",WPA_SSID_MIN_CHAR_SIZE,WPA_SSID_MAX_CHAR_SIZE,WPA_SSID_MIN_BIT_SIZE,WPA_SSID_MAX_BIT_SIZE); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"SSID key size out of range.\nValid SSID size range is %d-%d ASCII characters (%d-%d bits).",WPA_SSID_MIN_CHAR_SIZE,WPA_SSID_MAX_CHAR_SIZE,WPA_SSID_MIN_BIT_SIZE,WPA_SSID_MAX_BIT_SIZE); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -665,7 +665,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) if ( ((new_key_string->len) != WPA_PSK_KEY_CHAR_SIZE)) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WPA PSK/PMK key size is wrong!\nValid key size is %d characters (%d bits).",WPA_PSK_KEY_CHAR_SIZE,WPA_PSK_KEY_BIT_SIZE); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WPA PSK/PMK key size is wrong.\nValid key size is %d characters (%d bits).",WPA_PSK_KEY_CHAR_SIZE,WPA_PSK_KEY_BIT_SIZE); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -678,7 +678,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) { if (!g_ascii_isxdigit(new_key_string->str[i])) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WPA PSK/PMK key!\nKey must be an hexadecimal number.\nThe valid characters are: 0123456789ABCDEF."); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WPA PSK/PMK key.\nKey must be an hexadecimal number.\nThe valid characters are: 0123456789ABCDEF."); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -761,7 +761,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) if ( ((new_key_string->len) > WEP_KEY_MAX_CHAR_SIZE) || ((new_key_string->len) < WEP_KEY_MIN_CHAR_SIZE)) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WEP key size out of range!\nValid key size range is %d-%d characters (%d-%d bits).",WEP_KEY_MIN_CHAR_SIZE,WEP_KEY_MAX_CHAR_SIZE,WEP_KEY_MIN_BIT_SIZE,WEP_KEY_MAX_BIT_SIZE); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WEP key size out of range.\nValid key size range is %d-%d characters (%d-%d bits).",WEP_KEY_MIN_CHAR_SIZE,WEP_KEY_MAX_CHAR_SIZE,WEP_KEY_MIN_BIT_SIZE,WEP_KEY_MAX_BIT_SIZE); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -772,7 +772,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) if ((new_key_string->len % 2) != 0) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WEP key!\nThe number of characters must be even."); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WEP key.\nThe number of characters must be even."); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -785,7 +785,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) { if (!g_ascii_isxdigit(new_key_string->str[i])) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WEP key!\nA WEP key must be an hexadecimal number.\nThe valid characters are: 0123456789ABCDEF."); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WEP key.\nA WEP key must be an hexadecimal number.\nThe valid characters are: 0123456789ABCDEF."); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -811,7 +811,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) if ( ((new_key_string->len) > WPA_KEY_MAX_CHAR_SIZE) || ((new_key_string->len) < WPA_KEY_MIN_CHAR_SIZE)) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WPA key size out of range!\nValid key size range is %d-%d ASCII characters (%d-%d bits).",WPA_KEY_MIN_CHAR_SIZE,WPA_KEY_MAX_CHAR_SIZE,WPA_KEY_MIN_BIT_SIZE,WPA_KEY_MAX_BIT_SIZE); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WPA key size out of range.\nValid key size range is %d-%d ASCII characters (%d-%d bits).",WPA_KEY_MIN_CHAR_SIZE,WPA_KEY_MAX_CHAR_SIZE,WPA_KEY_MIN_BIT_SIZE,WPA_KEY_MAX_BIT_SIZE); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -825,7 +825,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) */ if ((new_ssid_string->len) > WPA_SSID_MAX_CHAR_SIZE) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"SSID key size out of range!\nValid SSID size range is %d-%d ASCII characters (%d-%d bits).",WPA_SSID_MIN_CHAR_SIZE,WPA_SSID_MAX_CHAR_SIZE,WPA_SSID_MIN_BIT_SIZE,WPA_SSID_MAX_BIT_SIZE); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"SSID key size out of range.\nValid SSID size range is %d-%d ASCII characters (%d-%d bits).",WPA_SSID_MIN_CHAR_SIZE,WPA_SSID_MAX_CHAR_SIZE,WPA_SSID_MIN_BIT_SIZE,WPA_SSID_MAX_BIT_SIZE); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -850,7 +850,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) if ( ((new_key_string->len) != WPA_PSK_KEY_CHAR_SIZE)) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WPA PSK/PMK key size is wrong!\nValid key size is %d characters (%d bits).",WPA_PSK_KEY_CHAR_SIZE,WPA_PSK_KEY_BIT_SIZE); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"WPA PSK/PMK key size is wrong.\nValid key size is %d characters (%d bits).",WPA_PSK_KEY_CHAR_SIZE,WPA_PSK_KEY_BIT_SIZE); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -863,7 +863,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) { if (!g_ascii_isxdigit(new_key_string->str[i])) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WPA PSK/PMK key!\nKey must be an hexadecimal number.\nThe valid characters are: 0123456789ABCDEF."); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Invalid WPA PSK/PMK key.\nKey must be an hexadecimal number.\nThe valid characters are: 0123456789ABCDEF."); g_string_free(new_type_string,TRUE); g_string_free(new_key_string, TRUE); @@ -942,7 +942,7 @@ on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data) if (gtk_tree_model_iter_n_children(GTK_TREE_MODEL(key_list_store), NULL) >= MAX_ENCRYPTION_KEYS) { - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Maximum number (%d) of decryption keys reached! You cannot add another key!\n",MAX_ENCRYPTION_KEYS); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Maximum number (%d) of decryption keys reached. You cannot add another key.\n",MAX_ENCRYPTION_KEYS); return; } @@ -2553,7 +2553,7 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_) gtk_widget_show (main_v_box); gtk_container_add (GTK_CONTAINER (keys_check_w), main_v_box); - warning_lb = gtk_label_new("<b>WARNING!</b> Decryption keys specified in Wireshark's preferences file differ from those specified for the AirPcap adapter(s). You can choose to:"); + warning_lb = gtk_label_new("<b>WARNING</b> Decryption keys specified in Wireshark's preferences file differ from those specified for the AirPcap adapter(s). You can choose to:"); gtk_label_set_use_markup (GTK_LABEL (warning_lb), TRUE); gtk_widget_set_name (warning_lb, "warning_lb"); gtk_widget_show (warning_lb); diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 11c73fb835..348868fdf5 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -258,7 +258,7 @@ match_selected_cb_do(GtkWidget *filter_te, int action, gchar *text) char *cur_filter, *new_filter; if ((!text) || (0 == strlen(text))) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not acquire information to build a filter!\nTry expanding or choosing another item."); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not acquire information to build a filter.\nTry expanding or choosing another item."); return; } @@ -356,7 +356,7 @@ colorize_selected_ptree_cb(GtkWidget *w _U_, gpointer data _U_, guint8 filt_nr) cfile.edt); if ((!filter) || (0 == strlen(filter))) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "Could not acquire information to build a filter!\n" + "Could not acquire information to build a filter.\n" "Try expanding or choosing another item."); return; } @@ -440,7 +440,7 @@ selected_ptree_info_cb(GtkWidget *widget _U_, gpointer data _U_) "As everyone can edit the Wiki and add new content (or extend existing), " "you are encouraged to add information if you can.\n" "\n" - "Hint 1: If you are new to wiki editing, try out editing the Sandbox first!\n" + "Hint 1: If you are new to wiki editing, try out editing the Sandbox first.\n" "\n" "Hint 2: If you want to add a new protocol page, you should use the ProtocolTemplate, " "which will save you a lot of editing and will give a consistent look over the pages.", diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c index 4be880527f..aa78802365 100644 --- a/ui/gtk/main_airpcap_toolbar.c +++ b/ui/gtk/main_airpcap_toolbar.c @@ -98,7 +98,7 @@ airpcap_toolbar_encryption_cb(GtkWidget *entry _U_, gpointer user_data _U_) airpcap_if_set_decryption_state(ad,airpcap_if_active->DecryptionOn); /* Save configuration */ 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, "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."); } airpcap_if_close(ad); } else { @@ -106,7 +106,7 @@ airpcap_toolbar_encryption_cb(GtkWidget *entry _U_, gpointer user_data _U_) airpcap_if_set_decryption_state(ad,airpcap_if_active->DecryptionOn); /* Save configuration */ 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, "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."); } airpcap_if_close(ad); } diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index 5debeb0fa0..ed92b07198 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -1306,7 +1306,7 @@ welcome_new(void) topic_menu_cb, GINT_TO_POINTER(ONLINEPAGE_NETWORK_MEDIA)); gtk_box_pack_start(GTK_BOX(topic_to_fill), item_hb, FALSE, FALSE, 5); #else - label_text = g_strdup("<span foreground=\"black\">Capturing is not compiled into\nthis version of Wireshark!</span>"); + label_text = g_strdup("<span foreground=\"black\">Capturing is not compiled into\nthis version of Wireshark.</span>"); w = gtk_label_new(label_text); gtk_label_set_markup(GTK_LABEL(w), label_text); g_free (label_text); @@ -1401,7 +1401,7 @@ welcome_new(void) topic_vb = welcome_topic_new("Updates", &topic_to_fill); gtk_box_pack_start(GTK_BOX(column_vb), topic_vb, TRUE, TRUE, 0); - label_text = g_strdup("<span foreground=\"black\">No updates available!</span>"); + label_text = g_strdup("<span foreground=\"black\">No updates available.</span>"); w = gtk_label_new(label_text); gtk_label_set_markup(GTK_LABEL(w), label_text); g_free (label_text); diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index 6f271bc6f5..974be9a31f 100644 --- a/ui/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -86,7 +86,7 @@ proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, g if (filter && strlen(filter) > 0) { str = g_strdup(filter); } else { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not acquire information to build a filter!\nTry expanding or choosing another item."); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not acquire information to build a filter.\nTry expanding or choosing another item."); return; } @@ -100,7 +100,7 @@ proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, g if (filter && strlen(filter) > 0) { str = g_strdup_printf("%s and %s", strtmp, filter); } else { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not acquire information to build a filter!\nTry expanding or choosing another item."); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not acquire information to build a filter.\nTry expanding or choosing another item."); g_free(strtmp); return; } diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index c7d3901341..247e522835 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -956,7 +956,7 @@ static gboolean unsaved_dialog(GtkWindow *w _U_, GdkEvent *e _U_, gpointer u) { gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); gtk_container_add(GTK_CONTAINER(win), vbox); - message = g_strdup_printf("Changes to '%s' are not being saved!\n" + message = g_strdup_printf("Changes to '%s' are not being saved.\n" "Do you want to save '%s'?", uat->name, uat->name); label = gtk_label_new(message); diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp index b4fb9e1713..e0eb171016 100644 --- a/ui/qt/capture_interfaces_dialog.cpp +++ b/ui/qt/capture_interfaces_dialog.cpp @@ -841,7 +841,7 @@ bool CaptureInterfacesDialog::saveOptionsToPreferences() switch (index) { case 1: if (global_capture_opts.autostop_filesize > 2000) { QMessageBox::warning(this, tr("Error"), - tr("Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.")); + tr("Multiple files: Requested filesize too large. The filesize cannot be greater than 2 GiB.")); return false; } else { global_capture_opts.autostop_filesize *= 1000; @@ -849,7 +849,7 @@ bool CaptureInterfacesDialog::saveOptionsToPreferences() break; case 2: if (global_capture_opts.autostop_filesize > 2) { QMessageBox::warning(this, tr("Error"), - tr("Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.")); + tr("Multiple files: Requested filesize too large. The filesize cannot be greater than 2 GiB.")); return false; } else { global_capture_opts.autostop_filesize *= 1000000; @@ -860,11 +860,11 @@ bool CaptureInterfacesDialog::saveOptionsToPreferences() /* test if the settings are ok for a ringbuffer */ if (global_capture_opts.save_file == NULL) { QMessageBox::warning(this, tr("Error"), - tr("Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.")); + tr("Multiple files: No capture file name given. You must specify a filename if you want to use multiple files.")); return false; } else if (!global_capture_opts.has_autostop_filesize && !global_capture_opts.has_file_duration) { QMessageBox::warning(this, tr("Error"), - tr("Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file\n if you want to use multiple files.")); + tr("Multiple files: No file limit given. You must specify a file size or duration at which is switched to the next capture file\n if you want to use multiple files.")); g_free(global_capture_opts.save_file); global_capture_opts.save_file = NULL; return false; @@ -877,7 +877,7 @@ bool CaptureInterfacesDialog::saveOptionsToPreferences() switch (index) { case 1: if (global_capture_opts.autostop_filesize > 2000) { QMessageBox::warning(this, tr("Error"), - tr("Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.")); + tr("Multiple files: Requested filesize too large. The filesize cannot be greater than 2 GiB.")); return false; } else { global_capture_opts.autostop_filesize *= 1000; @@ -885,7 +885,7 @@ bool CaptureInterfacesDialog::saveOptionsToPreferences() break; case 2: if (global_capture_opts.autostop_filesize > 2) { QMessageBox::warning(this, tr("Error"), - tr("Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.")); + tr("Multiple files: Requested filesize too large. The filesize cannot be greater than 2 GiB.")); return false; } else { global_capture_opts.autostop_filesize *= 1000000; diff --git a/ui/qt/interface_tree_model.cpp b/ui/qt/interface_tree_model.cpp index 78d02b002a..54bca41677 100644 --- a/ui/qt/interface_tree_model.cpp +++ b/ui/qt/interface_tree_model.cpp @@ -78,7 +78,7 @@ QString InterfaceTreeModel::interfaceError() QString errorText; if ( rowCount() == 0 ) { - errorText = tr("No Interfaces found!"); + errorText = tr("No Interfaces found."); } #ifdef HAVE_LIBPCAP else if ( global_capture_opts.ifaces_err != 0 ) |