merge

1 files changed, 38 insertions, 62 deletions

diff --git a/po/es.po b/po/es.po
index 179887d6..ead17cc9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\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: 2004-01-19 09:17-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -221,7 +221,7 @@ msgstr "Conexión automática"
 msgid "Backups"
 msgstr "Copia de respaldo"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "Cargador de arranque"
@@ -236,7 +236,7 @@ msgstr "Tema de arranque"
 msgid "Boot floppy"
 msgstr "Disquete de arranque"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "Compartir la conexión a Internet"
@@ -291,7 +291,7 @@ msgstr "Tipografías"
 msgid "Graphical server"
 msgstr "Servidor gráfico"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "Particiones"
@@ -306,7 +306,7 @@ msgstr "Hardware"
 msgid "Install"
 msgstr "Instalar"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Teclado"
@@ -331,7 +331,7 @@ msgstr "Menús"
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Ratón"
@@ -396,7 +396,7 @@ msgstr "Niveles y verificaciones"
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Servicios"
@@ -411,7 +411,7 @@ msgstr "Administrador de soportes"
 msgid "TV card"
 msgstr "Tarjeta de TV"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
@@ -670,7 +670,7 @@ msgstr ""
 "Nombre del perfil a crear (el perfil nuevo se crea como copia del "
 "corriente): "
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -747,7 +747,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Por favor, espere un momento ..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Anterior"
@@ -878,66 +878,31 @@ msgstr "Centro de control de 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 "Autores"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Contribuidores a Mandrake Linux"
 
 #: ../drakxconf:25
 #, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Configuración del servidor"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Configuración del servidor"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Configuración del servidor"
+msgid "Display"
+msgstr "/Mostrar Logs"
 
 #: ../drakxconf:28
 #, fuzzy, c-format
 msgid "Internet & Network"
 msgstr "Acceso a Internet"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Configuración del servidor"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Configuración de arranque"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Disquete de instalación automática"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Compartir la conexión a Internet"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -951,16 +916,6 @@ msgstr ""
 "\n"
 "Elija el menú que desea configurar"
 
-#: ../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"
@@ -1007,6 +962,30 @@ msgstr "Haga clic aquí para configurar el sistema de impresión"
 msgid "Done"
 msgstr "Hecho"
 
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Configuración del servidor"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Configuración del servidor"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Configuración del servidor"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Configuración del servidor"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Configuración de arranque"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Compartir la conexión a Internet"
+
 #~ msgid "Bootstrapping"
 #~ msgstr "Arranque"
 
@@ -1308,9 +1287,6 @@ msgstr "Hecho"
 #~ "Advertencia de seguridad: No puedo conectarme a la Internet como el "
 #~ "usuario root"
 
-#~ msgid "/Display Logs"
-#~ msgstr "/Mostrar Logs"
-
 #~ msgid "/Options"
 #~ msgstr "/Opciones"