updated pot file

1 files changed, 405 insertions, 294 deletions

diff --git a/po/et.po b/po/et.po
index 4c01941c..6dfc69e0 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-03-26 17:05+0100\n"
+"POT-Creation-Date: 2004-08-07 12:27+0200\n"
 "PO-Revision-Date: 2004-03-27 12:55+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -20,31 +20,32 @@ msgid "configuration wizard"
 msgstr "seadistuste nõustaja"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
-#: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
-#: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:200
+#: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
+#: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:206
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Hoiatus."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
-#: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:206
-#: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
+#: ../samba_wizard/Samba.pm:165 ../samba_wizard/Samba.pm:170
+#: ../samba_wizard/Samba.pm:212 ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Viga."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/ldap.pm:207 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
-#: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
+#: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:238 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Õnnitlused"
 
@@ -115,21 +116,23 @@ msgstr "Arvuti nimi:"
 msgid "IP address of the machine:"
 msgstr "Arvuti IP aadress:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:89
-#: ../dhcp_wizard/Dhcp.pm:99 ../dns_wizard/Bind.pm:184
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:184
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:89
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
 #: ../dns_wizard/Bind.pm:184 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
-#: ../drakwizard.pl:91 ../drakwizard.pl:142 ../drakwizard.pl:146
-#: ../kolab_wizard/Kolab.pm:120 ../ldap_wizard/ldap.pm:168
-#: ../postfix_wizard/Postfix.pm:88
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
+#: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/ldap.pm:141
+#: ../ldap_wizard/ldap.pm:145 ../ldap_wizard/ldap.pm:167
+#: ../ldap_wizard/ldap.pm:171 ../ldap_wizard/ldap.pm:175
+#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Viga"
 
@@ -172,21 +175,34 @@ msgstr "Kliendi IP:"
 msgid "The wizard successfully added the client."
 msgstr "Nõustaja lisas edukalt kliendi."
 
-#: ../dhcp_wizard/Dhcp.pm:43 ../dhcp_wizard/Dhcp.pm:58
+#: ../common/Wizcommon.pm:87
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard ?"
+msgstr ""
+
+#: ../common/Wizcommon.pm:105
+msgid "Close"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP nõustaja"
 
-#: ../dhcp_wizard/Dhcp.pm:58
+#: ../dhcp_wizard/Dhcp.pm:53
 msgid ""
 "DHCP is a service that automatically assigns networking addresses to your "
 "workstations."
 msgstr "DHCP on teenus, mis automaatselt omistab tööjaamadele võrguaadressid."
 
-#: ../dhcp_wizard/Dhcp.pm:58
+#: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "See nõustaja aitab seadistada Teie serveri DHCP teenused."
 
-#: ../dhcp_wizard/Dhcp.pm:64
+#: ../dhcp_wizard/Dhcp.pm:58
+msgid "Interface the dhcp server must listen to"
+msgstr "Liides, mida DHCP server peab jälgima"
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid ""
 "If you want to enable PXE in your dhcp server please check the box (Pre-boot "
 "eXecution Environment, a protocol that allows computers to boot through the "
@@ -196,11 +212,11 @@ msgstr ""
 "eellaadimise keskkond, inglise keeles Pre-boot eXecution Environment ehk "
 "protokoll, mis lubab arvutitel alglaadimise sooritada üle võrgu)."
 
-#: ../dhcp_wizard/Dhcp.pm:64
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Range of addresses used by DHCP"
 msgstr "DHCP kasutatav aadresside vahemik"
 
-#: ../dhcp_wizard/Dhcp.pm:64
+#: ../dhcp_wizard/Dhcp.pm:72
 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 "
@@ -210,89 +226,85 @@ msgstr ""
 "ei ole just erilisi vajadusi, võite rahumeeli nõustuda pakutavate "
 "väärtustega (nt. 192.168.100.20 192.168.100.40)."
 
-#: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
+#: ../dhcp_wizard/Dhcp.pm:82 ../dhcp_wizard/Dhcp.pm:115
 msgid "Lowest IP address:"
 msgstr "Väikseim IP aadress:"
 
-#: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
+#: ../dhcp_wizard/Dhcp.pm:83 ../dhcp_wizard/Dhcp.pm:116
 msgid "Highest IP address:"
 msgstr "Suurim IP aadress:"
 
-#: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
+#: ../dhcp_wizard/Dhcp.pm:84 ../dhcp_wizard/Dhcp.pm:117
 msgid "Gateway IP address:"
 msgstr "Lüüsi (gateway) IP aadress:"
 
-#: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
+#: ../dhcp_wizard/Dhcp.pm:85 ../dhcp_wizard/Dhcp.pm:119
 msgid "Enable PXE:"
 msgstr "PXE lubamine:"
 
-#: ../dhcp_wizard/Dhcp.pm:79
-msgid "Interface the dhcp server must listen to"
-msgstr "Liides, mida DHCP server peab jälgima"
-
-#: ../dhcp_wizard/Dhcp.pm:94
+#: ../dhcp_wizard/Dhcp.pm:95
 msgid "The IP range specified is not correct."
 msgstr "Määratud IP aadresside vahemik ei ole korrektne."
 
-#: ../dhcp_wizard/Dhcp.pm:99
+#: ../dhcp_wizard/Dhcp.pm:100
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Määratud IP aadresside vahemik ei asu serveri võrguaadresside vahemikus."
 
-#: ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:105
 msgid "The IP of the server must not be in range."
 msgstr "Serveri IP ei tohi olla vahemikus."
 
-#: ../dhcp_wizard/Dhcp.pm:109
+#: ../dhcp_wizard/Dhcp.pm:110
 msgid "Configuring the DHCP server"
 msgstr "DHCP serveri seadistamine"
 
-#: ../dhcp_wizard/Dhcp.pm:109
+#: ../dhcp_wizard/Dhcp.pm:110
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja DHCP teenuse seadistamiseks:"
 
