merge

1 files changed, 39 insertions, 63 deletions

diff --git a/po/gl.po b/po/gl.po
index 3600ae60..47691e1a 100644
--- a/po/gl.po
+++ b/po/gl.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: 2001-03-18 11:41+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Backups"
 msgstr ""
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr ""
@@ -218,7 +218,7 @@ msgstr ""
 msgid "Boot floppy"
 msgstr ""
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, fuzzy, c-format
 msgid "Internet connection sharing"
 msgstr "Configuración do hardware"
@@ -273,7 +273,7 @@ msgstr "Fontes"
 msgid "Graphical server"
 msgstr ""
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr ""
@@ -288,7 +288,7 @@ msgstr "Hardware"
 msgid "Install"
 msgstr ""
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Teclado"
@@ -313,7 +313,7 @@ msgstr "Menús"
 msgid "Monitor"
 msgstr ""
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Rato"
@@ -378,7 +378,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Servicios"
@@ -393,7 +393,7 @@ msgstr ""
 msgid "TV card"
 msgstr ""
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, fuzzy, c-format
 msgid "Users and groups"
 msgstr "Xestión de usuarios e grupos"
@@ -648,7 +648,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 "Cancelar"
@@ -722,7 +722,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Por favor, sexa paciente"
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr ""
@@ -849,66 +849,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
 #, fuzzy, c-format
 msgid "Authors"
 msgstr "Autor: "
 
-#: ../control-center:997
+#: ../control-center:999
 #, fuzzy, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Centro de control de Mandrake %s"
 
 #: ../drakxconf:25
-#, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Configuración do hardware"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Configuración do hardware"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Configuración do hardware"
+#, c-format
+msgid "Display"
+msgstr "Pantalla"
 
 #: ../drakxconf:28
 #, fuzzy, c-format
 msgid "Internet & Network"
 msgstr "Internet e rede"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Configuración do hardware"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Configuración do arrinque"
-
 #: ../drakxconf:33
 #, c-format
 msgid "Auto Install"
 msgstr ""
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Configuración do hardware"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, c-format
 msgid "Control Center"
@@ -919,16 +884,6 @@ msgstr "Centro de control"
 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"
@@ -973,6 +928,30 @@ msgid "Done"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Configuración do hardware"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Configuración do hardware"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Configuración do hardware"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Configuración do hardware"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Configuración do arrinque"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Configuración do hardware"
+
+#, fuzzy
 #~ msgid "DrakGw helps you share your Internet connection"
 #~ msgstr "Conexión á rede e á Internet"
 
@@ -1061,9 +1040,6 @@ msgstr ""
 #~ msgid "/File"
 #~ msgstr "/Ficheiro"
 
-#~ msgid "Display"
-#~ msgstr "Pantalla"
-
 #~ msgid "DrakConf: error"
 #~ msgstr "DrakConf: erro"