2006-09-14 [paul] 2.4.0cvs187

	* manual/advanced.xml
		improvements to the English,
		properly place the new hidden options
		within the alphabetical order
	* src/gtk/pluginwindow.c
		improvements to the English

diff --git a/ChangeLog b/ChangeLog
index c4445bb4204c983436c47f522b617bce06117832..757345e49d953ab1094c1686d434c4ae0901da22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-14 [paul]      2.4.0cvs187
+
+       * manual/advanced.xml
+               improvements to the English,
+               properly place the new hidden options
+               within the alphabetical order
+       * src/gtk/pluginwindow.c
+               improvements to the English
+
 2006-09-14 [colin]     2.4.0cvs186
 
        * src/prefs_common.c

diff --git a/PATCHSETS b/PATCHSETS
index a21f83c586091c64d835bd695a142cd1bdd1871e..c4d7a2afa11d4818cd229766c93bbb87b607b5dc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1878,3 +1878,4 @@
 ( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/common/ssl_certificate.c;  ) > 2.4.0cvs184.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gedit-print.c;  cvs diff -u -r 1.94.2.105 -r 1.94.2.106 src/messageview.c;  cvs diff -u -r 1.19.2.9 -r 1.19.2.10 src/messageview.h;  cvs diff -u -r 1.395.2.248 -r 1.395.2.249 src/summaryview.c;  cvs diff -u -r 1.96.2.147 -r 1.96.2.148 src/textview.c;  ) > 2.4.0cvs185.patchset
 ( cvs diff -u -r 1.204.2.101 -r 1.204.2.102 src/prefs_common.c;  cvs diff -u -r 1.103.2.60 -r 1.103.2.61 src/prefs_common.h;  cvs diff -u -r 1.1.4.30 -r 1.1.4.31 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 manual/advanced.xml;  ) > 2.4.0cvs186.patchset
+( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 manual/advanced.xml;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/pluginwindow.c;  ) > 2.4.0cvs187.patchset

diff --git a/configure.ac b/configure.ac
index 59da77f346f422ca1a4f92d120310e08894c9dcd..13c8f8709f7f5482deabd30b7758fc6ab92e1399 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=186
+EXTRA_VERSION=187
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index c421ff9903cc06f29294c1a56b62d0a1128fb70f..c256897d19321f7d426a0931d9d498d123da2220 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -547,8 +547,9 @@
        <term><literal>enable_dotted_lines</literal></term>
        <listitem>
          <para>
-       Use the <emphasis>old</emphasis> dotted line look for the Folder List and
-       Message List instead of the <emphasis>modern</emphasis> lineless look.
+       Use the <emphasis>old</emphasis> dotted line look in the main window
+       GtkTreeView components, (Folder List and Message List), instead of the
+       <emphasis>modern</emphasis> lineless look.
          </para>
        </listitem>
       </varlistentry>
@@ -560,33 +561,6 @@
          </para>
        </listitem>
       </varlistentry>
-      <varlistentry>
-       <term><literal>use_stripes_everywhere</literal></term>
-       <listitem>
-         <para>
-       Enable alternately coloured lines in GtkTreeView components.
-         </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>use_stripes_in_summaries</literal></term>
-       <listitem>
-         <para>
-       Enable alternately coloured lines in main window's GtkTreeView components
-       (folder list and messages list). The only useful way to use this option is
-       to set it to 0 when use_stripes_everywhere is set to 1.
-         </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>stripes_color_offset</literal></term>
-       <listitem>
-         <para>
-       Specify the value to use to create alternate colors in summaries. The
-       more little it is, the less the difference will be visible.
-         </para>
-       </listitem>
-      </varlistentry>
       <varlistentry>
        <term><literal>enable_swap_from</literal></term>
        <listitem>
@@ -658,6 +632,16 @@
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+       <term><literal>stripes_color_offset</literal></term>
+       <listitem>
+       <para>
+       Specify the value to use when creating alternately coloured lines in
+       GtkTreeView components. The smaller the value, the less visible the
+       difference in the alternating colours of the lines.
+       </para>
+       </listitem>
+      </varlistentry>
       <varlistentry>
        <term><literal>textview_cursor_visible</literal></term>
        <listitem>
@@ -683,6 +667,25 @@
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+       <term><literal>use_stripes_everywhere</literal></term>
+       <listitem>
+       <para>
+       Enable alternately coloured lines in GtkTreeView components.
+       </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><literal>use_stripes_in_summaries</literal></term>
+       <listitem>
+       <para>
+       Enable alternately coloured lines in the main window GtkTreeView
+       components, (Folder List and Message List). The only useful way to
+       use this option is to set it to 0 when use_stripes_everywhere is set
+       to 1.
+       </para>
+       </listitem>
+      </varlistentry>
       <varlistentry>
        <term><literal>utf8_instead_of_locale_for_broken_mail</literal></term>
        <listitem>

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 009db5750454c1fa1360e1f0e8f8c5fc69dc014f..19e57b90d40d7f58b840f07a30a42b8ea0b2173d 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -182,7 +182,7 @@ static void load_cb(GtkButton *button, PluginWindow *pluginwindow)
        GList *file_list;
 
        file_list = filesel_select_multiple_files_open_with_filter(
-                       _("Select one or more Plugins to load"), get_plugin_dir(), 
+                       _("Select the Plugins to load"), get_plugin_dir(), 
                        "*." G_MODULE_SUFFIX);
 
        if (file_list) {
@@ -381,11 +381,11 @@ void pluginwindow_create()
 
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips),
                        load_btn,
-                       _("Load one or more plugins by selecting here."), NULL);
+                       _("Click here to load one or more plugins"), NULL);
 
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips),
                        unload_btn,
-                       _("Unload the currently selected plugin."), NULL);
+                       _("Unload the selected plugin"), NULL);
 
        pluginwindow->window = window;
        pluginwindow->plugin_list_view = plugin_list_view;