Updated POT file.

1 files changed, 1820 insertions, 564 deletions

diff --git a/po/fi.po b/po/fi.po
index 80b6d440..12be4512 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fi - LE2005 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-03 09:17+0100\n"
+"POT-Creation-Date: 2005-06-13 22:56+0800\n"
 "PO-Revision-Date: 2005-03-30 22:18-0500\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -24,33 +24,32 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "asetusvelho"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:137 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Varoitus."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:142
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
-#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
-#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
-#: ../web_wizard/Apache.pm:125
+#: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Virhe."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
-#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
-#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
-#: ../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:243 ../web_wizard/Apache.pm:146
+#: ../ftp_wizard/Proftpd.pm:169 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
+#: ../postfix_wizard/Postfix.pm:264 ../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:345
+#: ../samba_wizard/Sambaprint.pm:134 ../samba_wizard/Sambashare.pm:413
+#: ../samba_wizard/Sambashare.pm:421 ../samba_wizard/Sambashare.pm:426
+#: ../samba_wizard/Sambashare.pm:431 ../sshd_wizard/Sshd.pm:188
+#: ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Onnittelut"
 
@@ -84,7 +83,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Tämä velho auttaa sinua lisäämään asiakkaan paikalliseen DNS-palveluun."
+msgstr ""
+"Tämä velho auttaa sinua lisäämään asiakkaan paikalliseen DNS-palveluun."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -122,6 +122,7 @@ msgstr "Koneen IP-osoite:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
 #: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
+#: ../nisautofs_wizard/Nisautofs.pm:86
 msgid "Warning"
 msgstr "Varoitus"
 
@@ -131,15 +132,30 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../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:111 ../ldap_wizard/Ldap.pm:113
-#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
-#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
-#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
-#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
-#: ../postfix_wizard/Postfix.pm:88
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:82
+#: ../drakwizard.pl:108 ../drakwizard.pl:159 ../drakwizard.pl:163
+#: ../ftp_wizard/Proftpd.pm:93 ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:115 ../ftp_wizard/Proftpd.pm:133
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:160 ../postfix_wizard/Postfix.pm:162
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:181
+#: ../postfix_wizard/Postfix.pm:197 ../postfix_wizard/Postfix.pm:215
+#: ../samba_wizard/Samba.pm:150 ../samba_wizard/Samba.pm:180
+#: ../samba_wizard/Samba.pm:224 ../samba_wizard/Samba.pm:265
+#: ../samba_wizard/Samba.pm:269 ../samba_wizard/Samba.pm:273
+#: ../samba_wizard/Samba.pm:277 ../samba_wizard/Samba.pm:294
+#: ../samba_wizard/Samba.pm:310 ../samba_wizard/Sambashare.pm:153
+#: ../samba_wizard/Sambashare.pm:201 ../samba_wizard/Sambashare.pm:208
+#: ../samba_wizard/Sambashare.pm:247 ../samba_wizard/Sambashare.pm:252
+#: ../samba_wizard/Sambashare.pm:255 ../samba_wizard/Sambashare.pm:258
+#: ../samba_wizard/Sambashare.pm:311 ../samba_wizard/Sambashare.pm:317
+#: ../samba_wizard/Sambashare.pm:513 ../samba_wizard/Sambashare.pm:590
+#: ../sshd_wizard/Sshd.pm:89 ../sshd_wizard/Sshd.pm:146
 msgid "Error"
 msgstr "Virhe"
 
@@ -188,8 +204,9 @@ msgid ""
 "You need to readjust your hostname. 'localhost' is not a correct hostname "
 "for a DNS server. Hostname must be a FQDN: Fully Qualified Domain Name"
 msgstr ""
-"Sinun täytyy uudelleenmäärittää konenimesi. verkkoaluenimesi. "
-"'localhost' ei ole kelvollinen konenimi DNS palvelimelle. Konenimi pitää olla FQDN: Fully Qualified Domain Name"
+"Sinun täytyy uudelleenmäärittää konenimesi. verkkoaluenimesi. 'localhost' ei "
+"ole kelvollinen konenimi DNS palvelimelle. Konenimi pitää olla FQDN: Fully "
+"Qualified Domain Name"
 
 #: ../common/Wizcommon.pm:60
 msgid ""
@@ -202,7 +219,8 @@ msgstr ""
 "olla FQDN. Käytä drakconnect muokataaksesi sitä."
 
 #: ../common/Wizcommon.pm:98
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Komento suoritetaan vielä. Haluatko tappaa sitä ja lopettaa velhon?"
 
 #: ../common/Wizcommon.pm:115
@@ -294,23 +312,21 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan DHCP-palvelusi "
 "asettamiseksi:"
 
-#: ../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:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
-#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
-#: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:149
+#: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
+#: ../ftp_wizard/Proftpd.pm:152 ../ftp_wizard/Proftpd.pm:153
+#: ../ftp_wizard/Proftpd.pm:154 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../web_wizard/Apache.pm:133
+#: ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "Poistettu käytöstä"
 
-#: ../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:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
-#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
-#: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:149
+#: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
+#: ../ftp_wizard/Proftpd.pm:152 ../ftp_wizard/Proftpd.pm:153
+#: ../ftp_wizard/Proftpd.pm:154 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../web_wizard/Apache.pm:133
+#: ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "Käytössä"
 
@@ -323,16 +339,18 @@ msgid "The wizard successfully configured the DHCP services."
 msgstr "Velho asetti palvelimesi DHCP-palvelun onnistuneesti."
 
 #: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
-#: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
+#: ../ftp_wizard/Proftpd.pm:175 ../nfs_wizard/NFS.pm:107
+#: ../nisautofs_wizard/Nisautofs.pm:120 ../postfix_wizard/Postfix.pm:273
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:354 ../samba_wizard/Sambaprint.pm:143
+#: ../samba_wizard/Sambashare.pm:436 ../sshd_wizard/Sshd.pm:194
+#: ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Epäonnistui"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:180
+#: ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Käyynistä drakwizard uudelleen ja yritä muuttaa joitakin parametreja."
 
@@ -375,11 +393,6 @@ msgstr ""
 "tarjoaa paikallisen DNS-palvelun paikallisille työasemille, sekä ei-"
 "paikallisten hakujen edelleenlähettämisen ulkoiselle DNS palvelimelle."
 
-#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
-#: ../pxe_wizard/Pxe.pm:126
-msgid "What do you want to do:"
-msgstr "Mitä haluat tehdä:"
-
 #: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "DNS-palvelimen käyttöliittymä "
@@ -478,7 +491,8 @@ msgid "Default domain name to search:"
 msgstr "Oletusverkkoalue jossa etsitään:"
 
 #: ../dns_wizard/Bind.pm:176
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Tämä ei ole oikeanmuotoinen osoite edelleenlähettäjällesi... paina "
 "'seuraava' jatkaaksesi"
@@ -522,7 +536,8 @@ msgstr ""
 "suorita DNS velho: Isäntä DNS-palvelin."
 
 #: ../dns_wizard/Bind.pm:211
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Näyttää siltä ettei tämä kone ole DNS Isäntä, vain ainoastaan orjana. Joten "
 "en voi lisätä/poistaa konetta."
@@ -552,7 +567,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Asiakas näillä tunnisteilla poistetaan DNS-palvelusta"
 
 #: ../dns_wizard/Bind.pm:243
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "DNS-palvelinta ollaan asettamassa seuraavilla asetuksilla:"
 
 #: ../dns_wizard/Bind.pm:245
@@ -607,51 +623,64 @@ msgstr "NFS-palvelin"
 msgid "Mail server"
 msgstr "Sähköpostipalvelin"
 
-#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:86
 msgid "FTP server"
 msgstr "FTP-palvelin"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:451
+#: ../samba_wizard/Sambaprint.pm:269
 msgid "Samba server"
 msgstr "Samba-palvelin"
 
 #: ../drakwizard.pl:48
+#, fuzzy
+msgid "Manage Samba share"
+msgstr "Käytössä olevat Samba-palvelut"
+
+#: ../drakwizard.pl:49
+#, fuzzy
+msgid "Manage Samba print"
+msgstr "Käytössä olevat Samba-palvelut"
+
+#: ../drakwizard.pl:50
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
-#: ../drakwizard.pl:49
+#: ../drakwizard.pl:51
+#, fuzzy
+msgid "OpenSSH daemon configuration"
+msgstr "Näytä LDAP asetukset"
+
+#: ../drakwizard.pl:52
 msgid "Time server"
 msgstr "Aikapalvelin"
 
-#: ../drakwizard.pl:50
+#: ../drakwizard.pl:53
 msgid "Apache2 web server"
 msgstr "Apache2 WWW-palvelin:"
 
-#: ../drakwizard.pl:51
+#: ../drakwizard.pl:54
 msgid "NIS server autofs map"
 msgstr "Nis palvelin + Autofs map"
 
-#: ../drakwizard.pl:52
-msgid "Mandrakelinux Install server"
+#: ../drakwizard.pl:55
+#, fuzzy
+msgid "Linux Install server"
 msgstr "Mandrakelinux Asennuspalvelin"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
-msgid "Kolab server"
-msgstr "Kolab-palvelin"
-
-#: ../drakwizard.pl:54
+#: ../drakwizard.pl:56
 msgid "ldap server"
 msgstr "LDAP palvelin"
 
-#: ../drakwizard.pl:68
+#: ../drakwizard.pl:70
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard velhojen valinta"
 
-#: ../drakwizard.pl:69
+#: ../drakwizard.pl:71
 msgid "Please select a wizard"
 msgstr "Ole hyvä ja valitse velho"
 
-#: ../drakwizard.pl:157
+#: ../drakwizard.pl:159
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -660,27 +689,27 @@ msgstr ""
 "%s ei ole asennettu.\n"
 "Paina \"Seuraava\" asentaaksesi tai \"Poistu\" lopettaaksesi."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:163 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
-#: ../ftp_wizard/Proftpd.pm:34
+#: ../ftp_wizard/Proftpd.pm:39
 msgid "FTP wizard"
 msgstr "FTP velho"
 
-#: ../ftp_wizard/Proftpd.pm:73
+#: ../ftp_wizard/Proftpd.pm:80
 msgid "FTP server configuration wizard"
 msgstr "FTP-palvelimen asetusvelho"
 
-#: ../ftp_wizard/Proftpd.pm:73
+#: ../ftp_wizard/Proftpd.pm:80
 msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Tämä velho auttaa sinua asettamaan FTP-palvelimen verkollesi."
 
-#: ../ftp_wizard/Proftpd.pm:79
+#: ../ftp_wizard/Proftpd.pm:86
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Valitse FTP-palvelun tyyppi jota haluat käyttää:"
 
-#: ../ftp_wizard/Proftpd.pm:79
+#: ../ftp_wizard/Proftpd.pm:86
 msgid ""
 "Your server can act as an FTP server toward your internal network (intranet) "
 "and as an FTP server for the Internet."
@@ -688,83 +717,114 @@ msgstr ""
 "Palvelimesi voi toimia FTP-palvelimena paikallisverkolle (intranet), sekä "
 "FTP-palvelimena Internetin käyttäjille."
 
-#: ../ftp_wizard/Proftpd.pm:81
+#: ../ftp_wizard/Proftpd.pm:88
 msgid "Enable the FTP server for the intranet"
 msgstr "Ota käyttöön FTP-palvelin paikallisverkolle"
 
-#: ../ftp_wizard/Proftpd.pm:82
+#: ../ftp_wizard/Proftpd.pm:89
 msgid "Enable the FTP server for the Internet"
 msgstr "Ota käyttöön FTP-palvelin Internetiin."
 
-#: ../ftp_wizard/Proftpd.pm:88
+#: ../ftp_wizard/Proftpd.pm:93
+msgid ""
+"Please choose whether to allow a connection to FTP server from internal or "
+"external hosts."
+msgstr ""
+"Ole hyvä ja valitse jos sallitan FTP yhteyksiä paikallisista ja etä-koneista."
+
+#: ../ftp_wizard/Proftpd.pm:100
 msgid "Admin email: email address of the FTP administrator."
 msgstr "Ylläpitäjän sähköposti: FTP ylläpitäjän sähköpostiosoite."
 
-#: ../ftp_wizard/Proftpd.pm:88
-msgid "Allow FTP resume: allow resume upload or download on FTP server."
-msgstr "Salli jatkettava FTP: salli jatkettava siirto (ylös/alas) FTP-palvelimella."
-
-#: ../ftp_wizard/Proftpd.pm:88
-msgid "Allow FXP: allow file transfer via another FTP."
-msgstr "Salli FXP: salli tiedostonsiirtoa toisten FTP-palvelimien kautta."
-
-#: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot home user: users will only see their home directory."
-msgstr "Aseta käyttäjät Chroot:iin: Rajoittaa käyttäjät omiin kotihakemistoihin."
-
-#: ../ftp_wizard/Proftpd.pm:88
-msgid "FTP Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "FTP Proftpd server options, step 1"
 msgstr "Ftp Proftpd palvelinasetukset"
 
-#: ../ftp_wizard/Proftpd.pm:88
+#: ../ftp_wizard/Proftpd.pm:100
 msgid "Permit root login: allow root to log on FTP server."
