merge

1 files changed, 45 insertions, 60 deletions

diff --git a/po/wa.po b/po/wa.po
index bf042f00..134f85e2 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\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-21 19:01+0100\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -222,7 +222,7 @@ msgstr "Elodjaedje otomatike"
 msgid "Backups"
 msgstr "Copeyes di såvrité"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "Enondrece"
@@ -237,7 +237,7 @@ msgstr "Tinme d' enondaedje"
 msgid "Boot floppy"
 msgstr "Plakete d' enondaedje"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "Pårtaedje do raloyaedje al daegntoele"
@@ -292,7 +292,7 @@ msgstr "Fontes"
 msgid "Graphical server"
 msgstr "Sierveu grafike"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "Pårticions"
@@ -307,7 +307,7 @@ msgstr "Éndjolreye"
 msgid "Install"
 msgstr "Astalaedje"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Taprece"
@@ -332,7 +332,7 @@ msgstr "Menus"
 msgid "Monitor"
 msgstr "Waitroûle"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Sori"
@@ -397,7 +397,7 @@ msgstr "Liveas eyet verifiaedjes"
 msgid "Permissions"
 msgstr "Permissions"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Siervices"
@@ -412,7 +412,7 @@ msgstr "Manaedjeu des sopoirts d' astalaedje"
 msgid "TV card"
 msgstr "Cåte tévé"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "Uzeus et groupes"
@@ -671,7 +671,7 @@ msgstr ""
 "No do profil a-z askepyî (li novea profil est askepyî come ene copeye do ci "
 "do moumint):"
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
@@ -748,7 +748,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Tårdjîz on pô s' i vs plait..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Di dvant"
@@ -875,66 +875,31 @@ msgstr "Cinte di contrôle di Mandrake %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Copyright © 1999-2004 MandrakeSoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "Oteurs"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Contribouweus a Mandrake Linux"
 
 #: ../drakxconf:25
-#, c-format
-msgid "Display Configuration"
-msgstr "Apontiaedje do håynaedje"
-
-#: ../drakxconf:26
-#, c-format
-msgid "KeyBoard Configuration"
-msgstr "Apontiaedje del taprece"
-
-#: ../drakxconf:27
-#, c-format
-msgid "Mouse Configuration"
-msgstr "Apontiaedje del sori"
+#, fuzzy, c-format
+msgid "Display"
+msgstr "/Håynaedje des _djournås"
 
 #: ../drakxconf:28
 #, c-format
 msgid "Internet & Network"
 msgstr "Rantoele & daegntoele"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr "Radjouter des noveas uzeus"
-
-#: ../drakxconf:30
-#, c-format
-msgid "Service Configuration"
-msgstr "Apontiaedje des siervices"
-
-#: ../drakxconf:32
-#, c-format
-msgid "Boot Configuration"
-msgstr "Apontiaedje di l' enondaedje"
-
 #: ../drakxconf:33
 #, c-format
 msgid "Auto Install"
 msgstr "Astalaedje otomatike"
 
-#: ../drakxconf:34
-#, c-format
-msgid "Connection Sharing"
-msgstr "Pårtaedje do raloyaedje al daegntoele"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr "Pårtixhaedje del deure plake"
-
 #: ../drakxconf:38
 #, c-format
 msgid "Control Center"
@@ -945,16 +910,6 @@ msgstr "Cinte di contrôle"
 msgid "Choose the tool you want to use"
 msgstr "Tchoezixhoz l' usteye ki vos vloz eployî"
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr "Shuvant"
-
-#: ../gecko.pm:60
-#, c-format
-msgid "Skip Wizard"
-msgstr "Passer houte do macrea"
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -1000,3 +955,33 @@ msgstr "Clitchîz chal po-z apontyî li sistinme d' imprimaedje"
 #, c-format
 msgid "Done"
 msgstr "Fwait"
+
+#~ msgid "Display Configuration"
+#~ msgstr "Apontiaedje do håynaedje"
+
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Apontiaedje del taprece"
+
+#~ msgid "Mouse Configuration"
+#~ msgstr "Apontiaedje del sori"
+
+#~ msgid "Add new users"
+#~ msgstr "Radjouter des noveas uzeus"
+
+#~ msgid "Service Configuration"
+#~ msgstr "Apontiaedje des siervices"
+
+#~ msgid "Boot Configuration"
+#~ msgstr "Apontiaedje di l' enondaedje"
+
+#~ msgid "Connection Sharing"
+#~ msgstr "Pårtaedje do raloyaedje al daegntoele"
+
+#~ msgid "Disk Partionning"
+#~ msgstr "Pårtixhaedje del deure plake"
+
+#~ msgid "Next"
+#~ msgstr "Shuvant"
+
+#~ msgid "Skip Wizard"
+#~ msgstr "Passer houte do macrea"