diff options
| author | Christian Neumair <cneumair@src.gnome.org> | 2004-06-05 16:55:25 +0800 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2004-06-05 16:55:25 +0800 |
| commit | d40794d3449282ff9f8e6165bd0ee63743e1bbd6 (patch) | |
| tree | 5c91bf93b9cd2ea0c8b7d9b1d0e2154ed6b2cf29 | |
| parent | 5727ab6f4eb11ef8d957202e1708c80645b1d496 (diff) | |
| download | gsoc2013-evolution-d40794d3449282ff9f8e6165bd0ee63743e1bbd6.tar gsoc2013-evolution-d40794d3449282ff9f8e6165bd0ee63743e1bbd6.tar.gz gsoc2013-evolution-d40794d3449282ff9f8e6165bd0ee63743e1bbd6.tar.bz2 gsoc2013-evolution-d40794d3449282ff9f8e6165bd0ee63743e1bbd6.tar.lz gsoc2013-evolution-d40794d3449282ff9f8e6165bd0ee63743e1bbd6.tar.xz gsoc2013-evolution-d40794d3449282ff9f8e6165bd0ee63743e1bbd6.tar.zst gsoc2013-evolution-d40794d3449282ff9f8e6165bd0ee63743e1bbd6.zip | |
Shuffle usage of trailing "..." in menus.
svn path=/trunk/; revision=26227
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 8 | ||||
| -rw-r--r-- | ui/ChangeLog | 5 | ||||
| -rw-r--r-- | ui/evolution-mail-list.xml | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 2a476c3973..630ef96ef2 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2004-06-05 Christian Neumair <chris@gnome-de.org> + * em-folder-tree.c: Shuffle usage of trailing "..." in menus according + to the HIG. + +2004-06-05 Christian Neumair <chris@gnome-de.org> + * mail-component.c (view_changed_cb): Use ngettext for message count information. diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 99332daa11..1186aef1b7 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -2538,18 +2538,18 @@ static EMPopupItem emft_popup_menu[] = { { EM_POPUP_BAR, "10.emc" }, #endif - { EM_POPUP_ITEM, "10.emc.00", N_("_Copy"), G_CALLBACK (emft_popup_copy), NULL, "stock_folder-copy", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, - { EM_POPUP_ITEM, "10.emc.01", N_("_Move"), G_CALLBACK (emft_popup_move), NULL, "stock_folder-move", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { EM_POPUP_ITEM, "10.emc.00", N_("_Copy..."), G_CALLBACK (emft_popup_copy), NULL, "stock_folder-copy", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, + { EM_POPUP_ITEM, "10.emc.01", N_("_Move..."), G_CALLBACK (emft_popup_move), NULL, "stock_folder-move", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, { EM_POPUP_BAR, "20.emc" }, /* FIXME: need to disable for nochildren folders */ { EM_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), G_CALLBACK (emft_popup_new_folder), NULL, "stock_folder", EM_POPUP_FOLDER_INFERIORS }, /* FIXME: need to disable for undeletable folders */ { EM_POPUP_ITEM, "20.emc.01", N_("_Delete"), G_CALLBACK (emft_popup_delete_folder), NULL, "stock_delete", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { EM_POPUP_ITEM, "20.emc.01", N_("_Rename"), G_CALLBACK (emft_popup_rename_folder), NULL, NULL, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { EM_POPUP_ITEM, "20.emc.01", N_("_Rename..."), G_CALLBACK (emft_popup_rename_folder), NULL, NULL, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, { EM_POPUP_BAR, "80.emc" }, - { EM_POPUP_ITEM, "80.emc.00", N_("_Properties..."), G_CALLBACK (emft_popup_properties), NULL, "stock_folder-properties", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } + { EM_POPUP_ITEM, "80.emc.00", N_("_Properties"), G_CALLBACK (emft_popup_properties), NULL, "stock_folder-properties", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } }; static gboolean diff --git a/ui/ChangeLog b/ui/ChangeLog index a1715ff292..03e81bde8a 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,8 @@ +2004-06-05 Christian Neumair <chris@gnome-de.org> + + * evolution-mail-list.xml: Remove trailing "..." from folder + properties menuitem. + 2004-06-01 William Jon McCann <mccann@jhu.edu> * evolution.xml: Add toolbar visibility toggle to View menu. diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml index e13fb781bb..5ba4a79129 100644 --- a/ui/evolution-mail-list.xml +++ b/ui/evolution-mail-list.xml @@ -70,7 +70,7 @@ <placeholder name="ComponentPlaceholder"> <separator name="mail-list-folder"/> <submenu name="Folder" _label="_Folder"> - <menuitem name="ChangeFolderProperties" verb="" _label="_Properties..."/> + <menuitem name="ChangeFolderProperties" verb="" _label="_Properties"/> </submenu> </placeholder> </submenu> |