-#: ../dhcp_wizard/Dhcp.pm:111 ../ftp_wizard/Proftpd.pm:128
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
-#: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:85
-#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:215
-#: ../samba_wizard/Samba.pm:216 ../samba_wizard/Samba.pm:217
+#: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:221
+#: ../samba_wizard/Samba.pm:222 ../samba_wizard/Samba.pm:223
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "keelatud"
 
-#: ../dhcp_wizard/Dhcp.pm:111 ../ftp_wizard/Proftpd.pm:128
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
-#: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:85
-#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:215
-#: ../samba_wizard/Samba.pm:216 ../samba_wizard/Samba.pm:217
+#: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:221
+#: ../samba_wizard/Samba.pm:222 ../samba_wizard/Samba.pm:223
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "lubatud"
 
-#: ../dhcp_wizard/Dhcp.pm:117
+#: ../dhcp_wizard/Dhcp.pm:118
 msgid "Interface:"
 msgstr "Liides:"
 
-#: ../dhcp_wizard/Dhcp.pm:124
+#: ../dhcp_wizard/Dhcp.pm:125
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Nõustaja seadistas edukalt DHCP teenused."
 
-#: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
 #: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
-#: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:237 ../web_wizard/Apache.pm:152
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Ebaõnnestus"
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:178
-#: ../samba_wizard/Samba.pm:238 ../web_wizard/Apache.pm:153
+#: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
 
@@ -310,12 +322,12 @@ msgstr ""
 "domeeninimi, mitte localdomain või üldse puuduma. Käivitage täpsutamiseks "
 "Drakconnect."
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:692
+#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:707
 msgid "Master DNS server"
 msgstr "Esmane nimeserver"
 
 #: ../dns_wizard/Bind.pm:85 ../dns_wizard/Bind.pm:144
-#: ../dns_wizard/Bind.pm:706
+#: ../dns_wizard/Bind.pm:721
 msgid "Slave DNS server"
 msgstr "Teisene nimeserver"
 
@@ -494,7 +506,7 @@ msgstr ""
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Nõustaja tekitab nüüd Teie teisese DNS seadistuse"
 
-#: ../dns_wizard/Bind.pm:209 ../ldap_wizard/ldap.pm:145
+#: ../dns_wizard/Bind.pm:209
 msgid "with this configuration:"
 msgstr "seadistusega:"
 
@@ -543,18 +555,14 @@ msgstr "Nõustaja seadistas edukalt Teie serveri DNS teenused."
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
 
-#: ../dns_wizard/Bind.pm:692
+#: ../dns_wizard/Bind.pm:707
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Süsteemi seadistamine esmaseks nimeserveriks..."
 
-#: ../dns_wizard/Bind.pm:706
+#: ../dns_wizard/Bind.pm:721
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Süsteemi seadistamine teiseseks nimeserveriks..."
 
-#: ../drakwizard.pl:40
-msgid "Apache web server"
-msgstr "Apache veebiserver"
-
 #: ../drakwizard.pl:41
 msgid "DHCP server"
 msgstr "DHCP server"
@@ -579,7 +587,7 @@ msgstr "Meiliserver"
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:478
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:510
 msgid "Samba server"
 msgstr "Samba server"
 
@@ -607,19 +615,19 @@ msgstr "Mandrake paigaldusserver"
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:152
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:154
 msgid "Kolab server"
 msgstr "Kolabi server"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:68
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizardi nõustaja valik"
 
-#: ../drakwizard.pl:61
+#: ../drakwizard.pl:69
 msgid "Please select a wizard"
 msgstr "Palun valige nõustaja"
 
-#: ../drakwizard.pl:142
+#: ../drakwizard.pl:157
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -629,7 +637,7 @@ msgstr ""
 "Klõpsake paigaldamiseks nupule \"Järgmine\" või \"Loobu\", kui soovite "
 "loobuda"
 
-#: ../drakwizard.pl:146 ../kolab_wizard/Kolab.pm:120
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
@@ -787,11 +795,11 @@ msgstr "Nõustaja seadistas edukalt intraneti/Interneti FTP serveri"
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
 
-#: ../installsrv_wizard/Installsrv.pm:51
+#: ../installsrv_wizard/Installsrv.pm:53
 msgid "Configure a Mandrake install server (via NFS and http)"
 msgstr "Mandrake paigaldusserveri seadistamine (NFS ja HTTP vahendusel)"
 
-#: ../installsrv_wizard/Installsrv.pm:51
+#: ../installsrv_wizard/Installsrv.pm:53
 msgid ""
 "Easily configure a Mandrake server installation directory, with NFS and HTTP "
 "access."
@@ -799,51 +807,56 @@ msgstr ""
 "Mandrake serveri paigalduskataloogi hõlpus seadistamine NFS ja HTTP "
 "ligipääsuga."
 
-#: ../installsrv_wizard/Installsrv.pm:56
+#: ../installsrv_wizard/Installsrv.pm:58
 msgid "Destination directory: copy file in which directory ?"
 msgstr "Sihtkataloog: millisesse kataloogi fail kopeerida?"
 
-#: ../installsrv_wizard/Installsrv.pm:56
+#: ../installsrv_wizard/Installsrv.pm:58
 msgid "Install server configuration"
 msgstr "Paigaldusserveri seadistus"
 
-#: ../installsrv_wizard/Installsrv.pm:56
+#: ../installsrv_wizard/Installsrv.pm:58
 msgid ""
 "Path to data: specify your source directory, should be base of an Mandrake "
 "installation."
 msgstr "Andmete asukoht: määrake lähtekataloog (Mandrake paigalduse baas)."
 
-#: ../installsrv_wizard/Installsrv.pm:71
+#: ../installsrv_wizard/Installsrv.pm:73
 msgid "The destination directory could not be '/var/install/'"
 msgstr "Sihtkataloog ei saa olla '/var/install/'"
 
-#: ../installsrv_wizard/Installsrv.pm:71
+#: ../installsrv_wizard/Installsrv.pm:73
 msgid "ie use: /var/install/mdk-release"
 msgstr "nt. kasutage /var/install/mdk-release"
 
