try again

diff --git a/manual/pl/dist/ps/.cvsignore b/manual/pl/dist/ps/.cvsignore
index 41878f606dc2dab37acbe66c7432de9e924c51ca..f8c92fabf079e50de67a55518f834797f72d6cd1 100644 (file)
--- a/manual/pl/dist/ps/.cvsignore
+++ b/manual/pl/dist/ps/.cvsignore
@@ -1,3 +1,3 @@
-sylpheed-claws-manual.*
+claws-mail-manual.*
 Makefile
 Makefile.in

diff --git a/manual/pl/dist/ps/Makefile.am b/manual/pl/dist/ps/Makefile.am
index 9d641526763e55db69bb2658c453d8ec126ce7e1..767c9c42d82c5e2be564580a8d1bd3fb0643995f 100644 (file)
--- a/manual/pl/dist/ps/Makefile.am
+++ b/manual/pl/dist/ps/Makefile.am
@@ -1,8 +1,8 @@
-EXTRA_DIST=sylpheed-claws-manual.ps
-manualpl_DATA=sylpheed-claws-manual.ps
+EXTRA_DIST=claws-mail-manual.ps
+manualpl_DATA=claws-mail-manual.ps
 manualpldir=$(manualdir)/pl
 
-sylpheed-claws-manual.ps: \
+claws-mail-manual.ps: \
        ../../account.xml \
        ../../ack.xml \
        ../../addrbook.xml \
@@ -15,8 +15,8 @@ sylpheed-claws-manual.ps: \
        ../../keyboard.xml \
        ../../plugins.xml \
        ../../starting.xml \
-       ../../sylpheed-claws-manual.xml 
-       -docbook2ps -o . ../../sylpheed-claws-manual.xml
+       ../../claws-mail-manual.xml 
+       -docbook2ps -o . ../../claws-mail-manual.xml
        
 maintainer-clean:
-       -rm sylpheed-claws-manual.ps
+       -rm claws-mail-manual.ps

diff --git a/manual/pl/dist/txt/.cvsignore b/manual/pl/dist/txt/.cvsignore
index 41878f606dc2dab37acbe66c7432de9e924c51ca..f8c92fabf079e50de67a55518f834797f72d6cd1 100644 (file)
--- a/manual/pl/dist/txt/.cvsignore
+++ b/manual/pl/dist/txt/.cvsignore
@@ -1,3 +1,3 @@
-sylpheed-claws-manual.*
+claws-mail-manual.*
 Makefile
 Makefile.in

diff --git a/manual/pl/dist/txt/Makefile.am b/manual/pl/dist/txt/Makefile.am
index 406acc1aead594f04a23a5e56e09410a3b5902a4..7ae66057b0bfa91ecd728ce287c8df671a3cc0b0 100644 (file)
--- a/manual/pl/dist/txt/Makefile.am
+++ b/manual/pl/dist/txt/Makefile.am
@@ -1,8 +1,8 @@
-EXTRA_DIST=sylpheed-claws-manual.txt
-manualpl_DATA=sylpheed-claws-manual.txt
+EXTRA_DIST=claws-mail-manual.txt
+manualpl_DATA=claws-mail-manual.txt
 manualpldir=$(manualdir)/pl
 
-sylpheed-claws-manual.txt: \
+claws-mail-manual.txt: \
        ../../account.xml \
        ../../ack.xml \
        ../../addrbook.xml \
@@ -15,8 +15,8 @@ sylpheed-claws-manual.txt: \
        ../../keyboard.xml \
        ../../plugins.xml \
        ../../starting.xml \
-       ../../sylpheed-claws-manual.xml 
-       -docbook2txt -o . ../../sylpheed-claws-manual.xml
+       ../../claws-mail-manual.xml 
+       -docbook2txt -o . ../../claws-mail-manual.xml
        
 maintainer-clean:
-       -rm sylpheed-claws-manual.txt
+       -rm claws-mail-manual.txt

diff --git a/po/.cvsignore b/po/.cvsignore
index eca0898458087fef0c371547df27fa62b481fdee..56b4a3ac8130dbac05ec082b46c5bba2ed698320 100644 (file)
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -14,4 +14,4 @@ remove-potcdate.sin
 sylpheed.pot
 *.po~
 *.gmo
-sylpheed-claws.pot
+claws-mail.pot

diff --git a/po/Makevars b/po/Makevars
index 24095cc651557b6b417c84a7019ea80cc429e330..c636c87cdd6fdda536f8417319424db28d1c6ebc 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -23,7 +23,7 @@ XGETTEXT_OPTIONS = \
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = The Sylpheed-Claws Team
+COPYRIGHT_HOLDER = The Claws Mail Team
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:

diff --git a/src/.cvsignore b/src/.cvsignore
index b96825233d5a1286bce7ba13a0b3438c0934f4ad..36550764e2325b77159cd61828a4b7c7ec485cf8 100644 (file)
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1,7 +1,7 @@
 Makefile
 .deps
 .libs
-sylpheed-claws
+claws-mail
 Makefile.in
 tags
 *.swp

diff --git a/src/Makefile.am b/src/Makefile.am
index b7691e37c0124037b80e72a26f107449fd38129e..03b77a369cd0dfe026bc1bbbe2929b64daf18bd8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,9 +9,9 @@ endif
 
 SUBDIRS = common gtk $(etpan_dir) . plugins
 
-bin_PROGRAMS = sylpheed-claws
+bin_PROGRAMS = claws-mail
 
-sylpheed_claws_SOURCES = \
+claws_mail_SOURCES = \
        account.c \
        action.c \
        addrbook.c \
@@ -146,8 +146,8 @@ sylpheed_claws_SOURCES = \
        vcard.c \
        wizard.c
 
-sylpheed_clawsincludedir = $(pkgincludedir)
-sylpheed_clawsinclude_HEADERS = \
+claws_mailincludedir = $(pkgincludedir)
+claws_mailinclude_HEADERS = \
        account.h \
        action.h \
        adbookbase.h \
@@ -378,9 +378,9 @@ EXTRA_DIST = \
        pixmaps/search.xpm \
        pixmaps/spam.xpm \
        pixmaps/spam_btn.xpm \
-       pixmaps/sylpheed-claws_icon.xpm \
-       pixmaps/sylpheed-claws_logo.xpm \
-       pixmaps/sylpheed-claws.xpm \
+       pixmaps/claws-mail_icon.xpm \
+       pixmaps/claws-mail_logo.xpm \
+       pixmaps/claws-mail.xpm \
        pixmaps/trash_hrm.xpm \
        pixmaps/trash.xpm \
        pixmaps/trash_btn.xpm \
@@ -415,10 +415,10 @@ else
 arch_ldflags :=
 endif
 
-sylpheed_claws_LDFLAGS = \
+claws_mail_LDFLAGS = \
        $(arch_ldflags) -export-dynamic
 
-sylpheed_claws_LDADD = \
+claws_mail_LDADD = \
        $(etpan_library) \
        gtk/libsylpheedgtk.la \
        $(ASPELL_LIBS) \
@@ -437,7 +437,7 @@ sylpheed_claws_LDADD = \
        $(LIBETPAN_LIBS)
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Sylpheed-Claws\" \
+       -DG_LOG_DOMAIN=\"Claws-Mail\" \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DMANUALDIR=\""$(manualdir)"\" \
        -DFAQDIR=\""$(faqdir)"\" \
@@ -459,18 +459,18 @@ AM_CPPFLAGS = \
 AM_YFLAGS = -d
 
 if CYGWIN
-sylpheed-claws$(EXEEXT): $(sylpheed_claws_OBJECTS) $(sylpheed_claws_DEPENDENCIES) 
-       @rm -f sylpheed-claws$(EXEEXT)
-       @rm -f sylpheed-claws.def sylpheed-claws.base sylpheed-claws.exp libsylpheed-claws.a .libs/libsylpheed-claws.a
-       $(LINK) -shared $(sylpheed_clawsLDFLAGS) -Wl,--out-implib=libsylpheed-claws.a -Wl,--export-all-symbols,--exclude-symbols,main $(sylpheed_claws_OBJECTS) -Wl,--no-whole-archive $(sylpheed_claws_LDADD) $(LIBS)
-       dlltool --output-def sylpheed-claws.def --dllname sylpheed-claws$(EXEEXT) --export-all-symbols --exclude-symbols main $(sylpheed_claws_OBJECTS) gtk/.libs/libsylpheedgtk.a
-       $(LINK) $(sylpheed_claws_LDFLAGS) -Wl,--base-file,sylpheed-claws.base $(sylpheed_claws_OBJECTS) $(sylpheed_claws_LDADD) $(LIBS)
+claws-mail$(EXEEXT): $(claws_mail_OBJECTS) $(claws_mail_DEPENDENCIES) 
+       @rm -f claws-mail$(EXEEXT)
+       @rm -f claws-mail.def claws-mail.base claws-mail.exp libclaws-mail.a .libs/libclaws-mail.a
+       $(LINK) -shared $(claws_mailLDFLAGS) -Wl,--out-implib=libclaws-mail.a -Wl,--export-all-symbols,--exclude-symbols,main $(claws_mail_OBJECTS) -Wl,--no-whole-archive $(claws_mail_LDADD) $(LIBS)
+       dlltool --output-def claws-mail.def --dllname claws-mail$(EXEEXT) --export-all-symbols --exclude-symbols main $(claws_mail_OBJECTS) gtk/.libs/libsylpheedgtk.a
+       $(LINK) $(claws_mail_LDFLAGS) -Wl,--base-file,claws-mail.base $(claws_mail_OBJECTS) $(claws_mail_LDADD) $(LIBS)
        sleep 5
-       dlltool --base-file sylpheed-claws.base --input-def sylpheed-claws.def --output-exp sylpheed-claws.exp
-       $(LINK) $(sylpheed_claws_LDFLAGS) -Wl,sylpheed-claws.exp $(sylpheed_claws_OBJECTS) $(sylpheed_claws_LDADD) $(LIBS)
-       @cp libsylpheed-claws.a .libs/libsylpheed-claws.a
+       dlltool --base-file claws-mail.base --input-def claws-mail.def --output-exp claws-mail.exp
+       $(LINK) $(claws_mail_LDFLAGS) -Wl,claws-mail.exp $(claws_mail_OBJECTS) $(claws_mail_LDADD) $(LIBS)
+       @cp libclaws-mail.a .libs/libclaws-mail.a
 else
-#sylpheed-claws$(EXEEXT): $(sylpheed_claws_OBJECTS) $(sylpheed_claws_DEPENDENCIES) 
-#      @rm -f sylpheed-claws$(EXEEXT)
-#      $(LINK) $(sylpheed_claws_LDFLAGS) $(sylpheed_claws_OBJECTS) $(sylpheed_claws_LDADD) $(LIBS)
+#claws-mail$(EXEEXT): $(claws_mail_OBJECTS) $(claws_mail_DEPENDENCIES) 
+#      @rm -f claws-mail$(EXEEXT)
+#      $(LINK) $(claws_mail_LDFLAGS) $(claws_mail_OBJECTS) $(claws_mail_LDADD) $(LIBS)
 endif

diff --git a/src/account.c b/src/account.c
index 0c01275ee36903a639ae66774baf50d97597d9d3..d873e9fa2ee76a3b86a434c755ec11b6dc7b35d4 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/account.h b/src/account.h
index 5264b55a3a2769c77fc694964926ad620c2313b0..38aa93bc040acdb247b92010ac0e912b188284be 100644 (file)
--- a/src/account.h
+++ b/src/account.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/action.c b/src/action.c
index d47bcccb812a5111da4b04d403d7aa2e4e1062b8..62eb5d31891885e104b03de24bcc6a0e78a5bacf 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/action.h b/src/action.h
index 28e64afa8b6be725cd0e46955bb7eac400619982..d33b602369f33f70eb756faac29679b755fa2cd8 100644 (file)
--- a/src/action.h
+++ b/src/action.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/adbookbase.h b/src/adbookbase.h
index 482a7a174079752691d2ed432a4f8b01d767df1d..529b5428d32e1f8c455f729abd53cc3406b3d4a4 100644 (file)
--- a/src/adbookbase.h
+++ b/src/adbookbase.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 575af4ed68d9f6bc42c5d46eb7663a68b403e918..c870bd8f8f5ca2e630e7dd0d1feedafb55dd4bc7 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -1,7 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  *
- * Copyright (C) 2000-2006 by Alfons Hoogervorst & The Sylpheed Claws Team.
+ * Copyright (C) 2000-2006 by Alfons Hoogervorst & The Claws Mail Team.
  *
  * 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

diff --git a/src/addr_compl.h b/src/addr_compl.h
index 464edcf76ced7b19a4928cc27195e1a7b48f5b8c..8a935197a5afd7e17e03eeedbbfd66b88fee23fb 100644 (file)
--- a/src/addr_compl.h
+++ b/src/addr_compl.h
@@ -1,7 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  * 
- * Copyright (C) 2000-2006 by Alfons Hoogervorst & The Sylpheed Claws Team.
+ * Copyright (C) 2000-2006 by Alfons Hoogervorst & The Claws Mail Team.
  *
  * 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

diff --git a/src/addrbook.c b/src/addrbook.c
index 9901d8b0cfde3167dd902abb2f082cc2b66944c7..d73d5570c45be470d7830462c4be3840f34afa86 100644 (file)
--- a/src/addrbook.c
+++ b/src/addrbook.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrcache.c b/src/addrcache.c
index 936ba296d31ec7c6a92f165e24e73d9a1916347c..f538974889c1282558cf707dbac921d96580ad83 100644 (file)
--- a/src/addrcache.c
+++ b/src/addrcache.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrcache.h b/src/addrcache.h
index 7293e530c86adcdf11f195777ba6a6f9f837e70f..324871e6587c7181375cff4e48dbcce40fe7093b 100644 (file)
--- a/src/addrcache.h
+++ b/src/addrcache.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrcindex.c b/src/addrcindex.c
index 89a1ac165a3ee89d1785a23d67d18d6c57125463..954044f42f7e6bb084f9f1cf1ab48b2fd1194096 100644 (file)
--- a/src/addrcindex.c
+++ b/src/addrcindex.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrcindex.h b/src/addrcindex.h
index 665f0764ed2fc2486866b83177edf2ba2a697eb8..b637579692ff85e2a5d70a12b4ea909fd2c83e4d 100644 (file)
--- a/src/addrcindex.h
+++ b/src/addrcindex.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrclip.c b/src/addrclip.c
index c1ac588c809830d9526493f032133151ea77c133..410c760cda80dc765112db9f41f8fe2a4d4beb6b 100644 (file)
--- a/src/addrclip.c
+++ b/src/addrclip.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrclip.h b/src/addrclip.h
index 18b6dee402032068964481b7d2818c2a044ff760..5ce546451abfb1ab9b738748420ccd62c632fcd5 100644 (file)
--- a/src/addrclip.h
+++ b/src/addrclip.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrdefs.h b/src/addrdefs.h
index 02e994dc5e6f48025bc6c718e218b28eff3365f1..89e5032b3ef1d694f6dbe3fa4169b41a2728c541 100644 (file)
--- a/src/addrdefs.h
+++ b/src/addrdefs.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addressadd.c b/src/addressadd.c
index b425a636bbcc7bd50f01d715c9d6b96d24ad5e3c..e0f46de97aa3d2cda8acb68598ec3614a5dbb811 100644 (file)
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addressadd.h b/src/addressadd.h
index 2fab8c6b370c410c8718926595d57bd1df5b97fa..d50ea9728f215812042faaf16bd5a6dc45b611bc 100644 (file)
--- a/src/addressadd.h
+++ b/src/addressadd.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addressbook.c b/src/addressbook.c
index ffe32e373527e3533bd6b832b897a4ddd8114b9f..236a63cd0878035ad1275c713c47f5d857fdd37b 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -405,7 +405,7 @@ static void addressbook_list_menu_setup( void );
 
 static GtkTargetEntry addressbook_drag_types[] =
 {
-       {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+       {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
 };
 
 static GtkTargetList *addressbook_target_list = NULL;

diff --git a/src/addressbook.h b/src/addressbook.h
index c83fcd10c829ded7a6d618723bb2965ec91a3846..237f13aa6f9a98988d93b97612a5de82cfa06053 100644 (file)
--- a/src/addressbook.h
+++ b/src/addressbook.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index 7ea655892d8a7da02192461b1981d2ec8721447f..ec6bd866019c6c6f78d1bdb32f59444cac140a08 100644 (file)
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addressbook_foldersel.h b/src/addressbook_foldersel.h
index 62023e5bd7df072b5e1f4225c153908b39a1c6e7..ceec8b11b755f9542ecbafcf7f09c35556b6da09 100644 (file)
--- a/src/addressbook_foldersel.h
+++ b/src/addressbook_foldersel.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrgather.c b/src/addrgather.c
index bd555fcea04cbc6ae6db0c9cadb2eca79a34db6f..2c4a13e28a52f541a066c56f50f5afeae0252eb9 100644 (file)
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrgather.h b/src/addrgather.h
index 21883347ed04241dbcaf55631f0b74f271643361..662811c97914e135717e6d4f33e598367afc96e5 100644 (file)
--- a/src/addrgather.h
+++ b/src/addrgather.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrharvest.c b/src/addrharvest.c
index 0b2f8c76beb7f6e76b36ff45d6b27ba9c5cd99e2..36cc7cc133513615b74e92d73e056e26d9c6dad0 100644 (file)
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrharvest.h b/src/addrharvest.h
index c506d8e34e3022038d078ae87b85ac7a81e113c2..e10639d96000a9b00672110f51f681df164f7ea4 100644 (file)
--- a/src/addrharvest.h
+++ b/src/addrharvest.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrindex.c b/src/addrindex.c
index fee6e7177d7a9fb933d2311bd51ef2f8968058ee..3e80ff9bac036a59eeb7fc1165e0c059fb452e2a 100644 (file)
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrindex.h b/src/addrindex.h
index e3c0c785cee8d0363d5749050658ad26bbcba121..8912e832285863100014e78cf2c5656e156ff359 100644 (file)
--- a/src/addrindex.h
+++ b/src/addrindex.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addritem.c b/src/addritem.c
index b6423390cd95a4e6e74d11ff38f13a6162c5883e..a12417ae2f5c198501014bafc9cc5665e767b4eb 100644 (file)
--- a/src/addritem.c
+++ b/src/addritem.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addritem.h b/src/addritem.h
index 80f788778ac27c1df351a7ec895f0ddf11655e8f..4dfc72c18da09ce48170fb5e79b837b510c1ecb6 100644 (file)
--- a/src/addritem.h
+++ b/src/addritem.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrquery.c b/src/addrquery.c
index 7a60084cee5aa997c8fe1c2ae1f5b6e8f68a8143..89b572cf13bf4779552a98536934ce29d8427855 100644 (file)
--- a/src/addrquery.c
+++ b/src/addrquery.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrquery.h b/src/addrquery.h
index 20a10f1a15be78eb829db5d5967ea60ca6f80983..e587f5b16412571be0e9df907c31c792744591a5 100644 (file)
--- a/src/addrquery.h
+++ b/src/addrquery.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrselect.c b/src/addrselect.c
index 786a3b222710e774dff304edfad7283096f5fb51..f5230b4fbc4d1bb5d33cbec13bcf6ea71a70c9cb 100644 (file)
--- a/src/addrselect.c
+++ b/src/addrselect.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/addrselect.h b/src/addrselect.h
index b8e7571b189c647770c32c6e627ef671ce450216..a148098e3522c860dfc263b764c6b45c52865655 100644 (file)
--- a/src/addrselect.h
+++ b/src/addrselect.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/alertpanel.c b/src/alertpanel.c
index ab8fc91a23a0941480993e74ef2b521c8a16c802..9cb348e4359815998cbeaea2434746fe480baae1 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/alertpanel.h b/src/alertpanel.h
index 4b133e4a24e90f0031b67c69220ed6720ad56e6a..58fc4a4f565b672732f1dac781439839746b24b1 100644 (file)
--- a/src/alertpanel.h
+++ b/src/alertpanel.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/browseldap.c b/src/browseldap.c
index accd60f310374419fc9440dae39ae584a340163b..750bc31ddb5390312862d0df7197c4babc016f34 100644 (file)
--- a/src/browseldap.c
+++ b/src/browseldap.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/browseldap.h b/src/browseldap.h
index d133035d9c05a0c43736c7e5b47c9f464e8e456d..ec1d50eafe8a51c66f05fff336754862d6b60b6f 100644 (file)
--- a/src/browseldap.h
+++ b/src/browseldap.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/codeconv.c b/src/codeconv.c
index a12632c85168a43004585181d32ce8d8e181e0b9..08c8c1f214920b6932962cac5e779938cff0d6a3 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/codeconv.h b/src/codeconv.h
index f8305ca38bf23cf3f4658d918363344b59929cd5..82a649c244a06ac3711fa8c43d774aac7d94248f 100644 (file)
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/base64.c b/src/common/base64.c
index bebe5d8a3de98928c5410d34ef29f740c08915c4..d9cb9746fa3cfd7bbed9488c40f8b35b9b9d5cc7 100644 (file)
--- a/src/common/base64.c
+++ b/src/common/base64.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/base64.h b/src/common/base64.h
index f5dc65ba73edd67acd27e31f01c167912063c0ae..886066c2ada6693b02602e2abf17c1a2a5fefde8 100644 (file)
--- a/src/common/base64.h
+++ b/src/common/base64.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws teams
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail teams
  *
  * 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

diff --git a/src/common/defs.h b/src/common/defs.h
index e9b6f3446ec64b661e76df2349e41c6f67568c9d..e8d1052bd1b8c510a63723b17de4022c07395680 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -44,7 +44,8 @@
 #define DRAFT_DIR              "draft"
 #define TRASH_DIR              "trash"
 #define RC_DIR                 CFG_RC_DIR
-#define OLD_GTK2_RC_DIR                ".sylpheed-gtk2"
+#define OLD_GTK2_RC_DIR                ".sylpheed-claws"
+#define OLDER_GTK2_RC_DIR      ".sylpheed-gtk2"
 #define OLD_GTK1_RC_DIR                ".sylpheed"
 #define NEWS_CACHE_DIR         "newscache"
 #define IMAP_CACHE_DIR         "imapcache"
@@ -67,17 +68,17 @@
 #define UIDL_DIR               "uidl"
 #define NEWSGROUP_LIST         ".newsgroup_list"
 #define ADDRESS_BOOK           "addressbook.xml"
-#define MANUAL_HTML_INDEX      "sylpheed-claws-manual.html"
-#define HOMEPAGE_URI           "http://www.sylpheed-claws.net/"
-#define MANUAL_URI             "http://www.sylpheed-claws.net/documentation.php"
-#define FAQ_URI                        "http://www.sylpheed-claws.net/faq/index.php"
-#define PLUGINS_URI            "http://www.sylpheed-claws.net/plugins.php"
+#define MANUAL_HTML_INDEX      "claws-mail-manual.html"
+#define HOMEPAGE_URI           "http://www.claws-mail.org/"
+#define MANUAL_URI             "http://www.claws-mail.org/documentation.php"
+#define FAQ_URI                        "http://www.claws-mail.org/faq/index.php"
+#define PLUGINS_URI            "http://www.claws-mail.org/plugins.php"
 #define BUGZILLA_URI           "http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/enter_bug.cgi"
-#define THEMES_URI             "http://www.sylpheed-claws.net/themes.php"
-#define MAILING_LIST_URI       "http://www.sylpheed-claws.net/MLs.php"
-#define USERS_ML_ADDR          "sylpheed-claws-users@dotsrc.org"
+#define THEMES_URI             "http://www.claws-mail.org/themes.php"
+#define MAILING_LIST_URI       "http://www.claws-mail.org/MLs.php"
+#define USERS_ML_ADDR          "claws-mail-users@dotsrc.org"
 #define GPL_URI                        "http://www.gnu.org/licenses/gpl.html"
-#define DONATE_URI             "http://www.sylpheed-claws.net/sponsors.php"
+#define DONATE_URI             "http://www.claws-mail.org/sponsors.php"
 #define OPENSSL_URI            "http://www.openssl.org/"
 #define THEMEINFO_FILE         ".sylpheed_themeinfo"
 #define FOLDER_LIST            "folderlist.xml"

diff --git a/src/common/hooks.c b/src/common/hooks.c
index 0d08c4f3c74cf48ff99e7df0ded32a8cde15d2f2..fadb07891de016773465de4aebd39783f29cef75 100644 (file)
--- a/src/common/hooks.c
+++ b/src/common/hooks.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/hooks.h b/src/common/hooks.h
index e881d0cf7b732ee9e084d4e0bae08d1c678e408c..e5dfae7461ab9cbf3a45a293c3c1e019b4e965ba 100644 (file)
--- a/src/common/hooks.h
+++ b/src/common/hooks.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/log.c b/src/common/log.c
index f522a14f8e9e285bb59f72e1da8505e5882efe32..22163640ff8c05a2ca15e2fc4bb0293b824e3808 100644 (file)
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/log.h b/src/common/log.h
index ec0a09bb529e99c396de72e7c88a8b6ee13ae7f2..00203936f6105ac0302d05dfbb7836b8cf5b3461 100644 (file)
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/mgutils.c b/src/common/mgutils.c
index 30226833b9e4927fbf7d098a936b637c21b42fab..45352a3fb47f578800ebe22ec09762347c9fdf07 100644 (file)
--- a/src/common/mgutils.c
+++ b/src/common/mgutils.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/common/mgutils.h b/src/common/mgutils.h
index 5b109b88d9ec5c1e68125bc395bb63af54108f23..f5dc4c0541d27f0ce12597bf7c91eab3accb511b 100644 (file)
--- a/src/common/mgutils.h
+++ b/src/common/mgutils.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/common/nntp.c b/src/common/nntp.c
index 142b33e3eabc0ab344a4efcc84786fa2690b9bcb..82c8b8f8abe10c674fbd0ab41db3923764826a67 100644 (file)
--- a/src/common/nntp.c
+++ b/src/common/nntp.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/nntp.h b/src/common/nntp.h
index 0639afe600d3d192d8c8ab285297bb0fedd54650..5809511e3d59ec50e6391a3aac57c23f06f717cb 100644 (file)
--- a/src/common/nntp.h
+++ b/src/common/nntp.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/passcrypt.c b/src/common/passcrypt.c
index 9e809b91645b54ab3b7350438bfc8612f2f57eb7..2e95d1499da4fe3d7a6eacd9ed7f2c72d92d8101 100644 (file)
--- a/src/common/passcrypt.c
+++ b/src/common/passcrypt.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/common/passcrypt.h.in b/src/common/passcrypt.h.in
index 38d4643f11480dbd99599030dab435520fda915a..4a9092801064d1ed93cfe9711eac147b160f8266 100644 (file)
--- a/src/common/passcrypt.h.in
+++ b/src/common/passcrypt.h.in
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/common/plugin.c b/src/common/plugin.c
index 385427814f58b8892738afe2075bcf37d6047bf2..6fb99d61c0942a214bf96d68ba471b55e0af720e 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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
@@ -333,7 +333,7 @@ Plugin *plugin_load(const gchar *filename, gchar **error)
        }
 
        if (!strcmp(plugin_type(), "GTK")) {
-               *error = g_strdup(_("This module is for Sylpheed-Claws GTK1."));
+               *error = g_strdup(_("This module is for Claws Mail GTK1."));
                g_module_close(plugin->module);
                g_free(plugin);
                return NULL;

diff --git a/src/common/plugin.h b/src/common/plugin.h
index 5f671f8acc06120594e1b8392a543e9a2ea785db..3fa56bd7e29eb4d4c6ccccec968f1d58cb426d61 100644 (file)
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/common/prefs.c b/src/common/prefs.c
index 8110daf7c6b3df95b7825d2cc7d8fc297bd1ed30..9c9c20a2936b7113bfba9b20a93ac1124bf3d331 100644 (file)
--- a/src/common/prefs.c
+++ b/src/common/prefs.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/prefs.h b/src/common/prefs.h
index 41efbc2ce2746277f57eb2ae615f9349515f8893..f77596d7641ebd111ca6db4cd2783da4c8490ab6 100644 (file)
--- a/src/common/prefs.h
+++ b/src/common/prefs.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/progressindicator.c b/src/common/progressindicator.c
index 1f8a00895f1e6cbb0641caca90cdb1d9adbf28ea..5e041ad90e31903c513c749b11e76d25e84063ea 100644 (file)
--- a/src/common/progressindicator.c
+++ b/src/common/progressindicator.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/progressindicator.h b/src/common/progressindicator.h
index 321ba5372fd8079e912729beb3ecf8aadea368eb..2b76bb5017a457cfc520824c4eae994eab79a74d 100644 (file)
--- a/src/common/progressindicator.h
+++ b/src/common/progressindicator.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/quoted-printable.c b/src/common/quoted-printable.c
index 1c10f2b4b4271d5c184ce1898107723f6ceddb88..212280fd57a6657a3bcd5c883ebbad9130050a97 100644 (file)
--- a/src/common/quoted-printable.c
+++ b/src/common/quoted-printable.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/quoted-printable.h b/src/common/quoted-printable.h
index 079551eefbda414cdf979b531d71eb90caac4829..7d89cd811523da7611695acfeeadeea888bbe009 100644 (file)
--- a/src/common/quoted-printable.h
+++ b/src/common/quoted-printable.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/session.c b/src/common/session.c
index 612eea99044b487084bf3aa53a0bdd2a88971089..444b50b4aa5b683bca7d4d9727d92362c75e6682 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/session.h b/src/common/session.h
index da561a25dfc95719dcf2c3ca9ac2c4aea7abaedb..f128b968f35b7f696dc3cae41fc8a487a7500cbb 100644 (file)
--- a/src/common/session.h
+++ b/src/common/session.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/smtp.c b/src/common/smtp.c
index 60915a326209a4abb1f8a45ffebc6215ab45bcd0..1b512b3e748b5d295442a2dd7f41a08256de28ad 100644 (file)
--- a/src/common/smtp.c
+++ b/src/common/smtp.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/smtp.h b/src/common/smtp.h
index 96902c7e1163b9811e091f1202abb620bc64adf3..b431496ae411dc1f36a9c2f09a86d47a3d942fb7 100644 (file)
--- a/src/common/smtp.h
+++ b/src/common/smtp.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/socket.c b/src/common/socket.c
index c2ecf22ef411cf63961c5b6186a29942f60d0898..a05358050ec4bd4d96bbcadd01e4956fac91982b 100644 (file)
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/socket.h b/src/common/socket.h
index fcec361cbf2498f34136605abeb2445597faf224..a9778be9851eb0abe915d51edef58ac470cacf4f 100644 (file)
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/ssl.c b/src/common/ssl.c
index 49ce6b498a53a82fc18f101496e764fbd6c43653..23d954e5b1d7afd65718daeeba027ad7cbc7be39 100644 (file)
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/ssl.h b/src/common/ssl.h
index ba0db9b5e915d5f3cb4dd9cc37506ec92411a9c7..c2f85209e4767a5b4466d5283fe8767b08a58b2a 100644 (file)
--- a/src/common/ssl.h
+++ b/src/common/ssl.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/stringtable.c b/src/common/stringtable.c
index 057172b10e193f4b5809ee73230ee797129b8872..02052751a8118524b17593a287efbf7b5b333105 100644 (file)
--- a/src/common/stringtable.c
+++ b/src/common/stringtable.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/stringtable.h b/src/common/stringtable.h
index c8a119a25672a02b39ade531cf0648131f4dedc6..9d91bc635fefd69cf12a83bf853f117cbf19d6a7 100644 (file)
--- a/src/common/stringtable.h
+++ b/src/common/stringtable.h
@@ -1,6 +1,6 @@
 /*
  * sylpheed -- a gtk+ based, lightweight, and fast e-mail client
- * copyright (c) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * copyright (c) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/sylpheed.c b/src/common/sylpheed.c
index 0265ed2d6752866dacd5c34daa7cd7e5ec2e374f..9b955dd0899822de1fcf00aae07e0d8a86f3a5f7 100644 (file)
--- a/src/common/sylpheed.c
+++ b/src/common/sylpheed.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999,2000 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/sylpheed.h b/src/common/sylpheed.h
index 51c53cb3b850587d061fe2f05c99077d82a79ec2..7849187b05d68af0c62c55f2f003e3ece0149ad5 100644 (file)
--- a/src/common/sylpheed.h
+++ b/src/common/sylpheed.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999,2000 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/template.c b/src/common/template.c
index 6646c24ca29710d9dbef5296cb4d80a497458914..613c3d0921d32ed69622a3fd8013d3461ece34e8 100644 (file)
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -1,7 +1,7 @@
 /*
  * Sylpheed templates subsystem 
  * Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/template.h b/src/common/template.h
index fe28171b0729cb4e2ed63b84b8bee1d7dd372cb7..71620e9106029300bc087f3dadc5cfc485160b5f 100644 (file)
--- a/src/common/template.h
+++ b/src/common/template.h
@@ -1,7 +1,7 @@
 /*
  * Sylpheed templates subsystem 
  * Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/timing.h b/src/common/timing.h
index 5748f3dd7ace4a0f514214596bf7e48e8162257e..129e7e3332d70440b11d769a5a2008a37621d8e3 100644 (file)
--- a/src/common/timing.h
+++ b/src/common/timing.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2006 Colin Leroy <colin@colino.net> & the Sylpheed-Claws team
+ * Copyright (C) 2005-2006 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * 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

diff --git a/src/common/utils.c b/src/common/utils.c
index a73042dd9e463731cb189feecfdbb9a8736d83f0..99a76a26eee850b3793176d835b794c1da75cd3d 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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
@@ -1984,7 +1984,7 @@ const gchar *get_plugin_dir(void)
 
        if (!plugin_dir)
                plugin_dir = g_strconcat(w32_get_module_dir(),
-                                        "\\lib\\sylpheed-claws\\plugins\\",
+                                        "\\lib\\claws-mail\\plugins\\",
                                         NULL);
        return plugin_dir;
 #else
@@ -3120,7 +3120,7 @@ FILE *my_tmpfile(void)
        tmplen = strlen(tmpdir);
        progname = g_get_prgname();
        if (progname == NULL)
-               progname = "sylpheed-claws";
+               progname = "claws-mail";
        proglen = strlen(progname);
        Xalloca(fname, tmplen + 1 + proglen + sizeof(suffix),
                return tmpfile());

diff --git a/src/common/utils.h b/src/common/utils.h
index 7d68b7e6d777f177f10e65d01b54e6e437fe67ac..f90c06680cef1bf7c0b39f03a82b0fdd2b9bddeb 100644 (file)
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/version.h.in b/src/common/version.h.in
index 8fd1d20b4d0d674f7dd359cee519874de0f726b1..80e3fbdbda796829f53d41adcbaed22b5603e5cb 100644 (file)
--- a/src/common/version.h.in
+++ b/src/common/version.h.in
@@ -27,7 +27,7 @@
 
 #define PACKAGE                        "@PACKAGE@"
 #define VERSION                        "@VERSION@"
-#define PROG_VERSION           "Sylpheed-Claws "VERSION
+#define PROG_VERSION           "Claws Mail "VERSION
 #define VERSION_NUMERIC                MAKE_NUMERIC_VERSION(@MAJOR_VERSION@, @MINOR_VERSION@, \
                                                     @MICRO_VERSION@, @EXTRA_VERSION@)
 

diff --git a/src/common/xml.c b/src/common/xml.c
index 16dc3667dfce981137b8a71a7234f14bd9daf5f4..60b232335839218e48fb8a5ab4334eb153d1b620 100644 (file)
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/xml.h b/src/common/xml.h
index b48a39f5a8896e0b250b561cfa78f21563c0599c..32018a0b15dcdef344e3dcaa5015418f525f0bc2 100644 (file)
--- a/src/common/xml.h
+++ b/src/common/xml.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/common/xmlprops.c b/src/common/xmlprops.c
index ecceaf125d980ab141843502b1f83a02444409a5..e23ffa0fed65e1e850958e4fe98cbc8ad4c8eb01 100644 (file)
--- a/src/common/xmlprops.c
+++ b/src/common/xmlprops.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/common/xmlprops.h b/src/common/xmlprops.h
index 27d3b6c860dc23c10e0af581a2f1369e860ca16b..caecc208eb5949100223832d0b7095f19b8f65d7 100644 (file)
--- a/src/common/xmlprops.h
+++ b/src/common/xmlprops.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/compose.c b/src/compose.c
index ba7ffbfe0f3f8e5d7abd961834bcd5e738c86b7e..ea27703f85c41db2353333788ca0858501722e0f 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -7734,7 +7734,7 @@ static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)
        
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to send this email.")))
                return;
        

diff --git a/src/crash.c b/src/crash.c
index da6ad16c27491ecac5c9d69e6b64b8c6e5a62486..e4e9bf7f3264c4fc564c0aa29924c9eeebb328e1 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 by the Sylpheed Claws Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * 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
@@ -139,7 +139,7 @@ void crash_main(const char *arg)
        tokens = g_strsplit(arg, ",", 0);
 
        pid = atol(tokens[0]);
-       text = g_strdup_printf(_("Sylpheed-Claws process (%ld) received signal %ld"),
+       text = g_strdup_printf(_("Claws Mail process (%ld) received signal %ld"),
                               pid, atol(tokens[1]));
 
        output = g_string_new("");     
@@ -185,7 +185,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
 
        window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width(GTK_CONTAINER(window1), 5);
-       gtk_window_set_title(GTK_WINDOW(window1), _("Sylpheed-Claws has crashed"));
+       gtk_window_set_title(GTK_WINDOW(window1), _("Claws Mail has crashed"));
        gtk_window_set_position(GTK_WINDOW(window1), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window1), TRUE);
        gtk_window_set_default_size(GTK_WINDOW(window1), 460, 272);
@@ -223,7 +223,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), text1);
        
        crash_report = g_strdup_printf(
-               "Sylpheed-Claws version %s\n"
+               "Claws Mail version %s\n"
                "GTK+ version %d.%d.%d / GLib %d.%d.%d\n"
                "Locale: %s (charset: %s)\n"
                "Features:%s\n"
@@ -314,7 +314,7 @@ static void crash_save_crash_log(GtkButton *button, const gchar *text)
 }
 
 /*!
- *\brief       create bug report (goes to Sylpheed Claws bug tracker)  
+ *\brief       create bug report (goes to Claws Mail bug tracker)      
  */
 static void crash_create_bug_report(GtkButton *button, const gchar *data)
 {

diff --git a/src/crash.h b/src/crash.h
index 6929efb5eb2d4594318272641471ed03068ed79a..57e6ccc9d0c2e0078c4629595c91823951fd05c3 100644 (file)
--- a/src/crash.h
+++ b/src/crash.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 by the Sylpheed Claws Team and  Hiroyuki Yamamoto
+ * Copyright (C) 2002 by the Claws Mail Team and  Hiroyuki Yamamoto
  *
  * 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

diff --git a/src/customheader.c b/src/customheader.c
index 94b72ea39f8468449e112ebdfaef926de182d781..0f0b2ceae0e2b5b041c035e388743ff486a26f35 100644 (file)
--- a/src/customheader.c
+++ b/src/customheader.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/customheader.h b/src/customheader.h
index 7427257e89121e542ba098027021dc311eac4a18..4c51f5e197b3018052a9a6f2d30f8f02b51452b0 100644 (file)
--- a/src/customheader.h
+++ b/src/customheader.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/displayheader.c b/src/displayheader.c
index 7cd0b5e87639653454360363fceea08ac670c6ef..e844caf4b15b499b0d421514dc165834a1b94875 100644 (file)
--- a/src/displayheader.c
+++ b/src/displayheader.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/displayheader.h b/src/displayheader.h
index 4044360faf5f4169b2066d1ff6773113c1c0bf2a..07318a1e0a2d926e3f373b6f624b32ed784f3308 100644 (file)
--- a/src/displayheader.h
+++ b/src/displayheader.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/editaddress.c b/src/editaddress.c
index 53823a73f91a31cde3aa27d56a06d5533eac1e67..dc1abdc98327589876d0bae48530a274533b709f 100644 (file)
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/editaddress.h b/src/editaddress.h
index 921cab9c481d6d0ec4aed5e5523ec76b592c867b..eae95f4add21d7164b0dc754f87976ac611d0ccb 100644 (file)
--- a/src/editaddress.h
+++ b/src/editaddress.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/editbook.c b/src/editbook.c
index c60dc90c67dd900eccf7e5f872bb1a8987667e91..68ebde33d9e6b52fb15adf680dba87088005f3cc 100644 (file)
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editbook.h b/src/editbook.h
index 370cc409be45673e33a18b57a3bac8e38a6ccee8..53f8633ed156174653b7e258727fc9716131e0c2 100644 (file)
--- a/src/editbook.h
+++ b/src/editbook.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editgroup.c b/src/editgroup.c
index f97f71ce07df74980c509efac9beaf460dd5bb84..4fef960e50537ebaf66802f10609c3f6e520bfdc 100644 (file)
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/editgroup.h b/src/editgroup.h
index 1a0bd224adf67e7fc68ca7669435f0e16096fa73..59e2db8dffce236faa8803e00a178d6ecbcf886d 100644 (file)
--- a/src/editgroup.h
+++ b/src/editgroup.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editjpilot.c b/src/editjpilot.c
index c59f462a1297da1d316c2ea71397c0727ad8238b..a13614b3734083f0f5a174d0c20d8632c019e5c4 100644 (file)
--- a/src/editjpilot.c
+++ b/src/editjpilot.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editjpilot.h b/src/editjpilot.h
index 44c675b52799ffdad1a4f376ed78bf93571b3249..b96a2f98b23c2b07d0a8d55bf9d45222f3833cf7 100644 (file)
--- a/src/editjpilot.h
+++ b/src/editjpilot.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editldap.c b/src/editldap.c
index 3a424f3ce5c5e92e7117426b12241129e86ed955..7820e1a9abb80e36bc4eb272fc38494c03beb636 100644 (file)
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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
@@ -450,7 +450,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
                "\"ldap.mydomain.com\" may be appropriate for the " \
                "\"mydomain.com\" organization. An IP address may also be " \
                "used. You may specify \"localhost\" if running an LDAP " \
-               "server on the same computer as Sylpheed-Claws." ),
+               "server on the same computer as Claws Mail." ),
                NULL );
 
        /* Next row */

diff --git a/src/editldap.h b/src/editldap.h
index c1b6fb77dd11f9dc0cc9f3a643a9d07abcf0549f..4796815c294d85e11220d656ed6312a3ba745da8 100644 (file)
--- a/src/editldap.h
+++ b/src/editldap.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c
index 9bf5d12b14fa19b0e0623cfa909173bbe6c958d9..438a943892b8ed716f0c4be7f4a14c3fa9c72f8e 100644 (file)
--- a/src/editldap_basedn.c
+++ b/src/editldap_basedn.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editldap_basedn.h b/src/editldap_basedn.h
index a7a60e3c95a1ba383755d0ade6d09428744dda1d..0c5a7c508adc2719a829b48004d35acb75ec75ae 100644 (file)
--- a/src/editldap_basedn.h
+++ b/src/editldap_basedn.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editvcard.c b/src/editvcard.c
index 41fd60fe7aa397c8e89fdd8482542a8f2b0cf9e8..bafdd854cc019103ecbe63fb6cd7fa0e52bee851 100644 (file)
--- a/src/editvcard.c
+++ b/src/editvcard.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/editvcard.h b/src/editvcard.h
index f1d8b56831e6e395bcfce84c60dd8b289f5dc30a..e5793529e16af2b0e2f7e47a9b9d068eb7693952 100644 (file)
--- a/src/editvcard.h
+++ b/src/editvcard.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c
index 1b9beef518f03ce12528a23fc870338669a87876..3e5e39940ce1b54ff7905359470915f392153916 100644 (file)
--- a/src/exphtmldlg.c
+++ b/src/exphtmldlg.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/exphtmldlg.h b/src/exphtmldlg.h
index 5891059dd9a15acd491305eeb9a2404fde8307c2..65d57b328269fde6790de08a8fe215a7cacc7693 100644 (file)
--- a/src/exphtmldlg.h
+++ b/src/exphtmldlg.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/expldifdlg.c b/src/expldifdlg.c
index 606c4446180cb5098414200057b2c80265ae3ebb..48cc1b5196eec37c9e9114652721209c05baf946 100644 (file)
--- a/src/expldifdlg.c
+++ b/src/expldifdlg.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/expldifdlg.h b/src/expldifdlg.h
index d55ca391518f67fb116446c8d7a6079832b010cf..ea97e315e44d5794128901cd1ac05907d01f7126 100644 (file)
--- a/src/expldifdlg.h
+++ b/src/expldifdlg.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/export.c b/src/export.c
index c88f9e378ca18b640ede2c512f5817aa71c18c98..480fc1a798ff8e818ec307efa0f99e5649bdc753 100644 (file)
--- a/src/export.c
+++ b/src/export.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/exporthtml.c b/src/exporthtml.c
index 91273bdd33b81eec457c2b2df30ee0d3e12dcd69..f93cd6a3b364ea371c69db14988e603d2a0e543c 100644 (file)
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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
@@ -1007,7 +1007,7 @@ void exporthtml_process(
                return;
        }
 
-       title = _( "Sylpheed-Claws Address Book" );
+       title = _( "Claws Mail Address Book" );
        rootFolder = cache->rootFolder;
        dsName = cache->name;
 

diff --git a/src/exporthtml.h b/src/exporthtml.h
index e43323085895f5a779a85c129cf22469dc32b6f7..710c0c56853955a5a3bbba27b4f1ed012816eefe 100644 (file)
--- a/src/exporthtml.h
+++ b/src/exporthtml.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/exportldif.c b/src/exportldif.c
index c7203c38b743a1ef3c6e745d330a6b4041bc041d..c2bad7a901c548e5f9269cbeb7ad890d9db1ee13 100644 (file)
--- a/src/exportldif.c
+++ b/src/exportldif.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/exportldif.h b/src/exportldif.h
index 0eb65e3261e0ac29471ccb80c2c472fba9babaf9..8b44c75df4d5d129a1f427e40c33fec7d1b50a5b 100644 (file)
--- a/src/exportldif.h
+++ b/src/exportldif.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/filtering.c b/src/filtering.c
index 2b3282f18d2a7978941799a4ba8dc8a536688fb6..1c57c07969e331884381c7a221bd3985a01ce68e 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/filtering.h b/src/filtering.h
index be2a57b7dbd2e9412c303a4902e8dd532cf08a74..26e201cf98da9e386504931717c2a7d505396f8e 100644 (file)
--- a/src/filtering.h
+++ b/src/filtering.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/folder.c b/src/folder.c
index ae48c4f7edeff7fa550a952fac6fb745f2c2a6f3..3a990e4e83202b057544a4dcbe09d2424333cb41 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/folder.h b/src/folder.h
index d215af7049b4c3257d99ca489c82dfc9ab164742..ef22c49ec61c9579afc1603edbb6d650b883027e 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -2,7 +2,7 @@
 
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -584,7 +584,7 @@ struct _FolderClass
         */
        void            (*synchronise)          (FolderItem     *item);
        
-       /* Passed from sylpheed-claws --subscribe scheme://uri. Implementations
+       /* Passed from claws-mail --subscribe scheme://uri. Implementations
         * should check if they handle this type of URI, and return TRUE in this
         * case after having subscribed it.
         */

diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index 7caaa7e19b476edd90f753f2ada2ae0d7a941fbe..bd8e2006cc66f32020310bfa86824a1f49a3283c 100644 (file)
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
index 723afdfd90c8c887a4bb919398460fee6cfa1387..05f60f9fdc3d790e223db67b86f2aac3ba00559d 100644 (file)
--- a/src/folder_item_prefs.h
+++ b/src/folder_item_prefs.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/foldersel.c b/src/foldersel.c
index c7caffcda7d69ee60b00b1e1d13d75ea9ca4b748..c86ec214de460505ca63fca7d0a22fe50f647492 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -231,7 +231,7 @@ static void foldersel_create(void)
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_window_set_wmclass
-               (GTK_WINDOW(window), "folder_selection", "Sylpheed-Claws");
+               (GTK_WINDOW(window), "folder_selection", "Claws Mail");
        gtk_widget_realize(window);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);

