projects / claws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c61238)
2005-04-17 [colin] 1.9.6cvs39
authorColin Leroy <colin@colino.net>
Sun, 17 Apr 2005 17:04:25 +0000 (17:04 +0000)
committerColin Leroy <colin@colino.net>
Sun, 17 Apr 2005 17:04:25 +0000 (17:04 +0000)
* src/mainwindow.c
Fix duplicate hotkeys in Mainwindow's menu

ChangeLog-gtk2.claws patch | blob | history
PATCHSETS patch | blob | history
configure.ac patch | blob | history
src/mainwindow.c patch | blob | history

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 57c6233998985ec4d3f97ff2ce3b28bdb8139bcb..75e08de9177df2b05cf571b3eb97ce6c88cbbc50 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-04-17 [colin]     1.9.6cvs39
+
+       * src/mainwindow.c
+               Fix duplicate hotkeys in Mainwindow's menu
+
 2005-04-17 [colin]     1.9.6cvs38
 
        * src/folderview.c
 2005-04-17 [colin]     1.9.6cvs38
 
        * src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
index a793a9830a5dfe7f0757fb858169df16ceefce8f..b2949b5f6fc5a3a5ee4190d41688adda62ef1395 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -455,3 +455,4 @@
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpmime/pgpmime.c; ) > 1.9.6cvs36.patchset
 ( cvs diff -u -r 1.395.2.66 -r 1.395.2.67 src/summaryview.c; ) > 1.9.6cvs37.patchset
 ( cvs diff -u -r 1.207.2.31 -r 1.207.2.32 src/folderview.c; ) > 1.9.6cvs38.patchset
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpmime/pgpmime.c; ) > 1.9.6cvs36.patchset
 ( cvs diff -u -r 1.395.2.66 -r 1.395.2.67 src/summaryview.c; ) > 1.9.6cvs37.patchset
 ( cvs diff -u -r 1.207.2.31 -r 1.207.2.32 src/folderview.c; ) > 1.9.6cvs38.patchset
