Updated French translations Chnaged #include "config.h" to #ifdef

2000-09-10 Bradford Hovinen <hovinen@helixcode.com> * po/fr.po: Updated French translations * all: Chnaged #include "config.h" to #ifdef HAVE_CONFIG_H ... * *.desktop, *.directory: Updated French translations * po/POTFILES.in: Added screensaver XML files Courtesy of Christophe Merlet <c.merlet@agglo-pau.fr>
2000-09-10 12:57:17 +00:00 · 2000-09-10 12:57:17 +00:00 · 99aa241dba
commit 99aa241dba
parent 818c4291c1
27 changed files with 1090 additions and 487 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2000-09-10  Bradford Hovinen  <hovinen@helixcode.com>
+
+	* all: Chnaged #include "config.h" to #ifdef HAVE_CONFIG_H ...
+	* *.desktop, *.directory: Updated French translations
+	* po/POTFILES.in: Added screensaver XML files
+
+	Courtesy of Christophe Merlet <c.merlet@agglo-pau.fr>
+
 2000-08-23  Bradford Hovinen  <hovinen@helixcode.com>

 	* capplets/wm-properties/Makefile.am (INCLUDES): 
--- a/capplets/mime-type/edit-window.c
+++ b/capplets/mime-type/edit-window.c
@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "edit-window.h"
 #include "mime-data.h"
 #include "mime-info.h"
--- a/capplets/mime-type/mime-data.c
+++ b/capplets/mime-type/mime-data.c
@ -2,7 +2,11 @@
 /* Copyright (C) 1998 Redhat Software Inc. 
 * Authors: Jonathan Blandford <jrb@redhat.com>
 */
-#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "capplet-widget.h"
 #include "gnome.h"
 #include <string.h>
--- a/capplets/mime-type/mime-info.c
+++ b/capplets/mime-type/mime-info.c
@ -2,7 +2,11 @@
 /* Copyright (C) 1998 Redhat Software Inc. 
 * Authors: Jonathan Blandford <jrb@redhat.com>
 */
-#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "capplet-widget.h"
 #include "gnome.h"
 #include <string.h>
--- a/capplets/mime-type/mime-type-capplet.c
+++ b/capplets/mime-type/mime-type-capplet.c
@ -2,7 +2,11 @@
 /* Copyright (C) 1998 Redhat Software Inc. 
 * Authors: Jonathan Blandford <jrb@redhat.com>
 */
-#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "capplet-widget.h"
 #include "gnome.h"
 #include <string.h>
--- a/capplets/mime-type/new-mime-window.c
+++ b/capplets/mime-type/new-mime-window.c
@ -1,6 +1,10 @@
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "new-mime-window.h"
 #include "capplet-widget.h"
-#include <config.h>
 static GtkWidget *add_dialog = NULL;
 extern GtkWidget *capplet;

--- a/capplets/screensaver/Makefile.am
+++ b/capplets/screensaver/Makefile.am
@ -47,3 +47,6 @@ screensaver_properties_capplet_LDADD = \
 	-lXt \
 	-lgdk_pixbuf \
 	../../libcapplet/libcapplet.la
