commit ae80fdb4f82ba61d7a53609857ad03bc6ab0197c
parent e14e633201562da37d3ccf8799ed972d07a21b00
Author: Paul <paul@claws-mail.org>
Date: Thu, 10 Apr 2025 10:51:37 +0100
replace the use of the anachronism 'Compose' in the UI
Diffstat:
16 files changed, 85 insertions(+), 74 deletions(-)
diff --git a/src/account.c b/src/account.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2025 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -398,8 +398,8 @@ void account_edit_open(gpointer a, gpointer b)
account_list_dirty = FALSE;
if (compose_get_compose_list()) {
- alertpanel_error(_("Some composing windows are open.\n"
- "Please close all the composing "
+ alertpanel_error(_("Some writing windows are open.\n"
+ "Please close all the writing "
"windows before editing accounts."));
inc_unlock();
return;
@@ -465,8 +465,8 @@ void account_open(PrefsAccount *ac_prefs, gboolean called_from_acc_list)
cm_return_if_fail(ac_prefs != NULL);
if (compose_get_compose_list()) {
- alertpanel_error(_("Some composing windows are open.\n"
- "Please close all the composing "
+ alertpanel_error(_("Some writing windows are open.\n"
+ "Please close all the writing "
"windows before editing accounts."));
return;
}
diff --git a/src/action.c b/src/action.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail Team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2025 the Claws Mail Team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -605,7 +605,7 @@ static void compose_actions_execute(Compose *compose, guint action_nb, GtkWidget
action_type = action_get_type(action);
if (action_type & (ACTION_SINGLE | ACTION_MULTIPLE)) {
alertpanel_warning
- (_("The selected action cannot be used in the compose window\n"
+ (_("The selected action cannot be used in the write window\n"
"because it contains %%f, %%F, %%as or %%p."));
return;
}
diff --git a/src/compose.c b/src/compose.c
@@ -598,11 +598,11 @@ static void from_name_activate_cb(GtkWidget *widget, gpointer data);
static GtkActionEntry compose_popup_entries[] =
{
- {"Compose", NULL, "Compose", NULL, NULL, NULL },
- {"Compose/Add", NULL, N_("_Add..."), NULL, NULL, G_CALLBACK(compose_attach_cb) },
- {"Compose/Remove", NULL, N_("_Remove"), NULL, NULL, G_CALLBACK(compose_attach_remove_selected) },
- {"Compose/---", NULL, "---", NULL, NULL, NULL },
- {"Compose/Properties", NULL, N_("_Properties..."), NULL, NULL, G_CALLBACK(compose_attach_property) },
+ {"Write", NULL, "Write", NULL, NULL, NULL },
+ {"Write/Add", NULL, N_("_Add..."), NULL, NULL, G_CALLBACK(compose_attach_cb) },
+ {"Write/Remove", NULL, N_("_Remove"), NULL, NULL, G_CALLBACK(compose_attach_remove_selected) },
+ {"Write/---", NULL, "---", NULL, NULL, NULL },
+ {"Write/Properties", NULL, N_("_Properties..."), NULL, NULL, G_CALLBACK(compose_attach_property) },
};
/* make sure to keep the key bindings in the tables below in sync with the default_menurc[] in prefs_other.c
@@ -1427,7 +1427,7 @@ static Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar
compose = compose_redirect(NULL, msginfo, FALSE);
break;
default:
- g_warning("compose_reply_mode(): invalid Compose Mode: %d", mode);
+ g_warning("compose_reply_mode(): invalid Write Mode: %d", mode);
}
if (compose == NULL) {
@@ -2588,9 +2588,9 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
compose_colorize_signature(compose);
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Add", FALSE);
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", FALSE);
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Add", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Remove", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Properties", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/SendLater", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/Save", FALSE);
@@ -3504,7 +3504,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
compose_entry_append(compose, (gchar *)cur->data,
COMPOSE_CC, PREF_NONE);
else
- debug_print("Cc address same as compose account's, ignoring\n");
+ debug_print("Cc address same as write account's, ignoring\n");
g_free(addr);
}
@@ -4896,12 +4896,12 @@ static void compose_set_title(Compose *compose)
#ifndef GENERIC_UMPC
if (subject && strlen(subject))
- str = g_strdup_printf(_("%s - Compose message%s"),
+ str = g_strdup_printf(_("%s - Write message%s"),
subject, edited);
else
- str = g_strdup_printf(_("[no subject] - Compose message%s"), edited);
+ str = g_strdup_printf(_("[no subject] - Write message%s"), edited);
#else
- str = g_strdup(_("Compose message"));
+ str = g_strdup(_("Write message"));
#endif
gtk_window_set_title(GTK_WINDOW(compose->window), str);
@@ -7303,7 +7303,7 @@ static void compose_create_header_entry(Compose *compose)
GSList *pwd_servers = addrindex_get_password_protected_ldap_servers();
if (pwd_servers != NULL && primary_passphrase() == NULL) {
gboolean enable = FALSE;
- debug_print("Primary passphrase not available, disabling password-protected LDAP servers for this compose window.\n");
+ debug_print("Primary passphrase not available, disabling password-protected LDAP servers for this write window.\n");
/* Temporarily disable password-protected LDAP servers,
* because user did not provide a primary passphrase.
* We can safely enable searchFlag on all servers in this list
@@ -7627,10 +7627,15 @@ static void entry_paste_clipboard(Compose *compose, GtkWidget *entry, gboolean w
static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
Compose *compose)
{
+ debug_print("text_clicked() '%s'\n",text);
gint prev_autowrap;
- GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ GtkTextBuffer *buffer;
+
+ if (text != NULL)
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
#if USE_ENCHANT
if (event->button == 3) {
+debug_print("if (event->button == 3) {\n");
GtkTextIter iter;
GtkTextIter sel_start, sel_end;
gboolean stuff_selected;
@@ -7666,7 +7671,7 @@ static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
GtkTextIter iter;
gint x, y;
BLOCK_WRAP();
-
+debug_print("if (event->button == 2) {\n");
/* get the middle-click position to paste at the correct place */
gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text),
GTK_TEXT_WINDOW_TEXT, event->x, event->y,
@@ -7803,7 +7808,7 @@ static Compose *compose_create(PrefsAccount *account,
default_header_bgcolor = prefs_common.color[COL_DEFAULT_HEADER_BG],
default_header_color = prefs_common.color[COL_DEFAULT_HEADER],
- debug_print("Creating compose window...\n");
+ debug_print("Creating write window...\n");
compose = g_new0(Compose, 1);
compose->batch = batch;
@@ -8209,13 +8214,13 @@ static Compose *compose_create(PrefsAccount *account,
gtk_action_group_add_actions(action_group, compose_popup_entries,
G_N_ELEMENTS(compose_popup_entries), (gpointer)compose);
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Popup", NULL, GTK_UI_MANAGER_MENUBAR)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup", "Compose", "Compose", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Add", "Compose/Add", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Remove", "Compose/Remove", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Separator1", "Compose/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Properties", "Compose/Properties", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup", "Write", "Write", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Write", "Add", "Write/Add", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Write", "Remove", "Write/Remove", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Write", "Separator1", "Write/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Write", "Properties", "Write/Properties", GTK_UI_MANAGER_MENUITEM)
- popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtk_ui_manager_get_widget(compose->ui_manager, "/Popup/Compose")));
+ popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtk_ui_manager_get_widget(compose->ui_manager, "/Popup/Write")));
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Undo", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Redo", FALSE);
@@ -10199,10 +10204,10 @@ static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
}
}
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", (attach_nr_selected > 0));
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Remove", (attach_nr_selected > 0));
/* Properties menu item makes no sense with more than one row
* selected, the properties dialog can only edit one attachment. */
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", (attach_nr_selected == 1));
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Properties", (attach_nr_selected == 1));
gtk_menu_popup_at_pointer(GTK_MENU(compose->popupmenu), NULL);
@@ -10917,21 +10922,24 @@ static void paste_text(Compose *compose, GtkWidget *entry,
if (contents == NULL)
return;
-
+debug_print("paste_text() start\n");
/* we shouldn't delete the selection when middle-click-pasting, or we
* can't mid-click-paste our own selection */
if (clip != GDK_SELECTION_PRIMARY) {
+debug_print("if (clip != GDK_SELECTION_PRIMARY) {\n");
undo_paste_clipboard(GTK_TEXT_VIEW(compose->text), compose->undostruct);
gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
}
if (insert_place == NULL) {
+debug_print("used for Ctrl-V pasting\n");
/* if insert_place isn't specified, insert at the cursor.
* used for Ctrl-V pasting */
gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
start = gtk_text_iter_get_offset(&start_iter);
gtk_text_buffer_insert(buffer, &start_iter, contents, strlen(contents));
} else {
+debug_print("used for mid-click-pasting\n");
/* if insert_place is specified, paste here.
* used for mid-click-pasting */
start = gtk_text_iter_get_offset(insert_place);
@@ -10941,12 +10949,14 @@ static void paste_text(Compose *compose, GtkWidget *entry,
}
if (!wrap) {
+debug_print("if (!wrap) {\n");
/* paste unwrapped: mark the paste so it's not wrapped later */
end = start + strlen(contents);
gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, start);
gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, end);
gtk_text_buffer_apply_tag_by_name(buffer, "no_wrap", &start_iter, &end_iter);
} else if (wrap && clip == GDK_SELECTION_PRIMARY) {
+debug_print("} else if (wrap && clip == GDK_SELECTION_PRIMARY) {\n");
/* rewrap paragraph now (after a mid-click-paste) */
mark_start = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
@@ -10954,6 +10964,7 @@ static void paste_text(Compose *compose, GtkWidget *entry,
compose_beautify_paragraph(compose, &start_iter, TRUE);
}
compose->modified = TRUE;
+debug_print("paste_text() end\n");
}
static void attach_uri_list(Compose *compose, GtkSelectionData *data)
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -660,8 +660,8 @@ static GtkActionEntry mainwin_entries[] =
{"Message/---", NULL, "---", NULL, NULL, NULL },
- {"Message/ComposeEmail", NULL, N_("Compose a_n email message"), "<control>M", NULL, G_CALLBACK(mw_compose_mail_cb) },
- {"Message/ComposeNews", NULL, N_("Compose a news message"), NULL, NULL, G_CALLBACK(mw_compose_news_cb) },
+ {"Message/WriteEmail", NULL, N_("Write a_n email message"), "<control>M", NULL, G_CALLBACK(mw_compose_mail_cb) },
+ {"Message/WriteNews", NULL, N_("Write a news message"), NULL, NULL, G_CALLBACK(mw_compose_news_cb) },
{"Message/Reply", NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(main_window_reply_cb) }, /* COMPOSE_REPLY */
{"Message/ReplyTo", NULL, N_("Repl_y to"), NULL, NULL, NULL },
@@ -1724,8 +1724,8 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "CancelSending", "Message/CancelSending", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ComposeEmail", "Message/ComposeEmail", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ComposeNews", "Message/ComposeNews", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "WriteEmail", "Message/WriteEmail", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "WriteNews", "Message/WriteNews", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Reply", "Message/Reply", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ReplyTo", "Message/ReplyTo", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/ReplyTo", "All", "Message/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
@@ -3164,8 +3164,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
SET_SENSITIVE("Menu/Message/Receive/CancelReceiving", M_INC_ACTIVE);
SET_SENSITIVE("Menu/Message/SendQueue", M_HAVE_ACCOUNT, M_HAVE_QUEUED_MAILS);
SET_SENSITIVE("Menu/Message/CancelSending", M_SEND_ACTIVE);
- SET_SENSITIVE("Menu/Message/ComposeEmail", M_HAVE_ACCOUNT);
- SET_SENSITIVE("Menu/Message/ComposeNews", M_HAVE_NEWS_ACCOUNT);
+ SET_SENSITIVE("Menu/Message/WriteEmail", M_HAVE_ACCOUNT);
+ SET_SENSITIVE("Menu/Message/WriteNews", M_HAVE_NEWS_ACCOUNT);
SET_SENSITIVE("Menu/Message/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
SET_SENSITIVE("Menu/Message/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
SET_SENSITIVE("Menu/Message/FollowupReply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_NEWS, M_SUMMARY_ISLIST);
diff --git a/src/messageview.c b/src/messageview.c
@@ -298,7 +298,7 @@ static GtkActionEntry msgview_entries[] =
{"View/Quotes", NULL, N_("Quotes"), NULL, NULL, NULL },
/* Message menu */
- {"Message/Compose", NULL, N_("Compose _new message"), "<control>M", NULL, G_CALLBACK(compose_cb) },
+ {"Message/Write", NULL, N_("Write _new message"), "<control>M", NULL, G_CALLBACK(compose_cb) },
{"Message/---", NULL, "---", NULL, NULL, NULL },
{"Message/Reply", NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY */
@@ -627,7 +627,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
#endif
/* Message menu */
- MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Compose", "Message/Compose", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Write", "Message/Write", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Reply", "Message/Reply", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "ReplyTo", "Message/ReplyTo", GTK_UI_MANAGER_MENU)
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -2705,7 +2705,7 @@ static void templates_create_widget_func(PrefsPage * _page,
&page->compose_subject_format,
&page->compose_body_format,
TRUE, NULL);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Compose")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("New")));
/* reply format */
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
@@ -4202,7 +4202,7 @@ static void register_compose_page(void)
static gchar *path[3];
path[0] = _("Account");
- path[1] = _("Compose");
+ path[1] = _("Write");
path[2] = NULL;
compose_page.page.path = path;
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2024 the Claws Mail Team and Colin Leroy <colin@colino.net>
+ * Copyright (C) 2005-2025 the Claws Mail Team and Colin Leroy <colin@colino.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -229,7 +229,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
g_free(text);
/* dnd insert or attach */
- label_dnd_insert_or_attach = gtk_label_new (_("When dropping files into the Compose window"));
+ label_dnd_insert_or_attach = gtk_label_new (_("When dropping files into the Write window"));
gtk_label_set_xalign(GTK_LABEL(label_dnd_insert_or_attach), 0.0);
gtk_widget_show (label_dnd_insert_or_attach);
@@ -371,7 +371,7 @@ void prefs_compose_writing_init(void)
WritingPage *page;
static gchar *path[3];
- path[0] = _("Compose");
+ path[0] = _("Write");
path[1] = _("Writing");
path[2] = NULL;
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2025 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1588,7 +1588,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
new_msg_format_rec_checkbtn = gtk_check_button_new_with_label(
_("Apply to subfolders"));
gtk_box_pack_end (GTK_BOX(hbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Compose")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("New")));
/* reply format */
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
@@ -1938,7 +1938,7 @@ static void register_compose_page(void)
static gchar *pfi_compose_path[2];
static FolderItemComposePage folder_item_compose_page;
- pfi_compose_path[0] = _("Compose");
+ pfi_compose_path[0] = _("Write");
pfi_compose_path[1] = NULL;
folder_item_compose_page.page.path = pfi_compose_path;
diff --git a/src/prefs_quote.c b/src/prefs_quote.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & The Claws Mail Team
+ * Copyright (C) 2005-2025 The Claws Mail Team and Colin Leroy
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
&prefs_quote->entry_subject,
&prefs_quote->text_format,
TRUE, prefs_quote_set_default_new_msg_fmt);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Compose")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("New")));
/* reply */
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
@@ -234,7 +234,7 @@ void prefs_quote_init(void)
QuotePage *page;
static gchar *path[3];
- path[0] = _("Compose");
+ path[0] = _("Write");
path[1] = _("Templates");
path[2] = NULL;
diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2021 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 2002-2025 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -305,7 +305,7 @@ void prefs_spelling_init(void)
static gchar *path[3];
const gchar* language = NULL;
- path[0] = _("Compose");
+ path[0] = _("Write");
path[1] = _("Spell Checking");
path[2] = NULL;
diff --git a/src/prefs_template.c b/src/prefs_template.c
@@ -1,7 +1,7 @@
/*
* Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2024 The Claws Mail team
+ * Copyright (C) 2001-2025 The Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -77,7 +77,7 @@ static struct
{N_("Name"), &templates.entry_name, FALSE,
N_("This name is used as the Menu item")},
{"From", &templates.entry_from, TRUE,
- N_("Override composing account's From header. This doesn't change the composing account.")},
+ N_("Override writing account's From header. This doesn't change the writing account.")},
{"To", &templates.entry_to, TRUE, NULL},
{"Cc", &templates.entry_cc, TRUE, NULL},
{"Bcc", &templates.entry_bcc, TRUE, NULL},
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2024 the Claws Mail team
+ * Copyright (C) 2002-2025 the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1242,7 +1242,7 @@ void prefs_toolbar_init(void)
prefs_toolbar_messageview = page;
composepath[0] = _("Toolbars");
- composepath[1] = _("Compose Window");
+ composepath[1] = _("Write Window");
composepath[2] = NULL;
page = g_new0(ToolbarPage, 1);
diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2012 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 2004-2025 The Claws Mail Team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -149,7 +149,7 @@ void prefs_wrapping_init(void)
WrappingPage *page;
static gchar *path[3];
- path[0] = _("Compose");
+ path[0] = _("Write");
path[1] = _("Wrapping");
path[2] = NULL;
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2025 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -170,7 +170,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
if (checkbtn_compose_with_format)
PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
- _("Use template when composing new messages"));
+ _("Use template when writing new messages"));
vbox_format = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox_format);
diff --git a/src/textview.c b/src/textview.c
@@ -245,7 +245,7 @@ static GtkActionEntry textview_link_popup_entries[] =
static GtkActionEntry textview_mail_popup_entries[] =
{
{"TextviewPopupMail", NULL, "TextviewPopupMail", NULL, NULL, NULL },
- {"TextviewPopupMail/Compose", NULL, N_("Compose _new message"), NULL, NULL, G_CALLBACK(mail_to_uri_cb) },
+ {"TextviewPopupMail/Write", NULL, N_("Write _new message"), NULL, NULL, G_CALLBACK(mail_to_uri_cb) },
{"TextviewPopupMail/ReplyTo", NULL, N_("_Reply to this address"), NULL, NULL, G_CALLBACK(reply_to_uri_cb) },
{"TextviewPopupMail/AddAB", NULL, N_("Add to _Address book"), NULL, NULL, G_CALLBACK(add_uri_to_addrbook_cb) },
{"TextviewPopupMail/Copy", NULL, N_("Copy this add_ress"), NULL, NULL, G_CALLBACK(copy_mail_to_uri_cb) },
@@ -383,7 +383,7 @@ TextView *textview_create(void)
MENUITEM_ADDUI_MANAGER(textview->ui_manager,
"/Menus/TextviewPopupLink", "Copy", "TextviewPopupLink/Copy", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(textview->ui_manager,
- "/Menus/TextviewPopupMail", "Compose", "TextviewPopupMail/Compose", GTK_UI_MANAGER_MENUITEM)
+ "/Menus/TextviewPopupMail", "Write", "TextviewPopupMail/Write", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(textview->ui_manager,
"/Menus/TextviewPopupMail", "ReplyTo", "TextviewPopupMail/ReplyTo", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(textview->ui_manager,
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2024 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 2001-2025 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -226,8 +226,8 @@ struct {
{ "A_RECEIVE_ALL", N_("Receive Mail from all Accounts") },
{ "A_RECEIVE_CUR", N_("Receive Mail from current Account") },
{ "A_SEND_QUEUED", N_("Send Queued Messages") },
- { "A_COMPOSE_EMAIL", N_("Compose Email") },
- { "A_COMPOSE_NEWS", N_("Compose News") },
+ { "A_COMPOSE_EMAIL", N_("Write Email") },
+ { "A_COMPOSE_NEWS", N_("Write News") },
{ "A_REPLY_MESSAGE", N_("Reply to Message") },
{ "A_REPLY_SENDER", N_("Reply to Sender") },
{ "A_REPLY_ALL", N_("Reply to All") },
@@ -494,8 +494,8 @@ const gchar *toolbar_get_short_text(int action) {
case A_RECEIVE_ALL: return _("Get Mail");
case A_RECEIVE_CUR: return _("Get");
case A_SEND_QUEUED: return _("Send");
- case A_COMPOSE_EMAIL: return C_("Toolbar", "Compose");
- case A_COMPOSE_NEWS: return C_("Toolbar", "Compose");
+ case A_COMPOSE_EMAIL: return C_("Toolbar", "Write");
+ case A_COMPOSE_NEWS: return C_("Toolbar", "Write");
case A_REPLY_MESSAGE: return _("Reply");
case A_REPLY_SENDER: return C_("Toolbar", "Sender");
case A_REPLY_ALL: return _("All");
@@ -964,7 +964,7 @@ static void activate_compose_button (Toolbar *toolbar,
GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
toolbar->compose_news_icon);
#ifndef GENERIC_UMPC
- CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Compose News message"));
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Write News message"));
#endif
gtk_widget_show(toolbar->compose_news_icon);
} else {
@@ -972,7 +972,7 @@ static void activate_compose_button (Toolbar *toolbar,
GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
toolbar->compose_mail_icon);
#ifndef GENERIC_UMPC
- CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Compose Email"));
+ CLAWS_SET_TOOL_ITEM_TIP(GTK_TOOL_ITEM(toolbar->compose_mail_btn), _("Write Email"));
#endif
gtk_widget_show(toolbar->compose_mail_icon);
}
@@ -2359,8 +2359,8 @@ Toolbar *toolbar_create(ToolbarType type,
case A_COMPOSE_EMAIL:
#ifndef GENERIC_UMPC
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
- _("Compose Email"),
- _("Compose with selected Account"));
+ _("Write Email"),
+ _("Write with selected Account"));
toolbar_data->compose_mail_btn = item;
toolbar_data->compose_mail_icon = icon_wid;
g_object_ref_sink(toolbar_data->compose_mail_icon);
@@ -2370,7 +2370,7 @@ Toolbar *toolbar_create(ToolbarType type,
g_object_ref_sink(toolbar_data->compose_news_icon);
#else
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
- _("Compose Email"));
+ _("Write Email"));
toolbar_data->compose_mail_btn = item;
toolbar_data->compose_mail_icon = icon_wid;
