From 55a66f9cec11ea1a4ae61aa1909a640b625497d6 Mon Sep 17 00:00:00 2001
From: hovinen <hovinen>
Date: Sun, 10 Sep 2000 12:57:08 +0000
Subject: [PATCH] 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>
---
 gnome/mime-type/edit-window.c       | 5 +++++
 gnome/mime-type/mime-data.c         | 6 +++++-
 gnome/mime-type/mime-info.c         | 6 +++++-
 gnome/mime-type/mime-type-capplet.c | 6 +++++-
 gnome/mime-type/mime-type.desktop   | 2 +-
 gnome/mime-type/new-mime-window.c   | 6 +++++-
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/gnome/mime-type/edit-window.c b/gnome/mime-type/edit-window.c
index a010401a2..98dd8bb51 100644
--- a/gnome/mime-type/edit-window.c
+++ b/gnome/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"
diff --git a/gnome/mime-type/mime-data.c b/gnome/mime-type/mime-data.c
index cfacc90d9..760463f9a 100644
--- a/gnome/mime-type/mime-data.c
+++ b/gnome/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>
diff --git a/gnome/mime-type/mime-info.c b/gnome/mime-type/mime-info.c
index 2de835f48..58518c30b 100644
--- a/gnome/mime-type/mime-info.c
+++ b/gnome/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>
diff --git a/gnome/mime-type/mime-type-capplet.c b/gnome/mime-type/mime-type-capplet.c
index 366fb475f..665e60311 100644
--- a/gnome/mime-type/mime-type-capplet.c
+++ b/gnome/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>
diff --git a/gnome/mime-type/mime-type.desktop b/gnome/mime-type/mime-type.desktop
index 5a8de929e..09e7fab9f 100644
--- a/gnome/mime-type/mime-type.desktop
+++ b/gnome/mime-type/mime-type.desktop
@@ -34,7 +34,7 @@ Comment[el]=
 Comment[es]=Configura los tipos de archivos y los programas asociados para manejarlos
 Comment[et]=MIME tüüpide assigneerimine failidele ja programmidele
 Comment[fi]=Aseta tiedostoassosiaatiot ja avaajat
-Comment[fr]=Configure les types de fichier et les programmes y associés
+Comment[fr]=Configuration des types de fichier et des programmes qui y sont associés
 Comment[gl]=Configura a maneira en que os ficheiros se asocian cos programas
 Comment[it]=Configura i tipi di files e le applicazioni usate per aprirli
 Comment[ja]=¥Õ¥¡¥¤¥ë¤Î°À­¤Ë´Ø¤¹¤ëÀßÄê
diff --git a/gnome/mime-type/new-mime-window.c b/gnome/mime-type/new-mime-window.c
index 92e75454d..8a6852171 100644
--- a/gnome/mime-type/new-mime-window.c
+++ b/gnome/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;