+2002-11-27 [paul] 0.8.6claws22
+
+ * src/mainwindow.c
+ src/prefs_account.c
+ src/prefs_actions.c
+ src/prefs_common.c
+ src/prefs_customheader.c
+ src/prefs_display_header.c
+ src/prefs_filtering.c
+ src/prefs_folder_item.c
+ src/prefs_matcher.c
+ src/prefs_scoring.c
+ src/prefs_summary_column.c
+ src/prefs_template.c
+ src/prefs_toolbar.c
+ improve the English in the GUI
+
2002-11-27 [colin] 0.8.6claws21
* src/folder.c
MICRO_VERSION=6
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws21
+EXTRA_VERSION=claws22
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
{N_("/_Configuration"), NULL, NULL, 0, "<Branch>"},
{N_("/_Configuration/_Common preferences..."),
NULL, prefs_common_open_cb, 0, NULL},
- {N_("/_Configuration/C_ustomize toolbar"),
+ {N_("/_Configuration/C_ustomize toolbars"),
NULL, NULL, 0, "<Branch>"},
- {N_("/_Configuration/C_ustomize toolbar/_Main toolbar..."),
+ {N_("/_Configuration/C_ustomize toolbars/_Main window..."),
NULL, prefs_toolbar_cb, TOOLBAR_MAIN, NULL},
- {N_("/_Configuration/C_ustomize toolbar/_Compose toolbar..."),
+ {N_("/_Configuration/C_ustomize toolbars/_Compose window..."),
NULL, prefs_toolbar_cb, TOOLBAR_COMPOSE, NULL},
{N_("/_Configuration/_Scoring..."),
NULL, prefs_scoring_open_cb, 0, NULL},
{N_("/_Configuration/_Filtering..."),
NULL, prefs_filtering_open_cb, 0, NULL},
- {N_("/_Configuration/_Template..."), NULL, prefs_template_open_cb, 0, NULL},
+ {N_("/_Configuration/_Templates..."), NULL, prefs_template_open_cb, 0, NULL},
{N_("/_Configuration/_Actions..."), NULL, prefs_actions_open_cb, 0, NULL},
{N_("/_Configuration/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Configuration/_Preferences for current account..."),
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox1), hbox, FALSE, FALSE, 0);
- label = gtk_label_new (_("Name of this account"));
+ label = gtk_label_new (_("Name of account"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
- PACK_CHECK_BUTTON (vbox2, date_chkbtn, _("Add Date header field"));
+ PACK_CHECK_BUTTON (vbox2, date_chkbtn, _("Add Date"));
PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-ID"));
hbox = gtk_hbox_new (FALSE, 12);
gchar *title[1];
- debug_print("Creating actions setting window...\n");
+ debug_print("Creating actions configuration window...\n");
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
- gtk_window_set_title(GTK_WINDOW(window), _("Actions setting"));
+ gtk_window_set_title(GTK_WINDOW(window), _("Actions configuration"));
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_actions_deleted), NULL);
gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
gtk_widget_show(btn_hbox);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_label(_("Register"));
+ reg_btn = gtk_button_new_with_label(_("Add"));
gtk_widget_show(reg_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_actions_register_cb), NULL);
- subst_btn = gtk_button_new_with_label(_(" Substitute "));
+ subst_btn = gtk_button_new_with_label(_(" Replace "));
gtk_widget_show(subst_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked",
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- title[0] = _("Registered actions");
+ title[0] = _("Current actions");
cond_clist = gtk_clist_new_with_titles(1, title);
gtk_widget_show(cond_clist);
gtk_container_add(GTK_CONTAINER (cond_scrolledwin), cond_clist);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (vbox2, checkbtn_savemsg,
- _("Save sent messages to Sent"));
+ _("Save sent messages to Sent folder"));
PACK_CHECK_BUTTON (vbox2, checkbtn_queuemsg,
_("Queue messages that fail to send"));
PACK_CHECK_BUTTON(vbox_spell, checkbtn_use_alternate,
_("Enable alternate dictionary"));
- help_label = gtk_label_new(_("Enabling alternate dictionary makes switching\nwith the last used dictionary faster."));
+ help_label = gtk_label_new(_("Enabling an alternate dictionary makes switching\n"
+ "with the last used dictionary faster."));
+ gtk_misc_set_alignment (GTK_MISC (help_label), 0, 0);
gtk_widget_show(help_label);
gtk_box_pack_start(GTK_BOX(vbox_spell), help_label, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox1), hbox_autosave, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (hbox_autosave, checkbtn_autosave,
- _("Autosave to drafts every "));
+ _("Autosave to Drafts folder every "));
entry_autosave_length = gtk_entry_new();
gtk_widget_set_usize (entry_autosave_length, 64, -1);
/* quote chars */
- PACK_FRAME (vbox1, frame_quote, _("Quoting characters"));
+ PACK_FRAME (vbox1, frame_quote, _("Quotation characters"));
vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_widget_show (vbox_quote);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
label_ng_abbrev = gtk_label_new
- (_("Abbreviate newsgroups longer than"));
+ (_("Abbreviate newsgroup names longer than"));
gtk_widget_show (label_ng_abbrev);
gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
button_dispitem = gtk_button_new_with_label
- (_(" Set displayed items of summary... "));
+ (_(" Set displayed items in summary... "));
gtk_widget_show (button_dispitem);
gtk_box_pack_start (GTK_BOX (hbox1), button_dispitem, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (button_dispitem), "clicked",
PACK_CHECK_BUTTON
(vbox2, checkbtn_show_msg_with_cursor,
- _("Open message when cursor keys are pressed on summary"));
+ _("Open messages with cursor keys in summary"));
PACK_CHECK_BUTTON
(vbox2, checkbtn_openunread,
gtk_container_add (GTK_CONTAINER (frame_ssl), vbox_ssl);
gtk_container_set_border_width (GTK_CONTAINER (vbox_ssl), 8);
PACK_CHECK_BUTTON (vbox_ssl, checkbtn_ssl_ask_unknown_valid,
- _("Confirm acception of all SSL certificates"));
+ _("Ask before accepting SSL certificates"));
hbox_ssl = gtk_hbox_new (FALSE, 3);
gtk_container_add (GTK_CONTAINER (vbox_ssl), hbox_ssl);
gtk_widget_show (hbox_ssl);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
label = gtk_label_new
- (_("Select the preset of key bindings.\n"
- "You can also modify each menu's shortcuts by pressing\n"
- "any key(s) when placing the mouse pointer on the item."));
+ (_("Select preset:"));
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+ label = gtk_label_new
+ (_("You can also modify each menu shortcut by pressing\n"
+ "any key(s) when placing the mouse pointer on the item."));
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
gtkut_button_set_create (&confirm_area, &ok_btn, _("OK"),
&cancel_btn, _("Cancel"), NULL, NULL);
gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default (ok_btn);
- gtk_window_set_title (GTK_WINDOW(window), _("Custom header setting"));
+ gtk_window_set_title (GTK_WINDOW(window), _("Custom header configuration"));
MANAGE_WINDOW_SIGNALS_CONNECT (window);
gtk_signal_connect (GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_custom_header_deleted),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- title[0] = _("Custom headers");
+ title[0] = _("Current custom headers");
customhdr_clist = gtk_clist_new_with_titles(1, title);
gtk_widget_show (customhdr_clist);
gtk_container_add (GTK_CONTAINER (ch_scrolledwin), customhdr_clist);
gtk_widget_grab_default (ok_btn);
gtk_window_set_title (GTK_WINDOW(window),
- _("Display header setting"));
+ _("Displayed header configuration"));
MANAGE_WINDOW_SIGNALS_CONNECT(window);
gtk_signal_connect (GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_display_header_deleted),
gchar *title[1];
- debug_print("Creating filtering setting window...\n");
+ debug_print("Creating filtering configuration window...\n");
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_widget_grab_default (ok_btn);
gtk_window_set_title (GTK_WINDOW(window),
- _("Filtering setting"));
+ _("Filtering/Processing configuration"));
+
gtk_signal_connect (GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_filtering_deleted), NULL);
gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
gtk_widget_show (btn_hbox);
gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_label (_("Register"));
+ reg_btn = gtk_button_new_with_label (_("Add"));
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
GTK_SIGNAL_FUNC (prefs_filtering_register_cb), NULL);
- subst_btn = gtk_button_new_with_label (_(" Substitute "));
+ subst_btn = gtk_button_new_with_label (_(" Replace "));
gtk_widget_show (subst_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- title[0] = _("Registered rules");
+ title[0] = _("Current filtering/processing rules");
cond_clist = gtk_clist_new_with_titles(1, title);
gtk_widget_show (cond_clist);
gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
if (*cond_str != '\0') {
matchers = matcher_parser_get_cond(cond_str);
if (matchers == NULL)
- alertpanel_error(_("Match string is not valid."));
+ alertpanel_error(_("Condition string is not valid."));
}
prefs_matcher_open(matchers, prefs_filtering_condition_define_done);
cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
if (*cond_str == '\0') {
- alertpanel_error(_("Score is not set."));
+ alertpanel_error(_("Condition string is empty."));
return NULL;
}
cond = matcher_parser_get_cond(cond_str);
if (cond == NULL) {
- alertpanel_error(_("Match string is not valid."));
+ alertpanel_error(_("Condition string is not valid."));
filteringaction_free(action);
return NULL;
}
rowcount++;
- /* Default Reply-To */
- checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default Reply-To: "));
+ /* Default address to reply to */
+ checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Send replies to: "));
gtk_widget_show(checkbtn_default_reply_to);
gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1,
rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gchar *title[1];
- debug_print("Creating matcher setting window...\n");
+ debug_print("Creating matcher configuration window...\n");
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_widget_grab_default (ok_btn);
gtk_window_set_title (GTK_WINDOW(window),
- _("Condition setting"));
+ _("Condition configuration"));
gtk_signal_connect (GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_matcher_deleted), NULL);
gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
gtk_widget_show (btn_hbox);
gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_label (_("Register"));
+ reg_btn = gtk_button_new_with_label (_("Add"));
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
GTK_SIGNAL_FUNC (prefs_matcher_register_cb), NULL);
- subst_btn = gtk_button_new_with_label (_(" Substitute "));
+ subst_btn = gtk_button_new_with_label (_(" Replace "));
gtk_widget_show (subst_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- title[0] = _("Registered rules");
+ title[0] = _("Current condition rules");
cond_clist = gtk_clist_new_with_titles(1, title);
gtk_widget_show (cond_clist);
gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
case CRITERIA_MESSAGE:
case CRITERIA_EXECUTE:
expr = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
-
- /*
- if (*expr == '\0') {
- alertpanel_error(_("Match string is not set."));
- return NULL;
- }
- */
break;
case CRITERIA_AGE_GREATER:
alertpanel_error(_("Header name is not set."));
return NULL;
}
- /*
- if (*expr == '\0') {
- alertpanel_error(_("Match string is not set."));
- return NULL;
- }
- */
break;
}
gchar *title[1];
- debug_print("Creating scoring setting window...\n");
+ debug_print("Creating scoring configuration window...\n");
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_widget_grab_default (ok_btn);
gtk_window_set_title (GTK_WINDOW(window),
- _("Scoring setting"));
+ _("Scoring configuration"));
gtk_signal_connect (GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_scoring_deleted), NULL);
gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
gtk_widget_show (btn_hbox);
gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_label (_("Register"));
+ reg_btn = gtk_button_new_with_label (_("Add"));
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
GTK_SIGNAL_FUNC (prefs_scoring_register_cb), NULL);
- subst_btn = gtk_button_new_with_label (_(" Substitute "));
+ subst_btn = gtk_button_new_with_label (_(" Replace "));
gtk_widget_show (subst_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- title[0] = _("Registered rules");
+ title[0] = _("Current scoring rules");
cond_clist = gtk_clist_new_with_titles(1, title);
gtk_widget_show (cond_clist);
gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
cond_str = gtk_entry_get_text(GTK_ENTRY(scoring.cond_entry));
if (*cond_str == '\0') {
- alertpanel_error(_("Score is not set."));
+ alertpanel_error(_("Condition string is empty."));
return;
}
score_str = gtk_entry_get_text(GTK_ENTRY(scoring.score_entry));
if (*score_str == '\0') {
- alertpanel_error(_("Match string is not set."));
+ alertpanel_error(_("Score is not set."));
return;
}
cond = matcher_parser_get_cond(cond_str);
if (cond == NULL) {
- alertpanel_error(_("Match string is not valid."));
+ alertpanel_error(_("Condition string is not valid."));
return;
}
cond_str = gtk_entry_get_text(GTK_ENTRY(scoring.cond_entry));
if (*cond_str == '\0') {
- alertpanel_error(_("Score is not set."));
+ alertpanel_error(_("Condition string is empty."));
return;
}
score_str = gtk_entry_get_text(GTK_ENTRY(scoring.score_entry));
if (*score_str == '\0') {
- alertpanel_error(_("Match string is not set."));
+ alertpanel_error(_("Score is not set."));
return;
}
cond = matcher_parser_get_cond(cond_str);
if (cond == NULL) {
- alertpanel_error(_("Match string is not valid."));
+ alertpanel_error(_("Condition string is not valid."));
return;
}
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
gtk_window_set_title(GTK_WINDOW(window),
- _("Summary displayed items setting"));
+ _("Summary displayed items configuration"));
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_summary_column_delete_event),
NULL);
gtk_box_pack_start(GTK_BOX(vbox), label_hbox, FALSE, FALSE, 4);
label = gtk_label_new
- (_("Select items to be displayed on the summary view. You can modify\n"
+ (_("Select items to be displayed in the summary view. You can modify\n"
"the order by using the Up / Down button, or dragging the items."));
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(label_hbox), label, FALSE, FALSE, 4);
gtk_widget_show(hbox3);
gtk_box_pack_start(GTK_BOX(hbox2), hbox3, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_label(_("Register"));
+ reg_btn = gtk_button_new_with_label(_("Add"));
gtk_widget_show(reg_btn);
gtk_box_pack_start(GTK_BOX(hbox3), reg_btn, FALSE, TRUE, 0);
gtk_signal_connect(GTK_OBJECT (reg_btn), "clicked",
GTK_SIGNAL_FUNC (prefs_template_register_cb), NULL);
- subst_btn = gtk_button_new_with_label(_(" Substitute "));
+ subst_btn = gtk_button_new_with_label(_(" Replace "));
gtk_widget_show(subst_btn);
gtk_box_pack_start(GTK_BOX(hbox3), subst_btn, FALSE, TRUE, 0);
gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked",
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- title[0] = _("Registered templates");
+ title[0] = _("Current templates");
clist_tmpls = gtk_clist_new_with_titles(1, title);
gtk_widget_show(clist_tmpls);
gtk_widget_set_usize(scroll1, -1, 140);
gtk_box_pack_end(GTK_BOX(vbox2), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
- gtk_window_set_title(GTK_WINDOW(window), _("Templates"));
+ gtk_window_set_title(GTK_WINDOW(window), _("Template configuration"));
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_template_deleted_cb), NULL);
btn_hbox = gtk_hbox_new(TRUE, 4);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_label(_("Register"));
+ reg_btn = gtk_button_new_with_label(_("Add"));
gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_toolbar_register),
NULL);
- subst_btn = gtk_button_new_with_label(_(" Substitute "));
+ subst_btn = gtk_button_new_with_label(_(" Replace "));
gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_toolbar_substitute),