2012-05-27 [paul] 3.8.0cvs47

	* src/editldap.c
	* src/prefs_actions.c
	* src/gtk/about.c
		fix some typos in strings, thanks to Thomas Bellmann

diff --git a/ChangeLog b/ChangeLog
index 5731436369e536c77482312aa8255ae4833794ab..e7f844a38884edb1af9d103f30c6e82afdadbc26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-27 [paul]      3.8.0cvs47
+
+       * src/editldap.c
+       * src/prefs_actions.c
+       * src/gtk/about.c
+               fix some typos in strings, thanks to Thomas Bellmann
+

 2012-05-16 [paul]      3.8.0cvs46
 
        * src/prefs_filtering_action.c
 2012-05-16 [paul]      3.8.0cvs46
 
        * src/prefs_filtering_action.c

diff --git a/PATCHSETS b/PATCHSETS
index a926f53ed1cc0d370195b7f2078e6fc2dbe8d1ea..4ffdea667144e10d3299baea918232db9c7fc7a7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4363,3 +4363,4 @@
 ( cvs diff -u -r 1.36.2.196 -r 1.36.2.197 src/common/utils.c;  ) > 3.8.0cvs44.patchset
 ( cvs diff -u -r 1.36.2.197 -r 1.36.2.198 src/common/utils.c;  ) > 3.8.0cvs45.patchset
 ( cvs diff -u -r 1.1.4.74 -r 1.1.4.75 src/prefs_filtering_action.c;  ) > 3.8.0cvs46.patchset
 ( cvs diff -u -r 1.36.2.196 -r 1.36.2.197 src/common/utils.c;  ) > 3.8.0cvs44.patchset
 ( cvs diff -u -r 1.36.2.197 -r 1.36.2.198 src/common/utils.c;  ) > 3.8.0cvs45.patchset
 ( cvs diff -u -r 1.1.4.74 -r 1.1.4.75 src/prefs_filtering_action.c;  ) > 3.8.0cvs46.patchset

+( cvs diff -u -r 1.8.2.43 -r 1.8.2.44 src/editldap.c;  cvs diff -u -r 1.60.2.79 -r 1.60.2.80 src/prefs_actions.c;  cvs diff -u -r 1.4.2.81 -r 1.4.2.82 src/gtk/about.c;  ) > 3.8.0cvs47.patchset

diff --git a/configure.ac b/configure.ac
index c64adb18741fc9cd4891203d018373b2efde6784..3de29a211ce104a0be16dfc371ea04b955038d21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=46
+EXTRA_VERSION=47

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/editldap.c b/src/editldap.c
index 02b3bae930343c7f062002167c17c53f797877a0..4077707a67f9a03751b002847e58acf89faaec11 100644 (file)
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -471,11 +471,11 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
        SET_TOGGLE_SENSITIVITY_REVERSE(enable_tls_checkbtn, enable_ssl_checkbtn);
        SET_TOGGLE_SENSITIVITY_REVERSE(enable_ssl_checkbtn, enable_tls_checkbtn);
        CLAWS_SET_TIP(enable_tls_checkbtn, _( 
        SET_TOGGLE_SENSITIVITY_REVERSE(enable_tls_checkbtn, enable_ssl_checkbtn);
        SET_TOGGLE_SENSITIVITY_REVERSE(enable_ssl_checkbtn, enable_tls_checkbtn);
        CLAWS_SET_TIP(enable_tls_checkbtn, _( 

-               "Enable secure connection to the LDAP server via TLS."
+               "Enable secure connection to the LDAP server via TLS. "

                "If connection fails, be sure to check the correct "
                "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
        CLAWS_SET_TIP(enable_ssl_checkbtn, _( 
                "If connection fails, be sure to check the correct "
                "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
        CLAWS_SET_TIP(enable_ssl_checkbtn, _( 

-               "Enable secure connection to the LDAP server via SSL."
+               "Enable secure connection to the LDAP server via SSL. "

                "If connection fails, be sure to check the correct "
                "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
 
                "If connection fails, be sure to check the correct "
                "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
 

diff --git a/src/gtk/about.c b/src/gtk/about.c
index e02a7719a976ae188f29a900744bf12ec1fdd293..5a4d78bf7b7f7fe0380c11571b37826350597293 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -143,7 +143,7 @@ static GtkWidget *about_create_child_page_info(void)
                                NULL);
 #ifdef GENERIC_UMPC
        gtk_text_buffer_insert(buffer, &iter, _(
                                NULL);
 #ifdef GENERIC_UMPC
        gtk_text_buffer_insert(buffer, &iter, _(

-                               "\n\nCopyright (C) 1999-2011\nThe Claws Mail Team\n"
+                               "\n\nCopyright (C) 1999-2012\nThe Claws Mail Team\n"

                                " and Hiroyuki Yamamoto"), -1);
 #endif
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("\n\nSystem Information\n")), -1,
                                " and Hiroyuki Yamamoto"), -1);
 #endif
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("\n\nSystem Information\n")), -1,


@@ -708,7 +708,7 @@ static void about_create(void)
        gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
 #ifndef GENERIC_UMPC
        label = gtk_label_new
        gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
 #ifndef GENERIC_UMPC
        label = gtk_label_new

-               (_("Copyright (C) 1999-2011\nThe Claws Mail Team\n"
+               (_("Copyright (C) 1999-2012\nThe Claws Mail Team\n"

                 "and Hiroyuki Yamamoto"));
        gtk_label_set_selectable(GTK_LABEL(label), TRUE);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
                 "and Hiroyuki Yamamoto"));
        gtk_label_set_selectable(GTK_LABEL(label), TRUE);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 42d4d9dfa325043ff441e860c8d9333d403fa2ed..eb1a5456fbe7a5aaf2261d4cbc21b6fd462bc956 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -612,7 +612,7 @@ static gint prefs_actions_clist_set_row(gint row)
 
        action_nb = prefs_actions_find_by_name(entry_text);
        if ((action_nb != -1) && ((row == -1) || (row != action_nb + 1))) {
 
        action_nb = prefs_actions_find_by_name(entry_text);
        if ((action_nb != -1) && ((row == -1) || (row != action_nb + 1))) {

-               alertpanel_error(_("There is action with this name already."));
+               alertpanel_error(_("There is an action with this name already."));

                return -1;
        }
        
                return -1;
        }