-#: ../installsrv_wizard/Installsrv.pm:75
+#: ../installsrv_wizard/Installsrv.pm:77
 msgid ""
 "Error, the source path must be a directory with full Mandrake installation "
 "directory."
 msgstr "Viga: lähtekataloog peab sisaldama täielikku Mandrake kataloogipuud."
 
-#: ../installsrv_wizard/Installsrv.pm:79
+#: ../installsrv_wizard/Installsrv.pm:81
 msgid "The destination directory already in use, please choose another one."
 msgstr "Sihtkataloog on juba kasutusel, palun valige mõni muu."
 
-#: ../installsrv_wizard/Installsrv.pm:83
+#: ../installsrv_wizard/Installsrv.pm:85
 msgid "Your install server will be configured with these parameters"
 msgstr "Teie paigaldusserver seadistatakse järgmiste parameetritega"
 
-#: ../installsrv_wizard/Installsrv.pm:91
+#: ../installsrv_wizard/Installsrv.pm:93
 msgid "Enable NFS install server:"
 msgstr "NFS paigaldusserveri lubamine:"
 
-#: ../installsrv_wizard/Installsrv.pm:92
+#: ../installsrv_wizard/Installsrv.pm:94
 msgid "Enable HTTP install server:"
 msgstr "HTTP paigaldusserveri lubamine:"
 
-#: ../installsrv_wizard/Installsrv.pm:98
+#: ../installsrv_wizard/Installsrv.pm:100
+#, fuzzy
+msgid "Configuring your system, please wait..."
+msgstr "Süsteemi seadistamine NIS kliendiks..."
+
+#: ../installsrv_wizard/Installsrv.pm:104
 msgid ""
 "Congratulations, Mandrake Install server is now ready. You can now configure "
 "a DHCP server with PXE support, and a PXE server. So it will be very easy to "
@@ -853,14 +866,6 @@ msgstr ""
 "seadistada DHCP serveri PXE toega ja PXE serveri. Sellisel juhul on märksa "
 "lihtsam paigaldada Mandrake ka üle võrgu."
 
-#: ../installsrv_wizard/Installsrv.pm:143
-msgid "Copying data to destination directory, can take a while...."
-msgstr "Andmete kopeerimine sihtkataloogi, võib võtta veidi aega..."
-
-#: ../installsrv_wizard/Installsrv.pm:143
-msgid "Install Server"
-msgstr "Paigaldusserver"
-
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
 msgstr "Kolabi seadistamise nõustaja"
@@ -907,8 +912,7 @@ msgstr "Sisestage Kolabi serveri haldurikonto parool."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Parool ei ole õige või jäi andmata, palun parandage viga."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/ldap.pm:89
-#: ../ldap_wizard/ldap.pm:128
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/ldap.pm:135
 msgid "Password:"
 msgstr "Parool:"
 
@@ -937,184 +941,170 @@ msgstr ""
 "(manager) aadressil https://127.0.0.1/kolab/admin/, kasutades äsja "
 "sisestatud parooli."
 
-#: ../kolab_wizard/Kolab.pm:115
+#: ../kolab_wizard/Kolab.pm:109
 msgid "Install in progress"
 msgstr "Paigaldamine..."
 
-#: ../kolab_wizard/Kolab.pm:115
+#: ../kolab_wizard/Kolab.pm:109
 msgid "Installing Kolab server on your system..."
 msgstr "Kolabi serveri paigaldamine Teie süsteemi..."
 
-#: ../kolab_wizard/Kolab.pm:152
+#: ../kolab_wizard/Kolab.pm:154
 msgid "Configuring Kolab server on your system..."
 msgstr "Teie süsteemi seadistamine Kolabi serveriks..."
 
-#: ../ldap_wizard/ldap.pm:59
+#: ../ldap_wizard/ldap.pm:26 ../ldap_wizard/ldapdef.pm:25
+msgid "Add POSIX account"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:87
 msgid "Server - Set configuration of LDAP server"
 msgstr "Server - LDAP serveri seadistamine"
 
-#: ../ldap_wizard/ldap.pm:60
-msgid "Add - add entry in LDAP server"
+#: ../ldap_wizard/ldap.pm:88
+#, fuzzy
+msgid "Add - Add user in LDAP server"
 msgstr "Lisamine - kirje lisamine LDAP serverile"
 
-#: ../ldap_wizard/ldap.pm:67
+#: ../ldap_wizard/ldap.pm:93
 msgid "LDAP configuration wizard"
 msgstr "LDAP seadistuste nõustaja"
 
-#: ../ldap_wizard/ldap.pm:67
-msgid "Setup a ldap server."
-msgstr "LDAP serveri seadistamine."
-
-#: ../ldap_wizard/ldap.pm:79
-msgid "which operation on LDAP:"
-msgstr "Mida soovite ette võtta:"
-
-#: ../ldap_wizard/ldap.pm:84
-msgid "Add data in LDAP"
-msgstr "Andmete lisamine LDAP-ile"
+#: ../ldap_wizard/ldap.pm:93
+#, fuzzy
+msgid "Setup a LDAP server."
+msgstr "PXE serveri seadistamine."
 
-#: ../ldap_wizard/ldap.pm:84
-msgid "uid, gid, home directory, "
-msgstr "UID, GUID, kodukataloog, "
+#: ../ldap_wizard/ldap.pm:105
+msgid "Your choice:"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:86 ../ldap_wizard/ldap.pm:125
-msgid "First Name:"
-msgstr "Eesnimi:"
+#: ../ldap_wizard/ldap.pm:109
+#, fuzzy
+msgid "Config Server "
+msgstr "Postfix server"
 
-#: ../ldap_wizard/ldap.pm:87 ../ldap_wizard/ldap.pm:126
-msgid "Last Name:"
-msgstr "Perekonnanimi:"
+#: ../ldap_wizard/ldap.pm:111
+#, fuzzy
+msgid "Server Name: "
+msgstr "Serveri nimi:"
 
-#: ../ldap_wizard/ldap.pm:88 ../ldap_wizard/ldap.pm:127
-msgid "User Name:"
-msgstr "Kasutajatunnus:"
+#: ../ldap_wizard/ldap.pm:112
+#, fuzzy
+msgid "Server RootDN: "
+msgstr "Serveri nimi:"
 
