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

18 files changed, 1 insertions, 270 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 9a0a6a1564..351194da4f 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -45,12 +45,6 @@ glade_DATA = 					\
 	e-itip-control.glade			\
 	goto-dialog.glade
 
-glade_messages = 				\
-	event-editor-dialog.glade.h		\
-	e-meeting-dialog.glade.h		\
-	e-itip-control.glade.h			\
-	goto-dialog.glade.h
-
 evolution_calendar_SOURCES =			\
 	$(IDL_GENERATED)			\
 	alarm.c					\
@@ -142,7 +136,6 @@ oaf_DATA = GNOME_Evolution_Calendar_Control.oafinfo GNOME_Evolution_Calendar.oaf
 
 EXTRA_DIST =	 			\
 	$(glade_DATA)			\
-	$(glade_messages)		\
 	bell.xpm			\
 	check-filled.xpm		\
 	dayview.xpm			\
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
index 32d7e03f8b..41718d0572 100644
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ b/calendar/gui/alarm-notify/alarm-notify.glade
@@ -21,8 +21,6 @@
   <handler_header_file>callbacks.h</handler_header_file>
   <support_source_file>support.c</support_source_file>
   <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>alarm-notify.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 39ae32d758..dd9a2b2540 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -31,11 +31,5 @@ glade_DATA =			\
 	cal-prefs-dialog.glade	\
 	task-editor-dialog.glade
 
-glade_messages =			\
-	alarm-notify.glade.h		\
-	cal-prefs-dialog.glade.h	\
-	task-editor-dialog.glade.h
-
 EXTRA_DIST =			\
-	$(glade_DATA)		\
-	$(glade_messages)
+	$(glade_DATA)
diff --git a/calendar/gui/dialogs/alarm-notify.glade b/calendar/gui/dialogs/alarm-notify.glade
index 32d7e03f8b..41718d0572 100644
--- a/calendar/gui/dialogs/alarm-notify.glade
+++ b/calendar/gui/dialogs/alarm-notify.glade
@@ -21,8 +21,6 @@
   <handler_header_file>callbacks.h</handler_header_file>
   <support_source_file>support.c</support_source_file>
   <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>alarm-notify.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/dialogs/alarm-notify.glade.h b/calendar/gui/dialogs/alarm-notify.glade.h
