merge

1 files changed, 373 insertions, 190 deletions

diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 25a50e86..30f3cbcc 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-20 12:30+0100\n"
+"POT-Creation-Date: 2004-01-21 12:03+0100\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -40,14 +40,15 @@ msgid "Error."
 msgstr "Greška u čarobnjaku."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:110 ../dns_wizard/Bind.pm:242
+#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:242
 #: ../dns_wizard/Bind.pm:247 ../dns_wizard/Bind.pm:253
-#: ../ftp_wizard/Proftpd.pm:140 ../news_wizard/Inn.pm:96
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:134
-#: ../nisautofs_wizard/Nisautofs.pm:141 ../postfix_wizard/Postfix.pm:104
-#: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:221
-#: ../pxe_wizard/Pxe.pm:226 ../pxe_wizard/Pxe.pm:231 ../pxe_wizard/Pxe.pm:236
-#: ../samba_wizard/Samba.pm:228 ../web_wizard/Apache.pm:144
+#: ../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
+#: ../web_wizard/Apache.pm:144
 msgid "Congratulations"
 msgstr "Čestitke"
 
@@ -120,12 +121,12 @@ msgstr "Ime računara:"
 msgid "IP number of the machine:"
 msgstr "IP adresa računara:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:80
-#: ../dhcp_wizard/Dhcp.pm:90 ../dns_wizard/Bind.pm:181
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
+#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:80
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
 #: ../dns_wizard/Bind.pm:181 ../web_wizard/Apache.pm:83
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
@@ -133,8 +134,9 @@ msgstr ""
 "Upozorenje\\nVi ste u dhcp, server može da ne radi uz ovakva podešavanja."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:85 ../dhcp_wizard/Dhcp.pm:95 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
+#: ../ldap_wizard/ldap.pm:168
 #, fuzzy
 msgid "Error"
 msgstr "Greška u čarobnjaku."
@@ -179,11 +181,11 @@ msgstr "Klijentski IP:"
 msgid "The wizard successfully added the client."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:51
+#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP čarobnjak"
 
-#: ../dhcp_wizard/Dhcp.pm:51
+#: ../dhcp_wizard/Dhcp.pm:52
 msgid ""
 "DHCP is a service that automatically assigns networking addresses to your "
 "workstations."
@@ -191,54 +193,54 @@ msgstr ""
 "DHCP je servis koji automatski dodeljuje mrežne adrese Vašim radnim "
 "stanicama."
 
-#: ../dhcp_wizard/Dhcp.pm:51
+#: ../dhcp_wizard/Dhcp.pm:52
 msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Ovaj čarobnjak će Vam pomoći da podesite DHCP servise Vašeg servera."
 
-#: ../dhcp_wizard/Dhcp.pm:57
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Opseg adresa koje dhcp koristi"
 
-#: ../dhcp_wizard/Dhcp.pm:57
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
 "values."
 msgstr "Izaberite opseg adresa"
 
-#: ../dhcp_wizard/Dhcp.pm:64 ../dhcp_wizard/Dhcp.pm:102
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
 msgid "Lowest IP Address:"
 msgstr "Najniža IP adresa:"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
 msgid "Highest IP Address:"
 msgstr "Najviša IP adresa"
 
-#: ../dhcp_wizard/Dhcp.pm:70
+#: ../dhcp_wizard/Dhcp.pm:71
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:85
+#: ../dhcp_wizard/Dhcp.pm:86
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Opseg IP adresa koji ste zadali nije ispravan"
 
-#: ../dhcp_wizard/Dhcp.pm:90
+#: ../dhcp_wizard/Dhcp.pm:91
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Opseg IP adresa koji ste zadali nije u rasponu za adresu mrežnog servera"
 
-#: ../dhcp_wizard/Dhcp.pm:95
+#: ../dhcp_wizard/Dhcp.pm:96
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP adresa servera ne sme biti u rasponu"
 
-#: ../dhcp_wizard/Dhcp.pm:100
+#: ../dhcp_wizard/Dhcp.pm:101
 msgid "Configuring the DHCP Server"
 msgstr "Podešavanje DHCP servera"
 