-#: ../ldap_wizard/ldap.pm:90
-msgid "Home Directory:"
-msgstr "Kodukataloog:"
+#: ../ldap_wizard/ldap.pm:113
+#, fuzzy
+msgid "RootDN Password: "
+msgstr "Parool:"
 
-#: ../ldap_wizard/ldap.pm:91 ../ldap_wizard/ldap.pm:130
-msgid "Login shell:"
-msgstr "Sisselogimisshell:"
-
-#: ../ldap_wizard/ldap.pm:92 ../ldap_wizard/ldap.pm:131
-msgid "uid number:"
-msgstr "UID:"
-
-#: ../ldap_wizard/ldap.pm:93 ../ldap_wizard/ldap.pm:132
-msgid "Group ID:"
-msgstr "Grupi ID:"
-
-#: ../ldap_wizard/ldap.pm:99
-msgid ""
-"LDAP RootDSE\n"
-"\n"
-"example:\n"
-"obelx.nux.com\n"
-"\n"
-"will be in ldap config:\n"
-"\n"
-"dc=obelx,dc=nux,dc=com\n"
-"\n"
-"RootDN is the manager of your ldap server."
-msgstr ""
-"LDAP RootDSE\n"
-"\n"
-"Näide:\n"
-"obelx.nux.com\n"
-"\n"
-"võtab LDAP seadistuses kuju\n"
-"\n"
-"dc=obelx,dc=nux,dc=com\n"
-"\n"
-"RootDN on Teie LDAP serveri haldur."
-
-#: ../ldap_wizard/ldap.pm:111 ../ldap_wizard/ldap.pm:148
-msgid "RootDSE"
-msgstr "RootDSE"
-
-#: ../ldap_wizard/ldap.pm:113 ../ldap_wizard/ldap.pm:150
-msgid "RootDN"
-msgstr "RootDN"
+#: ../ldap_wizard/ldap.pm:114
+#, fuzzy
+msgid "Server Suffix: "
+msgstr "Serveri IP:"
 
 #: ../ldap_wizard/ldap.pm:115
-msgid "Password"
-msgstr "Parool"
+msgid "Server Default Users OU: "
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:117
-msgid "Default OU"
-msgstr "Vaikimisi üksus"
+#: ../ldap_wizard/ldap.pm:120
+msgid "LDAP User Add"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:123
-msgid "Ok Now add entry in LDAP"
-msgstr "Olgu, nüüd lisatakse kirje LDAP-ile"
+#: ../ldap_wizard/ldap.pm:120
+#, fuzzy
+msgid "User Create in: "
+msgstr "Kasutajatunnus:"
 
-#: ../ldap_wizard/ldap.pm:129
-msgid "Home directory:"
-msgstr "Kodukataloog:"
+#: ../ldap_wizard/ldap.pm:123
+msgid "First Name:"
+msgstr "Eesnimi:"
 
-#: ../ldap_wizard/ldap.pm:133
-msgid "Container:"
-msgstr "Konteiner"
+#: ../ldap_wizard/ldap.pm:125 ../ldap_wizard/ldap.pm:186
+#, fuzzy
+msgid "Name:"
+msgstr "Kasutajatunnus:"
 
-#: ../ldap_wizard/ldap.pm:134
-msgid "shadowMax:"
-msgstr "shadowMax:"
+#: ../ldap_wizard/ldap.pm:127 ../ldap_wizard/ldap.pm:190
+msgid "User Name:"
+msgstr "Kasutajatunnus:"
 
-#: ../ldap_wizard/ldap.pm:135
-msgid "shadowMin:"
-msgstr "shadowMin:"
+#: ../ldap_wizard/ldap.pm:132
+#, fuzzy
+msgid "LDAP User Password"
+msgstr "Parool"
 
-#: ../ldap_wizard/ldap.pm:136
-msgid "shadowWarning:"
-msgstr "shadowWarning:"
+#: ../ldap_wizard/ldap.pm:132
+#, fuzzy
+msgid "Password for Users: "
+msgstr "Parool:"
 
 #: ../ldap_wizard/ldap.pm:137
-msgid "shadowInactive:"
-msgstr "shadowInactive:"
+#, fuzzy
+msgid "Password (again):"
+msgstr "Parool teist korda:"
+
+#: ../ldap_wizard/ldap.pm:141 ../ldap_wizard/ldap.pm:171
+msgid "You must enter a password for LDAP."
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:145 ../ldap_wizard/ldap.pm:175
+msgid "The passwords do not match"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:154
+#, fuzzy
+msgid "Configuring LDAP"
+msgstr "Samba seadistamine"
 
-#: ../ldap_wizard/ldap.pm:138
-msgid "shadowExpire:"
-msgstr "shadowExpire:"
+#: ../ldap_wizard/ldap.pm:157 ../ldap_wizard/ldap.pm:201
+msgid "LDAP Suffix:"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:139
-msgid "objectClass:"
-msgstr "objectClass:"
+#: ../ldap_wizard/ldap.pm:159
+msgid "LDAP Administrator:"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:145
-msgid "Ok Now building your LDAP configuration"
-msgstr "Olgu, nüüd tekitame Teie LDAP seadistuse"
+#: ../ldap_wizard/ldap.pm:161
+#, fuzzy
+msgid "LDAP Password:"
+msgstr "Parool:"
 
-#: ../ldap_wizard/ldap.pm:156
-msgid "Error in Home directory"
-msgstr "Viga kodukataloogi määramisel"
+#: ../ldap_wizard/ldap.pm:163
+#, fuzzy
+msgid "LDAP Password (again):"
+msgstr "Parool teist korda:"
 
-#: ../ldap_wizard/ldap.pm:160
-msgid "Error, pass could not be empty"
-msgstr "Viga, parool tuleb anda"
+#: ../ldap_wizard/ldap.pm:167
+msgid "You must enter a suffix for LDAP."
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:164
-msgid "Error in Login shell"
-msgstr "Viga shelli määramisel"
+#: ../ldap_wizard/ldap.pm:183 ../ldap_wizard/ldap.pm:198
+msgid "Confirmation de l'utilisateur a creer"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:164
-msgid "Please choose a correct one"
-msgstr "Palun valige korrektne variant"
+#: ../ldap_wizard/ldap.pm:188
+#, fuzzy
+msgid "First name:"
+msgstr "Eesnimi:"
 
-#: ../ldap_wizard/ldap.pm:168
-msgid "Please Should be a number"
-msgstr "See peab olema number"
+#: ../ldap_wizard/ldap.pm:192
+msgid "Create in:"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:173
+#: ../ldap_wizard/ldap.pm:208
 msgid "The wizard successfully configured the LDAP."
 msgstr "Nõustaja seadistas edukalt Teie LDAP serveri."
 
-#: ../ldap_wizard/ldap.pm:179
-msgid "Successfully added data"
+#: ../ldap_wizard/ldap.pm:214
+#, fuzzy
+msgid "Successfully added User"
 msgstr "Andmed edukalt lisatud"
 
-#: ../ldap_wizard/ldap.pm:180
-msgid "The wizard successfully added an entry in ldap"
+#: ../ldap_wizard/ldap.pm:215
+#, fuzzy
+msgid "The wizard successfully added an user in LDAP"
 msgstr "Nõustaja lisas edukalt kirje LDAP-ile"
 
 #: ../news_wizard/Inn.pm:33
@@ -1224,11 +1214,11 @@ msgstr "Nõustaja seadistas edukalt serveri uudistegruppide teenuse."
 msgid "NFS Wizard"
 msgstr "NFS nõustaja"
 
-#: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
+#: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:39
 msgid "All - No access restriction"
 msgstr "Kõik - ei mingeid ligipääsupiiranguid"
 
-#: ../nfs_wizard/NFS.pm:46 ../proxy_wizard/Squid.pm:38
+#: ../nfs_wizard/NFS.pm:46 ../proxy_wizard/Squid.pm:40
 msgid "Local Network - access for local network (recommended)"
 msgstr "Kohtvõrk - ligipääs kohtvõrgule (soovitatav)"
 
@@ -1249,16 +1239,21 @@ msgstr ""
 "Kataloog, mis eksporditakse NFS klientidele. See eksporditakse ainult "
 "lugemisõigusega. Lubatud ei ole ükski failisüsteemi muuta püüdev päring."
 
-#: ../nfs_wizard/NFS.pm:59
+#: ../nfs_wizard/NFS.pm:58
 msgid "Directory:"
 msgstr "Kataloog:"
 
-#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:170
+#: ../web_wizard/Apache.pm:119
+msgid "The path you entered does not exist."
+msgstr "Sisestatud asukohta ei ole olemas."
+
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:108
 #: ../samba_wizard/Samba.pm:119
 msgid "Access control"
 msgstr "Ligipääsu kontroll"
 
-#: ../nfs_wizard/NFS.pm:64
+#: ../nfs_wizard/NFS.pm:69
 msgid ""
 "Choose the level that suits your needs. If you don't know, the local network "
 "level is usually the most appropriate. Beware that the all level may be not "
@@ -1267,11 +1262,11 @@ msgstr ""
 "Valige tase, mis vastab Teie vajadustele. Kui Te ei ole kindel, on enamasti "
 "kohane kohtvõrgu tase. Pange tähele, et tase 'Kõik' ei pruugi olla turvaline."
 
-#: ../nfs_wizard/NFS.pm:64
+#: ../nfs_wizard/NFS.pm:69
 msgid "NFS can be restricted to a certain ip class"
 msgstr "NFS võib olla piiratud teatud IP klassiga"
 
-#: ../nfs_wizard/NFS.pm:75 ../proxy_wizard/Squid.pm:117
+#: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:119
 msgid ""
 "Access will be allowed for hosts on the network. Here is the information "
 "found about your current local network, you can modify it if needed."
@@ -1279,19 +1274,14 @@ msgstr ""
 "Ligipääs lubatakse kõigile võrgu masinatele. Siin on info, mis leiti Teie "
 "praeguse kohtvõrgu kohta; vajadusel võite seda muuta."
 
-#: ../nfs_wizard/NFS.pm:75 ../proxy_wizard/Squid.pm:117
+#: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:119
 msgid "Grant access on local network"
 msgstr "Ligipääsu võimaldamine kohtvõrgule"
 
-#: ../nfs_wizard/NFS.pm:77 ../proxy_wizard/Squid.pm:122
+#: ../nfs_wizard/NFS.pm:82 ../proxy_wizard/Squid.pm:124
 msgid "Authorized network:"
 msgstr "Autoriseeritud võrk:"
 
-#: ../nfs_wizard/NFS.pm:83 ../samba_wizard/Samba.pm:164
-#: ../web_wizard/Apache.pm:119
-msgid "The path you entered does not exist."
-msgstr "Sisestatud asukohta ei ole olemas."
-
 #: ../nfs_wizard/NFS.pm:88
 msgid "The wizard collected the following parameters."
 msgstr "Nõustaja kogus järgmised andmed."
@@ -1637,42 +1627,42 @@ msgstr "Konflikti vältimiseks eemaldatakse Sendmail..."
 msgid "Configuring your Postfix server....."
 msgstr "Postfix serveri seadistamine..."
 
-#: ../proxy_wizard/Squid.pm:39
+#: ../proxy_wizard/Squid.pm:41
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - ligipääs on lubatud ainult käesolevale serverile"
 
-#: ../proxy_wizard/Squid.pm:42
+#: ../proxy_wizard/Squid.pm:44
 msgid "No upper level proxy (recommended)"
 msgstr "Ülemise taseme vahendaja puudub (soovitatav)"
 
-#: ../proxy_wizard/Squid.pm:43
+#: ../proxy_wizard/Squid.pm:45
 msgid "Define an upper level proxy"
 msgstr "Ülemise taseme (teenusepakkuja poolse) vahendaja määramine"
 
-#: ../proxy_wizard/Squid.pm:47
+#: ../proxy_wizard/Squid.pm:49
 msgid "Squid wizard"
 msgstr "Squidi nõustaja"
 
-#: ../proxy_wizard/Squid.pm:65
+#: ../proxy_wizard/Squid.pm:67
 msgid "Proxy Configuration Wizard"
 msgstr "Vahendaja seadistamise nõustaja"
 
-#: ../proxy_wizard/Squid.pm:65
+#: ../proxy_wizard/Squid.pm:67
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
 msgstr ""
 "Squid on veebivahendaja server, mis lubab kohtvõrgule kiiremat pääsu veebi."
 
-#: ../proxy_wizard/Squid.pm:65
+#: ../proxy_wizard/Squid.pm:67
 msgid "This wizard will help you in configuring your proxy server."
 msgstr "See nõustaja aitab seadistada Teie vahendaja serveri."
 
-#: ../proxy_wizard/Squid.pm:70
+#: ../proxy_wizard/Squid.pm:72
 msgid "Proxy Port"
 msgstr "Vahendaja port"
 
-#: ../proxy_wizard/Squid.pm:70
+#: ../proxy_wizard/Squid.pm:72
 msgid ""
 "Proxy port value sets what port the proxy server will listen on for http "
 "requests. Default is 3128, other common value can be 8080, the port value "
@@ -1682,40 +1672,40 @@ msgstr ""
 "päringuid. Vaikimisi on see 3128, teine levinud väärtus on 8080, aga igal "
 "juhul peab pordi number olema suurem kui 1024."
 
-#: ../proxy_wizard/Squid.pm:76
+#: ../proxy_wizard/Squid.pm:78
 msgid "Proxy port:"
 msgstr "Vahendaja port:"
 
-#: ../proxy_wizard/Squid.pm:81
+#: ../proxy_wizard/Squid.pm:83
 msgid ""
 "Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Selle väärtusega nõustumiseks vajutage nupule 'Järgmine' või nupule "
 "'Tagasi', kui soovite midagi muuta."
 
-#: ../proxy_wizard/Squid.pm:81
+#: ../proxy_wizard/Squid.pm:83
 msgid "You have entered a port that may be useful for this service:"
 msgstr "Sisestatud port võib olla kasulik selleks teenuseks:"
 
-#: ../proxy_wizard/Squid.pm:88
+#: ../proxy_wizard/Squid.pm:90
 msgid "Press back to change the value."
 msgstr "Väärtuse muutmiseks vajutage nupule 'Tagasi'."
 
-#: ../proxy_wizard/Squid.pm:88
+#: ../proxy_wizard/Squid.pm:90
 msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr ""
 "Valida tuleb port, mille number on suurem kui 1024 ja väiksem kui 65535"
 
-#: ../proxy_wizard/Squid.pm:92
+#: ../proxy_wizard/Squid.pm:94
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr "Ketta vahemälu on kettaruum, mida kasutatakse puhverdamiseks kettal."
 
-#: ../proxy_wizard/Squid.pm:92
+#: ../proxy_wizard/Squid.pm:94
 msgid "For your information, here is /var/spool/squid space on disk:"
 msgstr "Lihtsalt teadmiseks, et /var/spool/squid kataloogis on kettaruumi:"
 
-#: ../proxy_wizard/Squid.pm:92
+#: ../proxy_wizard/Squid.pm:94
 msgid ""
 "Memory Cache is the amount of RAM dedicated to cache memory operations (note "
 "that actual memory usage of the whole squid process is bigger)."
@@ -1724,25 +1714,25 @@ msgstr ""
 "puhverdamisoperatsioonideks (pange tähele, et kogu squid-protsessi tegelik "
 "mälunõudlus on paar korda suurem)."
 
-#: ../proxy_wizard/Squid.pm:92
+#: ../proxy_wizard/Squid.pm:94
 msgid "Proxy Cache Size"
 msgstr "Vahendaja vahemälu suurus"
 
-#: ../proxy_wizard/Squid.pm:98 ../proxy_wizard/Squid.pm:151
-#: ../proxy_wizard/Squid.pm:164
+#: ../proxy_wizard/Squid.pm:100 ../proxy_wizard/Squid.pm:153
+#: ../proxy_wizard/Squid.pm:166
 msgid "Memory cache (MB):"
 msgstr "Vahemälu (MB):"
 
-#: ../proxy_wizard/Squid.pm:99 ../proxy_wizard/Squid.pm:152
-#: ../proxy_wizard/Squid.pm:165
+#: ../proxy_wizard/Squid.pm:101 ../proxy_wizard/Squid.pm:154
+#: ../proxy_wizard/Squid.pm:167
 msgid "Disk space (MB):"
 msgstr "Kettaruum (MB):"
 
-#: ../proxy_wizard/Squid.pm:104
+#: ../proxy_wizard/Squid.pm:106
 msgid "Access Control"
 msgstr "Ligipääsu kontroll"
 
-#: ../proxy_wizard/Squid.pm:104
+#: ../proxy_wizard/Squid.pm:106
 msgid ""
 "Choose the level that suits your needs. If you don't know, the Local Network "
 "level is usually the most appropriate. Beware that the All level may be not "
@@ -1751,12 +1741,12 @@ msgstr ""
 "Valige tase, mis vastab Teie vajadustele. Kui Te ei ole kindel, on enamasti "
 "kohane kohtvõrgu tase. Pange tähele, et tase 'Kõik' ei pruugi olla turvaline."
 
-#: ../proxy_wizard/Squid.pm:104
+#: ../proxy_wizard/Squid.pm:106
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Vahendajat võib seadistada erinevaid ligipääsu kontrolli tasemeid kasutades"
 
-#: ../proxy_wizard/Squid.pm:117
+#: ../proxy_wizard/Squid.pm:119
 msgid ""
 "You can use either a numeric format like \"192.168.1.0/255.255.255.0\" or a "
 "text format like \".domain.net\""
@@ -1764,7 +1754,7 @@ msgstr ""
 "Kasutada võib nii numbrilist vormingut (nt \"192.168.1.0/255.255.255.0\") "
 "kui ka tekstivormingut (nt \"domeen.ee\")."
 
-#: ../proxy_wizard/Squid.pm:122
+#: ../proxy_wizard/Squid.pm:124
 msgid ""
 "Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like "
 "\".domain.net\""
@@ -1772,7 +1762,7 @@ msgstr ""
 "Kasutada võib nii numbrilist vormingut (nt \"192.168.1.0/255.255.255.0\") "
 "kui ka tekstivormingut (nt \"domeen.ee\")"
 
-#: ../proxy_wizard/Squid.pm:127
+#: ../proxy_wizard/Squid.pm:129
 msgid ""
 "As an option, Squid can be configured in proxy cascading. You can add a new "
 "upper level proxy by specifying its hostname and port."
@@ -1781,11 +1771,11 @@ msgstr ""
 "ülemise taseme vahendaja, millele HTTP-päringud edasi suunatakse. Selleks "
 "peate määrama ülemise taseme vahendaja nime ja pordi."
 
-#: ../proxy_wizard/Squid.pm:127 ../proxy_wizard/Squid.pm:140
+#: ../proxy_wizard/Squid.pm:129 ../proxy_wizard/Squid.pm:142
 msgid "Cache hierarchy"
 msgstr "Vahendaja serverite hierarhia"
 
-#: ../proxy_wizard/Squid.pm:127
+#: ../proxy_wizard/Squid.pm:129
 msgid ""
 "You can safely select \"No upper level proxy\" if you don't need this "
 "feature."
@@ -1793,33 +1783,33 @@ msgstr ""
 "Võite julgelt valida \"Ülemise taseme vahendaja puudub\", kui Te seda ei "
 "vaja."
 
-#: ../proxy_wizard/Squid.pm:140
+#: ../proxy_wizard/Squid.pm:142
 msgid ""
 "Enter the qualified hostname (like \"cache.domain.net\") and the port of the "
 "proxy to use."
 msgstr ""
 "Sisestage sobilik nimi (nt \"cache.domeen.ee\") ja kasutatav vahendaja port."
 
-#: ../proxy_wizard/Squid.pm:142 ../proxy_wizard/Squid.pm:154
+#: ../proxy_wizard/Squid.pm:144 ../proxy_wizard/Squid.pm:156
 msgid "Upper level proxy hostname:"
 msgstr "Ülemise taseme vahendaja nimi:"
 
-#: ../proxy_wizard/Squid.pm:143 ../proxy_wizard/Squid.pm:155
+#: ../proxy_wizard/Squid.pm:145 ../proxy_wizard/Squid.pm:157
 msgid "Upper level proxy port:"
 msgstr "Ülemise taseme vahendaja port:"
 
-#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Configuring the Proxy"
 msgstr "Vahendaja seadistamine"
 
-#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja vahendaja seadistamiseks:"
 
-#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
-#: ../samba_wizard/Samba.pm:212 ../web_wizard/Apache.pm:131
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
+#: ../samba_wizard/Samba.pm:218 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1827,23 +1817,23 @@ msgstr ""
 "Nende väärtustega nõustumiseks ja serveri seadistamiseks vajutage nupule "
 "'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta."
 
-#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
+#: ../proxy_wizard/Squid.pm:152 ../proxy_wizard/Squid.pm:165
 msgid "Port:"
 msgstr "Port:"
 
-#: ../proxy_wizard/Squid.pm:153 ../proxy_wizard/Squid.pm:166
+#: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
 msgid "Access Control:"
 msgstr "Ligipääsu kontroll:"
 
-#: ../proxy_wizard/Squid.pm:172
+#: ../proxy_wizard/Squid.pm:174
 msgid "The wizard have successfully configured your proxy server."
 msgstr "Nõustaja seadistas edukalt Teie vahendaja serveri."
 
-#: ../proxy_wizard/Squid.pm:225
+#: ../proxy_wizard/Squid.pm:227
 msgid "Configuring your system as a Proxy server..."
 msgstr "Süsteemi seadistamine vahendaja serveriks..."
 
-#: ../proxy_wizard/Squid.pm:225
+#: ../proxy_wizard/Squid.pm:227
 msgid "Squid proxy"
 msgstr "Squid vahendaja"
 
@@ -2237,7 +2227,7 @@ msgstr "Samba peab teadma Windowsi töögruppi, mida ta teenindab."
 msgid "Workgroup"
 msgstr "Töögrupp"
 
-#: ../samba_wizard/Samba.pm:81 ../samba_wizard/Samba.pm:220
+#: ../samba_wizard/Samba.pm:81 ../samba_wizard/Samba.pm:226
 msgid "Workgroup:"
 msgstr "Töögrupp:"
 
@@ -2350,7 +2340,7 @@ msgstr ""
 "tuleb kasutada sinna pääsemise parooli määramiseks smbpasswordi."
 
 #: ../samba_wizard/Samba.pm:153 ../samba_wizard/Samba.pm:159
-#: ../samba_wizard/Samba.pm:223
+#: ../samba_wizard/Samba.pm:229
 msgid "Shared directory:"
 msgstr "Jagatud kataloog:"
 
@@ -2358,11 +2348,19 @@ msgstr "Jagatud kataloog:"
 msgid "Type the path of the directory you want being shared."
 msgstr "Sisestage kataloogi asukoht, mida soovite jagada."
 
-#: ../samba_wizard/Samba.pm:169
+#: ../samba_wizard/Samba.pm:160
+msgid "Create shared directory if it doesn't exists"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:165
+msgid "Failed to create directory."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:175
 msgid "File permissions"
 msgstr "Faili õigused"
 
-#: ../samba_wizard/Samba.pm:169
+#: ../samba_wizard/Samba.pm:175
 msgid ""
 "Type users or group separated by a comma (groups must be preceded by a '@') "
 "like this :\n"
@@ -2372,59 +2370,59 @@ msgstr ""
 "'@'), näiteks :\n"
 "root, fred, @users, @wheel igat liiki õiguse jaoks."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:182
 msgid "Read list:"
 msgstr "lugemisõigusega:"
 
