merge

1 files changed, 13 insertions, 58 deletions

diff --git a/po/drakconf.pot b/po/drakconf.pot
index fc2e829e..c467f8ec 100644
--- a/po/drakconf.pot
+++ b/po/drakconf.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Backups"
 msgstr ""
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr ""
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Boot floppy"
 msgstr ""
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr ""
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Graphical server"
 msgstr ""
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Install"
 msgstr ""
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr ""
@@ -299,7 +299,7 @@ msgstr ""
 msgid "Monitor"
 msgstr ""
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr ""
@@ -364,7 +364,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
 msgid "TV card"
 msgstr ""
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr ""
@@ -631,7 +631,7 @@ msgstr ""
 msgid "Name of the profile to create (the new profile is created as a copy of the current one):"
 msgstr ""
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr ""
@@ -704,7 +704,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr ""
@@ -833,29 +833,19 @@ msgstr ""
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr ""
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr ""
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr ""
 
 #: ../drakxconf:25
 #, c-format
-msgid "Display Configuration"
-msgstr ""
-
-#: ../drakxconf:26
-#, c-format
-msgid "KeyBoard Configuration"
-msgstr ""
-
-#: ../drakxconf:27
-#, c-format
-msgid "Mouse Configuration"
+msgid "Display"
 msgstr ""
 
 #: ../drakxconf:28
@@ -863,36 +853,11 @@ msgstr ""
 msgid "Internet & Network"
 msgstr ""
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, c-format
-msgid "Service Configuration"
-msgstr ""
-
-#: ../drakxconf:32
-#, c-format
-msgid "Boot Configuration"
-msgstr ""
-
 #: ../drakxconf:33
 #, c-format
 msgid "Auto Install"
 msgstr ""
 
-#: ../drakxconf:34
-#, c-format
-msgid "Connection Sharing"
-msgstr ""
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, c-format
 msgid "Control Center"
@@ -903,16 +868,6 @@ msgstr ""
 msgid "Choose the tool you want to use"
 msgstr ""
 
-#: ../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"