deleted file mode 100644
index 053395a4c5..0000000000
--- a/calendar/gui/dialogs/alarm-notify.glade.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * 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_("Close");
-gchar *s = N_("Edit appointment");
-gchar *s = N_("Snooze");
-gchar *s = N_("Snooze time (minutes)");
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index c0e225764b..f6eccb163d 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -10,8 +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>cal-prefs-dialog.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade.h b/calendar/gui/dialogs/cal-prefs-dialog.glade.h
deleted file mode 100644
index 71ba85a8bd..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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_("12 hour (am/pm)");
-gchar *s = N_("24 hour");
-gchar *s = N_("Alarms timeout after");
-gchar *s = N_("Audio Alarms");
-gchar *s = N_("Beep when alarm windows appear.");
-gchar *s = N_("Calendar");
-gchar *s = N_("Calendar Preferences");
-gchar *s = N_("Colors");
-gchar *s = N_("Compress weekends");
-gchar *s = N_("Date navigator options");
-gchar *s = N_("Defaults");
-gchar *s = N_("Display options");
-gchar *s = N_("Due Date");
-gchar *s = N_("Enable snoozing for");
-gchar *s = N_("End of day:");
-gchar *s = N_("First day of week:");
-gchar *s = N_("Fri");
-gchar *s = N_("Highlight");
-gchar *s = N_("Items Due Today");
-gchar *s = N_("Items Due Today:");
-gchar *s = N_("Items Not Yet Due");
-gchar *s = N_("Items Not Yet Due:");
-gchar *s = N_("Mon");
-gchar *s = N_("Overdue Items");
-gchar *s = N_("Overdue Items:");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Priority");
-gchar *s = N_("Remind me of all appointments");
-gchar *s = N_("Reminders");
-gchar *s = N_("Sat");
-gchar *s = N_("Show");
-gchar *s = N_("Show appointment end times");
-gchar *s = N_("Show week numbers");
-gchar *s = N_("Start of day:");
-gchar *s = N_("Sun");
-gchar *s = N_("TaskPad");
-gchar *s = N_("Thu");
-gchar *s = N_("Time Until Due");
-gchar *s = N_("Time divisions:");
-gchar *s = N_("Time format:");
-gchar *s = N_("Tue");
-gchar *s = N_("Visual Alarms");
-gchar *s = N_("Wed");
-gchar *s = N_("Work week");
-gchar *s = N_("minutes before they occur.");
-gchar *s = N_("seconds.");
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
index a9cf4f62e9..ae7ea9681a 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ b/calendar/gui/dialogs/task-editor-dialog.glade
@@ -10,8 +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>task-editor-dialog.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h
deleted file mode 100644
index 2ec3ad93af..0000000000
--- a/calendar/gui/dialogs/task-editor-dialog.glade.h
+++ /dev/null
@@ -1,34 +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_("Su_mmary:");
-gchar *s = N_("Date & Time");
-gchar *s = N_("Sta_rt Date:");
-gchar *s = N_("_Due Date:");
-gchar *s = N_("Progress");
-gchar *s = N_("_Status:");
-gchar *s = N_("Not Started\n"
-              "In Progress\n"
-              "Completed\n"
-              "Cancelled\n"
-              "");
-gchar *s = N_("_Priority:");
-gchar *s = N_("High\n"
-              "Normal\n"
-              "Low\n"
-              "Undefined\n"
-              "");
-gchar *s = N_("% Comp_lete:");
-gchar *s = N_("Classification");
-gchar *s = N_("Pu_blic");
-gchar *s = N_("Pri_vate");
-gchar *s = N_("_Confidential");
-gchar *s = N_("_Contacts...");
-gchar *s = N_("Ca_tegories...");
-gchar *s = N_("Task");
-gchar *s = N_("Date Completed:");
-gchar *s = N_("URL:");
-gchar *s = N_("Details");
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index a9cf4f62e9..ae7ea9681a 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -10,8 +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>task-editor-dialog.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
index 1a44687c8f..eb950139a1 100644
--- a/calendar/gui/e-itip-control.glade
+++ b/calendar/gui/e-itip-control.glade
@@ -10,8 +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>e-itip-control.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/e-itip-control.glade.h b/calendar/gui/e-itip-control.glade.h
deleted file mode 100644
index 33372424b4..0000000000
--- a/calendar/gui/e-itip-control.glade.h
+++ /dev/null
@@ -1,19 +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_("window1");
-gchar *s = N_("Calendar Message");
-gchar *s = N_("Date:");
-gchar *s = N_("Organizer:");
-gchar *s = N_("Summary:");
-gchar *s = N_("Description:");
-gchar *s = N_("date-start");
-gchar *s = N_("--to--");
-gchar *s = N_("date-end");
-gchar *s = N_("Sender");
-gchar *s = N_("Loading Calendar");
-gchar *s = N_("Loading calendar...");
-gchar *s = N_("%P %%");
diff --git a/calendar/gui/e-meeting-dialog.glade b/calendar/gui/e-meeting-dialog.glade
index bcbbea4eda..5b9a057f46 100644
--- a/calendar/gui/e-meeting-dialog.glade
+++ b/calendar/gui/e-meeting-dialog.glade
@@ -10,8 +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>e-meeting-dialog.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/e-meeting-dialog.glade.h b/calendar/gui/e-meeting-dialog.glade.h
deleted file mode 100644
index 4c17bc32b3..0000000000
--- a/calendar/gui/e-meeting-dialog.glade.h
+++ /dev/null
@@ -1,37 +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_("Meeting Invitations");
-gchar *s = N_("Publish\n"
-              "Event");
-gchar *s = N_("Request\n"
-              "Meeting");
-gchar *s = N_("Cancel\n"
-              "Meeting");
-gchar *s = N_("Schedule\n"
-              "Time");
-gchar *s = N_("Organizer: ");
-gchar *s = N_("Attendees: ");
-gchar *s = N_("Add");
-gchar *s = N_("Delete");
-gchar *s = N_("Edit");
-gchar *s = N_("Attendee");
-gchar *s = N_("Role");
-gchar *s = N_("RSVP");
-gchar *s = N_("Status");
-gchar *s = N_("Attendee");
-gchar *s = N_("Attendee address");
-gchar *s = N_("Role");
-gchar *s = N_("Chair\n"
-              "Required Participant\n"
-              "Optional Participant\n"
-              "Non-Participant\n"
-              "Other\n"
-              "\n"
-              "\n"
-              "");
-gchar *s = N_("Required Participant");
-gchar *s = N_("RSVP");
diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade
index 10fdcfe54e..615bd3eed3 100644
--- a/calendar/gui/event-editor-dialog.glade
+++ b/calendar/gui/event-editor-dialog.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>event-editor-dialog.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h
deleted file mode 100644
index f4008b76e5..0000000000
--- a/calendar/gui/event-editor-dialog.glade.h
+++ /dev/null
@@ -1,66 +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_("Su_mmary:");
-gchar *s = N_("Date & Time");
-gchar *s = N_("_Start time:");
-gchar *s = N_("_End time:");
-gchar *s = N_("A_ll day event");
-gchar *s = N_("Classification");
-gchar *s = N_("Pu_blic");
-gchar *s = N_("Pri_vate");
-gchar *s = N_("_Confidential");
-gchar *s = N_("_Contacts...");
-gchar *s = N_("Ca_tegories...");
-gchar *s = N_("Appointment");
-gchar *s = N_("Appointment Basics");
-gchar *s = N_("Su_mmary:");
-gchar *s = N_("_Starting date:");
-gchar *s = N_("Reminders");
-gchar *s = N_("Show a dialog\n"
-              "Play a sound\n"
-              "Send an email\n"
-              "Run a program\n"
-              "");
-gchar *s = N_("minute(s)\n"
-              "hour(s)\n"
-              "day(s)\n"
-              "");
-gchar *s = N_("before\n"
-              "after\n"
-              "");
-gchar *s = N_("start of appointment\n"
-              "end of appointment\n"
-              "");
-gchar *s = N_("Settings...");
-gchar *s = N_("label55");
-gchar *s = N_("Add");
-gchar *s = N_("Delete");
-gchar *s = N_("Reminder");
-gchar *s = N_("Appointment Basics");
-gchar *s = N_("Su_mmary:");
-gchar *s = N_("_Starting date:");
-gchar *s = N_("Recurrence Rule");
-gchar *s = N_("No recurrence");
-gchar *s = N_("Simple recurrence");
-gchar *s = N_("Custom recurrence");
-gchar *s = N_("Every");
-gchar *s = N_("day(s)\n"
-              "week(s)\n"
-              "month(s)\n"
-              "year(s)\n"
-              "");
-gchar *s = N_("for\n"
-              "until\n"
-              "forever\n"
-              "");
-gchar *s = N_("Exceptions");
-gchar *s = N_("Add");
-gchar *s = N_("Modify");
-gchar *s = N_("Delete");
-gchar *s = N_("label21");
-gchar *s = N_("Preview");
-gchar *s = N_("Recurrence");
diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade
index 6b81612b6c..289ad7ab69 100644
--- a/calendar/gui/goto-dialog.glade
+++ b/calendar/gui/goto-dialog.glade
@@ -10,8 +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>goto-dialog.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/calendar/gui/goto-dialog.glade.h b/calendar/gui/goto-dialog.glade.h
deleted file mode 100644
index 8701da0ec8..0000000000
--- a/calendar/gui/goto-dialog.glade.h
+++ /dev/null
@@ -1,20 +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_("Go To Date");
-gchar *s = N_("Go To Today");
-gchar *s = N_("January");
-gchar *s = N_("February");
-gchar *s = N_("March");
-gchar *s = N_("April");
-gchar *s = N_("May");
-gchar *s = N_("June");
-gchar *s = N_("July");
-gchar *s = N_("August");
-gchar *s = N_("September");
-gchar *s = N_("October");
-gchar *s = N_("November");
-gchar *s = N_("December");