2 files changed, 82 insertions, 28 deletions

diff --git a/mail/mail-config-druid.glade.h b/mail/mail-config-druid.glade.h
index 7c48ce6ea1..d1f5dc862e 100644
--- a/mail/mail-config-druid.glade.h
+++ b/mail/mail-config-druid.glade.h
@@ -1,18 +1,79 @@
 /*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
+ * Translatable strings file generated by extract-ui.
+ * Add this file to your project's POTFILES.in
  * DO NOT compile it as part of your application.
  */
 
-gchar *s = N_("Mail Configuration");
-gchar *s = N_("Mail Configuration");
-gchar *s = N_("Welcome to the Evolution Mail configuration wizard!\n"
-              "By filling in some information about your email\n"
-              "settings, you can start sending and receiving email\n"
-              "right away. Click Next to continue.");
+gchar *s = N_("Account Information");
+gchar *s = N_("Account Management");
+gchar *s = N_("Accounts");
+gchar *s = N_("Add");
+gchar *s = N_("Add Optional Fields...");
+gchar *s = N_("Additional Identity Fields");
+gchar *s = N_("Authentication");
+gchar *s = N_("Authentication:");
+gchar *s = N_("Browse...");
+gchar *s = N_("Congratulations, your mail configuration is complete.");
+              "");
+              "You are now ready to send and receive email ");
+              "using Evolution. ");
+              "");
+              "Click "Finish" to save your settings.");
+gchar *s = N_("Default");
+gchar *s = N_("Delete");
+gchar *s = N_("Don't delete messages from server");
+gchar *s = N_("Done");
+gchar *s = N_("Edit");
+gchar *s = N_("Edit Mail Configuration Settings");
+gchar *s = N_("Email Address:");
+gchar *s = N_("Evolution Mail Configuration");
+gchar *s = N_("Full Name:");
+gchar *s = N_("IMAP");
 gchar *s = N_("Identity");
-gchar *s = N_("Mail Source");
-gchar *s = N_("Mail Transport");
+gchar *s = N_("Mail");
 gchar *s = N_("Mail Configuration");
-gchar *s = N_("Your email configuration is now complete.\n"
-              "Click \"Finish\" to save your new settings");
+gchar *s = N_("Mail Configuration Druid");
+gchar *s = N_("Make this my default account");
+gchar *s = N_("Name:");
+gchar *s = N_("News");
+gchar *s = N_("Optional");
+gchar *s = N_("Optional Information");
+gchar *s = N_("Organization:");
+gchar *s = N_("Password:");
+gchar *s = N_("Path:");
+gchar *s = N_("Please enter information about your incoming mail server below. If you don't know what");
+              "kind of server you use, contact your system administrator or Internet Service Provider. ");
+gchar *s = N_("Please enter information about your outgoing mail protocol below. If you don't know ");
+              "which protocol you use, contact your system administrator or Internet Service Provider. ");
+gchar *s = N_("Please enter your name and email address below. The "optional" fields below do not ");
+              "need to be filled in, unless you wish to include this information in email you send.  ");
+gchar *s = N_("Preferred type: ");
+gchar *s = N_("Receiving Email");
+gchar *s = N_("Receiving Mail");
+gchar *s = N_("Remember my password");
+gchar *s = N_("Reply-to:");
+gchar *s = N_("Required");
+gchar *s = N_("SMTP");
+gchar *s = N_("SMTP server requires authentication");
+gchar *s = N_("Sending Email");
+gchar *s = N_("Sending Mail");
+gchar *s = N_("Server Configuration");
+gchar *s = N_("Server Type: ");
+gchar *s = N_("Server:");
+gchar *s = N_("Signature file:");
+gchar *s = N_("Sources");
+gchar *s = N_("Test Settings");
+gchar *s = N_("Type:");
+gchar *s = N_("Username:");
+gchar *s = N_("Welcome to the Evolution Mail Configuration Druid! ");
+              "");
+              "By filling in some information about your email settings,  ");
+              "you can start sending and receiving email right away.");
+              "");
+              "Click "Next" to begin. ");
+gchar *s = N_("You are almost done with the mail configuration process. The identity, incoming");
+              "mail server and outgoing mail transport method which you provided will be grouped ");
+              "together to make an Evolution mail account. Please enter a name for this account ");
+              "in the space below. This name will be used for display purposes only. ");
+gchar *s = N_("Your mail server supports the following types of authentication. Please");
+              "select the type you want Evolution to use.");
diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h
index f1daaa4cbc..43e395b8a9 100644
--- a/mail/mail-config.glade.h
+++ b/mail/mail-config.glade.h
@@ -1,28 +1,21 @@
 /*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
+ * Translatable strings file generated by extract-ui.
+ * Add this file to your project's POTFILES.in
  * DO NOT compile it as part of your application.
  */
 
-gchar *s = N_("Identities");
-gchar *s = N_("Address");
-gchar *s = N_("Organization");
-gchar *s = N_("Signature File");
 gchar *s = N_("Add");
-gchar *s = N_("Edit");
+gchar *s = N_("Address");
 gchar *s = N_("Delete");
-gchar *s = N_("Identities");
-gchar *s = N_("Sources");
-gchar *s = N_("Add");
 gchar *s = N_("Edit");
-gchar *s = N_("Delete");
+gchar *s = N_("Identities");
 gchar *s = N_("Mail Sources");
 gchar *s = N_("Mail Transport");
+gchar *s = N_("Mark message as seen [ms]: ");
 gchar *s = N_("News Servers");
-gchar *s = N_("Add");
-gchar *s = N_("Edit");
-gchar *s = N_("Delete");
 gchar *s = N_("News Sources");
-gchar *s = N_("Send messages in HTML format");
-gchar *s = N_("Mark message as seen [ms]: ");
+gchar *s = N_("Organization");
 gchar *s = N_("Other");
+gchar *s = N_("Send messages in HTML format");
+gchar *s = N_("Signature File");
+gchar *s = N_("Sources");