2007-04-29 [wwp] 2.9.1cvs34

	* src/mainwindow.c
	* configure.ac
		Fix few grammatical errors (patch by David Relson < relson at
		osagesoftware dot com >).

diff --git a/ChangeLog b/ChangeLog
index e4133fbefe1c69160b12a77c273e07bfd4674f72..f2e26edce60d401d60a0a9b16d5bab8784e8d5a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-29 [wwp]       2.9.1cvs34
+
+       * src/mainwindow.c
+       * configure.ac
+               Fix few grammatical errors (patch by David Relson < relson at
+               osagesoftware dot com >).
+
 2007-04-28 [colin]     2.9.1cvs33
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index 0c4d3ce85244f60471ddb99fc7802a3b9952deae..4dbc93d8e382fdf0312b6615a290c124d47c033d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2561,3 +2561,4 @@
 ( cvs diff -u -r 1.213.2.142 -r 1.213.2.143 src/folder.c;  cvs diff -u -r 1.179.2.170 -r 1.179.2.171 src/imap.c;  cvs diff -u -r 1.105.2.92 -r 1.105.2.93 src/prefs_account.c;  cvs diff -u -r 1.49.2.25 -r 1.49.2.26 src/prefs_account.h;  cvs diff -u -r 1.1.4.78 -r 1.1.4.79 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/etpan/imap-thread.h;  ) > 2.9.1cvs31.patchset
 ( cvs diff -u -r 1.61.2.61 -r 1.61.2.62 src/account.c;  cvs diff -u -r 1.105.2.93 -r 1.105.2.94 src/prefs_account.c;  cvs diff -u -r 1.49.2.26 -r 1.49.2.27 src/prefs_account.h;  ) > 2.9.1cvs32.patchset
 ( cvs diff -u -r 1.61.2.62 -r 1.61.2.63 src/account.c;  cvs diff -u -r 1.56.2.51 -r 1.56.2.52 src/pop.c;  cvs diff -u -r 1.105.2.94 -r 1.105.2.95 src/prefs_account.c;  cvs diff -u -r 1.49.2.27 -r 1.49.2.28 src/prefs_account.h;  ) > 2.9.1cvs33.patchset
+( cvs diff -u -r 1.274.2.187 -r 1.274.2.188 src/mainwindow.c;  cvs diff -u -r 1.654.2.2617 -r 1.654.2.2618 configure.ac;  ) > 2.9.1cvs34.patchset

diff --git a/configure.ac b/configure.ac
index 6baefd156ca024599293509dd94dd48c73731519..177ed422e7f5b9ad0b8364e6bacdd4f6980a4e12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -660,7 +660,7 @@ if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_MSG_RESULT(yes)
        AC_SPAMASSASSIN
        PLUGINS="spamassassin $PLUGINS"
-       AC_DEFINE(USE_SPAMASSASSIN_PLUGIN, 1, Define if spamassassin plugin is being build.)
+       AC_DEFINE(USE_SPAMASSASSIN_PLUGIN, 1, Define if spamassassin plugin is being built.)
 else
        AC_MSG_RESULT(no)
 fi
@@ -674,7 +674,7 @@ AC_ARG_ENABLE(bogofilter-plugin,
 if test x"$ac_cv_enable_bogofilter_plugin" = xyes; then
        AC_MSG_RESULT(yes)
        PLUGINS="bogofilter $PLUGINS"
-       AC_DEFINE(USE_BOGOFILTER_PLUGIN, 1, Define if bogofilter plugin is being build.)
+       AC_DEFINE(USE_BOGOFILTER_PLUGIN, 1, Define if bogofilter plugin is being built.)
 else
        AC_MSG_RESULT(no)
 fi

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 2e95c71a0d67ae4d78099b15ccee0b5010d0bc41..489416bee1aa05fc2fafbdfed480a2fc2d40a0c7 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2140,7 +2140,7 @@ void main_window_add_mailbox(MainWindow *mainwin)
 
        path = input_dialog(_("Add mailbox"),
                            _("Input the location of mailbox.\n"
-                             "If the existing mailbox is specified, it will be\n"
+                             "If an existing mailbox is specified, it will be\n"
                              "scanned automatically."),
                            "Mail");
        if (!path) return;