merge

1 files changed, 38 insertions, 59 deletions

diff --git a/po/et.po b/po/et.po
index f95f4c8b..e0e8d744 100644
--- a/po/et.po
+++ b/po/et.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: 2004-01-17 10:52+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -217,7 +217,7 @@ msgstr "Automaatne sisselogimine"
 msgid "Backups"
 msgstr "Varukoopiad"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "Algkäivitus"
@@ -232,7 +232,7 @@ msgstr "Algkäivitusteema"
 msgid "Boot floppy"
 msgstr "Algkäivitusdiskett"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "Internetiühenduse jagamine"
@@ -287,7 +287,7 @@ msgstr "Fondid"
 msgid "Graphical server"
 msgstr "Graafiline server"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "Partitsioonid"
@@ -302,7 +302,7 @@ msgstr "Riistvara"
 msgid "Install"
 msgstr "Paigaldamine"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Klaviatuur"
@@ -327,7 +327,7 @@ msgstr "Menüüd"
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Hiir"
@@ -392,7 +392,7 @@ msgstr "Turvatasemed"
 msgid "Permissions"
 msgstr "Õigused"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Teenused"
@@ -407,7 +407,7 @@ msgstr "Allikate haldur"
 msgid "TV card"
 msgstr "TV-kaart"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "Kasutajad ja grupid"
@@ -664,7 +664,7 @@ msgid ""
 "current one):"
 msgstr "Loodava profiili nimi (uus profiil luuakse praeguse koopiana):"
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
@@ -741,7 +741,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Palun oodake..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Eelmine"
@@ -872,66 +872,31 @@ msgstr "Mandrake Juhtimiskeskus %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Kõik õigused (C) 1999-2004 Mandrakesoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "Autorid"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linuxi kaasautorid"
 
 #: ../drakxconf:25
 #, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Trükkimise seadistused"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Menüüde seadistuskeskus"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Menüüde seadistuskeskus"
+msgid "Display"
+msgstr "/_Logifailide näitamine"
 
 #: ../drakxconf:28
 #, fuzzy, c-format
 msgid "Internet & Network"
 msgstr "Internetiühendus"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Trükkimise seadistused"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Trükkimise seadistused"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Automaatpaigalduse diskett"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Internetiühenduse jagamine"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -945,16 +910,6 @@ msgstr ""
 "\n"
 "Valige, millist menüüd soovite seadistada"
 
-#: ../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"
@@ -1000,3 +955,27 @@ msgstr "Siin saab printereid seadistada"
 #, c-format
 msgid "Done"
 msgstr "Tehtud"
+
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Trükkimise seadistused"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Menüüde seadistuskeskus"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Menüüde seadistuskeskus"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Trükkimise seadistused"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Trükkimise seadistused"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Internetiühenduse jagamine"