2005-10-16 [colin] 1.9.15cvs62
authorColin Leroy <colin@colino.net>
Sun, 16 Oct 2005 16:03:03 +0000 (16:03 +0000)
committerColin Leroy <colin@colino.net>
Sun, 16 Oct 2005 16:03:03 +0000 (16:03 +0000)
* src/toolbar.c
s/Get All/Get Mail/
* src/wizard.c
Real welcome mail text, thanks Paul

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/toolbar.c
src/wizard.c

index e6da8fd2abc04ce9b823da0b259a7246ff8d0289..4aab4ad44b818d01e2dd5caaace020d9250467d6 100644 (file)
@@ -1,3 +1,10 @@
+2005-10-16 [colin]     1.9.15cvs62
+
+       * src/toolbar.c
+               s/Get All/Get Mail/
+       * src/wizard.c
+               Real welcome mail text, thanks Paul
+
 2005-10-16 [colin]     1.9.15cvs61
 
        * src/editldap.c
index 2963af29b8c21a8631aff50e6c60e47253ba03a0..ea0b16da629b5083939f419b899fd1c0a937caaa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/wizard.c;  ) > 1.9.15cvs59.patchset
 ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/wizard.c;  cvs diff -u -r 1.204.2.64 -r 1.204.2.65 src/prefs_common.c;  ) > 1.9.15cvs60.patchset
 ( cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/editldap.c;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/exporthtml.c;  cvs diff -u -r 1.115.2.58 -r 1.115.2.59 src/main.c;  cvs diff -u -r 1.274.2.75 -r 1.274.2.76 src/mainwindow.c;  cvs diff -u -r 1.3.2.29 -r 1.3.2.30 src/prefs_themes.c;  cvs diff -u -r 1.30.2.18 -r 1.30.2.19 src/prefs_toolbar.c;  cvs diff -u -r 1.13.2.2 -r 1.13.2.3 src/plugins/demo/demo.c;  cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/plugins/trayicon/trayicon.c;  ) > 1.9.15cvs61.patchset
+( cvs diff -u -r 1.43.2.30 -r 1.43.2.31 src/toolbar.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/wizard.c;  ) > 1.9.15cvs62.patchset
index e04b6bf6db3abd7efcfdc1a372cc5671d76dfb90..b9eb95515f4f00f7a39a82b81194059b9bc56db2 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=62
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index fe0f0ebb029431e939f0e1a3682635b2a208649e..f0c53f352bc1a239d84fa627e6ec2aad4c9c6ec0 100644 (file)
@@ -382,7 +382,7 @@ static void toolbar_set_default_main(void)
                gint icon;
                gchar *text;
        } default_toolbar[] = {
-               { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get All") },
+               { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get Mail") },
                { A_SEPARATOR,     0,                                 ("")         }, 
                { A_SEND_QUEUED,   STOCK_PIXMAP_MAIL_SEND_QUEUE,      _("Send")    },
                { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,         _("Compose") },
index 7f32814817f01e1c6726cfa087dfec4e9a24163f..a850fe8a28b341cccf0ecd3d82fe148b85a91bc5 100644 (file)
@@ -158,8 +158,42 @@ static void write_welcome_email(WizardWindow *wizard)
                "Date: %s\n"
                "Subject: Welcome to Sylpheed-Claws.\n"
                "\n"
-               "Welcome!\n", 
-               gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
+               "Welcome to Sylpheed-Claws\n"
+               "-------------------------\n"
+               "\n"
+               "Now that you have set up your account you can fetch your\n"
+               "mail by clicking the 'Get All' button at the left of the\n"
+               "toolbar.\n"
+               "\n"
+               "You can change your Account Preferences by using the menu\n"
+               "entry '/Configuration/Preferences for current account'\n"
+               "and change the general Preferences by using\n"
+               "'/Configuration/Preferences'.\n"
+               "\n"
+               "You can find futher information in the Sylpheed-Claws manual,\n"
+               "which can be accessed by using the menu entry '/Help/Manual'\n"
+               "or online at the URL given below.\n"
+               "\n"
+               "Useful URLs\n"
+               "-----------\n"
+               "Homepage:      <http://claws.sylpheed.org>\n"
+               "Manual:        <http://claws.sylpheed.org/manual/>\n"
+               "FAQ:          <http://claws.sylpheed.org/faq.php>\n"
+               "Themes:        <http://claws.sylpheed.org/themes.php>\n"
+               "Mailing Lists: <http://claws.sylpheed.org/MLs.php>\n"
+               "\n"
+               "LICENSE\n"
+               "-------\n"
+               "Sylpheed-Claws is free software, released under the terms\n"
+               "of the GNU General Public License, version 2 or later, as\n"
+               "published by the Free Software Foundation, 51 Franklin Street,\n"
+               "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
+               "found at <http://www.gnu.org/licenses/gpl.html>.\n"
+               "\n"
+               "DONATIONS\n"
+               "---------\n"
+               "If you wish to donate to the Sylpheed-Claws project you can do\n"
+               "so at <https://sourceforge.net/donate/index.php?group_id=25528>.",             gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
                gtk_entry_get_text(GTK_ENTRY(wizard->email)),
                buf_date);