merge

1 files changed, 39 insertions, 64 deletions

diff --git a/po/fr.po b/po/fr.po
index b6e8ec3c..44fe3af3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
-"PO-Revision-Date: 2004-01-16 14:40+0000\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\n"
+"PO-Revision-Date: 2004-01-22 12:44+0100\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: french <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr "Connexion automatique"
 msgid "Backups"
 msgstr "Sauvegardes"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "Gestionnaire de démarrage"
@@ -235,7 +235,7 @@ msgstr "Thèmes du démarrage"
 msgid "Boot floppy"
 msgstr "Disquette de démarrage"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "Partage de la connexion internet"
@@ -290,7 +290,7 @@ msgstr "Polices"
 msgid "Graphical server"
 msgstr "Affichage"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "Partitions"
@@ -305,7 +305,7 @@ msgstr "Matériel"
 msgid "Install"
 msgstr "Installer"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Clavier"
@@ -330,7 +330,7 @@ msgstr "Menus"
 msgid "Monitor"
 msgstr "Moniteur"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Souris"
@@ -395,7 +395,7 @@ msgstr "Niveau et vérifications"
 msgid "Permissions"
 msgstr "Permissions"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Services"
@@ -410,7 +410,7 @@ msgstr "Gestionnaire des dépôts"
 msgid "TV card"
 msgstr "Carte TV"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "Utilisateurs et groupes"
@@ -669,7 +669,7 @@ msgstr ""
 "Nom du profile à créer (le nouveau profile sera créé en copiant le profile "
 "courant) :"
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -747,7 +747,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Veuillez patienter ..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Précédent"
@@ -874,66 +874,31 @@ msgstr "Centre de Contrôle Mandrake %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Copyright (C) 1999-2004 Mandrakesoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "Auteurs"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Contributeurs de Mandrake Linux"
 
 #: ../drakxconf:25
-#, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Configuration serveur"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Configuration serveur"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Configuration serveur"
+#, c-format
+msgid "Display"
+msgstr "Affichage"
 
 #: ../drakxconf:28
 #, fuzzy, c-format
 msgid "Internet & Network"
 msgstr "Accès à Internet"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Configuration serveur"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Configuration du démarrage"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Disquette d'installation automatique"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Partage de la connexion internet"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -947,16 +912,6 @@ msgstr ""
 "\n"
 "Choisissez le menu que vous voulez configurer"
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr ""
-
-#: ../gecko.pm:60
-#, c-format
-msgid "Skip Wizard"
-msgstr ""
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -1003,6 +958,29 @@ msgstr "Cliquez ici pour configurer le système d'impression"
 msgid "Done"
 msgstr "Terminé"
 
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Configuration serveur"
+
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Configuration serveur"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Configuration serveur"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Configuration serveur"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Configuration du démarrage"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Partage de la connexion internet"
+
 #~ msgid "Bootstrapping"
 #~ msgstr "Démarrage"
 
@@ -1375,9 +1353,6 @@ msgstr "Terminé"
 #~ msgid "/Themes"
 #~ msgstr "/Thèmes"
 
-#~ msgid "Display"
-#~ msgstr "Affichage"
-
 #~ msgid "DrakConf: error"
 #~ msgstr "DrakConf : erreur"