+
+install-data-local:
+	$(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop
--- a/capplets/screensaver/screensaver-properties.desktop
+++ b/capplets/screensaver/screensaver-properties.desktop
@ -7,7 +7,7 @@ Name[el]=
 Name[es]=Propiedades Salvapantallas
 Name[et]=Ekraanisäästja
 Name[fi]=Ruudunsäästäjä
-Name[fr]=Propriétés Économiseur d'écran
+Name[fr]=Économiseur d'écran
 Name[hu]=Képernyõvédõ
 Name[it]=Salvaschermo
 Name[ja]=¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð¡¼
@ -28,7 +28,7 @@ Comment[el]=
 Comment[es]=Configurar el salvapantalla
 Comment[et]=Ekraanisäästja häälestus
 Comment[fi]=Aseta ruudunsäästäjän asetukset.
-Comment[fr]=Configurer l'économiseur d'écran
+Comment[fr]=Configuration des propriétés de l'économiseur d'écran
 Comment[hu]=Képernyõvédõ beállítások
 Comment[it]=Impostazioni del salvaschermo
 Comment[ja]=¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð¡¼¤ÎÀßÄê
--- a/capplets/screensaver/screensavers/Makefile.am
+++ b/capplets/screensaver/screensavers/Makefile.am
@ -15,7 +15,10 @@ Screensavers_DATA = \

 EXTRA_DIST = $(Screensavers_DATA) README

-noinst_PROGRAMS = extract-labels
+BUILT_SOURCES = ant.xml.h bsod.xml.h compass.xml.h flag.xml.h \
+		qix.xml.h attraction.xml.h
+		
+noinst_PROGRAMS = extract-labels $(BUILD_SOURCES)

 extract_labels_SOURCES = extract-labels.c

@ -24,9 +27,6 @@ extract_labels_LDADD = \
 	$(GNOME_LIBS) \
 	$(GNOME_XML_LIB)

-BUILT_SOURCES = ant.xml.h bsod.xml.h compass.xml.h flag.xml.h \
-		qix.xml.h attraction.xml.h
-
 ant.xml.h: $(srcdir)/ant.xml extract-labels
 	./extract-labels $(srcdir)/ant.xml
 bsod.xml.h: $(srcdir)/bsod.xml extract-labels
--- a/capplets/theme-switcher/demo.c
+++ b/capplets/theme-switcher/demo.c
@ -1,4 +1,8 @@
-#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "da.h"
 #include <errno.h>

--- a/capplets/theme-switcher/demo.c-45827
+++ b/capplets/theme-switcher/demo.c-45827
@ -1,4 +1,8 @@
-#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "da.h"
 #include <errno.h>

--- a/capplets/theme-switcher/gui.c
+++ b/capplets/theme-switcher/gui.c
@ -1,4 +1,8 @@
-#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "da.h"
 #include "capplet-widget.h"
 #include <signal.h>
--- a/capplets/theme-switcher/gui.c-6060
+++ b/capplets/theme-switcher/gui.c-6060
@ -1,4 +1,8 @@
-#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "da.h"
 #include "capplet-widget.h"
 #include <signal.h>
--- a/capplets/theme-switcher/install.c
+++ b/capplets/theme-switcher/install.c
@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "da.h"
 #include <errno.h>

--- a/capplets/theme-switcher/install.c-64828
+++ b/capplets/theme-switcher/install.c-64828
@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "da.h"
 #include <errno.h>

--- a/capplets/theme-switcher/main.c
+++ b/capplets/theme-switcher/main.c
@ -1,4 +1,8 @@
-#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include "capplet-widget.h"
 #include "da.h"

--- a/capplets/theme-switcher/theme-selector.desktop
+++ b/capplets/theme-switcher/theme-selector.desktop
@ -8,7 +8,7 @@ Name[el]=
 Name[es]=Selector de Temas
 Name[et]=Teemad
 Name[fi]=Teemavalitsin
-Name[fr]=Selecteur de Thèmes
+Name[fr]=Selecteur de thèmes
 Name[gl]=Escoller temas
 Name[hu]=Témaválasztó
 Name[it]=Selettore temi
@ -34,7 +34,7 @@ Comment[el]=
 Comment[es]=Seleccionar el tema deseado para el escritorio
 Comment[et]=Töölaua teemade valik
 Comment[fi]=Valitsee käytettävän työpöytäteeman.
-Comment[fr]=Choisir un thème pour le bureau
+Comment[fr]=Configuration du thème de bureau
 Comment[gl]=Escoller qué tema usar para o escritorio
 Comment[hu]=A GNOME alkalmazások kinézetét meghatározó téma
 Comment[it]=Selezione del tema da usare per il desktop
--- a/capplets/url-properties/url-properties.c
+++ b/capplets/url-properties/url-properties.c
@ -17,8 +17,9 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#   include <config.h>
 #endif
+
 #include <string.h>
 #include <gtk/gtk.h>
 #include "capplet-widget.h"
--- a/capplets/wm-properties/wm-properties-capplet.c
+++ b/capplets/wm-properties/wm-properties-capplet.c
@ -4,8 +4,12 @@
 * Authors: Jonathan Blandford <jrb@redhat.com>
 *          Owen Taylor <otaylor@redhat.com>
 */
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
 #include <ctype.h>
-#include <config.h>
 #include <parser.h>
 #include "wm-properties.h"
 #include "capplet-widget.h"
--- a/po/ChangeLog
+++ b/po/ChangeLog
@ -1,3 +1,8 @@
+2000-09-10  Bradford Hovinen  <hovinen@helixcode.com>
+
+	* fr.po: Updated French translations
+	  (courtesy of Christophe Merlet <c.merlet@agglo-pau.fr>)
+
 2000-09-03  Christian Rose  <menthos@menthos.com>

 	* sv.po: Updated Swedish translation.
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -9,6 +9,12 @@ capplets/mime-type/mime-info.c
 capplets/mime-type/mime-type-capplet.c
 capplets/mime-type/new-mime-window.c
 capplets/mouse-properties/mouse-properties.c
+capplets/new-screensaver-properties/screensavers/ant.xml.h
+capplets/new-screensaver-properties/screensavers/attraction.xml.h
+capplets/new-screensaver-properties/screensavers/bsod.xml.h
+capplets/new-screensaver-properties/screensavers/compass.xml.h
+capplets/new-screensaver-properties/screensavers/flag.xml.h
+capplets/new-screensaver-properties/screensavers/qix.xml.h
 capplets/new-screensaver-properties/preferences.c
 capplets/new-screensaver-properties/prefs-widget.c
 capplets/new-screensaver-properties/screensaver-prefs-dialog.c
@ -27,7 +33,5 @@ capplets/theme-switcher/install.c
 capplets/ui-properties/ui-properties.c
 capplets/url-properties/url-properties.c
 capplets/wm-properties/wm-properties-capplet.c
-#capplets/new-screensaver-properties/screensavers/qix.xml.h
-#capplets/new-screensaver-properties/screensavers/attraction.xml.h
 libcapplet/capplet-widget.c
 new-control-center/capplet-dir-view.c
--- a/po/fr.po
+++ b/po/fr.po