Getting almost full and proper use of xml-i18n-tools.

Removed all files where glade writes strings.
Changed Makefile.am to not distribute them.
Changed all glade files to not write strings to those files.

Removed *.desktop and evolution.keys files, because they are generated.
Added them to .cvsignore
Added *.desktop.in evolution.keys.in files without transalted strings.
Added all existing entries from desktop files to po files.
Changed Makefile.am to distribute only .in files, and merge translations into
desktop files.

Removed obsolete files from po/ dir

svn path=/trunk/; revision=8164

6 files changed, 7 insertions, 126 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1d3e2c6640..d8c96c6954 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
+
+	* mail-config.glade.h: removed, xml-i18n-extract's the strings itself.
+	* *.glade: do not output_translatable_strings 
+	* Makefile.am: removed *.glade.h from EXTRA_DIST. 
+
 2001-02-09  Dan Winship  <danw@ximian.com>
 
 	* mail-local.c: Updates for CamelStore changes, small memory leak
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 0cbec8d49e..15335f2aed 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -168,16 +168,13 @@ oaf_DATA = GNOME_Evolution_Mail.oafinfo
 gladedir   = $(datadir)/evolution/glade
 glade_DATA = mail-config.glade local-config.glade
 
-glade_messages = \
-	mail-config.glade.h
-
 iconsdir = $(datadir)/images/evolution
 
 $(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl 
 	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \
 	-I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mail.idl
 
-EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA) $(glade_messages)
+EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA)
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 9ae62d88b3..c30d6baba0 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -13,8 +13,6 @@
   <output_main_file>False</output_main_file>
   <output_support_files>False</output_support_files>
   <output_build_files>False</output_build_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>mail-config.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h
deleted file mode 100644
index 81d686570a..0000000000
--- a/mail/mail-config.glade.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Mail Configuration Druid");
-gchar *s = N_("Mail Configuration");
-gchar *s = N_("Welcome to the Evolution Mail Configuration Druid.\n"
-              "\n"
-              "Click \"Next\" to begin. ");
-gchar *s = N_("Identity");
-gchar *s = N_("Required");
-gchar *s = N_("Email Address:");
-gchar *s = N_("Full Name:");
-gchar *s = N_("Optional");
-gchar *s = N_("Organization:");
-gchar *s = N_("Signature file:");
-gchar *s = N_("Receiving Email");
-gchar *s = N_("Server Type: ");
-gchar *s = N_("Server Configuration");
-gchar *s = N_("Host:");
-gchar *s = N_("Username:");
-gchar *s = N_("Path:");
-gchar *s = N_("Keep mail on server");
-gchar *s = N_("Automatically check mail every");
-gchar *s = N_("minutes.");
-gchar *s = N_("Check settings");
-gchar *s = N_("Authentication");
-gchar *s = N_("Authentication");
-gchar *s = N_("Authentication Type:");
-gchar *s = N_("Password:");
-gchar *s = N_("Remember my password");
-gchar *s = N_("Sending Email");
-gchar *s = N_("Server Type: ");
-gchar *s = N_("Server Configuration");
-gchar *s = N_("Host:");
-gchar *s = N_("Server requires authentication");
-gchar *s = N_("Check settings");
-gchar *s = N_("Account Management");
-gchar *s = N_("Account Information");
-gchar *s = N_("Name:");
-gchar *s = N_("Make this my default account");
-gchar *s = N_("Done");
-gchar *s = N_("Congratulations, your mail configuration is complete.\n"
-              "\n"
-              "You are now ready to send and receive email \n"
-              "using Evolution. \n"
-              "\n"
-              "Click \"Finish\" to save your settings.");
-gchar *s = N_("Account Properties");
-gchar *s = N_("Mail Account");
-gchar *s = N_("Type the name by which you would like to refer to these servers. For example: \"Work\" or \"Home\".");
-gchar *s = N_("User Information");
-gchar *s = N_("Select signature file");
-gchar *s = N_("Name:");
-gchar *s = N_("E-Mail Address:");
-gchar *s = N_("Reply-To:");
-gchar *s = N_("Organization:");
-gchar *s = N_("Signature:");
-gchar *s = N_("General");
-gchar *s = N_("Incoming Mail Server");
-gchar *s = N_("Save password");
-gchar *s = N_("This server requires a secure connection (SSL)");
-gchar *s = N_("Username:");
-gchar *s = N_("Password:");
-gchar *s = N_("Authentication:");
-gchar *s = N_("Hostname:");
-gchar *s = N_("Type:");
-gchar *s = N_("Plain Text\n"
-              "Kerberos\n"
-              "CRAM-MD5\n"
-              "DIGEST-MD5\n"
-              "");
-gchar *s = N_("Outgoing Mail Server");
-gchar *s = N_("This server requires a secure connection (SSL)");
-gchar *s = N_("Type:");
-gchar *s = N_("Hostname:");
-gchar *s = N_("Authentication:");
-gchar *s = N_("None\n"
-              "CRAM-MD5\n"
-              "");
-gchar *s = N_("Sendmail\n"
-              "SMTP\n"
-              "");
-gchar *s = N_("Servers");
-gchar *s = N_("Miscellaneous");
-gchar *s = N_("Path:");
-gchar *s = N_("Keep mail on server");
-gchar *s = N_("Advanced");
-gchar *s = N_("Evolution Mail Configuration");
-gchar *s = N_("Account");
-gchar *s = N_("Type");
-gchar *s = N_("Add");
-gchar *s = N_("Edit");
-gchar *s = N_("Delete");
-gchar *s = N_("Default");
-gchar *s = N_("Mail");
-gchar *s = N_("Sources");
-gchar *s = N_("Add");
-gchar *s = N_("Edit");
-gchar *s = N_("Delete");
-gchar *s = N_("News");
-gchar *s = N_("Send mail in HTML format by default.");
-gchar *s = N_("Mark messages as \"Read\" after:");
-gchar *s = N_("seconds.");
-gchar *s = N_("Other");
diff --git a/mail/subscribe-dialog.glade b/mail/subscribe-dialog.glade
index 339fe0372f..5169f450c3 100644
--- a/mail/subscribe-dialog.glade
+++ b/mail/subscribe-dialog.glade
@@ -10,7 +10,6 @@
   <language>C</language>
   <gnome_support>True</gnome_support>
   <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
   <translatable_strings_file>subscribe-dialog.glade.h</translatable_strings_file>
 </project>
 
diff --git a/mail/subscribe-dialog.glade.h b/mail/subscribe-dialog.glade.h
deleted file mode 100644
index cb1a1b1076..0000000000
--- a/mail/subscribe-dialog.glade.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Display folders whose name contain:");
-gchar *s = N_("All Folders");
-gchar *s = N_("Subscribed");
-gchar *s = N_("Query");
-gchar *s = N_("Subscribe");
-gchar *s = N_("Unsubscribe");