2006-11-16 [paul] 2.6.0cvs50

	* po/Makevars
		update my email address
	* src/addressbook.c
	* src/compose.c
	* src/imap_gtk.c
	* src/mh_gtk.c
	* src/news_gtk.c
	* src/summaryview.c
	* src/plugins/trayicon/trayicon.c
		don't offer simple menu separators
		for translation
	* src/folderview.c
		add separator between 'mark all read'
		and 'search folder'

diff --git a/ChangeLog b/ChangeLog
index 2403c61e738f988f5a1ed306a0e84cbb8956aa9e..4a0287588322648979a0757c40b92ed1daa77081 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-11-16 [paul]      2.6.0cvs50
+
+       * po/Makevars
+               update my email address
+       * src/addressbook.c
+       * src/compose.c
+       * src/imap_gtk.c
+       * src/mh_gtk.c
+       * src/news_gtk.c
+       * src/summaryview.c
+       * src/plugins/trayicon/trayicon.c
+               don't offer simple menu separators
+               for translation
+       * src/folderview.c
+               add separator between 'mark all read'
+               and 'search folder'
+
 2006-11-15 [wwp]       2.6.0cvs49
 
        * src/gtk/authors.h

diff --git a/PATCHSETS b/PATCHSETS
index 9600434253a8e42146e1f6b7e4d316b95251c0dd..a75655b974b824068f4ca775939c95663e3db100 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2074,3 +2074,4 @@
 ( cvs diff -u -r 1.155.2.48 -r 1.155.2.49 src/Makefile.am;  cvs diff -u -r 1.28.2.30 -r 1.28.2.31 src/mbox.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/pgpinline/pgpinline.c;  ) > 2.6.0cvs47.patchset
 ( cvs diff -u -r 1.382.2.330 -r 1.382.2.331 src/compose.c;  ) > 2.6.0cvs48.patchset
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/gtk/authors.h;  ) > 2.6.0cvs49.patchset
+( cvs diff -u -r 1.1.4.5 -r 1.1.4.6 po/Makevars;  cvs diff -u -r 1.60.2.68 -r 1.60.2.69 src/addressbook.c;  cvs diff -u -r 1.382.2.331 -r 1.382.2.332 src/compose.c;  cvs diff -u -r 1.207.2.133 -r 1.207.2.134 src/folderview.c;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/imap_gtk.c;  cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/mh_gtk.c;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/news_gtk.c;  cvs diff -u -r 1.395.2.265 -r 1.395.2.266 src/summaryview.c;  cvs diff -u -r 1.14.2.43 -r 1.14.2.44 src/plugins/trayicon/trayicon.c;  ) > 2.6.0cvs50.patchset

diff --git a/configure.ac b/configure.ac
index c62bd5c6ab266abd7beeca36bc5c4e179413315f..e534cb93a2920afb21313487e7a4e8d7fe6452ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/po/Makevars b/po/Makevars
index 7911ffb98592cb46afeff3b4d3deafbdc24446c8..d35bf2f525b19a118824e1508120aed0d5b7f3ae 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -40,7 +40,7 @@ COPYRIGHT_HOLDER = The Claws Mail Team
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = paul@sylpheed.org
+MSGID_BUGS_ADDRESS = paul@claws-mail.org
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.