-msgstr "Salli root login: sallii kirjautuminen root-tunnuksella FTP-palvelimelle."
+msgstr ""
+"Salli root login: sallii kirjautuminen root-tunnuksella FTP-palvelimelle."
+
+#: ../ftp_wizard/Proftpd.pm:106
+#, fuzzy
+msgid "Server name:"
+msgstr "Palvelimen konenimi:"
 
-#: ../ftp_wizard/Proftpd.pm:96
+#: ../ftp_wizard/Proftpd.pm:107
 msgid "Admin email:"
 msgstr "Ylläpitäjän sähköposti:"
 
-#: ../ftp_wizard/Proftpd.pm:97
+#: ../ftp_wizard/Proftpd.pm:108 ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:180
 msgid "Permit root login:"
 msgstr "Salli kirjautuminen root tunnuksella:"
 
-#: ../ftp_wizard/Proftpd.pm:98
+#: ../ftp_wizard/Proftpd.pm:112
+msgid ""
+"I can't find bash in list of shells! It seems you have modified it by hand! "
+"Please correct."
+msgstr "En löydä bash komentotulkkien listasta, ole hyvä ja korjaa."
+
+#: ../ftp_wizard/Proftpd.pm:115
+#, fuzzy
+msgid "Need a server name"
+msgstr "Uutispalvelimen nimi:"
+
+#: ../ftp_wizard/Proftpd.pm:120
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
+msgstr ""
+"Salli jatkettava FTP: salli jatkettava siirto (ylös/alas) FTP-palvelimella."
+
+#: ../ftp_wizard/Proftpd.pm:120
+msgid "Allow FXP: allow file transfer via another FTP."
+msgstr "Salli FXP: salli tiedostonsiirtoa toisten FTP-palvelimien kautta."
+
+#: ../ftp_wizard/Proftpd.pm:120
+msgid "Chroot home user: users will only see their home directory."
+msgstr ""
+"Aseta käyttäjät Chroot:iin: Rajoittaa käyttäjät omiin kotihakemistoihin."
+
+#: ../ftp_wizard/Proftpd.pm:120
+#, fuzzy
+msgid "FTP server options, step 2"
+msgstr "Ftp Proftpd palvelinasetukset"
+
+#: ../ftp_wizard/Proftpd.pm:128 ../ftp_wizard/Proftpd.pm:157
+#, fuzzy
+msgid "FTP Port:"
+msgstr "Portti:"
+
+#: ../ftp_wizard/Proftpd.pm:129
 msgid "Chroot home user:"
 msgstr "aseta kotikäyttäjät chroot:iin:"
 
-#: ../ftp_wizard/Proftpd.pm:99
+#: ../ftp_wizard/Proftpd.pm:130
 msgid "Allow FTP resume:"
 msgstr "Salli jatkettava FTP:"
 
-#: ../ftp_wizard/Proftpd.pm:100
+#: ../ftp_wizard/Proftpd.pm:131
 msgid "Allow FXP:"
 msgstr "Salli FXP:"
 
-#: ../ftp_wizard/Proftpd.pm:106
+#: ../ftp_wizard/Proftpd.pm:133
+#, fuzzy
+msgid "FTP Port should be a number."
+msgstr "Pitäisi olla numero"
+
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "You are in DHCP, server may not work with your configuration."
 msgstr "Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
 
-#: ../ftp_wizard/Proftpd.pm:111
-msgid ""
-"Please choose whether to allow a connection to FTP server from internal or "
-"external hosts."
-msgstr "Ole hyvä ja valitse jos sallitan FTP yhteyksiä paikallisista ja etä-koneista."
-
-#: ../ftp_wizard/Proftpd.pm:115
-msgid ""
-"I can't find bash in list of shells! It seems you have modified it by hand! "
-"Please correct."
-msgstr "En löydä bash komentotulkkien listasta, ole hyvä ja korjaa."
-
-#: ../ftp_wizard/Proftpd.pm:121
+#: ../ftp_wizard/Proftpd.pm:142
 msgid "Sorry, you must be root to do this..."
 msgstr "Valitan, sinun pitää olla pääkäyttäjä tehdäksesi tämän..."
 
-#: ../ftp_wizard/Proftpd.pm:126
+#: ../ftp_wizard/Proftpd.pm:147
 msgid "Configuring the FTP server"
 msgstr "Asetetaan FTP-palvelin"
 
-#: ../ftp_wizard/Proftpd.pm:126
+#: ../ftp_wizard/Proftpd.pm:147
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "server"
@@ -772,7 +832,7 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan FTP-palvelimesi "
 "asettamiseksi"
 
-#: ../ftp_wizard/Proftpd.pm:126
+#: ../ftp_wizard/Proftpd.pm:147
 msgid ""
 "To accept those values, and configure your server, click the next button or "
 "use the back button to correct them"
@@ -780,51 +840,50 @@ msgstr ""
 "Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
 "'Edellinen' korjataksesi asetuksia"
 
-#: ../ftp_wizard/Proftpd.pm:136
+#: ../ftp_wizard/Proftpd.pm:158
 msgid "Intranet FTP server:"
 msgstr "Intranet FTP Palvelin:"
 
-#: ../ftp_wizard/Proftpd.pm:137
+#: ../ftp_wizard/Proftpd.pm:159
 msgid "Internet FTP server:"
 msgstr "Internet FTP Palvelin:"
 
-#: ../ftp_wizard/Proftpd.pm:138
-msgid "Admin email"
-msgstr "Ylläpitäjän sähköposti"
-
-#: ../ftp_wizard/Proftpd.pm:139
+#: ../ftp_wizard/Proftpd.pm:160
 msgid "Permit root Login"
 msgstr "Salli kirjautuminen root tunnuksella"
 
-#: ../ftp_wizard/Proftpd.pm:140
+#: ../ftp_wizard/Proftpd.pm:161
 msgid "Chroot Home user"
 msgstr "aseta kotikäyttäjät chroot:iin"
 
-#: ../ftp_wizard/Proftpd.pm:141
+#: ../ftp_wizard/Proftpd.pm:162
 msgid "Allow FTP resume"
 msgstr "Salli jatkettava FTP"
 
-#: ../ftp_wizard/Proftpd.pm:142
+#: ../ftp_wizard/Proftpd.pm:163
 msgid "Allow FXP"
 msgstr "Salli FXP"
 
-#: ../ftp_wizard/Proftpd.pm:148
+#: ../ftp_wizard/Proftpd.pm:169
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Velho asetti Intranet/Internet FTP-palvelimesi onnistuneesti"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
-#: ../pxe_wizard/Pxe.pm:332
+#: ../ftp_wizard/Proftpd.pm:176 ../postfix_wizard/Postfix.pm:274
+#: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:355
+#: ../samba_wizard/Sambaprint.pm:144 ../samba_wizard/Sambashare.pm:437
+#: ../sshd_wizard/Sshd.pm:195
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Käyynistä drakwizard uudelleen ja yritä muuttaa joitakin parametreja."
 
 #: ../installsrv_wizard/Installsrv.pm:53
-msgid "Configure a Mandrakelinux install server (via NFS and http)"
+#, fuzzy
+msgid "Configure an install server (via NFS and http)"
 msgstr "Aseta Mandrakelinux asennuspalvelinta (käyttäen NFS ja http)"
 
 #: ../installsrv_wizard/Installsrv.pm:53
+#, fuzzy
 msgid ""
-"Easily configure a Mandrakelinux server installation directory, with NFS and "
-"HTTP access."
+"Easily configure a server installation directory, with NFS and HTTP access."
 msgstr ""
 "Aseta helposti Mandrakelinux asennuspalvelimen hakemisto, käyttäen NFS ja "
 "HTTP yhteyttä."
@@ -838,9 +897,10 @@ msgid "Install server configuration"
 msgstr "Asenna palvelinasetukset"
 
 #: ../installsrv_wizard/Installsrv.pm:58
+#, fuzzy
 msgid ""
-"Path to data: specify your source directory, should be base of a "
-"Mandrakelinux installation."
+"Path to data: specify your source directory, should be base of a Linux "
+"installation."
 msgstr ""
 "Lähdehakemisto: määritä lähdehakemistosi, sen pitää olla Mandrakelinux "
 "asennuksen juurihakemisto."
@@ -854,9 +914,10 @@ msgid "ie use: /var/install/mdk-release"
 msgstr "käytä: /var/install/mdk-release"
 
 #: ../installsrv_wizard/Installsrv.pm:77
+#, fuzzy
 msgid ""
-"Error, the source path must be a directory with full Mandrakelinux "
-"installation directory."
+"Error, the source path must be a directory with full Linux installation "
+"directory."
 msgstr ""
 "Virhe, Lähdehakemisto pitää olla hakemisto jossa on täydellinen "
 "Mandrakelinux asennushakemisto."
@@ -877,20 +938,30 @@ msgstr "Ota käyttöön NFS asennuspalvelin"
 msgid "Enable HTTP install server:"
 msgstr "Ota käyttöön HTTP asennuspalvelin:"
 
-#: ../installsrv_wizard/Installsrv.pm:100
+#: ../installsrv_wizard/Installsrv.pm:101
 msgid "Configuring your system, please wait..."
 msgstr "Asetetaan järjestelmäsi, odota hetki..."
 
-#: ../installsrv_wizard/Installsrv.pm:104
+#: ../installsrv_wizard/Installsrv.pm:105
+#, fuzzy
 msgid ""
-"Congratulations, Mandrakelinux 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 install Mandrakelinux through a network."
+"Congratulations, 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 "
+"install Linux through a network."
 msgstr ""
 "Onnittelut, Mandrakelinux asennuspalvelin on nyt valmis. Voit nyt asettaa "
 "DHCP-palvelinta PXE-tuella, ja PXE-palvelinta. Sen jälkeen on helppoa "
 "asentaa Mandrakelinux verkon kautta."
 
+#: ../installsrv_wizard/Installsrv.pm:150
+#, fuzzy
+msgid "Configuring your system as Linux install server..."
+msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
+
+#: ../installsrv_wizard/Installsrv.pm:150
+msgid "Copying data"
+msgstr ""
+
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
 msgstr "Kolab asetusvelho"
@@ -929,7 +1000,7 @@ msgstr "Anna Kolab-palvelimen hallintatilin salasanaa."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Salasana ei täsmää, tai tyhjää salasanaa, ole hyvä ja korjaa."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -941,7 +1012,7 @@ msgstr "Salasana uudestaan:"
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Kolab-palvelinta asetetaan nyt näillä parametreilla."
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:154
 msgid "Hostname:"
 msgstr "Konenimi:"
 
@@ -969,23 +1040,27 @@ msgstr "Asennetaan Kolab-palvelinta järjestelmääsi..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Asetetaan järjestelmäsi Kolab-palvelinta..."
 
-#: ../ldap_wizard/Ldap.pm:31
+#: ../kolab_wizard/Kolab.pm:128
+msgid "Kolab server"
+msgstr "Kolab-palvelin"
+
+#: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "LDAP velho"
 
-#: ../ldap_wizard/Ldap.pm:91
+#: ../ldap_wizard/Ldap.pm:88
 msgid "Show Ldap configuration"
 msgstr "Näytä LDAP asetukset"
 
-#: ../ldap_wizard/Ldap.pm:92
+#: ../ldap_wizard/Ldap.pm:89
 msgid "Add user in Ldap server"
 msgstr "Lisää käyttäjää LDAP palvelimeen"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:90
 msgid "Delete Ldap configuration"
 msgstr "Poista LDAP asetukset"
 
-#: ../ldap_wizard/Ldap.pm:98
+#: ../ldap_wizard/Ldap.pm:95
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -993,82 +1068,82 @@ msgstr ""
 "Se on kevyt protokolla hakemistopalvelujen käyttämiseksi, erityisesti X.500 "
 "pohjaiset hakemistoplavelut."
 
-#: ../ldap_wizard/Ldap.pm:98
+#: ../ldap_wizard/Ldap.pm:95
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP tarkoittaa Lightweight Directory Access Protocol, eli kevyt hakemiston "
 "käyttöprotokolla."
 
-#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:95 ../ldap_wizard/Ldap.pm:103
 msgid "Ldap configuration wizard"
 msgstr "LDAP asetusvelho"
 
-#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
 msgid "You must setup an Ldap server first."
 msgstr "Sinun täytyy asettaa LDAP-palvelinta ensin."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:123
 msgid "Your choice:"
 msgstr "Valintasi:"
 
-#: ../ldap_wizard/Ldap.pm:131
+#: ../ldap_wizard/Ldap.pm:128
 msgid "Delete configuration"
 msgstr "Poista asetukset"
 
-#: ../ldap_wizard/Ldap.pm:131
+#: ../ldap_wizard/Ldap.pm:128
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Tallennetaan nykyinen pohja /root/ldap-sav.ldiff tiedostoon"
 
-#: ../ldap_wizard/Ldap.pm:136
+#: ../ldap_wizard/Ldap.pm:133
 msgid "LDAP Adding User"
 msgstr "LDAP lisää käyttäjää"
 
-#: ../ldap_wizard/Ldap.pm:139
+#: ../ldap_wizard/Ldap.pm:136
 #, perl-format
 msgid "User Created in: %s, %s"
 msgstr "Käyttäjä luotu kohteessa: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:138
 msgid "First Name:"
 msgstr "Etunimi:"
 
-#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
+#: ../ldap_wizard/Ldap.pm:139 ../ldap_wizard/Ldap.pm:218
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../ldap_wizard/Ldap.pm:143
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Login:"
 msgstr "Kirjautumistunnus:"
 
