merge

1 files changed, 38 insertions, 62 deletions

diff --git a/po/ga.po b/po/ga.po
index 795eac4d..8320b39c 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -8,7 +8,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: 2000-09-07 16:24+0200\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Gaeilge <ga@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 ""
 msgid "Boot floppy"
 msgstr ""
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, fuzzy, c-format
 msgid "Internet connection sharing"
 msgstr "Nasc"
@@ -274,7 +274,7 @@ msgstr "Chlofhoireanna"
 msgid "Graphical server"
 msgstr "Freastalaí Post"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr ""
@@ -289,7 +289,7 @@ msgstr "Crua-earraí"
 msgid "Install"
 msgstr "Uath-Feistiú"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Eocharchlár"
@@ -314,7 +314,7 @@ msgstr "Chlaranna"
 msgid "Monitor"
 msgstr ""
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Luchóg"
@@ -379,7 +379,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Seirbishí"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "TV card"
 msgstr ""
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr ""
@@ -649,7 +649,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 "Cealaigh"
@@ -723,7 +723,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Ag Lódail, fam tamall le do thoil ..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr ""
@@ -850,66 +850,31 @@ msgstr "Ionad Bainisteoiréacht Mandrake %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Cóipcheart © 1999-2004 Mandrakesoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, fuzzy, c-format
 msgid "Authors"
 msgstr "Údáir"
 
-#: ../control-center:997
+#: ../control-center:999
 #, fuzzy, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Ionad Bainisteoireacht Mandrake %s"
 
 #: ../drakxconf:25
-#, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Data & Am"
-
-#: ../drakxconf:26
 #, c-format
-msgid "KeyBoard Configuration"
-msgstr ""
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Data & Am"
+msgid "Display"
+msgstr "Taispeántas"
 
 #: ../drakxconf:28
 #, c-format
 msgid "Internet & Network"
 msgstr ""
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Data & Am"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Cumraigh Boot"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Uath-Feistiú"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Nasc"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -920,16 +885,6 @@ msgstr "Ionad Bainisteoireacht Mandrake"
 msgid "Choose the tool you want to use"
 msgstr ""
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr ""
-
-#: ../gecko.pm:60
-#, fuzzy, c-format
-msgid "Skip Wizard"
-msgstr "Draíodóir"
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -973,6 +928,30 @@ msgstr ""
 msgid "Done"
 msgstr "Críochnaithe."
 
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Data & Am"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Data & Am"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Data & Am"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Cumraigh Boot"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Nasc"
+
+#, fuzzy
+#~ msgid "Skip Wizard"
+#~ msgstr "Draíodóir"
+
 #~ msgid "DrakClock"
 #~ msgstr "Chlóg"
 
@@ -1115,9 +1094,6 @@ msgstr "Críochnaithe."
 #~ msgid "Dhcp Server"
 #~ msgstr "Freastalaí Dhcp"
 
-#~ msgid "Display"
-#~ msgstr "Taispeántas"
-
 #~ msgid "DrakConf: error"
 #~ msgstr "DrakConf: earraidh"