-#: ../dhcp_wizard/Dhcp.pm:100
+#: ../dhcp_wizard/Dhcp.pm:101
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -246,11 +248,11 @@ msgstr ""
 "Čarobnjak sakuplja sledeće parametre koji su potrebni da bi se podesio Vaš "
 "DHCP servis:"
 
-#: ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:105
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:110
+#: ../dhcp_wizard/Dhcp.pm:111
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
 
@@ -258,27 +260,31 @@ msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:74
+#: ../dns_wizard/Bind.pm:74 ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:81
-msgid "Master - Master DNS server"
-msgstr ""
+#: ../dns_wizard/Bind.pm:81 ../dns_wizard/Bind.pm:682
+#, fuzzy
+msgid "Master DNS server"
+msgstr "NFS server"
 
-#: ../dns_wizard/Bind.pm:82
-msgid "Slave - Slave DNS server"
-msgstr ""
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:696
+#, fuzzy
+msgid "Slave DNS server"
+msgstr "NFS server"
 
 #: ../dns_wizard/Bind.pm:83
-msgid "Add host - Add a host in existing configuration"
+msgid "Add host in DNS"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:84
-msgid "remove host - Remove a Host in DNS"
-msgstr ""
+#, fuzzy
+msgid "Remove host in DNS"
+msgstr "Odbij domaćine:"
 
 #: ../dns_wizard/Bind.pm:104
 msgid ""
@@ -327,11 +333,6 @@ msgid ""
 "server is unreachable."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:141 ../dns_wizard/Bind.pm:692
-#, fuzzy
-msgid "Slave DNS server"
-msgstr "NFS server"
-
 #: ../dns_wizard/Bind.pm:143
 #, fuzzy
 msgid "IP of master DNS server:"
@@ -444,6 +445,7 @@ msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:206 ../dns_wizard/Bind.pm:231
+#: ../ldap_wizard/ldap.pm:147
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS čarobnjak (podešavanje)"
@@ -489,17 +491,12 @@ msgstr "Čarobnjak je uspešno dodao klijenta."
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Čarobnjak je uspešno podesio DNS servise za Vaš server."
 
-#: ../dns_wizard/Bind.pm:678
+#: ../dns_wizard/Bind.pm:682
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Podešavanje DNS servera"
 
-#: ../dns_wizard/Bind.pm:678
-#, fuzzy
-msgid "Master DNS server"
-msgstr "NFS server"
-
-#: ../dns_wizard/Bind.pm:692
+#: ../dns_wizard/Bind.pm:696
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Podešavanje DNS servera"
@@ -751,8 +748,8 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:51
 msgid ""
-"Easily configure a Mandrake server installation directory, with nfs export "
-"and http access."
+"Easily configure a Mandrake server installation directory, with NFS and HTTP "
+"access."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:56
@@ -766,19 +763,10 @@ msgstr "Sačuvao sam podešavanja vremenskog servera"
 
 #: ../installsrv_wizard/Installsrv.pm:56
 msgid ""
-"Path to data: specify your source directory (should be base of an Mandrake "
+"Path to data: specify your source directory, should be base of an Mandrake "
 "installation."
 msgstr ""
 
-#: ../installsrv_wizard/Installsrv.pm:64 ../installsrv_wizard/Installsrv.pm:91
-#, fuzzy
-msgid "Enable NFS install server:"
-msgstr "Omogući sve štampače"
-
-#: ../installsrv_wizard/Installsrv.pm:65 ../installsrv_wizard/Installsrv.pm:92
-msgid "Enable HTTP  install server:"
-msgstr ""
-
 #: ../installsrv_wizard/Installsrv.pm:71
 msgid "Destination directory could not be '/var/install/'"
 msgstr ""
@@ -801,19 +789,209 @@ msgstr ""
 msgid "I Will configure your install server with those parameters"
 msgstr ""
 
+#: ../installsrv_wizard/Installsrv.pm:91
+#, fuzzy
+msgid "Enable NFS install server:"
+msgstr "Omogući sve štampače"
+
+#: ../installsrv_wizard/Installsrv.pm:92
+msgid "Enable HTTP  install server:"
+msgstr ""
+
 #: ../installsrv_wizard/Installsrv.pm:98
 msgid "Congratulations, Mandrake Install server is now ready."
 msgstr ""
 