-#: ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:144
 msgid "You must enter a valid First Name."
 msgstr "Sinun täytyy antaa pätevä etunimi."
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid Name."
 msgstr "Sinun täytyy antaa pätevä nimi."
 
-#: ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid User Name."
 msgstr "Sinun täytyy antaa pätevä käyttäjänimi."
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:159
 msgid "LDAP User Password"
 msgstr "LDAP käyttäjä salasana"
 
-#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:162 ../ldap_wizard/Ldap.pm:163
 msgid "passwords must match"
 msgstr "salasanat pitää täsmää"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:163
 msgid "Password (again):"
 msgstr "Salasana (uudestaan):"
 
-#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:200
 msgid "You must enter a password for LDAP."
 msgstr "Sinun täytyy antaa LDAP salasanaa."
 
-#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Salasanat poikkeavat toisistaan"
 
@@ -1104,13 +1179,13 @@ msgstr "LDAP hakemistopuu"
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS nimitys käytetään LDAP hakemistopuun määrittelyyn."
 
-#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
-#: ../ldap_wizard/Ldap.pm:267
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:272
 msgid "LDAP directory tree:"
 msgstr "LDAP hakemistopuu:"
 
-#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
-#: ../ldap_wizard/Ldap.pm:268
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:273
 msgid "LDAP Administrator:"
 msgstr "LDAP Järjestelmävalvoja:"
 
@@ -1122,60 +1197,60 @@ msgstr "LDAP Salasana:"
 msgid "LDAP Password (again):"
 msgstr "LDAP Salasana (uudestaan):"
 
-#: ../ldap_wizard/Ldap.pm:194
+#: ../ldap_wizard/Ldap.pm:196
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Sinun täytyy antaa pätevän LDAP hakemistopuun."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:215
 msgid "Confirmation of the user to create"
 msgstr "Vahvistaminen käyttäjän luontiin"
 
-#: ../ldap_wizard/Ldap.pm:214
+#: ../ldap_wizard/Ldap.pm:219
 msgid "First name:"
 msgstr "Etunimi:"
 
-#: ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:220
 msgid "User Name:"
 msgstr "Käyttäjänimi:"
 
-#: ../ldap_wizard/Ldap.pm:216
+#: ../ldap_wizard/Ldap.pm:221
 msgid "Create in:"
 msgstr "Luo kohdassa:"
 
-#: ../ldap_wizard/Ldap.pm:222
+#: ../ldap_wizard/Ldap.pm:227
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Vahvistaminen LDAP palvelimen luontiin"
 
-#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
+#: ../ldap_wizard/Ldap.pm:232 ../ldap_wizard/Ldap.pm:274
 msgid "Users Container:"
 msgstr "Käyttäjät Säiliö:"
 
-#: ../ldap_wizard/Ldap.pm:238
+#: ../ldap_wizard/Ldap.pm:243
 msgid "The wizard successfully configured the LDAP."
 msgstr "Velho asetti LDAP onnistuneesti."
 
-#: ../ldap_wizard/Ldap.pm:244
+#: ../ldap_wizard/Ldap.pm:249
 msgid "Successfully added User"
 msgstr "käyttäjää lisätty onnistuneesti"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:258
 msgid "Error when adding user in Ldap database"
 msgstr "Virhe lisättäessä käyttäjää LDAP tietokantaan"
 
-#: ../ldap_wizard/Ldap.pm:262
+#: ../ldap_wizard/Ldap.pm:267
 msgid "Server already configured"
 msgstr "Palvelin on jo määritelty"
 
-#: ../ldap_wizard/Ldap.pm:262
+#: ../ldap_wizard/Ldap.pm:267
 msgid "You have already configured your Ldap Server"
 msgstr "Olet jo määrittänyt LDAP palvelintasi"
 
-#: ../ldap_wizard/Ldap.pm:421
+#: ../ldap_wizard/Ldap.pm:426
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Epäonnistui"
 
-#: ../ldap_wizard/Ldap.pm:421
+#: ../ldap_wizard/Ldap.pm:426
 msgid "Error!"
 msgstr "Virhe!"
 
@@ -1187,7 +1262,8 @@ msgstr "Uutispalvelin velho"
 msgid ""
 "This wizard will help you configuring the Internet News services for your "
 "network."
-msgstr "Tämä velho auttaa sinua asettamaan Internetin uutisryhmäpalvelun verkollesi."
+msgstr ""
+"Tämä velho auttaa sinua asettamaan Internetin uutisryhmäpalvelun verkollesi."
 
 #: ../news_wizard/Inn.pm:44
 msgid "Welcome to the News Wizard"
@@ -1261,7 +1337,7 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan\n"
 "Internet uutisryhmäpalvelun asettamiseksi:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:245
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1278,7 +1354,8 @@ msgid "Polling interval:"
 msgstr "Viestien noutoaikaväli:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "Velho asetti Internet uutisryhmäpalvelun onnistuneesti."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1286,6 +1363,7 @@ msgid "NFS Wizard"
 msgstr "NFS velho"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:39
+#: ../samba_wizard/Sambashare.pm:65
 msgid "All - No access restriction"
 msgstr "Kaikki - Ei käyttörajoituksia"
 
@@ -1315,13 +1393,11 @@ msgstr ""
 msgid "Directory:"
 msgstr "Hakemisto:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
-#: ../web_wizard/Apache.pm:119
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Annettua hakemistoa ei ole."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
-#: ../samba_wizard/Samba.pm:124
+#: ../nfs_wizard/NFS.pm:69
 msgid "Access control"
 msgstr "Käyttörajoitus"
 
@@ -1374,20 +1450,16 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Velho asetti NFS-palvelimen onnistuneesti."
 
-#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:70 ../nisautofs_wizard/Nisautofs.pm:75
 msgid "NIS server with autofs map"
 msgstr "Nis palvelin + Autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
-msgid "NIS client"
-msgstr "Nis-asiakas"
-
-#: ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:70
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
-msgstr "Aseta NIS-palvelinta + autofs map, auto.home ja auto.master tiedostoja."
+msgstr ""
+"Aseta NIS-palvelinta + autofs map, auto.home ja auto.master tiedostoja."
 
-#: ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:70
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1395,28 +1467,7 @@ msgstr ""
 "Asiakkaat voivat automattisesti littää kotihakemistonsa kun he kirjautuvat "
 "NIS-verkkoon."
 
-#: ../nisautofs_wizard/Nisautofs.pm:82
-msgid "What do you want to do?"
-msgstr "Mitä haluat tehdä?"
-
-#: ../nisautofs_wizard/Nisautofs.pm:87
-msgid "Configure computer to be a NIS client"
-msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi"
-
-#: ../nisautofs_wizard/Nisautofs.pm:87
-msgid "You just have to put nisdomain and nisserver."
-msgstr "Tarvitset vain asettaa nis-verkkoalue ja nis-palvelin"
-
-#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
-#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
-msgid "NIS server:"
-msgstr "NIS-palvelin:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:90
-msgid "NIS domain:"
-msgstr "Nis verkkoalue:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:75
 msgid ""
 "A NIS server is useful to create user, hostname database. The wizard builds "
 "autofs map, so it will provide the capabilities for NIS user to automount "
