From: Colin Leroy Date: Tue, 7 Nov 2006 10:47:23 +0000 (+0000) Subject: try again X-Git-Tag: rel_2_7_0~203 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ccda55996e36bdf25add658cf3192832a16256b0 try again --- diff --git a/manual/pl/dist/ps/.cvsignore b/manual/pl/dist/ps/.cvsignore index 41878f606..f8c92fabf 100644 --- 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 9d6415267..767c9c42d 100644 --- 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 41878f606..f8c92fabf 100644 --- 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 406acc1ae..7ae66057b 100644 --- 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 eca089845..56b4a3ac8 100644 --- 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 24095cc65..c636c87cd 100644 --- 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 b96825233..36550764e 100644 --- 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 b7691e37c..03b77a369 100644 --- 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 0c01275ee..d873e9fa2 100644 --- 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 5264b55a3..38aa93bc0 100644 --- 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 d47bcccb8..62eb5d318 100644 --- 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 28e64afa8..d33b60236 100644 --- 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 482a7a174..529b5428d 100644 --- 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 575af4ed6..c870bd8f8 100644 --- 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 464edcf76..8a935197a 100644 --- 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 9901d8b0c..d73d5570c 100644 --- 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 936ba296d..f53897488 100644 --- 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 7293e530c..324871e65 100644 --- 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 89a1ac165..954044f42 100644 --- 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 665f0764e..b63757969 100644 --- 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 c1ac588c8..410c760cd 100644 --- 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 18b6dee40..5ce546451 100644 --- 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 02e994dc5..89e5032b3 100644 --- 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 b425a636b..e0f46de97 100644 --- 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 2fab8c6b3..d50ea9728 100644 --- 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 ffe32e373..236a63cd0 100644 --- 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 c83fcd10c..237f13aa6 100644 --- 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 7ea655892..ec6bd8660 100644 --- 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 62023e5bd..ceec8b11b 100644 --- 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 bd555fcea..2c4a13e28 100644 --- 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 21883347e..662811c97 100644 --- 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 0b2f8c76b..36cc7cc13 100644 --- 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 c506d8e34..e10639d96 100644 --- 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 fee6e7177..3e80ff9ba 100644 --- 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 e3c0c785c..8912e8322 100644 --- 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 b6423390c..a12417ae2 100644 --- 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 80f788778..4dfc72c18 100644 --- 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 7a60084ce..89b572cf1 100644 --- 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 20a10f1a1..e587f5b16 100644 --- 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 786a3b222..f5230b4fb 100644 --- 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 b8e7571b1..a148098e3 100644 --- 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 ab8fc91a2..9cb348e43 100644 --- 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 4b133e4a2..58fc4a4f5 100644 --- 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 accd60f31..750bc31dd 100644 --- 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 d133035d9..ec1d50eaf 100644 --- 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 a12632c85..08c8c1f21 100644 --- 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 f8305ca38..82a649c24 100644 --- 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 bebe5d8a3..d9cb9746f 100644 --- 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 f5dc65ba7..886066c2a 100644 --- 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 e9b6f3446..e8d1052bd 100644 --- 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 0d08c4f3c..fadb07891 100644 --- 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 e881d0cf7..e5dfae746 100644 --- 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 f522a14f8..22163640f 100644 --- 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 ec0a09bb5..00203936f 100644 --- 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 30226833b..45352a3fb 100644 --- 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 5b109b88d..f5dc4c054 100644 --- 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 142b33e3e..82c8b8f8a 100644 --- 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 0639afe60..5809511e3 100644 --- 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 9e809b916..2e95d1499 100644 --- 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 38d4643f1..4a9092801 100644 --- 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 385427814..6fb99d61c 100644 --- 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 5f671f8ac..3fa56bd7e 100644 --- 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 8110daf7c..9c9c20a29 100644 --- 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 41efbc2ce..f77596d76 100644 --- 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 1f8a00895..5e041ad90 100644 --- 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 321ba5372..2b76bb501 100644 --- 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 1c10f2b4b..212280fd5 100644 --- 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 079551eef..7d89cd811 100644 --- 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 612eea990..444b50b4a 100644 --- 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 da561a25d..f128b968f 100644 --- 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 60915a326..1b512b3e7 100644 --- 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 96902c7e1..b431496ae 100644 --- 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 c2ecf22ef..a05358050 100644 --- 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 fcec361cb..a9778be98 100644 --- 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 49ce6b498..23d954e5b 100644 --- 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 ba0db9b5e..c2f85209e 100644 --- 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 057172b10..02052751a 100644 --- 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 c8a119a25..9d91bc635 100644 --- 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 0265ed2d6..9b955dd08 100644 --- 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 51c53cb3b..7849187b0 100644 --- 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 6646c24ca..613c3d092 100644 --- 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 fe28171b0..71620e910 100644 --- 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 5748f3dd7..129e7e333 100644 --- 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 & the Sylpheed-Claws team + * Copyright (C) 2005-2006 Colin Leroy & 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 a73042dd9..99a76a26e 100644 --- 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 7d68b7e6d..f90c06680 100644 --- 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 8fd1d20b4..80e3fbdbd 100644 --- 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 16dc3667d..60b232335 100644 --- 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 b48a39f5a..32018a0b1 100644 --- 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 ecceaf125..e23ffa0fe 100644 --- 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 27d3b6c86..caecc208e 100644 --- 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 ba7ffbfe0..ea27703f8 100644 --- 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 da6ad16c2..e4e9bf7f3 100644 --- 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 6929efb5e..57e6ccc9d 100644 --- 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 94b72ea39..0f0b2ceae 100644 --- 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 7427257e8..4c51f5e19 100644 --- 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 7cd0b5e87..e844caf4b 100644 --- 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 4044360fa..07318a1e0 100644 --- 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 53823a73f..dc1abdc98 100644 --- 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 921cab9c4..eae95f4ad 100644 --- 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 c60dc90c6..68ebde33d 100644 --- 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 370cc409b..53f8633ed 100644 --- 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 f97f71ce0..4fef960e5 100644 --- 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 1a0bd224a..59e2db8df 100644 --- 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 c59f462a1..a13614b37 100644 --- 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 44c675b52..b96a2f98b 100644 --- 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 3a424f3ce..7820e1a9a 100644 --- 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 c1b6fb77d..4796815c2 100644 --- 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 9bf5d12b1..438a94389 100644 --- 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 a7a60e3c9..0c5a7c508 100644 --- 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 41fd60fe7..bafdd854c 100644 --- 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 f1d8b5683..e5793529e 100644 --- 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 1b9beef51..3e5e39940 100644 --- 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 5891059dd..65d57b328 100644 --- 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 606c44461..48cc1b519 100644 --- 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 d55ca3915..ea97e315e 100644 --- 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 c88f9e378..480fc1a79 100644 --- 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 91273bdd3..f93cd6a3b 100644 --- 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 e43323085..710c0c568 100644 --- 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 c7203c38b..c2bad7a90 100644 --- 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 0eb65e326..8b44c75df 100644 --- 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 2b3282f18..1c57c0796 100644 --- 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 be2a57b7d..26e201cf9 100644 --- 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 ae48c4f7e..3a990e4e8 100644 --- 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 d215af704..ef22c49ec 100644 --- 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 7caaa7e19..bd8e2006c 100644 --- 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 723afdfd9..05f60f9fd 100644 --- 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 c7caffcda..c86ec214d 100644 --- 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 c275f6612..8f0c7c4bb 100644 --- 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 efc8e58ed..60d86ce0c 100644 --- 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 356b4e3f1..250325a6f 100644 --- 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 1e207d52d..6234b8f57 100644 --- 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 5b58cae90..fce025b40 100644 --- 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 567473ff3..ec1df35ab 100644 --- 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 a9d00040e..4112e3f2b 100644 --- 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 44270347b..2e2b4b048 100644 --- 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 - ("Sylpheed-Claws\nversion %s", + ("Claws Mail\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 \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 d6ae64f4b..a2d652e17 100644 --- 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 7fc796a00..fc4f9da57 100644 --- 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 736cf6203..170535a2c 100644 --- 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 b6c921a5b..773f97915 100644 --- 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 91f32ae84..863ff6173 100644 --- 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 198c6ce95..13a7aa547 100644 --- 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 8b15ecf28..5297d6c10 100644 --- 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 aeff4e41f..d08f25cf1 100644 --- 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 8783b6b37..0fc86d6e0 100644 --- 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 2b56e4f70..2f8bf7056 100644 --- 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 2d1083bd9..5e989de01 100644 --- 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 617d8829c..4502037c4 100644 --- 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 b71707f24..136540a09 100644 --- 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 e92e9a457..1784af32c 100644 --- 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 ac2100d4d..4259e24ed 100644 --- 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 03b54c6d5..1cfe0b039 100644 --- 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 bf7e0cde5..b1b69088e 100644 --- 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 ebb84483f..1ddd84ea5 100644 --- 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 54bcdefb7..c21caeb1c 100644 --- 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 92f279a19..c74cb6569 100644 --- a/src/gtk/icon_legend.c +++ b/src/gtk/icon_legend.c @@ -1,6 +1,6 @@ /* * This file Copyright (C) 2005 Paul Mangan - * 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 cf1d3a664..250056a45 100644 --- 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 - * 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 88b89faf2..cc4a3b63c 100644 --- 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 a5ef8dd31..d0cdfdd93 100644 --- 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 1782a9364..67a795d5b 100644 --- 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 b4a96053e..19a87692e 100644 --- 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 19e57b90d..ab0b32948 100644 --- 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 430aaab18..55fe64e17 100644 --- 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 8bbabdc6c..835d8cfb1 100644 --- 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 6b67fd823..be0d2f402 100644 --- 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 3cebc7b95..ecf9c290b 100644 --- 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 55679b62a..9aadd869d 100644 --- 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 fdb5109a5..4551c7a2d 100644 --- 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 afe62bdf7..26b82a18b 100644 --- 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 91d86a248..3d3d71f4f 100644 --- 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 22eefc01e..e1835017b 100644 --- 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 edacb29a0..710b0780a 100644 --- 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 d64b8ede1..47f2f50ec 100644 --- 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 3538fc099..33986aa23 100644 --- 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 9ff39e4bd..507e9a57f 100644 --- 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 f894aea9a..8edb255cd 100644 --- 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 4d77af87a..f16946075 100644 --- 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 7b965558f..a4af9edb6 100644 --- 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 11f1fe2ec..2d7bb1c62 100644 --- 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 39b4a54cb..5e72374c9 100644 --- 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 5be36dfaf..6a1a7e1f8 100644 --- 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 1b577b125..86d5e17d2 100644 --- 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 59ddc9d1c..101334c01 100644 --- 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 7ad4fa480..4c7e0a15b 100644 --- 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 e9a5e1973..f7f9a8f5c 100644 --- 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 f3d43142a..667fda5aa 100644 --- 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 f8e00a347..1eea15819 100644 --- 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 5cfb0abe2..5abce34de 100644 --- 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 160bf50d2..176611244 100644 --- 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 bac04337d..4881c4c9e 100644 --- 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 427fcbcf1..eccb62d5b 100644 --- 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 34cf00b3d..6cf03afeb 100644 --- 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 3392edb88..c637d8298 100644 --- 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 79b8b1517..7cd8facd4 100644 --- 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 312c16047..0b2c661bb 100644 --- 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 e022b3755..55643fe95 100644 --- 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 e076155cc..519741fe3 100644 --- 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 d107d88dc..e62eeda02 100644 --- 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 dc4f8c66c..8ef1971a7 100644 --- 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 1b39e97b3..01b602fc3 100644 --- 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 23adb2d95..d372d7e1a 100644 --- 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 007c40508..f99cfa74f 100644 --- 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 e4fe57d43..649536375 100644 --- 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 68729feee..6963422ef 100644 --- 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 7a7635eb3..2b592ae8b 100644 --- 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 a9ce3fc87..9665df86a 100644 --- 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 e03d7152e..edcc0c01f 100644 --- 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 f6d4c2415..2fd2537f6 100644 --- 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 f0f407bf2..8b3f1ce98 100644 --- 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 eb41091ef..9fd0832a3 100644 --- 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 ef12ca921..36ac474ef 100644 --- 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 4721ed40f..e8fd7b5a7 100644 --- 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 dd7ea090b..973210417 100644 --- 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 ca07f05a1..a2e314850 100644 --- 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 e4d31f13f..e7fe58a0a 100644 --- 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 733f03987..0d5f14261 100644 --- 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 7f6dd62c3..b7007706d 100644 --- 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 b1b1e5b4f..1edac29f3 100644 --- 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 eda7ab982..ee49241b4 100644 --- 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 90424f168..2763f9de2 100644 --- 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 b8444d026..bc0fb1e80 100644 --- 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 61ffa531c..d67283cc2 100644 --- 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 5ce0421a9..42f4a919d 100644 --- 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 2e260b877..5ea5a3241 100644 --- 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 8096d5522..aa26030b3 100644 --- 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 5e9d7e921..c7d2ec26c 100644 --- 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 00f392b34..adab49d72 100644 --- 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 f1e2ad62e..33ad83ddc 100644 --- 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 889fb7175..aa54544e1 100644 --- 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 0d25b2e72..5da1ea8d1 100644 --- 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 7eba093e0..2de37582d 100644 --- 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 cfa8746e6..94dd35ea7 100644 --- 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 ba829ed43..daef68c1c 100644 --- 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 bd6612b5c..d11322ef2 100644 --- 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 aa9dacdef..e91abea6e 100644 --- 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 8a6641320..a40eb9ba3 100644 --- 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 50b72c9ca..6e040d684 100644 --- 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 8810fcd80..07cf315d8 100644 --- 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 7e591daa8..abe95f864 100644 --- 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 d57f7df66..6ab297653 100644 --- 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 e2e03eb9a..9ac12e93b 100644 --- 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 e88b097a6..3ca793282 100644 --- 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 e87523da8..0b7bdb9f8 100644 --- 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 581b7805d..6f6f5f237 100644 --- 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 5b3c66f1d..30eda9f97 100644 --- 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 * * 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 d81da0ed7..2f3c3f898 100644 --- 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 cc4233283..2367aa700 100644 --- 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 45d6db8bd..f48b8729f 100644 --- 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 3ad952f73..f31aafb19 100644 --- 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 e808b8bdf..444f758f0 100644 --- 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 681fbb55c..d5171f4c1 100644 --- 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 b0b37984e..9b5171f15 100644 --- 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 ba8e296df..699d17cb0 100644 --- 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 9f8f48257..866b269de 100644 --- 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 7531101bb..701aac88e 100644 --- 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 8f7fbbafc..4bab8cb3d 100644 --- 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 d5dfaf7de..68a08e66a 100644 --- 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 dd52df54c..19ef8e063 100644 --- 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 7f126221d..063d20ca7 100644 --- 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 d5e2a38f6..b068f7108 100644 --- 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 * * 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 65a18e71f..445b5f220 100644 --- 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 * * 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 84f8f8d59..2f6ab4d00 100644 --- 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 1bdb6185e..bd08e5d66 100644 --- 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 04e6dcd2e..50fb8a9f8 100644 --- 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 d494d6042..97685022f 100644 --- 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 fe7ebebcc..47c61b1cc 100644 --- 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 b09805086..1cd535388 100644 --- 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 1e51351cd..220372d6c 100644 --- 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 7573ac911..9ca2c271e 100644 --- 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 afbd3615f..d9e23927a 100644 --- 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 2b9a75d20..963641490 100644 --- 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 af2c4babf..c66f53d2f 100644 --- 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 * * 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 5a7405d3b..8c703a130 100644 --- 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 437965444..03d8255d5 100644 --- 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 8c0dd1c5d..895152273 100644 --- 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 ef0ed6b3e..31445a368 100644 --- 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 3145d1535..4a93e21bd 100644 --- 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 3f4a29f7d..67628d067 100644 --- 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 225b04d6b..34fe39f75 100644 --- 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 a9a636393..6407e2e8d 100644 --- 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 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 @@ -32,12 +32,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/MIME plugin was built with")); + *error = g_strdup(_("Your version of Claws Mail is newer than the version the PGP/MIME 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/MIME plugin")); + *error = g_strdup(_("Your version of Claws Mail is too old for the PGP/MIME plugin")); return -1; } diff --git a/src/plugins/pgpmime/sylpheed.def b/src/plugins/pgpmime/sylpheed.def index bc79608ff..20cfc9b28 100644 --- a/src/plugins/pgpmime/sylpheed.def +++ b/src/plugins/pgpmime/sylpheed.def @@ -1,4 +1,4 @@ -LIBRARY SYLPHEED-CLAWS.EXE +LIBRARY CLAWS-MAIL.EXE EXPORTS canonicalize_str debug_print_real diff --git a/src/plugins/pgpmime/version.rc b/src/plugins/pgpmime/version.rc index 35b2e34f6..358d127a3 100644 --- a/src/plugins/pgpmime/version.rc +++ b/src/plugins/pgpmime/version.rc @@ -18,9 +18,9 @@ BEGIN VALUE "FileDescription", "pgpmime 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/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am index 30abf54b2..4f754e721 100644 --- a/src/plugins/spamassassin/Makefile.am +++ b/src/plugins/spamassassin/Makefile.am @@ -12,7 +12,7 @@ spamassassin_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/spamassassin/README b/src/plugins/spamassassin/README index b2a04b018..996936a96 100644 --- a/src/plugins/spamassassin/README +++ b/src/plugins/spamassassin/README @@ -22,7 +22,7 @@ Plugin preferences can be found under "Configuration/Preferences/Plugins /SpamAssassin". The SpamAssassin plugin uses it's own block in the sylpheedrc file in your -~/.sylpheed-claws/ directory, and define the following options: +~/.claws-mail/ directory, and define the following options: [SpamAssassin] transport=0 transport type (to reach spamd) diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c index d69804560..3c7ba76d3 100644 --- a/src/plugins/spamassassin/spamassassin.c +++ b/src/plugins/spamassassin/spamassassin.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 @@ -331,7 +331,7 @@ int spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam) if (config.transport == SPAMASSASSIN_TRANSPORT_TCP && prefs_common.work_offline && !inc_offline_should_override( - _("Sylpheed-Claws needs network access in order " + _("Claws Mail needs network access in order " "to feed this mail(s) to the remote learner."))) { return -1; } @@ -466,12 +466,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 SpamAssassin plugin was built with")); + *error = g_strdup(_("Your version of Claws Mail is newer than the version the SpamAssassin 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 SpamAssassin plugin")); + *error = g_strdup(_("Your version of Claws Mail is too old for the SpamAssassin plugin")); return -1; } diff --git a/src/plugins/spamassassin/spamassassin.h b/src/plugins/spamassassin/spamassassin.h index 671b5916c..cd6b2b20c 100644 --- a/src/plugins/spamassassin/spamassassin.h +++ b/src/plugins/spamassassin/spamassassin.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/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c index 84ef81d23..1de487cf0 100644 --- a/src/plugins/spamassassin/spamassassin_gtk.c +++ b/src/plugins/spamassassin/spamassassin_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/trayicon/Makefile.am b/src/plugins/trayicon/Makefile.am index c3467bbfb..c1f32a420 100644 --- a/src/plugins/trayicon/Makefile.am +++ b/src/plugins/trayicon/Makefile.am @@ -5,7 +5,7 @@ plugindir = $(pkglibdir)/plugins plugin_LTLIBRARIES = trayicon.la 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/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c index 20b3ced2a..604cbae08 100644 --- a/src/plugins/trayicon/trayicon.c +++ b/src/plugins/trayicon/trayicon.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 @@ -105,7 +105,7 @@ static GtkItemFactoryEntry trayicon_popup_menu_entries[] = {N_("/---"), NULL, NULL, 0, ""}, {N_("/_Work Offline"), NULL, trayicon_toggle_offline_cb, 0, ""}, {N_("/---"), NULL, NULL, 0, ""}, - {N_("/E_xit Sylpheed-Claws"), NULL, trayicon_exit_cb, 0, NULL} + {N_("/E_xit Claws Mail"), NULL, trayicon_exit_cb, 0, NULL} }; static void set_trayicon_pixmap(TrayIconType icontype) @@ -261,7 +261,7 @@ static void create_trayicon() { gint n_entries = 0; - trayicon = egg_tray_icon_new("Sylpheed-Claws"); + trayicon = egg_tray_icon_new("Claws Mail"); gtk_widget_realize(GTK_WIDGET(trayicon)); gtk_window_set_default_size(GTK_WINDOW(trayicon), 16, 16); gtk_container_set_border_width(GTK_CONTAINER(trayicon), 0); @@ -312,12 +312,12 @@ static void create_trayicon() int plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the Trayicon plugin was built with")); + *error = g_strdup(_("Your version of Claws Mail is newer than the version the Trayicon 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 Trayicon plugin")); + *error = g_strdup(_("Your version of Claws Mail is too old for the Trayicon plugin")); return -1; } diff --git a/src/pop.c b/src/pop.c index da9b7d41c..effe156a3 100644 --- a/src/pop.c +++ b/src/pop.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/pop.h b/src/pop.h index 9d670f08d..fe2785e82 100644 --- a/src/pop.h +++ b/src/pop.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/prefs_account.c b/src/prefs_account.c index 3c2721d0d..330f25842 100644 --- a/src/prefs_account.c +++ b/src/prefs_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 @@ -1195,7 +1195,7 @@ static void prefs_account_basic_create(void) no_imap_warn_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR); - no_imap_warn_label = gtk_label_new(_("Warning: this version of Sylpheed-Claws\n" + no_imap_warn_label = gtk_label_new(_("Warning: this version of Claws Mail\n" "has been built without IMAP support.")); gtk_label_set_use_markup(GTK_LABEL(no_imap_warn_label), TRUE); diff --git a/src/prefs_account.h b/src/prefs_account.h index 08ff40cad..bc59eebea 100644 --- a/src/prefs_account.h +++ b/src/prefs_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/prefs_actions.c b/src/prefs_actions.c index 1109609fc..d5913ffe7 100644 --- a/src/prefs_actions.c +++ b/src/prefs_actions.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/prefs_actions.h b/src/prefs_actions.h index 68d0344aa..0c6b9b10e 100644 --- a/src/prefs_actions.h +++ b/src/prefs_actions.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/prefs_common.c b/src/prefs_common.c index 776471610..ab897ca70 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.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/prefs_common.h b/src/prefs_common.h index e04c43d9f..506679808 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.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/prefs_compose_writing.c b/src/prefs_compose_writing.c index 5762d521e..c6e36a70e 100644 --- a/src/prefs_compose_writing.c +++ b/src/prefs_compose_writing.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & The Sylpheed-Claws Team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_compose_writing.h b/src/prefs_compose_writing.h index d5d9dffad..99d5c392e 100644 --- a/src/prefs_compose_writing.h +++ b/src/prefs_compose_writing.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & the Sylpheed-Claws team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_customheader.c b/src/prefs_customheader.c index ce1e22ccd..103f7d8c9 100644 --- a/src/prefs_customheader.c +++ b/src/prefs_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/prefs_customheader.h b/src/prefs_customheader.h index 94cbebb8a..cbf67bd9d 100644 --- a/src/prefs_customheader.h +++ b/src/prefs_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/prefs_display_header.c b/src/prefs_display_header.c index 95cb4db9d..67ac24bee 100644 --- a/src/prefs_display_header.c +++ b/src/prefs_display_header.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/prefs_display_header.h b/src/prefs_display_header.h index 8840d46f4..9e0e015a8 100644 --- a/src/prefs_display_header.h +++ b/src/prefs_display_header.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/prefs_ext_prog.c b/src/prefs_ext_prog.c index b6adc0944..6ac4b157f 100644 --- a/src/prefs_ext_prog.c +++ b/src/prefs_ext_prog.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/prefs_ext_prog.h b/src/prefs_ext_prog.h index cde18d1ac..9829d8333 100644 --- a/src/prefs_ext_prog.h +++ b/src/prefs_ext_prog.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/prefs_filtering.c b/src/prefs_filtering.c index c29c7f1f6..ca3f5c269 100644 --- a/src/prefs_filtering.c +++ b/src/prefs_filtering.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/prefs_folder_column.c b/src/prefs_folder_column.c index 02f9710f0..b2e7e5211 100644 --- a/src/prefs_folder_column.c +++ b/src/prefs_folder_column.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/prefs_folder_column.h b/src/prefs_folder_column.h index b2a6c3dd8..5e570ca19 100644 --- a/src/prefs_folder_column.h +++ b/src/prefs_folder_column.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/prefs_folder_item.c b/src/prefs_folder_item.c index bc297c4a7..031718efd 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.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/prefs_folder_item.h b/src/prefs_folder_item.h index edfd5cc66..793fc0edc 100644 --- a/src/prefs_folder_item.h +++ b/src/prefs_folder_item.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/prefs_fonts.c b/src/prefs_fonts.c index c02860f1b..cb4c830b2 100644 --- a/src/prefs_fonts.c +++ b/src/prefs_fonts.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/prefs_fonts.h b/src/prefs_fonts.h index 8ff2f1e78..f4c95b1f1 100644 --- a/src/prefs_fonts.h +++ b/src/prefs_fonts.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/prefs_gtk.c b/src/prefs_gtk.c index 7c569a1ea..244fe2b99 100644 --- a/src/prefs_gtk.c +++ b/src/prefs_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/prefs_gtk.h b/src/prefs_gtk.h index af546f00d..399007a6f 100644 --- a/src/prefs_gtk.h +++ b/src/prefs_gtk.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/prefs_image_viewer.c b/src/prefs_image_viewer.c index dce5fc79a..1d42d53ea 100644 --- a/src/prefs_image_viewer.c +++ b/src/prefs_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/prefs_image_viewer.h b/src/prefs_image_viewer.h index 0715c7693..4a80d02f2 100644 --- a/src/prefs_image_viewer.h +++ b/src/prefs_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/prefs_matcher.c b/src/prefs_matcher.c index 09339c20f..8bfc45f41 100644 --- a/src/prefs_matcher.c +++ b/src/prefs_matcher.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/prefs_matcher.h b/src/prefs_matcher.h index 05228d3bd..fe44a906c 100644 --- a/src/prefs_matcher.h +++ b/src/prefs_matcher.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/prefs_message.c b/src/prefs_message.c index b9d102953..b2930ff03 100644 --- a/src/prefs_message.c +++ b/src/prefs_message.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & The Sylpheed-Claws Team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_message.h b/src/prefs_message.h index 8bceace33..9a7510477 100644 --- a/src/prefs_message.h +++ b/src/prefs_message.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005 Colin Leroy & the Sylpheed-Claws team + * Copyright (C) 2005 Colin Leroy & 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/prefs_msg_colors.c b/src/prefs_msg_colors.c index 3cf8a4e74..52be6ca38 100644 --- a/src/prefs_msg_colors.c +++ b/src/prefs_msg_colors.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/prefs_msg_colors.h b/src/prefs_msg_colors.h index 96a18c59e..21940a0f3 100644 --- a/src/prefs_msg_colors.h +++ b/src/prefs_msg_colors.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/prefs_other.c b/src/prefs_other.c index 5f68f8ff0..78a60c766 100644 --- a/src/prefs_other.c +++ b/src/prefs_other.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & The Sylpheed-Claws Team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_other.h b/src/prefs_other.h index 75ec3a166..0190d7a06 100644 --- a/src/prefs_other.h +++ b/src/prefs_other.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005 Colin Leroy & the Sylpheed-Claws team + * Copyright (C) 2005 Colin Leroy & 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/prefs_quote.c b/src/prefs_quote.c index 771fe1a02..afd4c8171 100644 --- a/src/prefs_quote.c +++ b/src/prefs_quote.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & The Sylpheed-Claws Team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_quote.h b/src/prefs_quote.h index bd64309cb..c274d9aed 100644 --- a/src/prefs_quote.h +++ b/src/prefs_quote.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005 Colin Leroy & the Sylpheed-Claws team + * Copyright (C) 2005 Colin Leroy & 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/prefs_receive.c b/src/prefs_receive.c index a1c4b1f84..34d7f38ac 100644 --- a/src/prefs_receive.c +++ b/src/prefs_receive.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & The Sylpheed-Claws Team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_receive.h b/src/prefs_receive.h index 8e8324430..0c50da68f 100644 --- a/src/prefs_receive.h +++ b/src/prefs_receive.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005 Colin Leroy & the Sylpheed-Claws team + * Copyright (C) 2005 Colin Leroy & 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/prefs_send.c b/src/prefs_send.c index d37788cb9..c5d5f7df2 100644 --- a/src/prefs_send.c +++ b/src/prefs_send.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & The Sylpheed-Claws Team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_send.h b/src/prefs_send.h index cb47c39ac..ac965071e 100644 --- a/src/prefs_send.h +++ b/src/prefs_send.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005 Colin Leroy & the Sylpheed-Claws team + * Copyright (C) 2005 Colin Leroy & 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/prefs_spelling.c b/src/prefs_spelling.c index f609ac9d0..7c8864fb9 100644 --- a/src/prefs_spelling.c +++ b/src/prefs_spelling.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2002-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team + * Copyright (C) 2002-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/prefs_spelling.h b/src/prefs_spelling.h index 1bd3c39d7..0d3866014 100644 --- a/src/prefs_spelling.h +++ b/src/prefs_spelling.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/prefs_summaries.c b/src/prefs_summaries.c index 924b19ab8..f36cc0072 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & The Sylpheed-Claws Team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_summaries.h b/src/prefs_summaries.h index aa08b7536..82450c7bb 100644 --- a/src/prefs_summaries.h +++ b/src/prefs_summaries.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2006 Colin Leroy & the Sylpheed-Claws team + * Copyright (C) 2005-2006 Colin Leroy & 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/prefs_summary_column.c b/src/prefs_summary_column.c index 2c2307e81..5f999273a 100644 --- a/src/prefs_summary_column.c +++ b/src/prefs_summary_column.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/prefs_summary_column.h b/src/prefs_summary_column.h index 810b5fc9a..19745f036 100644 --- a/src/prefs_summary_column.h +++ b/src/prefs_summary_column.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/prefs_template.c b/src/prefs_template.c index b9fd561ed..4a42c567b 100644 --- a/src/prefs_template.c +++ b/src/prefs_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/prefs_template.h b/src/prefs_template.h index f9f768d16..7442abca0 100644 --- a/src/prefs_template.h +++ b/src/prefs_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/prefs_themes.c b/src/prefs_themes.c index 6f9678c35..c1daf8e94 100644 --- a/src/prefs_themes.c +++ b/src/prefs_themes.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 @@ -703,7 +703,7 @@ static void prefs_themes_get_theme_info(ThemesData *tdata) if (IS_INTERNAL_THEME(path)) { info->name = g_strdup(_("Default internal theme")); - info->author = g_strdup(_("The Sylpheed-Claws Team")); + info->author = g_strdup(_("The Claws Mail Team")); info->url = g_strdup(HOMEPAGE_URI); info->status = g_strdup_printf(_("Internal theme has %d icons"), N_STOCK_PIXMAPS); } diff --git a/src/prefs_themes.h b/src/prefs_themes.h index 8c6d91a0f..ebd547196 100644 --- a/src/prefs_themes.h +++ b/src/prefs_themes.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/prefs_toolbar.c b/src/prefs_toolbar.c index 780ac1511..adca0b974 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2002-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team + * Copyright (C) 2002-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 @@ -295,7 +295,7 @@ static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar) for (i = 0; i < STOCK_PIXMAP_EMPTY; i++) { GdkPixbuf *pixbuf; - if (i == STOCK_PIXMAP_SYLPHEED_CLAWS_LOGO) + if (i == STOCK_PIXMAP_CLAWS_MAIL_LOGO) continue;/* that's too big */ stock_pixbuf_gdk(prefs_toolbar->window, i, &pixbuf); @@ -640,7 +640,7 @@ static void prefs_toolbar_selection_changed(GtkList *list, if (g_utf8_collate(cur_entry, actions_entry) == 0) { gtk_widget_hide(prefs_toolbar->entry_icon_text); gtk_widget_show(prefs_toolbar->combo_syl_action); - gtk_label_set_text(GTK_LABEL(prefs_toolbar->label_icon_text), _("Sylpheed-Claws Action")); + gtk_label_set_text(GTK_LABEL(prefs_toolbar->label_icon_text), _("Claws Mail Action")); if (prefs_common.actions_list == NULL) { gtk_widget_set_sensitive(prefs_toolbar->combo_syl_action, FALSE); diff --git a/src/prefs_toolbar.h b/src/prefs_toolbar.h index 5edffd1ae..4e4951396 100644 --- a/src/prefs_toolbar.h +++ b/src/prefs_toolbar.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/prefs_wrapping.c b/src/prefs_wrapping.c index efbc1df2b..7bd5374bd 100644 --- a/src/prefs_wrapping.c +++ b/src/prefs_wrapping.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/prefs_wrapping.h b/src/prefs_wrapping.h index 5e2e9a710..6d96ac99a 100644 --- a/src/prefs_wrapping.h +++ b/src/prefs_wrapping.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/privacy.c b/src/privacy.c index d99f145e7..6b4fe1021 100644 --- a/src/privacy.c +++ b/src/privacy.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/privacy.h b/src/privacy.h index c1b9ff794..db4df8d09 100644 --- a/src/privacy.h +++ b/src/privacy.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/procheader.c b/src/procheader.c index 2c1d4bf5e..dae95bdf5 100644 --- a/src/procheader.c +++ b/src/procheader.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/procheader.h b/src/procheader.h index e9cf543c9..44a716ea0 100644 --- a/src/procheader.h +++ b/src/procheader.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/procmime.c b/src/procmime.c index 4314ec79c..0ba724bc2 100644 --- a/src/procmime.c +++ b/src/procmime.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/procmime.h b/src/procmime.h index ba90995fa..59dadc411 100644 --- a/src/procmime.h +++ b/src/procmime.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/procmsg.c b/src/procmsg.c index 8e0bb3588..7486414dc 100644 --- a/src/procmsg.c +++ b/src/procmsg.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 @@ -1667,7 +1667,7 @@ send_mail: if (errstr) { if (*errstr) g_free(*errstr); *errstr = g_strdup(_("Couldn't determine sending informations. " - "Maybe the email hasn't been generated by Sylpheed-Claws.")); + "Maybe the email hasn't been generated by Claws Mail.")); } mailval = -1; } diff --git a/src/procmsg.h b/src/procmsg.h index c1edc2ed2..4c4996f38 100644 --- a/src/procmsg.h +++ b/src/procmsg.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 @@ -77,7 +77,7 @@ typedef GSList MsgNumberList; #define MSG_SPAM (1U << 13) /* new one */ /* RESERVED */ -#define MSG_RESERVED_CLAWS (1U << 30) /* for sylpheed-claws */ +#define MSG_RESERVED_CLAWS (1U << 30) /* for claws-mail */ #define MSG_RESERVED (1U << 31) typedef guint32 MsgPermFlags; diff --git a/src/quote_fmt.c b/src/quote_fmt.c index 736bb80a1..c41afc2f6 100644 --- a/src/quote_fmt.c +++ b/src/quote_fmt.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/quote_fmt_parse.y b/src/quote_fmt_parse.y index b0c479706..d2107a48f 100644 --- a/src/quote_fmt_parse.y +++ b/src/quote_fmt_parse.y @@ -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/recv.c b/src/recv.c index e457dece4..2efa90f8d 100644 --- a/src/recv.c +++ b/src/recv.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/recv.h b/src/recv.h index 9473434d9..6aa1ae49f 100644 --- a/src/recv.h +++ b/src/recv.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/remotefolder.c b/src/remotefolder.c index 9db865f19..68a573623 100644 --- a/src/remotefolder.c +++ b/src/remotefolder.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2002-2006 by the Sylpheed Claws Team and Hiroyuki Yamamoto + * Copyright (C) 2002-2006 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/remotefolder.h b/src/remotefolder.h index a03985689..597f052a4 100644 --- a/src/remotefolder.h +++ b/src/remotefolder.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2002-2006 by the Sylpheed Claws Team and Hiroyuki Yamamoto + * Copyright (C) 2002-2006 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/send_message.c b/src/send_message.c index 6db9a1d96..cb7cbde16 100644 --- a/src/send_message.c +++ b/src/send_message.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 @@ -299,7 +299,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g 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/send_message.h b/src/send_message.h index b6fd02970..d6effad34 100644 --- a/src/send_message.h +++ b/src/send_message.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/setup.c b/src/setup.c index 735efbeb3..e3b686d76 100644 --- a/src/setup.c +++ b/src/setup.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/setup.h b/src/setup.h index c2fc9cf19..6ff9b7081 100644 --- a/src/setup.h +++ b/src/setup.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/sourcewindow.c b/src/sourcewindow.c index 6c0de4d85..415bef3e0 100644 --- a/src/sourcewindow.c +++ b/src/sourcewindow.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/sourcewindow.h b/src/sourcewindow.h index 43ef6e564..cac4b2dfb 100644 --- a/src/sourcewindow.h +++ b/src/sourcewindow.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/ssl_manager.c b/src/ssl_manager.c index d956edc0d..ad3d0fc65 100644 --- a/src/ssl_manager.c +++ b/src/ssl_manager.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) 2002-2005 Colin Leroy * * This program is free software; you can redistribute it and/or modify diff --git a/src/ssl_manager.h b/src/ssl_manager.h index c181fe800..2d57ea0e5 100644 --- a/src/ssl_manager.h +++ b/src/ssl_manager.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 Copyright (C) 2002-2005 Colin Leroy * * This program is free software; you can redistribute it and/or modify diff --git a/src/statusbar.c b/src/statusbar.c index 04b076ec3..63905660a 100644 --- a/src/statusbar.c +++ b/src/statusbar.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/statusbar.h b/src/statusbar.h index 0356e1034..16a38281e 100644 --- a/src/statusbar.h +++ b/src/statusbar.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/stock_pixmap.c b/src/stock_pixmap.c index 47f4043d3..acdc274c0 100644 --- a/src/stock_pixmap.c +++ b/src/stock_pixmap.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 @@ -73,8 +73,8 @@ #include "pixmaps/paste.xpm" #include "pixmaps/preferences.xpm" #include "pixmaps/properties.xpm" -#include "pixmaps/sylpheed-claws_icon.xpm" -#include "pixmaps/sylpheed-claws_logo.xpm" +#include "pixmaps/claws-mail_icon.xpm" +#include "pixmaps/claws-mail_logo.xpm" #include "pixmaps/address_book.xpm" #include "pixmaps/unread.xpm" #include "pixmaps/read.xpm" @@ -298,10 +298,10 @@ static StockPixmapData pixmaps[] = {privacy_emblem_failed_xpm , NULL, NULL, "privacy_emblem_failed", NULL}, {privacy_emblem_warn_xpm , NULL, NULL, "privacy_emblem_warn", NULL}, {mime_message_xpm , NULL, NULL, "mime_message", NULL}, - {sylpheed_claws_icon_xpm , NULL, NULL, "sylpheed_claws_icon", NULL}, + {claws_mail_icon_xpm , NULL, NULL, "claws_mail_icon", NULL}, {read_xpm , NULL, NULL, "read", NULL}, {trash_btn_xpm , NULL, NULL, "trash_btn", NULL}, - {sylpheed_claws_logo_xpm , NULL, NULL, "sylpheed_claws_logo", NULL}, + {claws_mail_logo_xpm , NULL, NULL, "claws_mail_logo", NULL}, {dir_noselect_xpm , NULL, NULL, "dir_noselect" , NULL}, {spam_xpm , NULL, NULL, "spam" , NULL}, {spam_btn_xpm , NULL, NULL, "spam_btn" , NULL}, diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h index bf531d13d..9d07a32e9 100644 --- a/src/stock_pixmap.h +++ b/src/stock_pixmap.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 @@ -149,10 +149,10 @@ typedef enum STOCK_PIXMAP_PRIVACY_EMBLEM_FAILED, STOCK_PIXMAP_PRIVACY_EMBLEM_WARN, STOCK_PIXMAP_MIME_MESSAGE, - STOCK_PIXMAP_SYLPHEED_CLAWS_ICON, + STOCK_PIXMAP_CLAWS_MAIL_ICON, STOCK_PIXMAP_READ, STOCK_PIXMAP_TRASH, - STOCK_PIXMAP_SYLPHEED_CLAWS_LOGO, + STOCK_PIXMAP_CLAWS_MAIL_LOGO, STOCK_PIXMAP_DIR_NOSELECT, STOCK_PIXMAP_SPAM, STOCK_PIXMAP_SPAM_BTN, diff --git a/src/summary_search.c b/src/summary_search.c index 5458dd826..3b0544cf3 100644 --- a/src/summary_search.c +++ b/src/summary_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/summary_search.h b/src/summary_search.h index cddb82150..269888b6c 100644 --- a/src/summary_search.h +++ b/src/summary_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/summaryview.c b/src/summaryview.c index 74e770016..fe8fd0645 100644 --- a/src/summaryview.c +++ b/src/summaryview.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 @@ -409,7 +409,7 @@ static gboolean summary_update_folder_item_name(gpointer source, gpointer data); GtkTargetEntry summary_drag_types[2] = { {"text/uri-list", 0, TARGET_MAIL_URI_LIST}, - {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY} + {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY} }; static GtkItemFactoryEntry summary_popup_entries[] = diff --git a/src/summaryview.h b/src/summaryview.h index 7039b2dda..d62b9d51f 100644 --- a/src/summaryview.h +++ b/src/summaryview.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/syldap.c b/src/syldap.c index 16ebe3599..31ee41c98 100644 --- a/src/syldap.c +++ b/src/syldap.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/syldap.h b/src/syldap.h index 67b592329..ef4a1896a 100644 --- a/src/syldap.h +++ b/src/syldap.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/textview.c b/src/textview.c index 8af9f7799..585258270 100644 --- a/src/textview.c +++ b/src/textview.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 @@ -1889,7 +1889,7 @@ static void textview_show_header(TextView *textview, GPtrArray *headers) if ((procheader_headername_equal(header->name, "X-Mailer") || procheader_headername_equal(header->name, "X-Newsreader")) && - strstr(header->body, "Sylpheed-Claws") != NULL) { + strstr(header->body, "Claws Mail") != NULL) { gtk_text_buffer_get_end_iter (buffer, &iter); gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, header->body, -1, diff --git a/src/textview.h b/src/textview.h index e5fe0d311..3a1c1e16a 100644 --- a/src/textview.h +++ b/src/textview.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/toolbar.c b/src/toolbar.c index 292fd406a..1955abed6 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * 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 @@ -191,7 +191,7 @@ struct { #ifdef USE_ASPELL { "A_CHECK_SPELLING", N_("Check spelling") }, #endif - { "A_SYL_ACTIONS", N_("Sylpheed-Claws Actions Feature") }, + { "A_SYL_ACTIONS", N_("Claws Mail Actions Feature") }, { "A_SEPARATOR", "Separator" } }; diff --git a/src/toolbar.h b/src/toolbar.h index ff177acb6..f52f5e944 100644 --- a/src/toolbar.h +++ b/src/toolbar.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * 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/undo.c b/src/undo.c index ced57c515..bdb95d0f6 100644 --- a/src/undo.c +++ b/src/undo.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/undo.h b/src/undo.h index 922d76793..e7284c225 100644 --- a/src/undo.h +++ b/src/undo.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/unmime.c b/src/unmime.c index f20a83c14..80b41fe5a 100644 --- a/src/unmime.c +++ b/src/unmime.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/unmime.h b/src/unmime.h index 9c4652e8b..e5176842b 100644 --- a/src/unmime.h +++ b/src/unmime.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/vcard.c b/src/vcard.c index 20a53e697..8af2a3c80 100644 --- a/src/vcard.c +++ b/src/vcard.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/vcard.h b/src/vcard.h index 2ca99ed63..004f13b33 100644 --- a/src/vcard.h +++ b/src/vcard.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/wizard.c b/src/wizard.c index ae059fe7b..1218e1d4d 100644 --- a/src/wizard.c +++ b/src/wizard.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 @@ -456,7 +456,7 @@ static void write_welcome_email(WizardWindow *wizard) get_rfc822_date(buf_date, sizeof(buf_date)); - subj = g_strdup_printf(_("Welcome to Sylpheed-Claws ")); + subj = g_strdup_printf(_("Welcome to Claws Mail ")); head = g_strdup_printf( "From: %s <%s>\n" @@ -466,21 +466,21 @@ static void write_welcome_email(WizardWindow *wizard) "X-Face: %s\n" "Face: %s\n" "Content-Type: text/plain; charset=UTF-8\n", - _("Sylpheed-Claws Team"), + _("Claws Mail Team"), USERS_ML_ADDR, gtk_entry_get_text(GTK_ENTRY(wizard->full_name)), gtk_entry_get_text(GTK_ENTRY(wizard->email)), buf_date, subj, XFACE, FACE); body = g_strdup_printf( _("\n" - "Welcome to Sylpheed-Claws\n" + "Welcome to Claws Mail\n" "-------------------------\n" "\n" "Now that you have set up your account you can fetch your\n" "mail by clicking the 'Get Mail' button at the left of the\n" "toolbar.\n" "\n" - "Sylpheed-Claws has lots of extra features accessible via plugins,\n" + "Claws Mail has lots of extra features accessible via plugins,\n" "like anti-spam filtering and learning (via the Bogofilter or\n" "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n" "aggregator, a calendar, and much more. You can load them from\n" @@ -491,7 +491,7 @@ static void write_welcome_email(WizardWindow *wizard) "and change the general Preferences by using\n" "'/Configuration/Preferences'.\n" "\n" - "You can find further information in the Sylpheed-Claws manual,\n" + "You can find further information in the Claws Mail manual,\n" "which can be accessed by using the menu entry '/Help/Manual'\n" "or online at the URL given below.\n" "\n" @@ -505,7 +505,7 @@ static void write_welcome_email(WizardWindow *wizard) "\n" "LICENSE\n" "-------\n" - "Sylpheed-Claws is free software, released under the terms\n" + "Claws Mail is free software, released under the terms\n" "of the GNU General Public License, version 2 or later, as\n" "published by the Free Software Foundation, 51 Franklin Street,\n" "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n" @@ -513,7 +513,7 @@ static void write_welcome_email(WizardWindow *wizard) "\n" "DONATIONS\n" "---------\n" - "If you wish to donate to the Sylpheed-Claws project you can do\n" + "If you wish to donate to the Claws Mail project you can do\n" "so at <%s>.\n\n"), HOMEPAGE_URI, MANUAL_URI, FAQ_URI, THEMES_URI, MAILING_LIST_URI, GPL_URI, DONATE_URI); @@ -712,7 +712,7 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title) /* create the titlebar */ hbox = gtk_hbox_new (FALSE, 12); image = stock_pixmap_widget(wizard->window, - STOCK_PIXMAP_SYLPHEED_CLAWS_ICON); + STOCK_PIXMAP_CLAWS_MAIL_ICON); gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 0); title_string = g_strconcat ("", title ? title : "", "", NULL); w = gtk_label_new (title_string); @@ -1103,7 +1103,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) i++; wizard->no_imap_warning = gtk_label_new(_( - "Warning: this version of Sylpheed-Claws\n" + "Warning: this version of Claws Mail\n" "has been built without IMAP support.")); gtk_label_set_use_markup(GTK_LABEL(wizard->no_imap_warning), TRUE); gtk_table_attach(GTK_TABLE(table), wizard->no_imap_warning, @@ -1245,7 +1245,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) { wizard_read_defaults(); - wizard->window = gtk_dialog_new_with_buttons (_("Sylpheed-Claws Setup Wizard"), + wizard->window = gtk_dialog_new_with_buttons (_("Claws Mail Setup Wizard"), NULL, 0, GTK_STOCK_GO_BACK, GO_BACK, GTK_STOCK_GO_FORWARD, GO_FORWARD, @@ -1277,19 +1277,19 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) { /*welcome page: 0 */ WELCOME_PAGE = i; - page = create_page(wizard, _("Welcome to Sylpheed-Claws")); + page = create_page(wizard, _("Welcome to Claws Mail")); wizard->pages = g_slist_append(wizard->pages, page); widget = stock_pixmap_widget(wizard->window, - STOCK_PIXMAP_SYLPHEED_CLAWS_LOGO); + STOCK_PIXMAP_CLAWS_MAIL_LOGO); gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0); - text = g_strdup(_("Welcome to the Sylpheed-Claws setup wizard.\n\n" + text = g_strdup(_("Welcome to the Claws Mail setup wizard.\n\n" "We will begin by defining some basic " "information about you and your most common " "mail options so that you can start to use " - "Sylpheed-Claws in less than five minutes.")); + "Claws Mail in less than five minutes.")); widget = gtk_label_new(text); gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE); gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0); @@ -1350,11 +1350,11 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) { wizard->pages = g_slist_append(wizard->pages, page); widget = stock_pixmap_widget(wizard->window, - STOCK_PIXMAP_SYLPHEED_CLAWS_LOGO); + STOCK_PIXMAP_CLAWS_MAIL_LOGO); gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0); - text = g_strdup(_("Sylpheed-Claws is now ready.\n\n" + text = g_strdup(_("Claws Mail is now ready.\n\n" "Click Save to start.")); widget = gtk_label_new(text); gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0); diff --git a/src/wizard.h b/src/wizard.h index d618355eb..74225f600 100644 --- a/src/wizard.h +++ b/src/wizard.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/tools/OOo2sylpheed.pl b/tools/OOo2sylpheed.pl index c6a865b5f..d4a11f0af 100644 --- a/tools/OOo2sylpheed.pl +++ b/tools/OOo2sylpheed.pl @@ -17,7 +17,7 @@ # * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # OOo2sylpheed.pl helper script to send documents from OpenOffice.org -# to Sylpheed-Claws +# to Claws Mail use strict; @@ -26,7 +26,7 @@ my $input = <>; $ARGV =~ s/^"attachment='file:\/\///; $ARGV =~ s/'"$//; $ARGV =~ s/%20/ /g; -exec "sylpheed-claws --attach \"$ARGV\""; +exec "claws-mail --attach \"$ARGV\""; ## change the line above to point to your sylpheed executable exit; diff --git a/tools/README b/tools/README index 02d59916d..18c4f522a 100644 --- a/tools/README +++ b/tools/README @@ -47,7 +47,7 @@ Action scripts * freshmeat_search.pl WORKS ON: selection COMMAND: |freshmeat_search.pl - Search freshmeat.net for selected text using the default Sylpheed-Claws browser + Search freshmeat.net for selected text using the default Claws Mail browser * google_msgid.pl WORKS ON: selection @@ -58,7 +58,7 @@ Action scripts * google_search.pl WORKS ON: selection COMMAND: |google_search.pl - Search google.com for selected text using the default Sylpheed-Claws browser + Search google.com for selected text using the default Claws Mail browser * multiwebsearch.pl WORKS ON: selection @@ -82,8 +82,8 @@ Action scripts WHAT IT DOES This is an Actions script that allows you to search websites for the selected text. It uses the default - Sylpheed-Claws browser as configured through Sylpheed - -Claws' GUI and specified in ~/.sylpheed-claws/sylpheedrc, + Claws Mail browser as configured through Sylpheed + -Claws' GUI and specified in ~/.claws-mail/sylpheedrc, and a configuration file called multiwebsearch.conf. CONFIGURATION @@ -98,7 +98,7 @@ Action scripts is included. HOW TO USE IT - Copy 'multiwebsearch.conf' to ~/.sylpheed-claws/ + Copy 'multiwebsearch.conf' to ~/.claws-mail/ Configure an Action: a) pre-configured website @@ -141,24 +141,24 @@ Address book conversion WHAT IT DOES This perl script will convert an exported Kmail addressbook into a - Sylpheed-Claws addressbook. If your version of Kmail is 1.37 or + Claws Mail addressbook. If your version of Kmail is 1.37 or greater and/or your version of KAddressBook is 3.1beta1 or greater, or this script mixes up your definitions and their related data, use 'kmail2sylpheed_v2.pl' instead. HOW TO USE IT - (You must run sylpheed-claws at least once before running this script.) + (You must run claws-mail at least once before running this script.) In Kmail's Address book choose '/File/Export List'. This will export your Kmail address book data to a *.csv file. - If Sylpheed-Claws is running, close it. + If Claws Mail is running, close it. From the command line, execute the following: perl kmail2sylpheed.pl --kmailfile=/path/to/addressbook.csv - Your Kmail address book data will now be contained in Sylpheed-Claws' + Your Kmail address book data will now be contained in Claws Mail' address book, under the name 'Kmail Address Book'. Contact: Paul Mangan @@ -170,16 +170,16 @@ Address book conversion WHAT IT DOES This perl script will convert a Kmail address book that has been - exported in csv format into a Sylpheed-Claws address book. + exported in csv format into a Claws Mail address book. HOW TO USE IT - (You must run sylpheed-claws at least once before running this script.) + (You must run claws-mail at least once before running this script.) Open Kmail's Addressbook, /File/Address Book In Kmail's Addressbook choose '/File/Export/Export List...'. This will allow you to export your Kmail addressbook data to a *.csv file. - If Sylpheed-Claws is running, close it. + If Claws Mail is running, close it. From the command line, execute the following: @@ -187,7 +187,7 @@ Address book conversion You can also use --help to see usage instructions. - Your Kmail addressbook data will now be contained in Sylpheed-Claws' + Your Kmail addressbook data will now be contained in Claws Mail' addressbook, under the name 'Kmail address book'. Contact: Paul Mangan @@ -197,7 +197,7 @@ Address book conversion WHAT IT DOES This perl script converts an Outlook generated contact list into a - Sylpheed-Claws XML address book. + Claws Mail XML address book. HOW TO USE IT For text files: @@ -205,7 +205,7 @@ Address book conversion You must export Outlook Express contact list as TXT file, choosing only "Name" and "Address" fields to export. - You must exit Sylpheed-Claws before converting the contact list. + You must exit Claws Mail before converting the contact list. From the command line, execute the following: @@ -216,7 +216,7 @@ Address book conversion You must export Outlook contact list as CSV file, choosing ALL the fields available for exporting. - You must exit Sylpheed-Claws before converting the contact list. + You must exit Claws Mail before converting the contact list. From the command line, execute the following: @@ -228,7 +228,7 @@ Address book conversion script. For csv files you must export all fields (but only non empty fields - are added to the created Sylpheed-Claws address book) and the number + are added to the created Claws Mail address book) and the number of fields expected is harcoded. Look for the $nboffields variable in the script and change its value if you are sure you exported all fields and script gives the 'unknown csv file format' error. @@ -240,19 +240,19 @@ Address book conversion WHAT IT DOES This perl script will convert an address book exported from The Bat! - into a Sylpheed-Claws address book. + into a Claws Mail address book. HOW TO USE IT - (You must run sylpheed-claws at least once before running this script.) + (You must run claws-mail at least once before running this script.) - If Sylpheed-Claws is running, close it. + If Claws Mail is running, close it. Export The Bat! Address Book to CSV file format with all fields selected to YES and then start: tb2sylpheed --tbfile=/full/path/to/thebat/addressbook.csv - The Bat! addressbook data will now be contained in Sylpheed-Claws' + The Bat! addressbook data will now be contained in Claws Mail' addressbook, under the name 'The Bat! Address Book'. Contact: Urke MMI @@ -261,13 +261,13 @@ Address book conversion * vcard2xml.py WHAT IT DOES - This python script will convert an Evolution vCard into a Sylpheed-Claws + This python script will convert an Evolution vCard into a Claws Mail address book. HOW TO USE IT - (You must run sylpheed-claws at least once before running this script.) + (You must run claws-mail at least once before running this script.) - If Sylpheed-Claws is running, close it. + If Claws Mail is running, close it. From the command line, execute the following: vcard2xml.py source_file [destination_file] @@ -317,7 +317,7 @@ Mailbox conversion WHAT IT DOES This perl script converts an mbox directory's contents into - Sylpheed-Claws' MH format. + Claws Mail' MH format. HOW TO USE IT @@ -325,8 +325,8 @@ Mailbox conversion perl convert_mbox.pl MBOX MH_DIR - Move the outputted MH_DIR and its contents into your Sylpheed-Claws - Mail folder; in Sylpheed-Claws right-click the top-level folder and + Move the outputted MH_DIR and its contents into your Claws Mail + Mail folder; in Claws Mail right-click the top-level folder and choose 'Rebuild folder tree' from the popup menu. Contact: Fred Marton @@ -335,17 +335,17 @@ Mailbox conversion WHAT IT DOES This perl script converts a mailbox in maildir format into - Sylpheed-Claws' MH format. + Claws Mail' MH format. HOW TO USE IT - Exit Sylpheed-Claws if running. + Exit Claws Mail if running. Run the script using: perl maildir2sylpheed.pl --kmaildir=mail_folder_name - Start Sylpheed-Claws and right-click the toplevel mailbox, i.e + Start Claws Mail and right-click the toplevel mailbox, i.e "Mailbox (MH)", and select 'Rebuild folder tree'. You may also need to run '/File/Folder/Check for new messages in all folders' @@ -362,7 +362,7 @@ Mailbox conversion WHAT IT DOES This python script integrates a Thunderbird folder tree into - Sylpheed-Claws. + Claws Mail. HOW TO USE IT @@ -385,7 +385,7 @@ Other tools WHAT IT DOES This perl script enables Adobe Reader 7 to send documents to - Sylpheed-Claws as attachments. + Claws Mail as attachments. HOW TO USE IT Make sure that the script is executable (chmod +x acroread2sylpheed.pl) @@ -395,7 +395,7 @@ Other tools Enter the path to this script in the alternate location box You can then use 'File/Email' or the Email toolbar button to launch - sylpheed-claws (if not already launched) and open a new compose window + claws-mail (if not already launched) and open a new compose window with the PDF attached. Contact: Paul Mangan @@ -406,7 +406,7 @@ Other tools WHAT IT DOES This perl script provides easy conversion of your filtering rules from sylpheed's new filter system (>= 0.9.99) to the filtering system used in - sylpheed-claws. (Disabled rules are ignored) + claws-mail. (Disabled rules are ignored) It reads '~/.sylpheed-2.0/filter.xml' or '~/.sylpheed/filter.xml' and writes '~/[CLAWS CONFIG DIR]/matcherrc' @@ -429,8 +429,8 @@ Other tools WHAT IT DOES This perl script provides easy conversion of your filtering rules from sylpheed's old filter system (< 0.9.99) to the filtering system - used in sylpheed-claws. - It reads '~/.sylpheed/filterrc' and writes '~/.sylpheed-claws/matcherrc' + used in claws-mail. + It reads '~/.sylpheed/filterrc' and writes '~/.claws-mail/matcherrc' HOW TO USE IT Issue the following command from the 'tools' directory: @@ -461,14 +461,14 @@ Other tools WHAT IT DOES This perl script enables OpenOffice.org to send documents to - Sylpheed-Claws as attachments. + Claws Mail as attachments. HOW TO USE IT OpenOffice.org Version 2.0 ---------------------------- This script is not needed for OOo version 2, which can work - directly with Sylpheed-Claws. - Go to 'Tools/Options/Internet/E-mail' and enter 'sylpheed-claws' + directly with Claws Mail. + Go to 'Tools/Options/Internet/E-mail' and enter 'claws-mail' in the box. OpenOffice.org Version 1.1.0 @@ -481,7 +481,7 @@ Other tools or select it by clicking on the '...' button. You can then use 'File/Send/Document as email' to launch - sylpheed-claws (if not already launched) and open a new compose + claws-mail (if not already launched) and open a new compose window with the document attached. OpenOffice.org Version 1.0 @@ -524,7 +524,7 @@ Extra tools WHAT IT DOES This perl script converts a monochrome (1 bit) 48x48 pixels GIF file into an X-Face graphic suitable for inclusion into custom headers of - Sylpheed-Claws. An X-Face allows to quickly identify (or be identified + Claws Mail. An X-Face allows to quickly identify (or be identified as) the sender of a mail message in a xface-capable MUA (like sylpheed -claws). @@ -541,11 +541,11 @@ Extra tools ./gif2xface < filename.gif > filename.xface In filename.xface will be the X-Face header ready to use. - You can add a custom header in Sylpheed-Claws through Configuration-> + You can add a custom header in Claws Mail through Configuration-> Preferences per account, "Send" tab, check "Add user-defined header" then "Edit..." if you want to add it via Sylpheed -Claws interface, or do - echo "0:" `cat filename.xface` > ~/.sylpheed-claws/customheaderrc + echo "0:" `cat filename.xface` > ~/.claws-mail/customheaderrc if you want to create the custom headers file yourself (Warning: this method is valid only if you don't have any other custom header set or diff --git a/tools/README.sylprint b/tools/README.sylprint index cda66c6a8..d8111de2d 100644 --- a/tools/README.sylprint +++ b/tools/README.sylprint @@ -148,7 +148,7 @@ FILES Stores user default preferred configuration for the script. Settings in this file may be overriden by command line options. Must be stored in the same - directory of the script and/or in the ~/.sylpheed-claws + directory of the script and/or in the ~/.claws-mail one (Sylpheed user's configuration directory). /tmp/sylprint.username.number @@ -165,7 +165,7 @@ FILES SEE ALSO Sylpheed: http://sylpheed.good-day.net - Sylpheed Claws: http://sylpheed-claws.sourceforge.net + Claws Mail: http://claws-mail.org/ Enscript: http://www.iki.fi/~mtr/genscript/ Muttprint: http://bwalle.exit.mytoday.de/muttprint/ Sylprint: http://www.aic.uniovi.es/mones/sylprint/ diff --git a/tools/acroread2sylpheed.pl b/tools/acroread2sylpheed.pl index 581ee6e68..4a472b861 100644 --- a/tools/acroread2sylpheed.pl +++ b/tools/acroread2sylpheed.pl @@ -17,7 +17,7 @@ # * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # acroread2sylpheed.pl helper script to send documents from -# Adobe Reader 7 to sylpheed-claws +# Adobe Reader 7 to claws-mail use strict; @@ -40,8 +40,8 @@ if ($ARGV =~ m/^\//) { $pdf = $ENV{HOME}."/".$output; } -exec "sylpheed-claws --attach \"$pdf\""; +exec "claws-mail --attach \"$pdf\""; ## if necessary, change the line above to point to -## your sylpheed-claws executable +## your claws-mail executable exit; diff --git a/tools/claws.i18n.status.pl b/tools/claws.i18n.status.pl index 0412a4a47..e3e6d46b0 100644 --- a/tools/claws.i18n.status.pl +++ b/tools/claws.i18n.status.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# claws.i18n.stats.pl - Generate statistics for Sylpheed Claws po directory. +# claws.i18n.stats.pl - Generate statistics for Claws Mail po directory. # # (c) 2003 by Ricardo Mones Lastra # This program is released under the GNU General Public License. diff --git a/tools/filter_conv.pl b/tools/filter_conv.pl index fe5a382cd..fe658f4a9 100644 --- a/tools/filter_conv.pl +++ b/tools/filter_conv.pl @@ -21,11 +21,11 @@ use strict; # * my $old_config_dir = "$ENV{HOME}/.sylpheed"; -my $config_dir = `sylpheed-claws --config-dir`; +my $config_dir = `claws-mail --config-dir`; chomp $config_dir; chdir($ENV{ HOME } . "/$config_dir") - or die("You don't appear to have Sylpheed-Claws installed\n"); + or die("You don't appear to have Claws Mail installed\n"); ############################################################################### diff --git a/tools/filter_conv_new.pl b/tools/filter_conv_new.pl index 93c953607..5843b00ce 100644 --- a/tools/filter_conv_new.pl +++ b/tools/filter_conv_new.pl @@ -22,13 +22,13 @@ use XML::SimpleObject; # # Convert new style Sylpheed filter rules (Sylpheed >= 0.9.99) to -# Sylpheed-Claws filtering rules +# Claws Mail filtering rules # # # TABLE OF EQUIVALENTS # -# SYLPHEED : SYLPHEED-CLAWS +# SYLPHEED : Claws Mail #------------------------------------------------------ # # NAME @@ -80,13 +80,13 @@ my $old_config = "$ENV{HOME}/.sylpheed-2.0/filter.xml"; my $older_config = "$ENV{HOME}/.sylpheed/filter.xml"; my $old_filters; -my $config_dir = `sylpheed-claws --config-dir` or die("ERROR: - You don't appear to have Sylpheed-Claws installed\n"); +my $config_dir = `claws-mail --config-dir` or die("ERROR: + You don't appear to have Claws Mail installed\n"); chomp $config_dir; chdir($ENV{HOME} . "/$config_dir") or die("ERROR: - Sylpheed-Claws config directory not found [~/$config_dir] - You need to run Sylpheed-Claws once, quit it, and then rerun this script\n"); + Claws Mail config directory not found [~/$config_dir] + You need to run Claws Mail once, quit it, and then rerun this script\n"); if (-e $old_config) { $old_filters = $old_config; @@ -97,8 +97,8 @@ if (-e $old_config) { exit; } -my $claws_version = `sylpheed-claws --version`; -$claws_version =~ s/^Sylpheed-Claws version //; +my $claws_version = `claws-mail --version`; +$claws_version =~ s/^Claws Mail version //; my ($major, $minor) = split(/\./, $claws_version); diff --git a/tools/freshmeat_search.pl b/tools/freshmeat_search.pl index 9ff0086c4..aa830e4ce 100644 --- a/tools/freshmeat_search.pl +++ b/tools/freshmeat_search.pl @@ -20,7 +20,7 @@ my $freshmeat = "http://freshmeat.net/search?q"; $_ = <>; -chdir($ENV{HOME} . "/.sylpheed-claws") || die("Can't find your .sylpheed-claws directory\n"); +chdir($ENV{HOME} . "/.claws-mail") || die("Can't find your .claws-mail directory\n"); open (SYLRC, "; diff --git a/tools/google_search.pl b/tools/google_search.pl index 6f0d68fa5..52a6487c3 100644 --- a/tools/google_search.pl +++ b/tools/google_search.pl @@ -20,7 +20,7 @@ my $google = "http://www.google.com/search?q"; $_ = <>; -chdir($ENV{HOME} . "/.sylpheed-claws") || die("Can't find your .sylpheed-claws directory\n"); +chdir($ENV{HOME} . "/.claws-mail") || die("Can't find your .claws-mail directory\n"); open (SYLRC, "; diff --git a/tools/kdeservicemenu/README b/tools/kdeservicemenu/README index 31399db8a..9f008be84 100644 --- a/tools/kdeservicemenu/README +++ b/tools/kdeservicemenu/README @@ -1,6 +1,6 @@ sylpheed-kdeservicemenu.pl Version: 1.3 -Sylpheed-Claws servicemenu for Konqueror +Claws Mail servicemenu for Konqueror FILES o README You're reading it @@ -16,13 +16,13 @@ or compression of files/directories and then attaching of the archive to a new compose window. Adds the following right-click menu item to Konqueror: -/Sylpheed-Claws/Attach file(s) -/Sylpheed-Claws/Attach as GZip File(s) -/Sylpheed-Claws/Attach as BZip File(s) -/Sylpheed-Claws/Attach as Tar Archive -/Sylpheed-Claws/Attach as Bzipped Tar Archive -/Sylpheed-Claws/Attach as Gzipped Tar Archive -/Sylpheed-Claws/Attach as Zip Archive +/Claws Mail/Attach file(s) +/Claws Mail/Attach as GZip File(s) +/Claws Mail/Attach as BZip File(s) +/Claws Mail/Attach as Tar Archive +/Claws Mail/Attach as Bzipped Tar Archive +/Claws Mail/Attach as Gzipped Tar Archive +/Claws Mail/Attach as Zip Archive OPERATION All outputted files are created in /tmp @@ -32,7 +32,7 @@ REQUIREMENTS Perl 5.x.x INSTALL -o cd sylpheed-claws/tools/kdeservicemenu +o cd claws-mail/tools/kdeservicemenu o ./install.sh (for kdialog prompt) -or- o ./install.sh --global @@ -40,7 +40,7 @@ o ./install.sh --global (systemwide or home directory installation) UNINSTALL -o cd sylpheed-claws/tools/kdeservicemenu +o cd claws-mail/tools/kdeservicemenu o ./install.sh (for kdialog prompt) -or- o ./install.sh --uninstall-global @@ -67,7 +67,7 @@ Translators: [sk] Andrej Kacian LINKS -Sylpheed-Claws +Claws Mail Perl KDE diff --git a/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl b/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl index 4997e97cb..875dd9c52 100644 --- a/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl +++ b/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl @@ -18,7 +18,7 @@ unless ($ARGV[0]) { exit; } -my $sylpheed = "sylpheed-claws --compose --attach"; +my $sylpheed = "claws-mail --compose --attach"; my $prefix = "/tmp/archive."; my $command = find_command($ARGV[0]); my ($sel,$att) = split_parts(); diff --git a/tools/kdeservicemenu/template_sylpheed-attach-files.desktop b/tools/kdeservicemenu/template_sylpheed-attach-files.desktop index 7b7de97b9..354a8c5fa 100644 --- a/tools/kdeservicemenu/template_sylpheed-attach-files.desktop +++ b/tools/kdeservicemenu/template_sylpheed-attach-files.desktop @@ -3,7 +3,7 @@ Actions=AttachFiles;GZipAndAttach;BZipAndAttach; Encoding=UTF8 Name=Sylpheed compress and attach files Comment=kde service menu for compressing and attaching files to Sylpheed -X-KDE-Submenu=Sylpheed-Claws +X-KDE-Submenu=Claws Mail X-KDE-Priority=TopLevel ServiceTypes=all/allfiles @@ -15,7 +15,7 @@ Name[fr]=Joindre le(s) Fichier(s) Name[it]=Allega file Name[pt_BR]=Anexar arquivo(s) Name[sk]=Pripoji» súbor(y) -Icon=sylpheed-claws +Icon=claws-mail Exec=SCRIPT_PATH attachfile %U [Desktop Action GZipAndAttach] @@ -26,7 +26,7 @@ Name[fr]=Joindre comme Fichier(s) GZip Name[it]=Allega come file .gz Name[pt_BR]=Anexar como arquivo(s) GZip Name[sk]=Pripoji» ako súbor(y) GZip -Icon=sylpheed-claws +Icon=claws-mail Exec=SCRIPT_PATH gz %U [Desktop Action BZipAndAttach] @@ -37,5 +37,5 @@ Name[fr]=Joindre comme Fichier(s) Bzip Name[it]=Allega come file .bz Name[pt_BR]=Anexar como arquivo(s) BZip Name[sk]=Pripoji» ako súbor(y) Bzip -Icon=sylpheed-claws +Icon=claws-mail Exec=SCRIPT_PATH bz2 %U diff --git a/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop b/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop index cdc3b9c32..52bfd5d9e 100644 --- a/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop +++ b/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop @@ -3,7 +3,7 @@ Actions=TarAndAttach;TarBzipAndAttach;TarGzipAndAttach;ZipAndAttach; Encoding=UTF8 Name=Sylpheed compress and attach files/dirs Comment=kde service menu for compressing and attaching files/dirs to Sylpheed -X-KDE-Submenu=Sylpheed-Claws +X-KDE-Submenu=Claws Mail X-KDE-Priority=TopLevel ServiceTypes=all/all @@ -15,7 +15,7 @@ Name[fr]=Joindre comme Archive Tar Name[it]=Allega come file tar Name[pt_BR]=Anexar como arquivo Tar Name[sk]=Pripoji» ako archív Tar -Icon=sylpheed-claws +Icon=claws-mail Exec=SCRIPT_PATH tar %U [Desktop Action TarBzipAndAttach] @@ -26,7 +26,7 @@ Name[fr]=Joindre comme Archive Tar Bzippée Name[it]=Allega come file tar.bz Name[pt_BR]=Anexar como arquivo Tar compactado com BZip Name[sk]=Pripoji» ako Bzip-om komprimovaný archív Tar -Icon=sylpheed-claws +Icon=claws-mail Exec=SCRIPT_PATH tar.bz2 %U [Desktop Action TarGzipAndAttach] @@ -37,7 +37,7 @@ Name[fr]=Joindre comme Archive Tar Gzippée Name[it]=Allega come file tar.gz Name[pt_BR]=Anexar como arquivo Tar compactado com GZip Name[sk]=Pripoji» ako Gzip-om komprimovaný archív Tar -Icon=sylpheed-claws +Icon=claws-mail Exec=SCRIPT_PATH tar.gz %U [Desktop Action ZipAndAttach] @@ -48,5 +48,5 @@ Name[fr]=Joindre comme Archive Zip Name[it]=Allega come file zip Name[pt_BR]=Anexar como arquivo Zip Name[sk]=Pripoji» ako archív Zip -Icon=sylpheed-claws +Icon=claws-mail Exec=SCRIPT_PATH zip %U diff --git a/tools/kmail2sylpheed.pl b/tools/kmail2sylpheed.pl index 41f6c1f4d..77dab1896 100644 --- a/tools/kmail2sylpheed.pl +++ b/tools/kmail2sylpheed.pl @@ -33,7 +33,7 @@ $sylph_addr .= "\n"; chdir; -opendir(SYLPHEED, ".sylpheed-claws") || die("Can't open .sylpheed-claws directory\n"); +opendir(SYLPHEED, ".claws-mail") || die("Can't open .claws-mail directory\n"); push(@cached,(readdir(SYLPHEED))); closedir(SYLPHEED); @@ -186,11 +186,11 @@ foreach $kmailline (@kmaillines) { } $sylph_addr .= "\n"; -open (NEWADDR, ">.sylpheed-claws/$new_addrbk"); +open (NEWADDR, ">.claws-mail/$new_addrbk"); print NEWADDR $sylph_addr; close NEWADDR; -open (ADDRIN, "<.sylpheed-claws/addrbook--index.xml") || die("can't open addrbook--index.xml"); +open (ADDRIN, "<.claws-mail/addrbook--index.xml") || die("can't open addrbook--index.xml"); @addrindex_file = ; close ADDRIN; @@ -203,7 +203,7 @@ foreach $addrindex_line (@addrindex_file) { } } -open (NEWADDRIN, ">.sylpheed-claws/addrbook--index.xml"); +open (NEWADDRIN, ">.claws-mail/addrbook--index.xml"); print NEWADDRIN "$rewrite_addrin"; close NEWADDRIN; diff --git a/tools/kmail2sylpheed_v2.pl b/tools/kmail2sylpheed_v2.pl index 205f8deb9..a5635ede3 100644 --- a/tools/kmail2sylpheed_v2.pl +++ b/tools/kmail2sylpheed_v2.pl @@ -40,7 +40,7 @@ if ($kmailfile eq "" || $iNeedHelp) { exit; } -$sylph_dir = ".sylpheed-claws"; +$sylph_dir = ".claws-mail"; $addr_index = "$sylph_dir/addrbook--index.xml"; $new_addressbook = "Kmail address book"; diff --git a/tools/make.themes.project b/tools/make.themes.project index 4f15c4884..f68d140c1 100644 --- a/tools/make.themes.project +++ b/tools/make.themes.project @@ -1,7 +1,7 @@ #!/bin/bash # -# Generate the source directory for sylpheed-claws-themes package -# from the theme tarballs in http://sylpheed-claws.net/themes.php +# Generate the source directory for claws-mail-themes package +# from the theme tarballs in http://claws-mail.org/themes.php # # Copyright (c) 2006 Ricardo Mones # Paul Mangan @@ -31,8 +31,8 @@ test x$1 = x && echo "Error: version number not given" && printHelp && exit 1; VERS=$1 shift; -SITE=http://sylpheed-claws.net -NAME=sylpheed-claws-themes +SITE=http://claws-mail.org +NAME=claws-mail-themes NOTES=RELEASE_NOTES DDIR=$NAME-$VERS PAGE=themes.php @@ -100,7 +100,7 @@ function createThemeMakefileAm() MA="/tmp/tmp.makefile.am"; cd "$1" dir="$1"; - echo 'themedir = $(prefix)/share/sylpheed-claws/themes/'${dir} > $MA + echo 'themedir = $(prefix)/share/claws-mail/themes/'${dir} > $MA echo "" >> $MA echo -n 'dist_theme_DATA =' >> $MA test -f .sylpheed_themeinfo \ diff --git a/tools/multiwebsearch.pl b/tools/multiwebsearch.pl index 1785ca5ab..933e31f6a 100644 --- a/tools/multiwebsearch.pl +++ b/tools/multiwebsearch.pl @@ -27,11 +27,11 @@ GetOptions("where=s" => \$where, $what =~ s/\s/%20/g; -chdir($ENV{HOME} . "/.sylpheed-claws") - || die("Can't find your ~/.sylpheed-claws directory\n"); +chdir($ENV{HOME} . "/.claws-mail") + || die("Can't find your ~/.claws-mail directory\n"); open (CONF, "; close CONF; @@ -51,7 +51,7 @@ if (!$url) { } open (SYLRC, "; close SYLRC; diff --git a/tools/nautilus2sylpheed.sh b/tools/nautilus2sylpheed.sh index fcb64fe12..4202dcef1 100644 --- a/tools/nautilus2sylpheed.sh +++ b/tools/nautilus2sylpheed.sh @@ -50,5 +50,5 @@ done echo "-----------" echo ${ATTACHMENTS} -eval "sylpheed-claws --compose --attach ${ATTACHMENTS}" +eval "claws-mail --compose --attach ${ATTACHMENTS}" diff --git a/tools/outlook2sylpheed.pl b/tools/outlook2sylpheed.pl index 49959a61f..d7b0b8231 100644 --- a/tools/outlook2sylpheed.pl +++ b/tools/outlook2sylpheed.pl @@ -41,7 +41,7 @@ else { $outl_file = $ARGV[0]; } # some init -$sylconf = ".sylpheed-claws"; +$sylconf = ".claws-mail"; $indexname = "$sylconf/addrbook--index.xml"; # the next is mostly Paul's code diff --git a/tools/sylprint.pl b/tools/sylprint.pl index 4b253ac4b..d62ef9709 100644 --- a/tools/sylprint.pl +++ b/tools/sylprint.pl @@ -41,7 +41,7 @@ else { $spp = join('/',@spp); $rcf="$spp$rc"; if (-x $rcf) { do $rcf; } - $rcf="$ENV{'HOME'}/.sylpheed-claws/$rc"; + $rcf="$ENV{'HOME'}/.claws-mail/$rc"; if (-x $rcf) { do $rcf; } } @forens = (); @@ -315,7 +315,7 @@ else { # no enscript, try lpr system(@vcmd); } if ($preview < 2) { - @lprcmd = ($LPR,'-T','Sylpheed-Claws Mail', + @lprcmd = ($LPR,'-T','Claws Mail Mail', ($headerformat eq '')? '-l': '-p','-P',$printer,@forens, $tmpfn); die "trying lpr: $! \n" unless (system(@lprcmd) != -1); } diff --git a/tools/sylprint.rc b/tools/sylprint.rc index cbbf0b3ee..ffc04f024 100644 --- a/tools/sylprint.rc +++ b/tools/sylprint.rc @@ -5,7 +5,7 @@ # your personal default preferences. Some of the values can # still be changed from the command line options if required. # This file must have exec permissions set and be located in -# sylprint.pl directory and/or ~/.sylpheed-claws to be used. +# sylprint.pl directory and/or ~/.claws-mail to be used. # # (c) 2001 by Ricardo Mones Lastra # This program is released under the GNU General Public License. diff --git a/tools/tb2sylpheed b/tools/tb2sylpheed index 15d888889..d139a9a45 100644 --- a/tools/tb2sylpheed +++ b/tools/tb2sylpheed @@ -43,7 +43,7 @@ $total_addresses = 0; chdir; # check is Sylpheed instrtalled -opendir(SYLPHEED, ".sylpheed-claws") || die("Can't open Sylpheed-Claws directory! Conversion abroted\n"); +opendir(SYLPHEED, ".claws-mail") || die("Can't open Claws Mail directory! Conversion abroted\n"); push(@cached, (readdir(SYLPHEED))); closedir(SYLPHEED); @@ -251,12 +251,12 @@ foreach $tbline (@tblines) { $sylph_addr .= "\n"; # print new addressbook to file -open (NEWADDR, ">.sylpheed-claws/$new_addrbk"); +open (NEWADDR, ">.claws-mail/$new_addrbk"); print NEWADDR $sylph_addr; close NEWADDR; # add new addressbook to index -open (ADDRIN, "<.sylpheed-claws/addrbook--index.xml") || die("Can't open addrbook--index.xml"); +open (ADDRIN, "<.claws-mail/addrbook--index.xml") || die("Can't open addrbook--index.xml"); @addrindex_file = ; close ADDRIN; @@ -269,7 +269,7 @@ foreach $addrindex_line (@addrindex_file) { } } -open (NEWADDRIN, ">.sylpheed-claws/addrbook--index.xml"); +open (NEWADDRIN, ">.claws-mail/addrbook--index.xml"); print NEWADDRIN "$rewrite_addrin"; close NEWADDRIN; print "You have sucessfully converted your The Bat! addressbook\n"; diff --git a/tools/textviewer.sh b/tools/textviewer.sh index caf67f630..844e8ebed 100644 --- a/tools/textviewer.sh +++ b/tools/textviewer.sh @@ -21,14 +21,14 @@ ############################################################################## # -# This script is a text viewer designed to be used with sylpheed-claws actions +# This script is a text viewer designed to be used with claws-mail actions # Set up an action with the command line: textviewer.sh %p | # # The script will try to detect file type automatically, and then # invokes a relevant program to print the file in plain text to # the standard output. # -# From v 0.9.7claws7, sylpheed-claws sets the temporary file +# From v 0.9.7claws7, claws-mail sets the temporary file # of a part to XXXXXX.mimetmp.[filename of attachment] # This means we can use the extension of the filename for checking. # Also use the program 'file' if that fails. @@ -73,7 +73,7 @@ # on the result, insteading of doing 'gzip -l' # # 2003-12-30 -# added the script to sylpheed-claws/tools +# added the script to claws-mail/tools # # 2003-12-30 # - use 'fold' after 'unrtf' to wrap to a nice width diff --git a/tools/vcard2xml.py b/tools/vcard2xml.py index 48962c3d4..d090d1f0a 100644 --- a/tools/vcard2xml.py +++ b/tools/vcard2xml.py @@ -151,12 +151,12 @@ def execute () : if len(sys.argv) <> 3 and len(sys.argv) <> 2 : print str("\nUsage: vcard2xml.py source_file [destination_file]\n\n" + '\tWhen only is specified will overwrite the existing addressbook.\n'+ - '\tWhen both arguments are suplied will create a new additional addressbook named \n\tas the destination file.'+'\n\tNOTE: in both cases the Sylpheed-Claws must be closed and ran at least once.\n\n') + '\tWhen both arguments are suplied will create a new additional addressbook named \n\tas the destination file.'+'\n\tNOTE: in both cases the Claws Mail must be closed and ran at least once.\n\n') sys.exit(1) in_file = None out_file = None - path_to_out = os.environ['HOME']+'/.sylpheed-claws/' + path_to_out = os.environ['HOME']+'/.claws-mail/' adr_idx = 'addrbook--index.xml' adr_idx_file = None tmp_adr_idx_file= None @@ -189,7 +189,7 @@ def execute () : tmp_adr_idx_file = open(path_to_out+adr_idx+'.tmp') adr_idx_file = open(path_to_out+adr_idx,'w') except Exception, e : - print 'Could not open <', path_to_out+adr_idx,'> file. Make sure you started Sylpheed-Claws at least once.' + print 'Could not open <', path_to_out+adr_idx,'> file. Make sure you started Claws Mail at least once.' sys.exit(1) try : out_file = open(path_to_out+sys.argv[2],'w')