6 files changed, 125 insertions, 127 deletions

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");