From a1ee155c6a64f1a1db3d2dfc489cd9a215b156a3 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sun, 17 Jun 2001 11:17:47 +0000 Subject: [PATCH] Minor UI stuff relating to clarity, continuity and English usage --- ChangeLog.claws | 13 +++++++++++++ src/mainwindow.c | 18 +++++++++--------- src/prefs_common.c | 36 +++++++++++++++++++----------------- src/summaryview.c | 12 ++++++------ 4 files changed, 47 insertions(+), 32 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 7b69ecd6e..28d8632a6 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,16 @@ +2001-06-17 [paul] + + Minor UI stuff + + * src/mainwindow.c + * src/summaryview.c + Improvements to the English + + * src/prefs_common.c + Improvements to the English and some + clarity/continuity improvements in the + description of Quote symbols. + 2001-06-17 [paul] 0.5.0claws1 diff --git a/src/mainwindow.c b/src/mainwindow.c index 1cc4f297b..0c0f2c1fd 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -384,7 +384,7 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_View/_Toolbar/Icon _and text"), NULL, toggle_toolbar_cb, TOOLBAR_BOTH, ""}, {N_("/_View/_Toolbar/_Icon"), NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Toolbar/Icon and text"}, {N_("/_View/_Toolbar/_Text"), NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"}, - {N_("/_View/_Toolbar/_Non-display"), NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"}, + {N_("/_View/_Toolbar/_None"), NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"}, {N_("/_View/_Status bar"), NULL, toggle_statusbar_cb, 0, ""}, {N_("/_View/---"), NULL, NULL, 0, ""}, {N_("/_View/Separate f_older tree"), NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, ""}, @@ -465,8 +465,8 @@ static GtkItemFactoryEntry mainwin_entries[] = #undef CODESET_ACTION {N_("/_Message"), NULL, NULL, 0, ""}, - {N_("/_Message/Rece_ive new mail"), "I", inc_mail_cb, 0, NULL}, - {N_("/_Message/Receive from _all accounts"), + {N_("/_Message/Get new ma_il"), "I", inc_mail_cb, 0, NULL}, + {N_("/_Message/Get from _all accounts"), "I", inc_all_account_mail_cb, 0, NULL}, {N_("/_Message/---"), NULL, NULL, 0, ""}, {N_("/_Message/Send queued messa_ges"), @@ -477,7 +477,7 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_Message/Repl_y to sender"), "R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, {N_("/_Message/Reply to a_ll"), "R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, {N_("/_Message/_Forward"), "F", reply_cb, COMPOSE_FORWARD, NULL}, - {N_("/_Message/Forward as an a_ttachment"), + {N_("/_Message/Forward as a_ttachment"), "F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, {N_("/_Message/---"), NULL, NULL, 0, ""}, {N_("/_Message/M_ove..."), "O", move_to_cb, 0, NULL}, @@ -488,13 +488,13 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_Message/_Mark/_Unmark"), NULL, unmark_cb, 0, NULL}, {N_("/_Message/_Mark/---"), NULL, NULL, 0, ""}, {N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL}, - {N_("/_Message/_Mark/Mark it as _being read"), + {N_("/_Message/_Mark/Mark as rea_d"), NULL, mark_as_read_cb, 0, NULL}, {N_("/_Message/---"), NULL, NULL, 0, ""}, {N_("/_Message/Open in new _window"), "N", open_msg_cb, 0, NULL}, {N_("/_Message/View _source"), "U", view_source_cb, 0, NULL}, {N_("/_Message/Show all _header"), "H", header_window_show_cb, 0, NULL}, - {N_("/_Message/Re_edit"), NULL, reedit_cb, 0, NULL}, + {N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL}, {N_("/_Summary"), NULL, NULL, 0, ""}, {N_("/_Summary/_Delete duplicated messages"), @@ -720,7 +720,7 @@ MainWindow *main_window_create(SeparateType type) switch (prefs_common.toolbar_style) { case TOOLBAR_NONE: menuitem = gtk_item_factory_get_item - (ifactory, "/View/Toolbar/Non-display"); + (ifactory, "/View/Toolbar/None"); break; case TOOLBAR_ICON: menuitem = gtk_item_factory_get_item @@ -1149,14 +1149,14 @@ void main_window_set_menu_sensitive(MainWindow *mainwin, gint selection) menu_set_sensitive(ifactory, "/Message/Reply to sender", sens); menu_set_sensitive(ifactory, "/Message/Reply to all", sens); menu_set_sensitive(ifactory, "/Message/Forward", sens); - menu_set_sensitive(ifactory, "/Message/Forward as an attachment", sens); + menu_set_sensitive(ifactory, "/Message/Forward an attachment", sens); menu_set_sensitive(ifactory, "/Message/Open in new window", sens); menu_set_sensitive(ifactory, "/Message/Show all header", sens); menu_set_sensitive(ifactory, "/Message/View source", sens); if (sens && (!mainwin->summaryview->folder_item || mainwin->summaryview->folder_item->stype != F_DRAFT)) sens = FALSE; - menu_set_sensitive(ifactory, "/Message/Reedit", sens); + menu_set_sensitive(ifactory, "/Message/Re-edit", sens); if (selection == SUMMARY_SELECTED_SINGLE || selection == SUMMARY_SELECTED_MULTIPLE) diff --git a/src/prefs_common.c b/src/prefs_common.c index 93fb6a1ff..fd9578ca4 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -934,9 +934,9 @@ static void prefs_send_create(void) gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); PACK_CHECK_BUTTON (vbox2, checkbtn_savemsg, - _("Save sent message to outbox")); + _("Save sent messages to outbox")); PACK_CHECK_BUTTON (vbox2, checkbtn_queuemsg, - _("Queue message that failed to send")); + _("Queue messages that fail to send")); PACK_CHECK_BUTTON (vbox2, checkbtn_returnreceipt, _("Send return receipt on request")); @@ -2422,30 +2422,32 @@ static void prefs_quote_description_create(void) gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); label = gtk_label_new - ("d:\n" /* date */ - "f:\n" /* from */ - "N:\n" /* full name */ - "F:\n" /* first name */ - "I:\n" /* sender's initial */ - "s:\n" /* subject line */ - "t:\n" /* to */ - "c:\n" /* cc */ - "n:\n" /* newsgroups */ - "i:\n" /* message id */ - "r:\n" /* references */ + ("SYMBOL\n\n" + "%d\n" /* date */ + "%f\n" /* from */ + "%N\n" /* full name */ + "%F\n" /* first name */ + "%I\n" /* sender's initial */ + "%s\n" /* subject line */ + "%t\n" /* to */ + "%c\n" /* cc */ + "%n\n" /* newsgroups */ + "%i\n" /* message id */ + "%r\n" /* references */ "\n" "%x\n" "?x(expr)\n" "\n" - "%M:\n" - "%Q:\n" - "%%:"); + "%M\n" + "%Q\n" + "%%"); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); label = gtk_label_new - (_("Date\n" + (_("DESCRIPTION\n\n" + "Date\n" "From\n" "Full Name of Sender\n" "First Name of Sender\n" diff --git a/src/summaryview.c b/src/summaryview.c index e53e595e2..912c26884 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -315,20 +315,20 @@ static GtkItemFactoryEntry summary_popup_entries[] = {N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL}, {N_("/_Mark/---"), NULL, NULL, 0, ""}, {N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL}, - {N_("/_Mark/Make it as _being read"), + {N_("/_Mark/Mark as rea_d"), NULL, summary_mark_as_read, 0, NULL}, {N_("/---"), NULL, NULL, 0, ""}, {N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL}, {N_("/Repl_y to sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL}, {N_("/Reply to a_ll"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL}, {N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL}, - {N_("/Forward as an a_ttachment"), + {N_("/Forward as a_ttachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}, {N_("/---"), NULL, NULL, 0, ""}, {N_("/Open in new _window"), NULL, summary_open_msg, 0, NULL}, {N_("/View so_urce"), NULL, summary_view_source, 0, NULL}, {N_("/Show all _header"), NULL, summary_show_all_header_cb, 0, NULL}, - {N_("/Re_edit"), NULL, summary_reedit, 0, NULL}, + {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL}, {N_("/---"), NULL, NULL, 0, ""}, {N_("/_Save as..."), NULL, summary_save_as, 0, NULL}, {N_("/_Print..."), NULL, summary_print, 0, NULL}, @@ -932,7 +932,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview) menu_set_sensitive(ifactory, "/Reply to sender", sens); menu_set_sensitive(ifactory, "/Reply to all", sens); menu_set_sensitive(ifactory, "/Forward", sens); - menu_set_sensitive(ifactory, "/Forward as an attachment", sens); + menu_set_sensitive(ifactory, "/Forward as attachment", sens); menu_set_sensitive(ifactory, "/Open in new window", sens); menu_set_sensitive(ifactory, "/View source", sens); @@ -940,7 +940,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview) if ((summaryview->folder_item->stype == F_DRAFT) || (summaryview->folder_item->stype == F_OUTBOX) || (summaryview->folder_item->stype == F_QUEUE)) - menu_set_sensitive(ifactory, "/Reedit", sens); + menu_set_sensitive(ifactory, "/Re-edit", sens); menu_set_sensitive(ifactory, "/Save as...", sens); menu_set_sensitive(ifactory, "/Print...", TRUE); @@ -951,7 +951,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview) menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE); menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE); - menu_set_sensitive(ifactory, "/Mark/Make it as being read", TRUE); + menu_set_sensitive(ifactory, "/Mark/Make as read", TRUE); menu_set_sensitive(ifactory, "/Select all", TRUE); } -- 2.25.1