+( cvs diff -u -r 1.274.2.33 -r 1.274.2.34 src/mainwindow.c; ) > 1.9.6cvs39.patchset
diff --git a/configure.ac b/configure.ac
index 44d73ddc642f5aa65975500ad7e46c6ae8b5a180..8cb1a72d005eb1cb1571cfa4f7e2b0595cfdfbc2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 66d846ea21b7680bf7dfdc5239f2faec9a5acc3a..893cc6264d128322c20a22d028b63b9ee79fc27a 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -447,7 +447,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Import mbox file..."),     NULL, import_mbox_cb, 0, NULL},
        {N_("/_File/_Export to mbox file..."),  NULL, export_mbox_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Import mbox file..."),     NULL, import_mbox_cb, 0, NULL},
        {N_("/_File/_Export to mbox file..."),  NULL, export_mbox_cb, 0, NULL},
-       {N_("/_File/_Export selected to mbox file..."), 
+       {N_("/_File/Exp_ort selected to mbox file..."), 
                                                NULL, export_list_mbox_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/Empty all _Trash folders"), "<shift>D", empty_trash_cb, 0, NULL},
                                                NULL, export_list_mbox_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/Empty all _Trash folders"), "<shift>D", empty_trash_cb, 0, NULL},
@@ -646,7 +646,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
        {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Open in new _window"),      "<control><alt>N", open_msg_cb, 0, NULL},
        {N_("/_View/Mess_age source"),          "<control>U", view_source_cb, 0, NULL},
-       {N_("/_View/Show all _headers"),        "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show all headers"),         "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
@@ -713,19 +713,19 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/_Tools/_Create filter rule/by _Subject"),
                                                NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
                                                NULL, create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/_Tools/_Create filter rule/by _Subject"),
                                                NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
-       {N_("/_Tools/_Create processing rule"), NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/_Create processing rule/_Automatically"),
+       {N_("/_Tools/C_reate processing rule"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/C_reate processing rule/_Automatically"),
                                                NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
                                                NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
-       {N_("/_Tools/_Create processing rule/by _From"),
+       {N_("/_Tools/C_reate processing rule/by _From"),
                                                NULL, create_processing_cb, FILTER_BY_FROM, NULL},
                                                NULL, create_processing_cb, FILTER_BY_FROM, NULL},
-       {N_("/_Tools/_Create processing rule/by _To"),
+       {N_("/_Tools/C_reate processing rule/by _To"),
                                                NULL, create_processing_cb, FILTER_BY_TO, NULL},
                                                NULL, create_processing_cb, FILTER_BY_TO, NULL},
-       {N_("/_Tools/_Create processing rule/by _Subject"),
+       {N_("/_Tools/C_reate processing rule/by _Subject"),
                                                NULL, create_processing_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/Actio_ns"),                NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
                                                NULL, create_processing_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/Actio_ns"),                NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/_Check for new messages in all folders"),
+       {N_("/_Tools/Ch_eck for new messages in all folders"),
                                                NULL, update_folderview_cb, 0, NULL},
        {N_("/_Tools/Delete du_plicated messages"),
                                                NULL, NULL, 0, "<Branch>"},
                                                NULL, update_folderview_cb, 0, NULL},
        {N_("/_Tools/Delete du_plicated messages"),
                                                NULL, NULL, 0, "<Branch>"},
@@ -737,7 +737,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Tools/E_xecute"),                "X", execute_summary_cb, 0, NULL},
 #ifdef USE_OPENSSL
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/E_xecute"),                "X", execute_summary_cb, 0, NULL},
 #ifdef USE_OPENSSL
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/SSL certi_ficates..."),    
+       {N_("/_Tools/SSL cer_tificates..."),    
                                                NULL, ssl_manager_open_cb, 0, NULL},
 #endif
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
                                                NULL, ssl_manager_open_cb, 0, NULL},
 #endif
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
@@ -753,24 +753,24 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration/_Edit accounts..."),
                                                NULL, account_edit_open, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Configuration/_Edit accounts..."),
                                                NULL, account_edit_open, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
-       {N_("/_Configuration/_Preferences..."),
+       {N_("/_Configuration/P_references..."),
                                                NULL, prefs_open_cb, 0, NULL},
                                                NULL, prefs_open_cb, 0, NULL},
-       {N_("/_Configuration/Pre-processing..."),
+       {N_("/_Configuration/Pre-pr_ocessing..."),
                                                NULL, prefs_pre_processing_open_cb, 0, NULL},
                                                NULL, prefs_pre_processing_open_cb, 0, NULL},
-       {N_("/_Configuration/Post-processing..."),
+       {N_("/_Configuration/Post-pro_cessing..."),
                                                NULL, prefs_post_processing_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
        {N_("/_Configuration/_Templates..."),   NULL, prefs_template_open_cb, 0, NULL},
        {N_("/_Configuration/_Actions..."),     NULL, prefs_actions_open_cb, 0, NULL},
                                                NULL, prefs_post_processing_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
        {N_("/_Configuration/_Templates..."),   NULL, prefs_template_open_cb, 0, NULL},
        {N_("/_Configuration/_Actions..."),     NULL, prefs_actions_open_cb, 0, NULL},
-       {N_("/_Configuration/Plugins..."),      NULL, plugins_open_cb, 0, NULL},
+       {N_("/_Configuration/Plu_gins..."),     NULL, plugins_open_cb, 0, NULL},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Help/_Manual (Local)"),          NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Help/_Manual (Local)"),          NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
-       {N_("/_Help/_Manual (Sylpheed Doc Homepage)"),
+       {N_("/_Help/Ma_nual (Sylpheed Doc Homepage)"),
                                                NULL, manual_open_cb, MANUAL_MANUAL_SYLDOC, NULL},
        {N_("/_Help/_FAQ (Local)"),             NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
                                                NULL, manual_open_cb, MANUAL_MANUAL_SYLDOC, NULL},
        {N_("/_Help/_FAQ (Local)"),             NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
-       {N_("/_Help/_FAQ (Sylpheed Doc Homepage)"),
+       {N_("/_Help/FA_Q (Sylpheed Doc Homepage)"),
                                                NULL, manual_open_cb, MANUAL_FAQ_SYLDOC, NULL},
        {N_("/_Help/_Claws FAQ (Claws Documentation)"),
                                                NULL, manual_open_cb, MANUAL_FAQ_CLAWS, NULL},
                                                NULL, manual_open_cb, MANUAL_FAQ_SYLDOC, NULL},
        {N_("/_Help/_Claws FAQ (Claws Documentation)"),
                                                NULL, manual_open_cb, MANUAL_FAQ_CLAWS, NULL},
Claws Mail