diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/evolution-calendars.ui | 58 | ||||
| -rw-r--r-- | ui/evolution-contacts.ui | 24 | ||||
| -rw-r--r-- | ui/evolution-mail-reader.ui | 20 | ||||
| -rw-r--r-- | ui/evolution-mail.ui | 7 | ||||
| -rw-r--r-- | ui/evolution-memos.ui | 28 | ||||
| -rw-r--r-- | ui/evolution-tasks.ui | 34 |
6 files changed, 87 insertions, 84 deletions
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui index 3444bebb72..59900ea05f 100644 --- a/ui/evolution-calendars.ui +++ b/ui/evolution-calendars.ui @@ -48,48 +48,48 @@ </toolbar> <popup name='calendar-popup'> <menuitem action='calendar-new'/> - <menuitem action='calendar-copy'/> - <menuitem action='calendar-rename'/> + <menuitem action='calendar-popup-copy'/> + <menuitem action='calendar-popup-rename'/> <separator/> - <menuitem action='calendar-delete'/> - <menuitem action='calendar-select-one'/> + <menuitem action='calendar-popup-delete'/> + <menuitem action='calendar-popup-select-one'/> <separator/> - <menuitem action='calendar-properties'/> + <menuitem action='calendar-popup-properties'/> </popup> <popup name='calendar-empty-popup'> <menuitem action='event-new'/> <menuitem action='event-all-day-new'/> <menuitem action='event-meeting-new'/> <separator/> - <menuitem action='event-print'/> + <menuitem action='event-popup-print'/> <separator/> - <menuitem action='event-clipboard-paste'/> + <menuitem action='event-popup-clipboard-paste'/> <separator/> <menuitem action='gal-view-menu'/> - <menuitem action='calendar-go-today'/> - <menuitem action='calendar-jump-to'/> + <menuitem action='calendar-popup-go-today'/> + <menuitem action='calendar-popup-jump-to'/> </popup> <popup name='calendar-event-popup'> - <menuitem action='event-open'/> - <menuitem action='event-save-as'/> - <menuitem action='event-print'/> - <separator/> - <menuitem action='event-clipboard-cut'/> - <menuitem action='event-clipboard-copy'/> - <menuitem action='event-clipboard-paste'/> - <separator/> - <menuitem action='event-copy'/> - <menuitem action='event-move'/> - <menuitem action='event-delegate'/> - <menuitem action='event-schedule'/> - <menuitem action='event-forward'/> - <menuitem action='event-reply'/> - <menuitem action='event-reply-all'/> - <separator/> - <menuitem action='event-occurrence-movable'/> - <menuitem action='event-delete'/> - <menuitem action='event-delete-occurrence'/> - <menuitem action='event-delete-occurrence-all'/> + <menuitem action='event-popup-open'/> + <menuitem action='event-popup-save-as'/> + <menuitem action='event-popup-print'/> + <separator/> + <menuitem action='event-popup-clipboard-cut'/> + <menuitem action='event-popup-clipboard-copy'/> + <menuitem action='event-popup-clipboard-paste'/> + <separator/> + <menuitem action='event-popup-copy'/> + <menuitem action='event-popup-move'/> + <menuitem action='event-popup-delegate'/> + <menuitem action='event-popup-schedule'/> + <menuitem action='event-popup-forward'/> + <menuitem action='event-popup-reply'/> + <menuitem action='event-popup-reply-all'/> + <separator/> + <menuitem action='event-popup-occurrence-movable'/> + <menuitem action='event-popup-delete'/> + <menuitem action='event-popup-delete-occurrence'/> + <menuitem action='event-popup-delete-occurrence-all'/> </popup> <popup name='calendar-memopad-popup'> <menuitem action='calendar-memopad-new'/> diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui index 0b221c8743..6d42ee0ae2 100644 --- a/ui/evolution-contacts.ui +++ b/ui/evolution-contacts.ui @@ -49,7 +49,7 @@ </toolbar> <popup name='address-book-popup'> <menuitem action='address-book-new'/> - <menuitem action='address-book-rename'/> + <menuitem action='address-book-popup-rename'/> <menuitem action='address-book-popup-save-as'/> <separator/> <menuitem action='address-book-popup-delete'/> @@ -57,23 +57,23 @@ <menuitem action='address-book-popup-properties'/> </popup> <popup name='contact-popup'> - <menuitem action='contact-open'/> + <menuitem action='contact-popup-open'/> <separator/> <menuitem action='contact-new'/> <menuitem action='contact-new-list'/> <separator/> - <menuitem action='contact-save-as'/> - <menuitem action='contact-forward'/> - <menuitem action='contact-send-message'/> - <menuitem action='contact-print'/> + <menuitem action='contact-popup-save-as'/> + <menuitem action='contact-popup-forward'/> + <menuitem action='contact-popup-send-message'/> + <menuitem action='contact-popup-print'/> <separator/> - <menuitem action='contact-copy'/> - <menuitem action='contact-move'/> + <menuitem action='contact-popup-copy'/> + <menuitem action='contact-popup-move'/> <separator/> - <menuitem action='contact-clipboard-cut'/> - <menuitem action='contact-clipboard-copy'/> - <menuitem action='contact-clipboard-paste'/> - <menuitem action='contact-delete'/> + <menuitem action='contact-popup-clipboard-cut'/> + <menuitem action='contact-popup-clipboard-copy'/> + <menuitem action='contact-popup-clipboard-paste'/> + <menuitem action='contact-popup-delete'/> </popup> <popup name='contact-search-options'> <menuitem action='contact-search-name-contains'/> diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui index a14db5090d..55e7ee56db 100644 --- a/ui/evolution-mail-reader.ui +++ b/ui/evolution-mail-reader.ui @@ -22,6 +22,7 @@ </placeholder> </menu> <menu action='view-menu'> + <separator/> <placeholder name='mail-message-list-actions'/> <separator/> <placeholder name='mail-message-view-actions'> @@ -124,17 +125,18 @@ </placeholder> </toolbar> <popup name='mail-message-popup'> - <menuitem action='mail-reply-sender'/> - <menuitem action='mail-reply-all'/> - <menuitem action='mail-forward'/> + <menuitem action='mail-popup-reply-sender'/> + <menuitem action='mail-popup-reply-all'/> + <menuitem action='mail-popup-forward'/> <separator/> - <menuitem action='mail-message-edit'/> - <menuitem action='mail-save-as'/> - <menuitem action='mail-print'/> + <menuitem action='mail-popup-message-edit'/> + <menuitem action='mail-popup-save-as'/> + <menuitem action='mail-popup-print'/> <separator/> - <menuitem action='mail-delete'/> - <menuitem action='mail-copy'/> - <menuitem action='mail-move'/> + <menuitem action='mail-popup-delete'/> + <menuitem action='mail-popup-undelete'/> + <menuitem action='mail-popup-copy'/> + <menuitem action='mail-popup-move'/> <separator/> <menuitem action='mail-popup-mark-read'/> <menuitem action='mail-popup-mark-unread'/> diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui index cc5a4d348c..5369802139 100644 --- a/ui/evolution-mail.ui +++ b/ui/evolution-mail.ui @@ -21,6 +21,7 @@ <menuitem action='mail-view-vertical'/> </menu> </placeholder> + <separator/> <placeholder name='mail-message-list-actions'> <menuitem action='mail-threads-group-by'/> <menuitem action='mail-threads-expand-all'/> @@ -75,9 +76,9 @@ <separator/> <menuitem action='mail-popup-folder-rename'/> <menuitem action='mail-popup-folder-refresh'/> - <menuitem action='mail-flush-outbox'/> - <menuitem action='mail-empty-trash'/> - <menuitem action='mail-account-disable'/> + <menuitem action='mail-popup-flush-outbox'/> + <menuitem action='mail-popup-empty-trash'/> + <menuitem action='mail-popup-account-disable'/> <separator/> <menuitem action='mail-popup-folder-properties'/> </popup> diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui index 73775dc371..28abc7e997 100644 --- a/ui/evolution-memos.ui +++ b/ui/evolution-memos.ui @@ -35,28 +35,28 @@ <popup name='memo-popup'> <menuitem action='memo-new'/> <separator/> - <menuitem action='memo-open'/> - <menuitem action='memo-open-url'/> - <menuitem action='memo-save-as'/> - <menuitem action='memo-print'/> + <menuitem action='memo-popup-open'/> + <menuitem action='memo-popup-open-url'/> + <menuitem action='memo-popup-save-as'/> + <menuitem action='memo-popup-print'/> <separator/> - <menuitem action='memo-clipboard-cut'/> - <menuitem action='memo-clipboard-copy'/> - <menuitem action='memo-clipboard-paste'/> + <menuitem action='memo-popup-clipboard-cut'/> + <menuitem action='memo-popup-clipboard-copy'/> + <menuitem action='memo-popup-clipboard-paste'/> <separator/> - <menuitem action='memo-forward'/> + <menuitem action='memo-popup-forward'/> <separator/> - <menuitem action='memo-delete'/> + <menuitem action='memo-popup-delete'/> </popup> <popup name='memo-list-popup'> <menuitem action='memo-list-new'/> - <menuitem action='memo-list-copy'/> - <menuitem action='memo-list-rename'/> + <menuitem action='memo-list-popup-copy'/> + <menuitem action='memo-list-popup-rename'/> <separator/> - <menuitem action='memo-list-delete'/> - <menuitem action='memo-list-select-one'/> + <menuitem action='memo-list-popup-delete'/> + <menuitem action='memo-list-popup-select-one'/> <separator/> - <menuitem action='memo-list-properties'/> + <menuitem action='memo-list-popup-properties'/> </popup> <popup name='memo-search-options'> <menuitem action='memo-search-summary-contains'/> diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui index 8b1ea89c9d..073f7d450a 100644 --- a/ui/evolution-tasks.ui +++ b/ui/evolution-tasks.ui @@ -43,31 +43,31 @@ <popup name='task-popup'> <menuitem action='task-new'/> <separator/> - <menuitem action='task-open'/> - <menuitem action='task-open-url'/> - <menuitem action='task-save-as'/> - <menuitem action='task-print'/> + <menuitem action='task-popup-open'/> + <menuitem action='task-popup-open-url'/> + <menuitem action='task-popup-save-as'/> + <menuitem action='task-popup-print'/> <separator/> - <menuitem action='task-clipboard-cut'/> - <menuitem action='task-clipboard-copy'/> - <menuitem action='task-clipboard-paste'/> + <menuitem action='task-popup-clipboard-cut'/> + <menuitem action='task-popup-clipboard-copy'/> + <menuitem action='task-popup-clipboard-paste'/> <separator/> - <menuitem action='task-assign'/> - <menuitem action='task-forward'/> - <menuitem action='task-mark-complete'/> - <menuitem action='task-mark-incomplete'/> + <menuitem action='task-popup-assign'/> + <menuitem action='task-popup-forward'/> + <menuitem action='task-popup-mark-complete'/> + <menuitem action='task-popup-mark-incomplete'/> <separator/> - <menuitem action='task-delete'/> + <menuitem action='task-popup-delete'/> </popup> <popup name='task-list-popup'> <menuitem action='task-list-new'/> - <menuitem action='task-list-copy'/> - <menuitem action='task-list-rename'/> + <menuitem action='task-list-popup-copy'/> + <menuitem action='task-list-popup-rename'/> <separator/> - <menuitem action='task-list-delete'/> - <menuitem action='task-list-select-one'/> + <menuitem action='task-list-popup-delete'/> + <menuitem action='task-list-popup-select-one'/> <separator/> - <menuitem action='task-list-properties'/> + <menuitem action='task-list-popup-properties'/> </popup> <popup name='task-search-options'> <menuitem action='task-search-summary-contains'/> |