diff --git a/src/foldersel.h b/src/foldersel.h
index c275f6612766ba3cc21d2efafadd46aa6630c8a9..8f0c7c4bbd52e24f3230a15f9436bfa8d4c1fe4e 100644 (file)
--- a/src/foldersel.h
+++ b/src/foldersel.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/folderutils.c b/src/folderutils.c
index efc8e58ed8d2bd42a4fb15688e00ee45b5a2a10b..60d86ce0c9c9b2316b547244ce969518a8903d95 100644 (file)
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2006 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 2004-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/folderutils.h b/src/folderutils.h
index 356b4e3f116b8ee42772a78b4a1193f4205cc716..250325a6f7ab5194544ff7c59e17117e59f11b37 100644 (file)
--- a/src/folderutils.h
+++ b/src/folderutils.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2006 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 2004-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/folderview.c b/src/folderview.c
index 1e207d52d41f4e196e6c2f0fab9ba7086193345c..6234b8f5762dc493bde4264ea10081acc3e6a5e5 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -306,7 +306,7 @@ static GtkItemFactoryEntry folder_view_queue_popup_entries[] = {
 
 GtkTargetEntry folderview_drag_types[] =
 {
-       {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
+       {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
        {"text/uri-list", 0, TARGET_MAIL_URI_LIST}
 };
 

diff --git a/src/folderview.h b/src/folderview.h
index 5b58cae902458761ff6df27427e7c99c093173d7..fce025b406afb9ea96c2d4995dfd0f9d71072392 100644 (file)
--- a/src/folderview.h
+++ b/src/folderview.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index 567473ff3287a061737042961bf5449ce70d2cf7..ec1df35abd485d1a3bf0c93af24ceed0f3bc5c7b 100644 (file)
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/grouplistdialog.h b/src/grouplistdialog.h
index a9d00040e05fb22e80c5a03ba4bb0772504869d1..4112e3f2b829a5c6794d5906f84eebf2b46f9f85 100644 (file)
--- a/src/grouplistdialog.h
+++ b/src/grouplistdialog.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/about.c b/src/gtk/about.c
index 44270347b56c241f0a1a2c8476e0d73bfdaffd13..2e2b4b0483e9e65c9b78d67c077ad9e57992402c 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -116,7 +116,7 @@ static void about_create(void)
        gint i;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title(GTK_WINDOW(window), _("About Sylpheed-Claws"));
+       gtk_window_set_title(GTK_WINDOW(window), _("About Claws Mail"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        gtk_widget_set_size_request(window, -1, -1);
@@ -132,7 +132,7 @@ static void about_create(void)
        table = gtk_table_new (1, 2, FALSE);
        gtk_box_pack_start(GTK_BOX(vbox1), table, FALSE, FALSE, 0);
 
-       image = stock_pixmap_widget(window, STOCK_PIXMAP_SYLPHEED_CLAWS_LOGO);
+       image = stock_pixmap_widget(window, STOCK_PIXMAP_CLAWS_MAIL_LOGO);
        gtk_table_attach(GTK_TABLE(table), image, 0, 1, 0, 1,
                         (GtkAttachOptions) (GTK_SHRINK),
                         (GtkAttachOptions) (GTK_SHRINK), 8, 0);
@@ -147,7 +147,7 @@ static void about_create(void)
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
        gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
        markup = g_markup_printf_escaped
-               ("<span weight=\"bold\" size=\"xx-large\">Sylpheed-Claws</span>\nversion %s",
+               ("<span weight=\"bold\" size=\"xx-large\">Claws Mail</span>\nversion %s",
                 VERSION);
        gtk_label_set_markup(GTK_LABEL(label), markup);
        g_free(markup);
@@ -238,7 +238,7 @@ static void about_create(void)
 
        label = gtk_label_new
                (_("Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-                "and the Sylpheed-Claws team"));
+                "and the Claws Mail team"));
        gtk_label_set_selectable(GTK_LABEL(label), TRUE);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
        gtk_table_attach(GTK_TABLE(table2), label, 0, 1, 0, 1,
@@ -280,16 +280,16 @@ static void about_create(void)
                                NULL);
 
        gtk_text_buffer_insert(buffer, &iter, _(
-                               "Sylpheed-Claws is a lightweight, fast and "
+                               "Claws Mail is a lightweight, fast and "
                                "highly-configurable email client.\n\n"
                                "For further information visit the Sylpheed-"
                                "Claws website:\n"), -1);
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, HOMEPAGE_URI, -1,
                                "link", NULL);
        gtk_text_buffer_insert(buffer, &iter, _("\n\n"
-                               "Sylpheed-Claws is free software released "
+                               "Claws Mail is free software released "
                                "under the GPL license. If you wish to donate "
-                               "to the Sylpheed-Claws project you can do "
+                               "to the Claws Mail project you can do "
                                "so at:\n"), -1);
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, DONATE_URI, -1,
                                "link", NULL);
@@ -332,7 +332,7 @@ static void about_create(void)
                                "underline", PANGO_UNDERLINE_SINGLE,
                                NULL);
 
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("The Sylpheed-Claws Team\n")), -1,
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("The Claws Mail Team\n")), -1,
                        "underlined-list-title", NULL);
 
        for (i = 0; TEAM_LIST[i] != NULL; i++) {

diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index d6ae64f4b68ef47ff4cf6708d5e2cee12236fffd..a2d652e17c46b61b53cf713f4fe8a7ead982d9f9 100644 (file)
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2001-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/gtk/colorlabel.h b/src/gtk/colorlabel.h
index 7fc796a00fc702b5d5b18ee8fa93cf8e79cd90d4..fc4f9da572c6b8d601c00f3d31c819a4e89fbb69 100644 (file)
--- a/src/gtk/colorlabel.h
+++ b/src/gtk/colorlabel.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2001 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/gtk/colorsel.c b/src/gtk/colorsel.c
index 736cf6203225991854d753078f925682b3251904..170535a2c26b98889faced90a2bf6f44b547575d 100644 (file)
--- a/src/gtk/colorsel.c
+++ b/src/gtk/colorsel.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2003-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/gtk/colorsel.h b/src/gtk/colorsel.h
index b6c921a5b2696eb7ab6cb91984ddab4a16763f8f..773f97915b8c3b3aec5e49e684aff13b5587f1b5 100644 (file)
--- a/src/gtk/colorsel.h
+++ b/src/gtk/colorsel.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2003-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/gtk/combobox.c b/src/gtk/combobox.c
index 91f32ae84f553b3414a552415a658a5ad51551cd..863ff6173e8814fb8f9803d0707bc084c0f2845e 100644 (file)
--- a/src/gtk/combobox.c
+++ b/src/gtk/combobox.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2006 Andrej Kacian and the Sylpheed-Claws team
+ * Copyright (C) 2006 Andrej Kacian and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/combobox.h b/src/gtk/combobox.h
index 198c6ce95a7cd040a8814ca197a9cc86ccf42bb3..13a7aa5475cdbfc450171fff9a1b219b37e8720e 100644 (file)
--- a/src/gtk/combobox.h
+++ b/src/gtk/combobox.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Andrej Kacian and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Andrej Kacian and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index 8b15ecf28e76a6ad670ae6d372e7887fa9e67458..5297d6c109adbe0ac9fe9bc280275dce9451d1a3 100644 (file)
--- a/src/gtk/description_window.c
+++ b/src/gtk/description_window.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/description_window.h b/src/gtk/description_window.h
index aeff4e41f4767d36577d50333a8c1ead1eb5b4e7..d08f25cf1cb2d7289f963a53a5af338ad31fb984 100644 (file)
--- a/src/gtk/description_window.h
+++ b/src/gtk/description_window.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c
index 8783b6b372b1db3863ca10e84716a24f8a4ef709..0fc86d6e00f1307dd1fec0ceaa1695652bbdfdbe 100644 (file)
--- a/src/gtk/filesel.c
+++ b/src/gtk/filesel.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/filesel.h b/src/gtk/filesel.h
index 2b56e4f70094b1113ed66c69f21c1e3a492a6b98..2f8bf705688384403bfd2238421a5cbdc3d78997 100644 (file)
--- a/src/gtk/filesel.h
+++ b/src/gtk/filesel.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index 2d1083bd9529a0d5de847f356dfa012c2fc96340..5e989de013ae590db9cd550e38a3a1fbb353f7bf 100644 (file)
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/gtk/foldersort.h b/src/gtk/foldersort.h
index 617d8829cd1c2f2f3fd8360816f8b9b2efbbead8..4502037c45d6e902c38a35af677f94b10c2ba34e 100644 (file)
--- a/src/gtk/foldersort.h
+++ b/src/gtk/foldersort.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index b71707f2433441ef7273fbb73c6fcc04f12daf51..136540a095346e3f6f91330bf20953190f74f082 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -19,7 +19,7 @@
 /*
  * Stuphead: (C) 2000,2001 Grigroy Bakunov, Sergey Pinaev
  * Adapted for Sylpheed (Claws) (c) 2001-2002 by Hiroyuki Yamamoto & 
- * The Sylpheed Claws Team.
+ * The Claws Mail Team.
  * Adapted for pspell (c) 2001-2002 Melvin Hadasht
  * Adapted for GNU/aspell (c) 2002 Melvin Hadasht
  */
@@ -1066,7 +1066,7 @@ static gboolean check_at(GtkAspell *gtkaspell, gint from_pos)
                return FALSE;
 
        if (misspelled_test(gtkaspell, buf)
-       && strcasecmp((char *)buf, "sylpheed") && strcasecmp((char *)buf, "sylpheed-claws")) {
+       && strcasecmp((char *)buf, "sylpheed") && strcasecmp((char *)buf, "claws-mail")) {
                strncpy(gtkaspell->theword, (gchar *)buf, GTKASPELLWORDSIZE - 1);
                gtkaspell->theword[GTKASPELLWORDSIZE - 1] = 0;
                gtkaspell->start_pos  = start;

diff --git a/src/gtk/gtkaspell.h b/src/gtk/gtkaspell.h
index e92e9a457bf8a5fe56303acde5c3e2cc7dc400fa..1784af32c5b32f394f39b82aecc2be8eb6f2d10f 100644 (file)
--- a/src/gtk/gtkaspell.h
+++ b/src/gtk/gtkaspell.h
@@ -20,7 +20,7 @@
  */
 
 /*
- * Adapted by the Sylpheed Claws Team.
+ * Adapted by the Claws Mail Team.
  */
 
 /*

diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index ac2100d4d75366e1ae8957ce1b9c5ce6fda48253..4259e24ed998a22261b028e97f020c1bf6c6ddf7 100644 (file)
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -1,7 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  * Parts of this file:
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * Parts of this file from gtk/gtkctree.c and gtk/gtkclist.c:
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald, 

diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
index 03b54c6d5b3dd221235b3555241a71d2749151c9..1cfe0b0393b4afb8798bbc10a3d1d9de107c2a2c 100644 (file)
--- a/src/gtk/gtkshruler.c
+++ b/src/gtk/gtkshruler.c
@@ -1,6 +1,6 @@
 /* GtkSHRuler
  *
- *  Copyright (C) 2000-2005 Alfons Hoogervorst & The Sylpheed Claws Team
+ *  Copyright (C) 2000-2005 Alfons Hoogervorst & The Claws Mail Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/src/gtk/gtkshruler.h b/src/gtk/gtkshruler.h
index bf7e0cde5002fd60c3756088f890a5d65fec33aa..b1b69088eea1d25d4cc723ffea0b70803b58020d 100644 (file)
--- a/src/gtk/gtkshruler.h
+++ b/src/gtk/gtkshruler.h
@@ -1,5 +1,5 @@
 /* GTKSHRuler
- * Copyright (C) 2000-2004 Alfons Hoogervorst & The Sylpheed Claws Team
+ * Copyright (C) 2000-2004 Alfons Hoogervorst & The Claws Mail Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index ebb84483f1002c3ea81253c81812cb1a47706ea7..1ddd84ea5eadfe5a95a9dbb3f4143d3bfcb47e33 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -791,7 +791,7 @@ void gtkut_widget_init(void)
 
 void gtkut_widget_set_app_icon(GtkWidget *widget)
 {
-#include "pixmaps/sylpheed-claws.xpm"
+#include "pixmaps/claws-mail.xpm"
        static GdkPixmap *sylpheedclawsxpm;
        static GdkBitmap *sylpheedclawsxpmmask;
        
@@ -799,7 +799,7 @@ void gtkut_widget_set_app_icon(GtkWidget *widget)
        g_return_if_fail(widget->window != NULL);
        if (!sylpheedclawsxpm) {
                PIXMAP_CREATE(widget, sylpheedclawsxpm, sylpheedclawsxpmmask,
-                             sylpheed_claws_xpm);
+                             claws_mail_xpm);
        }               
        gdk_window_set_icon(widget->window, NULL, sylpheedclawsxpm, sylpheedclawsxpmmask);
 }

diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 54bcdefb738c161007775dfb84e9190983f14ece..c21caeb1c6df9b54cb3c192e05556eabc5549419 100644 (file)
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index 92f279a19803b90f6f29508d5ee79d218228e3a5..c74cb656965ab078d52bcb66e3b4b50fae30b776 100644 (file)
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -1,6 +1,6 @@
 /*
  * This file Copyright (C) 2005 Paul Mangan <claws@thewildbeast.co.uk>
- * and the Sylpheed-Claws team
+ * and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/icon_legend.h b/src/gtk/icon_legend.h
index cf1d3a664a5776ed169e072a7622eb3a1a46824b..250056a45918b26a869e9d5d0a861c5bfc472f9c 100644 (file)
--- a/src/gtk/icon_legend.h
+++ b/src/gtk/icon_legend.h
@@ -1,7 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  * This file Copyright (C) 2005 Paul Mangan <claws@thewildbeast.co.uk>
- * and the Sylpheed-Claws team
+ * and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index 88b89faf2f8b7ceb9dfb2a0f98a9c47b0be9e424..cc4a3b63c18070af270a7b0991b654916b32d745 100644 (file)
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/logwindow.h b/src/gtk/logwindow.h
index a5ef8dd31197dd60dce45d8aade29cf4afd67c72..d0cdfdd9307ccfb3bfcdec0115501a865fd7e382 100644 (file)
--- a/src/gtk/logwindow.h
+++ b/src/gtk/logwindow.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/manage_window.c b/src/gtk/manage_window.c
index 1782a936425074d36b0fea9275dbb7c152650208..67a795d5bf1c1a1e097e03bc81bc3b4d8b994a6c 100644 (file)
--- a/src/gtk/manage_window.c
+++ b/src/gtk/manage_window.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/manage_window.h b/src/gtk/manage_window.h
index b4a96053e8d90a84ae960cc6dc2d938160cbb73f..19a87692e7de1677091a9696a68aa00d4ecc2b85 100644 (file)
--- a/src/gtk/manage_window.h
+++ b/src/gtk/manage_window.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 19e57b90d40d7f58b840f07a30a42b8ea0b2173d..ab0b32948b1538ad1594b81049d04f18b7187985 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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
@@ -334,7 +334,7 @@ void pluginwindow_create()
        gtk_container_add(GTK_CONTAINER(scrolledwindow3), plugin_desc);
 
        desc_lbl = gtk_label_new(_("More plugins are available from the "
-                                  "Sylpheed-Claws website."));
+                                  "Claws Mail website."));
        gtk_misc_set_alignment(GTK_MISC(desc_lbl), 0, 0.5);
        gtk_widget_show(desc_lbl);
        gtk_box_pack_start(GTK_BOX(vbox1), desc_lbl, FALSE, FALSE, 0);

diff --git a/src/gtk/pluginwindow.h b/src/gtk/pluginwindow.h
index 430aaab18286b04c670cfa20394e39eb9361b8a6..55fe64e17192e4dab31e9b6e26778e51a2305daf 100644 (file)
--- a/src/gtk/pluginwindow.h
+++ b/src/gtk/pluginwindow.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 8bbabdc6cf39b05828076fd89b10f339920b05a6..835d8cfb177a4ff32b6c5d1e4fdf0189455eb279 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h
index 6b67fd823e438256aac8e4af4e2c0188fcdebe5d..be0d2f402b7f1843f978b4a9ecbdb4a100b24e45 100644 (file)
--- a/src/gtk/prefswindow.h
+++ b/src/gtk/prefswindow.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 3cebc7b953166d2e605f3a08429e055ca0e62b3f..ecf9c290b584e79af768a8203061d4658a94f588 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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

diff --git a/src/gtk/quicksearch.h b/src/gtk/quicksearch.h
index 55679b62a4977131aa063ff20060a4848c82dbce..9aadd869df95c1a7f7d09e28b528317e3e225d7c 100644 (file)
--- a/src/gtk/quicksearch.h
+++ b/src/gtk/quicksearch.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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

diff --git a/src/html.c b/src/html.c
index fdb5109a5b5496cce83883091857d340d3005466..4551c7a2d03e88789d32e4b76c874b7e6702ba00 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/html.h b/src/html.h
index afe62bdf70585e04127bd8d507409671d9f11e73..26b82a18b261af680628279e7aab6afd4ac7c345 100644 (file)
--- a/src/html.h
+++ b/src/html.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/image_viewer.c b/src/image_viewer.c
index 91d86a248f52b3594a78f73520a9318cdd4e82d6..3d3d71f4f5a4c34b605a94072e17131b5342f4db 100644 (file)
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/image_viewer.h b/src/image_viewer.h
index 22eefc01ee0b5c2c3c43cbc8f15f14e500447770..e1835017b623aa91d5d483c524e3cef866ee17fa 100644 (file)
--- a/src/image_viewer.h
+++ b/src/image_viewer.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/imap.c b/src/imap.c
index edacb29a0d0ad1acb42a9d4054f34f02dafa9e77..710b0780af7b811dbe8047233a0947c1ad6ddfe7 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -703,7 +703,7 @@ static IMAPSession *imap_session_get(Folder *folder)
        
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to access the IMAP server."))) {
                return NULL;
        }
@@ -780,7 +780,7 @@ static IMAPSession *imap_session_new(Folder * folder,
                if (alertpanel_full(_("Insecure connection"),
                        _("This connection is configured to be secured "
                          "using SSL, but SSL is not available in this "
-                         "build of Sylpheed-Claws. \n\n"
+                         "build of Claws Mail. \n\n"
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
@@ -2219,7 +2219,7 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
                
                if (prefs_common.work_offline && 
                    !inc_offline_should_override(
-                       _("Sylpheed-Claws needs network access in order "
+                       _("Claws Mail needs network access in order "
                          "to access the IMAP server."))) {
                        g_free(data);
                        return NULL;
@@ -2563,7 +2563,7 @@ static gint imap_cmd_login(IMAPSession *session,
                        }
 #else          
                        log_error(_("Connection to %s failed: "
-                                       "server requires TLS, but Sylpheed-Claws "
+                                       "server requires TLS, but Claws Mail "
                                        "has been compiled without OpenSSL "
                                        "support.\n"),
                                        SESSION(session)->server);
@@ -2743,7 +2743,7 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
 
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to access the IMAP server."))) {
                g_free(data);
                return -1;
@@ -2828,7 +2828,7 @@ static gint imap_cmd_expunge(IMAPSession *session)
        
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to access the IMAP server."))) {
                return -1;
        }
@@ -3162,7 +3162,7 @@ static gint get_list_of_uids(IMAPSession *session, Folder *folder, IMAPFolderIte
        data->session = session;
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to access the IMAP server."))) {
                g_free(data);
                return -1;
@@ -3917,7 +3917,7 @@ static gint imap_get_flags(Folder *folder, FolderItem *item,
        
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to access the IMAP server."))) {
                g_free(data);
                return -1;
@@ -4381,12 +4381,12 @@ static Folder   *imap_folder_new        (const gchar    *name,
                alertpanel_error(
                        _("You have one or more IMAP accounts "
                          "defined. However this version of "
-                         "Sylpheed-Claws has been built without "
+                         "Claws Mail has been built without "
                          "IMAP support; your IMAP account(s) are "
                          "disabled.\n\n"
                          "You probably need to "
                          "install libetpan and recompile "
-                         "Sylpheed-Claws."));
+                         "Claws Mail."));
        }
        return NULL;
 }

diff --git a/src/imap.h b/src/imap.h
index d64b8ede15a05dd8614f24ede9816adfb8b7048b..47f2f50ec7889e1ed0c1c18a009c2c93ad9d4cac 100644 (file)
--- a/src/imap.h
+++ b/src/imap.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 3538fc09954fdb09cb1d054d59d12b9e80df6b1e..33986aa231cb53b517e0e141273c1f9042106dd0 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * 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

diff --git a/src/imap_gtk.h b/src/imap_gtk.h
index 9ff39e4bd3aacfd597b55f5496909858200d689f..507e9a57f8a69b426eb4a977fd3ceb2a5d475034 100644 (file)
--- a/src/imap_gtk.h
+++ b/src/imap_gtk.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * 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

diff --git a/src/import.c b/src/import.c
index f894aea9a515c38f443144ea33ca28e89f0ab98f..8edb255cd320f16f58e039f4107314aaea18d092 100644 (file)
--- a/src/import.c
+++ b/src/import.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/import.h b/src/import.h
index 4d77af87a61bae415d4c59d55a32e8e25885aae1..f16946075e56c28266a32db0787020e4513a7d1a 100644 (file)
--- a/src/import.h
+++ b/src/import.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/importldif.c b/src/importldif.c
index 7b965558fb90bf87d5ce162c0211e7adfca44401..a4af9edb61c981a43c1064f27e0a3859ffdccacf 100644 (file)
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/importldif.h b/src/importldif.h
index 11f1fe2ece6a5e29799459f5a8c491e0d6bbf108..2d7bb1c62f837100fb2c7256095e0aec9b466a48 100644 (file)
--- a/src/importldif.h
+++ b/src/importldif.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/importmutt.c b/src/importmutt.c
index 39b4a54cb677fee39961e21e725a40ee390478ac..5e72374c9ac9d0f27dfc287fe1d2dfbde43670b6 100644 (file)
--- a/src/importmutt.c
+++ b/src/importmutt.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/importmutt.h b/src/importmutt.h
index 5be36dfaff4f1a0579a4bbfe2a30efd2be470155..6a1a7e1f8273f7c600e7328cf39a6f2728019854 100644 (file)
--- a/src/importmutt.h
+++ b/src/importmutt.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/importpine.c b/src/importpine.c
index 1b577b125c4f12ac35dfb606c2b42ecb2ecde4d6..86d5e17d224f6c5b269555c61ca89867fda778cf 100644 (file)
--- a/src/importpine.c
+++ b/src/importpine.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/importpine.h b/src/importpine.h
index 59ddc9d1cffadf74135d6d8d4dc279c4bd520f66..101334c01444f1bbe9e42cc8942e6cd89df14ca4 100644 (file)
--- a/src/importpine.h
+++ b/src/importpine.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/inc.c b/src/inc.c
index 7ad4fa480261815ef7f1f471b2696a3ea22b9f67..4c7e0a15be495f76ccb81807f6939fa9d128e42a 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -170,7 +170,7 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
 
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to get mails.")))
                return;
 
@@ -275,7 +275,7 @@ gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account)
 
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to get mails.")))
                return 0;
 
@@ -301,7 +301,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
        
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to get mails.")))
                return;
 
@@ -770,7 +770,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                if (alertpanel_full(_("Insecure connection"),
                        _("This connection is configured to be secured "
                          "using SSL, but SSL is not available in this "
-                         "build of Sylpheed-Claws. \n\n"
+                         "build of Claws Mail. \n\n"
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),

diff --git a/src/inc.h b/src/inc.h
index e9a5e19736fdb57e914fa2ad6248913700677df7..f7f9a8f5cb06d07d8e165e45047d1b14cc7cb056 100644 (file)
--- a/src/inc.h
+++ b/src/inc.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/jpilot.c b/src/jpilot.c
index f3d43142a9b39c32ace2a436fed2106c338a1895..667fda5aaf6956c2282850c9f4d493716e554267 100644 (file)
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/jpilot.h b/src/jpilot.h
index f8e00a34743d18046971548fb866e5d7b8f89aad..1eea158192624bc77eb927d59bd45ea0b19516b7 100644 (file)
--- a/src/jpilot.h
+++ b/src/jpilot.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index 5cfb0abe22a0dc7b4fb53842d1d8a4cd23649f61..5abce34decf3122b4f28a3d5344371753afc0c63 100644 (file)
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldapctrl.h b/src/ldapctrl.h
index 160bf50d238e87663c26d0cfa4513cda7812b348..17661124449341543f696353ad01244f3138ba88 100644 (file)
--- a/src/ldapctrl.h
+++ b/src/ldapctrl.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldaplocate.c b/src/ldaplocate.c
index bac04337d5e926fa46ee5601938c01c340834971..4881c4c9eabdf233cb94cab18309257a6bed2234 100644 (file)
--- a/src/ldaplocate.c
+++ b/src/ldaplocate.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldaplocate.h b/src/ldaplocate.h
index 427fcbcf1e815ca5b54d3ba36a72ccf8145e85b3..eccb62d5b4f925e5d20d4b9e7665048768a4c604 100644 (file)
--- a/src/ldaplocate.h
+++ b/src/ldaplocate.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldapquery.c b/src/ldapquery.c
index 34cf00b3d80d06801ec4a7caa7814c1c1748f7c9..6cf03afeb1b35dd66c1e44e6b51a3bcf53eef82c 100644 (file)
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldapquery.h b/src/ldapquery.h
index 3392edb8857573687a94bfba1b7d8d11eec0214a..c637d8298b8f1ac97f1bdd3f6ab69cdde78b7831 100644 (file)
--- a/src/ldapquery.h
+++ b/src/ldapquery.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldapserver.c b/src/ldapserver.c
index 79b8b1517b9d24d1d6c5a68d0271b1b1d2843e60..7cd8facd4443c4ca00433ca7266cd2a4fde543a7 100644 (file)
--- a/src/ldapserver.c
+++ b/src/ldapserver.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldapserver.h b/src/ldapserver.h
index 312c16047f54f2b6833b9c1aec938f24b6d97c71..0b2c661bbcad30d97cf6e752d9329d9960d9435c 100644 (file)
--- a/src/ldapserver.h
+++ b/src/ldapserver.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldaputil.c b/src/ldaputil.c
index e022b375550320482a7e293130065f869cd3ebbd..55643fe958f8a146dc5bb2b5aaf44cd607ae1e3b 100644 (file)
--- a/src/ldaputil.c
+++ b/src/ldaputil.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldaputil.h b/src/ldaputil.h
index e076155cc9c61a2deef99c90f21e9e9eeb5ecfc5..519741fe3c65192109db3826c69008bb87a8be2e 100644 (file)
--- a/src/ldaputil.h
+++ b/src/ldaputil.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldif.c b/src/ldif.c
index d107d88dc275c81672e66932a64dde46a7497962..e62eeda0249ed28e0cc491e70ccd62c11141890e 100644 (file)
--- a/src/ldif.c
+++ b/src/ldif.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/ldif.h b/src/ldif.h
index dc4f8c66c6e54d58f323cf644010246bdf76cb18..8ef1971a702a307bc10566864798c4e8135a8017 100644 (file)
--- a/src/ldif.h
+++ b/src/ldif.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/localfolder.c b/src/localfolder.c
index 1b39e97b3de740931787ea8f9087ae45cbd4c6e0..01b602fc37dfb51282012fdfa3bc3c6d992e30a5 100644 (file)
--- a/src/localfolder.c
+++ b/src/localfolder.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 by the Sylpheed Claws Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * 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

diff --git a/src/localfolder.h b/src/localfolder.h
index 23adb2d95a876fd44381cea9c29d42ee6da30d9f..d372d7e1a28df9fa5b8e3986d1872064aa63245d 100644 (file)
--- a/src/localfolder.h
+++ b/src/localfolder.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 by the Sylpheed Claws Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * 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

diff --git a/src/main.c b/src/main.c
index 007c40508af123372589ec4d9b434a8b07059240..f99cfa74fc838e7cf1df7c9443a6a11d017dc236 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -265,12 +265,10 @@ static gboolean defer_jump(void *data)
        return FALSE;
 }
 
-static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir)
+static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir, const gchar *oldversion)
 {
-       gchar *message = g_strdup_printf(_("Configuration for Sylpheed-Claws %s found.\n"
-                        "Do you want to migrate this configuration?"),
-                        !strcmp(old_cfg_dir, OLD_GTK1_RC_DIR)?
-                               _("1.0.5 or previous"):_("1.9.15 or previous"));
+       gchar *message = g_strdup_printf(_("Configuration for %s (or previous) found.\n"
+                        "Do you want to migrate this configuration?"), oldversion);
        gint r = 0;
        GtkWidget *window = NULL;
        if (alertpanel(_("Migration of configuration"),
@@ -507,7 +505,7 @@ int main(int argc, char *argv[])
        }
 
        if (cmd.status || cmd.status_full) {
-               puts("0 Sylpheed-Claws not running.");
+               puts("0 Claws Mail not running.");
                lock_socket_remove();
                return 0;
        }
@@ -532,20 +530,20 @@ int main(int argc, char *argv[])
        /* check that we're not on a too recent/old gtk+ */
 #if GTK_CHECK_VERSION(2, 9, 0)
        if (gtk_check_version(2, 9, 0) != NULL) {
-               alertpanel_error(_("Sylpheed-Claws has been compiled with "
+               alertpanel_error(_("Claws Mail has been compiled with "
                                   "a more recent GTK+ library than is "
                                   "currently available. This will cause "
                                   "crashes. You need to upgrade GTK+ or "
-                                  "recompile Sylpheed-Claws."));
+                                  "recompile Claws Mail."));
                exit(1);
        }
 #else
        if (gtk_check_version(2, 9, 0) == NULL) {
-               alertpanel_error(_("Sylpheed-Claws has been compiled with "
+               alertpanel_error(_("Claws Mail has been compiled with "
                                   "an older GTK+ library than is "
                                   "currently available. This will cause "
                                   "crashes. You need to recompile "
-                                  "Sylpheed-Claws."));
+                                  "Claws Mail."));
                exit(1);
        }
 #endif 
@@ -564,9 +562,11 @@ int main(int argc, char *argv[])
                prefs_destroy_cache();
                gboolean r = FALSE;
                if (is_dir_exist(OLD_GTK2_RC_DIR))
-                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR);
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0"));
+               else if (is_dir_exist(OLDER_GTK2_RC_DIR))
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15"));
                else if (is_dir_exist(OLD_GTK1_RC_DIR))
-                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR);
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5"));
                if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0)
                        exit(1);
        }
