Renamed to *.directory.in to be used with xml-i18n-tools. Renamed to

2001-07-14  Carlos Perelló Marín <carlos@gnome-db.org>

        * *.directory: Renamed to *.directory.in to be used with
        xml-i18n-tools.
        * *.desktop: Renamed to *.desktop to be used with xml-i18n-tools.
        * *.glade: Modified to not generate the glade.h files.
        * *.glade.h: Removed.
        * Makefile.am: Modify to use xml-i18n-tools
        * configure.in: ditto.
        * autogen.sh: ditto, now we use the macros/autogen.sh

2001-07-14  Carlos Perelló Marín <carlos@gnome-db.org>

        * .cvsignore: ssshhhh

2001-07-14  Carlos Perelló Marín <carlos@gnome-db.org>

        * screensavers/*.xml: /s/label/_label, /s/low-label/_low-label/,
        /s/high-label/_high-label/: Changed to let xml-i18n-tools extract
        this labels.
        * extract-labels.c: Removed, now, we use xml-i18n-tools.
        * preferences.c: /s/label/_label, /s/low-label/_low-label/,
        /s/high-label/_high-label/: Changed to sync with the xml changes.
        * screensaver-prefs-dialog.c: ditto.

2001-07-16  Carlos Perelló Marín <carlos@gnome-db.org>

        * no.po: Solved some conflicts with my patch.

2001-07-14  Carlos Perelló Marín <carlos@gnome-db.org>

        * POTFILES.in: Updated to reflect the xml-i18n-tools use.
        * *.po: Added the .directory && .desktop translations.
        * update.*: Removed.
        * wa.po: Added.
        * es.po: Updated Spanish translation.

6 files changed, 12 insertions, 44 deletions

diff --git a/capplets/rollback/.cvsignore b/capplets/rollback/.cvsignore
index e18687403..40aa0bcbd 100644
--- a/capplets/rollback/.cvsignore
+++ b/capplets/rollback/.cvsignore
@@ -6,3 +6,4 @@ Makefile.in
 *.la
 *.o
 rollback-capplet
+rollback.desktop
diff --git a/capplets/rollback/Makefile.am b/capplets/rollback/Makefile.am
index 387c3cf46..d01672628 100644
--- a/capplets/rollback/Makefile.am
+++ b/capplets/rollback/Makefile.am
@@ -1,19 +1,16 @@
 Applicationsdir = $(datadir)/control-center/capplets
-Applications_DATA = \
-	rollback.desktop
+Applications_in_files = rollback.desktop.in
+Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
+@XML_I18N_MERGE_DESKTOP_RULE@
 
 pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop
-pApplications_DATA = \
-	rollback.desktop
+pApplications_DATA = $(Applications_DATA)
 
 Gladedir = $(datadir)/control-center-data
 Glade_DATA = \
 	rollback.glade
 
-glade_msgs = \
-	rollback.glade.h
-
-EXTRA_DIST = $(Applications_DATA) $(Glade_DATA) $(glade_msgs)
+EXTRA_DIST = $(Applications_DATA) $(Glade_DATA)
 
 INCLUDES = \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
diff --git a/capplets/rollback/rollback.desktop b/capplets/rollback/rollback.desktop
deleted file mode 100644
index c3385e13c..000000000
--- a/capplets/rollback/rollback.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Rollback
-Name[de]=Zurücksetzen
-Comment=Restore earlier configuration
-Comment[de]=Setzt aüf ältere Konfigurationen zurück
-Exec=rollback-capplet
-Terminal=0
-Type=Application
diff --git a/capplets/rollback/rollback.desktop.in b/capplets/rollback/rollback.desktop.in
new file mode 100644
index 000000000..2e6ddb8c6
--- /dev/null
+++ b/capplets/rollback/rollback.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+_Name=Rollback
+_Comment=Restore earlier configuration
+Exec=rollback-capplet
+Terminal=0
+Type=Application
diff --git a/capplets/rollback/rollback.glade b/capplets/rollback/rollback.glade
index eba5f29f4..cd1bedbd3 100644
--- a/capplets/rollback/rollback.glade
+++ b/capplets/rollback/rollback.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>rollback.glade.h</translatable_strings_file>
 </project>
 
 <widget>
diff --git a/capplets/rollback/rollback.glade.h b/capplets/rollback/rollback.glade.h
deleted file mode 100644
index 63bb21a4f..000000000
--- a/capplets/rollback/rollback.glade.h
+++ /dev/null
@@ -1,26 +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_("Restore all tools");
-gchar *s = N_("View Logs...");
-gchar *s = N_("Advanced...");
-gchar *s = N_("Restore only");
-gchar *s = N_("Restore configuration from");
-gchar *s = N_("days ago");
-gchar *s = N_("Configuration Restoration");
-gchar *s = N_("Create...");
-gchar *s = N_("Destroy...");
-gchar *s = N_("Rename...");
-gchar *s = N_("Change to this Location");
-gchar *s = N_("Edit this Location");
-gchar *s = N_("Location Management");
-gchar *s = N_("Restore old configuration");
-gchar *s = N_("Restore configuration from");
-gchar *s = N_("days ago");
-gchar *s = N_("Restore all tools");
-gchar *s = N_("Restore only");
-gchar *s = N_("View Logs...");
-gchar *s = N_("Advanced...");