diff options
author | Gerald Combs <gerald@zing.org> | 2017-02-19 10:58:47 -0800 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-02-20 16:53:17 +0000 |
commit | d84577fe1aeb8e3b06d922258ccb482e5a2201cc (patch) | |
tree | 19ee482a9768414c0219e3aa4b2e27224720d14d /ui/gtk | |
parent | 6e8066cc287e0f93f23714d1c453714e5d38f9c5 (diff) | |
download | wireshark-d84577fe1aeb8e3b06d922258ccb482e5a2201cc.tar.gz |
Yell at the user less.
Our user-facing messages should have a helpful (or at the very least
neutral) tone. In English, exclamation points are neither. Replace a
bunch of them with periods.
Change-Id: I29c3b2f84c25e06aae5b559860224559053a0378
Reviewed-on: https://code.wireshark.org/review/20189
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk')
-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 |
6 files changed, 27 insertions, 27 deletions
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); |