@@ -638,7 +638,7 @@ int main(int argc, char *argv[])
        renderer_read_config();
 
        gtkut_widget_init();
-       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_CLAWS_ICON, &icon);
+       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
        gtk_window_set_default_icon(icon);
 
        folderview_initialize();
@@ -705,7 +705,7 @@ int main(int argc, char *argv[])
        /* if Sylpheed crashed, rebuild caches */
        if (!cmd.crash && crash_file_present) {
                GTK_EVENTS_FLUSH();
-               debug_print("Sylpheed-Claws crashed, checking for new messages in local folders\n");
+               debug_print("Claws Mail crashed, checking for new messages in local folders\n");
                folder_item_update_thaw();
                folderview_check_new(NULL);
                folder_clean_cache_memory_force();
@@ -762,7 +762,7 @@ int main(int argc, char *argv[])
        if (!folder_have_mailbox()) {
                prefs_destroy_cache();
                main_window_cursor_normal(mainwin);
-               alertpanel_error(_("Sylpheed-Claws has detected a configured "
+               alertpanel_error(_("Claws Mail has detected a configured "
                                   "mailbox, but could not load it. It is "
                                   "probably provided by an out-of-date "
                                   "external plugin. Please reinstall the "
@@ -971,7 +971,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
                } else if (!strncmp(argv[i], "--version", 9)) {
-                       puts("Sylpheed-Claws version " VERSION);
+                       puts("Claws Mail version " VERSION);
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
                        const gchar *p = argv[i + 1];
@@ -1022,7 +1022,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                                          "                         folder is a folder id like '#mh/Mailbox/inbox'"));
                        g_print("%s\n", _("  --online               switch to online mode"));
                        g_print("%s\n", _("  --offline              switch to offline mode"));
-                       g_print("%s\n", _("  --exit                 exit Sylpheed-Claws"));
+                       g_print("%s\n", _("  --exit                 exit Claws Mail"));
                        g_print("%s\n", _("  --debug                debug mode"));
                        g_print("%s\n", _("  --help                 display this help and exit"));
                        g_print("%s\n", _("  --version              output version information and exit"));
@@ -1208,7 +1208,7 @@ gchar *get_socket_name(void)
        static gchar *filename = NULL;
 
        if (filename == NULL) {
-               filename = g_strdup_printf("%s%csylpheed-claws-%d",
+               filename = g_strdup_printf("%s%cclaws-mail-%d",
                                           g_get_tmp_dir(), G_DIR_SEPARATOR,
 #if HAVE_GETUID
                                           getuid());
@@ -1225,7 +1225,7 @@ static gchar *get_crashfile_name(void)
        static gchar *filename = NULL;
 
        if (filename == NULL) {
-               filename = g_strdup_printf("%s%csylpheed-crashed",
+               filename = g_strdup_printf("%s%cclaws-crashed",
                                           get_tmp_dir(), G_DIR_SEPARATOR);
        }
 
@@ -1246,7 +1246,7 @@ static gint prohibit_duplicate_launch(void)
 
        /* remote command mode */
 
-       debug_print("another Sylpheed-Claws instance is already running.\n");
+       debug_print("another Claws Mail instance is already running.\n");
 
        if (cmd.receive_all) {
                fd_write_all(uxsock, "receive_all\n", 12);

diff --git a/src/main.h b/src/main.h
index e4fe57d434a000254b60d64eb6de91965d27ede5..649536375398dfe3fef76738c411f5dee2e8023d 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 68729feeef99bdfd2cefbd69f4863fd014908574..6963422ef65c3f4238871d7d687f50838dbe5fa5 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -2693,7 +2693,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                
                folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
                gtk_window_set_title(GTK_WINDOW(folderwin),
-                                    _("Sylpheed-Claws - Folder View"));
+                                    _("Claws Mail - Folder View"));
 
                gtk_window_move(GTK_WINDOW(folderwin),
                                prefs_common.folderwin_x,
@@ -2729,7 +2729,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                
                messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
                gtk_window_set_title(GTK_WINDOW(messagewin),
-                                    _("Sylpheed-Claws - Message View"));
+                                    _("Claws Mail - Message View"));
                                     
                gtk_window_move(GTK_WINDOW(messagewin), 
                                prefs_common.main_msgwin_x,
@@ -3120,7 +3120,7 @@ static void print_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        if (prefs_common.confirm_on_exit) {
-               if (alertpanel(_("Exit"), _("Exit Sylpheed-Claws?"),
+               if (alertpanel(_("Exit"), _("Exit Claws Mail?"),
                               GTK_STOCK_CANCEL, GTK_STOCK_QUIT,  NULL)
                    != G_ALERTALTERNATE)
                        return;

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7a7635eb3a4adf2b2576c77836efc447059a6cda..2b592ae8b0c6aede15072761f1831b2e94ab1161 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/manual.c b/src/manual.c
index a9ce3fc8781badd273b34148f0118117604e291b..9665df86ad7fc1657e70aabf14da846f0b929b0a 100644 (file)
--- a/src/manual.c
+++ b/src/manual.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/manual.h b/src/manual.h
index e03d7152e9794a4bcf4de6a3549ee5d0808ae5e5..edcc0c01f2b0fabc95276ea4531f3aac65859948 100644 (file)
--- a/src/manual.h
+++ b/src/manual.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/matcher.c b/src/matcher.c
index f6d4c2415f216d7643e9385054fec4008ac64994..2fd2537f60b20912ea97460b70c555c6d084b367 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2004 by the Sylpheed Claws Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002-2004 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * 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

diff --git a/src/matcher.h b/src/matcher.h
index f0f407bf278e2ae4af7434b61648ca839029ba6b..8b3f1ce984a24b80999f03dc29f3faccd28e2ead 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 by the Sylpheed Claws Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * 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

diff --git a/src/matcher_parser.h b/src/matcher_parser.h
index eb41091eff1ca0a480a747dae99205d240693c8f..9fd0832a39d32d9acb67251368b5ae282f63bba8 100644 (file)
--- a/src/matcher_parser.h
+++ b/src/matcher_parser.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (c) 2001-2002 by Hiroyuki Yamamoto & The Sylpheed Claws Team.
+ * Copyright (c) 2001-2002 by Hiroyuki Yamamoto & The Claws Mail Team.
  *
  * 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

diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index ef12ca921bba5869db16ff8487eaa16fcdf095b8..36ac474ef67758fa3fa4957ade2e4033dd12142f 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -1,7 +1,7 @@
 %{
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (c) 2001-2002 by Hiroyuki Yamamoto & The Sylpheed Claws Team.
+ * Copyright (c) 2001-2002 by Hiroyuki Yamamoto & The Claws Mail Team.
  *
  * 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

diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index 4721ed40fd9bb2221b3f5cef85d493d3e87c191a..e8fd7b5a715189d79b4c08e3a5f0dfad9ddd3f0c 100644 (file)
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -3,7 +3,7 @@
 
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (c) 2001-2002 by Hiroyuki Yamamoto & The Sylpheed Claws Team.
+ * Copyright (c) 2001-2002 by Hiroyuki Yamamoto & The Claws Mail Team.
  *
  * 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

diff --git a/src/mbox.c b/src/mbox.c
index dd7ea090b2d0cb376e1a16730bfd0ac200161fd6..973210417672e6c401040c2c32402aafe16ab82c 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/mbox.h b/src/mbox.h
index ca07f05a12fd182963f5513895025158c756fdb8..a2e31485043ecaa3f68759b48c3c8b73523cab08 100644 (file)
--- a/src/mbox.h
+++ b/src/mbox.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999,2000 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/message_search.c b/src/message_search.c
index e4d31f13f67132e50e312fffa390fc680de94ae3..e7fe58a0af281d2957ac1efd5a18600cbd3cf17a 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/message_search.h b/src/message_search.h
index 733f03987a9cbb54ada9cc6b063d6a0e5b335be4..0d5f142610886594688bfe0ddff1e2fc357438a6 100644 (file)
--- a/src/message_search.h
+++ b/src/message_search.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/messageview.c b/src/messageview.c
index 7f6dd62c368206207af0113a85bba0bdbf5ad23d..b7007706d7d1cdf6c4d33a4cf5af4a4d3f3595cf 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -446,7 +446,7 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw
        static GdkGeometry geometry;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed-Claws - Message View"));
+       gtk_window_set_title(GTK_WINDOW(window), _("Claws Mail - Message View"));
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
        if (!geometry.min_height) {
@@ -715,7 +715,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to send this email.")))
                return 0;
 
@@ -852,7 +852,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        
        if (messageview->window)
                gtk_window_set_title(GTK_WINDOW(messageview->window), 
-                               _("Sylpheed-Claws - Message View"));
+                               _("Claws Mail - Message View"));
        if (messageview->window && msginfo->subject) {
                subject = g_strdup(msginfo->subject);
                if (!g_utf8_validate(subject, -1, NULL)) {

diff --git a/src/messageview.h b/src/messageview.h
index b1b1e5b4f92837ac461918fcbb6472f5d21177b3..1edac29f327d0ce19483f4e8cee1cdba3ebaaabb 100644 (file)
--- a/src/messageview.h
+++ b/src/messageview.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/mh.c b/src/mh.c
index eda7ab98295e40c65f99eabf8da25a0276971776..ee49241b4737708eecc8b579da99336f4c208b95 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/mh.h b/src/mh.h
index 90424f16815610117f679b56f2068c99bbd09306..2763f9de237990e82326b597bc7a31c5e1a377c8 100644 (file)
--- a/src/mh.h
+++ b/src/mh.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index b8444d026edf0ca79c0fa795f2895f5a2789afb3..bc0fb1e80453d84427080e344ff5f59733f4a536 100644 (file)
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * 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

diff --git a/src/mh_gtk.h b/src/mh_gtk.h
index 61ffa531c49dbe587ec60c5952befbfbac30c586..d67283cc24d5864e397e7c388c12fc359e12e149 100644 (file)
--- a/src/mh_gtk.h
+++ b/src/mh_gtk.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * 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

diff --git a/src/mimeview.c b/src/mimeview.c
index 5ce0421a90285ab270a0f9b4b3eef521db8a497f..42f4a919dfbc87461415446b7459d3a78c4ece48 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/mimeview.h b/src/mimeview.h
index 2e260b8779ce535f2fdd27f3c79727b1222e5cb7..5ea5a3241ac57b27ee9e4ae7518707ab8404ce4e 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/msgcache.c b/src/msgcache.c
index 8096d552268dc8fd0fef408693b89b9a4709952c..aa26030b34260cdd025b41305027886cb87d96e1 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/msgcache.h b/src/msgcache.h
index 5e9d7e921fd975372cc86b0709a069e54b68bd8c..c7d2ec26c1626df79b96c1a424e6e68de74f1125 100644 (file)
--- a/src/msgcache.h
+++ b/src/msgcache.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/mutt.c b/src/mutt.c
index 00f392b34049523bf2f2375e0f73e0778a7cb373..adab49d7242b70765b29bd906a56c36962f76b22 100644 (file)
--- a/src/mutt.c
+++ b/src/mutt.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/mutt.h b/src/mutt.h
index f1e2ad62e664f5e86614b42b98fa4d06f166506c..33ad83ddcf5d225b6d1f017248b3048b6b93e9fe 100644 (file)
--- a/src/mutt.h
+++ b/src/mutt.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2001-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/news.c b/src/news.c
index 889fb71752fe5934b154e29044eef7e407b3a587..aa54544e107243718643d35c8d0453e27157eb18 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -295,7 +295,7 @@ static Session *news_session_new_for_folder(Folder *folder)
                if (alertpanel_full(_("Insecure connection"),
                        _("This connection is configured to be secured "
                          "using SSL, but SSL is not available in this "
-                         "build of Sylpheed-Claws. \n\n"
+                         "build of Claws Mail. \n\n"
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
@@ -325,7 +325,7 @@ static NNTPSession *news_session_get(Folder *folder)
 
        if (prefs_common.work_offline && 
            !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+               _("Claws Mail needs network access in order "
                  "to access the News server."))) {
                return NULL;
        }

diff --git a/src/news.h b/src/news.h
index 0d25b2e72444a6b1fcb1270dc662ee5e51d619c7..5da1ea8d1c2cc8c330a0a2a8579240063cbe52e2 100644 (file)
--- a/src/news.h
+++ b/src/news.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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

diff --git a/src/news_gtk.c b/src/news_gtk.c
index 7eba093e09f863a6f8997a7cb228e3a15243176f..2de37582d24891d173af095c8e449ecb3c1aabec 100644 (file)
--- a/src/news_gtk.c
+++ b/src/news_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * 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

diff --git a/src/news_gtk.h b/src/news_gtk.h
index cfa8746e6a56233516efe9fc4024eba9885f1c66..94dd35ea79338d0869921c6290aca9e6d055dfce 100644 (file)
--- a/src/news_gtk.h
+++ b/src/news_gtk.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * 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

diff --git a/src/noticeview.c b/src/noticeview.c
index ba829ed4364997cea999dee442d37d1f31f412bf..daef68c1c1404019d2c3c37614fe512acf78e0a8 100644 (file)
--- a/src/noticeview.c
+++ b/src/noticeview.c
@@ -1,6 +1,6 @@
 /* 
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2002 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/noticeview.h b/src/noticeview.h
index bd6612b5caf02c32338a496edd545940972ad89b..d11322ef24a03c9e92b73578a54eeeeb85cbc6b2 100644 (file)
--- a/src/noticeview.h
+++ b/src/noticeview.h
@@ -1,6 +1,6 @@
 /* 
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2002 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * 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

diff --git a/src/partial_download.c b/src/partial_download.c
index aa9dacdef1f77292657621cc12520fff07a56340..e91abea6ef966c73b99af74c5f3e4335561de60e 100644 (file)
--- a/src/partial_download.c
+++ b/src/partial_download.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  * This file (C) 2004 Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/src/partial_download.h b/src/partial_download.h
index 8a66413203849bcc8649b41f7fc9f53ef7ef9e57..a40eb9ba30d3c9ca9b46efed1bcd50e4e7ab37cc 100644 (file)
--- a/src/partial_download.h
+++ b/src/partial_download.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  * This file (C) 2004 Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/src/pine.c b/src/pine.c
index 50b72c9ca11690806463eb7cc150bbdcb2bae751..6e040d684a87960a6ecdb3c95c426af6ec44b708 100644 (file)
--- a/src/pine.c
+++ b/src/pine.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/pine.h b/src/pine.h
index 8810fcd80699966b84ee09daf86f7c2b22f75ad4..07cf315d881dff5b3f5b098f3d8b346a0eb81577 100644 (file)
--- a/src/pine.h
+++ b/src/pine.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2006 Match Grun and the Sylpheed-Claws team
+ * Copyright (C) 2002-2006 Match Grun and the Claws Mail team
  *
  * 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

diff --git a/src/pixmaps/sylpheed-claws.xpm b/src/pixmaps/claws-mail.xpm
similarity index 98%
rename from src/pixmaps/sylpheed-claws.xpm
rename to src/pixmaps/claws-mail.xpm
index 7e591daa87f42db1eccc32322098261710409796..abe95f86437904bff75c9efe2e0c7d70fe579526 100644 (file)
--- a/src/pixmaps/sylpheed-claws.xpm
+++ b/src/pixmaps/claws-mail.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sylpheed_claws_xpm[] = {
+static char * claws_mail_xpm[] = {
 "50 50 65 1",
 "      c None",
 ".     c #757474",

diff --git a/src/pixmaps/sylpheed-claws_icon.xpm b/src/pixmaps/claws-mail_icon.xpm
similarity index 99%
rename from src/pixmaps/sylpheed-claws_icon.xpm
rename to src/pixmaps/claws-mail_icon.xpm
index d57f7df66c758853037de18147cab9c8d74c8f6b..6ab297653914ea3871a04ac7f961a6c51c2b3b52 100644 (file)
--- a/src/pixmaps/sylpheed-claws_icon.xpm
+++ b/src/pixmaps/claws-mail_icon.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sylpheed_claws_icon_xpm[] = {
+static char * claws_mail_icon_xpm[] = {
 "48 48 1150 2",
 "      c None",
 ".     c #4E7382",

diff --git a/src/pixmaps/sylpheed-claws_logo.xpm b/src/pixmaps/claws-mail_logo.xpm
similarity index 99%
rename from src/pixmaps/sylpheed-claws_logo.xpm
rename to src/pixmaps/claws-mail_logo.xpm
index e2e03eb9a65c3c2f21a29aaf56ec4ad7707237a0..9ac12e93beb70e926e158dade11b39f6c823cc5f 100644 (file)
--- a/src/pixmaps/sylpheed-claws_logo.xpm
+++ b/src/pixmaps/claws-mail_logo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sylpheed_claws_logo_xpm[] = {
+static char * claws_mail_logo_xpm[] = {
 "160 175 12434 3",
 "      c None",
 ".     c #EAEAEA",

diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index e88b097a6b122153c4e3b7a01e460f92999ebae3..3ca79328288a20c3b13f3a5e27dcd0f38dcaca73 100644 (file)
--- a/src/plugins/bogofilter/Makefile.am
+++ b/src/plugins/bogofilter/Makefile.am
@@ -10,7 +10,7 @@ bogofilter_la_LDFLAGS = \
        -avoid-version -module -no-undefined
 
 if CYGWIN
-cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
 else
 cygwin_export_lib =
 endif

diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index e87523da86ef82e0ec246dd3709bccd15d7c9283..0b7bdb9f86834767d1b0b65a9fc598092ee3bf98 100644 (file)
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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
@@ -485,12 +485,12 @@ gint plugin_init(gchar **error)
        hook_id = -1;
 
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the Bogofilter plugin was built with"));
+               *error = g_strdup(_("Your version of Claws Mail is newer than the version the Bogofilter plugin was built with"));
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the Bogofilter plugin"));
+               *error = g_strdup(_("Your version of Claws Mail is too old for the Bogofilter plugin"));
                return -1;
        }
 

diff --git a/src/plugins/bogofilter/bogofilter.h b/src/plugins/bogofilter/bogofilter.h
index 581b7805dbce713fea0bdd86c64f7ccd4a648f7c..6f6f5f2376c8a7ac070ae84865029a2143c840af 100644 (file)
--- a/src/plugins/bogofilter/bogofilter.h
+++ b/src/plugins/bogofilter/bogofilter.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index 5b3c66f1d4f3a553ba269ea5fe0e66d33f1ca539..30eda9f97826a0f1d994b1d750e0787357e55bde 100644 (file)
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  * This file Copyright (C) 2006 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/src/plugins/clamav/Makefile.am b/src/plugins/clamav/Makefile.am
index d81da0ed7b3bf1495e77be27f538553e4e024e5e..2f3c3f8980f82a6a06dbf632f8491b6073e2e7f5 100644 (file)
--- a/src/plugins/clamav/Makefile.am
+++ b/src/plugins/clamav/Makefile.am
@@ -9,7 +9,7 @@ clamav_plugin_la_SOURCES = \
 clamav_plugin_la_LDFLAGS = \
        -avoid-version -module -no-undefined
 if CYGWIN
-cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
 else
 cygwin_export_lib =
 endif

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index cc4233283a227294b71595a59be2eef74c902c5a..2367aa700fe81676f82e4b62ec266c7efcb1447d 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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
@@ -195,12 +195,12 @@ gint plugin_init(gchar **error)
        unsigned int no;
 
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the ClamAV plugin was built with"));
+               *error = g_strdup(_("Your version of Claws Mail is newer than the version the ClamAV plugin was built with"));
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the ClamAV plugin"));
+               *error = g_strdup(_("Your version of Claws Mail is too old for the ClamAV plugin"));
                return -1;
        }
 

diff --git a/src/plugins/clamav/clamav_plugin.h b/src/plugins/clamav/clamav_plugin.h
index 45d6db8bddcff20c2647ecec7d966feb5ac06096..f48b8729f1828b828294553a5da2b0f5459e0f0f 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.h
+++ b/src/plugins/clamav/clamav_plugin.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index 3ad952f7330fe6f0cb4b70f2d566e4b491df9a08..f31aafb1978dd6038cf9b396d1c1ae84771cdf5f 100644 (file)
--- a/src/plugins/clamav/clamav_plugin_gtk.c
+++ b/src/plugins/clamav/clamav_plugin_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/plugins/demo/Makefile.am b/src/plugins/demo/Makefile.am
index e808b8bdfc6f8e7a7bc0a7fcf955bff96ee4b68c..444f758f08f5e9c564b28ec0309b973ecf18a7bb 100644 (file)
--- a/src/plugins/demo/Makefile.am
+++ b/src/plugins/demo/Makefile.am
@@ -9,7 +9,7 @@ demo_la_LDFLAGS = \
        -avoid-version -module -no-undefined
 
 if CYGWIN
-cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
 else
 cygwin_export_lib = 
 endif

diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c
index 681fbb55c5ea279aca584c69f1f6a131bdb78e03..d5171f4c1d661ba3a977f2b0948bafa83c4213bf 100644 (file)
--- a/src/plugins/demo/demo.c
+++ b/src/plugins/demo/demo.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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
@@ -42,12 +42,12 @@ static guint hook_id;
 gint plugin_init(gchar **error)
 {
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup(_("Your sylpheed-claws version is newer than the version the plugin was built with"));
+               *error = g_strdup(_("Your claws-mail version is newer than the version the plugin was built with"));
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 8, 11, 39))) {
-               *error = g_strdup(_("Your sylpheed-claws version is too old"));
+               *error = g_strdup(_("Your claws-mail version is too old"));
                return -1;
        }
 
@@ -76,7 +76,7 @@ const gchar *plugin_name(void)
 
 const gchar *plugin_desc(void)
 {
-       return _("This Plugin is only a demo of how to write plugins for Sylpheed-Claws. "
+       return _("This Plugin is only a demo of how to write plugins for Claws Mail. "
                 "It installs a hook for new log output and writes it to stdout."
                 "\n\n"
                 "It is not really useful");

diff --git a/src/plugins/dillo_viewer/Makefile.am b/src/plugins/dillo_viewer/Makefile.am
index b0b37984ed14bc91af562af0af13a7c74a53d2af..9b5171f1510a5ce2dc3d71eea96ea5c120e60999 100644 (file)
--- a/src/plugins/dillo_viewer/Makefile.am
+++ b/src/plugins/dillo_viewer/Makefile.am
@@ -10,7 +10,7 @@ dillo_viewer_la_LDFLAGS = \
        -avoid-version -module -no-undefined
 
 if CYGWIN
-cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
 else
 cygwin_export_lib =
 endif

diff --git a/src/plugins/dillo_viewer/README b/src/plugins/dillo_viewer/README
index ba8e296df34355541651ae138bab511bf6b78976..699d17cb0992acbd77d697799e0c3968caec277f 100644 (file)
--- a/src/plugins/dillo_viewer/README
+++ b/src/plugins/dillo_viewer/README
@@ -1,13 +1,13 @@
-Dillo Viewer: HTML mail viewing in Sylpheed-Claws
+Dillo Viewer: HTML mail viewing in Claws Mail
 -------------------------------------------------
 
 This plugin uses the Dillo (http://www.dillo.org) browser to
-view text/html MIME parts inside Sylpheed-Claws.
+view text/html MIME parts inside Claws Mail.
 
 When the plugin is loaded, if the MIME part to be viewed is of
 text/html type, then the MIME part is saved in a temporary file and
 Dillo is started with special options to embed it inside
-Sylpheed-Claws' message view and to "safely" view the part.  Dillo is
+Claws Mail' message view and to "safely" view the part.  Dillo is
 also run in the fullwindow mode, where the toolbar, menubar and the
 statusbar are hidden so the message is viewed in a larger area.  The
 fullwindow mode is toggled on and off by double clicking on an empty

diff --git a/src/plugins/dillo_viewer/dillo_prefs.c b/src/plugins/dillo_viewer/dillo_prefs.c
index 9f8f48257b535f1adb1974ce559e12bc55eb83b6..866b269de7eaddbd791caadccb2435bcd7c6e7f2 100644 (file)
--- a/src/plugins/dillo_viewer/dillo_prefs.c
+++ b/src/plugins/dillo_viewer/dillo_prefs.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/plugins/dillo_viewer/dillo_prefs.h b/src/plugins/dillo_viewer/dillo_prefs.h
index 7531101bb4323dc7ec59995603daffa4c212de98..701aac88ef2484620db6c0b4763a71be747926a8 100644 (file)
--- a/src/plugins/dillo_viewer/dillo_prefs.h
+++ b/src/plugins/dillo_viewer/dillo_prefs.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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

diff --git a/src/plugins/dillo_viewer/dillo_viewer.c b/src/plugins/dillo_viewer/dillo_viewer.c
index 8f7fbbafcb8a9781e159e557505b0312cf593efb..4bab8cb3d031ced1721458ba60f83ade6d21621c 100644 (file)
--- a/src/plugins/dillo_viewer/dillo_viewer.c
+++ b/src/plugins/dillo_viewer/dillo_viewer.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * 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
@@ -166,12 +166,12 @@ static MimeViewerFactory dillo_viewer_factory =
 gint plugin_init(gchar **error)
 {
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the Dillo plugin was built with"));
+               *error = g_strdup(_("Your version of Claws Mail is newer than the version the Dillo plugin was built with"));
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the Dillo plugin"));
+               *error = g_strdup(_("Your version of Claws Mail is too old for the Dillo plugin"));
                return -1;
        }
 

diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index d5dfaf7de7621c305624c141260bba55317da200..68a08e66ac6bbe18498acb91e5d41570ab76fd8f 100644 (file)
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -36,7 +36,7 @@ no_undefined =
 endif
 
 if CYGWIN
-cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
 else
 cygwin_export_lib =
 endif

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index dd52df54cd4cde1f4d4e45ed48ba12c75e7d55b9..19ef8e063e619f8b96fb68ac6155a0d029736467 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -1,5 +1,5 @@
 /* passphrase.c - GTK+ based passphrase callback
- *      Copyright (C) 2001-2006 Werner Koch (dd9jn) and the Sylpheed-Claws team
+ *      Copyright (C) 2001-2006 Werner Koch (dd9jn) and the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpcore/passphrase.h b/src/plugins/pgpcore/passphrase.h
index 7f126221dab4fa130bb3f5ac7e2fb155bdab496d..063d20ca74328358bdac9accb3708c78e0e200ae 100644 (file)
--- a/src/plugins/pgpcore/passphrase.h
+++ b/src/plugins/pgpcore/passphrase.h
@@ -1,5 +1,5 @@
 /* passphrase.h - GTK+ based passphrase callback
- *      Copyright (C) 2001-2006 Werner Koch (dd9jn) and the Sylpheed-Claws team
+ *      Copyright (C) 2001-2006 Werner Koch (dd9jn) and the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index d5e2a38f618fceca3e222a83e4a4a85f87ddeebd..b068f7108a9b89ddf00135a58e02b44736641a60 100644 (file)
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
  * This file Copyright (C) 2006 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -117,7 +117,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
                if (!prefs_common.work_offline) {
                        val = alertpanel(_("Key import"),
                                _("This key is not in your keyring. Do you want "
-                                 "Sylpheed-Claws to try and import it from a "
+                                 "Claws Mail to try and import it from a "
                                  "keyserver?"),
                                  GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
                        GTK_EVENTS_FLUSH();

diff --git a/src/plugins/pgpcore/pgp_viewer.h b/src/plugins/pgpcore/pgp_viewer.h
index 65a18e71f7f6a257cf23bab945fc7e658199d4d7..445b5f22065fbfa1c1f34b6d163fb35a3e1072bb 100644 (file)
--- a/src/plugins/pgpcore/pgp_viewer.h
+++ b/src/plugins/pgpcore/pgp_viewer.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
  * This file Copyright (C) 2006 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/src/plugins/pgpcore/plugin.c b/src/plugins/pgpcore/plugin.c
index 84f8f8d59c32523df51e5a8de81b6d1a34a973ed..2f6ab4d001f595d3b9c230cf9b3c59af0b260ab0 100644 (file)
--- a/src/plugins/pgpcore/plugin.c
+++ b/src/plugins/pgpcore/plugin.c
@@ -35,12 +35,12 @@
 gint plugin_init(gchar **error)
 {
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin was built with"));
+               *error = g_strdup(_("Your version of Claws Mail is newer than the version the PGP/Core plugin was built with"));
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the PGP/Core plugin"));
+               *error = g_strdup(_("Your version of Claws Mail is too old for the PGP/Core plugin"));
                return -1;
        }
 

diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index 1bdb6185ef2e961228991f40fa44a6ba49260c82..bd08e5d665aa245a39a910dd484e9069fcf78e44 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpcore/prefs_gpg.h b/src/plugins/pgpcore/prefs_gpg.h
index 04e6dcd2e1538a2a1a4125ae93604f874ffd5bf8..50fb8a9f8576b4e2efd2bb071feddcfbf5897de0 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.h
+++ b/src/plugins/pgpcore/prefs_gpg.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index d494d60422c8c6211bf0c4a67d14e7156b85eebc..97685022fea7d77bd4450f654c756df40f5cd31c 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -1,5 +1,5 @@
 /* select-keys.c - GTK+ based key selection
- *      Copyright (C) 2001-2006 Werner Koch (dd9jn) and the Sylpheed-Claws team
+ *      Copyright (C) 2001-2006 Werner Koch (dd9jn) and the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpcore/select-keys.h b/src/plugins/pgpcore/select-keys.h
index fe7ebebcc636f1ba0cf64dff2796dff11eadc519..47c61b1cc5dc811cf313bd92434884485e7df85d 100644 (file)
--- a/src/plugins/pgpcore/select-keys.h
+++ b/src/plugins/pgpcore/select-keys.h
@@ -1,5 +1,5 @@
 /* select-keys.h - GTK+ based key selection
- *      Copyright (C) 2001-2006 Werner Koch (dd9jn) and the Sylpheed-Claws team
+ *      Copyright (C) 2001-2006 Werner Koch (dd9jn) and the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index b09805086e8a37b4a0304c80a9ecae9dc531b5ee..1cd53538825946aa49a155d515c1dfc940af5890 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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
@@ -608,7 +608,7 @@ void sgpgme_create_secret_key(PrefsAccount *account, gboolean ask_create)
        }
        if (ask_create) {
                val = alertpanel(_("No PGP key found"),
-                               _("Sylpheed-Claws did not find a secret PGP key, "
+                               _("Claws Mail did not find a secret PGP key, "
                                  "which means that you won't be able to sign "
                                  "emails or receive encrypted emails.\n"
                                  "Do you want to create a new key pair now?"),

diff --git a/src/plugins/pgpcore/sgpgme.h b/src/plugins/pgpcore/sgpgme.h
index 1e51351cde4ed6d2b63809bc4a630dac91aa6365..220372d6c970fb1b7a29dde828dacc5feb1872d7 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.h
+++ b/src/plugins/pgpcore/sgpgme.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpcore/sylpheed.def b/src/plugins/pgpcore/sylpheed.def
index 7573ac911acddace6444af451473f93ef532f849..9ca2c271ea7d8ba3e6d1e28efc354d8dd51674c7 100644 (file)
--- a/src/plugins/pgpcore/sylpheed.def
+++ b/src/plugins/pgpcore/sylpheed.def
@@ -1,4 +1,4 @@
-LIBRARY SYLPHEED-CLAWS.EXE
+LIBRARY CLAWS-MAIL.EXE
 EXPORTS
 alertpanel
 alertpanel_full

diff --git a/src/plugins/pgpcore/version.rc b/src/plugins/pgpcore/version.rc
index afbd3615f4e2f52ce5728894d141982bf615527b..d9e23927a65d2ea93d6d5ce0a0c14839ff1908d5 100644 (file)
--- a/src/plugins/pgpcore/version.rc
+++ b/src/plugins/pgpcore/version.rc
@@ -18,9 +18,9 @@ BEGIN
             VALUE "FileDescription", "pgpcore Plugin\0"
             VALUE "FileVersion", "0.0.0.0\0"
             VALUE "ProductVersion", "0.0.0.0 Win32\0"
-            VALUE "LegalCopyright", "GPL / © 1999-2003 Hiroyuki Yamamoto & The Sylpheed Claws Team\0"
+            VALUE "LegalCopyright", "GPL / © 1999-2003 Hiroyuki Yamamoto & The Claws Mail Team\0"
             VALUE "CompanyName", "GNU / Free Software Foundation\0"
-            VALUE "ProductName", "Sylpheed-Claws\0"
+            VALUE "ProductName", "Claws Mail\0"
 //            VALUE "Comments", "\0"
 //            VALUE "InternalName", "\0"
 //            VALUE "LegalTrademarks", "\0"

diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index 2b9a75d2073a8ae6b28303fa458c4aadba2c7466..9636414909871537396aa6d35a8c16f8766c2927 100644 (file)
--- a/src/plugins/pgpinline/Makefile.am
+++ b/src/plugins/pgpinline/Makefile.am
@@ -40,7 +40,7 @@ no_undefined =
 endif
 
 if CYGWIN
-cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
 pgpcore_lib = ../pgpcore/pgpcore.la
 else
 cygwin_export_lib = 

diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index af2c4babfb2ec006d0266307a8c4267ca84bc2e0..c66f53d2f21535e0bf6509d73dc0f12c669173f1 100644 (file)
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
  * This file (C) 2004 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/src/plugins/pgpinline/pgpinline.h b/src/plugins/pgpinline/pgpinline.h
index 5a7405d3b2cc222f6da83ff293b8f8f69e93ffa5..8c703a130aff3caae9136dc9dde6568b7b3c1905 100644 (file)
--- a/src/plugins/pgpinline/pgpinline.h
+++ b/src/plugins/pgpinline/pgpinline.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpinline/plugin.c b/src/plugins/pgpinline/plugin.c
index 437965444eec8789d19e2b6ee650558efcc1fa8d..03d8255d5268897853a2d4db175ff9b8978dae31 100644 (file)
--- a/src/plugins/pgpinline/plugin.c
+++ b/src/plugins/pgpinline/plugin.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -33,12 +33,12 @@
 gint plugin_init(gchar **error)
 {
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the PGP/inline plugin was built with"));
+               *error = g_strdup(_("Your version of Claws Mail is newer than the version the PGP/inline plugin was built with"));
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
-               *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the PGP/inline plugin"));
+               *error = g_strdup(_("Your version of Claws Mail is too old for the PGP/inline plugin"));
                return -1;
        }
 

diff --git a/src/plugins/pgpinline/sylpheed.def b/src/plugins/pgpinline/sylpheed.def
index 8c0dd1c5da71205a7bdd932277983b6609274871..895152273b5d1a60f08a204ae568f79b0e660017 100644 (file)
--- a/src/plugins/pgpinline/sylpheed.def
+++ b/src/plugins/pgpinline/sylpheed.def
@@ -1,4 +1,4 @@
-LIBRARY SYLPHEED-CLAWS.EXE
+LIBRARY CLAWS-MAIL.EXE
 EXPORTS
 codeconv_set_strict
 conv_codeset_strdup

diff --git a/src/plugins/pgpinline/version.rc b/src/plugins/pgpinline/version.rc
index ef0ed6b3e7c711b41593d386ab0e27fa388edc05..31445a368ea2275de5265aa2b469fd083a799343 100644 (file)
--- a/src/plugins/pgpinline/version.rc
+++ b/src/plugins/pgpinline/version.rc
@@ -18,9 +18,9 @@ BEGIN
             VALUE "FileDescription", "pgpinline Plugin\0"
             VALUE "FileVersion", "0.0.0.0\0"
             VALUE "ProductVersion", "0.0.0.0 Win32\0"
-            VALUE "LegalCopyright", "GPL / © 1999-2003 Hiroyuki Yamamoto & The Sylpheed Claws Team\0"
+            VALUE "LegalCopyright", "GPL / © 1999-2003 Hiroyuki Yamamoto & The Claws Mail Team\0"
             VALUE "CompanyName", "GNU / Free Software Foundation\0"
-            VALUE "ProductName", "Sylpheed-Claws\0"
+            VALUE "ProductName", "Claws Mail\0"
 //            VALUE "Comments", "\0"
 //            VALUE "InternalName", "\0"
 //            VALUE "LegalTrademarks", "\0"

diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index 3145d153575f6f8705434546eb37d360432a0799..4a93e21bdd190cf93826260642a3d9e368b34e00 100644 (file)
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -39,7 +39,7 @@ no_undefined =
 endif
 
 if CYGWIN
-cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
 pgpcore_lib = ../pgpcore/pgpcore.la
 else
 pgpcore_lib = 

diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 3f4a29f7d602e8caedaa54258ee4bb2584d2650c..67628d06701f6822099bd766482d51efe1b48d4a 100644 (file)
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpmime/pgpmime.h b/src/plugins/pgpmime/pgpmime.h
index 225b04d6b4c60802dceafe673e57bc4561620a04..34fe39f751087ec82dbe1cad60c944e1caf84a1c 100644 (file)
--- a/src/plugins/pgpmime/pgpmime.h
+++ b/src/plugins/pgpmime/pgpmime.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Claws Mail team
  *
  * 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

diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c
index a9a63639372eca8bd645497c48ea46dc54919b0c..6407e2e8dc0d9f9a8988f0029c077989a431d475 100644 (file)
--- a/src/plugins/pgpmime/plugin.c
+++ b/src/plugins/pgpmime/plugin.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the