-#: ../installsrv_wizard/Installsrv.pm:142
-msgid "Copying data to destination directory..."
+#: ../installsrv_wizard/Installsrv.pm:143
+msgid "Copying data to destination directory, can take a while...."
 msgstr ""
 
-#: ../installsrv_wizard/Installsrv.pm:142
+#: ../installsrv_wizard/Installsrv.pm:143
 #, fuzzy
 msgid "Install Server"
 msgstr "Server za štampanje:"
 
+#: ../ldap_wizard/ldap.pm:56
+#, fuzzy
+msgid "Server - Set configuration of Ldap server"
+msgstr "Sačuvao sam podešavanja vremenskog servera"
+
+#: ../ldap_wizard/ldap.pm:57
+msgid "Add - add entry in Ldap server"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:62
+#, fuzzy
+msgid "LDAP configuration wizard"
+msgstr "Čarobnjak za podešavanje"
+
+#: ../ldap_wizard/ldap.pm:62
+#, fuzzy
+msgid "Setup a ldap server."
+msgstr "Server bazi podataka"
+
+#: ../ldap_wizard/ldap.pm:71
+#, fuzzy
+msgid "wich operation on LDAP:"
+msgstr "Čarobnjak za podešavanje"
+
+#: ../ldap_wizard/ldap.pm:76
+msgid "Add data in LDAP"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:76
+msgid "uid, guid, home directory, "
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:79 ../ldap_wizard/ldap.pm:113
+#, fuzzy
+msgid "First Name:"
+msgstr "Ime domaćina:"
+
+#: ../ldap_wizard/ldap.pm:81 ../ldap_wizard/ldap.pm:115
+#, fuzzy
+msgid "Last Name:"
+msgstr "Ime domaćina:"
+
+#: ../ldap_wizard/ldap.pm:83 ../ldap_wizard/ldap.pm:117
+#, fuzzy
+msgid "User Name:"
+msgstr "Korisničko ime:"
+
+#: ../ldap_wizard/ldap.pm:85 ../ldap_wizard/ldap.pm:119
+msgid "Password:"
+msgstr "Lozinka:"
+
+#: ../ldap_wizard/ldap.pm:87 ../ldap_wizard/ldap.pm:123
+msgid "Login shell:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:125
+msgid "uid number:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:91 ../ldap_wizard/ldap.pm:127
+msgid "Group ID:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:93 ../ldap_wizard/ldap.pm:129
+msgid "Container:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:99
+msgid "Ldap RootDSE"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:99
+msgid "RootDN is the manager of your ldap server."
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:99
+msgid "dc=obelx,dc=nux,dc=com"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:99
+msgid "example:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:99
+msgid "obelx.nux.com"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:99
+msgid "will be in ldap config:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:101 ../ldap_wizard/ldap.pm:149
+msgid "RootDSE"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:102 ../ldap_wizard/ldap.pm:150
+msgid "RootDN"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:103
+#, fuzzy
+msgid "Password"
+msgstr "Lozinka:"
+
+#: ../ldap_wizard/ldap.pm:104
+msgid "Default OU"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:110
+msgid "Ok Now add entry in LDAP"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:121
+#, fuzzy
+msgid "Home directory:"
+msgstr "KOrisnički direktorijum:"
+
+#: ../ldap_wizard/ldap.pm:131
+msgid "shadowMax:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:133
+msgid "shadowMin:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:135
+#, fuzzy
+msgid "shadowWarning:"
+msgstr "Upozorenje:"
+
+#: ../ldap_wizard/ldap.pm:137
+msgid "shadowInactive:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:139
+msgid "shadowExpire:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:141
+msgid "objectClass:"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:147
+msgid "Ok Now building your LDAP configuration"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:156
+#, fuzzy
+msgid "Error in Home directory"
+msgstr "Deljeni direktorijum:"
+
+#: ../ldap_wizard/ldap.pm:160
+msgid "Error, pass could not be empty"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:164
+msgid "Error in Login shell"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:164
+msgid "Please choose a correct one"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:168
+msgid "Please Should be a number"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:173
+#, fuzzy
+msgid "The wizard successfully configured the LDAP."
+msgstr "Čarobnjak je uspešno podesio vaš proksi server."
+
+#: ../ldap_wizard/ldap.pm:179
+msgid "Successfully add data"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:180
+#, fuzzy
+msgid "The wizard successfully add entry in ldap"
+msgstr "Čarobnjak je uspešno dodao klijenta."
+
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News čarobnjak"
@@ -1012,155 +1190,169 @@ msgstr "Mrežna maska:"
 msgid "The wizard successfully configured your NFS Server"
 msgstr "Čarobnjak je uspešno podesio Vaš NFS server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid "Nis Server - Setup configuration NIS + Autofs(nfs) server"
+#: ../nisautofs_wizard/Nisautofs.pm:63
+msgid ""
+"You need to readjust your NIS domainname. For a NIS server you need a "
+"correct NIS domainname, not egal to localdomain or none. Add "
+"NISDOMAIN=your_nis_domain in /etc/sysconfig/network file, and do a: "
+"nisdomainname your_nis_domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:65
-msgid "Nis Client - Setup a Nis Client"
+#: ../nisautofs_wizard/Nisautofs.pm:70
+#, fuzzy
+msgid "NIS Server with autofs map"
+msgstr "News server"
+
+#: ../nisautofs_wizard/Nisautofs.pm:71
+#, fuzzy
+msgid "NIS Client"
+msgstr "Klijentski IP:"
+
+#: ../nisautofs_wizard/Nisautofs.pm:76
+msgid ""
+"Client can automatically mount their home directory when they log on a NIS "
+"client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:70 ../nisautofs_wizard/Nisautofs.pm:91
+#: ../nisautofs_wizard/Nisautofs.pm:76 ../nisautofs_wizard/Nisautofs.pm:97
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "News server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:70
-msgid ""
-"Setup a Nis server with autofs map (auto.home and auto.master files).\") . "
-"\"\\n\\n\" . N(\"Client can automatically mount their home directory when "
-"they log on a NIS client computer network."
+#: ../nisautofs_wizard/Nisautofs.pm:76
+msgid "Setup a Nis server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:78
+#: ../nisautofs_wizard/Nisautofs.pm:84
 msgid "What do you want todo ?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:83
+#: ../nisautofs_wizard/Nisautofs.pm:89
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:83
+#: ../nisautofs_wizard/Nisautofs.pm:89
 msgid "You just have to put nisdomain and nisserver"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:91
 #, fuzzy
 msgid "NIS Server:"
 msgstr "NFS server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:86
+#: ../nisautofs_wizard/Nisautofs.pm:92
 msgid "NIS Domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:91
+#: ../nisautofs_wizard/Nisautofs.pm:97
 msgid ""
 "Home NIS: home directory for users on NIS server. This directory will be "
 "export through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:91
+#: ../nisautofs_wizard/Nisautofs.pm:97
 msgid "NIS domain: NIS domain for your NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:91
+#: ../nisautofs_wizard/Nisautofs.pm:97
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:93 ../nisautofs_wizard/Nisautofs.pm:103
-#: ../nisautofs_wizard/Nisautofs.pm:118
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:124
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:94 ../nisautofs_wizard/Nisautofs.pm:104
+#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Kućni dir:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:95 ../nisautofs_wizard/Nisautofs.pm:105
-#: ../nisautofs_wizard/Nisautofs.pm:119
+#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Prpračunato Ime domena"
 
-#: ../nisautofs_wizard/Nisautofs.pm:101
+#: ../nisautofs_wizard/Nisautofs.pm:107
 msgid "Will set your NIS server with  autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:106
+#: ../nisautofs_wizard/Nisautofs.pm:112
 #, fuzzy
 msgid "Nis directory:"
 msgstr "KOrisnički direktorijum:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:107
+#: ../nisautofs_wizard/Nisautofs.pm:113
 #, fuzzy
 msgid "Network File:"
 msgstr "Mrežni uređaj"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:114
 msgid "Nfs exports:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:115
 msgid "Auto master:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:110
+#: ../nisautofs_wizard/Nisautofs.pm:116
 msgid "Auto home:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:116
+#: ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS domainname: name of NIS domainname."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:116
+#: ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server: hostname of the nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:116
+#: ../nisautofs_wizard/Nisautofs.pm:122
 msgid "Will set your computer has a NIS client."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:131
 msgid "Error should be a directory"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:129
+#: ../nisautofs_wizard/Nisautofs.pm:135
 msgid "Error nisdomainame should be correct (not none or localdomain)"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:129
+#: ../nisautofs_wizard/Nisautofs.pm:135
 msgid ""
 "Please adjust with domainname command or in /etc/sysconfig/network file "
 "(NISDOMAIN=yournisdomain)"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:135
+#: ../nisautofs_wizard/Nisautofs.pm:141
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:148
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS with autofs map."
 msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:294
-msgid "Configuring your system as a Nis+Autofs(nfs) server ..."
-msgstr ""
+#: ../nisautofs_wizard/Nisautofs.pm:301
+#, fuzzy
+msgid "Configuring your system to be a NIS server with Autofs map..."
+msgstr "Podešavanje DNS servera"
 
-#: ../nisautofs_wizard/Nisautofs.pm:294
+#: ../nisautofs_wizard/Nisautofs.pm:301
 #, fuzzy
-msgid "Nis+autofs Server"
+msgid "NIS with autofs map"
 msgstr "News server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:322
+#: ../nisautofs_wizard/Nisautofs.pm:329
 msgid "Configuring your system as Nis Client ..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:322
+#: ../nisautofs_wizard/Nisautofs.pm:329
 #, fuzzy
 msgid "Nis Client"
 msgstr "Klijentski IP:"
@@ -1495,38 +1687,39 @@ msgstr "Podešavanje FTP servera"
 msgid "Squid proxy"
 msgstr "Squid čarobnjak"
 
-#: ../pxe_wizard/Pxe.pm:52
+#: ../pxe_wizard/Pxe.pm:58
 #, fuzzy
-msgid "PXE Wizard (devel)"
-msgstr "DHCP čarobnjak"
+msgid "PXE Wizard"
+msgstr "FTP čarobnjak"
 
-#: ../pxe_wizard/Pxe.pm:67
-msgid "PXE - Set PXE server"
-msgstr ""
+#: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:172
+#, fuzzy
+msgid "Set PXE server"
+msgstr "NFS server"
 
-#: ../pxe_wizard/Pxe.pm:68
-msgid "add - Add boot image in PXE"
+#: ../pxe_wizard/Pxe.pm:80
+msgid "Add boot image in PXE"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:69
-msgid "remove - remove boot image in PXE"
+#: ../pxe_wizard/Pxe.pm:81
+msgid "Remove boot image in PXE"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:70
-msgid "Modify - Modify boot image in PXE"
+#: ../pxe_wizard/Pxe.pm:82
+msgid "Modify boot image in PXE"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:100
+#: ../pxe_wizard/Pxe.pm:112
 #, fuzzy
 msgid "PXE wizard"
 msgstr "FTP čarobnjak"
 
-#: ../pxe_wizard/Pxe.pm:100
+#: ../pxe_wizard/Pxe.pm:112
 #, fuzzy
 msgid "Set a PXE server."
 msgstr "Server bazi podataka"
 
-#: ../pxe_wizard/Pxe.pm:100
+#: ../pxe_wizard/Pxe.pm:112
 msgid ""
 "This wizard will help you configuring the PXE server. PXE (Pre-boot "
 "Execution Environment) is a protocol designed by Intel that allows computers "
@@ -1536,7 +1729,7 @@ msgid ""
 "an operating system loaded through the network."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:100
+#: ../pxe_wizard/Pxe.pm:112
 #, fuzzy
 msgid ""
 "This wizard will provide a pxe service, and ability to add/remove/modify "
@@ -1546,212 +1739,207 @@ msgstr ""
 "podešavanja će pružiti lokalni DNS servis za lokalna imena računara, sa ne-"
 "lokalnim zahtevima koji se šalju van DNS-a."
 
-#: ../pxe_wizard/Pxe.pm:114
+#: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:120
+#: ../pxe_wizard/Pxe.pm:132
 msgid "Add a boot image"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:120
+#: ../pxe_wizard/Pxe.pm:132
 msgid "PXE name: name in PXE menu (one word/number, no space please)"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:120
+#: ../pxe_wizard/Pxe.pm:132
 msgid "Path to image: full path to image (need network boot image)"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:130
+#: ../pxe_wizard/Pxe.pm:142
 msgid "Choose PXE boot image you want to remove from PXE server."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:130
+#: ../pxe_wizard/Pxe.pm:142
 msgid "Remove a boot image"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:132
+#: ../pxe_wizard/Pxe.pm:144
 msgid "Boot image to remove:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:137
+#: ../pxe_wizard/Pxe.pm:149
 msgid "Add option to boot image:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:137
+#: ../pxe_wizard/Pxe.pm:149
 msgid "Please choose PXE boot image to modify"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:139
+#: ../pxe_wizard/Pxe.pm:151
 msgid "Boot image to configure:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:145
+#: ../pxe_wizard/Pxe.pm:157
 msgid "Acpi option: Advanced Configuration and Power Interface"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:145
+#: ../pxe_wizard/Pxe.pm:157
 msgid "Install directory: full path to MDK install server directory"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:145
+#: ../pxe_wizard/Pxe.pm:157
 msgid "Installation method: choose nfs/http to install via nfs/http."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:145
+#: ../pxe_wizard/Pxe.pm:157
 msgid ""
 "Network client interface: through wich interface client should be installed."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:145
+#: ../pxe_wizard/Pxe.pm:157
 msgid "Options to add to PXE boot disk"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:145
+#: ../pxe_wizard/Pxe.pm:157
 msgid "Ramsize: adjust ramsize on boot disk."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:145
+#: ../pxe_wizard/Pxe.pm:157
 msgid ""
 "Server IP: IP address of server wich contain installation directory. You can "
 "create one with MDK install server wizard."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:145
+#: ../pxe_wizard/Pxe.pm:157
 msgid "VGA option: if you encounter some problem whith VGA, please adjust. "
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:147 ../pxe_wizard/Pxe.pm:189
+#: ../pxe_wizard/Pxe.pm:159 ../pxe_wizard/Pxe.pm:201
 msgid "Boot image to modify:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:148 ../pxe_wizard/Pxe.pm:190
+#: ../pxe_wizard/Pxe.pm:160 ../pxe_wizard/Pxe.pm:202
 #, fuzzy
 msgid "Server IP:"
 msgstr "Ime servera:"
 
-#: ../pxe_wizard/Pxe.pm:149 ../pxe_wizard/Pxe.pm:191
+#: ../pxe_wizard/Pxe.pm:161 ../pxe_wizard/Pxe.pm:203
 #, fuzzy
 msgid "Install directory:"
 msgstr "KOrisnički direktorijum:"
 
-#: ../pxe_wizard/Pxe.pm:150 ../pxe_wizard/Pxe.pm:192
+#: ../pxe_wizard/Pxe.pm:162 ../pxe_wizard/Pxe.pm:204
 msgid "Installation method:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:151 ../pxe_wizard/Pxe.pm:193
+#: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:205
 msgid "Network client interface:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:152 ../pxe_wizard/Pxe.pm:194
+#: ../pxe_wizard/Pxe.pm:164 ../pxe_wizard/Pxe.pm:206
 msgid "Ramsize:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:153 ../pxe_wizard/Pxe.pm:195
+#: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:207
 msgid "VGA option:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:154 ../pxe_wizard/Pxe.pm:196
+#: ../pxe_wizard/Pxe.pm:166 ../pxe_wizard/Pxe.pm:208
 msgid "Acpi option:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:155 ../pxe_wizard/Pxe.pm:197
+#: ../pxe_wizard/Pxe.pm:167 ../pxe_wizard/Pxe.pm:209
 msgid "Apic option:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:160
-#, fuzzy
-msgid "Set PXE server"
-msgstr "NFS server"
-
-#: ../pxe_wizard/Pxe.pm:160
+#: ../pxe_wizard/Pxe.pm:172
 msgid ""
 "This will configure all needed default configurations files to set a PXE "
 "server."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:160
+#: ../pxe_wizard/Pxe.pm:172
 msgid "We need to use a special dhcpd.conf with PXE parameter."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:164
+#: ../pxe_wizard/Pxe.pm:176
 msgid "Please provide a bootable image..."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:168
+#: ../pxe_wizard/Pxe.pm:180
 msgid "Please provide a correct name in PXE entry (one word)"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:172
+#: ../pxe_wizard/Pxe.pm:184
 msgid "Please provide another PXE Menu name"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:172
+#: ../pxe_wizard/Pxe.pm:184
 msgid "Similar name is already used in PXE menu entry"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:176
