2007-10-10 [paul] 3.0.2cvs51

	* src/addrduplicates.c
		fix engrish
		use GTK_STOCK... buttons

diff --git a/ChangeLog b/ChangeLog
index c98073312f0bd52a07d190b948512b61f2791bf9..6a2b3ed78c5ff1482600f77656a034ab0501c8df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-10 [paul]      3.0.2cvs51
+
+       * src/addrduplicates.c
+               fix engrish
+               use GTK_STOCK... buttons
+
 2007-10-10 [paul]      3.0.2cvs50
 
        * src/addressadd.c

diff --git a/PATCHSETS b/PATCHSETS
index 51cbd4f299046e09351f216214fc1c09e9104838..d425a85611f68f4dd934731d8c68f3f7041eb758 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2963,3 +2963,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/addrduplicates.c;  cvs diff -u -r 1.14.2.32 -r 1.14.2.33 src/editaddress.c;  ) > 3.0.2cvs48.patchset
 ( cvs diff -u -r 1.9.2.17 -r 1.9.2.18 src/addressadd.c;  cvs diff -u -r 1.28.2.35 -r 1.28.2.36 src/addrindex.c;  cvs diff -u -r 1.14.2.33 -r 1.14.2.34 src/editaddress.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/headerview.c;  cvs diff -u -r 1.94.2.157 -r 1.94.2.158 src/messageview.c;  cvs diff -u -r 1.395.2.329 -r 1.395.2.330 src/summaryview.c;  cvs diff -u -r 1.96.2.185 -r 1.96.2.186 src/textview.c;  ) > 3.0.2cvs49.patchset
 ( cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/addressadd.c;  cvs diff -u -r 1.28.2.36 -r 1.28.2.37 src/addrindex.c;  cvs diff -u -r 1.14.2.34 -r 1.14.2.35 src/editaddress.c;  ) > 3.0.2cvs50.patchset
+( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/addrduplicates.c;  ) > 3.0.2cvs51.patchset

diff --git a/configure.ac b/configure.ac
index d3917b7302a3bfbba3462cd76f3b8bc6ab0b1231..a3cf54deeb34fec4c22f722d84667f054e7b0a25 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=50
+EXTRA_VERSION=51
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index bf9ef77a631ea5f93415afa97e6239af4d79dc87..1ada1a920b547478a3374c8cf94bd613cba72f50 100644 (file)
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -144,8 +144,8 @@ static gboolean create_dialog()
 
        val = alertpanel_full(_("Find address book email duplicates"),
                              _("Claws-Mail will now search for duplicate email "
-                               "addresses in the addressbook."),
-                             _("Cancel"),_("Search"),NULL, FALSE, vbox, ALERT_NOTICE,
+                               "addresses in the address book."),
+                             GTK_STOCK_CANCEL,GTK_STOCK_FIND,NULL, FALSE, vbox, ALERT_NOTICE,
                              G_ALERTALTERNATE);
        if(val == G_ALERTALTERNATE) {
                want_search = TRUE;
@@ -324,7 +324,7 @@ static void present_finder_results(GtkWindow *parent)
        static GdkGeometry geometry;
 
        if(g_hash_table_size(addr_hash) == 0) {
-               alertpanel_notice(_("No duplicate email addresses in the addressbook found"));
+               alertpanel_notice(_("No duplicate email addresses found in the address book"));
                return;
        }
 
@@ -473,7 +473,7 @@ static GtkWidget* create_detail_view(GtkListStore *store)
        /* col 1 */
        gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
                -1,
-               _("Addressbook path"),
+               _("Address book path"),
                renderer,
                "text", COL_BOOKPATH,
                NULL);