talons

Fork of Claws Mail https://www.claws-mail
Log | Files | Refs | README | LICENSE

commit 120fa67a89dd9fb84d9b37f4041ce4a726c29400
parent 1e77d9acde91fccc6523c51dbc3d9328c11f944b
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 20 Apr 2008 11:32:28 +0000

2008-04-20 [colin]	3.4.0cvs3

	* src/pixmaps/tray_newmail.offline.xpm
	* src/pixmaps/tray_newmail.xpm
	* src/pixmaps/tray_newmarkedmail.offline.xpm
	* src/pixmaps/tray_newmarkedmail.xpm
	* src/pixmaps/tray_nomail.offline.xpm
	* src/pixmaps/tray_nomail.xpm
	* src/pixmaps/tray_unreadmail.offline.xpm
	* src/pixmaps/tray_unreadmail.xpm
	* src/pixmaps/tray_unreadmarkedmail.offline.xpm
	* src/pixmaps/tray_unreadmarkedmail.xpm
		Make the tray icons a bit nicer. Would be
		nice to get really nice icons from someone
		who's good at Gimp :)

Diffstat:
MChangeLog | 16++++++++++++++++
MPATCHSETS | 1+
Mconfigure.ac | 2+-
Msrc/pixmaps/tray_newmail.offline.xpm | 48++++++++++++++++++++++++------------------------
Msrc/pixmaps/tray_newmail.xpm | 38+++++++++++++++++++-------------------
Msrc/pixmaps/tray_newmarkedmail.offline.xpm | 46++++++++++++++++++++++------------------------
Msrc/pixmaps/tray_newmarkedmail.xpm | 42++++++++++++++++++++----------------------
Msrc/pixmaps/tray_nomail.offline.xpm | 41++++++++++++++++++++---------------------
Msrc/pixmaps/tray_nomail.xpm | 35+++++++++++++++++------------------
Msrc/pixmaps/tray_unreadmail.offline.xpm | 46+++++++++++++++++++++++-----------------------
Msrc/pixmaps/tray_unreadmail.xpm | 42+++++++++++++++++++++---------------------
Msrc/pixmaps/tray_unreadmarkedmail.offline.xpm | 47+++++++++++++++++++++++------------------------
Msrc/pixmaps/tray_unreadmarkedmail.xpm | 43+++++++++++++++++++++----------------------
13 files changed, 228 insertions(+), 219 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,19 @@ +2008-04-20 [colin] 3.4.0cvs3 + + * src/pixmaps/tray_newmail.offline.xpm + * src/pixmaps/tray_newmail.xpm + * src/pixmaps/tray_newmarkedmail.offline.xpm + * src/pixmaps/tray_newmarkedmail.xpm + * src/pixmaps/tray_nomail.offline.xpm + * src/pixmaps/tray_nomail.xpm + * src/pixmaps/tray_unreadmail.offline.xpm + * src/pixmaps/tray_unreadmail.xpm + * src/pixmaps/tray_unreadmarkedmail.offline.xpm + * src/pixmaps/tray_unreadmarkedmail.xpm + Make the tray icons a bit nicer. Would be + nice to get really nice icons from someone + who's good at Gimp :) + 2008-04-18 [colin] 3.4.0cvs2 * src/common/log.c diff --git a/PATCHSETS b/PATCHSETS @@ -3298,3 +3298,4 @@ ( cvs diff -u -r 1.58.2.37 -r 1.58.2.38 po/de.po; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 po/fi.po; cvs diff -u -r 1.34.2.26 -r 1.34.2.27 po/it.po; cvs diff -u -r 1.50.2.30 -r 1.50.2.31 po/pt_BR.po; ) > 3.3.1cvs61.patchset ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/addrduplicates.c; cvs diff -u -r 1.60.2.114 -r 1.60.2.115 src/addressbook.c; cvs diff -u -r 1.382.2.442 -r 1.382.2.443 src/compose.c; cvs diff -u -r 1.23.2.28 -r 1.23.2.29 src/crash.c; cvs diff -u -r 1.14.2.48 -r 1.14.2.49 src/editaddress.c; cvs diff -u -r 1.213.2.180 -r 1.213.2.181 src/folder.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/image_viewer.c; cvs diff -u -r 1.179.2.216 -r 1.179.2.217 src/imap.c; cvs diff -u -r 1.149.2.86 -r 1.149.2.87 src/inc.c; cvs diff -u -r 1.115.2.193 -r 1.115.2.194 src/main.c; cvs diff -u -r 1.28.2.42 -r 1.28.2.43 src/mbox.c; cvs diff -u -r 1.94.2.174 -r 1.94.2.175 src/messageview.c; cvs diff -u -r 1.79.2.64 -r 1.79.2.65 src/mh.c; cvs diff -u -r 1.16.2.61 -r 1.16.2.62 src/msgcache.c; cvs diff -u -r 1.101.2.49 -r 1.101.2.50 src/news.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/partial_download.c; cvs diff -u -r 1.56.2.60 -r 1.56.2.61 src/pop.c; cvs diff -u -r 1.204.2.163 -r 1.204.2.164 src/prefs_common.c; cvs diff -u -r 1.103.2.105 -r 1.103.2.106 src/prefs_common.h; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_other.c; cvs diff -u -r 1.3.2.54 -r 1.3.2.55 src/prefs_themes.c; cvs diff -u -r 1.47.2.47 -r 1.47.2.48 src/procheader.c; cvs diff -u -r 1.49.2.108 -r 1.49.2.109 src/procmime.c; cvs diff -u -r 1.150.2.108 -r 1.150.2.109 src/procmsg.c; cvs diff -u -r 1.96.2.199 -r 1.96.2.200 src/textview.c; cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/wizard.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/common/prefs.c; cvs diff -u -r 1.4.2.25 -r 1.4.2.26 src/common/ssl_certificate.c; cvs diff -u -r 1.2.4.27 -r 1.2.4.28 src/common/template.c; cvs diff -u -r 1.36.2.136 -r 1.36.2.137 src/common/utils.c; cvs diff -u -r 1.20.2.60 -r 1.20.2.61 src/common/utils.h; cvs diff -u -r 1.1.4.98 -r 1.1.4.99 src/etpan/imap-thread.c; cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/plugins/pgpcore/sgpgme.c; cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/plugins/pgpinline/pgpinline.c; ) > 3.4.0cvs1.patchset ( cvs diff -u -r 1.6.2.19 -r 1.6.2.20 src/common/log.c; ) > 3.4.0cvs2.patchset +( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmail.offline.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmail.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmarkedmail.offline.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmarkedmail.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_nomail.offline.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_nomail.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmail.offline.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmail.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmarkedmail.offline.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmarkedmail.xpm; ) > 3.4.0cvs3.patchset diff --git a/configure.ac b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=2 +EXTRA_VERSION=3 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/pixmaps/tray_newmail.offline.xpm b/src/pixmaps/tray_newmail.offline.xpm @@ -2,28 +2,28 @@ static char * tray_newmail_offline_xpm[] = { "16 16 10 1", " c None", -". c #787878", +". c #3F3F3F", "+ c #FFFFFF", -"@ c #FF7878", -"# c #CDCDCD", -"$ c #000000", -"% c #DFDFDF", -"& c #6666CC", -"* c #BCBCBC", -"= c #A7A7A7", -" .. ", -" .++. ", -" .++@+. ", -" .++@@@+. ", -" .++++@+++. ", -" .+++#+++#++. ", -" .+++#+++#+++.. ", -"....$$++#+$$....", -".+%$&$$$++$&$*=.", -"$$$&&$#+++$&&$$$", -"&&&&&$$$+%$&&&&&", -"$$$&&$%%%%$&&$$$", -".+%$&$$$**$&$*=.", -".+%#$$****$$**=.", -" .%#**********. ", -" ............ "}; +"@ c #CF6F6F", +"# c #B7B7B7", +"$ c #818181", +"% c #000000", +"& c #D1D1D1", +"* c #6666CC", +"= c #9F9F9F", +" . ", +" .+. ", +" .+@+. ", +" .+@@@+. ", +" .+++@+++. ", +" .+++++++++. ", +" .++++#++#+++. ", +"$$$$%%#++#%%$$$$", +"$+&%*%%%#+%*%#=$", +"%%%**%+#++%**%%%", +"*****%%%++%*****", +"%%%**%$$$$%**%%%", +"$+&%*%%%##%*%#=$", +"$+&#%%####%%##=$", +" $&###########$ ", +" $$$$$$$$$$$$ "}; diff --git a/src/pixmaps/tray_newmail.xpm b/src/pixmaps/tray_newmail.xpm @@ -6,22 +6,22 @@ static char * tray_newmail_xpm[] = { "+ c #FFFFFF", "@ c #FF0000", "# c #A0A0A0", -"$ c #C3C3C3", -"% c #808080", -"& c #585858", -" .. ", -" .++. ", -" .++@+. ", -" .++@@@+. ", -" .++++@+++. ", -" .+++#+++#++. ", -" .+++#+++#+++.. ", -"....++++#+++....", -".+$#.++#+++.%%&.", -".+$#.+#+++..%%&.", -".+$#.++++.$.%%&.", -".+$#%......%%%&.", -".+$#%%%%%%%%%%&.", -".+$#%%%%%%%%%%&.", -" .$#%%%%%%%%%%. ", -" ............ "}; +"$ c #585858", +"% c #C3C3C3", +"& c #808080", +" . ", +" .+. ", +" .+@+. ", +" .+@@@+. ", +" .+++@+++. ", +" .+++++++++. ", +" .++++#++#+++. ", +"$$$$++#++#++$$$$", +"$+%#$+++#++$##&$", +"$+%#$++#+++$##&$", +"$+%#$+#+++.$##&$", +"$+%##$$$$$$###&$", +"$+%###########&$", +"$+%###########&$", +" $%###########$ ", +" $$$$$$$$$$$$ "}; diff --git a/src/pixmaps/tray_newmarkedmail.offline.xpm b/src/pixmaps/tray_newmarkedmail.offline.xpm @@ -1,30 +1,28 @@ /* XPM */ static char * tray_newmarkedmail_offline_xpm[] = { -"16 16 11 1", +"16 16 9 1", " c None", -". c #EE9595", +". c #CF6F6F", "+ c #FFFFFF", -"@ c #FF7878", -"# c #CDCDCD", +"@ c #B7B7B7", +"# c #C68686", "$ c #000000", -"% c #DFDFDF", +"% c #D1D1D1", "& c #6666CC", -"* c #BCBCBC", -"= c #A7A7A7", -"- c #787878", -" .. ", -" .++. ", -" .++@+. ", -" .++@@@+. ", -" .++++@+++. ", -" .+++#+++#++. ", -" .+++#+++#+++.. ", -"....$$++#+$$....", -".+%$&$$$++$&$*=.", -"$$$&&$#+++$&&$$$", -"&&&&&$$$+%$&&&&&", -"$$$&&$%%%%$&&$$$", -".+%$&$$$**$&$*=.", -".+%#$$****$$**=.", -" -%#**********. ", -" ............ "}; +"* c #9F9F9F", +" . ", +" .+. ", +" .+.+. ", +" .+...+. ", +" .+++.+++. ", +" .+++++++++. ", +" .++++@++@+++. ", +"####$$@++@$$####", +"#+%$&$$$@+$&$@*#", +"$$$&&$+@++$&&$$$", +"&&&&&$$$++$&&&&&", +"$$$&&$####$&&$$$", +"#+%$&$$$@@$&$@*#", +"#+%@$$@@@@$$@@*#", +" #%@@@@@@@@@@@# ", +" ############ "}; diff --git a/src/pixmaps/tray_newmarkedmail.xpm b/src/pixmaps/tray_newmarkedmail.xpm @@ -1,28 +1,26 @@ /* XPM */ static char * tray_newmarkedmail_xpm[] = { -"16 16 9 1", +"16 16 7 1", " c None", -". c #DE3636", +". c #FF0000", "+ c #FFFFFF", -"@ c #FF0000", -"# c #A0A0A0", +"@ c #A0A0A0", +"# c #DE3636", "$ c #C3C3C3", "% c #808080", -"& c #585858", -"* c #000000", -" .. ", -" .++. ", -" .++@+. ", -" .++@@@+. ", -" .++++@+++. ", -" .+++#+++#++. ", -" .+++#+++#+++.. ", -"....++++#+++....", -".+$#.++#+++.%%&.", -".+$#.+#+++..%%&.", -".+$#.++++.$.%%&.", -".+$#%......%%%&.", -".+$#%%%%%%%%%%&.", -".+$#%%%%%%%%%%&.", -" *$#%%%%%%%%%%. ", -" ............ "}; +" . ", +" .+. ", +" .+.+. ", +" .+...+. ", +" .+++.+++. ", +" .+++++++++. ", +" .++++@++@+++. ", +"####++@++@++####", +"#+$@#+++@++#@@%#", +"#+$@#++@+++#@@%#", +"#+$@#+@+++.#@@%#", +"#+$@@######@@@%#", +"#+$@@@@@@@@@@@%#", +"#+$@@@@@@@@@@@%#", +" #$@@@@@@@@@@@# ", +" ############ "}; diff --git a/src/pixmaps/tray_nomail.offline.xpm b/src/pixmaps/tray_nomail.offline.xpm @@ -1,29 +1,28 @@ /* XPM */ static char * tray_nomail_offline_xpm[] = { -"16 16 10 1", +"16 16 9 1", " c None", -". c #787878", -"+ c #CDCDCD", -"@ c #ECECEC", -"# c #BCBCBC", -"$ c #DFDFDF", -"% c #000000", -"& c #FFFFFF", -"* c #6666CC", -"= c #A7A7A7", +". c #818181", +"+ c #B7B7B7", +"@ c #D1D1D1", +"# c #E4E4E4", +"$ c #000000", +"% c #FFFFFF", +"& c #6666CC", +"* c #9F9F9F", " ", " ", " ", " ........ ", -" .++@@@@#$. ", -" .+#########. ", -" .+++$$$$$$###. ", -"....%%$$$$%%....", -".&$%*%%%$$%*%#=.", -"%%%**%$$$$%**%%%", -"*****%%%$$%*****", -"%%%**%$$$$%**%%%", -".&$%*%%%##%*%#=.", -".&$+%%####%%##=.", -" .$+##########. ", +" .+@######. ", +" .++@@@@@@@+. ", +" .++@@@@@@@@@+. ", +"....$$@@@@$$....", +".%@$&$$$@@$&$+*.", +"$$$&&$@@@@$&&$$$", +"&&&&&$$$@@$&&&&&", +"$$$&&$....$&&$$$", +".%@$&$$$++$&$+*.", +".%@+$$++++$$++*.", +" .@+++++++++++. ", " ............ "}; diff --git a/src/pixmaps/tray_nomail.xpm b/src/pixmaps/tray_nomail.xpm @@ -1,27 +1,26 @@ /* XPM */ static char * tray_nomail_xpm[] = { -"16 16 8 1", +"16 16 7 1", " c None", -". c #000000", +". c #585858", "+ c #A0A0A0", -"@ c #DCDCDC", -"# c #808080", -"$ c #C3C3C3", -"% c #FFFFFF", -"& c #585858", +"@ c #C3C3C3", +"# c #DCDCDC", +"$ c #FFFFFF", +"% c #808080", " ", " ", " ", " ........ ", -" .++@@@@#$. ", -" .+#########. ", -" .+++$$$$$$###. ", -"....+$$$$$$#....", -".%$+.$$$$$$.##&.", -".%$+.$$$$$$.##&.", -".%$+.$$$$$$.##&.", -".%$+#......###&.", -".%$+##########&.", -".%$+##########&.", -" .$+##########. ", +" .+@######. ", +" .++@@@@@@@+. ", +" .++@@@@@@@@@+. ", +"....@@@@@@@@....", +".$@+.@@@@@@.++%.", +".$@+.@@@@@@.++%.", +".$@+.@@@@@@.++%.", +".$@++......+++%.", +".$@+++++++++++%.", +".$@+++++++++++%.", +" .@+++++++++++. ", " ............ "}; diff --git a/src/pixmaps/tray_unreadmail.offline.xpm b/src/pixmaps/tray_unreadmail.offline.xpm @@ -2,28 +2,28 @@ static char * tray_unreadmail_offline_xpm[] = { "16 16 10 1", " c None", -". c #787878", -"+ c #DFDFDF", -"@ c #FFFFFF", -"# c #BCBCBC", -"$ c #FF7878", +". c #3F3F3F", +"+ c #FFFFFF", +"@ c #9F9F9F", +"# c #CF6F6F", +"$ c #818181", "% c #000000", -"& c #6666CC", -"* c #ACACAC", -"= c #CDCDCD", -" ........... ", -" .+++++++++++. ", +"& c #D1D1D1", +"* c #6666CC", +"= c #B7B7B7", +" ", +" ", " .............. ", -" .@@@@@@@@@@@@. ", -" .@####@@@@$$@. ", -" .@@@@@@@@@$$@. ", -" .@@@@@@@@@@@@. ", -"....%%++++%%....", -".@+%&%%%@@%&%#*.", -"%%%&&%@@++%&&%%%", -"&&&&&%%%@@%&&&&&", -"%%%&&%++++%&&%%%", -".@+%&%%%##%&%#*.", -".@+=%%####%%##*.", -" .+=##########. ", -" ............ "}; +" .++++++++++++. ", +" .+@@@@++++##+. ", +" .+++++++++##+. ", +" .++++++++++++. ", +"$$$$%%@@@@%%$$$$", +"$+&%*%%%++%*%=@$", +"%%%**%++@@%**%%%", +"*****%%%++%*****", +"%%%**%$$$$%**%%%", +"$+&%*%%%==%*%=@$", +"$+&=%%====%%==@$", +" $&===========$ ", +" $$$$$$$$$$$$ "}; diff --git a/src/pixmaps/tray_unreadmail.xpm b/src/pixmaps/tray_unreadmail.xpm @@ -3,25 +3,25 @@ static char * tray_unreadmail_xpm[] = { "16 16 8 1", " c None", ". c #000000", -"+ c #C3C3C3", -"@ c #FFFFFF", -"# c #808080", -"$ c #FF0000", -"% c #A0A0A0", -"& c #636363", -" ........... ", -" .+++++++++++. ", +"+ c #FFFFFF", +"@ c #808080", +"# c #FF0000", +"$ c #585858", +"% c #C3C3C3", +"& c #A0A0A0", +" ", +" ", " .............. ", -" .@@@@@@@@@@@@. ", -" .@####@@@@$$@. ", -" .@@@@@@@@@$$@. ", -" .@@@@@@@@@@@@. ", -"....@@####@@....", -".@+%.@@@@@@.##&.", -".@+%.@@@##@.##&.", -".@+%.@@@@@@.##&.", -".@+%#......###&.", -".@+%##########&.", -".@+%##########&.", -" .+%##########. ", -" ............ "}; +" .++++++++++++. ", +" .+@@@@++++##+. ", +" .+++++++++##+. ", +" .++++++++++++. ", +"$$$$++@@@@++$$$$", +"$+%&$++++++$&&@$", +"$+%&$+++@@+$&&@$", +"$+%&$++++++$&&@$", +"$+%&&$$$$$$&&&@$", +"$+%&&&&&&&&&&&@$", +"$+%&&&&&&&&&&&@$", +" $%&&&&&&&&&&&$ ", +" $$$$$$$$$$$$ "}; diff --git a/src/pixmaps/tray_unreadmarkedmail.offline.xpm b/src/pixmaps/tray_unreadmarkedmail.offline.xpm @@ -1,29 +1,28 @@ /* XPM */ static char * tray_unreadmarkedmail_offline_xpm[] = { -"16 16 10 1", +"16 16 9 1", " c None", -". c #EE9595", -"+ c #DFDFDF", -"@ c #FFFFFF", -"# c #BCBCBC", -"$ c #FF7878", -"% c #000000", +". c #CF6F6F", +"+ c #FFFFFF", +"@ c #9F9F9F", +"# c #C68686", +"$ c #000000", +"% c #D1D1D1", "& c #6666CC", -"* c #ACACAC", -"= c #CDCDCD", -" ........... ", -" .+++++++++++. ", +"* c #B7B7B7", +" ", +" ", " .............. ", -" .@@@@@@@@@@@@. ", -" .@####@@@@$$@. ", -" .@@@@@@@@@$$@. ", -" .@@@@@@@@@@@@. ", -"....%%++++%%....", -".@+%&%%%@@%&%#*.", -"%%%&&%@@++%&&%%%", -"&&&&&%%%@@%&&&&&", -"%%%&&%++++%&&%%%", -".@+%&%%%##%&%#*.", -".@+=%%####%%##*.", -" .+=##########. ", -" ............ "}; +" .++++++++++++. ", +" .+@@@@++++..+. ", +" .+++++++++..+. ", +" .++++++++++++. ", +"####$$@@@@$$####", +"#+%$&$$$++$&$*@#", +"$$$&&$++@@$&&$$$", +"&&&&&$$$++$&&&&&", +"$$$&&$####$&&$$$", +"#+%$&$$$**$&$*@#", +"#+%*$$****$$**@#", +" #%***********# ", +" ############ "}; diff --git a/src/pixmaps/tray_unreadmarkedmail.xpm b/src/pixmaps/tray_unreadmarkedmail.xpm @@ -1,27 +1,26 @@ /* XPM */ static char * tray_unreadmarkedmail_xpm[] = { -"16 16 8 1", +"16 16 7 1", " c None", -". c #DE3636", -"+ c #C3C3C3", -"@ c #FFFFFF", -"# c #808080", -"$ c #FF0000", +". c #FF0000", +"+ c #FFFFFF", +"@ c #808080", +"# c #DE3636", +"$ c #C3C3C3", "% c #A0A0A0", -"& c #636363", -" ........... ", -" .+++++++++++. ", +" ", +" ", " .............. ", -" .@@@@@@@@@@@@. ", -" .@####@@@@$$@. ", -" .@@@@@@@@@$$@. ", -" .@@@@@@@@@@@@. ", -"....@@####@@....", -".@+%.@@@@@@.##&.", -".@+%.@@@##@.##&.", -".@+%.@@@@@@.##&.", -".@+%#......###&.", -".@+%##########&.", -".@+%##########&.", -" .+%##########. ", -" ............ "}; +" .++++++++++++. ", +" .+@@@@++++..+. ", +" .+++++++++..+. ", +" .++++++++++++. ", +"####++@@@@++####", +"#+$%#++++++#%%@#", +"#+$%#+++@@+#%%@#", +"#+$%#++++++#%%@#", +"#+$%%######%%%@#", +"#+$%%%%%%%%%%%@#", +"#+$%%%%%%%%%%%@#", +" #$%%%%%%%%%%%# ", +" ############ "};