-#: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
+#: ../samba_wizard/Samba.pm:182 ../samba_wizard/Samba.pm:183
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:177
+#: ../samba_wizard/Samba.pm:183
 msgid "Write list:"
 msgstr "kirjutamisõigusega:"
 
-#: ../samba_wizard/Samba.pm:187
+#: ../samba_wizard/Samba.pm:193
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Valige, millised printerid on tuntud kasutajatele kättesaadavad"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:200
 msgid "Enable all printers"
 msgstr "Kõigi printerite lubamine"
 
-#: ../samba_wizard/Samba.pm:212
+#: ../samba_wizard/Samba.pm:218
 msgid "Configuring Samba"
 msgstr "Samba seadistamine"
 
-#: ../samba_wizard/Samba.pm:212
+#: ../samba_wizard/Samba.pm:218
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Nõustaja kogus järgmised andmed, mida on vaja Samba seadistamiseks."
 
-#: ../samba_wizard/Samba.pm:221
+#: ../samba_wizard/Samba.pm:227
 msgid "Server banner:"
 msgstr "Serveri nimetus:"
 
-#: ../samba_wizard/Samba.pm:222
+#: ../samba_wizard/Samba.pm:228
 msgid "File sharing:"
 msgstr "Failijagamine:"
 
-#: ../samba_wizard/Samba.pm:224
+#: ../samba_wizard/Samba.pm:230
 msgid "Print server:"
 msgstr "Printserver:"
 
-#: ../samba_wizard/Samba.pm:225
+#: ../samba_wizard/Samba.pm:231
 msgid "Home:"
 msgstr "Kodukataloog:"
 
-#: ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:232
 msgid "Printers:"
 msgstr "Printerid:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:238
 msgid "The wizard successfully configured your Samba server."
 msgstr "Nõustaja seadistas edukalt Teie Samba-serveri."
 
-#: ../samba_wizard/Samba.pm:478
+#: ../samba_wizard/Samba.pm:510
 msgid "Configuring your Samba server..."
 msgstr "Samba serveri seadistamine..."
 
@@ -2664,3 +2662,116 @@ msgstr "Apache server"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Süsteemi seadistamine Apache serveriks..."
+
+#~ msgid "Apache web server"
+#~ msgstr "Apache veebiserver"
+
+#~ msgid "Copying data to destination directory, can take a while...."
+#~ msgstr "Andmete kopeerimine sihtkataloogi, võib võtta veidi aega..."
+
+#~ msgid "Install Server"
+#~ msgstr "Paigaldusserver"
+
+#~ msgid "Setup a ldap server."
+#~ msgstr "LDAP serveri seadistamine."
+
+#~ msgid "which operation on LDAP:"
+#~ msgstr "Mida soovite ette võtta:"
+
+#~ msgid "Add data in LDAP"
+#~ msgstr "Andmete lisamine LDAP-ile"
+
+#~ msgid "uid, gid, home directory, "
+#~ msgstr "UID, GUID, kodukataloog, "
+
+#~ msgid "Last Name:"
+#~ msgstr "Perekonnanimi:"
+
+#~ msgid "Home Directory:"
+#~ msgstr "Kodukataloog:"
+
+#~ msgid "Login shell:"
+#~ msgstr "Sisselogimisshell:"
+
+#~ msgid "uid number:"
+#~ msgstr "UID:"
+
+#~ msgid "Group ID:"
+#~ msgstr "Grupi ID:"
+
+#~ msgid ""
+#~ "LDAP RootDSE\n"
+#~ "\n"
+#~ "example:\n"
+#~ "obelx.nux.com\n"
+#~ "\n"
+#~ "will be in ldap config:\n"
+#~ "\n"
+#~ "dc=obelx,dc=nux,dc=com\n"
+#~ "\n"
+#~ "RootDN is the manager of your ldap server."
+#~ msgstr ""
+#~ "LDAP RootDSE\n"
+#~ "\n"
+#~ "Näide:\n"
+#~ "obelx.nux.com\n"
+#~ "\n"
+#~ "võtab LDAP seadistuses kuju\n"
+#~ "\n"
+#~ "dc=obelx,dc=nux,dc=com\n"
+#~ "\n"
+#~ "RootDN on Teie LDAP serveri haldur."
+
+#~ msgid "RootDSE"
+#~ msgstr "RootDSE"
+
+#~ msgid "RootDN"
+#~ msgstr "RootDN"
+
+#~ msgid "Default OU"
+#~ msgstr "Vaikimisi üksus"
+
+#~ msgid "Ok Now add entry in LDAP"
+#~ msgstr "Olgu, nüüd lisatakse kirje LDAP-ile"
+
+#~ msgid "Home directory:"
+#~ msgstr "Kodukataloog:"
+
+#~ msgid "Container:"
+#~ msgstr "Konteiner"
+
+#~ msgid "shadowMax:"
+#~ msgstr "shadowMax:"
+
+#~ msgid "shadowMin:"
+#~ msgstr "shadowMin:"
+
+#~ msgid "shadowWarning:"
+#~ msgstr "shadowWarning:"
+
+#~ msgid "shadowInactive:"
+#~ msgstr "shadowInactive:"
+
+#~ msgid "shadowExpire:"
+#~ msgstr "shadowExpire:"
+
+#~ msgid "objectClass:"
+#~ msgstr "objectClass:"
+
+#~ msgid "Ok Now building your LDAP configuration"
+#~ msgstr "Olgu, nüüd tekitame Teie LDAP seadistuse"
+
+#~ msgid "Error in Home directory"
+#~ msgstr "Viga kodukataloogi määramisel"
+
+#~ msgid "Error, pass could not be empty"
+#~ msgstr "Viga, parool tuleb anda"
+
+#~ msgid "Error in Login shell"
+#~ msgstr "Viga shelli määramisel"
+
+#~ msgid "Please choose a correct one"
+#~ msgstr "Palun valige korrektne variant"
+
+#~ msgid "Please Should be a number"
+#~ msgstr "See peab olema number"