2008-11-30 [paul] 3.6.1cvs55

	* manual/advanced.xml
	* manual/plugins.xml
	* src/prefs_toolbar.c
		remove the verb from the page title and
		update references in the manual

diff --git a/ChangeLog b/ChangeLog
index a46e91076a955c893ff7adb69362e62adf1b6499..ce3726623bbe5352aad81fbf78aac3b3cd4060d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-30 [paul]      3.6.1cvs55
+
+       * manual/advanced.xml
+       * manual/plugins.xml
+       * src/prefs_toolbar.c
+               remove the verb from the page title and
+               update references in the manual
+
 2008-11-30 [paul]      3.6.1cvs54
 
        * src/prefs_other.c

diff --git a/PATCHSETS b/PATCHSETS
index faf48d356b47e4a7560a4677c83cceaaf36607ee..16da5c07192eaf4f8cf543dde1fab0ec9928f1f3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3636,3 +3636,4 @@
 ( cvs diff -u -r 1.83.2.148 -r 1.83.2.149 src/mimeview.c;  ) > 3.6.1cvs52.patchset
 ( cvs diff -u -r 1.8.2.52 -r 1.8.2.53 README;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 manual/advanced.xml;  ) > 3.6.1cvs53.patchset
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/prefs_other.c;  cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/gtk/prefswindow.c;  ) > 3.6.1cvs54.patchset
+( cvs diff -u -r 1.1.2.52 -r 1.1.2.53 manual/advanced.xml;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 manual/plugins.xml;  cvs diff -u -r 1.30.2.53 -r 1.30.2.54 src/prefs_toolbar.c;  ) > 3.6.1cvs55.patchset

diff --git a/configure.ac b/configure.ac
index 246ac6a4acd9f38b9687b475309123847f43b0d6..c0d42affd94fcf440f3b2371012d6a656b205c7f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=54
+EXTRA_VERSION=55
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index 86a647b00aeba07720d0ec2b27f86d5fe881b59e..1a7024b24db163aca7c6dc970118c16e0ed5d216 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -25,7 +25,7 @@
     <para>
         Additionally, it is possible to add toolbar entries for your
         actions. To do so, open the <quote>Configuration/Preferences</quote>
-        menu and select <quote>Customize Toolbars/Main Window</quote>.
+        menu and select <quote>Toolbars/Main Window</quote>.
        Select <quote>User Action</quote> in the <quote>Item type</quote>
        dropdown menu, then select the Action in the <quote>Event executed on click</quote>
        dropdown menu, and click the <quote>Icon</quote> button to select the

diff --git a/manual/plugins.xml b/manual/plugins.xml
index 6c670bd327b5e24a5cad91669457f8cc8a7cb97e..6df2f863b622bc0b45b671f056063bcc86af0ab8 100644 (file)
--- a/manual/plugins.xml
+++ b/manual/plugins.xml
@@ -36,7 +36,7 @@
        You can train Bogofilter by marking messages as spam or ham from the 
        Message List contextual menu, or using the relevant toolbar button in 
        the main window or the message window (see 
-       <quote>Configuration/Preferences/Customize toolbars</quote>). Messages 
+       <quote>Configuration/Preferences/Toolbars</quote>). Messages 
        marked as spam are optionally saved to a designated folder.
          </para><para>
        Plugin preferences can be found in 
@@ -89,7 +89,7 @@
        You can train SpamAssassin by marking messages as spam or ham from the 
        Message List contextual menu, or using the relevant toolbar button in 
        the main window or the message window (see 
-       <quote>Configuration/Preferences/Customize toolbars</quote>). Messages 
+       <quote>Configuration/Preferences/Toolbars</quote>). Messages 
        marked as spam are optionally saved to a designated folder.
          </para><para>
        Plugin preferences can be found in 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 4ac0beb3098316ac3e84ab53b0ce313163ae2ad7..06fc7509c4a3bf4c4affb79a6adf3bfcf5a41ceb 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -995,7 +995,7 @@ void prefs_toolbar_init(void)
        ToolbarPage *page;
        static gchar *mainpath[3], *messagepath[3], *composepath[3];
 
-       mainpath[0] = _("Customize Toolbars");
+       mainpath[0] = _("Toolbars");
        mainpath[1] = _("Main Window");
        mainpath[2] = NULL;
 
@@ -1009,7 +1009,7 @@ void prefs_toolbar_init(void)
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_toolbar_mainwindow = page;
 
-       messagepath[0] = _("Customize Toolbars");
+       messagepath[0] = _("Toolbars");
        messagepath[1] = _("Message Window");
        messagepath[2] = NULL;
 
@@ -1023,7 +1023,7 @@ void prefs_toolbar_init(void)
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_toolbar_messageview = page;
 
-       composepath[0] = _("Customize Toolbars");
+       composepath[0] = _("Toolbars");
        composepath[1] = _("Compose Window");
        composepath[2] = NULL;