2007-08-11 [paul] 2.10.0cvs113

[claws.git] / src / addrgather.c

diff --git a/src/addrgather.c b/src/addrgather.c
index a17b2d380c2b78e387e1006576fa90fd1f2263d3..a941ad8698faa18e7b9b25a2c4962d5498632652 100644 (file)
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 /*
@@ -248,11 +248,11 @@ static void addrgather_dlg_cancel( GtkWidget *widget, gpointer data ) {
        gtk_main_quit();
 }
 
-#define PACK_CHECK_BUTTON(box, chkbtn, label) \
+#define PACK_CHECK_BUTTON(box, checkbtn, label) \
 { \
-       chkbtn = gtk_check_button_new_with_label(label); \
-       gtk_widget_show(chkbtn); \
-       gtk_box_pack_start(GTK_BOX(box), chkbtn, FALSE, TRUE, 0); \
+       checkbtn = gtk_check_button_new_with_label(label); \
+       gtk_widget_show(checkbtn); \
+       gtk_box_pack_start(GTK_BOX(box), checkbtn, FALSE, TRUE, 0); \
 }
 
 /*
@@ -405,7 +405,7 @@ static void addrgather_page_fields( gint pageNum, gchar *pageLbl ) {
 
        /* Recurse folders */
        top += 4;
-       checkRecurse = gtk_check_button_new_with_label( _("Include sub-folders" ) );
+       checkRecurse = gtk_check_button_new_with_label( _("Include subfolders" ) );
        gtk_table_attach( GTK_TABLE(table), checkRecurse, 0, 2, top, (top + 1),
                        GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0 );