diff --git a/src/addressbook.c b/src/addressbook.c
index 236a63cd0878035ad1275c713c47f5d857fdd37b..75d994a1a2840e70883566dd9115dd9d9f87f7e4 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -458,11 +458,11 @@ static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
 {
        {N_("/_Edit"),          NULL, addressbook_treenode_edit_cb,   0, NULL},
        {N_("/_Delete"),        NULL, addressbook_treenode_delete_cb, 0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
        {N_("/New _Book"),      NULL, addressbook_new_book_cb,      0, NULL},
        {N_("/New _Folder"),    NULL, addressbook_new_folder_cb,      0, NULL},
        {N_("/New _Group"),     NULL, addressbook_new_group_cb,      0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
        {N_("/C_ut"),           NULL, addressbook_treenode_cut_cb,    0, NULL},
        {N_("/_Copy"),          NULL, addressbook_treenode_copy_cb,   0, NULL},
        {N_("/_Paste"),         NULL, addressbook_treenode_paste_cb,  0, NULL}
@@ -471,17 +471,17 @@ static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
 static GtkItemFactoryEntry addressbook_list_popup_entries[] =
 {
        {N_("/_Select all"),    NULL, addressbook_select_all_cb, 0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit"),          NULL, addressbook_edit_address_cb,   0, NULL},
        {N_("/_Delete"),        NULL, addressbook_delete_address_cb, 0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
        {N_("/New _Address"),   NULL, addressbook_new_address_cb,    0, NULL},
        {N_("/New _Group"),     NULL, addressbook_new_group_cb,      0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
        {N_("/C_ut"),           NULL, addressbook_clip_cut_cb,       0, NULL},
        {N_("/_Copy"),          NULL, addressbook_clip_copy_cb,      0, NULL},
        {N_("/_Paste"),         NULL, addressbook_clip_paste_cb,     0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
 /*     {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL},*/
        {N_("/_Mail To"),       NULL, addressbook_mail_to_cb,            0, NULL},
 #ifdef USE_LDAP

diff --git a/src/compose.c b/src/compose.c
index 33d648ae5871f33fbea8e2da96a68d5a092314ea..92afe0835bcfc3504359c7228cd51dd29e3fab7e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -521,7 +521,7 @@ static GtkItemFactoryEntry compose_popup_entries[] =
 {
        {N_("/_Add..."),        NULL, compose_attach_cb, 0, NULL},
        {N_("/_Remove"),        NULL, compose_attach_remove_selected, 0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
        {N_("/_Properties..."), NULL, compose_attach_property, 0, NULL}
 };
 

diff --git a/src/folderview.c b/src/folderview.c
index fe67036cd32711a8460da0b611111b7002bf2748..bd68aea4270c42d59c5e0fa0ca14d7dc6d028c72 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -288,6 +288,7 @@ GHashTable *folderview_popups;
 static GtkItemFactoryEntry folderview_common_popup_entries[] =
 {
        {N_("/Mark all re_ad"),         NULL, mark_all_read_cb, 0, NULL},
+       {"/---",                        NULL, NULL, 0, "<Separator>"},
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
        {N_("/Process_ing..."),         NULL, folderview_processing_cb, 0, NULL},

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 33986aa231cb53b517e0e141273c1f9042106dd0..5e681521269c70c823dc872934e99151a500ece3 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -56,14 +56,14 @@ static GtkItemFactoryEntry imap_popup_entries[] =
        {N_("/_Rename folder..."),       NULL, rename_folder_cb, 0, NULL},
        {N_("/M_ove folder..."),         NULL, move_folder_cb,   0, NULL},
        {N_("/_Delete folder..."),       NULL, delete_folder_cb, 0, NULL},
-       {N_("/---"),                     NULL, NULL,             0, "<Separator>"},
+       {"/---",                         NULL, NULL,             0, "<Separator>"},
        {N_("/Synchronise"),             NULL, sync_cb,         0, NULL},
        {N_("/Down_load messages"),      NULL, download_cb,      0, NULL},
-       {N_("/---"),                     NULL, NULL,             0, "<Separator>"},
+       {"/---",                         NULL, NULL,             0, "<Separator>"},
        {N_("/_Check for new messages"), NULL, update_tree_cb,   0, NULL},
        {N_("/C_heck for new folders"),  NULL, update_tree_cb,   1, NULL},
        {N_("/R_ebuild folder tree"),    NULL, update_tree_cb,   2, NULL},
-       {N_("/---"),                     NULL, NULL,             0, "<Separator>"},
+       {"/---",                         NULL, NULL,             0, "<Separator>"},
 };
 
 static void set_sensitivity(GtkItemFactory *factory, FolderItem *item);

diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index bc0fb1e80453d84427080e344ff5f59733f4a536..25f67302591ab2a2850b281055b02e02ff72ae39 100644 (file)
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -51,13 +51,13 @@ static GtkItemFactoryEntry mh_popup_entries[] =
        {N_("/_Rename folder..."),       NULL, rename_folder_cb,  0, NULL},
        {N_("/M_ove folder..."),         NULL, move_folder_cb,    0, NULL},
        {N_("/_Delete folder..."),       NULL, delete_folder_cb,  0, NULL},
-       {N_("/---"),                     NULL, NULL,              0, "<Separator>"},
+       {"/---",                         NULL, NULL,              0, "<Separator>"},
        {N_("/_Check for new messages"), NULL, update_tree_cb,    0, NULL},
        {N_("/C_heck for new folders"),  NULL, update_tree_cb,    1, NULL},
        {N_("/R_ebuild folder tree"),    NULL, update_tree_cb,    2, NULL},
-       {N_("/---"),                     NULL, NULL,              0, "<Separator>"},
+       {"/---",                         NULL, NULL,              0, "<Separator>"},
        {N_("/Remove _mailbox..."),      NULL, remove_mailbox_cb, 0, NULL},
-       {N_("/---"),                     NULL, NULL,              0, "<Separator>"},
+       {"/---",                         NULL, NULL,              0, "<Separator>"},
 };
 
 static void set_sensitivity(GtkItemFactory *factory, FolderItem *item);

diff --git a/src/news_gtk.c b/src/news_gtk.c
index 2de37582d24891d173af095c8e449ecb3c1aabec..bb1391cb0084ce97363266a44f9c46092cddfd33 100644 (file)
--- a/src/news_gtk.c
+++ b/src/news_gtk.c
@@ -51,12 +51,12 @@ static GtkItemFactoryEntry news_popup_entries[] =
 {
        {N_("/_Subscribe to newsgroup..."),     NULL, subscribe_newsgroup_cb,    0, NULL},
        {N_("/_Unsubscribe newsgroup"),         NULL, unsubscribe_newsgroup_cb,  0, NULL},
-       {N_("/---"),                            NULL, NULL,                      0, "<Separator>"},
+       {"/---",                                NULL, NULL,                      0, "<Separator>"},
        {N_("/Synchronise"),                    NULL, sync_cb,          0, NULL},
        {N_("/Down_load messages"),             NULL, download_cb,               0, NULL},
-       {N_("/---"),                            NULL, NULL,                      0, "<Separator>"},
+       {"/---",                                NULL, NULL,                      0, "<Separator>"},
        {N_("/_Check for new messages"),        NULL, update_tree_cb,            0, NULL},
-       {N_("/---"),                            NULL, NULL,                      0, "<Separator>"},
+       {"/---",                                NULL, NULL,                      0, "<Separator>"},
 };
 
 static void set_sensitivity(GtkItemFactory *factory, FolderItem *item);

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 15fdfbdb9150a66850bd5eeceb9f647c4366459b..2778e546744a0d43c43cf9089357cbce619988a5 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -102,14 +102,14 @@ static void resize_cb                 (GtkWidget *widget, GtkRequisition *req, gpointer use
 static GtkItemFactoryEntry trayicon_popup_menu_entries[] =
 {
        {N_("/_Get Mail"),              NULL, trayicon_get_all_cb,              0, NULL},
-       {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
+       {"/---",                        NULL, NULL,                             0, "<Separator>"},
        {N_("/_Email"),                 NULL, trayicon_compose_cb,              0, NULL},
        {N_("/_Email from account"),    NULL, NULL,                             0, "<Branch>"},
-       {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
+       {"/---",                        NULL, NULL,                             0, "<Separator>"},
        {N_("/Open A_ddressbook"),      NULL, trayicon_addressbook_cb,          0, NULL},
-       {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
+       {"/---",                        NULL, NULL,                             0, "<Separator>"},
        {N_("/_Work Offline"),          NULL, trayicon_toggle_offline_cb,       0, "<CheckItem>"},
-       {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
+       {"/---",                        NULL, NULL,                             0, "<Separator>"},
        {N_("/E_xit Claws Mail"),       NULL, trayicon_exit_cb,                 0, NULL}
 };
 

diff --git a/src/summaryview.c b/src/summaryview.c
index fe8fd06455163d745a3b13fcb2d9b4808d5c23e0..eea35e0bb2ac2bd369d487ca087f971862e43cb8 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -420,16 +420,16 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Repl_y to/_sender"),      NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/Repl_y to/mailing _list"),
                                        "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {"/---",                        NULL, NULL,             0, "<Separator>"},
        {N_("/_Forward"),               "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
        {N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {"/---",                        NULL, NULL,             0, "<Separator>"},
        {N_("/M_ove..."),               "<control>O", summary_move_to,  0, NULL},
        {N_("/_Copy..."),               "<shift><control>O", summary_copy_to,   0, NULL},
        {N_("/Move to _trash"),         "<control>D", summary_delete_trash,     0, NULL},
        {N_("/_Delete..."),             NULL, summary_delete, 0, NULL},
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {"/---",                        NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
        {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
@@ -447,7 +447,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_Mark/Unlock"),           NULL, summary_msgs_unlock, 0, NULL},
        {N_("/Color la_bel"),           NULL, NULL,             0, NULL},
 
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {"/---",                        NULL, NULL,             0, "<Separator>"},
        {N_("/Add sender to address boo_k"),
                                        NULL, summary_add_address_cb, 0, NULL},
        {N_("/Create f_ilter rule"),    NULL, NULL,             0, "<Branch>"},
@@ -468,13 +468,13 @@ static GtkItemFactoryEntry summary_popup_entries[] =
                                        NULL, summary_create_processing_cb, FILTER_BY_TO, NULL},
        {N_("/Create processing rule/by _Subject"),
                                        NULL, summary_create_processing_cb, FILTER_BY_SUBJECT, NULL},
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {"/---",                        NULL, NULL,             0, "<Separator>"},
        {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_View/Open in new _window"),
                                        "<control><alt>N", summary_open_msg,    0, NULL},
        {N_("/_View/Message _source"),  "<control>U", summary_view_source, 0, NULL},
        {N_("/_View/All _headers"),     "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {"/---",                        NULL, NULL,             0, "<Separator>"},
        {N_("/_Save as..."),            "<control>S", summary_save_as,   0, NULL},
        {N_("/_Print..."),              "<control>P", summary_print,   0, NULL},
 };  /* see also list in menu_connect_identical_items() in menu.c if this changes */