aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog4
-rw-r--r--ui/evolution-addressbook-ldap.xml12
-rw-r--r--ui/evolution-calendar.xml22
-rw-r--r--ui/evolution-contact-editor.xml8
-rw-r--r--ui/evolution-executive-summary.xml2
-rw-r--r--ui/evolution-mail.xml32
-rw-r--r--ui/evolution-subscribe.xml6
-rw-r--r--ui/evolution.xml28
8 files changed, 64 insertions, 50 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 6ac95c9207..2966f4eb5f 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-09 Michael Meeks <michael@helixcode.com>
+
+ * evolution-subscribe.xml: s/descr/tip/
+
2000-10-05 Michael Meeks <michael@helixcode.com>
* evolution-mail.xml: remove redundant separator.
diff --git a/ui/evolution-addressbook-ldap.xml b/ui/evolution-addressbook-ldap.xml
index 3ea2b96c15..cb8cf624be 100644
--- a/ui/evolution-addressbook-ldap.xml
+++ b/ui/evolution-addressbook-ldap.xml
@@ -49,21 +49,21 @@
<dockitem name="Toolbar" relief="none">
<toolitem name="New" _label="New"
- _descr="Create a new contact" verb="ContactNew"
+ _tip="Create a new contact" verb="ContactNew"
pixtype="stock" pixname="New"/>
<toolitem type="separator"/>
<toolitem name="Find" _label="Find"
- _descr="Find a contact" verb="ContactFind"
+ _tip="Find a contact" verb="ContactFind"
pixtype="stock" pixname="Search"/>
<toolitem name="Print" _label="Print"
- _descr="Print contacts" verb="ContactsPrint"
+ _tip="Print contacts" verb="ContactsPrint"
pixtype="stock" pixname="Print"/>
<toolitem name="Delete" label="Delete"
- _descr="Delete a contact" verb="ContactDelete"
+ _tip="Delete a contact" verb="ContactDelete"
pixtype="stock" pixname="Trash"/>
<toolitem type="separator"/>
@@ -71,11 +71,11 @@
<control name="QuickSearch"/>
<toolitem name="View All" _label="View All"
- _descr="View all contacts" verb="ContactViewAll"
+ _tip="View all contacts" verb="ContactViewAll"
pixtype="stock" pixname="Multiple"/>
<toolitem name="Stop" _label="Stop"
- _descr="Stop Loading" verb="ContactStop"
+ _tip="Stop Loading" verb="ContactStop"
pixtype="stock" pixname="Stop"/>
</dockitem>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 6a760e4cc2..c27b6f1214 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -6,7 +6,7 @@
<submenu name="New" _label="_New">
<menuitem name="CalendarNew" verb=""
- _label="New Ca_lendar" _descr="Create a new calendar"/>
+ _label="New Ca_lendar" _tip="Create a new calendar"/>
</submenu>
@@ -14,13 +14,13 @@
<submenu name="Open" _label="_Open">
<menuitem name="CalendarOpen" verb=""
- _label="_Open Calendar" _descr="Open a calendar"/>
+ _label="_Open Calendar" _tip="Open a calendar"/>
</submenu>
<menuitem name="CalendarSaveAs" verb=""
_label="_Save Calendar As"
- _descr="Save calendar As something else"/>
+ _tip="Save calendar As something else"/>
</placeholder>
@@ -38,43 +38,43 @@
<submenu name="Edit">
<menuitem name="Appointment" _label="_New appointment..."
- verb="EditNewAppointment" _descr="Create a new appointment"/>
+ verb="EditNewAppointment" _tip="Create a new appointment"/>
<menuitem name="Preferences" _label="Preferences"
- verb="CalendarPreferences" _descr="Alter preferences"/>
+ verb="CalendarPreferences" _tip="Alter preferences"/>
</submenu>
</menu>
<dockitem name="Toolbar" relief="none">
<toolitem name="New" _label="New"
- _descr="Create a new appointment" verb="EditNewAppointment"
+ _tip="Create a new appointment" verb="EditNewAppointment"
pixtype="stock" pixname="New"/>
<toolitem type="separator"/>
<toolitem name="Print" _label="Print"
- _descr="Print this calendar" verb="CalendarPrint"
+ _tip="Print this calendar" verb="CalendarPrint"
pixtype="stock" pixname="Print"/>
<toolitem type="separator"/>
<toolitem name="Prev" label="Prev"
- _descr="Go back in time" verb="CalendarPrev"
+ _tip="Go back in time" verb="CalendarPrev"
pixtype="stock" pixname="Back"/>
<toolitem name="Today" label="Today"
- _descr="Go to present time" verb="CalendarToday"
+ _tip="Go to present time" verb="CalendarToday"
pixtype="stock" pixname="Home"/>
<toolitem name="Next" label="Next"
- _descr="Go forward in time" verb="CalendarNext"
+ _tip="Go forward in time" verb="CalendarNext"
pixtype="stock" pixname="Forward"/>
<toolitem type="separator"/>
<toolitem name="Goto" label="Go to"
- _descr="Go to a specific date" verb="CalendarGoto"
+ _tip="Go to a specific date" verb="CalendarGoto"
pixtype="stock" pixname="Jump To"/>
<toolitem type="separator"/>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index 06a1acf484..83411aa334 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -213,22 +213,22 @@ static GnomeUIInfo main_menu[] = {
<dockitem name="Toolbar" relief="none">
<toolitem name="Save and Close" _label="Save and Close"
- _descr="Save the contact and close the dialog box" verb="ContactEditorSaveClose"
+ _tip="Save the contact and close the dialog box" verb="ContactEditorSaveClose"
pixtype="stock" pixname="Save"/>
<toolitem type="separator"/>
<toolitem name="Print" _label="Print..."
- _descr="Print this item" verb="ContactEditorPrint"
+ _tip="Print this item" verb="ContactEditorPrint"
pixtype="stock" pixname="Print"/>
<toolitem name="Delete" _label="Delete"
- _descr="Delete this item" verb="ContactEditorDelete"
+ _tip="Delete this item" verb="ContactEditorDelete"
pixtype="stock" pixname="Trash"/>
<!--
<toolitem name="Help" _label="Help"
- _descr="See online help" verb="ContactEditorHelp"
+ _tip="See online help" verb="ContactEditorHelp"
pixtype="stock" pixname="Help"/>
GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Previous"),
diff --git a/ui/evolution-executive-summary.xml b/ui/evolution-executive-summary.xml
index 70abe8d86a..4465c6265f 100644
--- a/ui/evolution-executive-summary.xml
+++ b/ui/evolution-executive-summary.xml
@@ -2,7 +2,7 @@
<dockitem name="Toolbar" relief="none">
<toolitem name="AddService" verb="AddService"
- _label="Add Service" _descr="Add a new service to the Executive Summary"
+ _label="Add Service" _tip="Add a new service to the Executive Summary"
pixtype="pixbuf"/>
</dockitem>
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index e19dd81f3c..c0962e977c 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -1,5 +1,12 @@
<Root>
+ <commands>
+
+ <cmd name="ViewThreaded"
+ _label="_Threaded" _tip="Threaded Message list" type="toggle" />
+
+ </commands>
+
<keybindings>
<accel name="D" verb="MessageDelete"/>
@@ -14,12 +21,12 @@
<menuitem name="Print" verb="PrintMessage"
_label="Print message..."
- _descr="Print message to the printer"
+ _tip="Print message to the printer"
pixtype="stock" pixname="Menu_Print"/>
<menuitem name="Print Preview" verb="PrintPreviewMessage"
_label="Print Preview of message..."
- _descr="Previews the message to be printed"
+ _tip="Previews the message to be printed"
pixtype="stock" pixname="Menu_Print"/>
</placeholder>
@@ -40,8 +47,7 @@
<menuitem/>
- <menuitem name="Threaded" verb="ViewThreaded"
- _label="_Threaded" _descr="Threaded Message list"/>
+ <menuitem name="Threaded" verb="ViewThreaded"/>
</submenu>
@@ -146,45 +152,45 @@
<dockitem name="Toolbar" relief="none">
<toolitem name="MailGet" verb=""
- _label="Get Mail" _descr="Send queued mail and retrieve new mail"
+ _label="Get Mail" _tip="Send queued mail and retrieve new mail"
pixtype="pixbuf"/>
<toolitem name="MailCompose" verb=""
- _label="Compose" _descr="Compose a new message"
+ _label="Compose" _tip="Compose a new message"
pixtype="pixbuf"/>
<toolitem type="separator"/>
<toolitem name="Reply" verb="MessageReplySndr"
- _label="Reply" _descr="Reply to the sender of this message"
+ _label="Reply" _tip="Reply to the sender of this message"
pixtype="pixbuf"/>
<toolitem name="ReplyAll" verb="MessageReplyAll"
- _label="Reply to All" _descr="Reply to all recipients of this message"
+ _label="Reply to All" _tip="Reply to all recipients of this message"
pixtype="pixbuf"/>
<toolitem name="Forward" verb="MessageForward"
- _label="Forward" _descr="Forward this message"
+ _label="Forward" _tip="Forward this message"
pixtype="pixbuf"/>
<toolitem type="separator"/>
<toolitem name="Move" verb="MessageMove"
- _label="Move" _descr="Move message to a new folder"
+ _label="Move" _tip="Move message to a new folder"
pixtype="pixbuf"/>
<toolitem name="Copy" verb="MessageCopy"
- _label="Copy" _descr="Copy message to a new folder"
+ _label="Copy" _tip="Copy message to a new folder"
pixtype="pixbuf"/>
<toolitem type="separator"/>
<toolitem name="Print" verb="MessagePrint"
- _label="Print" _descr="Print the selected message"
+ _label="Print" _tip="Print the selected message"
pixtype="stock" pixname="Print"/>
<toolitem name="Delete" verb="MessageDelete"
- _label="Delete" _descr="Delete this message"
+ _label="Delete" _tip="Delete this message"
pixtype="stock" pixname="Trash"/>
</dockitem>
diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml
index 91d9cceeb8..1ee9d8ceb5 100644
--- a/ui/evolution-subscribe.xml
+++ b/ui/evolution-subscribe.xml
@@ -34,17 +34,17 @@
<dockitem name="Toolbar" relief="none">
<toolitem name="SubscribeFolder" verb=""
- _label="Subscribe" _descr="Add folder to your list of subscribed folders"
+ _label="Subscribe" _tip="Add folder to your list of subscribed folders"
pixtype="pixbuf"/>
<toolitem name="UnsubscribeFolder" verb=""
- _label="Unsubscribe" _descr="Remove folder from your list of subscribed folders"
+ _label="Unsubscribe" _tip="Remove folder from your list of subscribed folders"
pixtype="pixbuf"/>
<toolitem type="separator"/>
<toolitem name="RefreshList" verb=""
- _label="Refresh List" _descr="Refresh List of Folders"
+ _label="Refresh List" _tip="Refresh List of Folders"
pixtype="pixbuf"/>
<toolitem type="separator"/>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index be7455be67..c6d630eeec 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -1,4 +1,13 @@
<Root>
+ <commands>
+ <cmd name="ViewShortcutBar" type="toggle"
+ _label="Show the _Shortcut Bar"
+ _tip="Toggle whether to show the shortcut bar"/>
+
+ <cmd name="ViewFolderBar" type="toggle"
+ _label="Show the _Folder Bar"
+ _tip="Toggle whether to show the folder bar"/>
+ </commands>
<menu>
<submenu name="File" _label="_File">
<submenu name="New" _label="_New">
@@ -39,16 +48,16 @@
<menuitem name="FileGoToFolder" verb=""
_label="_Go to Folder..."
- _descr="Display a different folder"/>
+ _tip="Display a different folder"/>
<menuitem name="FileCreateFolder" verb=""
_label="_Create New Folder..."
- _descr="Create a new folder"/>
+ _tip="Create a new folder"/>
<placeholder name="Print" delimit="bottom"/>
<menuitem name="FileExit" verb=""
- _label="E_xit" _descr="Exit the program"
+ _label="E_xit" _tip="Exit the program"
pixtype="stock" pixname="Menu_Quit"
accel="*Control*q"/>
@@ -58,13 +67,8 @@
<submenu name="View" _label="_View">
- <menuitem name="ShortcutBar" type="toggle"
- id="ViewShortcutBar" _label="Show the _Shortcut Bar"
- _descr="Toggle whether to show the shortcut bar"/>
-
- <menuitem name="FolderBar" type="toggle"
- id="ViewFolderBar" _label="Show the _Folder Bar"
- _descr="Toggle whether to show the folder bar"/>
+ <menuitem name="ShortcutBar" id="ViewShortcutBar"/>
+ <menuitem name="FolderBar" id="ViewFolderBar"/>
</submenu>
@@ -93,13 +97,13 @@
<menuitem name="HelpSubmitBug" verb=""
_label="_Submit Bug Report"
- _descr="Submit bug report using Bug Buddy"/>
+ _tip="Submit bug report using Bug Buddy"/>
<menuitem/>
<menuitem name="HelpAbout" verb=""
_label="_About Evolution..."
- _descr="Show information about Evolution"
+ _tip="Show information about Evolution"
pixtype="stock" pixname="Menu_About"/>
</submenu>