aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/C/config-prefs.sgml29
-rw-r--r--doc/C/menuref.sgml24
-rw-r--r--doc/C/usage-contact.sgml13
-rw-r--r--doc/C/usage-mail.sgml13
-rw-r--r--doc/ChangeLog43
-rw-r--r--help/C/config-prefs.sgml29
-rw-r--r--help/C/menuref.sgml24
-rw-r--r--help/C/usage-contact.sgml13
-rw-r--r--help/C/usage-mail.sgml13
-rw-r--r--help/ChangeLog43
-rw-r--r--ui/evolution-addressbook-ldap.h2
-rw-r--r--ui/evolution-addressbook.h18
-rw-r--r--ui/evolution-calendar.h47
-rw-r--r--ui/evolution-mail.h88
-rw-r--r--ui/evolution-message-composer.h52
-rw-r--r--ui/evolution.h45
16 files changed, 347 insertions, 149 deletions
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 7fee2fd340..6139b9a01d 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -595,6 +595,35 @@
You can set the following options: <!--insert variable list
here-->
</para>
+
+ <sect2 id="config-prefs-contact-ldap-add">
+ <title>Adding Directory Servers</title>
+ <para>
+ To add a new LDAP server to your available contact
+ folders, select <menuchoice> <guimenu>Actions</guimenu>
+ <guimenuitem>New Directory Server</guimenuitem>
+ </menuchoice>. This brings up a small dialog box which
+ will let you enter the following options:
+ <itemizedlist>
+ <listitem><para>
+ <guilabel>Name</guilabel> &mdash; any name you choose for the server.
+ </para></listitem>
+
+ <listitem><para>
+ <guilabel>Description</guilabel> &mdash; a longer description of the server.
+ </para></listitem>
+
+ <listitem><para>
+ <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
+ </para></listitem>
+
+ <listitem><para>
+ <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
+ </para></listitem>
+
+ <listitem><para>
+ <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
+ </para></listitem>
</sect1>
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
index 7b5394d0c1..036b663b23 100644
--- a/doc/C/menuref.sgml
+++ b/doc/C/menuref.sgml
@@ -245,12 +245,18 @@
<varlistentry>
<term><guimenuitem>Mail Configuration</guimenuitem></term>
+ <listitem><para>
+ Tools for setting up all your mail account preferences.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
<listitem><para>
- This is a poorly named tool. You can set your identity,
- and everything else related to your mail account, here.
+ Tools for newsgroup and IMAP folder subscriptions.
</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guimenuitem>Forget Passwords</guimenuitem></term>
<listitem><para>
@@ -1228,7 +1234,17 @@
<sect2 id="menuref-contact-actions">
<title>Contact Manager Tools Menu</title>
<para>
- This menu is broken. (FIXME).
+ This menu contains only one item:
+
+ <variablelist>
+ <varlistentry>
+ <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
+ the in-depth search window. <xref
+ linkend="config-prefs-contact-ldap-add"> describes how to use this
+ feature. </para></listitem>
+ </varlistentry>
+ </variablelist>
+
</para>
</sect2>
</sect1>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index f4d7e50ebc..21630cacb3 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -507,12 +507,13 @@
you want to make accessible to others.
</para>
<para>
- To learn how to set up your connection to an LDAP server, see
- <xref linkend="config-prefs-contact">. Once you have a
- connection, the network contacts folder or folders will appear
- inside the <guilabel>External Directories</guilabel> folder in
- the folder bar, and will work exactly like a local folder of
- cards, with the following exceptions:
+ To learn how to add a remote directory to your available
+ contact folders, see <xref linkend="config-prefs-contact">.
+ Once you have a connection, the network contacts folder or
+ folders will appear inside the <guilabel>External
+ Directories</guilabel> folder in the folder bar, and will work
+ exactly like a local folder of cards, with the following
+ exceptions:
<itemizedlist>
<listitem><para>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 9184b77b82..864a46ff38 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -29,7 +29,8 @@
linkend="pop">POP3</glossterm>, local
<systemitem><filename>mbox</filename></systemitem> and
<systemitem><filename>mh</filename></systemitem> files, and
- even NNTP data (newsgroups), which isn't technically email.
+ even NNTP messages (newsgroups), which aren't technically
+ email.
</para>
</listitem>
</itemizedlist>
@@ -1384,6 +1385,16 @@ possibly never will be due to security evil. -->
</figure>
</para>
</sect2>
+ <sect2 id="usage-mail-subscriptions">
+ <title>Subscription Management</title>
+ <para>
+ <application>Evolution</application> lets you handle your
+ IMAP and newsgroup subscriptions with the same tool: the
+ subscriptions manager. To start using it, choose
+ <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
+ Subscriptions</guimenuitem> </menuchoice>.
+ </para>
+ </sect2>
</sect1>
</chapter>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 40bb14634b..3c302bc261 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,46 @@
+2000-10-25 Aaron Weber <aaron@helixcode.com>
+
+ * C/menuref.sgml: Actions -> New Directory Server added.
+
+ * C/config-prefs.sgml: Actions -> New Directory Server added.
+
+ * C/usage-contact.sgml: Actions -> New Directory Server added.
+
+ * C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
+
+ * C/usage-mail.sgml: Subscriptions section added. Quite
+ incomplete, though.
+
+2000-10-11 Aaron Weber <aaron@helixcode.com>
+
+ * C/evolution-guide.sgml: Re-checked validity of all files. Made
+ minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml to
+ bring up to spec.
+
+ * C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
+ improved functionality.
+
+ * C/fig/*: Re-did remaining screenshots.
+
+2000-10-10 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-print.sgml: New file, describing printing and print-preview.
+
+ * C/fig/print-preview.png: New file.
+
+ * C/fig/print-dest.png: New file.
+
+ * C/evolution-guide.sgml: Added usage-print entity.
+
+ * C/menuref.sgml: Fixed calendar menu stuff.
+
+ * C/usage-mail.sgml: No more "Actions" menu, other assorted
+ menu-related changes.
+
+2000-10-06 Aaron Weber <aaron@helixcode.com>
+
+ * C/fig/ * replaced a whole bunch of screenshots.
+
2000-10-05 Aaron Weber <aaron@helixcode.com>
* C/usage-contact.sgml: Described Search features.
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 7fee2fd340..6139b9a01d 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -595,6 +595,35 @@
You can set the following options: <!--insert variable list
here-->
</para>
+
+ <sect2 id="config-prefs-contact-ldap-add">
+ <title>Adding Directory Servers</title>
+ <para>
+ To add a new LDAP server to your available contact
+ folders, select <menuchoice> <guimenu>Actions</guimenu>
+ <guimenuitem>New Directory Server</guimenuitem>
+ </menuchoice>. This brings up a small dialog box which
+ will let you enter the following options:
+ <itemizedlist>
+ <listitem><para>
+ <guilabel>Name</guilabel> &mdash; any name you choose for the server.
+ </para></listitem>
+
+ <listitem><para>
+ <guilabel>Description</guilabel> &mdash; a longer description of the server.
+ </para></listitem>
+
+ <listitem><para>
+ <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
+ </para></listitem>
+
+ <listitem><para>
+ <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
+ </para></listitem>
+
+ <listitem><para>
+ <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
+ </para></listitem>
</sect1>
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index 7b5394d0c1..036b663b23 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -245,12 +245,18 @@
<varlistentry>
<term><guimenuitem>Mail Configuration</guimenuitem></term>
+ <listitem><para>
+ Tools for setting up all your mail account preferences.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
<listitem><para>
- This is a poorly named tool. You can set your identity,
- and everything else related to your mail account, here.
+ Tools for newsgroup and IMAP folder subscriptions.
</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guimenuitem>Forget Passwords</guimenuitem></term>
<listitem><para>
@@ -1228,7 +1234,17 @@
<sect2 id="menuref-contact-actions">
<title>Contact Manager Tools Menu</title>
<para>
- This menu is broken. (FIXME).
+ This menu contains only one item:
+
+ <variablelist>
+ <varlistentry>
+ <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
+ the in-depth search window. <xref
+ linkend="config-prefs-contact-ldap-add"> describes how to use this
+ feature. </para></listitem>
+ </varlistentry>
+ </variablelist>
+
</para>
</sect2>
</sect1>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index f4d7e50ebc..21630cacb3 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -507,12 +507,13 @@
you want to make accessible to others.
</para>
<para>
- To learn how to set up your connection to an LDAP server, see
- <xref linkend="config-prefs-contact">. Once you have a
- connection, the network contacts folder or folders will appear
- inside the <guilabel>External Directories</guilabel> folder in
- the folder bar, and will work exactly like a local folder of
- cards, with the following exceptions:
+ To learn how to add a remote directory to your available
+ contact folders, see <xref linkend="config-prefs-contact">.
+ Once you have a connection, the network contacts folder or
+ folders will appear inside the <guilabel>External
+ Directories</guilabel> folder in the folder bar, and will work
+ exactly like a local folder of cards, with the following
+ exceptions:
<itemizedlist>
<listitem><para>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 9184b77b82..864a46ff38 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -29,7 +29,8 @@
linkend="pop">POP3</glossterm>, local
<systemitem><filename>mbox</filename></systemitem> and
<systemitem><filename>mh</filename></systemitem> files, and
- even NNTP data (newsgroups), which isn't technically email.
+ even NNTP messages (newsgroups), which aren't technically
+ email.
</para>
</listitem>
</itemizedlist>
@@ -1384,6 +1385,16 @@ possibly never will be due to security evil. -->
</figure>
</para>
</sect2>
+ <sect2 id="usage-mail-subscriptions">
+ <title>Subscription Management</title>
+ <para>
+ <application>Evolution</application> lets you handle your
+ IMAP and newsgroup subscriptions with the same tool: the
+ subscriptions manager. To start using it, choose
+ <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
+ Subscriptions</guimenuitem> </menuchoice>.
+ </para>
+ </sect2>
</sect1>
</chapter>
diff --git a/help/ChangeLog b/help/ChangeLog
index 40bb14634b..3c302bc261 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,46 @@
+2000-10-25 Aaron Weber <aaron@helixcode.com>
+
+ * C/menuref.sgml: Actions -> New Directory Server added.
+
+ * C/config-prefs.sgml: Actions -> New Directory Server added.
+
+ * C/usage-contact.sgml: Actions -> New Directory Server added.
+
+ * C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
+
+ * C/usage-mail.sgml: Subscriptions section added. Quite
+ incomplete, though.
+
+2000-10-11 Aaron Weber <aaron@helixcode.com>
+
+ * C/evolution-guide.sgml: Re-checked validity of all files. Made
+ minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml to
+ bring up to spec.
+
+ * C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
+ improved functionality.
+
+ * C/fig/*: Re-did remaining screenshots.
+
+2000-10-10 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-print.sgml: New file, describing printing and print-preview.
+
+ * C/fig/print-preview.png: New file.
+
+ * C/fig/print-dest.png: New file.
+
+ * C/evolution-guide.sgml: Added usage-print entity.
+
+ * C/menuref.sgml: Fixed calendar menu stuff.
+
+ * C/usage-mail.sgml: No more "Actions" menu, other assorted
+ menu-related changes.
+
+2000-10-06 Aaron Weber <aaron@helixcode.com>
+
+ * C/fig/ * replaced a whole bunch of screenshots.
+
2000-10-05 Aaron Weber <aaron@helixcode.com>
* C/usage-contact.sgml: Described Search features.
diff --git a/ui/evolution-addressbook-ldap.h b/ui/evolution-addressbook-ldap.h
index cf14296527..3d5b4fb4bb 100644
--- a/ui/evolution-addressbook-ldap.h
+++ b/ui/evolution-addressbook-ldap.h
@@ -6,5 +6,5 @@
* POTFILES.in. DO NOT compile it as part of your application.
*/
-gchar *s = N_("_Actions");
gchar *s = N_("N_ew Directory Server");
+gchar *s = N_("_Actions");
diff --git a/ui/evolution-addressbook.h b/ui/evolution-addressbook.h
index 3128ccfb83..5c97aa9098 100644
--- a/ui/evolution-addressbook.h
+++ b/ui/evolution-addressbook.h
@@ -6,20 +6,20 @@
* POTFILES.in. DO NOT compile it as part of your application.
*/
-gchar *s = N_("_Print Contacts...");
gchar *s = N_("As _Table");
-gchar *s = N_("_New Contact");
-gchar *s = N_("_Tools");
-gchar *s = N_("_Search for contacts");
-gchar *s = N_("New");
gchar *s = N_("Create a new contact");
+gchar *s = N_("Delete");
+gchar *s = N_("Delete a contact");
gchar *s = N_("Find");
gchar *s = N_("Find a contact");
+gchar *s = N_("New");
gchar *s = N_("Print");
gchar *s = N_("Print contacts");
-gchar *s = N_("Delete");
-gchar *s = N_("Delete a contact");
-gchar *s = N_("View All");
-gchar *s = N_("View all contacts");
gchar *s = N_("Stop");
gchar *s = N_("Stop Loading");
+gchar *s = N_("View All");
+gchar *s = N_("View all contacts");
+gchar *s = N_("_New Contact");
+gchar *s = N_("_Print Contacts...");
+gchar *s = N_("_Search for contacts");
+gchar *s = N_("_Tools");
diff --git a/ui/evolution-calendar.h b/ui/evolution-calendar.h
index ac3d3355e2..3820fca0ed 100644
--- a/ui/evolution-calendar.h
+++ b/ui/evolution-calendar.h
@@ -6,36 +6,35 @@
* POTFILES.in. DO NOT compile it as part of your application.
*/
-gchar *s = N_("_New");
-gchar *s = N_("New Ca_lendar");
-gchar *s = N_("Create a new calendar");
-gchar *s = N_("_Open");
-gchar *s = N_("_Open Calendar");
-gchar *s = N_("Open a calendar");
-gchar *s = N_("_Save Calendar As");
-gchar *s = N_("Save calendar As something else");
-gchar *s = N_("_Print this calendar");
-gchar *s = N_("_New appointment...");
-gchar *s = N_("Create a new appointment");
-gchar *s = N_("Calendar Preferences...");
+gchar *s = N_("5 Days");
gchar *s = N_("Alter preferences");
-gchar *s = N_("New");
+gchar *s = N_("Calendar Preferences...");
gchar *s = N_("Create a new appointment");
-gchar *s = N_("Print");
-gchar *s = N_("Print this calendar");
-gchar *s = N_("Prev");
+gchar *s = N_("Create a new calendar");
+gchar *s = N_("Day");
gchar *s = N_("Go back in time");
-gchar *s = N_("Today");
-gchar *s = N_("Go to present time");
-gchar *s = N_("Next");
gchar *s = N_("Go forward in time");
gchar *s = N_("Go to");
gchar *s = N_("Go to a specific date");
-gchar *s = N_("Day");
+gchar *s = N_("Go to present time");
+gchar *s = N_("Month");
+gchar *s = N_("New");
+gchar *s = N_("New Ca_lendar");
+gchar *s = N_("Next");
+gchar *s = N_("Open a calendar");
+gchar *s = N_("Prev");
+gchar *s = N_("Print");
+gchar *s = N_("Print this calendar");
+gchar *s = N_("Save calendar As something else");
gchar *s = N_("Show 1 day");
-gchar *s = N_("5 Days");
+gchar *s = N_("Show 1 month");
+gchar *s = N_("Show 1 week");
gchar *s = N_("Show the working week");
+gchar *s = N_("Today");
gchar *s = N_("Week");
-gchar *s = N_("Show 1 week");
-gchar *s = N_("Month");
-gchar *s = N_("Show 1 month");
+gchar *s = N_("_New");
+gchar *s = N_("_New appointment...");
+gchar *s = N_("_Open");
+gchar *s = N_("_Open Calendar");
+gchar *s = N_("_Print this calendar");
+gchar *s = N_("_Save Calendar As");
diff --git a/ui/evolution-mail.h b/ui/evolution-mail.h
index c339b2810f..958a091ab4 100644
--- a/ui/evolution-mail.h
+++ b/ui/evolution-mail.h
@@ -6,55 +6,55 @@
* POTFILES.in. DO NOT compile it as part of your application.
*/
-gchar *s = N_("_Threaded");
-gchar *s = N_("Threaded Message list");
-gchar *s = N_("Print message...");
-gchar *s = N_("Print message to the printer");
-gchar *s = N_("Print Preview of message...");
-gchar *s = N_("Previews the message to be printed");
-gchar *s = N_("Select _All");
-gchar *s = N_("_Invert Selection");
-gchar *s = N_("Mail _Filters...");
-gchar *s = N_("_Virtual Folder Editor...");
-gchar *s = N_("_Mail Configuration...");
-gchar *s = N_("Manage Subscriptions...");
-gchar *s = N_("Forget _Passwords");
-gchar *s = N_("_Message");
-gchar *s = N_("_Open in New Window");
-gchar *s = N_("_Edit Message");
-gchar *s = N_("_Print Message");
-gchar *s = N_("Reply to _Sender");
-gchar *s = N_("Reply to _All");
-gchar *s = N_("_Forward");
-gchar *s = N_("Mar_k As Read");
-gchar *s = N_("Mark As U_nread");
-gchar *s = N_("_Delete");
-gchar *s = N_("_Move to Folder");
-gchar *s = N_("_Copy to Folder");
-gchar *s = N_("_VFolder on Subject");
-gchar *s = N_("VFolder on Se_nder");
-gchar *s = N_("VFolder on _Recipients");
-gchar *s = N_("_Filter on Subject");
-gchar *s = N_("Fi_lter on Sender");
-gchar *s = N_("Filter on Rec_ipients");
-gchar *s = N_("F_older");
-gchar *s = N_("_Expunge");
-gchar *s = N_("_Configure Folder");
-gchar *s = N_("Get Mail");
-gchar *s = N_("Send queued mail and retrieve new mail");
gchar *s = N_("Compose");
gchar *s = N_("Compose a new message");
-gchar *s = N_("Reply");
-gchar *s = N_("Reply to the sender of this message");
-gchar *s = N_("Reply to All");
-gchar *s = N_("Reply to all recipients of this message");
+gchar *s = N_("Copy");
+gchar *s = N_("Copy message to a new folder");
+gchar *s = N_("Delete");
+gchar *s = N_("Delete this message");
+gchar *s = N_("F_older");
+gchar *s = N_("Fi_lter on Sender");
+gchar *s = N_("Filter on Rec_ipients");
+gchar *s = N_("Forget _Passwords");
gchar *s = N_("Forward");
gchar *s = N_("Forward this message");
+gchar *s = N_("Get Mail");
+gchar *s = N_("Mail _Filters...");
+gchar *s = N_("Manage Subscriptions...");
+gchar *s = N_("Mar_k As Read");
+gchar *s = N_("Mark As U_nread");
gchar *s = N_("Move");
gchar *s = N_("Move message to a new folder");
-gchar *s = N_("Copy");
-gchar *s = N_("Copy message to a new folder");
+gchar *s = N_("Previews the message to be printed");
gchar *s = N_("Print");
+gchar *s = N_("Print Preview of message...");
+gchar *s = N_("Print message to the printer");
+gchar *s = N_("Print message...");
gchar *s = N_("Print the selected message");
-gchar *s = N_("Delete");
-gchar *s = N_("Delete this message");
+gchar *s = N_("Reply");
+gchar *s = N_("Reply to All");
+gchar *s = N_("Reply to _All");
+gchar *s = N_("Reply to _Sender");
+gchar *s = N_("Reply to all recipients of this message");
+gchar *s = N_("Reply to the sender of this message");
+gchar *s = N_("Select _All");
+gchar *s = N_("Send queued mail and retrieve new mail");
+gchar *s = N_("Threaded Message list");
+gchar *s = N_("VFolder on Se_nder");
+gchar *s = N_("VFolder on _Recipients");
+gchar *s = N_("_Configure Folder");
+gchar *s = N_("_Copy to Folder");
+gchar *s = N_("_Delete");
+gchar *s = N_("_Edit Message");
+gchar *s = N_("_Expunge");
+gchar *s = N_("_Filter on Subject");
+gchar *s = N_("_Forward");
+gchar *s = N_("_Invert Selection");
+gchar *s = N_("_Mail Configuration...");
+gchar *s = N_("_Message");
+gchar *s = N_("_Move to Folder");
+gchar *s = N_("_Open in New Window");
+gchar *s = N_("_Print Message");
+gchar *s = N_("_Threaded");
+gchar *s = N_("_VFolder on Subject");
+gchar *s = N_("_Virtual Folder Editor...");
diff --git a/ui/evolution-message-composer.h b/ui/evolution-message-composer.h
index 126d9a9e35..8965bceebc 100644
--- a/ui/evolution-message-composer.h
+++ b/ui/evolution-message-composer.h
@@ -6,43 +6,43 @@
* POTFILES.in. DO NOT compile it as part of your application.
*/
+gchar *s = N_("Attach");
+gchar *s = N_("Attach a file");
+gchar *s = N_("Bold");
+gchar *s = N_("Close");
+gchar *s = N_("Close the current file");
+gchar *s = N_("F_ormat");
+gchar *s = N_("HTML");
+gchar *s = N_("Insert a file as text into the message");
+gchar *s = N_("Insert text file...");
gchar *s = N_("Open");
gchar *s = N_("Open a file");
gchar *s = N_("Save");
-gchar *s = N_("Save the current file");
gchar *s = N_("Save As");
-gchar *s = N_("Save the current file with a different name");
-gchar *s = N_("Close");
-gchar *s = N_("Close the current file");
+gchar *s = N_("Save _As...");
+gchar *s = N_("Save in _folder... (FIXME)");
gchar *s = N_("Save in folder...");
+gchar *s = N_("Save the current file");
+gchar *s = N_("Save the current file with a different name");
gchar *s = N_("Save the message in a specified folder");
-gchar *s = N_("Insert text file...");
-gchar *s = N_("Insert a file as text into the message");
gchar *s = N_("Send");
-gchar *s = N_("Send the message now");
+gchar *s = N_("Send _Later");
+gchar *s = N_("Send _Now");
gchar *s = N_("Send later");
-gchar *s = N_("Send the message later");
-gchar *s = N_("Attach");
-gchar *s = N_("Attach a file");
-gchar *s = N_("HTML");
gchar *s = N_("Send the mail in HTML format");
-gchar *s = N_("Show attachments");
+gchar *s = N_("Send the message later");
+gchar *s = N_("Send the message now");
+gchar *s = N_("Sets something as bold");
gchar *s = N_("Show / hide attachments");
+gchar *s = N_("Show _attachments");
+gchar *s = N_("Show attachments");
+gchar *s = N_("_About...");
+gchar *s = N_("_Close");
+gchar *s = N_("_Debug");
+gchar *s = N_("_Edit");
gchar *s = N_("_File");
+gchar *s = N_("_Help");
+gchar *s = N_("_Insert text file... (FIXME)");
gchar *s = N_("_Open...");
gchar *s = N_("_Save");
-gchar *s = N_("Save _As...");
-gchar *s = N_("Save in _folder... (FIXME)");
-gchar *s = N_("_Insert text file... (FIXME)");
-gchar *s = N_("Send _Now");
-gchar *s = N_("Send _Later");
-gchar *s = N_("_Close");
-gchar *s = N_("_Edit");
-gchar *s = N_("F_ormat");
gchar *s = N_("_View");
-gchar *s = N_("Show _attachments");
-gchar *s = N_("_Help");
-gchar *s = N_("_About...");
-gchar *s = N_("_Debug");
-gchar *s = N_("Bold");
-gchar *s = N_("Sets something as bold");
diff --git a/ui/evolution.h b/ui/evolution.h
index 725f3ab882..6be17f5469 100644
--- a/ui/evolution.h
+++ b/ui/evolution.h
@@ -6,35 +6,34 @@
* POTFILES.in. DO NOT compile it as part of your application.
*/
-gchar *s = N_("Show the _Shortcut Bar");
-gchar *s = N_("Toggle whether to show the shortcut bar");
+gchar *s = N_("Create a new folder");
+gchar *s = N_("Display a different folder");
+gchar *s = N_("E_xit");
+gchar *s = N_("Evolution bar _shortcut");
+gchar *s = N_("Exit the program");
+gchar *s = N_("Getting _Started");
+gchar *s = N_("Show information about Evolution");
gchar *s = N_("Show the _Folder Bar");
+gchar *s = N_("Show the _Shortcut Bar");
+gchar *s = N_("Submit bug report using Bug Buddy");
gchar *s = N_("Toggle whether to show the folder bar");
-gchar *s = N_("_File");
-gchar *s = N_("_New");
-gchar *s = N_("_View");
-gchar *s = N_("_Folder");
-gchar *s = N_("Evolution bar _shortcut");
-gchar *s = N_("_Mail message (FIXME)");
+gchar *s = N_("Toggle whether to show the shortcut bar");
+gchar *s = N_("Using the C_ontact Manager");
+gchar *s = N_("Using the _Calendar");
+gchar *s = N_("Using the _Mailer");
+gchar *s = N_("_About Evolution...");
gchar *s = N_("_Appointment (FIXME)");
gchar *s = N_("_Contact (FIXME)");
-gchar *s = N_("_Task (FIXME)");
-gchar *s = N_("_Go to Folder...");
-gchar *s = N_("Display a different folder");
gchar *s = N_("_Create New Folder...");
-gchar *s = N_("Create a new folder");
-gchar *s = N_("E_xit");
-gchar *s = N_("Exit the program");
gchar *s = N_("_Edit");
-gchar *s = N_("_View");
-gchar *s = N_("_Settings");
+gchar *s = N_("_File");
+gchar *s = N_("_Folder");
+gchar *s = N_("_Go to Folder...");
gchar *s = N_("_Help");
gchar *s = N_("_Index");
-gchar *s = N_("Getting _Started");
-gchar *s = N_("Using the _Mailer");
-gchar *s = N_("Using the _Calendar");
-gchar *s = N_("Using the C_ontact Manager");
+gchar *s = N_("_Mail message (FIXME)");
+gchar *s = N_("_New");
+gchar *s = N_("_Settings");
gchar *s = N_("_Submit Bug Report");
-gchar *s = N_("Submit bug report using Bug Buddy");
-gchar *s = N_("_About Evolution...");
-gchar *s = N_("Show information about Evolution");
+gchar *s = N_("_Task (FIXME)");
+gchar *s = N_("_View");