@@ -1427,7 +1478,7 @@ msgstr ""
 "kotihakemisto liitetään automaattisesti kuin ne kirjautuvat NIS "
 "asiakaskoneelle."
 
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:75
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1435,88 +1486,72 @@ msgstr ""
 "NIS koti: käyttäjien kotihakemisto NIS-palvelimella. Tämä hakemisto jaetaan "
 "NFS-palvelimen kautta."
 
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:75
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS verkkoalue: Käytettävä NIS verkkoalue (Yleensä sama kuin DNS "
 "verkkonimesi)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:75
 msgid "NIS server: name of your computer."
 msgstr "NIS palvelin: koneesi nimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:95
+msgid "NIS server:"
+msgstr "NIS-palvelin:"
+
+#: ../nisautofs_wizard/Nisautofs.pm:78 ../nisautofs_wizard/Nisautofs.pm:96
 msgid "Home NIS:"
 msgstr "NIS Kotihakemisto:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:79 ../nisautofs_wizard/Nisautofs.pm:97
 msgid "NIS domainname:"
 msgstr "NIS verkkoalueen nimi:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:105
+#: ../nisautofs_wizard/Nisautofs.pm:80
+#, fuzzy
+msgid "Create home NIS directory if it doesn't exist"
+msgstr "Luo jaettu hakemisto jos sitä ei ole olemassa"
+
+#: ../nisautofs_wizard/Nisautofs.pm:86
+msgid "Directory doesn't exist. Please create it manually."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:93
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Welho asettaa NIS palvelintasi + autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:110
+#: ../nisautofs_wizard/Nisautofs.pm:98
 msgid "NIS directory:"
 msgstr "NIS hakemisto:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:120
-msgid "NIS domainname: name of NIS domain."
-msgstr "NIS verkkoalueen nimi: NIS verkkoalueen nimi."
-
-#: ../nisautofs_wizard/Nisautofs.pm:120
-msgid "NIS server: hostname of the NIS server."
-msgstr "NIS palvelin: NIS-palvelimen konenimi."
-
-#: ../nisautofs_wizard/Nisautofs.pm:120
-msgid ""
-"The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding information."
-msgstr ""
-"YPBIND demoni löytää NIS verkkoalueiden palvelimet ja hallitsee NIS-"
-"liitoksien tietoja."
-
-#: ../nisautofs_wizard/Nisautofs.pm:129
-msgid "Error: should be a directory."
-msgstr "Virhe, Pitää olla hakemisto."
-
-#: ../nisautofs_wizard/Nisautofs.pm:133
+#: ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Virhe, nis-verkkoaluenimi ei saa olla 'none' tai 'localdomain'"
 
-#: ../nisautofs_wizard/Nisautofs.pm:133
+#: ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Please adjust it."
 msgstr "Ole hyvä ja korjaa sitä."
 
-#: ../nisautofs_wizard/Nisautofs.pm:139
-msgid "The wizard successfully configured your machine to be a NIS client."
-msgstr "Velho asetti koneesi NIS asiakkaaksi onnistuneesti."
-
-#: ../nisautofs_wizard/Nisautofs.pm:146
+#: ../nisautofs_wizard/Nisautofs.pm:114
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Velho asetti koneesi NIS-palvelimeksi + autofs onnistuneesti."
 
-#: ../nisautofs_wizard/Nisautofs.pm:307
+#: ../nisautofs_wizard/Nisautofs.pm:276
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Asetetaan järjestelmäsi Nis+Autofs(nfs) palvelimeksi ..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:307
+#: ../nisautofs_wizard/Nisautofs.pm:276
 msgid "NIS with Autofs map"
 msgstr "Nis palvelin + Autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:336
-msgid "Configuring your system as NIS client ..."
-msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi ..."
-
-#: ../postfix_wizard/Postfix.pm:39
+#: ../postfix_wizard/Postfix.pm:50
 msgid "Postfix wizard"
 msgstr "Postfix velho"
 
-#: ../postfix_wizard/Postfix.pm:49
+#: ../postfix_wizard/Postfix.pm:89
 msgid ""
 "Error, can't find your hostname in /etc/hosts. Exiting. Please launch "
 "drakconnect and choose static IP address."
@@ -1524,169 +1559,314 @@ msgstr ""
 "Virhe, konenimesi ei löytynyt tiedostosta /etc/hosts. Lopetetaan. Ole hyvä "
 "ja suorita drakconnect ja valitse kiinteä IP-osoite."
 
-#: ../postfix_wizard/Postfix.pm:59
-msgid "External mail server"
+#: ../postfix_wizard/Postfix.pm:99
+#, fuzzy
+msgid "Main mail server"
+msgstr "Sähköpostipalvelin"
+
+#: ../postfix_wizard/Postfix.pm:100
+#, fuzzy
+msgid "Relay mail server"
 msgstr "Ulkoinen sähköpostipalvelin"
 
-#: ../postfix_wizard/Postfix.pm:60
-msgid "Internal mail server"
-msgstr "Sisäinen sähköpostipalvelin"
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Sambashare.pm:70
+#: ../sshd_wizard/Sshd.pm:64
+msgid "Newbie - classical options"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:105 ../samba_wizard/Sambashare.pm:71
+msgid "Expert - advanced options"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:66
+#: ../postfix_wizard/Postfix.pm:112
 msgid "Internet mail configuration wizard"
 msgstr "Internet sähköpostin asetusvelho"
 
-#: ../postfix_wizard/Postfix.pm:66
+#: ../postfix_wizard/Postfix.pm:112
+#, fuzzy
 msgid ""
-"This wizard will help you configure an internal mail server for your "
-"network, or configure an external mail server."
+"This wizard will help you configure a Postifx mail server or a Postfix mail "
+"relay."
+msgstr "Tämä velho auttaa sinua asettamaan FTP-palvelimen verkollesi."
+
+#: ../postfix_wizard/Postfix.pm:117 ../samba_wizard/Samba.pm:98
+#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:91
+#: ../samba_wizard/Sambashare.pm:140
+msgid "Information"
 msgstr ""
-"Tämä velho auttaa asettamaan Internet sähköpostipalvelut verkollesi, tai "
-"asettamaan ulkoisen sähköpostipalvelimen."
 
-#: ../postfix_wizard/Postfix.pm:82
+#: ../postfix_wizard/Postfix.pm:117
 msgid ""
-"Address masquerading is a method to hide all hosts inside a domain behind "
-"their mail gateway, and to make it appear as if the mail comes from the "
-"gateway itself, instead of from individual machines."
+"It seems you previously setup a Postfix configuration. This wizard will re-"
+"read your old configuration, and show you the Postfix server type you choose"
 msgstr ""
-"Osoite-maskeerausta on tapa jolla piilotetaan kaikki verkkoalueen sisällä "
-"oleviakoneita postiyhdyskäytävän takana. Tämä tarkoitta sitä että kaikki "
-"lähtevät postit näyttävät tulevan itse yhdyskäytävästä eri koneiden sijasta."
 
-#: ../postfix_wizard/Postfix.pm:82
-msgid "Outgoing mail address"
-msgstr "Lähtevän postipalvelimen osoite"
+#: ../postfix_wizard/Postfix.pm:125 ../pxe_wizard/Pxe.pm:126
+msgid "What do you want to do:"
+msgstr "Mitä haluat tehdä:"
+
+#: ../postfix_wizard/Postfix.pm:130
+msgid "Now i need to know your undestanding in Postfix server configuration"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:132 ../samba_wizard/Sambashare.pm:116
+msgid "What kind of user are you:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:138
+#, fuzzy
+msgid "Global postfix configuration"
+msgstr "Poista asetukset"
+
+#: ../postfix_wizard/Postfix.pm:153
+#, fuzzy
+msgid "Smtpd banner:"
+msgstr "Palvelin juliste:"
 
-#: ../postfix_wizard/Postfix.pm:82
+#: ../postfix_wizard/Postfix.pm:154
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr "Tämä pitäisi olla yhtenäinen saapuvan sähköpostin osoitteen kanssa."
+"The myhostname parameter specifies the internet hostname of this  mail "
+"system. ie: myhostname = myhostname"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:155
+#, fuzzy
+msgid "Domain:"
+msgstr "Verkkoalue:"
+
+#: ../postfix_wizard/Postfix.pm:155
+#, fuzzy
+msgid ""
+"The mydomain parameter specifies the local internet domain name. ie: "
+"mydomain = mydomain"
+msgstr ""
+"Parametri 'myorigin=' määrittää mistä verkkoalueesta paikallisesti lähetetyt "
+"viestit näyttää tulevan"
+
+#: ../postfix_wizard/Postfix.pm:156
+#, fuzzy
+msgid "Origin:"
+msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:82
+#: ../postfix_wizard/Postfix.pm:156
+#, fuzzy
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\"From:\" and \"Reply-to\" field."
+"The myorigin parameter specifies the domain that locally-posted mail appears "
+"to come from. ie: myorigin = $myhostname"
+msgstr ""
+"Parametri 'myorigin=' määrittää mistä verkkoalueesta paikallisesti lähetetyt "
+"viestit näyttää tulevan"
+
+#: ../postfix_wizard/Postfix.pm:160
+#, fuzzy
+msgid "Please provide an Smtpd banner."
+msgstr "Ole hyvä ja valitse toinen."
+
+#: ../postfix_wizard/Postfix.pm:162
+msgid "You must provide an internet hostname of this mail system."
 msgstr ""
-"Voit valita osoitemuodon jonka lähtevä sähköposti näyttää kentissä: "
-"\"Keneltä (From)\" ja \"Vastausosoite (Reply-to)\"."
 
-#: ../postfix_wizard/Postfix.pm:88
+#: ../postfix_wizard/Postfix.pm:164
+msgid "You must specifies the local internet domain name."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:168
+#, fuzzy
+msgid "Main Postfix server"
+msgstr "Postfix palvelin"
+
+#: ../postfix_wizard/Postfix.pm:168
+msgid ""
+"Verify command: this stops some techniques used to harvest email addresses."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:168
+msgid ""
+"helo_required: require that a remote SMTP client introduces itself at the "
+"beginning of an SMTP session with the HELO or EHLO command."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:175
+msgid "helo required:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:176
+msgid "Disable verify command:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:177
+#, fuzzy
+msgid "Masquerade domains"
+msgstr "Maskeeratun verkkoalueen nimi:"
+
+#: ../postfix_wizard/Postfix.pm:177
+#, fuzzy
+msgid ""
+"This should be chosen consistently with the address you use for incoming "
+"mail. Address masquerading is a method to hide all hosts inside a domain "
+"behind their mail gateway, and to make it appear as if the mail comes from "
+"the gateway itself, instead of from individual machines."
+msgstr ""
+"Osoite-maskeerausta on tapa jolla piilotetaan kaikki verkkoalueen sisällä "
+"oleviakoneita postiyhdyskäytävän takana. Tämä tarkoitta sitä että kaikki "
+"lähtevät postit näyttävät tulevan itse yhdyskäytävästä eri koneiden sijasta."
+
+#: ../postfix_wizard/Postfix.pm:181
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 "Maskeeratun verkkoalueen tulisi olla kelvollinen domain-nimi kuten "
 "\"nimiosoite.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:93
-msgid "Masquerade domain name:"
-msgstr "Maskeeratun verkkoalueen nimi:"
+#: ../postfix_wizard/Postfix.pm:188
+msgid ""
+"Relay domains: what destination domains (and subdomains thereof) this system "
+"will relay mail to."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:188
+#, fuzzy
+msgid "Relay server"
+msgstr "LDAP palvelin"
+
+#: ../postfix_wizard/Postfix.pm:194 ../postfix_wizard/Postfix.pm:247
+#, fuzzy
+msgid "Relay host:"
+msgstr "Kiellä osoitteet:"
+
+#: ../postfix_wizard/Postfix.pm:195 ../postfix_wizard/Postfix.pm:248
+#, fuzzy
+msgid "Relay domains:"
+msgstr "Sähköposti verkkoalue:"
 
-#: ../postfix_wizard/Postfix.pm:98
-msgid "Warning:"
-msgstr "Varoitus:"
+#: ../postfix_wizard/Postfix.pm:195
+msgid ""
+"What destination domains (and subdomains thereof) this system will relay "
+"mail to. ie: mydomain.com"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
-msgid "You entered an empty address for the mail gateway."
-msgstr "Jätit sähköpostin yhdyskäytävä -asetuksen tyhjäksi."
+#: ../postfix_wizard/Postfix.pm:197
+msgid "Need a relayhost."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:201
+#, fuzzy
+msgid "Network config"
+msgstr "Verkkotiedosto:"
+
+#: ../postfix_wizard/Postfix.pm:211
 msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
+"The network interface addresses that this mail system receives mail on. By "
+"default, the software claims all active interfaces on the machine. ie: all"
 msgstr ""
-"Valintasi voidaan hyväksyä, mutta tämä ei salli sinun lähettää sähköpostia "
-"paikallisverkkosi ulkopuolelle. Paina 'Seuraava' jatkaaksesi, tai 'Takaisin' "
-"korjataksesi asetuksia."
 
-#: ../postfix_wizard/Postfix.pm:102
+#: ../postfix_wizard/Postfix.pm:211 ../postfix_wizard/Postfix.pm:256
+#, fuzzy
+msgid "inet interfaces:"
+msgstr "Liitäntä:"
+
+#: ../postfix_wizard/Postfix.pm:212
 msgid ""
-"Error, sendmail is installed. Please remove it before installing or "
-"configuring Postfix"
+"The list of domains that are delivered via the $local_transport mail "
+"delivery transport. ie: $myhostname, localhost.$mydomain, /etc/postfix/"
+"destinations"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:212 ../postfix_wizard/Postfix.pm:257
+msgid "my destination:"
 msgstr ""
-"Virhe, sendmail on asennettu, ole hyvä ja poista sitä ennen kuin asennat ja "
-"asetat Postfix"
 
-#: ../postfix_wizard/Postfix.pm:108
+#: ../postfix_wizard/Postfix.pm:213
+msgid "The list of trusted SMTP clients. ie: 127.0.0.0/32, 192.168.1.0/24"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:213 ../postfix_wizard/Postfix.pm:258
+msgid "my networks:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:215
 msgid ""
-"Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the Internet mail server is "
-"usually \"smtp.provider.com\"."
+"This is the list of trusted SMTP clients. For securty reason, please provide "
+"one. ie: 127.0.0.0/32, 192.168.1.0/24"
 msgstr ""
-"Internet palvelinnimet on oltava muodossa \"palvelin.verkkoalue.aluetyyppi"
-"\"; eli jos esimerkiksi palveluntarjoajasi on \"tarjoaja.fi\", niin "
-"sähköpostipalvelimen nimi on yleensä \"smtp.tarjoaja.fi\"."
 
-#: ../postfix_wizard/Postfix.pm:108
-msgid "Internet mail gateway"
-msgstr "Internet sähköpostin yhdyskäytävä"
+#: ../postfix_wizard/Postfix.pm:225
+msgid "Message options"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:108
+#: ../postfix_wizard/Postfix.pm:225
+msgid "Various options to configure your message queue, delay, size..."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:232
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Determines how long a message should stay in the queue before it is deemed "
+"undeliverable. The default is five days (5d)"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:232
+msgid "Maximal queue life:"
 msgstr ""
-"Postipalvelimesi lähettää lähtevän postin postiyhdyskäytävän kautta, joka "
-"vastaa lopullisen lähetyksen perillemenosta."
 
-#: ../postfix_wizard/Postfix.pm:114
-msgid "Mail server name:"
-msgstr "Sähköpostipalvelimen nimi:"
+#: ../postfix_wizard/Postfix.pm:233
+msgid "Maximum size of a message in Kb"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:119
-msgid "The default is to append myhostname which is fine for small sites."
-msgstr "Oletuksena lisätään myhostname joka rittää pienille verkoille."
+#: ../postfix_wizard/Postfix.pm:233
+msgid "Message size limit:"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:119
+#: ../postfix_wizard/Postfix.pm:234
+msgid "Delay warning time:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:234
 msgid ""
-"The myorigin parameter specifies the domain that locally-posted mail appears "
-"to come from."
+"The delay_warning_time specifies after how many hours a warning is sent that "
+"mail has not yet been delivered."
 msgstr ""
-"Parametri 'myorigin=' määrittää mistä verkkoalueesta paikallisesti lähetetyt "
-"viestit näyttää tulevan"
 
-#: ../postfix_wizard/Postfix.pm:124 ../postfix_wizard/Postfix.pm:137
-msgid "myorigin:"
-msgstr "myorigin:"
+#: ../postfix_wizard/Postfix.pm:239
+msgid ""
+"Error, sendmail is installed. Please remove it before installing or "
+"configuring Postfix"
+msgstr ""
+"Virhe, sendmail on asennettu, ole hyvä ja poista sitä ennen kuin asennat ja "
+"asetat Postfix"
 
-#: ../postfix_wizard/Postfix.pm:133
-msgid "Configuring the external mail server"
-msgstr "Asetetaan ulkoinen sähköpostipalvelin"
+#: ../postfix_wizard/Postfix.pm:245
+#, fuzzy
+msgid "Configuring your relay mail server"
+msgstr "Asetetaan Samaba-palvelimesi."
 
-#: ../postfix_wizard/Postfix.pm:133
+#: ../postfix_wizard/Postfix.pm:245
+#, fuzzy
 msgid ""
-"The wizard collected the following parameters needed to configure your "
-"external mail server:"
+"The wizard collected the following parameters needed to configure your relay "
+"mail server:"
 msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan ulkoisen Internet "
 "sähköpostipalvelimen asettamiseksi:"
 
-#: ../postfix_wizard/Postfix.pm:135
-msgid "Internet mail gateway:"
-msgstr "Internet sähköpostin yhdyskäytävä:"
-
-#: ../postfix_wizard/Postfix.pm:136
-msgid "Form of the address:"
-msgstr "Osoitteen muoto:"
-
-#: ../postfix_wizard/Postfix.pm:143
-msgid "The wizard will now configure an internal mail server."
+#: ../postfix_wizard/Postfix.pm:254
+#, fuzzy
+msgid "The wizard will now configure your Postfix mail server."
 msgstr "Velho asettaa nyt Internet sähköpostipalvelinta."
 
-#: ../postfix_wizard/Postfix.pm:148
-msgid "The wizard successfully configured your external mail server."
-msgstr "Velho asetti ulkoisen sähköpostipalvelimen onnistuneesti."
+#: ../postfix_wizard/Postfix.pm:264
+#, fuzzy
+msgid "The wizard successfully configured your Postfix Mail server."
+msgstr "Velho asetti PXE-palvelimen onnistuneesti."
 
-#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
-#: ../postfix_wizard/Postfix.pm:265
+#: ../postfix_wizard/Postfix.pm:290 ../postfix_wizard/Postfix.pm:362
+#: ../postfix_wizard/Postfix.pm:382
 msgid "Postfix Server"
 msgstr "Postfix palvelin"
 
-#: ../postfix_wizard/Postfix.pm:170
+#: ../postfix_wizard/Postfix.pm:290
 msgid "removing Sendmail to avoid conflict...."
 msgstr "poistetaan Sendmail ristiriitojen välttämiseksi..."
 
-#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:265
+#: ../postfix_wizard/Postfix.pm:362 ../postfix_wizard/Postfix.pm:382
 msgid "Configuring your Postfix server....."
 msgstr "Asetetaan Postfix-palvelimesi..."
 
@@ -1741,7 +1921,8 @@ msgid "Proxy port:"
 msgstr "Välityspalvelimen portti:"
 
 #: ../proxy_wizard/Squid.pm:83
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Paina 'Seuraava' jos haluat pitää tämän arvon, tai 'Takaisin' jos haluat "
 "korjata valintasi."
@@ -1756,10 +1937,12 @@ msgstr "Paina 'Takaisin' muuttaaksesi asetusta."
 
 #: ../proxy_wizard/Squid.pm:90
 msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Sinun pitää valita portti joka on suurempi kuin 1024 ja pienempi kuin 65535."
+msgstr ""
+"Sinun pitää valita portti joka on suurempi kuin 1024 ja pienempi kuin 65535."
 
 #: ../proxy_wizard/Squid.pm:94
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "Levyvälimuisti on määrätty osa levytilasta joka voidaan käyttää "
 "välimuistitietojen tallentamiseen levylle."
@@ -1865,13 +2048,14 @@ msgid "Configuring the Proxy"
 msgstr "Asetetaan välityspalvelin"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan välityspalvelimen "
 "asettamiseksi:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:331 ../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."
@@ -2025,8 +2209,10 @@ msgstr ""
 "käyttäjä pystyy valitsemaan minkä kuvan hän haluaa käynnistää PXE:n kautta"
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
-msgstr "Valitse PXE käynnistyslevykuvatiedosto jota haluat poistaa PXE palvelimelta."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
+msgstr ""
+"Valitse PXE käynnistyslevykuvatiedosto jota haluat poistaa PXE palvelimelta."
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Remove a boot image"
@@ -2056,7 +2242,8 @@ msgstr ""
 "käynnistyskuvatiedoston."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
 msgstr "Valitse muutettava PXE käynnistyskuvatiedosto alla olevasta listasta."
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
@@ -2068,7 +2255,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Lisää optiota PXE käynnistyskuvatiedostoon"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandrakelinux install server directory"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr ""
 "Asennushakemisto: koko hakemistopolku Mandrakelinux asennuspalvelimen "
 "hakemistoon"
@@ -2167,7 +2355,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "Tarvitaan all.rdz tai network.img kuvatiedostoa. Ole hyvä ja lisää yhden."
+msgstr ""
+"Tarvitaan all.rdz tai network.img kuvatiedostoa. Ole hyvä ja lisää yhden."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
@@ -2188,10 +2377,12 @@ msgstr "Valitse kuvatiedosto toiselta hakemistolta kuin %s."
 msgid ""
 "Please provide a correct PXE name: one ASCII word or one number with no "
 "spaces."
-msgstr "ole hyvä ja valitse oikea PXE nimi: yksi sana tai numero ilman välilyöntejä"
+msgstr ""
+"ole hyvä ja valitse oikea PXE nimi: yksi sana tai numero ilman välilyöntejä"
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Jos haluat lisätä/poistaa/muokata PXE käynnistyskuvatiedostoa, sinun pitää "
 "suorita 'Aseta PXE palvelin' ensin."
@@ -2226,7 +2417,8 @@ msgstr "PXE 'apu' tiedosto:"
 
 #: ../pxe_wizard/Pxe.pm:248
 msgid "The wizard will now modify boot options with those parameters:"
-msgstr "Nyt muokataan käynnistyskuvatiedoston käynnistysoptiot näillä parametreilla."
+msgstr ""
+"Nyt muokataan käynnistyskuvatiedoston käynnistysoptiot näillä parametreilla."
 
 #: ../pxe_wizard/Pxe.pm:265
 msgid "The wizard will now remove this PXE boot image"
@@ -2264,24 +2456,41 @@ msgstr "Asetetaan järjestelmäsi PXE-palvelinta..."
 msgid "PXE server"
 msgstr "PXE-palvelin"
 
-#: ../samba_wizard/Samba.pm:38
-msgid "Samba wizard"
-msgstr "Samba velho"
+#: ../samba_wizard/Samba.pm:83
+msgid "BDC - backup domain controller"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
-#, perl-format
-msgid "%s does not exist."
-msgstr "%s ei ole olemassa."
+#: ../samba_wizard/Samba.pm:84
+msgid "PDC - primary domain controller"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:70
-msgid "All - no access restriction"
-msgstr "Kaikki - Ei käyttörajoituksia"
+#: ../samba_wizard/Samba.pm:85
+#, fuzzy
+msgid "Standalone - standalone server"
+msgstr "Mandrakelinux Asennuspalvelin"
 
-#: ../samba_wizard/Samba.pm:71
-msgid "My rules - ask me allowed and denied hosts"
-msgstr "Omat säännöt - Vahvista sallitut ja kielletyt osoitteet"
+#: ../samba_wizard/Samba.pm:86
+msgid "Member - member of a domain"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:76
+#: ../samba_wizard/Samba.pm:94
+msgid "BDC: backup domain controller"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:94
+msgid "Member: member of a domain"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:94
+msgid "PDC: primary domain controller"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:94
+#, fuzzy
+msgid "Samba Configuration Wizard"
+msgstr "Samba asetusvelho"
+
+#: ../samba_wizard/Samba.pm:94
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2289,127 +2498,773 @@ msgstr ""
 "Samba sallii palvelimesi toimia tiedosto- ja tulostuspalvelimena "
 "työasemille, jotka eivät käytä Linuxia."
 
-#: ../samba_wizard/Samba.pm:76
-msgid "Samba configuration wizard"
-msgstr "Samba asetusvelho"
+#: ../samba_wizard/Samba.pm:94
+#, fuzzy
+msgid "standalone: standalone server"
+msgstr "Mandrakelinux Asennuspalvelin"
+
+#: ../samba_wizard/Samba.pm:98
+msgid ""
+"It seems you previously setup a Samba server. This wizard will re-read your "
+"old configuration, and show you the Samba server type you choose"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:117
+msgid "Wich type of Samba server do you you want:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:121
+msgid ""
+"Domain master = yes, causes the server to register the NetBIOS name <pdc "
+"name>1B. This name will be recognized by other servers."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:121
+msgid "PDC server: primary domain controller"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:121
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:121
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends, "
+"but large installations should use the LDAP backend to provide centralized "
+"management of both Posix users and Windows users."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:140
+#, fuzzy
+msgid "Domain logons:"
+msgstr "Verkkoalue:"
+
+#: ../samba_wizard/Samba.pm:141 ../samba_wizard/Samba.pm:189
+#: ../samba_wizard/Samba.pm:219
+#, fuzzy
+msgid "Domain master:"
+msgstr "Verkkoalue:"
+
+#: ../samba_wizard/Samba.pm:142 ../samba_wizard/Samba.pm:190
+#: ../samba_wizard/Samba.pm:218
+msgid "Security:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:143 ../samba_wizard/Samba.pm:174
+msgid "Wins support:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:144 ../samba_wizard/Samba.pm:196
+msgid "admin users:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:144 ../samba_wizard/Samba.pm:196
+msgid "root @adm"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:76
-msgid "This wizard will help you configuring the Samba services of your server."
-msgstr "Tämä velho auttaa asettamaan palvelimesi Samba-palvelut."
+#: ../samba_wizard/Samba.pm:145 ../samba_wizard/Samba.pm:191
+#, fuzzy
+msgid "Os level:"
+msgstr "Käyttörajoitustaso:"
+
+#: ../samba_wizard/Samba.pm:145
+msgid ""
+"The global os level option dictates the operating system level at which "
+"Samba will masquerade during a browser election. If you wish to have Samba "
+"win an election and become the master browser, you can set the level above "
+"that of the operating system on your network with the highest current value. "
+"ie: os level = 34"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:146 ../samba_wizard/Samba.pm:217
+msgid "Use LDAP Passdb backend"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:150
+#, fuzzy
+msgid "The domain is wrong."
+msgstr "Työryhmä on väärä"
+
+#: ../samba_wizard/Samba.pm:157
+msgid "BDC server: backup domain controller"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:157
+msgid ""
+"This enables BDCs to carry much of the network logon processing. A BDC on a "
+"local segment handles logon requests and authenticates users when the PDC is "
+"busy on the local network. When a segment becomes heavily loaded, the "
+"reponsibility is offloaded to another segment's BDC or to the PDC."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:175
+msgid ""
+"This specifies the IP address (or DNS name: IP address for preference) of "
+"the WINS server that nmbd(8) should register with. If you have a WINS server "
+"on your network then you should set this to the WINS server's IP."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:175
+#, fuzzy
+msgid "Wins server:"
+msgstr "Tulostuspalvelin:"
+
+#: ../samba_wizard/Samba.pm:176
+msgid "Wins name resolve order:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:180
+msgid ""
+"Your server doesn't support Wins. Please provide a Wins server, or leave "
+"blank Wins Support entry."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:187
+msgid "BDC server: needed fixed options"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:192
+#, fuzzy
+msgid "Local master:"
+msgstr "Automattinen isäntä:"
+
+#: ../samba_wizard/Samba.pm:193
+#, fuzzy
+msgid "Domain master"
+msgstr "Verkkoalue:"
+
+#: ../samba_wizard/Samba.pm:194
+msgid "Prefered master"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:195
+#, fuzzy
+msgid "Domain logons"
+msgstr "Verkkoalue: %s"
+
+#: ../samba_wizard/Samba.pm:201
+#, fuzzy
+msgid "Member of a domain"
+msgstr "Sähköposti verkkoalue:"
+
+#: ../samba_wizard/Samba.pm:201
+msgid "Please enter the domain you want to join."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:216
+#, fuzzy
+msgid "Password server"
+msgstr "Salasana:"
+
+#: ../samba_wizard/Samba.pm:224
+#, fuzzy
+msgid "Please provide the password server."
+msgstr "Ole hyvä ja valitse toinen."
+
+#: ../samba_wizard/Samba.pm:231
+msgid "LDAP configuration for Domain Controlling"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:231
+msgid ""
+"The account (dn) that samba uses to access the LDAP server. This account "
+"needs to have write access to the LDAP tree. You will need to give samba the "
+"password for this dn."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:254
+msgid "Passdb backend"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:255
+msgid ""
+" The ldap admin dn defines the Distinguished Name (DN) name used by Samba to "
+"contact the ldap server when retreiving user account information. ie: "
+"cn=Manager,dc=mydomain,dc=com"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:255
+#, fuzzy
+msgid "LDAP administrator"
+msgstr "LDAP Järjestelmävalvoja"
+
+#: ../samba_wizard/Samba.pm:256
+msgid "LDAP suffix"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:256
+msgid ""
+"Specifies where user and machine accounts are added to the tree. Can be "
+"overriden by ldap user suffix and ldap machine suffix. It also used as the "
+"base dn for all ldap searches. ie: dc=$DOMAINNAME,dc=com"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:257
+#, fuzzy
+msgid "LDAP password"
+msgstr "LDAP Salasana:"
+
+#: ../samba_wizard/Samba.pm:258
+#, fuzzy
+msgid "LDAP password check:"
+msgstr "LDAP Salasana:"
 
-#: ../samba_wizard/Samba.pm:81
+#: ../samba_wizard/Samba.pm:259
+msgid ""
+"It specifies where machines should be added to the ldap tree. ie: "
+"ou=Computers"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:259
+msgid "LDAP machine suffix:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:260
+msgid "LDAP user suffix:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:260
+msgid ""
+"This parameter specifies where users are added to the tree. If this "
+"parameter is not specified, the value from ldap suffix."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:261
+msgid "LDAP group suffix:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:261
+msgid ""
+"This parameters specifies the suffix that is  used for groups when these are "
+"added to the LDAP directory. ie: ou=Groups"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:265
+#, fuzzy
+msgid "Please provide an LDAP suffix."
+msgstr "Ole hyvä ja valitse toinen."
+
+#: ../samba_wizard/Samba.pm:269
+#, fuzzy
+msgid "Please enter an LDAP administrator."
+msgstr "LDAP Järjestelmävalvoja"
+
+#: ../samba_wizard/Samba.pm:273
+msgid "Please enter an LDAP password."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:277
+#, fuzzy
+msgid "Pasword dont match."
+msgstr "Salasanat poikkeavat toisistaan"
+
+#: ../samba_wizard/Samba.pm:284
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samban täytyy tietää Windows-työryhmä, jota sen pitää palvella."
 
-#: ../samba_wizard/Samba.pm:81
+#: ../samba_wizard/Samba.pm:284
 msgid "Workgroup"
 msgstr "Työryhmä"
 
-#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:290 ../samba_wizard/Samba.pm:337
+#: ../samba_wizard/Sambaprint.pm:126
 msgid "Workgroup:"
 msgstr "Työryhmä:"
 
-#: ../samba_wizard/Samba.pm:92
-msgid "The Workgroup is wrong"
+#: ../samba_wizard/Samba.pm:294
+#, fuzzy
+msgid "The Workgroup is wrong."
 msgstr "Työryhmä on väärä"
 
-#: ../samba_wizard/Samba.pm:97
-msgid "Server banner."
+#: ../samba_wizard/Samba.pm:301
+#, fuzzy
+msgid "Server Banner."
 msgstr "Palvelin juliste:"
 
-#: ../samba_wizard/Samba.pm:97
+#: ../samba_wizard/Samba.pm:301
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "Juliste määrää tämän palvelimen kuvauksen Windows-työasemissa."
 
-#: ../samba_wizard/Samba.pm:103
+#: ../samba_wizard/Samba.pm:306
 msgid "Banner:"
 msgstr "Juliste:"
 
-#: ../samba_wizard/Samba.pm:108
-msgid "The server banner is incorrect"
+#: ../samba_wizard/Samba.pm:310
+#, fuzzy
+msgid "The Server Banner is incorrect."
 msgstr "Palvelimen juliste on virheellinen"
 
-#: ../samba_wizard/Samba.pm:119
-msgid "Access level:"
-msgstr "Käyttörajoitustaso:"
+#: ../samba_wizard/Samba.pm:317
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:124
+#: ../samba_wizard/Samba.pm:317
+msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:317
+msgid "Max Log size: put a capping on the size of the log files (in Kb)."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:317
+msgid "Samba Log"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:324 ../samba_wizard/Samba.pm:339
+#: ../samba_wizard/Sambaprint.pm:128
+msgid "Log file:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:325
+msgid "Max log size:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:326 ../sshd_wizard/Sshd.pm:127
+#, fuzzy
+msgid "Log level:"
+msgstr "Sisäänkirjautumiskehote:"
+
+#: ../samba_wizard/Samba.pm:331
+msgid "Configuring Samba"
+msgstr "Asetetaan Samba"
+
+#: ../samba_wizard/Samba.pm:331
 msgid ""
-"* Example 1: allow all IP in 150.203.*.*; except one\n"
-"hosts allow = 150.203. EXCEPT 150.203.6.66"
+"If you have previously create some shares, they will appear in this "
+"configuration. Run \"drakwizard sambashare\" to manage your share."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:331
+msgid "The wizard collected the following parameters to configure Samba."
+msgstr ""
+"Velho keräsi seuraavat parametrit jotka vaaditaanSamba-palvelun "
+"asettamiseksi."
+
+#: ../samba_wizard/Samba.pm:336 ../samba_wizard/Sambaprint.pm:125
+#, fuzzy
+msgid "Samba type:"
+msgstr "Samba-palvelin"
+
+#: ../samba_wizard/Samba.pm:338 ../samba_wizard/Sambaprint.pm:127
+msgid "Server banner:"
+msgstr "Palvelin juliste:"
+
+#: ../samba_wizard/Samba.pm:345 ../samba_wizard/Sambaprint.pm:134
+msgid "The wizard successfully configured your Samba server."
+msgstr "Velho asetti Samba-palvelimesi onnistuneesti."
+
+#: ../samba_wizard/Samba.pm:451 ../samba_wizard/Sambaprint.pm:269
+#: ../samba_wizard/Sambashare.pm:495 ../samba_wizard/Sambashare.pm:516
+#: ../samba_wizard/Sambashare.pm:552 ../samba_wizard/Sambashare.pm:568
+#: ../samba_wizard/Sambashare.pm:593
+msgid "Configuring your Samba server..."
+msgstr "Asetetaan Samaba-palvelimesi."
+
+#: ../samba_wizard/Sambaprint.pm:57
+msgid "Printers - configure your printers"
 msgstr ""
-"* Esimerkki 1: hyväksy kaikki ip-osoitteet välillä 150.203.*.* paitsi yksi "
-"tietty\n"
-"hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:124
+#: ../samba_wizard/Sambaprint.pm:58
+msgid "Print - printers drivers"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:65
+#, fuzzy
+msgid "Samba printers Wizard"
+msgstr "Samba velho"
+
+#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:91
 msgid ""
-"* Example 2: allow hosts that match the given network/netmask\n"
-"hosts allow = 150.203.15.0/255.255.255.0"
+"It seems that you don't setup a Samba server. Please setup a Samba server "
+"with Samba wizard before manage your share."
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:74
+msgid "? :"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:79
+msgid "Select which printers you want to be accessible from known users"
+msgstr ""
+"Valitse mitkä tulostimia haluat olla käytettävissä tunnistetuille "
+"käyttäjille."
+
+#: ../samba_wizard/Sambaprint.pm:85
+msgid "Enable all printers"
+msgstr "Ota käyttöön kaikki tulostimet"
+
+#: ../samba_wizard/Sambaprint.pm:91
+msgid ""
+"Now you can configure your printers service. Change value only if you know "
+"what your are doing."
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:112 ../samba_wizard/Sambashare.pm:168
+#: ../samba_wizard/Sambashare.pm:239 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:340 ../samba_wizard/Sambashare.pm:351
+#: ../samba_wizard/Sambashare.pm:362 ../samba_wizard/Sambashare.pm:374
+#: ../samba_wizard/Sambashare.pm:388
+#, fuzzy
+msgid "Comment:"
+msgstr "Kotihakemisto:"
+
+#: ../samba_wizard/Sambaprint.pm:113 ../samba_wizard/Sambashare.pm:343
+#: ../samba_wizard/Sambashare.pm:354
+#, fuzzy
+msgid "Create mode:"
+msgstr "Luo kohdassa:"
+
+#: ../samba_wizard/Sambaprint.pm:114 ../samba_wizard/Sambashare.pm:170
+#: ../samba_wizard/Sambashare.pm:241 ../samba_wizard/Sambashare.pm:285
+#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:352
+#: ../samba_wizard/Sambashare.pm:363 ../samba_wizard/Sambashare.pm:376
+#: ../samba_wizard/Sambashare.pm:389
+msgid "Browseable:"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:115
+msgid "Guest ok:"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:120
+#, fuzzy
+msgid "Configuring Samba priniters"
+msgstr "Asetetaan Samba"
+
+#: ../samba_wizard/Sambashare.pm:66
+#, fuzzy
+msgid "My rules - Ask me allowed and denied hosts"
+msgstr "Omat säännöt - Vahvista sallitut ja kielletyt osoitteet"
+
+#: ../samba_wizard/Sambashare.pm:75
+msgid "Add - add a share"
 msgstr ""
-"* Esimerkki 2: hyväksy koneet jotka vastaavat annettua verkkoa/verkkomaskia\n"
-"hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:124
+#: ../samba_wizard/Sambashare.pm:76
+msgid "Remove - remove a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:77
+msgid "Modify - modify a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:78
+msgid "CDrom - share a CDrom"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:79
+msgid "Homes - share home user dir"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:88
+#, fuzzy
+msgid "What do you want todo with your share ?"
+msgstr "Mitä haluat tehdä?"
+
+#: ../samba_wizard/Sambashare.pm:88
+msgid "add/remove/modify a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:114
+msgid "Now i need to know your undestanding in Samba server configuration"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:121
+msgid "Delete wich share ?"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:121
+#, fuzzy
+msgid "Please choose the share you want to remove."
+msgstr ""
+"Valitse PXE käynnistyslevykuvatiedosto jota haluat poistaa PXE palvelimelta."
+
+#: ../samba_wizard/Sambashare.pm:129
+msgid "Modify wich share ?"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:129
+#, fuzzy
+msgid "Please choose the share you want to modify."
+msgstr "Valitse muutettava PXE käynnistyskuvatiedosto alla olevasta listasta."
+
+#: ../samba_wizard/Sambashare.pm:137
+msgid "Modify a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:140
+msgid "There is no share to modify, please add one."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:153
+msgid "Please enter a share comment."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:167 ../samba_wizard/Sambashare.pm:238
+#: ../samba_wizard/Sambashare.pm:361 ../samba_wizard/Sambashare.pm:387
+#, fuzzy
+msgid "Name of the share:"
+msgstr "Koneen nimi:"
+
+#: ../samba_wizard/Sambashare.pm:168
 msgid ""
-"* Example 3: allow a couple of hosts\n"
-"hosts allow = lapland, arvidsjaur"
+"This is a text field that is seen next to a share when a client does a "
+"queries the server"
 msgstr ""
-"* Esimerkki 3: hyväksy muutama kone\n"
-"hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:124
+#: ../samba_wizard/Sambashare.pm:169 ../samba_wizard/Sambashare.pm:240
+#, fuzzy
+msgid "Path:"
+msgstr "Portti:"
+
+#: ../samba_wizard/Sambashare.pm:170 ../samba_wizard/Sambashare.pm:241
+msgid "Allows share to be displayed in list of share."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:171 ../samba_wizard/Sambashare.pm:300
+#: ../samba_wizard/Sambashare.pm:342 ../samba_wizard/Sambashare.pm:353
+#: ../samba_wizard/Sambashare.pm:364 ../samba_wizard/Sambashare.pm:391
+#, fuzzy
+msgid "Writable:"
+msgstr "Kirjoituslista:"
+
+#: ../samba_wizard/Sambashare.pm:172 ../samba_wizard/Sambashare.pm:242
+#: ../samba_wizard/Sambashare.pm:288 ../samba_wizard/Sambashare.pm:365
+#: ../samba_wizard/Sambashare.pm:379 ../samba_wizard/Sambashare.pm:392
+msgid "Public:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:178
+msgid "Advanced options, step 1"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:178
+msgid "Advanced options, use them if you know what you are doing."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:178
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
-"from one particular host\n"
-"hosts allow = @foonet\n"
-"hosts deny = pirate"
+"If you choose \"Write list\" wizard will create the samba user without "
+"password. Use: smbpasswd [username] to redefine samba user password."
 msgstr ""
-"* Esimerkki 4: hyväksy vain koneet NIS-ryhmästä \"foonet\" mutta estä yhteys "
-"yhdestä tietystä osoitteesta\n"
-"hosts allow = @foonet\n"
-"hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:124
-msgid "Note that access still requires suitable user-level passwords."
-msgstr "Huomaa että yhteys vaatii silti oikein määritetyn käyttäjän/salasanan."
+#: ../samba_wizard/Sambashare.pm:191
+msgid "Specifies a user that have read-write access to a share. ie: fred"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:131
-msgid "Allow hosts:"
-msgstr "Hyväksy osoitteet:"
+#: ../samba_wizard/Sambashare.pm:191 ../samba_wizard/Sambashare.pm:303
+#: ../samba_wizard/Sambashare.pm:394
+msgid "Write list:"
+msgstr "Kirjoituslista:"
 
-#: ../samba_wizard/Samba.pm:132
-msgid "Deny hosts:"
-msgstr "Kiellä osoitteet:"
+#: ../samba_wizard/Sambashare.pm:192 ../samba_wizard/Sambashare.pm:304
+#, fuzzy
+msgid "User own directory:"
+msgstr "Käyttäjien hakemisto:"
 
-#: ../samba_wizard/Samba.pm:137
-msgid "Enabled Samba services"
-msgstr "Käytössä olevat Samba-palvelut"
+#: ../samba_wizard/Sambashare.pm:195 ../samba_wizard/Sambashare.pm:306
+msgid "Hide files:"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:137
+#: ../samba_wizard/Sambashare.pm:195 ../samba_wizard/Sambashare.pm:306
 msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+"The hide files option provides one or more directory or filename patterns to "
+"Samba. Any file matching this pattern will be treated as a hidden file from "
+"the perspective of the client. ie: /.icewm/"
 msgstr ""
-"Samba voi tarjota yleisen tiedostonjakelualueen Windows-työasemillesi, sekä "
-"tulostimen jaon kaikille tulostimille jotka on kytketty palvelimeen."
 
-#: ../samba_wizard/Samba.pm:145
-msgid "Enable file sharing area"
-msgstr "Ota käyttöön jaettu alue"
+#: ../samba_wizard/Sambashare.pm:196 ../samba_wizard/Sambashare.pm:305
+#: ../samba_wizard/Sambashare.pm:395
+msgid "Show dot files:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:196 ../samba_wizard/Sambashare.pm:305
+msgid ""
+"The hide dot files option hides any files on the server that begin with a "
+"dot (.)"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:201 ../samba_wizard/Sambashare.pm:311
+#, fuzzy, perl-format
+msgid "Please provide a system user, %s not present."
+msgstr "Ole hyvä ja valitse toinen."
+
+#: ../samba_wizard/Sambashare.pm:208
+msgid "Please enter a unique user name for: \\\"write list\\\"."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:214
+msgid "Advanced options, step 2"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:214
+msgid "Advanced options, use them only if you know what you are doing."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:226
+msgid ""
+"When a file is created, the necessary permissions are calculated according "
+"to the mapping from DOS modes to UNIX permissions, and the resulting UNIX "
+"mode is then bit-wise 'AND'ed with this parameter. This parameter may be "
+"thought of as a bit-wise MASK for the UNIX modes of a file. Any bit not set "
+"here will be removed from the modes set on a file when it is created."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:226
+#, fuzzy
+msgid "create mask"
+msgstr "Netmask:"
+
+#: ../samba_wizard/Sambashare.pm:227
+msgid ""
+"This parameter specifies a set of UNIX mode bit permissions that will always "
+"be set on a file created by Samba. This is done by bitwise 'OR'ing these "
+"bits onto the mode bits of a file that is being created or having its "
+"permissions changed. The default for this parameter is (in octal) 000. ie: "
+"force create mode = 0700 "
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:227
+msgid "force create mode"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:228
+msgid ""
+"This parameter specifies a set of UNIX mode bit permissions that will always "
+"be set on a directory created by Samba. This is done by bitwise 'OR'ing "
+"these bits onto the mode bits of a directory that is being created. The "
+"default for this parameter is (in octal) 0000 which will not add any extra "
+"permission bits to a created directory. Default: ie: force directory mode = "
+"0755"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:228
+#, fuzzy
+msgid "force directory mode"
+msgstr "Kotihakemisto:"
+
+#: ../samba_wizard/Sambashare.pm:229
+msgid ""
+"This specifies a UNIX group name that will be assigned as the default "
+"primary group for all users connecting to this service. This is useful for "
+"sharing files by ensuring that all access to files on service will use the "
+"named group for their permissions checking. ie: force group = agroup"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:229
+#, fuzzy
+msgid "force group"
+msgstr "Työryhmä"
+
+#: ../samba_wizard/Sambashare.pm:230
+#, fuzzy
+msgid "default case"
+msgstr "Oletus OU"
+
+#: ../samba_wizard/Sambashare.pm:230
+msgid "lower or upper"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:231
+msgid ""
+"This controls if new filenames are created with the case that the client "
+"passes, or if they are forced to be the default case"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:231
+#, fuzzy
+msgid "preserve case"
+msgstr "Uutispalvelimen nimi:"
+
+#: ../samba_wizard/Sambashare.pm:236 ../samba_wizard/Sambashare.pm:293
+msgid "Add a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:236 ../samba_wizard/Sambashare.pm:324
+msgid "Browseable: view share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:236
+msgid "Comment: description of the share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:236
+msgid "Writable: user can write in the share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:247
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:146
-msgid "Enable server Printer Sharing"
-msgstr "Ota käyttöön Palvelimen jaettu tulostus"
+#: ../samba_wizard/Sambashare.pm:252 ../samba_wizard/Sambashare.pm:258
+msgid "Can't create the directory, please enter a correct path."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:255
+msgid "Please enter a Comment for this share."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:265
+msgid "Share a CDROM"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:284
+msgid "CDrom path:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:286 ../samba_wizard/Sambashare.pm:377
+msgid "Root preexec:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:287 ../samba_wizard/Sambashare.pm:378
+msgid "Root postexec:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:293
+msgid "If you don't want to use one of this options, leave it blanck."
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:147
-msgid "Make home directories available for their owners"
-msgstr "Aseta kotihakemistot omistajiensa saataville."
+#: ../samba_wizard/Sambashare.pm:301 ../samba_wizard/Sambashare.pm:390
+#, fuzzy
+msgid "Create mask:"
+msgstr "Luo kohdassa:"
+
+#: ../samba_wizard/Sambashare.pm:303
+msgid "Specifie a user that have read-write access to a share. ie: guibo"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:152
+#: ../samba_wizard/Sambashare.pm:317
+msgid ""
+"Please enter a unique user name for: \\\"write list\\\" and \\\"valid user\\"
+"\"."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:324
+msgid "Comment: description of users home directory"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:324
+msgid "Create mode: man chmod for more info"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:324
+#, fuzzy
+msgid "Users home options"
+msgstr "Mukautettu vaihtoehto:"
+
+#: ../samba_wizard/Sambashare.pm:324
+msgid "Writable: user can write in their home"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:324
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2418,97 +3273,316 @@ msgstr ""
 "kautta, mutta sinun/heidän on käytettävä smbpasswd salasanan "
 "määrittelemiseksi."
 
-#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
-#: ../samba_wizard/Samba.pm:234
-msgid "Shared directory:"
-msgstr "Jaettu hakemisto:"
+#: ../samba_wizard/Sambashare.pm:348 ../samba_wizard/Sambashare.pm:384
+#, fuzzy
+msgid ""
+"If you really want to add this this share, click the Next button or use the "
+"Back button."
+msgstr ""
+"Hyväksy asetukset ja lisää asiakas painamalla 'Seuraava', tai paina "
+"'Edellinen' korjataksesi asetuksia."
 
-#: ../samba_wizard/Samba.pm:158
-msgid "Type the path of the directory you want being shared."
-msgstr "Syötä hakemisto jonka haluat jakaa."
+#: ../samba_wizard/Sambashare.pm:348
+msgid "Summary add home share"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:165
-msgid "Create shared directory if it doesn't exist"
-msgstr "Luo jaettu hakemisto jos sitä ei ole olemassa"
+#: ../samba_wizard/Sambashare.pm:359
+#, fuzzy
+msgid ""
+"If you really want to modify this share, click the Next button or use the "
+"Back button."
+msgstr ""
+"Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
+"'Edellinen' korjataksesi asetuksia."
 
-#: ../samba_wizard/Samba.pm:170
-msgid "Failed to create directory."
-msgstr "Hakemiston luonti epäonnistui"
+#: ../samba_wizard/Sambashare.pm:359
+msgid "Summary modify a share"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:180
-msgid "File permissions"
-msgstr "Tiedoston oikeudet"
+#: ../samba_wizard/Sambashare.pm:371
+msgid "CDROM"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:180
+#: ../samba_wizard/Sambashare.pm:371
+#, fuzzy
 msgid ""
-"Type users or groups separated by a comma (groups must be preceded by a '@') "
-"like this:\n"
-"root, fred, @users, @wheel for each kind of permission."
+"If you really want to share a CDROM, click the Next button or use the Back "
+"button."
 msgstr ""
-"Anna käyttäjät tai ryhmät pilkuilla erotettuna (ryhmiä täytyy edeltää '@') "
-"esimerkiksi näin:\n"
-"root fred @users @wheel jokaiselle eri oikeudelle."
+"Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
+"'Edellinen' korjataksesi asetuksia."
 
-#: ../samba_wizard/Samba.pm:187
-msgid "Read list:"
-msgstr "Lukulista:"
+#: ../samba_wizard/Sambashare.pm:375
+msgid "Cdrom path:"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
-msgid "root, fred, @users, @wheel"
-msgstr "root, fred, @users, @wheel"
+#: ../samba_wizard/Sambashare.pm:384
+msgid "Summary add share"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:188
-msgid "Write list:"
-msgstr "Kirjoituslista:"
+#: ../samba_wizard/Sambashare.pm:400
+#, fuzzy
+msgid ""
+"If you really want to remove this share, click the Next button or use the "
+"Back button."
+msgstr ""
+"Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
+"'Edellinen' korjataksesi asetuksia."
 
-#: ../samba_wizard/Samba.pm:198
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/Sambashare.pm:400
+msgid "Summary remove a share"
 msgstr ""
-"Valitse mitkä tulostimia haluat olla käytettävissä tunnistetuille "
-"käyttäjille."
 
-#: ../samba_wizard/Samba.pm:205
-msgid "Enable all printers"
-msgstr "Ota käyttöön kaikki tulostimet"
+#: ../samba_wizard/Sambashare.pm:406
+msgid "Delete this share:"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:223
-msgid "Configuring Samba"
-msgstr "Asetetaan Samba"
+#: ../samba_wizard/Sambashare.pm:407
+msgid "Comment for this share:"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:223
-msgid "The wizard collected the following parameters to configure Samba."
+#: ../samba_wizard/Sambashare.pm:413
+#, fuzzy
+msgid "The wizard successfully configured your Samba samba."
+msgstr "Velho asetti Samba-palvelimesi onnistuneesti."
+
+#: ../samba_wizard/Sambashare.pm:421
+#, fuzzy
+msgid "The wizard successfully modify your share."
+msgstr "Velho asetti PXE-palvelimen onnistuneesti."
+
+#: ../samba_wizard/Sambashare.pm:426
+#, fuzzy
+msgid "The wizard successfully add your share."
+msgstr "Velho asetti NFS-palvelimen onnistuneesti."
+
+#: ../samba_wizard/Sambashare.pm:431
+#, fuzzy
+msgid "The wizard successfully remove your share."
+msgstr "Velho asetti PXE-palvelimen onnistuneesti."
+
+#: ../samba_wizard/Sambashare.pm:495 ../samba_wizard/Sambashare.pm:516
+#: ../samba_wizard/Sambashare.pm:552 ../samba_wizard/Sambashare.pm:568
+#: ../samba_wizard/Sambashare.pm:593
+#, fuzzy
+msgid "Samba share"
+msgstr "Samba-palvelin"
+
+#: ../samba_wizard/Sambashare.pm:513 ../samba_wizard/Sambashare.pm:590
+#, perl-format
+msgid "Can't create %s. Please check why wizard can't create this directory."
 msgstr ""
-"Velho keräsi seuraavat parametrit jotka vaaditaanSamba-palvelun "
-"asettamiseksi."
 
-#: ../samba_wizard/Samba.pm:232
-msgid "Server banner:"
-msgstr "Palvelin juliste:"
+#: ../sshd_wizard/Sshd.pm:65
+msgid "Expert - advanced ssh options"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:233
-msgid "File sharing:"
-msgstr "Tiedostojako:"
+#: ../sshd_wizard/Sshd.pm:70
+#, fuzzy
+msgid "OpenSSH SSH daemon configuration"
+msgstr "Näytä LDAP asetukset"
 
-#: ../samba_wizard/Samba.pm:235
-msgid "Print server:"
-msgstr "Tulostuspalvelin:"
+#: ../sshd_wizard/Sshd.pm:72
+#, fuzzy
+msgid "Wich type of configuration do you you want to do:"
+msgstr "Mitä haluat tehdä:"
 
-#: ../samba_wizard/Samba.pm:236
-msgid "Home:"
-msgstr "Kotihakemisto:"
+#: ../sshd_wizard/Sshd.pm:77
+msgid "SSH server, classical options"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#, fuzzy
+msgid "Listen address:"
+msgstr "Matalin IP-osoite:"
+
+#: ../sshd_wizard/Sshd.pm:85
+msgid "Specifies the local addresses sshd should listen on."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
+#, fuzzy
+msgid "Port number:"
+msgstr "uid numero:"
+
+#: ../sshd_wizard/Sshd.pm:86
+msgid "Specifies the port number that sshd listens on. The default is 22."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:89
+#, fuzzy
+msgid "Port should be a number"
+msgstr "Pitäisi olla numero"
+
+#: ../sshd_wizard/Sshd.pm:100
+#, fuzzy
+msgid "Authentication Method"
+msgstr "Asennustapa:"
+
+#: ../sshd_wizard/Sshd.pm:110
+msgid "RSA auth:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:111
+msgid "PubKey auth:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:112
+msgid "Auth key file:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:113
+#, fuzzy
+msgid "Password auth:"
+msgstr "Salasana:"
+
+#: ../sshd_wizard/Sshd.pm:114
+msgid "Ignore rhosts file:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:115
+msgid "Permit empty password:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:120
+msgid "Log"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:120
+msgid ""
+"Log level: gives the verbosity level that is used when logging messages from "
+"sshd."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:120
+msgid ""
+"Syslog facility: gives the facility code that is used when logging messages "
+"from sshd"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:126
+msgid "Syslog facility:"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:237
-msgid "Printers:"
+#: ../sshd_wizard/Sshd.pm:132
+msgid "Login options"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:132
+msgid ""
+"Print last log: whether sshd should print the date and time when the user "
+"last logged in"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:140
+msgid "Login Grace time:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:140
+msgid ""
+"The server disconnects after this time if the user has not successfully "
+"logged in. If the value is 0, there is no time limit. The default is 120 "
+"seconds."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:141
+msgid "Keep alive:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:142
+#, fuzzy
+msgid "Print motd:"
 msgstr "Tulostimet:"
 
-#: ../samba_wizard/Samba.pm:243
-msgid "The wizard successfully configured your Samba server."
-msgstr "Velho asetti Samba-palvelimesi onnistuneesti."
+#: ../sshd_wizard/Sshd.pm:143
+#, fuzzy
+msgid "Print last log:"
+msgstr "Salli kirjautuminen root tunnuksella:"
 
-#: ../samba_wizard/Samba.pm:525
-msgid "Configuring your Samba server..."
+#: ../sshd_wizard/Sshd.pm:146
+#, fuzzy
+msgid "Login grace time should be a number"
+msgstr "Pitäisi olla numero"
+
+#: ../sshd_wizard/Sshd.pm:151
+msgid ""
+"Strict modes: specifies whether sshd should check file modes and ownership "
+"of the user's files and home directory before accepting login. This is "
+"normally desirable because novices sometimes accidentally leave their "
+"directory or files world-writable"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:151
+#, fuzzy
+msgid "User Login options"
+msgstr "Kirjautumistunnus:"
+
+#: ../sshd_wizard/Sshd.pm:159
+msgid "Strict modes:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:160
+#, fuzzy
+msgid "Allow users:"
+msgstr "Hyväksy osoitteet:"
+
+#: ../sshd_wizard/Sshd.pm:160
+msgid ""
+"If specified, login is allowed only for user names that match one of the "
+"patterns. ie: erwan aginies guibo"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:161
+#, fuzzy
+msgid "Deny users:"
+msgstr "Kiellä osoitteet:"
+
+#: ../sshd_wizard/Sshd.pm:161
+msgid ""
+"Login is disallowed for user names that match one of the patterns. ie: "
+"pirate guillomovitch"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:166
+msgid "Compression: Specifies whether compression is allowed."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:166
+msgid ""
+"X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
+"disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
+"as users can always install their own forwarders."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:172
+#, fuzzy
+msgid "Compression:"
+msgstr "Mukautettu vaihtoehto:"
+
+#: ../sshd_wizard/Sshd.pm:173
+msgid "X11 forwarding:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:178
+#, fuzzy
+msgid "Summary of OpenSSH configuration."
+msgstr "Näytä LDAP asetukset"
+
+#: ../sshd_wizard/Sshd.pm:188
+#, fuzzy
+msgid "The wizard successfully configured your SSH server."
+msgstr "Velho asetti NFS-palvelimen onnistuneesti."
+
+#: ../sshd_wizard/Sshd.pm:250
+#, fuzzy
+msgid "Configuring your OpenSSH server..."
 msgstr "Asetetaan Samaba-palvelimesi."
 
+#: ../sshd_wizard/Sshd.pm:250
+#, fuzzy
+msgid "OpenSSH server"
+msgstr "Apache palvelin"
+
 #: ../time_wizard/Ntp.pm:34
 msgid "Time wizard"
 msgstr "Aika velho"
@@ -2629,6 +3703,11 @@ msgstr "Palvelimesi voi nyt toimia aikapalvelimena paikallisverkollesi."
 msgid "Web wizard"
 msgstr "WWW velho"
 
+#: ../web_wizard/Apache.pm:62
+#, perl-format
+msgid "%s does not exist."
+msgstr "%s ei ole olemassa."
+
 #: ../web_wizard/Apache.pm:71
 msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Tämä velho auttaa asettamaan WWW-palvelimen verkollesi."
@@ -2743,6 +3822,212 @@ msgstr "Apache palvelin"
 msgid "Configuring your system as Apache server ..."
 msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 
+#~ msgid "Admin email"
+#~ msgstr "Ylläpitäjän sähköposti"
+
+#~ msgid "NIS client"
+#~ msgstr "Nis-asiakas"
+
+#~ msgid "Configure computer to be a NIS client"
+#~ msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi"
+
+#~ msgid "You just have to put nisdomain and nisserver."
+#~ msgstr "Tarvitset vain asettaa nis-verkkoalue ja nis-palvelin"
+
+#~ msgid "NIS domain:"
+#~ msgstr "Nis verkkoalue:"
+
+#~ msgid "NIS domainname: name of NIS domain."
+#~ msgstr "NIS verkkoalueen nimi: NIS verkkoalueen nimi."
+
+#~ msgid "NIS server: hostname of the NIS server."
+#~ msgstr "NIS palvelin: NIS-palvelimen konenimi."
+
+#~ msgid ""
+#~ "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
+#~ "binding information."
+#~ msgstr ""
+#~ "YPBIND demoni löytää NIS verkkoalueiden palvelimet ja hallitsee NIS-"
+#~ "liitoksien tietoja."
+
+#~ msgid "Error: should be a directory."
+#~ msgstr "Virhe, Pitää olla hakemisto."
+
+#~ msgid "The wizard successfully configured your machine to be a NIS client."
+#~ msgstr "Velho asetti koneesi NIS asiakkaaksi onnistuneesti."
+
+#~ msgid "Configuring your system as NIS client ..."
+#~ msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi ..."
+
+#~ msgid "Internal mail server"
+#~ msgstr "Sisäinen sähköpostipalvelin"
+
+#~ msgid ""
+#~ "This wizard will help you configure an internal mail server for your "
+#~ "network, or configure an external mail server."
+#~ msgstr ""
+#~ "Tämä velho auttaa asettamaan Internet sähköpostipalvelut verkollesi, tai "
+#~ "asettamaan ulkoisen sähköpostipalvelimen."
+
+#~ msgid "Outgoing mail address"
+#~ msgstr "Lähtevän postipalvelimen osoite"
+
+#~ msgid ""
+#~ "This should be chosen consistently with the address you use for incoming "
+#~ "mail."
+#~ msgstr "Tämä pitäisi olla yhtenäinen saapuvan sähköpostin osoitteen kanssa."
+
+#~ msgid ""
+#~ "You can select the kind of address that outgoing mail will show in the "
+#~ "\"From:\" and \"Reply-to\" field."
+#~ msgstr ""
+#~ "Voit valita osoitemuodon jonka lähtevä sähköposti näyttää kentissä: "
+#~ "\"Keneltä (From)\" ja \"Vastausosoite (Reply-to)\"."
+
+#~ msgid "Warning:"
+#~ msgstr "Varoitus:"
+
+#~ msgid "You entered an empty address for the mail gateway."
+#~ msgstr "Jätit sähköpostin yhdyskäytävä -asetuksen tyhjäksi."
+
+#~ msgid ""
+#~ "Your choice can be accepted, but this will not allow you to send mail "
+#~ "outside your local network. Press next to continue, or back to enter a "
+#~ "value."
+#~ msgstr ""
+#~ "Valintasi voidaan hyväksyä, mutta tämä ei salli sinun lähettää "
+#~ "sähköpostia paikallisverkkosi ulkopuolelle. Paina 'Seuraava' jatkaaksesi, "
+#~ "tai 'Takaisin' korjataksesi asetuksia."
+
+#~ msgid ""
+#~ "Internet host names must be in the form \"host.domain.domaintype\"; for "
+#~ "example, if your provider is \"provider.com\", the Internet mail server "
+#~ "is usually \"smtp.provider.com\"."
+#~ msgstr ""
+#~ "Internet palvelinnimet on oltava muodossa \"palvelin.verkkoalue.aluetyyppi"
+#~ "\"; eli jos esimerkiksi palveluntarjoajasi on \"tarjoaja.fi\", niin "
+#~ "sähköpostipalvelimen nimi on yleensä \"smtp.tarjoaja.fi\"."
+
+#~ msgid "Internet mail gateway"
+#~ msgstr "Internet sähköpostin yhdyskäytävä"
+
+#~ msgid ""
+#~ "Your server will send the outgoing through a mail gateway, that will take "
+#~ "care of the final delivery."
+#~ msgstr ""
+#~ "Postipalvelimesi lähettää lähtevän postin postiyhdyskäytävän kautta, joka "
+#~ "vastaa lopullisen lähetyksen perillemenosta."
+
+#~ msgid "Mail server name:"
+#~ msgstr "Sähköpostipalvelimen nimi:"
+
+#~ msgid "The default is to append myhostname which is fine for small sites."
+#~ msgstr "Oletuksena lisätään myhostname joka rittää pienille verkoille."
+
+#~ msgid "Configuring the external mail server"
+#~ msgstr "Asetetaan ulkoinen sähköpostipalvelin"
+
+#~ msgid "Internet mail gateway:"
+#~ msgstr "Internet sähköpostin yhdyskäytävä:"
+
+#~ msgid "Form of the address:"
+#~ msgstr "Osoitteen muoto:"
+
+#~ msgid "The wizard successfully configured your external mail server."
+#~ msgstr "Velho asetti ulkoisen sähköpostipalvelimen onnistuneesti."
+
+#~ msgid "All - no access restriction"
+#~ msgstr "Kaikki - Ei käyttörajoituksia"
+
+#~ msgid ""
+#~ "This wizard will help you configuring the Samba services of your server."
+#~ msgstr "Tämä velho auttaa asettamaan palvelimesi Samba-palvelut."
+
+#~ msgid ""
+#~ "* Example 1: allow all IP in 150.203.*.*; except one\n"
+#~ "hosts allow = 150.203. EXCEPT 150.203.6.66"
+#~ msgstr ""
+#~ "* Esimerkki 1: hyväksy kaikki ip-osoitteet välillä 150.203.*.* paitsi "
+#~ "yksi tietty\n"
+#~ "hosts allow = 150.203. EXCEPT 150.203.6.66"
+
+#~ msgid ""
+#~ "* Example 2: allow hosts that match the given network/netmask\n"
+#~ "hosts allow = 150.203.15.0/255.255.255.0"
+#~ msgstr ""
+#~ "* Esimerkki 2: hyväksy koneet jotka vastaavat annettua verkkoa/"
+#~ "verkkomaskia\n"
+#~ "hosts allow = 150.203.15.0/255.255.255.0"
+
+#~ msgid ""
+#~ "* Example 3: allow a couple of hosts\n"
+#~ "hosts allow = lapland, arvidsjaur"
+#~ msgstr ""
+#~ "* Esimerkki 3: hyväksy muutama kone\n"
+#~ "hosts allow = lapland, arvidsjaur"
+
+#~ msgid ""
+#~ "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny "
+#~ "access from one particular host\n"
+#~ "hosts allow = @foonet\n"
+#~ "hosts deny = pirate"
+#~ msgstr ""
+#~ "* Esimerkki 4: hyväksy vain koneet NIS-ryhmästä \"foonet\" mutta estä "
+#~ "yhteys yhdestä tietystä osoitteesta\n"
+#~ "hosts allow = @foonet\n"
+#~ "hosts deny = pirate"
+
+#~ msgid "Note that access still requires suitable user-level passwords."
+#~ msgstr ""
+#~ "Huomaa että yhteys vaatii silti oikein määritetyn käyttäjän/salasanan."
+
+#~ msgid ""
+#~ "Samba can provide a common file sharing area to your Windows workstation, "
+#~ "and can also provide printer sharing for the printers connected to your "
+#~ "server."
+#~ msgstr ""
+#~ "Samba voi tarjota yleisen tiedostonjakelualueen Windows-työasemillesi, "
+#~ "sekä tulostimen jaon kaikille tulostimille jotka on kytketty palvelimeen."
+
+#~ msgid "Enable file sharing area"
+#~ msgstr "Ota käyttöön jaettu alue"
+
+#~ msgid "Enable server Printer Sharing"
+#~ msgstr "Ota käyttöön Palvelimen jaettu tulostus"
+
+#~ msgid "Make home directories available for their owners"
+#~ msgstr "Aseta kotihakemistot omistajiensa saataville."
+
+#~ msgid "Shared directory:"
+#~ msgstr "Jaettu hakemisto:"
+
+#~ msgid "Type the path of the directory you want being shared."
+#~ msgstr "Syötä hakemisto jonka haluat jakaa."
+
+#~ msgid "Failed to create directory."
+#~ msgstr "Hakemiston luonti epäonnistui"
+
+#~ msgid "File permissions"
+#~ msgstr "Tiedoston oikeudet"
+
+#~ msgid ""
+#~ "Type users or groups separated by a comma (groups must be preceded by a "
+#~ "'@') like this:\n"
+#~ "root, fred, @users, @wheel for each kind of permission."
+#~ msgstr ""
+#~ "Anna käyttäjät tai ryhmät pilkuilla erotettuna (ryhmiä täytyy edeltää "
+#~ "'@') esimerkiksi näin:\n"
+#~ "root fred @users @wheel jokaiselle eri oikeudelle."
+
+#~ msgid "Read list:"
+#~ msgstr "Lukulista:"
+
+#~ msgid "root, fred, @users, @wheel"
+#~ msgstr "root, fred, @users, @wheel"
+
+#~ msgid "File sharing:"
+#~ msgstr "Tiedostojako:"
+
 #~ msgid "You need to readjust your hostname."
 #~ msgstr "Sinun täytyy uudelleenmäärittää koneesi nimi."
 
@@ -2806,12 +4091,6 @@ msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 #~ msgid "Home Directory:"
 #~ msgstr "Kotihakemisto:"
 
-#~ msgid "Login shell:"
-#~ msgstr "Sisäänkirjautumiskehote:"
-
-#~ msgid "uid number:"
-#~ msgstr "uid numero:"
-
 #~ msgid "Group ID:"
 #~ msgstr "Ryhmä ID (GID):"
 
@@ -2843,15 +4122,9 @@ msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 #~ msgid "RootDN"
 #~ msgstr "RootDN"
 
-#~ msgid "Default OU"
-#~ msgstr "Oletus OU"
-
 #~ msgid "Ok Now add entry in LDAP"
 #~ msgstr "Ok, nyt lisätään tietuetta LDAP:iin"
 
-#~ msgid "Home directory:"
-#~ msgstr "Kotihakemisto:"
-
 #~ msgid "shadowMax:"
 #~ msgstr "shadowMax:"
 
@@ -2885,9 +4158,6 @@ msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 #~ msgid "Please choose a correct one"
 #~ msgstr "Ole hyvä ja valitse kelvollinen"
 
-#~ msgid "Please Should be a number"
-#~ msgstr "Pitäisi olla numero"
-
 #~ msgid ""
 #~ "It seems that your are not a master DNS server, but just a slave one. So "
 #~ "I can't add/remove host."
@@ -2898,13 +4168,6 @@ msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "Velho asetti NFS-palvelimen onnistuneesti."
 
-#~ msgid ""
-#~ "The myorigin parameter specifies the domain that locally-posted mail "
-#~ "appears to come from"
-#~ msgstr ""
-#~ "Parametri 'myorigin=' määrittää mistä verkkoalueesta paikallisesti "
-#~ "lähetetyt viestit näyttää tulevan"
-
 #~ msgid "Form of the address"
 #~ msgstr "Osoitteen muoto"
 
@@ -2952,15 +4215,9 @@ msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 #~ msgid "NIS Server:"
 #~ msgstr "NIS-palvelin:"
 
-#~ msgid "Network File:"
-#~ msgstr "Verkkotiedosto:"
-
 #~ msgid "NFS exports:"
 #~ msgstr "NFS exports:"
 
-#~ msgid "Auto master:"
-#~ msgstr "Automattinen isäntä:"
-
 #~ msgid "Auto home:"
 #~ msgstr "Automaattinen kotihakemisto:"
 
@@ -2969,4 +4226,3 @@ msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 
 #~ msgid "Document Root:"
 #~ msgstr "Juurihakemisto:"
-