From bdfb806effbb8523049c1a496cdba712cbf8329a Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Fri, 13 Jul 2007 08:35:55 +0000 Subject: [PATCH 1/1] 2007-07-13 [paul] 2.10.0cvs18 * src/gtk/colorlabel.c fix bug 1261, '[DE] coloring messages in overview keys are not localised' the string is now included in claws-mail.pot --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/colorlabel.c | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20cc56704..fd0627d40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-13 [paul] 2.10.0cvs18 + + * src/gtk/colorlabel.c + fix bug 1261, '[DE] coloring messages in overview + keys are not localised' + the string is now included in claws-mail.pot + 2007-07-13 [colin] 2.10.0cvs17 * src/summaryview.c diff --git a/PATCHSETS b/PATCHSETS index 5a4424173..a72e531d2 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2671,3 +2671,4 @@ ( cvs diff -u -r 1.115.2.156 -r 1.115.2.157 src/main.c; ) > 2.10.0cvs15.patchset ( cvs diff -u -r 1.5.10.6 -r 1.5.10.7 COPYING; cvs diff -u -r 1.8.2.37 -r 1.8.2.38 README; cvs diff -u -r 1.4.2.8 -r 1.4.2.9 autogen.sh; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/claws-mail-manual.xml; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/gpl.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/claws-mail-manual.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/gpl.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/claws-mail-manual.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/gpl.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/pl/gpl.xml; cvs diff -u -r 1.61.2.64 -r 1.61.2.65 src/account.c; cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/account.h; cvs diff -u -r 1.12.2.46 -r 1.12.2.47 src/action.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/action.h; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/adbookbase.h; cvs diff -u -r 1.27.2.36 -r 1.27.2.37 src/addr_compl.c; cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/addr_compl.h; cvs diff -u -r 1.22.2.14 -r 1.22.2.15 src/addrbook.c; cvs diff -u -r 1.7.2.3 -r 1.7.2.4 src/addrbook.h; cvs diff -u -r 1.15.2.12 -r 1.15.2.13 src/addrcache.c; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/addrcache.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/addrcindex.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/addrcindex.h; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/addrclip.c; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/addrclip.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/addrdefs.h; cvs diff -u -r 1.9.2.15 -r 1.9.2.16 src/addressadd.c; cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/addressadd.h; cvs diff -u -r 1.60.2.91 -r 1.60.2.92 src/addressbook.c; cvs diff -u -r 1.18.2.8 -r 1.18.2.9 src/addressbook.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/addressbook_foldersel.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/addressbook_foldersel.h; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/addressitem.h; cvs diff -u -r 1.5.10.18 -r 1.5.10.19 src/addrgather.c; cvs diff -u -r 1.3.12.4 -r 1.3.12.5 src/addrgather.h; cvs diff -u -r 1.6.10.15 -r 1.6.10.16 src/addrharvest.c; cvs diff -u -r 1.4.12.5 -r 1.4.12.6 src/addrharvest.h; cvs diff -u -r 1.28.2.27 -r 1.28.2.28 src/addrindex.c; cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/addrindex.h; cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/addritem.c; cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/addritem.h; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/addrquery.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/addrquery.h; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/addrselect.c; cvs diff -u -r 1.1.14.6 -r 1.1.14.7 src/addrselect.h; cvs diff -u -r 1.17.2.35 -r 1.17.2.36 src/alertpanel.c; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/alertpanel.h; cvs diff -u -r 1.2.4.16 -r 1.2.4.17 src/browseldap.c; cvs diff -u -r 1.2.4.5 -r 1.2.4.6 src/browseldap.h; cvs diff -u -r 1.65.2.57 -r 1.65.2.58 src/codeconv.c; cvs diff -u -r 1.15.2.19 -r 1.15.2.20 src/codeconv.h; cvs diff -u -r 1.382.2.393 -r 1.382.2.394 src/compose.c; cvs diff -u -r 1.50.2.37 -r 1.50.2.38 src/compose.h; cvs diff -u -r 1.23.2.24 -r 1.23.2.25 src/crash.c; cvs diff -u -r 1.1.12.2 -r 1.1.12.3 src/crash.h; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/customheader.c; cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/customheader.h; cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/displayheader.c; cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/displayheader.h; cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/editaddress.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/editaddress.h; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.5.12.10 -r 1.5.12.11 src/editbook.c; cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/editbook.h; cvs diff -u -r 1.11.2.16 -r 1.11.2.17 src/editgroup.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/editgroup.h; cvs diff -u -r 1.5.12.13 -r 1.5.12.14 src/editjpilot.c; cvs diff -u -r 1.3.16.4 -r 1.3.16.5 src/editjpilot.h; cvs diff -u -r 1.8.2.22 -r 1.8.2.23 src/editldap.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/editldap.h; cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/editldap_basedn.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/editldap_basedn.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/edittags.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/edittags.h; cvs diff -u -r 1.5.12.12 -r 1.5.12.13 src/editvcard.c; cvs diff -u -r 1.3.16.4 -r 1.3.16.5 src/editvcard.h; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/enriched.c; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/enriched.h; cvs diff -u -r 1.3.2.21 -r 1.3.2.22 src/exphtmldlg.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/exphtmldlg.h; cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/expldifdlg.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/expldifdlg.h; cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/export.c; cvs diff -u -r 1.1.16.3 -r 1.1.16.4 src/export.h; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/exporthtml.c; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/exporthtml.h; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/exportldif.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/exportldif.h; cvs diff -u -r 1.60.2.33 -r 1.60.2.34 src/filtering.c; cvs diff -u -r 1.21.2.13 -r 1.21.2.14 src/filtering.h; cvs diff -u -r 1.213.2.147 -r 1.213.2.148 src/folder.c; cvs diff -u -r 1.87.2.43 -r 1.87.2.44 src/folder.h; cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/folder_item_prefs.c; cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/folder_item_prefs.h; cvs diff -u -r 1.26.2.32 -r 1.26.2.33 src/foldersel.c; cvs diff -u -r 1.4.12.4 -r 1.4.12.5 src/foldersel.h; cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/folderutils.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/folderutils.h; cvs diff -u -r 1.207.2.166 -r 1.207.2.167 src/folderview.c; cvs diff -u -r 1.20.2.20 -r 1.20.2.21 src/folderview.h; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gedit-print.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gedit-print.h; cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/grouplistdialog.c; cvs diff -u -r 1.3.14.4 -r 1.3.14.5 src/grouplistdialog.h; cvs diff -u -r 1.8.2.21 -r 1.8.2.22 src/headerview.c; cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/headerview.h; cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/html.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/html.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/image_viewer.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/image_viewer.h; cvs diff -u -r 1.179.2.175 -r 1.179.2.176 src/imap.c; cvs diff -u -r 1.34.2.16 -r 1.34.2.17 src/imap.h; cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/imap_gtk.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/imap_gtk.h; cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/import.c; cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/import.h; cvs diff -u -r 1.14.2.15 -r 1.14.2.16 src/importldif.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/importldif.h; cvs diff -u -r 1.4.12.16 -r 1.4.12.17 src/importmutt.c; cvs diff -u -r 1.2.12.4 -r 1.2.12.5 src/importmutt.h; cvs diff -u -r 1.1.14.16 -r 1.1.14.17 src/importpine.c; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/importpine.h; cvs diff -u -r 1.149.2.74 -r 1.149.2.75 src/inc.c; cvs diff -u -r 1.29.2.12 -r 1.29.2.13 src/inc.h; cvs diff -u -r 1.18.2.24 -r 1.18.2.25 src/jpilot.c; cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/jpilot.h; cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/ldapctrl.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/ldapctrl.h; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/ldaplocate.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/ldaplocate.h; cvs diff -u -r 1.3.2.19 -r 1.3.2.20 src/ldapquery.c; cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/ldapquery.h; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/ldapserver.c; cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/ldapserver.h; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/ldapupdate.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/ldapupdate.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/ldaputil.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/ldaputil.h; cvs diff -u -r 1.12.2.13 -r 1.12.2.14 src/ldif.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/ldif.h; cvs diff -u -r 1.3.4.5 -r 1.3.4.6 src/localfolder.c; cvs diff -u -r 1.2.4.3 -r 1.2.4.4 src/localfolder.h; cvs diff -u -r 1.115.2.157 -r 1.115.2.158 src/main.c; cvs diff -u -r 1.7.2.11 -r 1.7.2.12 src/main.h; cvs diff -u -r 1.274.2.194 -r 1.274.2.195 src/mainwindow.c; cvs diff -u -r 1.39.2.38 -r 1.39.2.39 src/mainwindow.h; cvs diff -u -r 1.11.2.11 -r 1.11.2.12 src/manual.c; cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/manual.h; cvs diff -u -r 1.75.2.42 -r 1.75.2.43 src/matcher.c; cvs diff -u -r 1.39.2.13 -r 1.39.2.14 src/matcher.h; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/matcher_parser.h; cvs diff -u -r 1.16.2.12 -r 1.16.2.13 src/matcher_parser_lex.l; cvs diff -u -r 1.25.2.29 -r 1.25.2.30 src/matcher_parser_parse.y; cvs diff -u -r 1.28.2.36 -r 1.28.2.37 src/mbox.c; cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/mbox.h; cvs diff -u -r 1.3.12.29 -r 1.3.12.30 src/message_search.c; cvs diff -u -r 1.1.16.5 -r 1.1.16.6 src/message_search.h; cvs diff -u -r 1.94.2.136 -r 1.94.2.137 src/messageview.c; cvs diff -u -r 1.19.2.15 -r 1.19.2.16 src/messageview.h; cvs diff -u -r 1.79.2.55 -r 1.79.2.56 src/mh.c; cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/mh.h; cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/mh_gtk.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/mh_gtk.h; cvs diff -u -r 1.83.2.108 -r 1.83.2.109 src/mimeview.c; cvs diff -u -r 1.20.2.20 -r 1.20.2.21 src/mimeview.h; cvs diff -u -r 1.16.2.52 -r 1.16.2.53 src/msgcache.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/msgcache.h; cvs diff -u -r 1.6.10.11 -r 1.6.10.12 src/mutt.c; cvs diff -u -r 1.3.12.4 -r 1.3.12.5 src/mutt.h; cvs diff -u -r 1.101.2.38 -r 1.101.2.39 src/news.c; cvs diff -u -r 1.21.2.6 -r 1.21.2.7 src/news.h; cvs diff -u -r 1.2.2.22 -r 1.2.2.23 src/news_gtk.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/news_gtk.h; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/noticeview.c; cvs diff -u -r 1.3.8.7 -r 1.3.8.8 src/noticeview.h; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/partial_download.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/partial_download.h; cvs diff -u -r 1.6.2.10 -r 1.6.2.11 src/pine.c; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/pine.h; cvs diff -u -r 1.56.2.52 -r 1.56.2.53 src/pop.c; cvs diff -u -r 1.17.2.18 -r 1.17.2.19 src/pop.h; cvs diff -u -r 1.105.2.102 -r 1.105.2.103 src/prefs_account.c; cvs diff -u -r 1.49.2.31 -r 1.49.2.32 src/prefs_account.h; cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/prefs_actions.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_actions.h; cvs diff -u -r 1.204.2.138 -r 1.204.2.139 src/prefs_common.c; cvs diff -u -r 1.103.2.85 -r 1.103.2.86 src/prefs_common.h; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_compose_writing.h; cvs diff -u -r 1.16.2.26 -r 1.16.2.27 src/prefs_customheader.c; cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/prefs_customheader.h; cvs diff -u -r 1.16.2.29 -r 1.16.2.30 src/prefs_display_header.c; cvs diff -u -r 1.1.16.4 -r 1.1.16.5 src/prefs_display_header.h; cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/prefs_ext_prog.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/prefs_ext_prog.h; cvs diff -u -r 1.59.2.56 -r 1.59.2.57 src/prefs_filtering.c; cvs diff -u -r 1.6.2.6 -r 1.6.2.7 src/prefs_filtering.h; cvs diff -u -r 1.1.4.37 -r 1.1.4.38 src/prefs_filtering_action.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/prefs_filtering_action.h; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_folder_column.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_folder_column.h; cvs diff -u -r 1.52.2.40 -r 1.52.2.41 src/prefs_folder_item.c; cvs diff -u -r 1.17.2.4 -r 1.17.2.5 src/prefs_folder_item.h; cvs diff -u -r 1.4.2.19 -r 1.4.2.20 src/prefs_fonts.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/prefs_fonts.h; cvs diff -u -r 1.10.2.32 -r 1.10.2.33 src/prefs_gtk.c; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/prefs_gtk.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_image_viewer.h; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_logging.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_logging.h; cvs diff -u -r 1.43.2.58 -r 1.43.2.59 src/prefs_matcher.c; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/prefs_matcher.h; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_message.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_message.h; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_msg_colors.h; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_other.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_other.h; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_quote.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_quote.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_receive.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_receive.h; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_send.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_send.h; cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/prefs_spelling.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/prefs_spelling.h; cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_summaries.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_summaries.h; cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/prefs_summary_column.c; cvs diff -u -r 1.1.16.4 -r 1.1.16.5 src/prefs_summary_column.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_summary_open.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_summary_open.h; cvs diff -u -r 1.12.2.44 -r 1.12.2.45 src/prefs_template.c; cvs diff -u -r 1.1.16.6 -r 1.1.16.7 src/prefs_template.h; cvs diff -u -r 1.3.2.49 -r 1.3.2.50 src/prefs_themes.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/prefs_themes.h; cvs diff -u -r 1.30.2.34 -r 1.30.2.35 src/prefs_toolbar.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_toolbar.h; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_wrapping.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_wrapping.h; cvs diff -u -r 1.10.2.14 -r 1.10.2.15 src/privacy.c; cvs diff -u -r 1.10.2.13 -r 1.10.2.14 src/privacy.h; cvs diff -u -r 1.47.2.44 -r 1.47.2.45 src/procheader.c; cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/procheader.h; cvs diff -u -r 1.49.2.92 -r 1.49.2.93 src/procmime.c; cvs diff -u -r 1.17.2.17 -r 1.17.2.18 src/procmime.h; cvs diff -u -r 1.150.2.99 -r 1.150.2.100 src/procmsg.c; cvs diff -u -r 1.60.2.45 -r 1.60.2.46 src/procmsg.h; cvs diff -u -r 1.8.2.21 -r 1.8.2.22 src/quote_fmt.c; cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.33 -r 1.22.2.34 src/quote_fmt_parse.y; cvs diff -u -r 1.17.2.9 -r 1.17.2.10 src/recv.c; cvs diff -u -r 1.6.12.4 -r 1.6.12.5 src/recv.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/remotefolder.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/remotefolder.h; cvs diff -u -r 1.17.2.38 -r 1.17.2.39 src/send_message.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/send_message.h; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/setup.c; cvs diff -u -r 1.1.1.1.16.5 -r 1.1.1.1.16.6 src/setup.h; cvs diff -u -r 1.1.16.3 -r 1.1.16.4 src/simple-gettext.c; cvs diff -u -r 1.9.2.20 -r 1.9.2.21 src/sourcewindow.c; cvs diff -u -r 1.1.1.1.16.5 -r 1.1.1.1.16.6 src/sourcewindow.h; cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/ssl_manager.c; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/ssl_manager.h; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/statusbar.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/statusbar.h; cvs diff -u -r 1.25.2.39 -r 1.25.2.40 src/stock_pixmap.c; cvs diff -u -r 1.18.2.28 -r 1.18.2.29 src/stock_pixmap.h; cvs diff -u -r 1.15.2.50 -r 1.15.2.51 src/summary_search.c; cvs diff -u -r 1.3.16.4 -r 1.3.16.5 src/summary_search.h; cvs diff -u -r 1.395.2.308 -r 1.395.2.309 src/summaryview.c; cvs diff -u -r 1.68.2.38 -r 1.68.2.39 src/summaryview.h; cvs diff -u -r 1.96.2.174 -r 1.96.2.175 src/textview.c; cvs diff -u -r 1.12.2.19 -r 1.12.2.20 src/textview.h; cvs diff -u -r 1.43.2.66 -r 1.43.2.67 src/toolbar.c; cvs diff -u -r 1.19.2.17 -r 1.19.2.18 src/toolbar.h; cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/undo.c; cvs diff -u -r 1.5.14.8 -r 1.5.14.9 src/undo.h; cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/unmime.c; cvs diff -u -r 1.2.10.5 -r 1.2.10.6 src/unmime.h; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/uri_opener.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/uri_opener.h; cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/vcard.c; cvs diff -u -r 1.5.12.4 -r 1.5.12.5 src/vcard.h; cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/wizard.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/wizard.h; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/base64.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/base64.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/claws.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/claws.h; cvs diff -u -r 1.9.2.39 -r 1.9.2.40 src/common/defs.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/fnmatch.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/fnmatch.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/fnmatch_loop.c; cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/common/hooks.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/common/hooks.h; cvs diff -u -r 1.6.2.12 -r 1.6.2.13 src/common/log.c; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/common/log.h; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/common/md5.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/md5.h; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/mgutils.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/mgutils.h; cvs diff -u -r 1.6.2.13 -r 1.6.2.14 src/common/nntp.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/common/nntp.h; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/common/passcrypt.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/passcrypt.h.in; cvs diff -u -r 1.13.2.28 -r 1.13.2.29 src/common/plugin.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/common/plugin.h; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/common/prefs.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/common/prefs.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/progressindicator.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/progressindicator.h; cvs diff -u -r 1.3.2.13 -r 1.3.2.14 src/common/quoted-printable.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/common/quoted-printable.h; cvs diff -u -r 1.23.2.14 -r 1.23.2.15 src/common/session.c; cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/common/session.h; cvs diff -u -r 1.11.2.21 -r 1.11.2.22 src/common/smtp.c; cvs diff -u -r 1.6.2.11 -r 1.6.2.12 src/common/smtp.h; cvs diff -u -r 1.13.2.33 -r 1.13.2.34 src/common/socket.c; cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/common/socket.h; cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/common/ssl.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/ssl.h; cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/ssl_certificate.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/string_match.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/string_match.h; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/stringtable.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/stringtable.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/tags.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/tags.h; cvs diff -u -r 1.2.4.19 -r 1.2.4.20 src/common/template.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/template.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/common/timing.h; cvs diff -u -r 1.36.2.105 -r 1.36.2.106 src/common/utils.c; cvs diff -u -r 1.20.2.47 -r 1.20.2.48 src/common/utils.h; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/uuencode.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/uuencode.h; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/common/version.h.in; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_dirent.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_reg.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_signal.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_stat.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_stdlib.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_string.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_time.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_unistd.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_wait.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/common/w32lib.h; cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/common/xml.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/common/xml.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/xmlprops.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/common/xmlprops.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-errors.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/etpan-thread-manager-types.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/etpan/etpan-thread-manager.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/etpan-thread-manager.h; cvs diff -u -r 1.1.4.79 -r 1.1.4.80 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/etpan/imap-thread.h; cvs diff -u -r 1.4.2.50 -r 1.4.2.51 src/gtk/about.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/gtk/about.h; cvs diff -u -r 1.2.2.19 -r 1.2.2.20 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/colorlabel.h; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/colorsel.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/colorsel.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/combobox.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/combobox.h; cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/gtk/description_window.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/description_window.h; cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/gtk/filesel.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/filesel.h; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/foldersort.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/foldersort.h; cvs diff -u -r 1.9.2.51 -r 1.9.2.52 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/gtkaspell.h; cvs diff -u -r 1.1.4.39 -r 1.1.4.40 src/gtk/gtksctree.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/gtkshruler.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/gtkshruler.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtksourceprintjob.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtksourceprintjob.h; cvs diff -u -r 1.5.2.58 -r 1.5.2.59 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.35 -r 1.4.2.36 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/gtk/gtkvscrollbutton.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/icon_legend.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/icon_legend.h; cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/inputdialog.h; cvs diff -u -r 1.1.4.30 -r 1.1.4.31 src/gtk/logwindow.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/logwindow.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/manage_window.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/manage_window.h; cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/menu.c; cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/gtk/menu.h; cvs diff -u -r 1.5.2.48 -r 1.5.2.49 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/pluginwindow.h; cvs diff -u -r 1.12.2.36 -r 1.12.2.37 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.10 -r 1.7.2.11 src/gtk/prefswindow.h; cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/gtk/progressdialog.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/progressdialog.h; cvs diff -u -r 1.1.2.73 -r 1.1.2.74 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/quicksearch.h; cvs diff -u -r 1.9.2.17 -r 1.9.2.18 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.7 -r 1.6.2.8 src/gtk/sslcertwindow.h; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/bogofilter/bogofilter.h; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.13.2.33 -r 1.13.2.34 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/plugins/clamav/clamav_plugin.h; cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/plugins/demo/demo.c; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.2.4.6 -r 1.2.4.7 src/plugins/dillo_viewer/dillo_prefs.h; cvs diff -u -r 1.12.2.21 -r 1.12.2.22 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/passphrase.h; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/pgp_viewer.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/pgp_viewer.h; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/prefs_gpg.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/select-keys.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/select-keys.h; cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/plugins/pgpcore/sgpgme.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/sgpgme.h; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpinline/pgpinline.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/pgpmime.h; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.18.2.54 -r 1.18.2.55 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.16 -r 1.4.2.17 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.39 -r 1.23.2.40 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.54 -r 1.14.2.55 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/trayicon/trayicon_prefs.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/trayicon/trayicon_prefs.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/trayicon/libeggtrayicon/eggtrayicon.h; cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.h; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c; cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/OOo2claws-mail.pl; cvs diff -u -r 1.1.14.3 -r 1.1.14.4 tools/README.sylprint; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/acroread2claws-mail.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/claws-mail-compose-insert-files.pl; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/convert_mbox.pl; cvs diff -u -r 1.16.2.5 -r 1.16.2.6 tools/filter_conv.pl; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 tools/filter_conv_new.pl; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/fix_date.sh; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 tools/freshmeat_search.pl; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 tools/google_search.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/kmail-mailbox2claws-mail.pl; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/kmail2claws-mail.pl; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/kmail2claws-mail_v2.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/mairix.sh; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 tools/make.themes.project; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 tools/multiwebsearch.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/nautilus2claws-mail.sh; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 tools/outlook2claws-mail.pl; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 tools/textviewer.sh; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/thunderbird-filters-convertor.pl; cvs diff -u -r 1.2.14.3 -r 1.2.14.4 tools/update-po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/uuooffice; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 tools/vcard2xml.py; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 tools/kdeservicemenu/claws-mail-kdeservicemenu.pl; ) > 2.10.0cvs16.patchset ( cvs diff -u -r 1.395.2.309 -r 1.395.2.310 src/summaryview.c; ) > 2.10.0cvs17.patchset +( cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/gtk/colorlabel.c; ) > 2.10.0cvs18.patchset diff --git a/configure.ac b/configure.ac index 6db373c5f..35b628b05 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=17 +EXTRA_VERSION=18 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c index d75ca4599..58a8509c7 100644 --- a/src/gtk/colorlabel.c +++ b/src/gtk/colorlabel.c @@ -339,7 +339,7 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index, gboolean fo gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4); if (color_index < 9) { - accel = g_strdup_printf(_("Ctrl+%c"), '1'+color_index); + accel = g_strdup_printf(gettext("Ctrl+%c"), '1'+color_index); label = gtk_label_new(accel); gtk_widget_show(label); gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); -- 2.25.1