+#: ../pxe_wizard/Pxe.pm:188
 msgid "Now will prepare all default files to set the PXE server"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:178
+#: ../pxe_wizard/Pxe.pm:190
 #, fuzzy
 msgid "Tftp directory:"
 msgstr "KOrisnički direktorijum:"
 
-#: ../pxe_wizard/Pxe.pm:179
+#: ../pxe_wizard/Pxe.pm:191
 msgid "Boot image path:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:180
+#: ../pxe_wizard/Pxe.pm:192
 msgid "PXE 'default' file:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:181
+#: ../pxe_wizard/Pxe.pm:193
 msgid "PXE 'help' file:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:187
+#: ../pxe_wizard/Pxe.pm:199
 msgid "Now will modify boot options in image"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:203
+#: ../pxe_wizard/Pxe.pm:215
 msgid "Now will remove your PXE boot image"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:205
+#: ../pxe_wizard/Pxe.pm:217
 msgid "PXE entry to remove:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:211
+#: ../pxe_wizard/Pxe.pm:223
 msgid "Now will add your PXE boot image"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:222
+#: ../pxe_wizard/Pxe.pm:234
 #, fuzzy
 msgid "The wizard successfully add a PXE boot image."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../pxe_wizard/Pxe.pm:227
+#: ../pxe_wizard/Pxe.pm:239
 #, fuzzy
 msgid "The wizard successfully remove a PXE boot image."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../pxe_wizard/Pxe.pm:232
+#: ../pxe_wizard/Pxe.pm:244
 #, fuzzy
 msgid "The wizard successfully modify image(s)."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../pxe_wizard/Pxe.pm:237
+#: ../pxe_wizard/Pxe.pm:249
 #, fuzzy
 msgid "The wizard successfully configured your PXE server."
 msgstr "Čarobnjak je uspešno podesio vaš proksi server."
 
-#: ../pxe_wizard/Pxe.pm:461
+#: ../pxe_wizard/Pxe.pm:482
 msgid "Configuring PXE server on your system..."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:461
+#: ../pxe_wizard/Pxe.pm:482
 #, fuzzy
 msgid "PXE server"
 msgstr "NFS server"
@@ -2238,6 +2426,14 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Čarobnjak je uspešno podesio vaš intranet/internet Web server"
 
 #, fuzzy
+#~ msgid "Nis+autofs Server"
+#~ msgstr "News server"
+
+#, fuzzy
+#~ msgid "PXE Wizard (devel)"
+#~ msgstr "DHCP čarobnjak"
+
+#, fuzzy
 #~ msgid "DNS Configuration Wizard"
 #~ msgstr "Čarobnjak za podešavanje DNS-a"
 
@@ -2301,10 +2497,6 @@ msgstr "Čarobnjak je uspešno podesio vaš intranet/internet Web server"
 #~ msgstr "Čarobnjak za podešavanje DNS-a"
 
 #, fuzzy
-#~ msgid "Which operation on Wizard:"
-#~ msgstr "Čarobnjak za podešavanje"
-
-#, fuzzy
 #~ msgid "Nis Server:"
 #~ msgstr "News server:"
 
@@ -2402,15 +2594,9 @@ msgstr "Čarobnjak je uspešno podesio vaš intranet/internet Web server"
 #~ msgid "Confirm"
 #~ msgstr "Potvrdi"
 
-#~ msgid "Password:"
-#~ msgstr "Lozinka:"
-
 #~ msgid "The wizard successfully configured your MySQL Database Server"
 #~ msgstr "Čarobnjak je uspešno podesio Vaš MySQL server bazi podataka"
 
-#~ msgid "Username:"
-#~ msgstr "Korisničko ime:"
-
 #~ msgid "Add"
 #~ msgstr "Dodaj"
 
@@ -2644,9 +2830,6 @@ msgstr "Čarobnjak je uspešno podesio vaš intranet/internet Web server"
 #~ msgid "This wizard will set the basic networking parameters of your server."
 #~ msgstr "Ovaj čarobnjak će podesiti osnovne mrežne parametre za vaš server."
 
-#~ msgid "Host Name:"
-#~ msgstr "Ime domaćina:"
-
 #~ msgid "Basic Network Configuration Wizard"
 #~ msgstr "Čarobnjak za osnovno podešavanje mreže"