merge

1 files changed, 49 insertions, 74 deletions

diff --git a/po/eo.po b/po/eo.po
index c4bdeabd..c489a142 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\n"
 "PO-Revision-Date: 2003-05-20 21:31+0200\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Backups"
 msgstr ""
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr ""
@@ -219,7 +219,7 @@ msgstr "Pli da etosoj"
 msgid "Boot floppy"
 msgstr ""
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Graphical server"
 msgstr ""
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr ""
@@ -289,7 +289,7 @@ msgstr "Aparatoj"
 msgid "Install"
 msgstr ""
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr ""
@@ -314,7 +314,7 @@ msgstr ""
 msgid "Monitor"
 msgstr ""
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, fuzzy, c-format
 msgid "Mouse"
 msgstr "Fermu"
@@ -379,7 +379,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
 msgid "TV card"
 msgstr ""
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr ""
@@ -654,7 +654,7 @@ msgid ""
 "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 "Nuligu"
@@ -728,7 +728,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Bonvole atendu..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Antaŭa"
@@ -855,81 +855,31 @@ msgstr "Mandrejko-Regilo %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Kopirajto (C) 1999-2004 MakdrakeSoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "Aŭtoroj"
 
-#: ../control-center:997
+#: ../control-center:999
 #, fuzzy, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrejko-Regilo %s"
 
-# line break inserted, as column width isn't large enough
 #: ../drakxconf:25
 #, fuzzy, c-format
-msgid "Display Configuration"
-msgstr ""
-"Servil-\n"
-"Konfigurado"
-
-# line break inserted, as column width isn't large enough
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr ""
-"Servil-\n"
-"Konfigurado"
-
-# line break inserted, as column width isn't large enough
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr ""
-"Servil-\n"
-"Konfigurado"
+msgid "Display"
+msgstr "/Display _Logs"
 
 #: ../drakxconf:28
 #, c-format
 msgid "Internet & Network"
 msgstr ""
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-# line break inserted, as column width isn't large enough
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr ""
-"Servil-\n"
-"Konfigurado"
-
-# line break inserted, as column width isn't large enough
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr ""
-"Servil-\n"
-"Konfigurado"
-
 #: ../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
 #, fuzzy, c-format
 msgid "Control Center"
@@ -943,16 +893,6 @@ msgstr ""
 "\n"
 "Elektu kiun menuon vi deziras konfiguri"
 
-#: ../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"
@@ -999,6 +939,41 @@ msgstr "Alklaku ĉi tie por konfiguri la pressistemon"
 msgid "Done"
 msgstr "Kompleta"
 
+# line break inserted, as column width isn't large enough
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr ""
+#~ "Servil-\n"
+#~ "Konfigurado"
+
+# line break inserted, as column width isn't large enough
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr ""
+#~ "Servil-\n"
+#~ "Konfigurado"
+
+# line break inserted, as column width isn't large enough
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr ""
+#~ "Servil-\n"
+#~ "Konfigurado"
+
+# line break inserted, as column width isn't large enough
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr ""
+#~ "Servil-\n"
+#~ "Konfigurado"
+
+# line break inserted, as column width isn't large enough
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr ""
+#~ "Servil-\n"
+#~ "Konfigurado"
+
 #~ msgid ""
 #~ "Mandrake Control Center is Mandrake Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"