commit 3c12297f3f50d6c70506a3f71711ca9c0014a43a
parent 8a48a61cf3c20e41d769b67b5aa84433e6126707
Author: Paul Mangan <paul@claws-mail.org>
Date: Mon, 9 Mar 2009 21:00:07 +0000
2009-03-09 [paul] 3.7.1cvs8
* src/prefs_folder_item.c
* src/send_message.c
fixes to english text
Diffstat:
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-09 [paul] 3.7.1cvs8
+
+ * src/prefs_folder_item.c
+ * src/send_message.c
+ fixes to english text
+
2009-03-08 [paul] 3.7.1cvs7
* po/ja.po
diff --git a/PATCHSETS b/PATCHSETS
@@ -3747,3 +3747,4 @@
( cvs diff -u -r 1.94.2.201 -r 1.94.2.202 src/messageview.c; ) > 3.7.1cvs5.patchset
( cvs diff -u -r 1.100.2.65 -r 1.100.2.66 AUTHORS; cvs diff -u -r 1.654.2.3813 -r 1.654.2.3814 configure.ac; cvs diff -u -r 1.16.2.6 -r 1.16.2.7 po/ja.po; cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/gtk/authors.h; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 tools/claws.i18n.status.pl; ) > 3.7.1cvs6.patchset
( cvs diff -u -r 1.16.2.7 -r 1.16.2.8 po/ja.po; ) > 3.7.1cvs7.patchset
+( cvs diff -u -r 1.52.2.75 -r 1.52.2.76 src/prefs_folder_item.c; cvs diff -u -r 1.17.2.54 -r 1.17.2.55 src/send_message.c; ) > 3.7.1cvs8.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -264,8 +264,8 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
if (!can_save) {
no_save_warning = gtk_label_new(
_("<i>These preferences will not be saved as this folder "
- "is a top-level one. However you can use them to set them "
- "to the whole mailbox tree using \"Apply to subfolders\".</i>"));
+ "is a top-level folder. However, you can set them for the "
+ "whole mailbox tree by using \"Apply to subfolders\".</i>"));
gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
@@ -817,8 +817,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
if (!can_save) {
no_save_warning = gtk_label_new(
_("<i>These preferences will not be saved as this folder "
- "is a top-level one. However you can use them to set them "
- "to the whole mailbox tree using \"Apply to subfolders\".</i>"));
+ "is a top-level folder. However, you can set them for the "
+ "whole mailbox tree by using \"Apply to subfolders\".</i>));
gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
@@ -1329,8 +1329,8 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
if (!can_save) {
no_save_warning = gtk_label_new(
_("<i>These preferences will not be saved as this folder "
- "is a top-level one. However you can use them to set them "
- "to the whole mailbox tree using \"Apply to subfolders\".</i>"));
+ "is a top-level folder. However, you can set them for the "
+ "whole mailbox tree by using \"Apply to subfolders\".</i>"));
gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
diff --git a/src/send_message.c b/src/send_message.c
@@ -638,7 +638,7 @@ static void send_put_error(Session *session)
case SESSION_TIMEOUT:
log_msg = _("Session timed out. You may be able to "
"recover by increasing the timeout value in "
- "Preferences/Other.");
+ "Preferences/Other/Miscellaneous.");
err_msg = g_strdup(log_msg);
break;
default:
