merge

1 files changed, 207 insertions, 167 deletions

diff --git a/po/et.po b/po/et.po
index 7a015176..4e70c602 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 12:03+0100\n"
+"POT-Creation-Date: 2004-01-22 19:33+0100\n"
 "PO-Revision-Date: 2004-01-21 11:21+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -37,14 +37,14 @@ msgid "Error."
 msgstr "Viga."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:242
-#: ../dns_wizard/Bind.pm:247 ../dns_wizard/Bind.pm:253
+#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
 #: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:172
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
 #: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
-#: ../pxe_wizard/Pxe.pm:233 ../pxe_wizard/Pxe.pm:238 ../pxe_wizard/Pxe.pm:243
-#: ../pxe_wizard/Pxe.pm:248 ../samba_wizard/Samba.pm:228
+#: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
+#: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:144
 msgid "Congratulations"
 msgstr "Õnnitlused"
@@ -83,21 +83,21 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "See nõustaja aitab Teil lisada uue kliendi kohalikule DNS-ile."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
 msgid "(you don't need to type the domain after the name)"
 msgstr "(nime järele pole vaja kirjutada domeeni)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
 msgid "Client identification:"
 msgstr "Kliendi andmed:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
 msgid ""
 "Note that the given IP number and client name should be unique in the "
 "network."
 msgstr "Pange tähele, et IP aadress ja kliendinimi peavad olema unikaalsed."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
 msgid ""
 "Your client on the network will be identified by name, as in clientname."
 "company.net. Every machine on the network must have a (unique) IP address, "
@@ -107,24 +107,21 @@ msgstr ""
 "arvutil peab võrgus olema (unikaalne) IP aadress, mis tavaliselt esitatakse "
 "punktidega eraldatud kujul."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
-#: ../dns_wizard/Bind.pm:135 ../dns_wizard/Bind.pm:216
-#: ../dns_wizard/Bind.pm:225
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
 msgid "Name of the machine:"
 msgstr "Arvuti nimi:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
-#: ../dns_wizard/Bind.pm:217
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
 msgid "IP number of the machine:"
 msgstr "Arvuti IP aadress:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:181
+#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
 msgid "Warning"
 msgstr "Hoiatus"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:181 ../web_wizard/Apache.pm:83
+#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:83
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
 
@@ -246,11 +243,11 @@ msgstr "Liides:"
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Nõustaja seadistas edukalt serveri DHCP teenused."
 
-#: ../dns_wizard/Bind.pm:71
+#: ../dns_wizard/Bind.pm:72
 msgid "You need to readjust your hostname."
 msgstr "Teil tuleb täpsustada masinanime."
 
-#: ../dns_wizard/Bind.pm:74 ../pxe_wizard/Pxe.pm:72
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
@@ -259,20 +256,20 @@ msgstr ""
 "domeeninimi, mitte localdomain või üldse puuduma. Käivitage täpsutamiseks "
 "Drakconnect."
 
-#: ../dns_wizard/Bind.pm:81 ../dns_wizard/Bind.pm:682
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
 msgid "Master DNS server"
 msgstr "Ülem nimeserver"
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:141
-#: ../dns_wizard/Bind.pm:696
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:693
 msgid "Slave DNS server"
 msgstr "Allutatud nimeserver"
 
-#: ../dns_wizard/Bind.pm:83
+#: ../dns_wizard/Bind.pm:84
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:84
+#: ../dns_wizard/Bind.pm:85
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "Eemaldatav masin:"
@@ -299,19 +296,28 @@ msgstr ""
 "tagatakse kohalikus võrgus aadresside korrektne lahendamine, suunates samas "
 "kõik muud nimepäringud väljaspool asuvale nimeserverile."
 
-#: ../dns_wizard/Bind.pm:133
+#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+msgid "What do you want to do:"
+msgstr "Mida soovite ette võtta:"
+
+#: ../dns_wizard/Bind.pm:134
 msgid "Choose the host you want to remove in the following list."
 msgstr "Valige nimekirjast masin, mida soovite eemaldada."
 
-#: ../dns_wizard/Bind.pm:133
+#: ../dns_wizard/Bind.pm:134
 msgid "Remove a host in existing dns configuration."
 msgstr "Masina eemaldamine olemasolevast DNS seadistusest."
 
-#: ../dns_wizard/Bind.pm:133
+#: ../dns_wizard/Bind.pm:134
 msgid "Remove host:"
 msgstr "Eemaldatav masin:"
 
-#: ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:136
+#, fuzzy
+msgid "Computer Name:"
+msgstr "Arvutatud domeeni nimi"
+
+#: ../dns_wizard/Bind.pm:142
 msgid ""
 "A slave name server will take some of the burden away from your primary name "
 "server, and will also function as a backup server, in case your master "
@@ -320,11 +326,12 @@ msgstr ""
 "Allutatud nimeserver võtab veidi koormust vähemaks esmaselt nimeserverilt ja "
 "on ka varuserveri eest, kui ülem nimeserver ei peaks olema kättesaadav."
 
-#: ../dns_wizard/Bind.pm:143
-msgid "IP of master DNS server:"
+#: ../dns_wizard/Bind.pm:144 ../dns_wizard/Bind.pm:209
+#, fuzzy
+msgid "Address IP of the master DNS server:"
 msgstr "Ülema nimeserveri IP:"
 
-#: ../dns_wizard/Bind.pm:150
+#: ../dns_wizard/Bind.pm:151
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -332,11 +339,12 @@ msgstr ""
 "Edastatakse ainult sellised päringud, mille suhtes serveri ei ole "
 "kompetentne ja millele puuduvad puhvris vastused."
 
-#: ../dns_wizard/Bind.pm:150
-msgid "IP of your forwarders"
+#: ../dns_wizard/Bind.pm:151
+#, fuzzy
+msgid "IP of your forwarder"
 msgstr "Teie edastusserverite IP"
 
-#: ../dns_wizard/Bind.pm:150
+#: ../dns_wizard/Bind.pm:151
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
@@ -344,22 +352,22 @@ msgstr ""
 "Kui Teil seda vaja läheb ja Te teate oma edastusserverite IP aadresse, "
 "kirjutage see siia, muidu jätke tühjaks"
 
-#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
-msgid "IP forwarders:"
-msgstr "IP edastusserverid:"
+#: ../dns_wizard/Bind.pm:153 ../dns_wizard/Bind.pm:236
+msgid "External DNS:"
+msgstr ""
 
-#: ../dns_wizard/Bind.pm:158
+#: ../dns_wizard/Bind.pm:159
 msgid "Add search domain"
 msgstr "Otsingudomeeni lisamine"
 
-#: ../dns_wizard/Bind.pm:158
+#: ../dns_wizard/Bind.pm:159
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 "Selle serveri domeeninimi lisatakse automaatselt, seda ei ole vaja siin anda."
 
-#: ../dns_wizard/Bind.pm:158
+#: ../dns_wizard/Bind.pm:159
 msgid ""
 "Search list for host-name lookup.  The search list is normally determined "
 "from the local domain name; by default, it contains only the local domain "
@@ -370,45 +378,33 @@ msgstr ""
 "domeeninime põhjal ja vaikimisi sisaldab ainult kohalikku domeeninime. Seda "
 "saab muuta, kui anda soovitud domeeninime otsingutee koos otsingu võtmesõnaga"
 
-#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
-msgid "add search domain:"
-msgstr "Otsingudomeeni lisamine:"
-
-#: ../dns_wizard/Bind.pm:166
-msgid "Error IP of forwarder."
-msgstr "Edastusserveri vigane IP."
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+msgid "Default domain name to search:"
+msgstr ""
 
-#: ../dns_wizard/Bind.pm:166
+#: ../dns_wizard/Bind.pm:167
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "See ei ole edastusserverile korrektne IP aadress... vajutage jätkamiseks "
 "nupule 'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:171
-msgid "Error Ip of DNS master."
-msgstr "Ülema DNS vigane IP."
-
-#: ../dns_wizard/Bind.pm:171
+#: ../dns_wizard/Bind.pm:172
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "See ei ole ülema DNS korrektne IP aadress... vajutage jätkamiseks nupule "
 "'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:176
-msgid "Error Ip of new host."
-msgstr "Uue masina vigane IP."
-
-#: ../dns_wizard/Bind.pm:176
+#: ../dns_wizard/Bind.pm:177
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 "See ei ole korrektne IP aadress... vajutage jätkamiseks nupule 'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:186
+#: ../dns_wizard/Bind.pm:187
 msgid "Error add host."
 msgstr "Masina lisamise viga."
 
-#: ../dns_wizard/Bind.pm:186
+#: ../dns_wizard/Bind.pm:187
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -416,11 +412,11 @@ msgstr ""
 "Paistab, et see masin on juba DNS seadistuses... vajutage jätkamiseks nupule "
 "'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:191
+#: ../dns_wizard/Bind.pm:192
 msgid "Error remove host."
 msgstr "Masina eemaldamise viga."
 
-#: ../dns_wizard/Bind.pm:191
+#: ../dns_wizard/Bind.pm:192
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -428,7 +424,7 @@ msgstr ""
 "Paistab, et seda masinat DNS seadistuses ei ole... vajutage jätkamiseks "
 "nupule 'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:196
+#: ../dns_wizard/Bind.pm:197
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -436,7 +432,7 @@ msgstr ""
 "Paistab, et nõustaja abil ei ole seadistatud ühtki nimeserverit. Palun "
 "käivitage DNS nõustaja: ülem nimeserver."
 
-#: ../dns_wizard/Bind.pm:201
+#: ../dns_wizard/Bind.pm:202
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
@@ -444,56 +440,61 @@ msgstr ""
 "Paistab, et see ei ole ülem nimeserver, vaid allutatu. Seepärast ei saa ka "
 "masinat lisada/eemaldada."
 
-#: ../dns_wizard/Bind.pm:206
+#: ../dns_wizard/Bind.pm:207
 msgid "Ok Now building your DNS slave configuration"
 msgstr "Olgu, nüüd tekitame Teie allutatud DNS seadistuse"
 
-#: ../dns_wizard/Bind.pm:206 ../dns_wizard/Bind.pm:231
-#: ../ldap_wizard/ldap.pm:147
+#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:147
 msgid "with this configuration:"
 msgstr "seadistusega:"
 
-#: ../dns_wizard/Bind.pm:208
-msgid "Ip of master DNS server:"
-msgstr "Ülema nimeserveri IP:"
-
-#: ../dns_wizard/Bind.pm:214
+#: ../dns_wizard/Bind.pm:215
 msgid "Client with this identification will be added to your DNS"
 msgstr "Teie DNS-ile lisatakse selline klient"
 
-#: ../dns_wizard/Bind.pm:223
+#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#, fuzzy
+msgid "Computer name:"
+msgstr "Arvutatud domeeni nimi"
+
+#: ../dns_wizard/Bind.pm:218
+msgid "Computer IP number:"
+msgstr ""
+
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be removed to your DNS"
 msgstr "Teie DNS-ist eemaldatakse selline klient"
 
-#: ../dns_wizard/Bind.pm:231
-msgid "Ok Now building your DNS configuration"
-msgstr "Olgu, nüüd tekitame Teie DNS seadistuse"
+#: ../dns_wizard/Bind.pm:232
+msgid ""
+"The DNS server is about to be configured with the following configuration"
+msgstr ""
 
-#: ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:234
 msgid "Server Hostname:"
 msgstr "Serveri nimi:"
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:235
 msgid "Domainname:"
 msgstr "Domeeninimi:"
 
-#: ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:244
 msgid "The wizard successfully add host in your DNS."
 msgstr "Nõustaja lisas edukalt DNS-ile kliendi."
 
-#: ../dns_wizard/Bind.pm:248
+#: ../dns_wizard/Bind.pm:254
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Nõustaja eemaldas edukalt DNS-ist kliendi."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Nõustaja seadistas edukalt Teie serveri DNS teenused."
 
-#: ../dns_wizard/Bind.pm:682
+#: ../dns_wizard/Bind.pm:680
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Süsteemi seadistamine ülemaks nimeserveriks..."
 
-#: ../dns_wizard/Bind.pm:696
+#: ../dns_wizard/Bind.pm:693
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Süsteemi seadistamine allutatud nimeserveriks..."
 
@@ -502,12 +503,14 @@ msgid "Apache web server"
 msgstr "Apache veebiserver"
 
 #: ../drakwizard.pl:41
-msgid "Dhcp server"
-msgstr "DHCP server"
+#, fuzzy
+msgid "DHCP server"
+msgstr "PXE server"
 
 #: ../drakwizard.pl:42
-msgid "Dns server"
-msgstr "Nimeserver"
+#, fuzzy
+msgid "DNS server"
+msgstr "NFS server"
 
 #: ../drakwizard.pl:43
 msgid "News server"
@@ -522,7 +525,8 @@ msgid "Mail server"
 msgstr "Meiliserver"
 
 #: ../drakwizard.pl:46
-msgid "Ftp server"
+#, fuzzy
+msgid "FTP server"
 msgstr "FTP server"
 
 #: ../drakwizard.pl:47
@@ -546,11 +550,12 @@ msgid "NIS server autofs map"
 msgstr "NIS server + Autofs"
 
 #: ../drakwizard.pl:52
-msgid "Mdk Install server"
+#, fuzzy
+msgid "Mandrake Install server"
 msgstr "Mandrake paigaldusserver"
 
-#: ../drakwizard.pl:53
-msgid "Pxe server"
+#: ../drakwizard.pl:53 ../pxe_wizard/Pxe.pm:497
+msgid "PXE server"
 msgstr "PXE server"
 
 #: ../drakwizard.pl:58
@@ -781,7 +786,8 @@ msgid "Enable NFS install server:"
 msgstr "NFS paigaldusserveri lubamine:"
 
 #: ../installsrv_wizard/Installsrv.pm:92
-msgid "Enable HTTP  install server:"
+#, fuzzy
+msgid "Enable HTTP install server:"
 msgstr "HTTP paigaldusserveri lubamine:"
 
 #: ../installsrv_wizard/Installsrv.pm:98
@@ -1670,7 +1676,7 @@ msgstr "Squid vahendaja"
 msgid "PXE Wizard"
 msgstr "PXE nõustaja"
 
-#: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:172
+#: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "PXE serveri seadistamine"
 
@@ -1689,15 +1695,15 @@ msgstr "Eemaldamine - PXE laadetõmmise eemaldamine"
 msgid "Modify boot image in PXE"
 msgstr "Muutmine - PXE laadetõmmise muutmine"
 
-#: ../pxe_wizard/Pxe.pm:112
+#: ../pxe_wizard/Pxe.pm:105
 msgid "PXE wizard"
 msgstr "PXE nõustaja"
 
-#: ../pxe_wizard/Pxe.pm:112
+#: ../pxe_wizard/Pxe.pm:105
 msgid "Set a PXE server."
 msgstr "PXE serveri seadistamine."
 
-#: ../pxe_wizard/Pxe.pm:112
+#: ../pxe_wizard/Pxe.pm:105
 msgid ""
 "This wizard will help you configuring the PXE server. PXE (Pre-boot "
 "Execution Environment) is a protocol designed by Intel that allows computers "
@@ -1713,7 +1719,7 @@ msgstr ""
 "laeb BIOS PXE ROM-i mällu ja täidab selle. Ilmub menüü, mis lubab arvutil "
 "laadida operatsioonisüsteemi võrgust."
 
-#: ../pxe_wizard/Pxe.pm:112
+#: ../pxe_wizard/Pxe.pm:105
 msgid ""
 "This wizard will provide a pxe service, and ability to add/remove/modify "
 "boot images."
@@ -1721,72 +1727,55 @@ msgstr ""
 "See nõustaja võimaldab pakkuda PXE teenuseid ning lisada, eemaldada ja muuta "
 "alglaadimistõmmiseid."
 
-#: ../pxe_wizard/Pxe.pm:126
-msgid "What do you want to do:"
-msgstr "Mida soovite ette võtta:"
-
-#: ../pxe_wizard/Pxe.pm:132
+#: ../pxe_wizard/Pxe.pm:127
 msgid "Add a boot image"
 msgstr "Laadetõmmise lisamine"
 
-#: ../pxe_wizard/Pxe.pm:132
+#: ../pxe_wizard/Pxe.pm:127
 msgid "PXE name: name in PXE menu (one word/number, no space please)"
 msgstr "PXE nimi: nimi PXE menüüs (üks sõna/number, ilma tühikuteta)"
 
-#: ../pxe_wizard/Pxe.pm:132
+#: ../pxe_wizard/Pxe.pm:127
 msgid "Path to image: full path to image (need network boot image)"
 msgstr "Tõmmise asukoht: tõmmise täielik asukoht (vajalik võrgulaadetõmmis)"
 
-#: ../pxe_wizard/Pxe.pm:142
+#: ../pxe_wizard/Pxe.pm:137
 msgid "Choose PXE boot image you want to remove from PXE server."
 msgstr "Valige PXE laadetõmmis, mida soovite PXE serverilt eemaldada."
 
-#: ../pxe_wizard/Pxe.pm:142
+#: ../pxe_wizard/Pxe.pm:137
 msgid "Remove a boot image"
 msgstr "Laadetõmmise eemaldamine"
 
-#: ../pxe_wizard/Pxe.pm:144
+#: ../pxe_wizard/Pxe.pm:139
 msgid "Boot image to remove:"
 msgstr "Eemaldatav laadetõmmis:"
 
-#: ../pxe_wizard/Pxe.pm:149
+#: ../pxe_wizard/Pxe.pm:144
 msgid "Add option to boot image:"
 msgstr "Võtme lisamine laadetõmmisele:"
 
-#: ../pxe_wizard/Pxe.pm:149
+#: ../pxe_wizard/Pxe.pm:144
 msgid "Please choose PXE boot image to modify"
 msgstr "Palun valige PXE laadetõmmis, mida muuta"
 
-#: ../pxe_wizard/Pxe.pm:151
+#: ../pxe_wizard/Pxe.pm:147
 msgid "Boot image to configure:"
 msgstr "Seadistatav laadetõmmis:"
 
-#: ../pxe_wizard/Pxe.pm:157
-msgid "Acpi option: Advanced Configuration and Power Interface"
-msgstr "ACPI võti: Advanced Configuration and Power Interface"
-
-#: ../pxe_wizard/Pxe.pm:157
+#: ../pxe_wizard/Pxe.pm:153
 msgid "Install directory: full path to MDK install server directory"
 msgstr "Paigalduskataloog: Mandrake paigaldusserveri kataloogi täielik asukoht"
 
-#: ../pxe_wizard/Pxe.pm:157
+#: ../pxe_wizard/Pxe.pm:153
 msgid "Installation method: choose nfs/http to install via nfs/http."
 msgstr "Paigaldusmeetod: valige NFS/HTTP NFS/HTTP vahendusel paigaldamiseks."
 
-#: ../pxe_wizard/Pxe.pm:157
-msgid ""
-"Network client interface: through wich interface client should be installed."
-msgstr "Kliendi võrguliides: millise liidese kaudu klient paigaldada"
-
-#: ../pxe_wizard/Pxe.pm:157
+#: ../pxe_wizard/Pxe.pm:153
 msgid "Options to add to PXE boot disk"
 msgstr "PXE laadekettale lisatavad võtmed"
 
-#: ../pxe_wizard/Pxe.pm:157
-msgid "Ramsize: adjust ramsize on boot disk."
-msgstr "RAM-i suurus: laadeketta RAM-i suuruse täpsustamine."
-
-#: ../pxe_wizard/Pxe.pm:157
+#: ../pxe_wizard/Pxe.pm:153
 msgid ""
 "Server IP: IP address of server wich contain installation directory. You can "
 "create one with MDK install server wizard."
@@ -1794,47 +1783,60 @@ msgstr ""
 "Serveri IP: paigalduskataloogiga serveri IP aadress. Sellise saab luua "
 "näiteks Mandrake paigaldusserveri nõustajaga."
 
-#: ../pxe_wizard/Pxe.pm:157
-msgid "VGA option: if you encounter some problem whith VGA, please adjust. "
-msgstr "VGA võti: kui Teil on probleeme VGA-ga, palun täpsustage siin."
-
-#: ../pxe_wizard/Pxe.pm:159 ../pxe_wizard/Pxe.pm:201
+#: ../pxe_wizard/Pxe.pm:155 ../pxe_wizard/Pxe.pm:211
 msgid "Boot image to modify:"
 msgstr "Muudetav laadetõmmis:"
 
-#: ../pxe_wizard/Pxe.pm:160 ../pxe_wizard/Pxe.pm:202
+#: ../pxe_wizard/Pxe.pm:156 ../pxe_wizard/Pxe.pm:212
 msgid "Server IP:"
 msgstr "Serveri IP:"
 
-#: ../pxe_wizard/Pxe.pm:161 ../pxe_wizard/Pxe.pm:203
+#: ../pxe_wizard/Pxe.pm:157 ../pxe_wizard/Pxe.pm:213
 msgid "Install directory:"
 msgstr "Paigalduskataloog:"
 
-#: ../pxe_wizard/Pxe.pm:162 ../pxe_wizard/Pxe.pm:204
+#: ../pxe_wizard/Pxe.pm:158 ../pxe_wizard/Pxe.pm:214
 msgid "Installation method:"
 msgstr "Paigaldusmeetod:"
 
-#: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:205
+#: ../pxe_wizard/Pxe.pm:163
+msgid "Acpi option: Advanced Configuration and Power Interface"
+msgstr "ACPI võti: Advanced Configuration and Power Interface"
+
+#: ../pxe_wizard/Pxe.pm:163
+msgid ""
+"Network client interface: through wich interface client should be installed."
+msgstr "Kliendi võrguliides: millise liidese kaudu klient paigaldada"
+
+#: ../pxe_wizard/Pxe.pm:163
+msgid "Ramsize: adjust ramsize on boot disk."
+msgstr "RAM-i suurus: laadeketta RAM-i suuruse täpsustamine."
+
+#: ../pxe_wizard/Pxe.pm:163
+msgid "VGA option: if you encounter some problem whith VGA, please adjust. "
+msgstr "VGA võti: kui Teil on probleeme VGA-ga, palun täpsustage siin."
+
+#: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:215
 msgid "Network client interface:"
 msgstr "Kliendi võrguliides:"
 
-#: ../pxe_wizard/Pxe.pm:164 ../pxe_wizard/Pxe.pm:206
+#: ../pxe_wizard/Pxe.pm:166 ../pxe_wizard/Pxe.pm:216
 msgid "Ramsize:"
 msgstr "RAM-i suurus:"
 
-#: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:207
+#: ../pxe_wizard/Pxe.pm:167 ../pxe_wizard/Pxe.pm:217
 msgid "VGA option:"
 msgstr "VGA võti:"
 
-#: ../pxe_wizard/Pxe.pm:166 ../pxe_wizard/Pxe.pm:208
+#: ../pxe_wizard/Pxe.pm:168 ../pxe_wizard/Pxe.pm:218
 msgid "Acpi option:"
 msgstr "ACPI võti:"
 
-#: ../pxe_wizard/Pxe.pm:167 ../pxe_wizard/Pxe.pm:209
+#: ../pxe_wizard/Pxe.pm:169 ../pxe_wizard/Pxe.pm:219
 msgid "Apic option:"
 msgstr "APIC võti:"
 
-#: ../pxe_wizard/Pxe.pm:172
+#: ../pxe_wizard/Pxe.pm:174
 msgid ""
 "This will configure all needed default configurations files to set a PXE "
 "server."
@@ -1842,86 +1844,94 @@ msgstr ""
 "See seadistab kõik vajalikud vaikekonfiguratsioonifailid PXE serveri "
 "loomiseks."
 
-#: ../pxe_wizard/Pxe.pm:172
+#: ../pxe_wizard/Pxe.pm:174
 msgid "We need to use a special dhcpd.conf with PXE parameter."
 msgstr "Kasutatakse spetsiaalset dhcpd.conf faili PXE parameetriga."
 
-#: ../pxe_wizard/Pxe.pm:176
+#: ../pxe_wizard/Pxe.pm:178
 msgid "Please provide a bootable image..."
 msgstr "Palun määrake laadetõmmis..."
 
-#: ../pxe_wizard/Pxe.pm:180
-msgid "Please provide a correct name in PXE entry (one word)"
+#: ../pxe_wizard/Pxe.pm:182
+#, perl-format
+msgid "Please choose an image from a different directory than %s."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:186
+#, fuzzy
+msgid "Please provide a correct name in PXE entry (one word)."
 msgstr "Palun määrake korrektne nimi PXE kirjes (üks sõna)"
 
-#: ../pxe_wizard/Pxe.pm:184
+#: ../pxe_wizard/Pxe.pm:190
+#, fuzzy
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgstr "Valige PXE laadetõmmis, mida soovite PXE serverilt eemaldada."
+
+#: ../pxe_wizard/Pxe.pm:194
 msgid "Please provide another PXE Menu name"
 msgstr "Palun määrake mõni muu PXE menüü nimi"
 
-#: ../pxe_wizard/Pxe.pm:184
+#: ../pxe_wizard/Pxe.pm:194
 msgid "Similar name is already used in PXE menu entry"
 msgstr "Selline nimi on juba PXE menüü kirjes kasutusel"
 
-#: ../pxe_wizard/Pxe.pm:188
+#: ../pxe_wizard/Pxe.pm:198
 msgid "Now will prepare all default files to set the PXE server"
 msgstr "Nüüd luuakse kõik vaikefailid PXE serveri loomiseks"
 
-#: ../pxe_wizard/Pxe.pm:190
+#: ../pxe_wizard/Pxe.pm:200
 msgid "Tftp directory:"
 msgstr "Tftp kataloog:"
 
-#: ../pxe_wizard/Pxe.pm:191
+#: ../pxe_wizard/Pxe.pm:201
 msgid "Boot image path:"
 msgstr "Laadetõmmise asukoht:"
 
-#: ../pxe_wizard/Pxe.pm:192
+#: ../pxe_wizard/Pxe.pm:202
 msgid "PXE 'default' file:"
 msgstr "PXE vaikefail ('default'):"
 
-#: ../pxe_wizard/Pxe.pm:193
+#: ../pxe_wizard/Pxe.pm:203
 msgid "PXE 'help' file:"
 msgstr "PXE abifail ('help'):"
 
-#: ../pxe_wizard/Pxe.pm:199
+#: ../pxe_wizard/Pxe.pm:209
 msgid "Now will modify boot options in image"
 msgstr "Nüüd muudetakse tõmmise laadimisvõtmeid"
 
-#: ../pxe_wizard/Pxe.pm:215
+#: ../pxe_wizard/Pxe.pm:225
 msgid "Now will remove your PXE boot image"
 msgstr "Nüüd eemaldatakse PXE laadetõmmis"
 
-#: ../pxe_wizard/Pxe.pm:217
+#: ../pxe_wizard/Pxe.pm:227
 msgid "PXE entry to remove:"
 msgstr "Eemaldatav PXE kirje:"
 
-#: ../pxe_wizard/Pxe.pm:223
+#: ../pxe_wizard/Pxe.pm:233
 msgid "Now will add your PXE boot image"
 msgstr "Nüüd lisatakse PXE laadetõmmis"
 
-#: ../pxe_wizard/Pxe.pm:234
+#: ../pxe_wizard/Pxe.pm:244
 msgid "The wizard successfully add a PXE boot image."
 msgstr "Nõustaja lisas edukalt PXE laadetõmmise."
 
-#: ../pxe_wizard/Pxe.pm:239
+#: ../pxe_wizard/Pxe.pm:256
 msgid "The wizard successfully remove a PXE boot image."
 msgstr "Nõustaja eemaldas edukalt PXE laadetõmmise."
 
-#: ../pxe_wizard/Pxe.pm:244
+#: ../pxe_wizard/Pxe.pm:268
 msgid "The wizard successfully modify image(s)."
 msgstr "Nõustaja muutis edukalt tõmmist/tõmmiseid."
 
-#: ../pxe_wizard/Pxe.pm:249
+#: ../pxe_wizard/Pxe.pm:273
 msgid "The wizard successfully configured your PXE server."
 msgstr "Nõustaja seadistas edukalt Teie PXE serveri."
 
-#: ../pxe_wizard/Pxe.pm:482
+#: ../pxe_wizard/Pxe.pm:497
 msgid "Configuring PXE server on your system..."
 msgstr "Süsteemi seadistamine PXE serveriks..."
 
-#: ../pxe_wizard/Pxe.pm:482
-msgid "PXE server"
-msgstr "PXE server"
-
 #: ../samba_wizard/Samba.pm:34
 msgid "Samba wizard"
 msgstr "Samba nõustaja"
@@ -2389,6 +2399,39 @@ msgstr "Kasutaja kataloog:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Nõustaja seadistas edukalt intraneti/Interneti veebiserveri"
 
+#~ msgid "IP forwarders:"
+#~ msgstr "IP edastusserverid:"
+
+#~ msgid "add search domain:"
+#~ msgstr "Otsingudomeeni lisamine:"
+
+#~ msgid "Error IP of forwarder."
+#~ msgstr "Edastusserveri vigane IP."
+
+#~ msgid "Error Ip of DNS master."
+#~ msgstr "Ülema DNS vigane IP."
+
+#~ msgid "Error Ip of new host."
+#~ msgstr "Uue masina vigane IP."
+
+#~ msgid "Ip of master DNS server:"
+#~ msgstr "Ülema nimeserveri IP:"
+
+#~ msgid "Ok Now building your DNS configuration"
+#~ msgstr "Olgu, nüüd tekitame Teie DNS seadistuse"
+
+#~ msgid "Dhcp server"
+#~ msgstr "DHCP server"
+
+#~ msgid "Dns server"
+#~ msgstr "Nimeserver"
+
+#~ msgid "Ftp server"
+#~ msgstr "FTP server"
+
+#~ msgid "Pxe server"
+#~ msgstr "PXE server"
+
 #~ msgid "Master - Master DNS server"
 #~ msgstr "Ülem - ülem nimeserver"
 
@@ -2659,9 +2702,6 @@ msgstr "Nõustaja seadistas edukalt intraneti/Interneti veebiserveri"
 #~ "kohtvõrgus ja võib-olla ka Internetis (sõltuvalt Teie "
 #~ "väljavooluseadetest)."
 
-#~ msgid "Computed domain Name"
-#~ msgstr "Arvutatud domeeni nimi"
-
 #~ msgid ""
 #~ "In regards to these wizards, your computer is seen as a server managing "
 #~ "his own local network (C class network)."