[Pkg-samba-maint] r1070 - in trunk: . po

Mon May 29 06:02:36 UTC 2006

Author: bubulle
Date: 2006-05-29 06:02:33 +0000 (Mon, 29 May 2006)
New Revision: 1070

Modified:
   trunk/changelog
   trunk/po/ca.po
   trunk/po/cs.po
   trunk/po/da.po
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/gl.po
   trunk/po/it.po
   trunk/po/ja.po
   trunk/po/nl.po
   trunk/po/pt.po
   trunk/po/pt_BR.po
   trunk/po/ru.po
   trunk/po/sv.po
   trunk/po/templates.pot
   trunk/po/tr.po
   trunk/po/vi.po
   trunk/samba-common.templates
   trunk/samba.templates
   trunk/swat.templates
Log:
Debconf templates rewrite for DevRef compliance


Modified: trunk/changelog
===================================================================

--- trunk/changelog	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/changelog	2006-05-29 06:02:33 UTC (rev 1070)
@@ -18,6 +18,8 @@
   * Add dependency on procps for samba, as ps is used in init scripts.
     Thanks to Bastian Blank for reporting. Closes: #365618
   * Add (U)MOUNT_CIFS_VENDOR_SUFFIX to VERSION.patch
+  * Rewrite debconf templates to be compliant with 6.5.2 of the Developer's
+    Reference
 
   [ Peter Eisentraut ]
   * Use debian/compat instead of DH_COMPAT

Modified: trunk/po/ca.po
===================================================================
--- trunk/po/ca.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/ca.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba_3.0.0beta2-1_templates\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2004-03-13 21:32-0500\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -23,9 +23,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -37,12 +38,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Si deixeu aquesta opció en blanc no es modificarà el smb.conf."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Joc de caràcters pels clients DOS"
@@ -50,13 +45,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "El fitxer smb.conf actual té configurat un \"client code page\".  En la "
 "versió 3.0 de Samba, aquesta opció es reemplaça per l'opció \"dos charset\". "
@@ -65,9 +60,16 @@
 "pels clients de DOS. Si deixeu aquesta opció en blanc no es canviarà el smb."
 "conf."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Si deixeu aquesta opció en blanc no es modificarà el smb.conf."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Voleu modificar el smb.conf perquè utilitza els paràmetres de configuració "
@@ -75,7 +77,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -92,29 +94,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Per beneficiar-vos d'aquesta característica cal que tingueu instal·lat el "
 "paquet dhcp3-client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Voleu configurar el smb.conf a través del debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "La resta de la configuració del Samba tracta amb qüestions que afecten els "
 "paràmetres del fitxer de configuració els programes de Samba /etc/samba/smb."
@@ -124,12 +129,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Si no utilitzeu el debconf per configurar el smb.conf, haureu de gestionar "
 "manualment qualsevol canvi de la configuració, i no us podreu beneficiar de "
@@ -138,14 +143,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Grup de treball/nom del domini?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -162,13 +169,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Els clients de Windows més recents es comuniquen amb els servidors de Samba "
 "utilitzant contrasenyes encriptades. Si voleu utilitzar contrasenyes amb "
@@ -179,6 +184,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Els clients de Windows més recents es comuniquen amb els servidors de Samba "
+"utilitzant contrasenyes encriptades. Si voleu utilitzar contrasenyes amb "
+"text pla, haureu de modificar el vostre registre de Windows. És recomanable "
+"utilitzar contrasenyes encriptades. Si ho feu, assegureu-vos de tenir un "
+"fitxer /etc/samba/smbpasswd vàlid i que hi especifiqueu la contrasenya de "
+"cada usuari utilitzant l'ordre smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
@@ -190,14 +211,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "El Samba s'ha de configurar perquè utilitzi contrasenyes encriptades per tal "
 "que sigui compatible amb la majoria de versions de Windows per defecte. Això "
 "implica que les contrasenyes d'usuari s'emmagatzemin a un fitxer diferent "
@@ -209,19 +235,29 @@
 "Per més informació feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html del paquet samba-doc."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "S'han desplaçat els fitxers de registre de Samba."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Els fitxers de registre dels dos dimonis de Samba (nmbd i smbd) es desen a /"
 "var/log/samba des de la primera versió dels paquets de Samba 2.2 per Debian. "
@@ -229,28 +265,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "Els fitxers de registre antics que estaven a /var/log/ es desplacen a la "
 "nova ubicació."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "L'execució del nmbd a través del inetd ja no estarà suportada."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "El vostre sistema estava prèviament configurat perquè inicies el nmbd i el "
 "smbd a través del inetd. A partir de la versió 2.999+3.0alpha20-4 el nmbd no "
@@ -260,19 +299,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "dimonis, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Com voleu executar el Samba?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -282,20 +321,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Es desplaça etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "El Samba 3.0 introdueix una interfície de base de dades de SAM més nova i "
 "completa que reemplaça el fitxer /etc/samba/smbpassd.  Voleu que es migri el "
 "fitxer smbpasswd a /var/lib/samba/passdb.tdb?  Si la vostra intenció és "
@@ -304,17 +350,24 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "El vostre smb.conf es reescriurà"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "El SWAT reescriurà el vostre fitxer smb.conf. Reorganitzarà les entrades i "
 "suprimirà els comentaris i les opcions include= i copy=.  Si teniu un smb."
 "conf molt elaborat feu una còpia de seguretat o no utilitzeu el SWAT."
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Com voleu executar el Samba?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "El vostre smb.conf es reescriurà"

Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/cs.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2004-03-05 12:04+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <provoz at debian.cz>\n"
@@ -32,9 +32,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -45,12 +46,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Pokud nezadáte nic, vá¹ smb.conf se nezmìní."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Znaková sada pro DOSové klienty."
@@ -58,13 +53,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Momentálnì máte ve svém smb.conf nastavenou volbu \"client code page\". V "
 "Sambì 3.0 je tato volba nahrazena volbou \"dos charset\". Zadejte, prosím, "
@@ -73,15 +68,22 @@
 "klienty, pouze pro DOSové klienty. Pokud nezadáte nic, vá¹ smb.conf se "
 "nezmìní."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Pokud nezadáte nic, vá¹ smb.conf se nezmìní."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Upravit smb.conf, aby pou¾íval WINS nastavení z DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -97,28 +99,31 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Pro vyu¾ití této vlastnosti musíte mít nainstalovaný balík dhcp3-client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Konfigurovat smb.conf pøes debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "Zbytek konfigurace Samby se zabývá otázkami, které mìní parametry v /etc/"
 "samba/smb.conf, co¾ je soubor pou¾ívaný pro nastavení programù nmbd a smbd "
@@ -128,12 +133,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Pokud pro konfiguraci smb.conf nepou¾íváte debconf, budete muset zvládnout "
 "v¹echna nastavení sami a nebudete moci vyu¾ívat výhod pravidelných vylep¹ení "
@@ -142,14 +147,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Skupina/Doménové jméno?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -165,13 +172,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Souèasní windowsoví klienti pou¾ívají pøi komunikaci se SMB servery "
 "za¹ifrovaná hesla. Pokud chcete pou¾ít hesla neza¹ifrovaná, musíte zmìnit "
@@ -181,6 +186,21 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Souèasní windowsoví klienti pou¾ívají pøi komunikaci se SMB servery "
+"za¹ifrovaná hesla. Pokud chcete pou¾ít hesla neza¹ifrovaná, musíte zmìnit "
+"jeden parametr v registrech systému Windows. Doporuèujeme pou¾ívat "
+"za¹ifrovaná hesla. Hesla mù¾ete jednotlivým u¾ivatelùm pøidat pøíkazem "
+"smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Vytvoøit databázi hesel /var/lib/samba/passdb.tdb?"
@@ -191,14 +211,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Pro dosa¾ení co nejvìt¹í kompatibility s vìt¹inou verzí systému Windows musí "
 "být Samba nastavena, aby pou¾ívala ¹ifrovaná hesla. To vy¾aduje, aby byla "
 "hesla uchována mimo souboru /etc/passwd. Po¾adovaný soubor mù¾ete nechat "
@@ -209,19 +234,29 @@
 "naleznete v /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html z balíku samba-"
 "doc."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Logovací soubory Samby se pøesunuly."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Od prvních debianích balíèkù Samby verze 2.2 jsou logovací soubory obou "
 "serverù (nmbd a smbd) umístìny ve /var/log/samba/. Názvy pøíslu¹ných souborù "
@@ -229,27 +264,30 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "Staré soubory z adresáøe /var/log/ budou pøesunuty na nové místo automaticky."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Spou¹tìní nmbd z inetd ji¾ není podporováno"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Vá¹ systém byl pùvodnì nastaven, aby spou¹tìl nmbd a smbd z inetd. Od verze "
 "2.999+3.0.alpha20-4 ji¾ nelze nmbd spou¹tìt z inetd. Pokud jste si upravili "
@@ -258,19 +296,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "démoni, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Jak chcete spou¹tìt Sambu?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -280,20 +318,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Pøesunout /etc/samba/smbpasswd do /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 zavedla nové, kompletnìj¹í rozhraní k SAM databázi, je¾ pøekonává "
 "pùvodní soubor /etc/samba/smbpasswd. Chcete pøevést stávající soubor "
 "smbpasswd na /var/lib/samba/passwd.tdb? Pokud plánujete pou¾ít jinou pdb "
@@ -302,17 +347,24 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Vá¹ smb.conf bude pøepsán!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT pøepí¹e vá¹ soubor smb.conf. Mj. pøeskládá polo¾ky a sma¾e v¹echny "
 "komentáøe a volby include= a copy=. Pokud máte pracnì odladìný smb.conf, tak "
 "si jej zazálohujte, nebo nepou¾ívejte SWAT!"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Jak chcete spou¹tìt Sambu?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Vá¹ smb.conf bude pøepsán!"

Modified: trunk/po/da.po
===================================================================
--- trunk/po/da.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/da.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2004-02-15 17:23+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -24,9 +24,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -37,12 +38,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Hvis du ikke skriver noget her, vil din smb.conf ikke blive Ã¦ndret."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "TegnsÃ¦t til DOS-klienter"
@@ -50,13 +45,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Du har en \"client code page\"-indstilling i din smb.conf. I Samba 3.0 "
 "erstattes denne af en ny indstilling, \"dos charset\". Angiv det tegnsÃ¦t, du "
@@ -65,15 +60,22 @@
 "understÃ¸tte Windows-klienter; den gÃ¦lder kun DOS-klienter. Hvis du ikke "
 "skriver noget her, vil smb.conf ikke blive Ã¦ndret."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Hvis du ikke skriver noget her, vil din smb.conf ikke blive Ã¦ndret."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ret smb.conf, sÃ¥ den benytter WINS-indstillinger fra DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -89,29 +91,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Ud skal have pakken dhcp3-client installeret for at kunne udnytte denne "
 "funktion."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "SÃ¦t smb.conf op med debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "Resten af Samba-opsÃ¦tningen drejer sig om spÃ¸rgsmÃ¥l om indstillingerne i "
 "filen /etc/samba/smb.conf, som benyttes til at sÃ¦tte Samba-programmerne "
@@ -122,12 +127,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Hvis du ikke bruger debconf til at sÃ¦tte smb.conf op, mÃ¥ du selv hÃ¥ndtere "
 "Ã¦ndringer i opsÃ¦tningen, og vil ikke kunne drage nytte af de lÃ¸bende "
@@ -137,14 +142,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Navn pÃ¥ arbejdsgruppe/domÃ¦ne?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -161,13 +168,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Nyere Windows-klienter kommunikerer med SMB-servere med krypterede "
 "adgangskoder. Hvis du vil bruge adgangkoder i klar tekst, bliver du nÃ¸dt til "
@@ -178,6 +183,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Nyere Windows-klienter kommunikerer med SMB-servere med krypterede "
+"adgangskoder. Hvis du vil bruge adgangkoder i klar tekst, bliver du nÃ¸dt til "
+"at Ã¦ndre en indstilling i Windows' registreringsdatabase. Det anbefales at "
+"du bruger krypterede adgangskoder. Hvis du gÃ¸r, sÃ¥ sÃ¸rg for at du har en "
+"gyldig /etc/samba/smbpasswd-fil og at du her angiver adgangskoder for hver "
+"bruger med kommandoen smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Opret samba-adgangskodedatabasen /var/lib/samba/passdb.tdb?"
@@ -188,14 +209,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "For at vÃ¦re kompatibel med standardindstillingerne i de fleste udgaver af "
 "Windows, skal Samba vÃ¦re sat op til at benytte krypterede adgangskoder. Det "
 "krÃ¦ver at brugernes adgangskoder gemmes i en anden fil end /etc/passwd. "
@@ -206,19 +232,29 @@
 "adgangskoder i klar tekst. Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 "html i pakken samba-doc for flere detaljer."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Sambas logfiler er flyttet."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Fra og med de fÃ¸rste Samba 2.2-Debianpakker, bliver begge Samba-dÃ¦monernes "
 "(nmbd og smbd) logfiler gemt i /var/log/samba/. Filernes navne er log.nmbd "
@@ -226,28 +262,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "De gamle logfiler, der var i /var/log vil blive flyttet til den nye "
 "placering for dig."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "KÃ¸rsel af nmbd fra inetd understÃ¸ttes ikke lÃ¦ngere."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Dit system var tidligere sat op til at starte nmbd og smbd fra inetd. Fra og "
 "med version 2.999+3.0.alpha20-4 kan nmbd ikke lÃ¦ngere startes med inetd. "
@@ -256,19 +295,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "dÃ¦moner, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Hvordan skal Samba kÃ¸res?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -278,20 +317,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Flyt /etc/samba/smbpasswd til /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 har en nyere og mere komplet SAM-databasegrÃ¦nseflade, som "
 "erstatter filen /etc/samba/smbpasswd. Vil du have din eksisterende smbpasswd-"
 "fil overfÃ¸rt til /var/lib/samba/passdb.tdb?`Hvis du i stedet planlÃ¦gger at "
@@ -300,18 +346,25 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Din smb.conf vil blive omskrevet!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT vil overskrive din smb.conf-fil. Den vil flytte rundt pÃ¥ linjerne og "
 "slette alle kommentarer, og linjer med \"include=\" og \"copy=\". Hvis du "
 "har brugt tid pÃ¥ at lave din egen smb.conf, sÃ¥ tag en sikkerhedskopi eller "
 "undlad at benytte SWAT!"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Hvordan skal Samba kÃ¸res?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Din smb.conf vil blive omskrevet!"

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/de.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: samba_3.0.14a-6.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2005-08-18 08:18+0200\n"
 "Last-Translator: Martin Krüger <mkrueger at mkru.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -32,29 +32,20 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  "
-"In Samba 3.0, this option is replaced by a new option, \"unix charset"
-"\". Please specify the character set you wish to use for this new "
-"option, which controls how Samba interprets filenames on the file "
-"system."
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for this new option, which "
+"controls how Samba interprets filenames on the file system."
 msgstr ""
 "Sie haben zurzeit ein \"character set\" in Ihrer smb.conf angegeben. In "
-"Samba 3.0 wurde die Option durch die neue Option \"unix charset\" "
-"ersetzt. Bitte geben Sie einen Zeichensatz an, den Sie verwenden "
-"wollen. Dieser bestimmt, wie Samba Dateinamen auf dem Dateisystem "
-"interpretiert."
+"Samba 3.0 wurde die Option durch die neue Option \"unix charset\" ersetzt. "
+"Bitte geben Sie einen Zeichensatz an, den Sie verwenden wollen. Dieser "
+"bestimmt, wie Samba Dateinamen auf dem Dateisystem interpretiert."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid ""
-"If you leave this option blank, your smb.conf will not be changed."
-msgstr ""
-"Wenn Sie diese Option leer lassen, wird Ihre smb.conf nicht verändert."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Zeichensatz für DOS-Clients"
@@ -62,27 +53,32 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In "
-"Samba 3.0, this option is replaced by the option \"dos charset\".  "
-"Please specify the character set you wish to use for this new "
-"option.  In most cases, the default chosen for you will be "
-"sufficient.  Note that this option is not needed to support Windows "
-"clients, it is only for DOS clients.  If you leave this option blank, "
-"your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
-"Zurzeit haben Sie \"client code page\" in Ihrer smb.conf angegeben. "
-"In Samba 3.0 wird diese Option durch die Option \"dos charset\" "
-"ersetzt. Bitte geben Sie den Zeichensatz an, den Sie für die neue "
-"Option benutzen wollen. In den meisten Fällen ist der standardmäßig "
-"gewählte Zeichensatz ausreichend. Bemerkung: Diese Option ist nur "
-"für das Betreiben von DOS-Clients notwendig, nicht für Windows-"
-"Clients. Wenn Sie diese Option leer lassen, wird Ihre smb.conf nicht "
-"verändert."
+"Zurzeit haben Sie \"client code page\" in Ihrer smb.conf angegeben. In Samba "
+"3.0 wird diese Option durch die Option \"dos charset\" ersetzt. Bitte geben "
+"Sie den Zeichensatz an, den Sie für die neue Option benutzen wollen. In den "
+"meisten Fällen ist der standardmäßig gewählte Zeichensatz ausreichend. "
+"Bemerkung: Diese Option ist nur für das Betreiben von DOS-Clients notwendig, "
+"nicht für Windows-Clients. Wenn Sie diese Option leer lassen, wird Ihre smb."
+"conf nicht verändert."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Wenn Sie diese Option leer lassen, wird Ihre smb.conf nicht verändert."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Soll smb.conf so abgeändert werden, dass WINS-Einstellungen von DHCP "
@@ -90,87 +86,89 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
-"If your computer gets IP address information from a DHCP server on "
-"the network, the DHCP server may also provide information about WINS "
-"servers (\"NetBIOS name servers\") present on the network.  This "
-"requires a change to your smb.conf file so that DHCP-provided WINS "
-"settings will automatically be read from /etc/samba/dhcp.conf."
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
 msgstr ""
-"Wenn Ihr Computer IP-Adress-Informationen von einem DHCP-Server "
-"bezieht, dann kann es sein, dass auch Informationen über WINS-Server "
-"zur Verfügung gestellt werden, sollten solche Server im Netzwerk "
-"vorhanden sein. Eine automatische Konfiguration von Samba mit diesen "
-"ermittelten Werten ist möglich, erfordert aber eine Änderung der smb."
-"conf. Damit würden automatisch die WINS-Einstellungen aus der Datei /"
-"etc/samba/dhcp.conf übernommen."
+"Wenn Ihr Computer IP-Adress-Informationen von einem DHCP-Server bezieht, "
+"dann kann es sein, dass auch Informationen über WINS-Server zur Verfügung "
+"gestellt werden, sollten solche Server im Netzwerk vorhanden sein. Eine "
+"automatische Konfiguration von Samba mit diesen ermittelten Werten ist "
+"möglich, erfordert aber eine Änderung der smb.conf. Damit würden automatisch "
+"die WINS-Einstellungen aus der Datei /etc/samba/dhcp.conf übernommen."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of "
-"this feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
-"Sie müssen das Paket dhcp3-client installiert haben, um dieses "
-"Feature nutzen zu können."
+"Sie müssen das Paket dhcp3-client installiert haben, um dieses Feature "
+"nutzen zu können."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Soll smb.conf durch debconf konfiguriert werden?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"The rest of the configuration of Samba deals with questions that "
-"affect parameters in /etc/samba/smb.conf, which is the file used to "
-"configure the Samba programs (nmbd and smbd). Your current smb.conf "
-"contains an 'include' line or an option that spans multiple lines, "
-"which could confuse debconf and require you to edit your smb.conf by "
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
 "Ihre aktuelle smb.conf enthält mindestens eine 'include'-Zeile oder "
 "mindestens eine mehrzeilige Option. Dies kann zu einer fehlerhaft "
-"generierten smb.conf-Datei führen. Es kann daher nötig werden, dass "
-"Sie Ihre smb.conf manuell korrigieren müssen, um den ordnungsgemäßen "
-"Betrieb von Samba zu gewährleisten."
+"generierten smb.conf-Datei führen. Es kann daher nötig werden, dass Sie Ihre "
+"smb.conf manuell korrigieren müssen, um den ordnungsgemäßen Betrieb von "
+"Samba zu gewährleisten."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to "
-"handle any configuration changes yourself, and will not be able to "
-"take advantage of periodic configuration enhancements.  Therefore, "
-"use of debconf is recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
-"Wenn Sie debconf nicht zur Konfiguration der smb.conf benutzen, "
-"werden Sie jede Änderung an der Konfiguration manuell vornehmen "
-"müssen. Erweiterungen der Konfiguration - in neueren Versionen - "
-"werden nicht automatisch in smb.conf einfließen. Daher ist das "
-"Benutzen von debconf empfohlen, falls möglich."
+"Wenn Sie debconf nicht zur Konfiguration der smb.conf benutzen, werden Sie "
+"jede Änderung an der Konfiguration manuell vornehmen müssen. Erweiterungen "
+"der Konfiguration - in neueren Versionen - werden nicht automatisch in smb."
+"conf einfließen. Daher ist das Benutzen von debconf empfohlen, falls möglich."
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Arbeitsgruppe/Domain Name?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when "
-"queried by clients. Note that this parameter also controls the Domain "
-"name used with the security=domain setting."
+"Please specify the workgroup this server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
 msgstr ""
 "Diese Einstellung gibt an, in welcher Arbeitsgruppe dieser Server bei "
-"Anfragen erscheint. Bemerkung: Dieser Parameter setzt auch den "
-"Domain Name, welcher in der Option security=domain verwendet wird."
+"Anfragen erscheint. Bemerkung: Dieser Parameter setzt auch den Domain Name, "
+"welcher in der Option security=domain verwendet wird."
 
 #. Type: boolean
 #. Description
@@ -181,170 +179,210 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to "
-"change a parameter in your Windows registry. It is recommended that "
-"you use encrypted passwords. If you do, make sure you have a valid /"
-"etc/samba/smbpasswd file and that you set passwords in there for each "
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
+msgstr ""
+"Neuere Windows-Versionen kommunizieren mit SMB-Servern und benutzen dabei "
+"verschlüsselte Passworte. Wenn Sie Passworte im Klartext verwenden wollen, "
+"dann müssen Sie einen bestimmten Parameter in der Windows Registry ändern. "
+"Es ist empfohlen verschlüsselte Passwörter zu verwenden. Falls Sie "
+"verschlüsselte Passwörter verwenden, stellen Sie sicher, dass Sie eine "
+"gültige /etc/samba/smbpasswd-Datei haben und dass die Passworte für jeden "
+"User mit dem Samba-Hilfsprogramm smbpasswd gesetzt wurden."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
 "user using the smbpasswd command."
 msgstr ""
-"Neuere Windows-Versionen kommunizieren mit SMB-Servern und benutzen "
-"dabei verschlüsselte Passworte. Wenn Sie Passworte im Klartext "
-"verwenden wollen, dann müssen Sie einen bestimmten Parameter in der "
-"Windows Registry ändern. Es ist empfohlen verschlüsselte Passwörter "
-"zu verwenden. Falls Sie verschlüsselte Passwörter verwenden, stellen "
-"Sie sicher, dass Sie eine gültige /etc/samba/smbpasswd-Datei haben "
-"und dass die Passworte für jeden User mit dem Samba-Hilfsprogramm "
-"smbpasswd gesetzt wurden."
+"Neuere Windows-Versionen kommunizieren mit SMB-Servern und benutzen dabei "
+"verschlüsselte Passworte. Wenn Sie Passworte im Klartext verwenden wollen, "
+"dann müssen Sie einen bestimmten Parameter in der Windows Registry ändern. "
+"Es ist empfohlen verschlüsselte Passwörter zu verwenden. Falls Sie "
+"verschlüsselte Passwörter verwenden, stellen Sie sicher, dass Sie eine "
+"gültige /etc/samba/smbpasswd-Datei haben und dass die Passworte für jeden "
+"User mit dem Samba-Hilfsprogramm smbpasswd gesetzt wurden."
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Samba-Passwort-Datenbank in /var/lib/samba/passdb.tdb erstellen?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords.  This requires user passwords to "
+"be stored in a file separate from /etc/passwd."
 msgstr ""
-"Samba-Passwort-Datenbank in /var/lib/samba/passdb.tdb erstellen?"
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:4
+#, fuzzy
 msgid ""
-"To be compatible with the defaults in most versions of Windows, Samba "
-"must be configured to use encrypted passwords.  This requires user "
-"passwords to be stored in a file separate from /etc/passwd. This file "
-"can be created automatically, but the passwords must be added "
-"manually (by you or the user) by running smbpasswd, and you must "
-"arrange to keep it up-to-date in the future.  If you do not create "
-"it, you will have to reconfigure samba (and probably your client "
-"machines) to use plaintext passwords. See /usr/share/doc/samba-doc/"
-"htmldocs/ENCRYPTION.html from the samba-doc package for more details."
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
 msgstr ""
-"Um mit den neusten Versionen von Windows kompatibel zu sein, muss "
-"Samba mit verschlüsselten Passwörtern konfiguriert werden. Dies "
-"zwingt jedoch dazu, die Benutzer-Passwörter in einer anderen Datei "
-"als /etc/passwd zu speichern. Diese andere Datei kann automatisch "
-"erzeugt werden, jedoch müssen die Passwörter manuell ergänzt werden "
-"(von Ihnen oder dem Benutzer) durch das Ausführen von smbpasswd. "
-"Zusätzlich müssen Vorkehrungen getroffen werden, die Passwörter in "
-"Zukunft aktuell zu halten. Wenn Sie die Datei nicht erstellen, müssen "
-"Sie Samba anders konfigurieren (und möglicherweise die Clients auch), "
-"um unverschlüsselte Passwörter zu benutzen. Siehe /usr/share/doc/"
-"samba-doc/htmldocs/ENCRYPTION.html des Pakets samba-doc für weitere "
+"Um mit den neusten Versionen von Windows kompatibel zu sein, muss Samba mit "
+"verschlüsselten Passwörtern konfiguriert werden. Dies zwingt jedoch dazu, "
+"die Benutzer-Passwörter in einer anderen Datei als /etc/passwd zu speichern. "
+"Diese andere Datei kann automatisch erzeugt werden, jedoch müssen die "
+"Passwörter manuell ergänzt werden (von Ihnen oder dem Benutzer) durch das "
+"Ausführen von smbpasswd. Zusätzlich müssen Vorkehrungen getroffen werden, "
+"die Passwörter in Zukunft aktuell zu halten. Wenn Sie die Datei nicht "
+"erstellen, müssen Sie Samba anders konfigurieren (und möglicherweise die "
+"Clients auch), um unverschlüsselte Passwörter zu benutzen. Siehe /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html des Pakets samba-doc für weitere "
 "Details."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Sambas Log-Dateien wurden verschoben."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log "
-"files for both Samba daemons (nmbd and smbd) are now stored in /var/"
-"log/samba/. The names of the files are log.nmbd and log.smbd, for "
-"nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
-"Beginnend mit den ersten Paketen von Samba 2.2 für Debian befinden "
-"sich die Log-Dateien für beide Samba-Prozesse (nmbd und smbd) jetzt "
-"in /var/log/samba/. Die Namen der Dateien sind log.nmbd und log.smbd."
+"Beginnend mit den ersten Paketen von Samba 2.2 für Debian befinden sich die "
+"Log-Dateien für beide Samba-Prozesse (nmbd und smbd) jetzt in /var/log/"
+"samba/. Die Namen der Dateien sind log.nmbd und log.smbd."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new "
-"location for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
-"Die alten Log-Dateien, welche in /var/log/ waren, werden für Sie in "
-"das neue Verzeichnis verschoben."
+"Die alten Log-Dateien, welche in /var/log/ waren, werden für Sie in das neue "
+"Verzeichnis verschoben."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Starten von nmbd über inetd wird nicht mehr unterstützt"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from "
-"inetd.  As of version 2.999+3.0.alpha20-4, nmbd will no longer be "
-"started from inetd.  If you have modified your /etc/init.d/samba "
-"startup script, you may need to adjust it by hand now so that nmbd "
-"will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
-"Ihr System war zuvor so konfiguriert, dass es nmbd und smbd über "
-"inetd startete. Seit Version 2.999+3.0.alpha20-4 wird nmbd nicht "
-"länger über inetd gestartet. Sollten Sie Ihr Startup-Skript /etc/init."
-"d/samba abgeändert haben, müssen Sie für einen korrekten Start von "
-"nmbd möglicherweise manuelle Korrekturen vornehmen."
+"Ihr System war zuvor so konfiguriert, dass es nmbd und smbd über inetd "
+"startete. Seit Version 2.999+3.0.alpha20-4 wird nmbd nicht länger über inetd "
+"gestartet. Sollten Sie Ihr Startup-Skript /etc/init.d/samba abgeändert "
+"haben, müssen Sie für einen korrekten Start von nmbd möglicherweise manuelle "
+"Korrekturen vornehmen."
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Wie wollen Sie Samba starten?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
-"The Samba daemon smbd can run as a normal daemon or from inetd. "
-"Running as a daemon is the recommended approach."
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
 msgstr ""
-"Der Samba-Prozess smbd kann als normaler Hintergrunddienst (Daemon) "
-"laufen oder über inetd gestartet werden. Ersteres wird jedoch "
-"empfohlen."
+"Der Samba-Prozess smbd kann als normaler Hintergrunddienst (Daemon) laufen "
+"oder über inetd gestartet werden. Ersteres wird jedoch empfohlen."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr ""
-"Soll /etc/samba/smbpasswd nach /var/lib/samba/passdb.tdb verschoben "
-"werden?"
+"Soll /etc/samba/smbpasswd nach /var/lib/samba/passdb.tdb verschoben werden?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface "
-"which supersedes the /etc/samba/smbpasswd file.  Would you like your "
-"existing smbpasswd file to be migrated to /var/lib/samba/passdb.tdb "
-"for you?  If you plan to use another pdb backend (e.g., LDAP) "
-"instead, you should answer 'no' here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 führt eine neue, komplexere SAM-Datenbank-Schnittstelle ein, "
-"welche die Datei /etc/samba/smbpasswd ablöst. Wollen Sie Ihre "
-"bestehende smbpasswd-Datei nach /var/lib/samba/passdb.tdb migrieren? "
-"Wenn Sie planen ein anderes pdb-Backend (z.B. LDAP) zu verwenden, "
-"sollten Sie hier mit 'Nein' antworten."
+"welche die Datei /etc/samba/smbpasswd ablöst. Wollen Sie Ihre bestehende "
+"smbpasswd-Datei nach /var/lib/samba/passdb.tdb migrieren? Wenn Sie planen "
+"ein anderes pdb-Backend (z.B. LDAP) zu verwenden, sollten Sie hier mit "
+"'Nein' antworten."
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Ihre smb.conf wird überschrieben!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries "
-"and delete all comments, include= and copy= options. If you have a "
-"carefully crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
-"SWAT wird Ihre smb.conf überschreiben. Es wird die Einträge "
-"umorganisieren und alle Kommentare, sowie die Optionen include= und "
-"copy=, löschen. Wenn Sie eine mühsam erstellte smb.conf haben, machen "
-"Sie eine Datensicherung oder benutzen Sie SWAT nicht!"
+"SWAT wird Ihre smb.conf überschreiben. Es wird die Einträge umorganisieren "
+"und alle Kommentare, sowie die Optionen include= und copy=, löschen. Wenn "
+"Sie eine mühsam erstellte smb.conf haben, machen Sie eine Datensicherung "
+"oder benutzen Sie SWAT nicht!"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Wie wollen Sie Samba starten?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Ihre smb.conf wird überschrieben!"

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/es.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2003-07-02 21:51-0500\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -33,9 +33,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -46,12 +47,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Si deja en blanco este campo, no se cambiarÃ¡ smb.conf."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Juego de caracteres para los clientes DOS"
@@ -59,13 +54,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Actualmente hay una opciÃ³n de \"client code page\" en smb.conf.  En Samba "
 "3.0 esta opciÃ³n ha sido reemplazado por la opciÃ³n \"dos charset\".  Por "
@@ -74,16 +69,23 @@
 "exclusivamente para los clientes DOS.  Si deja en blanco este campo, no se "
 "cambiarÃ¡ smb.conf."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Si deja en blanco este campo, no se cambiarÃ¡ smb.conf."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Â¿Modificar smb.conf para usar la configuraciÃ³n WINS que proviene de DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -99,28 +101,31 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Â¿Configurar smb.conf mediante debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "El resto de la configuraciÃ³n de Samba trata sobre cuestiones que afectan al "
 "contenido de /etc/samba/smb.conf, que es el fichero utilizado para "
@@ -131,12 +136,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Si no usa debconf para configurar smb.conf, tendrÃ¡ que cuidar a mano "
 "cualquier cambio a la configuraciÃ³n de Samba y no disfrutarÃ¡ de aumentos "
@@ -146,14 +151,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Nombre del dominio o del grupo de trabajo"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -170,13 +177,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Los clientes Windows mÃ¡s modernos se comunican con los servidores SMB "
 "utilizando contraseÃ±as cifradas. Si quiere usar contraseÃ±as en texto plano, "
@@ -187,6 +192,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Los clientes Windows mÃ¡s modernos se comunican con los servidores SMB "
+"utilizando contraseÃ±as cifradas. Si quiere usar contraseÃ±as en texto plano, "
+"tendrÃ¡ que cambiar un parÃ¡metro en el registro de Windows. Es muy "
+"recomendable usar cifrado en las contraseÃ±as. Si elige hacerlo, compruebe "
+"que tiene un fichero /etc/samba/smbpasswd vÃ¡lido y que ha puesto las "
+"contraseÃ±as con el programa smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Â¿Crear el base de dados de contraseÃ±as /var/lib/samba/passdb.tdb?"
@@ -197,14 +218,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Para manterner la compatibilidad con el comportamiento por defecto de la "
 "mayoria de los sistemas Windows, hay que configurar Samba para que use "
 "contraseÃ±as cifradas, lo cual requiere la creaciÃ³n de un fichero, distinto "
@@ -217,19 +243,29 @@
 "samba-doc/htmldocs/ENCRYPTION.html del paquete samba-doc para mÃ¡s "
 "informaciÃ³n."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Se han cambiado de lugar los ficheros de registro de Samba."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "A partir de los primeros paquetes Debian de Samba 2.2, los ficheros de "
 "registro de los dos demonios del Samba (nmbd y smbd) se encuentran en /var/"
@@ -238,28 +274,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "Los ficheros de registro antiguos que habÃa en /var/log se moverÃ¡n "
 "automÃ¡ticamente a su nueva ubicaciÃ³n."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Ya no se puede ejecutar nmbd desde el inetd"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Su sistema estaba configurado anteriormente para ejectuar nmbd y smbd desde "
 "inetd.  A partir de la version 2.999+3.0.alpha20-4, nmbd ya no se ejecuta "
@@ -268,19 +307,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "demonios, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Â¿CÃ³mo quiere que se ejecute Samba?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -290,21 +329,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr ""
 "Â¿Convertir el fichero /etc/samba/smbpasswd en /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
+msgid ""
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
 #, fuzzy
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
 msgstr ""
 "La versiÃ³n 3.0 de Samba introduce un nuevo base de dados \"SAM\" mÃ¡s "
 "completo que suplanta al fichero /etc/samba/smbpasswd.  Â¿Quiere que el "
@@ -314,14 +359,20 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Â¡Se sobrescribirÃ¡ su configuraciÃ³n smb.conf!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Â¿CÃ³mo quiere que se ejecute Samba?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Â¡Se sobrescribirÃ¡ su configuraciÃ³n smb.conf!"

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/fr.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2003-07-02 21:52-0500\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -32,9 +32,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -46,14 +47,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr ""
-"Le fichier smb.conf ne sera pas modifié si vous laissez cette option sans "
-"réponse."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Jeu de caractères pour les clients DOS"
@@ -61,13 +54,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Votre fichier smb.conf contient une option « client code page » (page de "
 "codes du client). Avec Samba 3.0, cette option a été remplacée par l'option "
@@ -78,15 +71,24 @@
 "DOS. Le fichier smb.conf ne sera pas modifié si vous laissez cette option "
 "sans réponse. "
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr ""
+"Le fichier smb.conf ne sera pas modifié si vous laissez cette option sans "
+"réponse."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modifier smb.conf pour utiliser les paramètres WINS fournis par DHCP ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -102,27 +104,30 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Pour cela, le paquet dhcp3-client doit être installé."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Voulez-vous configurer smb.conf avec debconf ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "La suite de la configuration de Samba pose des questions sur des paramètres "
 "de /etc/samba/smb.conf, le fichier utilisé pour configurer les programmes de "
@@ -132,12 +137,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Si vous n'utilisez pas debconf pour configurer smb.conf, vous devrez vous-"
 "même gérer les modifications de configuration et vous ne pourrez pas "
@@ -147,14 +152,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Groupe de travail et nom de domaine ?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -171,13 +178,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Des clients Windows récents communiquent avec les serveurs SMB en utilisant "
 "des mots de passe chiffrés. Si vous voulez utiliser des mots de passe sans "
@@ -189,6 +194,23 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Des clients Windows récents communiquent avec les serveurs SMB en utilisant "
+"des mots de passe chiffrés. Si vous voulez utiliser des mots de passe sans "
+"chiffrement, vous devez modifier un paramètre dans le registre de Windows. "
+"Il est recommandé d'utiliser des mots de passe chiffrés. Si vous le faites, "
+"n'oubliez pas de créer un fichier /etc/samba/smbpasswd et d'y mettre les "
+"mots de passe de tous les utilisateurs qui se servent de la commande "
+"smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Faut-il créer une base de données /var/lib/samba/passdb.tdb ?"
@@ -199,14 +221,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Pour préserver la compatibilité avec le comportement par défaut de la "
 "plupart des systèmes Windows, Samba doit utiliser les mots de passe "
 "chiffrés. Cela exige la création d'un fichier, distinct du fichier /etc/"
@@ -218,19 +245,29 @@
 "mots de passe non chiffrés. Voyez /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html dans le paquet samba-doc pour plus de détails."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Les fichiers-journaux de Samba ont changé de place."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "À partir des premiers paquets de Samba 2.2 pour Debian, les fichiers-"
 "journaux des démons nmbd et smbd se trouvent dans /var/log/samba/. Les noms "
@@ -238,27 +275,30 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "Les anciens fichiers-journaux dans /var/log/ seront mis au bon endroit."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "L'utilisation de nmbd à partir d'inetd n'est plus supportée"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Votre système lançait nmbd et smbd à partir d'inetd. Depuis la version 2.999"
 "+3.0.alpha20-4, on ne peut plus exécuter nmbd à partir d'inetd. Si vous avez "
@@ -267,19 +307,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "démons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Comment voulez-vous lancer Samba ?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -290,20 +330,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Faut-il convertir /etc/samba/smbpasswd en /var/lib/samba/passdb.tdb ?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Avec Samba 3.0, une nouvelle interface pour les bases de données SAM, plus "
 "complète, vient remplacer le fichier /etc/samba/smbpasswd. Voulez-vous que "
 "votre fichier existant soit remplacé par /var/lib/samba/passdb.tdb ? Si vous "
@@ -313,18 +360,25 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Ré-écriture de votre fichier smb.conf !"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT va modifier votre fichier smb.conf. Les entrées seront réorganisées et "
 "les commentaires détruits ainsi que les entrées « include = » et « copy = ». "
 "Si votre smb.conf était soigneusement construit, sauvegardez-le ou "
 "n'utilisez pas SWAT !"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Comment voulez-vous lancer Samba ?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Ré-écriture de votre fichier smb.conf !"

Modified: trunk/po/gl.po
===================================================================
--- trunk/po/gl.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/gl.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2006-04-07 09:40+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -32,9 +32,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -46,13 +47,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr ""
-"Se deixa esta opciÃ³n en branco non se ha cambiar o seu ficheiro smb.conf."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Xogo de Caracteres para os clientes DOS"
@@ -60,13 +54,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Actualmente ten unha opciÃ³n \"client code page\" (pÃ¡xina de cÃ³digos do "
 "cliente) configurada no seu ficheiro smb.conf. En Samba 3.0 esta opciÃ³n "
@@ -76,15 +70,23 @@
 "soportar clientes Windows; Ã© sÃ³ para clientes DOS. Se a deixa en branco non "
 "se ha cambiar o seu ficheiro smb.conf."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr ""
+"Se deixa esta opciÃ³n en branco non se ha cambiar o seu ficheiro smb.conf."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Â¿Modificar smb.conf para empregar a configuraciÃ³n WINS de DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -100,28 +102,31 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Debe ter o paquete dhcp3-client instalado para empregar esta caracterÃstica."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Â¿Configurar o ficheiro smb.conf mediante debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "O resto da configuraciÃ³n de Samba trata con cuestiÃ³ns que afectan aos "
 "parÃ¡metros de /etc/samba/smb.conf, que Ã© o ficheiro que se emprega para "
@@ -132,12 +137,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Se non emprega debconf para configurar o ficheiro smb.conf ha ter que facer "
 "os cambios na configuraciÃ³n vostede mesmo, e non ha poder aproveitar as "
@@ -147,14 +152,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Â¿Nome do grupo de traballo/dominio?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -171,13 +178,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Os clientes Windows recentes comunÃcanse cos servidores SMB empregando "
 "contrasinais cifrados. Se quere empregar contrasinais de texto claro ha ter "
@@ -188,6 +193,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Os clientes Windows recentes comunÃcanse cos servidores SMB empregando "
+"contrasinais cifrados. Se quere empregar contrasinais de texto claro ha ter "
+"que cambiar un parÃ¡metro no rexistro de Windows. RecomÃ©ndase que empregue "
+"contrasinais cifrados. Se o fai, asegÃºrese de ter un ficheiro /etc/samba/"
+"smbpasswd vÃ¡lido e de estabrecer nel os contrasinais de cada usuario co "
+"programa smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
@@ -199,14 +220,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Para que sexa compatible coas opciÃ³ns por defecto da maiorÃa das versiÃ³ns de "
 "Windows, Samba dÃ©bese configurar para que empregue contrasinais cifrados. "
 "Para isto os contrasinais dos usuarios teÃ±en que se armacenar nun ficheiro "
@@ -217,19 +243,29 @@
 "contrasinais en texto normal. Vexa o ficheiro /usr/share/doc/samba-doc/"
 "htmldocs/ENCRYPTION.html do paquete samba-doc para ver mÃ¡is detalles."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "TrasladÃ¡ronse os ficheiros de rexistro de Samba."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "A partires dos primeiros paquetes de Samba 2.2 para Debian os ficheiros de "
 "rexistro dos dous servizos de Samba (nmbd e smbd) estÃ¡n armacenados en /var/"
@@ -238,28 +274,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "Os ficheiros de rexistro antigos que estaban en /var/log hÃ¡nselle trasladar "
 "Ã¡ nova localizaciÃ³n."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Xa non se soporta o inicio de nmbd desde inetd"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "O seu sistema estivo configurado para iniciar nmbd e smbd desde inetd. A "
 "partires da versiÃ³n 2.999+3.0alpha20-4, nmbd xa non se ha iniciar desde "
@@ -268,19 +307,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "servizos, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Â¿Como quere executar Samba?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -290,20 +329,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Â¿Trasladar /etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 introduce unha nova interface de base de datos SAM mÃ¡is completa "
 "que substitÃºe o ficheiro /etc/samba/smbpasswd. Â¿Quere que se lle migre o seu "
 "ficheiro smbpasswd a /var/lib/samba/passdb.tdb? Se pretende empregar outro "
@@ -312,17 +358,24 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Hase sobrescribir o seu ficheiro smb.conf"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT ha sobrescribir o seu ficheiro smb.conf. Ha reordear as entradas e "
 "eliminar os comentarios, as opciÃ³ns include= e as opciÃ³ns copy=. Se ten un "
 "ficheiro smb.conf delicado cÃ³pieo ou non empregue SWAT."
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Â¿Como quere executar Samba?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Hase sobrescribir o seu ficheiro smb.conf"

Modified: trunk/po/it.po
===================================================================
--- trunk/po/it.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/it.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.0.7 debconf templates\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2004-12-03 21:10+0100\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -24,9 +24,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -37,12 +38,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Lasciando vuoto questo valore smb.conf non verrÃ  modificato."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Set di caratteri per i client DOS"
@@ -50,13 +45,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Attualmente in smb.conf Ã¨ configurato il Â«client code pageÂ», in Samba 3.0, "
 "questa opzione Ã¨ sostituita dall'opzione Â«dos characterÂ». Specificare il set "
@@ -65,15 +60,22 @@
 "per i client Windows, invece Ã¨ specifica per i client DOS. Lasciando vuoto "
 "questo valore smb.conf non verrÃ  modificato."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Lasciando vuoto questo valore smb.conf non verrÃ  modificato."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modificare smb.conf per usare le impostazioni WINS da DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -89,29 +91,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Deve essere installato il pacchetto dhcp3-client per usare questa "
 "funzionalitÃ ."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Configurare smb.conf usando debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "Il resto della configurazione di Samba fa delle domande sui parametri di /"
 "etc/samba/smb.conf, il file usato per configurare i programmi di Samba (nmbd "
@@ -121,12 +126,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Se non si vuole usare usare debconf per configurare smb.conf si dovranno "
 "gestire tutti i cambiamenti della configurazione da soli e non sarÃ  "
@@ -136,14 +141,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Nome del Workgroup/Dominio"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -160,13 +167,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "I client Windows recenti comunicano con i server SMB usando password "
 "cifrate. Per usare password in chiaro Ã¨ necessario cambiare un parametro nel "
@@ -176,6 +181,21 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"I client Windows recenti comunicano con i server SMB usando password "
+"cifrate. Per usare password in chiaro Ã¨ necessario cambiare un parametro nel "
+"registro di Windows. Si raccomanda l'uso di password cifrate. In caso "
+"contrario assicurarsi che il file /etc/samba/smbpasswd sia valido e usare il "
+"comando smbpasswd per inserirci le password di ciascun utente."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Creare il database delle password samba /var/lib/samba/passdb.tdb?"
@@ -186,14 +206,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Per essere compatibile con le impostazioni predefinite di molte versioni di "
 "Windows, Samba deve essere configurato per usare password cifrate. Questo "
 "richiede che le password degli utenti siano memorizzate in un file diverso "
@@ -204,19 +229,29 @@
 "per usare password in chiaro. Vedere /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html contenuto nel pacchetto samba-doc per ulteriori dettagli."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "I file di log di Samba sono stati spostati."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "A partire dai primi pacchetti Samba 2.2 per Debian i file di log per "
 "entrambi i demoni Samba (nmbd e smbd) sono memorizzati in /var/log/samba/. I "
@@ -225,27 +260,30 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "I vecchi file di log in /var/log/ verranno spostati nella nuova directory."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "L'avvio di nmbd da inetd non Ã¨ piÃ¹ supportato"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Il sistema Ã¨ configurato per avviare nmbd e smbd da inetd. Dalla versione "
 "2.999+3.0.alpha20-4 non Ã¨ piÃ¹ possibile avviare nmbd da inetd. Se si Ã¨ "
@@ -254,19 +292,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "demoni, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Come avviare Samba?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -276,20 +314,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Spostare /etc/samba/smbpasswd in /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 introduce una nuova e piÃ¹ completa interfaccia al database SAM che "
 "sostituisce il file /etc/samba/smbpasswd. Si vuole che il file smbpasswd sia "
 "migrato a /var/lib/samba/passdb.tdb? Se si pensa di usare un backend pdb "
@@ -298,17 +343,24 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Sovrascrittura di smb.conf!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT sovrascriverÃ  il file smb.conf, verranno riordinate le impostazioni e "
 "verranno cancellati tutti i commenti, le opzioni include= e copy=. Se si Ã¨ "
 "personalizzato smb.conf tornare indietro e non usare SWAT."
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Come avviare Samba?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Sovrascrittura di smb.conf!"

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/ja.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -11,12 +11,11 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2003-09-09 09:26+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -33,9 +32,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -46,12 +46,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "¤³¤Î¥ª¥×¥·¥ç¥ó¤ò¶õ¤Î¤Þ¤Þ¤Ë¤¹¤ë¤È¡¢smb.conf ¤ÏÊÑ¹¹¤µ¤ì¤Þ¤»¤ó¡£"
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "DOS ¥¯¥é¥¤¥¢¥ó¥È¸þ¤±¤ÎÊ¸»ú¥»¥Ã¥È"
@@ -59,13 +53,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "¸½ºß¡¢smb.conf ¤ËÀßÄêºÑ¤ß¤Î \"client code page\" ¤¬¤¢¤ê¤Þ¤¹¡£Samba 3.0 ¤Ç¤Ï¡¢"
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¿·¤·¤¤¥ª¥×¥·¥ç¥ó \"dos charset\" ¤ËÃÖ¤´¹¤¨¤é¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î"
@@ -74,15 +68,22 @@
 "¥È¥µ¥Ý¡¼¥È¤Ë¤ÏÉ¬Í×¤Ê¤¯¡¢DOS ¥¯¥é¥¤¥¢¥ó¥È¤Î¤ß¤Î¤¿¤á¤Ç¤¢¤ë¤³¤È¤òÃí°Õ¤·¤Æ¤ª¤¤Þ"
 "¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò¶õ¤Î¤Þ¤Þ¤Ë¤¹¤ë¤È¡¢smb.conf ¤ÏÊÑ¹¹¤µ¤ì¤Þ¤»¤ó¡£"
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "¤³¤Î¥ª¥×¥·¥ç¥ó¤ò¶õ¤Î¤Þ¤Þ¤Ë¤¹¤ë¤È¡¢smb.conf ¤ÏÊÑ¹¹¤µ¤ì¤Þ¤»¤ó¡£"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "DHCP ¤«¤é WINS ÀßÄê¤ò»È¤¦¤è¤¦ smb.conf ¤òÊÑ¹¹¤·¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -98,29 +99,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "¤³¤Îµ¡Ç½¤ò»È¤¦¤¿¤á¤Ë¤Ï¡¢dhcp3-client ¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëÉ¬Í×¤¬"
 "¤¢¤ê¤Þ¤¹¡£"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "debconf ¤òÄÌ¤·¤Æ smb.conf ¤òÀßÄê¤·¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "Samba ¤ÎÀßÄê¤Î»Ä¤ê¤ÎÉôÊ¬¤Ï¡¢Samba ¥×¥í¥°¥é¥à (nmbd ¤ª¤è¤Ó smbd) ¤òÀßÄê¤¹¤ë¤Î"
 "¤Ë»È¤¦¥Õ¥¡¥¤¥ë /etc/samba/smb.conf ¤Ë¤¢¤ë¥Ñ¥é¥á¡¼¥¿¤Ë±Æ¶Á¤¹¤ë¼ÁÌä¤Ç¤¹¡£¸½ºß"
@@ -130,12 +134,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "smb.conf ¤ÎÀßÄê¤Ë debconf ¤ò»È¤ï¤Ê¤¤¾ì¹ç¡¢¤¹¤Ù¤Æ¤ÎÀßÄê¤ÎÊÑ¹¹¤ò¤¢¤Ê¤¿¼«¿È¤¬ÌÌ"
 "ÅÝ¤ò¸«¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤ÏÄê´üÅª¤ÊÀßÄê²þÁ±¤Ë¤Ï¸þ¤¤¤Æ¤¤¤Þ¤»¤ó¡£¤½¤Î¤¿¤á¡¢"
@@ -144,14 +148,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "¥ï¡¼¥¯¥°¥ë¡¼¥×/¥É¥á¥¤¥óÌ¾¤Ï²¿¤Ç¤¹¤«?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -168,13 +174,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "ºÇ¶á¤Î Windows ¥¯¥é¥¤¥¢¥ó¥È¤Ï°Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤Æ SMB ¥µ¡¼¥Ð¤È¤ä¤ê"
 "¼è¤ê¤·¤Þ¤¹¡£¥¯¥ê¥¢¥Æ¥¥¹¥È¥Ñ¥¹¥ï¡¼¥É¤ò»È¤¤¤¿¤¤¾ì¹ç¤Ï¡¢¤¢¤Ê¤¿¤Î Windows ¤Î¥ì¥¸"
@@ -184,6 +188,21 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"ºÇ¶á¤Î Windows ¥¯¥é¥¤¥¢¥ó¥È¤Ï°Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤Æ SMB ¥µ¡¼¥Ð¤È¤ä¤ê"
+"¼è¤ê¤·¤Þ¤¹¡£¥¯¥ê¥¢¥Æ¥¥¹¥È¥Ñ¥¹¥ï¡¼¥É¤ò»È¤¤¤¿¤¤¾ì¹ç¤Ï¡¢¤¢¤Ê¤¿¤Î Windows ¤Î¥ì¥¸"
+"¥¹¥È¥ê¤Î¥Ñ¥é¥á¡¼¥¿¤òÊÑ¹¹¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¡£°Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ò»È¤¦¤³¤È"
+"¤ò¿ä¾©¤·¤Þ¤¹¡£¤³¤¦¤¹¤ë¾ì¹ç¡¢Í¸ú¤Ê /etc/samba/smbpasswd ¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤³¤È¤ò"
+"³ÎÇ§¤·¡¢³Æ¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤Ï smbpasswd ¥³¥Þ¥ó¥É¤ò»È¤Ã¤ÆÀßÄê¤·¤Þ¤¹¡£"
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Samba ¥Ñ¥¹¥ï¡¼¥É¥Ç¡¼¥¿¥Ù¡¼¥¹ /var/lib/samba/passdb.tdb ¤òºîÀ®¤·¤Þ¤¹¤«?"
@@ -194,14 +213,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Windows ¤Î¤Û¤È¤ó¤É¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥È¤È¸ß´¹À¤òÊÝ¤Ä¤¿¤á¡¢Samba ¤Ï°Å¹æ²½"
 "¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤ÆÀßÄê¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤ò /etc/passwd "
 "¤È¤ÏÊÌ¤Î¥Õ¥¡¥¤¥ë¤Ë³ÊÇ¼¤¹¤ë¤³¤È¤òÉ¬Í×¤È¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¼«Æ°Åª¤ËºîÀ®¤¹¤ë"
@@ -212,19 +236,29 @@
 "ºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢samba-doc ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤¢¤ë /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Samba ¤Î¥í¥°¥Õ¥¡¥¤¥ë¤Ï°ÜÆ°¤µ¤ì¤Þ¤·¤¿¡£"
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Debian ¸þ¤±¤Î Samba 2.2 ¤Î½é´ü¥Ñ¥Ã¥±¡¼¥¸¤«¤é¡¢Î¾ Samba ¥Ç¡¼¥â¥ó (nmbd ¤ª¤è¤Ó "
 "smbd) ¤Î¥í¥°¥Õ¥¡¥¤¥ë¤Ï /var/log/samba ¤Ë³ÊÇ¼¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¥Õ¥¡¥¤"
@@ -232,26 +266,29 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr "/var/log/ ¤Ë¤¢¤Ã¤¿¸Å¤¤¥í¥°¥Õ¥¡¥¤¥ë¤Ï¿·¤·¤¤¾ì½ê¤Ë°ÜÆ°¤µ¤ì¤Þ¤¹¡£"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "inetd ¤«¤é¤Î nmbd ¤Î¼Â¹Ô¤Ï¤â¤¦¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤Ë¤Ï inetd ¤«¤é nmbd ¤ª¤è¤Ó smbd ¤òµ¯Æ°¤¹¤ë°ÊÁ°¤ÎÀßÄê¤¬¤¢¤ê¤Þ"
 "¤¹¡£¥Ð¡¼¥¸¥ç¥ó 2.999+3.0.alpha20-4 °Ê¹ß¤Ç¤Ï¡¢nmbd ¤Ï inetd ¤«¤é¤Ï¤â¤¦µ¯Æ°¤·¤Þ"
@@ -260,19 +297,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "¥Ç¡¼¥â¥ó, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "¤É¤Î¤è¤¦¤Ë Samba ¤ò¼Â¹Ô¤·¤¿¤¤¤Ç¤¹¤«?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -282,20 +319,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "/etc/samba/smbpasswd ¤ò /var/lib/samba/passdb.tdb ¤Ë°ÜÆ°¤·¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 ¤Ç¤Ï¡¢/etc/samba/smbpasswd ¥Õ¥¡¥¤¥ë¤ËÂå¤ï¤ë¡¢¤è¤ê¿·¤·¤¤¡¢¤è¤ê´°Á´"
 "¤Ê SAM ¥Ç¡¼¥¿¥Ù¡¼¥¹¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤¬Æ³Æþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£´ûÂ¸¤Î smbpasswd ¥Õ¥¡"
 "¥¤¥ë¤ò /var/lib/samba/passdb.tdb ¤Ë°Ü¹Ô¤·¤Þ¤¹¤«? ÊÌ¤Î pdb ¥Ð¥Ã¥¯¥¨¥ó¥É (LDAP "
@@ -304,18 +348,25 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "¤¢¤Ê¤¿¤Î smb.conf ¤Ï½ñ¤Ä¾¤µ¤ì¤Þ¤¹!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT ¤Ï¤¢¤Ê¤¿¤Î smb.conf ¥Õ¥¡¥¤¥ë¤ò½ñ¤Ä¾¤·¤Þ¤¹¡£SWAT ¤Ï¥¨¥ó¥È¥ê¤òºÆÊÔÀ®¤·¡¢"
 "¤¹¤Ù¤Æ¤Î¥³¥á¥ó¥È¤ª¤è¤Ó include= ¤È copy= ¥ª¥×¥·¥ç¥ó¤òºï½ü¤·¤Þ¤¹¡£¿µ½Å¤ËºîÀ®¤µ"
 "¤ì¤¿ smb.conf ¤ò»ý¤Ã¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Æ¤ª¤¯¤«¡¢SWAT ¤ò»È¤ï¤Ê¤¤"
 "¤Ç¤¯¤À¤µ¤¤!"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "¤É¤Î¤è¤¦¤Ë Samba ¤ò¼Â¹Ô¤·¤¿¤¤¤Ç¤¹¤«?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "¤¢¤Ê¤¿¤Î smb.conf ¤Ï½ñ¤Ä¾¤µ¤ì¤Þ¤¹!"

Modified: trunk/po/nl.po
===================================================================
--- trunk/po/nl.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/nl.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2003-08-30 02:03+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
 "Language-Team: dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -32,9 +32,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -46,13 +47,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr ""
-"Uw smb.conf bestand wordt niet aangepast indien u deze optie leeg laat."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Karakterset voor DOS-clients"
@@ -60,13 +54,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "U heeft momenteel een \"client code pagina\" ingesteld in uw smb.conf. In "
 "Samba 3.0 werd deze optie vervangen door de optie \"dos karakterset\". "
@@ -76,15 +70,23 @@
 "enkel voor DOS-clients. Uw smb.conf wordt niet veranderd wanneer u deze "
 "optie blank laat."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr ""
+"Uw smb.conf bestand wordt niet aangepast indien u deze optie leeg laat."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "smb.conf aanpassen om de WINS instellingen van DHCP te gebruiken?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -100,29 +102,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "U dient het dhcp3-client-pakket geïnstalleert te hebben om van deze optie "
 "gebruik te maken."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Configuratie in smb.conf met debconf beheren?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "De resterende Samba configuratie beslaat parameters in /etc/samba/smb.conf, "
 "het configuratiebestand dat gebruikt wordt voor de Samba programmas (nmbd en "
@@ -133,12 +138,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Indien u geen gebruik maakt van debconf voor het beheer van smb.conf dient u "
 "alle configuratie instellingen zelf te doen, en zult u geen voordeel halen "
@@ -148,14 +153,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Werkgroep/Domeinnaam?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -172,13 +179,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Recente Windows clients maken gebruik van versleutelde wachtwoorden voor de "
 "communicatie met SMB-servers. Indien u onversleutelde tekst  wachtwoorden "
@@ -190,6 +195,23 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Recente Windows clients maken gebruik van versleutelde wachtwoorden voor de "
+"communicatie met SMB-servers. Indien u onversleutelde tekst  wachtwoorden "
+"wilt gebruiken dient u een parameter te veranderen in de Windows registry. "
+"Het gebruik van versleutelde wachtwoorden wordt aangeraden. Indien u dit "
+"doet zorg er dan voor dat u een geldig /etc/samba/smbpasswd bestand heeft en "
+"dat u de wachtwoorden daar voor elke gebruiker met behulp van smbpasswd "
+"insteld. "
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Samba wachtwoord database, /var/lib/samba/passdb.tdb, aanmaken?"
@@ -200,14 +222,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Om compatibel te zijn met de standaard instellingen van de meeste "
 "Windowsversies dient Samba gebruik te maken van versleutelde wachtwoorden. "
 "Dit vereist dat de gebruikerswachtwoorden opgeslagen worden in een bestand "
@@ -219,19 +246,29 @@
 "deze onversleutelde wachtwoorden gebruiken. Zie /usr/share/doc/samba-doc/"
 "htmldocs/ENCRYPTION.html uit het samba-doc pakket voor meer details."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Samba's log bestanden zijn verhuisd."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Vanaf de eerste Debian pakketten vaan Samba versie 2.2 zijn de log bestanden "
 "van beide Samba daemons (nmbd en smbd) opgeslagen in /var/log/samba/. De log "
@@ -239,28 +276,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "De oude logbestanden in /var/log worden voor u naar de nieuwe locatie "
 "verplaatst."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "nmbd vanuit inetd draaien wordt niet langer ondersteund"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Uw systeem was geconfigureerd om nmbd en smbd vanuit inetd te starten. Vanaf "
 "versie 2.999+3.0.alpha20-4 kan nmbd niet langer door inetd gestart worden. "
@@ -269,19 +309,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Hoe wilt u Samba draaien?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -291,20 +331,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "/etc/samba/smbpasswd verplaatsen naar /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 introduceert een nieuwe, meer complete SAM databaseinterface die "
 "het /etc/samba/smbpasswd bestand overstijgt. \"Wilt u dat ik uw bestaand "
 "smbpasswd bestand voor u naar /var/lib/samba/passdb.tdb migreer? Indien u "
@@ -314,18 +361,25 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Uw smb.conf wordt herschreven!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT zal uw smb.conf bestand herschrijven. Het zal de ingangen anders "
 "schikken en alle comments, include= en copy= opties verwijderen. Als u een, "
 "met veel zorg, handmatig opgebouwd smb.conf bestand heeft, maak dan een "
 "reservekopie of zie van het gebruik van SWAT af! "
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Hoe wilt u Samba draaien?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Uw smb.conf wordt herschreven!"

Modified: trunk/po/pt.po
===================================================================
--- trunk/po/pt.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/pt.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.0.9-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2005-01-05 19:25+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -23,9 +23,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -37,12 +38,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Se deixar esta opÃ§Ã£o vazia, o seu smb.conf nÃ£o serÃ¡ alterado."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Conjunto de caracteres para clientes DOS"
@@ -50,13 +45,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Actualmente tem um \"client code page\" definido no seu smb.conf.  No Samba "
 "3.0, esta opÃ§Ã£o Ã© substituÃda pela opÃ§Ã£o \"dos charset\".  Por favor "
@@ -66,16 +61,23 @@
 "apenas para clientes em DOS.  Se deixar esta opÃ§Ã£o vazia, o seu smb.conf nÃ£o "
 "serÃ¡ alterado."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Se deixar esta opÃ§Ã£o vazia, o seu smb.conf nÃ£o serÃ¡ alterado."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Modificar o smb.conf para utilizar definiÃ§Ãµes de WINS a partir de DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -92,29 +94,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Tem de ter o pacote dhcp3-client instalado para tirar vantagem desta "
 "caracterÃstica."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Configurar o smb.conf atravÃ©s de debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "O resto da configuraÃ§Ã£o de Samba trata de questÃµes que afectam parÃ¢metros "
 "em /etc/samba/smb.conf, que Ã© o ficheiro utilizado para configurar os "
@@ -125,12 +130,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Se nÃ£o utilizar o debconf para configurar o smb.conf, terÃ¡ de lidar vocÃª "
 "mesmo com quaisquer alteraÃ§Ãµes da configuraÃ§Ã£o, e nÃ£o poderÃ¡ tirar partido "
@@ -140,14 +145,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Nome do Grupo de trabalho/DomÃnio ?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -164,13 +171,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Os clientes de Windows recentes comunicam com servidores de SMB utilizando "
 "passwords encriptadas. Se deseja utilizar passwords de texto puro vocÃª vai "
@@ -181,6 +186,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Os clientes de Windows recentes comunicam com servidores de SMB utilizando "
+"passwords encriptadas. Se deseja utilizar passwords de texto puro vocÃª vai "
+"necessitar alterar um parÃ¢metro no seu registo do Windows. Ã‰ recomendado que "
+"utilize passwords encriptadas. Se o fizer, assegure-se que tem um ficheiro /"
+"etc/samba/smbpasswd vÃ¡lido e que defina lÃ¡ passwords para cada um dos "
+"utilizadores utilizando o comando smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Criar base de dados de passwords samba, /var/lib/samba/passdb.tdb?"
@@ -191,14 +212,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Para ser compatÃvel com valores por omissÃ£o na maioria das versÃµes do "
 "Windows, o Samba tem de ser configurado para utilizar passwords encriptadas. "
 "Isto requer que as passwords de utilizador sejam guardadas num ficheiro "
@@ -210,19 +236,29 @@
 "doc/samba-doc/htmldocs/ENCRIPTION.html do pacote samba-doc para mais "
 "detalhes."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Os ficheiros de log de Samba foram movidos."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Desde os primeiros pacotes para Debian de Samba 2.2 que os ficheiros de log "
 "para ambos os daemons de Samba (nmbd e smbd) sÃ£o agora guardados em /var/log/"
@@ -231,28 +267,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "Os ficheiros de log antigos que estavam em /var/log/ vÃ£o ser movidos, para "
 "si, para a nova localizaÃ§Ã£o."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Executar o nmbd a partir de inetd jÃ¡ nÃ£o Ã© suportado"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "O seu sistema foi previamente configurado para iniciar o nmbd e smbd a "
 "partir de inetd.  A partir da versÃ£o 2.999+3.0.alpha20-4, o nmbd jÃ¡ nÃ£o "
@@ -262,19 +301,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Como deseja correr o Samba?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -284,20 +323,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Mover /etc/samba/smbpasswd para /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "O Samba 3.0 introduz um novo e mais completo interface com a base de dados "
 "SAM, que suplanta o ficheiro /etc/samba/smbpasswd. Deseja que o seu ficheiro "
 "existente smbpasswd seja migrado para /var/lib/samba/passdb.tdb para si? Se "
@@ -307,18 +353,25 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "A sua configuraÃ§Ã£o smb.conf serÃ¡ re-escrita!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "O SWAT irÃ¡ reescrever o seu ficheiro smb.conf. IrÃ¡ reordenar as entradas e "
 "apagar todos os comentÃ¡rios, e opÃ§Ãµes include= e copy=. Se tem um smb.conf "
 "cuidadosamente trabalhado faÃ§a uma cÃ³pia de seguranÃ§a dele ou nÃ£o utilize o "
 "SWAT!"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Como deseja correr o Samba?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "A sua configuraÃ§Ã£o smb.conf serÃ¡ re-escrita!"

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/pt_BR.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2005-05-10 14:07-0300\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -32,9 +32,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -47,14 +48,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr ""
-"Caso você deixe esta opção em branco, seu arquivo smb.conf não será "
-"modificado."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Conjunto de caracteres para clientes DOS"
@@ -62,13 +55,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Atualmente existe um \"código de página do cliente\" (\"client code page\") "
 "definido em seu arquivo smb.conf. No Samba 3.0, essa opção foi substituída "
@@ -78,15 +71,24 @@
 "clientes DOS. Caso você deixe essa opção em branco, seu arquivo smb.conf não "
 "será modificado."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr ""
+"Caso você deixe esta opção em branco, seu arquivo smb.conf não será "
+"modificado."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -103,29 +105,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Você deve possuir o pacote dhcp3-client instalado para poder usar esse "
 "recurso."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Configurar o arquivo smb.conf através do debconf ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "O restante da configuração do Samba lida com questões que afetam parâmetros "
 "no arquivo /etc/samba/smb.conf, que é o arquivo usado para configurar os "
@@ -136,12 +141,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Caso você opte por não usar o debconf para configurar o arquivo smb.conf, "
 "será necessário que você lide com quaisquer mudanças de configurações "
@@ -152,14 +157,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Nome de Domínio/Grupo de Trabalho ?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -177,13 +184,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Clientes Windows atuais comunicam-se com servidores SMB usando senhas "
 "criptografadas. Caso você queira usar senhas em texto puro você precisará "
@@ -194,6 +199,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Clientes Windows atuais comunicam-se com servidores SMB usando senhas "
+"criptografadas. Caso você queira usar senhas em texto puro você precisará "
+"modificar um parâmetro no registro de seu Windows. É recomendado que você "
+"use senhas criptografadas. Caso as utilize, certifique-se de possuir um "
+"arquivo /etc/samba/smbpasswd válido e que você tenha definido senhas no "
+"mesmo para cada usuário, utilizando o comando smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Gerar a base de dados para senhas /var/lib/samba/passdb.tdb ?"
@@ -204,14 +225,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Para compatibilidade com os padrões adotados em todas as versões atuais do "
 "Windows, o Samba deve ser configurado para usar senhas criptografadas. Isso "
 "requer que as senhas dos usuários sejam armazenadas em um arquivo diferente "
@@ -224,19 +250,29 @@
 "doc em /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html para maiores "
 "detalhes."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Arquivos de log do Samba foram movidos."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Desde os primeiros pacotes Debian do Samba 2.2, os arquivos de log para "
 "ambos os daemons Samba (nmbd e smbd) são armazenados no diretório /var/log/"
@@ -245,28 +281,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "Os antigos arquivos de log que estavam no diretório /var/log/ serão movidos "
 "para o novo local para você."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "A execução do nmbd a partir do inetd não é mais suportada"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Seu sistema foi previamente configurado para iniciar os daemons nmbd e smbd "
 "a partir do inetd. Desde a versão 2.999+3.0.alpha20-4, o nmbd não mais será "
@@ -276,19 +315,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Como você deseja que o Samba seja executado ?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -298,20 +337,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Mover /etc/samba/smbpasswd para /var/lib/samba/passdb.tdb ?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "O Samba 3.0 introduziu uma nova e mais completa interface de base de dados "
 "SAM que substituiu o arquivo /etc/samba/smbpasswd. Você gostaria que o "
 "arquivo smbpasswd existente fosse migrado para /var/lib/samba/passdb.tdb "
@@ -321,18 +367,25 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Seu arquivo smb.conf será reescrito !"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "O SWAT irá reescrever seu arquivo smb.conf. Ele irá rearrumar as entradas e "
 "apagar todos os comentários, opções include= e copy=. Caso você possua um "
 "arquivo smb.conf cuidadosamente criado e comentado, faça uma cópia de "
 "segurança (backup) do mesmo ou não use o SWAT !"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Como você deseja que o Samba seja executado ?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Seu arquivo smb.conf será reescrito !"

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/ru.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: samba_3.0.14a-2_ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2005-05-21 21:43+1000\n"
 "Last-Translator: Yuriy Talakan' <yt at amur.elektra.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -22,9 +22,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -35,12 +36,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð¾Ð¿Ñ†Ð¸ÑŽ Ð¿ÑƒÑÑ‚Ð¾Ð¹, Ð²Ð°Ñˆ smb.conf Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "ÐšÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° Ð´Ð»Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² DOS"
@@ -48,13 +43,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñƒ Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð¾Ð¿Ñ†Ð¸Ñ \"client code page\" Ð² smb.conf. Ð’ Samba 3.0, ÑÑ‚Ð° "
 "Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð° Ð½Ð° \"dos charset\". Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÑƒ, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð²Ñ‹ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ "
@@ -63,15 +58,22 @@
 "ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² Windows, Ð¾Ð½Ð° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² DOS. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð¾Ð¿Ñ†Ð¸ÑŽ "
 "Ð¿ÑƒÑÑ‚Ð¾Ð¹, Ð²Ð°Ñˆ smb.conf Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð¾Ð¿Ñ†Ð¸ÑŽ Ð¿ÑƒÑÑ‚Ð¾Ð¹, Ð²Ð°Ñˆ smb.conf Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ smb.conf Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº WINS Ð¸Ð· DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -87,29 +89,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð²Ð¾ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ ÑÑ‚Ð¾Ð¹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒÑŽ, Ð²Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚ dhcp3-"
 "client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ smb.conf Ñ‡ÐµÑ€ÐµÐ· debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "ÐžÑÑ‚Ð°Ð²ÑˆÐ°ÑÑÑ Ñ‡Ð°ÑÑ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Samba ÑÐ¾ÑÑ‚Ð¾Ð¸Ñ‚ Ð¸Ð· Ð²Ð¾Ð¿Ñ€Ð¾ÑÐ¾Ð², ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð·Ð°Ñ‚Ñ€Ð°Ð³Ð¸Ð²Ð°ÑŽÑ‚ "
 "Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð² /etc/samba/smb.conf. ÐÑ‚Ð¾Ñ‚ Ñ„Ð°Ð¹Ð» Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ "
@@ -120,12 +125,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ðµ debconf Ð´Ð»Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ smb.conf, Ñ‚Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ "
 "ÑÐ°Ð¼Ð¾ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾ Ð¿Ð¾Ð·Ð°Ð±Ð¾Ñ‚Ð¸Ñ‚ÑŒÑÑ Ð¾Ð±Ð¾ Ð²ÑÐµÑ… Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÑÑ… Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº Ð¸ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ‚Ðµ "
@@ -135,14 +140,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Ð˜Ð¼Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹/Ð´Ð¾Ð¼ÐµÐ½Ð°?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -159,13 +166,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Ð¡Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ñ‹ Windows Ð¾Ð±Ñ‰Ð°ÑŽÑ‚ÑÑ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°Ð¼Ð¸ SMB Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ "
 "Ð¿Ð°Ñ€Ð¾Ð»Ð¸. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð¾Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ð¸, Ð²Ð°Ð¼ Ð¿Ñ€Ð¸Ð´ÐµÑ‚ÑÑ "
@@ -176,6 +181,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Ð¡Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ñ‹ Windows Ð¾Ð±Ñ‰Ð°ÑŽÑ‚ÑÑ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°Ð¼Ð¸ SMB Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ "
+"Ð¿Ð°Ñ€Ð¾Ð»Ð¸. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð¾Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ð¸, Ð²Ð°Ð¼ Ð¿Ñ€Ð¸Ð´ÐµÑ‚ÑÑ "
+"Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ Ð² Ñ€ÐµÐµÑÑ‚Ñ€Ðµ Windows. Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ "
+"Ð¿Ð°Ñ€Ð¾Ð»Ð¸. Ð’ ÑÑ‚Ð¾Ð¼ ÑÐ»ÑƒÑ‡Ð°Ðµ ÑƒÐ±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ, Ñ‡Ñ‚Ð¾ Ñƒ Ð²Ð°Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» /etc/samba/"
+"smbpasswd Ð¸ Ñ‡Ñ‚Ð¾ Ð²Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ð»Ð¸ Ñ‚Ð°Ð¼ Ð¿Ð°Ñ€Ð¾Ð»Ð¸ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ "
+"smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹ samba, /var/lib/samba/passdb.tdb?"
@@ -186,14 +207,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Ð”Ð»Ñ ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ð¾ÑÑ‚Ð¸ ÑÐ¾ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ÐµÐ¼ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð² Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ Ð²ÐµÑ€ÑÐ¸Ð¹ Windows, "
 "Samba Ð´Ð¾Ð»Ð¶Ð½Ð° Ð±Ñ‹Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð° Ð½Ð° Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹.  ÐÑ‚Ð¾ "
 "Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ñ… Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹ Ð² Ñ„Ð°Ð¹Ð»Ðµ, Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ð¾Ð¼ Ð¾Ñ‚ /etc/passwd. "
@@ -204,19 +230,29 @@
 "Ð¼Ð°ÑˆÐ¸Ð½Ñ‹) Ð½Ð° Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ñ… Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹. Ð‘Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾ ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ Ð² /usr/"
 "share/doc/samba-doc/htmldocs/ENCRYPTION.html Ð¸Ð· Ð¿Ð°ÐºÐµÑ‚Ð° samba-doc."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "log-Ñ„Ð°Ð¹Ð»Ñ‹ Samba Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ð»Ð¸ÑÑŒ."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "ÐÐ°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð¿ÐµÑ€Ð²Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Samba 2.2 Ð´Ð»Ñ Debian, log-Ñ„Ð°Ð¹Ð»Ñ‹ Ð´Ð»Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¾Ð² Samba "
 "(nmbd Ð¸ smbd) Ñ…Ñ€Ð°Ð½ÑÑ‚ÑÑ Ñ‚ÐµÐ¿ÐµÑ€ÑŒ Ð² /var/log/samba/. Ð¤Ð°Ð¹Ð»Ñ‹ Ð½Ð°Ð·Ñ‹Ð²Ð°ÑŽÑ‚ÑÑ log.nmbd Ð¸ "
@@ -224,28 +260,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "Ð¡Ñ‚Ð°Ñ€Ñ‹Ðµ log-Ñ„Ð°Ð¹Ð»Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±Ñ‹Ð»Ð¸ Ð² /var/log/, Ð±ÑƒÐ´ÑƒÑ‚ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ñ‹ Ð² Ð½Ð¾Ð²Ð¾Ðµ Ð´Ð»Ñ Ð²Ð°Ñ "
 "Ð¼ÐµÑÑ‚Ð¾."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Ð—Ð°Ð¿ÑƒÑÐº nmbd Ð¸Ð· inetd Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Ð’Ð°ÑˆÐ° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ð±Ñ‹Ð»Ð° Ñ€Ð°Ð½ÐµÐµ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð° Ð½Ð° Ð·Ð°Ð¿ÑƒÑÐº nmbd Ð¸ smbd Ð¸Ð· inetd.  nmbd Ñ "
 "Ð²ÐµÑ€ÑÐ¸Ð¸ 2.999+3.0.alpha20-4 Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð·Ð°Ð¿ÑƒÑÐºÐ°ÐµÑ‚ÑÑ Ð¸Ð· inetd. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð»Ð¸ "
@@ -254,19 +293,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "ÐšÐ°Ðº Ð²Ñ‹ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð·Ð°Ð¿ÑƒÑÐºÐ°Ñ‚ÑŒ Samba?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -276,20 +315,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚ÑŒ /etc/samba/smbpasswd Ð² /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 Ð¿Ñ€Ð¸Ð½Ð¾ÑÐ¸Ñ‚ Ð½Ð¾Ð²Ñ‹Ð¹, Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð»Ð½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ… SAM, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ "
 "Ð·Ð°Ð¼ÐµÐ½ÑÐµÑ‚ ÑÐ¾Ð±Ð¾Ð¹ Ñ„Ð°Ð¹Ð» /etc/samba/smbpasswd.  Ð–ÐµÐ»Ð°ÐµÑ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²Ð°Ñˆ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ "
 "Ñ„Ð°Ð¹Ð» smbpasswd Ð¼Ð¸Ð³Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð» Ð² /var/lib/samba/passdb.tdb?  Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð»Ð°Ð½Ð¸Ñ€ÑƒÐµÑ‚Ðµ "
@@ -299,17 +345,24 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Ð’Ð°Ñˆ smb.conf Ð±ÑƒÐ´ÐµÑ‚ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÐ°Ð½!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT Ð¿ÐµÑ€ÐµÐ¿Ð¸ÑˆÐµÑ‚ Ð²Ð°Ñˆ Ñ„Ð°Ð¹Ð» smb.conf. ÐžÐ½ Ð¿ÐµÑ€ÐµÐ³Ñ€ÑƒÐ¿Ð¿Ð¸Ñ€ÑƒÐµÑ‚ Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ Ð²ÑÐµ "
 "ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¸, Ð¾Ð¿Ñ†Ð¸Ð¸ include= Ð¸ copy=. Ð•ÑÐ»Ð¸ Ñƒ Ð²Ð°Ñ Ñ‚Ñ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð½Ñ‹Ð¹ smb."
 "conf, Ñ‚Ð¾ ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚Ðµ ÐµÐ³Ð¾ Ð² Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð¼ Ð¼ÐµÑÑ‚Ðµ Ð¸Ð»Ð¸ Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ SWAT!"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "ÐšÐ°Ðº Ð²Ñ‹ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð·Ð°Ð¿ÑƒÑÐºÐ°Ñ‚ÑŒ Samba?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Ð’Ð°Ñˆ smb.conf Ð±ÑƒÐ´ÐµÑ‚ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÐ°Ð½!"

Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/sv.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.0.20b-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2005-12-04 21:23+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -31,9 +31,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -44,12 +45,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Om du lämnar denna blank kommer din smb.conf inte att ändras."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Teckenuppsättning för DOS-klienter"
@@ -57,13 +52,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Du har för närvarande en \"client code page\" satt i din smb.conf.  I Samba "
 "3.0 är denna inställning ersatt med \"dos charset\".  Specificera den "
@@ -72,15 +67,22 @@
 "för att stödja Windows-klienter utan bara för DOS-klienter.  Om du lämnar "
 "denna inställning blank kommer din smb.conf inte att ändras."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Om du lämnar denna blank kommer din smb.conf inte att ändras."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modifiera smb.conf att använda WINS-inställningar från DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -96,28 +98,31 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Du måste ha paketet dhcp3-client installerat för att använda denna funktion."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Konfigurera smb.conf genom Debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "Resten av konfigurationen av Samba gäller frågor som påverkar parametrar i /"
 "etc/samba/smb.conf vilken är filen som används för att konfigurera Samba-"
@@ -128,12 +133,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Om du inte använder Debconf för att konfigurera smb.conf måste du hantera "
 "alla konfigurationsändringar på egen hand och kan därför inte utnyttja alla "
@@ -143,14 +148,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Arbetsgrupp/Domännamn?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -167,13 +174,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Tidigare Windows-klienter kommunicerar med SMB-servrar med krypterade "
 "lösenord. Om du vill använda lösenord i klartext behöver du ändra en "
@@ -184,6 +189,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Tidigare Windows-klienter kommunicerar med SMB-servrar med krypterade "
+"lösenord. Om du vill använda lösenord i klartext behöver du ändra en "
+"parameter i Windows registry. Det rekommenderas att du använder krypterade "
+"lösenord. Om du gör det, kontrollera att du har en giltig fil /etc/samba/"
+"smbpasswd och att du har satt lösenorden där för varje användare med "
+"kommandot smbpasswd."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Skapa Sambas lösenordsdatabas, /var/lib/samba/passdb.tdb?"
@@ -194,14 +215,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "För att vara kompatibel med de standarder i de flesta versioner av Windows "
 "måste Samba konfigureras för att använda krypterade lösenord.  Detta kräver "
 "att användarnas lösenord lagras i en fil som är separerad från /etc/passwd. "
@@ -212,19 +238,29 @@
 "använda lösenord i klartext. Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 "html från paketet samba-doc för mer information."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Samba's loggfiler har flyttats."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Från och med första paketen av Samba 2.2 för Debian är loggfilerna för båda "
 "Samba-demonerna (nmbd och smbd) lagrade i /var/log/samba/. Namnen på filerna "
@@ -232,28 +268,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "De gamla loggfilerna som fanns i /var/log har flyttats till den nya mappen "
 "åt dig."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Köra nmbd från inetd är inte längre supporterad"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Ditt system var tidigare konfigurerat att starta nmbd från inetd.  Från och "
 "med version 2.999+3.0.alpha20-4 kommer inte nmbd att startas via inetd.  Om "
@@ -262,19 +301,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "demoner, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Hur vill du köra Samba?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -284,20 +323,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Flytta /etc/samba/smbpasswd till /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0 introducerar en ny, mer komplett SAM-databasgränssnitt som "
 "ersätter filen /etc/samba/smbpasswd.  Vill du migrera din existerande "
 "smbpasswd till /var/lib/samba/passdb.tdb?  Om du planerar att använda ett "
@@ -307,18 +353,25 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Din smb.conf kommer att skrivas om!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT kommer att skriva om din fil smb.conf. Den kommer att arrangera om "
 "raderna och radera alla kommentarer, inställningarna include= och copy= . Om "
 "du har en känslig och välstrukturerad smb.conf så ta en säkerhetskopia först "
 "eller använd inte SWAT!"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Hur vill du köra Samba?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Din smb.conf kommer att skrivas om!"

Modified: trunk/po/templates.pot
===================================================================
--- trunk/po/templates.pot	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/templates.pot	2006-05-29 06:02:33 UTC (rev 1070)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -34,45 +34,44 @@
 #. Description
 #: ../samba-common.templates:3
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
-msgid "Character Set for DOS clients"
+msgid ""
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
-msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+msgid "If you leave this option blank, the smb.conf file will not be changed."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -83,50 +82,49 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+msgid "Configure smb.conf automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+msgid "Workgroup/Domain Name:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -141,16 +139,22 @@
 #. Description
 #: ../samba-common.templates:60
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
@@ -161,69 +165,81 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+msgid "Samba's log files moved"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+msgid "Running nmbd from inetd no longer supported"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
+#: ../samba.templates:39
+msgid "Samba run method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -231,32 +247,38 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
+
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
+msgid "Configuration file rewritten by SWAT"
 msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""

Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/tr.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2004-06-01 09:42+0300\n"
 "Last-Translator: Mehmet TÃ¼rker <mturker at innova.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -23,9 +23,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -36,12 +37,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr "Bu seÃ§eneÄŸi boÅŸ bÄ±rakÄ±rsanÄ±z, smb.conf dosyanÄ±z deÄŸiÅŸtirilmeyecektir."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "DOS istemcileri iÃ§in karakter seti"
@@ -49,13 +44,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "HalihazÄ±rda smb.conf yapÄ±landÄ±rma dosyanÄ±zda \"client code page\" ayarÄ± "
 "mevcut.  Samba 3.0'da bu seÃ§enek \"dos charset\" seÃ§eneÄŸiyle deÄŸiÅŸtirildi.  "
@@ -65,9 +60,16 @@
 "sadece DOS istemcileri iÃ§indir.  EÄŸer bu seÃ§eneÄŸi boÅŸ bÄ±rakÄ±rsanÄ±z smb.conf "
 "dosyanÄ±z deÄŸiÅŸtirilmeyecektir."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr "Bu seÃ§eneÄŸi boÅŸ bÄ±rakÄ±rsanÄ±z, smb.conf dosyanÄ±z deÄŸiÅŸtirilmeyecektir."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "WINS ayarlarÄ±nÄ± DHCP'den kullanmak iÃ§in smb.conf dosyasÄ±nda deÄŸiÅŸiklik "
@@ -75,7 +77,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -91,29 +93,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Bu Ã¶zellikten yararlanabilmek iÃ§in dhcp3-client paketinin kurulmuÅŸ olmasÄ± "
 "gerekir."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "\"smb.conf\" dosyasÄ± debconf ile yapÄ±landÄ±rÄ±lsÄ±n mÄ±?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "Geri kalan Samba yapÄ±landÄ±rmasÄ± Samba uygulamalarÄ±nÄ± (nmbd ve smbd) "
 "yapÄ±landÄ±rmak iÃ§in kullanÄ±lan /etc/samba/smb.conf dosyasÄ±ndaki parametreleri "
@@ -124,12 +129,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "EÄŸer smb.conf'u yapÄ±landÄ±rmak iÃ§in debconf'u kullanmÄ±yorsanÄ±z bÃ¼tÃ¼n "
 "yapÄ±landÄ±rma deÄŸiÅŸikliklerini kendiniz elle yapmanÄ±z gerekir.  Bu durumda "
@@ -140,14 +145,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Ã‡alÄ±ÅŸma Grubu/Etki AlanÄ± Ä°smi?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -165,13 +172,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "Yeni Windows istemcileri SBM sunucularÄ±yla ÅŸifrelenmiÅŸ parolalar kullanarak "
 "iletiÅŸim kurarlar. EÄŸer dÃ¼z metin parolalarÄ± kullanmak istiyorsanÄ±z Windows "
@@ -182,6 +187,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Yeni Windows istemcileri SBM sunucularÄ±yla ÅŸifrelenmiÅŸ parolalar kullanarak "
+"iletiÅŸim kurarlar. EÄŸer dÃ¼z metin parolalarÄ± kullanmak istiyorsanÄ±z Windows "
+"registry iÃ§inde bir parametreyi deÄŸiÅŸtirmelisiniz. EÄŸer bu iÅŸlemi "
+"yapmÄ±ÅŸsanÄ±z, geÃ§erli bir /etc/samba/smbpasswd dosyanÄ±z olduÄŸundan ve buraya "
+"smbpasswd komutu kullanarak bÃ¼tÃ¼n kullanÄ±cÄ±lar iÃ§in parola kaydÄ± "
+"eklendiÄŸinden emin olun."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Samba parola veritabanÄ± /var/lib/samba/passwd.tdb yaratÄ±lsÄ±n mÄ±?"
@@ -192,14 +213,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Windows'un Ã§oÄŸu sÃ¼rÃ¼mÃ¼yle uyumlu olmasÄ± iÃ§in, Samba'nÄ±n ÅŸifreli parolalarÄ± "
 "kullanmak Ã¼zere yapÄ±landÄ±rÄ±lmasÄ± gerekir.  Bu iÅŸlem kullanÄ±cÄ± parolalarÄ±nÄ±n /"
 "etc/passwd dosyasÄ±ndan farklÄ± bir yerde saklanmasÄ±nÄ± gerektirir. Bu dosya "
@@ -210,19 +236,29 @@
 "yapÄ±landÄ±rmanÄ±z gerekir. Daha ayrÄ±ntÄ±lÄ± bilgi iÃ§in samba-doc paketinden "
 "Ã§Ä±kan /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html'ye baÅŸvurun."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Samba'nÄ±n gÃ¼nce dosyalarÄ± taÅŸÄ±ndÄ±."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Samba 2.2'nin ilk paketlerinden itibaren, Samba artalan sÃ¼reÃ§lerine (nmbd ve "
 "smbd) ait Debian gÃ¼nce dosyalarÄ± artÄ±k /var/log/samba altÄ±nda saklanÄ±yor. Bu "
@@ -230,27 +266,30 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "/var/log/ iÃ§inde bulunan eski gÃ¼nce dosyalarÄ± yeni bir konuma taÅŸÄ±nacak."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Nmbd'nin inetd'den Ã§alÄ±ÅŸtÄ±rÄ±lmasÄ± artÄ±k desteklenmiyor"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "Sisteminiz, nmbd ve smbd'yi inetd Ã¼zerinden Ã§alÄ±ÅŸtÄ±racak ÅŸekilde "
 "ayarlanmÄ±ÅŸ.  SÃ¼rÃ¼m 2.999+3.0.alpha20-4'ten sonra artÄ±k nmbd inetd'den "
@@ -260,19 +299,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "artalan sÃ¼reÃ§leri, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Samba'nÄ±n nasÄ±l Ã§alÄ±ÅŸmasÄ±nÄ± istersiniz?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -282,20 +321,27 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "/etc/samba/smbpasswd /var/lib/samba/passwd.tdb'ye taÅŸÄ±nsÄ±n mÄ±?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba 3.0, /etc/samba/smbpasswd'nin yerini alan yeni ve daha eksiksiz bir "
 "SAM veritabanÄ± arayÃ¼zÃ¼ ile birlikte geliyor. Mevcut smbpasswd dosyasÄ±nÄ±n /"
 "var/lib/samba/passdb.tbd dosyasÄ±na dÃ¶nÃ¼ÅŸtÃ¼rÃ¼lmesini ister misiniz?  EÄŸer "
@@ -305,18 +351,25 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Smb.conf dosyanÄ±z tekrar yazÄ±lacak!"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT smb.conf dosyanÄ±zÄ±n Ã¼zerine yazacak. Bu iÅŸlem kayÄ±tlarÄ± tekrar "
 "dÃ¼zenleyecek, bÃ¼tÃ¼n yorumlarÄ±, include= ve copy= seÃ§eneklerini silecek. EÄŸer "
 "Ã¶zel olarak tasarladÄ±ÄŸÄ±nÄ±z bir smb.conf dosyanÄ±z varsa, bunu yedekleyin veya "
 "SWAT kullanmayÄ±n!"
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Samba'nÄ±n nasÄ±l Ã§alÄ±ÅŸmasÄ±nÄ± istersiniz?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "Smb.conf dosyanÄ±z tekrar yazÄ±lacak!"

Modified: trunk/po/vi.po
===================================================================
--- trunk/po/vi.po	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/po/vi.po	2006-05-29 06:02:33 UTC (rev 1070)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.0.14a-6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-05-29 07:59+0200\n"
 "PO-Revision-Date: 2005-07-12 16:17+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -25,9 +25,10 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"The \"character set\" option is currently configured in smb.conf.  In Samba "
+"3.0, this option is replaced by a new option, \"unix charset\". Please "
 "specify the character set you wish to use for this new option, which "
 "controls how Samba interprets filenames on the file system."
 msgstr ""
@@ -40,13 +41,6 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
-msgstr ""
-"Náº¿u báº¡n bá» rá»—ng tÃ¹y chá»n nÃ y thÃ¬ sáº½ khÃ´ng sá»a Ä‘á»•i táºp tin Â«smb.confÂ» cá»§a báº¡n."
-
-#. Type: string
-#. Description
 #: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Bá»™ kÃ½ tá»± cho trÃ¬nh khÃ¡ch DOS"
@@ -54,13 +48,13 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:13
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Hiá»‡n thá»i báº¡n cÃ³ láºp má»™t Â«client code pageÂ» (trang mÃ£ khÃ¡ch) trong táºp tin "
 "Â«smb.confÂ». Trong Samba phiÃªn báº£n 3.0, tÃ¹y chá»n nÃ y Ä‘Æ°á»£c thay tháº¿ báº±ng tÃ¹y "
@@ -70,15 +64,23 @@
 "Windows: chá»‰ trÃ¬nh khÃ¡ch DOS cáº§n thiáº¿t nÃ³. Náº¿u báº¡n bá» rá»—ng tÃ¹y chá»n nÃ y thÃ¬ "
 "sáº½ khÃ´ng sá»a Ä‘á»•i táºp tin Â«smb.confÂ» cá»§a báº¡n."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+#, fuzzy
+msgid "If you leave this option blank, the smb.conf file will not be changed."
+msgstr ""
+"Náº¿u báº¡n bá» rá»—ng tÃ¹y chá»n nÃ y thÃ¬ sáº½ khÃ´ng sá»a Ä‘á»•i táºp tin Â«smb.confÂ» cá»§a báº¡n."
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Sá»a Ä‘á»•i Â«smb.confÂ» Ä‘á»ƒ dÃ¹ng thiáº¿t láºp WINS tá»« DHCP khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -94,27 +96,30 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:25
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Äá»ƒ nhá»› dá»‹p tÃnh nÄƒng nÃ y, báº¡n cáº§n pháº£i cÃ i Ä‘áº·t gÃ³i tin Â«dhcp3-clientÂ»."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:38
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Cáº¥u hÃ¬nh Â«smb.confÂ» báº±ng debconf khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
 "Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
 msgstr ""
 "Nhá»¯ng pháº§n cÃ²n láº¡i cá»§a cáº¥u hÃ¬nh Samba Ä‘á» cáºp cÃ¢u há»i vá» tham sá»‘ trong táºp "
 "tin Â«/etc/samba/smb.confÂ», táºp tin Ä‘Æ°á»£c dÃ¹ng Ä‘á»ƒ cáº¥u hÃ¬nh chÆ°Æ¡ng trÃ¬nh Samba "
@@ -125,12 +130,12 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:38
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
 "Náº¿u báº¡n khÃ´ng sá» dá»¥ng debconf Ä‘á»ƒ cáº¥u hÃ¬nh táºp tin Â«smb.confÂ», báº¡n sáº½ pháº£i tá»± "
 "quáº£n lÃ½ sá»± thay Ä‘á»•i cáº¥u hÃ¬nh nÃ o, vÃ  sáº½ khÃ´ng thá»ƒ nhá»› dá»‹p cáº¥u hÃ¬nh tÄƒng "
@@ -139,14 +144,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "TÃªn nhÃ³m lÃ m viá»‡c hay tÃªn miá»n?"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:52
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -164,13 +171,11 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:60
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
 "TrÃ¬nh khÃ¡ch Windows má»›i hÆ¡n cÃ³ liÃªn láº¡c vá»›i trÃ¬nh phá»¥c vá»¥ SMB dÃ¹ng máºt kháº©u "
 "máºt mÃ£. Náº¿u báº¡n cÃ³ muá»‘n sá» dá»¥ng máºt kháº©u Â«chá»¯ rÃµÂ» (chá»¯ thÃ´, khÃ´ng cÃ³ máºt mÃ£) "
@@ -181,6 +186,22 @@
 
 #. Type: boolean
 #. Description
+#: ../samba-common.templates:60
+#, fuzzy
+msgid ""
+"Choosing this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"TrÃ¬nh khÃ¡ch Windows má»›i hÆ¡n cÃ³ liÃªn láº¡c vá»›i trÃ¬nh phá»¥c vá»¥ SMB dÃ¹ng máºt kháº©u "
+"máºt mÃ£. Náº¿u báº¡n cÃ³ muá»‘n sá» dá»¥ng máºt kháº©u Â«chá»¯ rÃµÂ» (chá»¯ thÃ´, khÃ´ng cÃ³ máºt mÃ£) "
+"thÃ¬ báº¡n sáº½ cáº§n pháº£i thay Ä‘á»•i má»™t tham sá»‘ trong sá»• Ä‘Äƒng kÃ½ (registry) Windows "
+"mÃ¬nh. Khuyáº¿n khÃch báº¡n sá» dá»¥ng máºt kháº©u máºt mÃ£. Náº¿u báº¡n lÃ m nhÆ° tháº¿, hÃ£y "
+"kiá»ƒm tra xem cÃ³ má»™t táºp tin Â«/etc/samba/smbpasswdÂ» há»£p lá»‡, vÃ  báº¡n Ä‘Ã£ láºp máºt "
+"kháº©u trong nÃ³ cho má»—i ngÆ°á»i dÃ¹ng cÃ³ dÃ¹ng lá»‡nh Â«smbpasswdÂ»."
+
+#. Type: boolean
+#. Description
 #: ../samba.templates:4
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Táº¡o cÆ¡ sá»Ÿ dá»¯ liá»‡u máºt kháº©u samba Â«/var/lib/samba/passdb.tdbÂ» khÃ´ng?"
@@ -191,14 +212,19 @@
 msgid ""
 "To be compatible with the defaults in most versions of Windows, Samba must "
 "be configured to use encrypted passwords.  This requires user passwords to "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+#, fuzzy
+msgid ""
+"This file can be created automatically, but the passwords must be added "
+"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
+"you do not create it, you will have to reconfigure samba (and probably your "
+"client machines) to use plaintext passwords."
+msgstr ""
 "Äá»ƒ tÆ°Æ¡ng thÃch vá»›i nhá»¯ng giÃ¡ trá»‹ máº·c Ä‘á»‹nh trong pháº§n lá»›n phiÃªn báº£n Windows, "
 "trÃ¬nh Samba pháº£i cÃ³ cáº¥u hÃ¬nh dÃ¹ng máºt kháº©u máºt mÃ£. LÃ m nhÆ° tháº¿ cáº§n thiáº¿t cÃ¡c "
 "máºt kháº©u ngÆ°á»i dÃ¹ng Ä‘Æ°á»£c lÆ°u vÃ o má»™t táºp tin khÃ¡c vá»›i Â«/etc/passwdÂ». CÃ³ thá»ƒ "
@@ -209,19 +235,29 @@
 "tin Â«/usr/share/doc/samba-doc/htmldocs/ENCRYPTION.htmlÂ» tá»« gÃ³i tin Â«samba-"
 "docÂ» Ä‘á»ƒ tÃ¬m chi tiáº¿t."
 
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:19
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Táºp tin báº£n ghi Samba Ä‘Ã£ di chuyá»ƒn rá»“i."
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Tá»« gÃ³i tin thá»© nháº¥t cá»§a Samba phiÃªn báº£n 2.2 cho Debian, nhá»¯ng táºp tin báº£n "
 "ghi cho cáº£ hai trÃ¬nh ná»n Samba (nmbd vÃ  smbd) Ä‘Æ°á»£c lÆ°u vÃ o Â«/var/log/"
@@ -230,28 +266,31 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:19
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
 "CÃ¡c táºp tin báº£n ghi cÅ© Ä‘Ã£ trong Â«/var/log/Â» sáº½ Ä‘Æ°á»£c di chuyá»ƒn sang vá»‹ trÃ "
 "má»›i cho báº¡n dÃ¹ng."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:29
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "KhÃ´ng cÃ²n há»— trá»£ láº¡i cháº¡y trÃ¬nh nmbd tá»« inetd."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:29
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
 "TrÆ°á»›c nÃ y, há»‡ thá»‘ng báº¡n Ä‘Æ°á»£c cáº¥u hÃ¬nh Ä‘á»ƒ khá»Ÿi cháº¡y trÃ¬nh ná»n nmbd vÃ  smbd tá»« "
 "inetd. Tá»« phiÃªn báº£n 2.999+3.0.alpha20-4, nmbd sáº½ khÃ´ng cÃ²n Ä‘Æ°á»£c khá»Ÿi cháº¡y "
@@ -260,19 +299,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:36
+#: ../samba.templates:37
 msgid "daemons, inetd"
 msgstr "trÃ¬nh ná»n, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Báº¡n cÃ³ muá»‘n cháº¡y Samba nhÆ° tháº¿ nÃ o?"
+#: ../samba.templates:39
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../samba.templates:39
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -282,21 +321,28 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr ""
 "Di chuyá»ƒn Â«/etc/samba/smbpasswdÂ» sang Â«/var/lib/samba/passdb.tdbÂ» khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:46
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:46
+#, fuzzy
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
 "Samba phiÃªn báº£n 3.0 giá»›i thiá»‡u má»™t giao diá»‡n cÆ¡ sá»Ÿ dá»¯ liá»‡u SAM má»›i hÆ¡n, hoÃ n "
 "thÃ nh hÆ¡n mÃ  thay tháº¿ táºp tin Â«/etc/samba/smbpasswdÂ». Báº¡n cÃ³ muá»‘n trÃ¬nh nÃ y "
 "di chuyá»ƒn táºp tin Â«smbpasswdÂ» Ä‘Ã£ cÃ³ sang Â«/var/lib/samba/passdb.tdbÂ» khÃ´ng? "
@@ -306,17 +352,24 @@
 #. Type: note
 #. Description
 #: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "â€¢ Sáº½ ghi láº¡i táºp tin Â«smb.confÂ» cá»§a báº¡n. â€¢"
+msgid "Configuration file rewritten by SWAT"
+msgstr ""
 
 #. Type: note
 #. Description
 #: ../swat.templates:3
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"SWAT will rewrite the smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you use a carefully "
+"crafted smb.conf, you should probably avoid using SWAT."
 msgstr ""
 "SWAT sáº½ ghi láº¡i táºp tin Â«smb.confÂ» cá»§a báº¡n. NÃ³ sáº½ sáº¯p xáº¿p láº¡i cÃ¡c má»¥c nháºp, "
 "vÃ  xÃ³a bá» má»i chÃº thÃch vÃ  tÃ¹y chon Â«include=Â» vÃ  Â«copy=Â». Náº¿u báº¡n khÃ´ng "
 "muá»‘n máº¥t táºp tin Â«smb.confÂ» mÃ¬nh thÃ¬ hÃ£y lÆ°u trá»¯ nÃ³, hoáº·c khÃ´ng sá» dá»¥ng SWAT."
+
+#~ msgid "How do you want to run Samba?"
+#~ msgstr "Báº¡n cÃ³ muá»‘n cháº¡y Samba nhÆ° tháº¿ nÃ o?"
+
+#~ msgid "Your smb.conf will be re-written!"
+#~ msgstr "â€¢ Sáº½ ghi láº¡i táºp tin Â«smb.confÂ» cá»§a báº¡n. â€¢"

Modified: trunk/samba-common.templates
===================================================================
--- trunk/samba-common.templates	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/samba-common.templates	2006-05-29 06:02:33 UTC (rev 1070)
@@ -1,22 +1,23 @@
 Template: samba-common/character_set
 Type: string
 _Description: Character Set for Unix filesystem
- You currently have a "character set" configured in your smb.conf.  In
+ The "character set" option is currently configured in smb.conf.  In
  Samba 3.0, this option is replaced by a new option, "unix charset".
  Please specify the character set you wish to use for this new option,
  which controls how Samba interprets filenames on the file system.
  .
- If you leave this option blank, your smb.conf will not be changed.
+ If you leave this option blank, the smb.conf file will not be changed.
 
 Template: samba-common/codepage
 Type: string
 _Description: Character Set for DOS clients
- You currently have a "client code page" set in your smb.conf.  In Samba
+ The "client code page" option is currently configured in smb.conf.  In Samba
  3.0, this option is replaced by the option "dos charset".  Please specify
  the character set you wish to use for this new option.  In most cases, the
  default chosen for you will be sufficient.  Note that this option is not
- needed to support Windows clients, it is only for DOS clients.  If you
- leave this option blank, your smb.conf will not be changed.
+ needed to support Windows clients, it is only for DOS clients.
+ .
+ If you leave this option blank, the smb.conf file will not be changed.
 
 Template: samba-common/dhcp
 Type: boolean
@@ -28,29 +29,28 @@
  change to your smb.conf file so that DHCP-provided WINS settings will
  automatically be read from /etc/samba/dhcp.conf.
  .
- You must have the dhcp3-client package installed to take advantage of this
+ The dhcp3-client package must be installed to take advantage of this
  feature.
 
 Template: samba-common/do_debconf
 Type: boolean
 Default: true
-_Description: Configure smb.conf through debconf?
- The rest of the configuration of Samba deals with questions that affect
- parameters in /etc/samba/smb.conf, which is the file used to configure the
- Samba programs (nmbd and smbd). Your current smb.conf contains an
- 'include' line or an option that spans multiple lines, which could confuse
- debconf and require you to edit your smb.conf by hand to get it working
- again.
+_Description: Configure smb.conf automatically?
+ The rest of the configuration of Samba deals with questions that
+ affect parameters in /etc/samba/smb.conf, which is the file used to
+ configure the Samba programs (nmbd and smbd). Your current smb.conf
+ contains an 'include' line or an option that spans multiple lines,
+ which could confuse the automated configuration process and require
+ you to edit your smb.conf by hand to get it working again.
  .
- If you don't use debconf to configure smb.conf, you will have to handle
+ If you do not choose this option, you will have to handle
  any configuration changes yourself, and will not be able to take
- advantage of periodic configuration enhancements.  Therefore, use of
- debconf is recommended if possible.
+ advantage of periodic configuration enhancements.
 
 Template: samba-common/workgroup
 Type: string
-_Description: Workgroup/Domain Name?
- This controls what workgroup your server will appear to be in when queried
+_Description: Workgroup/Domain Name:
+ Please specify the workgroup this server will appear to be in when queried
  by clients. Note that this parameter also controls the Domain name used
  with the security=domain setting.
 
@@ -58,9 +58,10 @@
 Type: boolean
 Default: true
 _Description: Use password encryption?
- Recent Windows clients communicate with SMB servers using encrypted
+ Most Windows clients communicate with SMB servers using encrypted
  passwords. If you want to use clear text passwords you will need to change
- a parameter in your Windows registry. It is recommended that you use
- encrypted passwords. If you do, make sure you have a valid
- /etc/samba/smbpasswd file and that you set passwords in there for each
- user using the smbpasswd command.
+ a parameter in your Windows registry. 
+ .
+ Choosing this option is highly recommended. If you do, make sure you
+ have a valid /etc/samba/smbpasswd file and that you set passwords in
+ there for each user using the smbpasswd command.

Modified: trunk/samba.templates
===================================================================
--- trunk/samba.templates	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/samba.templates	2006-05-29 06:02:33 UTC (rev 1070)
@@ -4,38 +4,39 @@
 _Description: Create samba password database, /var/lib/samba/passdb.tdb?
  To be compatible with the defaults in most versions of Windows, Samba must
  be configured to use encrypted passwords.  This requires user passwords to
- be stored in a file separate from /etc/passwd. This file can be created
- automatically, but the passwords must be added manually (by you or the
- user) by running smbpasswd, and you must arrange to keep it up-to-date in
- the future.  If you do not create it, you will have to reconfigure samba
- (and probably your client machines) to use plaintext passwords. See
- /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc
- package for more details.
+ be stored in a file separate from /etc/passwd.
+ .
+ This file can be created automatically, but the passwords must be
+ added manually (by running smbpasswd) and be kept up-to-date in the
+ future.  If you do not create it, you will have to reconfigure samba
+ (and probably your client machines) to use plaintext passwords.
+ .
+ See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the
+ samba-doc package for more details.
 
 Template: samba/log_files_moved
 Type: note
-_Description: Samba's log files have moved.
- Starting with the first packages of Samba 2.2 for Debian the log files for
- both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The
- names of the files are log.nmbd and log.smbd, for nmbd and smbd
- respectively.
+_Description: Samba's log files moved
+ The log files for both Samba daemons (nmbd and smbd) are now stored
+ in /var/log/samba/. The names of the files are log.nmbd and log.smbd,
+ for nmbd and smbd respectively.
  .
- The old log files that were in /var/log/ will be moved to the new location
- for you.
+ The old log files from /var/log/ will automatically be moved to
+ the new location.
 
 Template: samba/nmbd_from_inetd
 Type: note
-_Description: Running nmbd from inetd is no longer supported
- Your system was previously configured to start nmbd and smbd from inetd. 
- As of version 2.999+3.0.alpha20-4, nmbd will no longer be started from
- inetd.  If you have modified your /etc/init.d/samba startup script, you
- may need to adjust it by hand now so that nmbd will start.
+_Description: Running nmbd from inetd no longer supported
+ This system was previously configured to start nmbd and smbd from
+ inetd. In recent Samba versions, nmbd cannot be started from inetd.
+ If you have modified your /etc/init.d/samba startup script, you may
+ need to adjust it now so that nmbd will start.
 
 Template: samba/run_mode
 Type: select
 _Choices: daemons, inetd
 Default: daemons
-_Description: How do you want to run Samba?
+_Description: Samba run method:
  The Samba daemon smbd can run as a normal daemon or from inetd. Running as
  a daemon is the recommended approach.
 
@@ -43,8 +44,10 @@
 Type: boolean
 Default: false
 _Description: Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?
- Samba 3.0 introduces a newer, more complete SAM database interface which
- supersedes the /etc/samba/smbpasswd file.  Would you like your existing
- smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you
- plan to use another pdb backend (e.g., LDAP) instead, you should answer
- 'no' here.
+ Samba 3.0 introduced a more complete SAM database interface which
+ supersedes the /etc/samba/smbpasswd file.
+ .
+ Please confirm whether you would like the existing smbpasswd file to
+ be automatically migrated to /var/lib/samba/passdb.tdb.  Do not
+ choose this option if you plan to use another pdb backend (e.g.,
+ LDAP) instead.

Modified: trunk/swat.templates
===================================================================
--- trunk/swat.templates	2006-05-28 16:50:34 UTC (rev 1069)
+++ trunk/swat.templates	2006-05-29 06:02:33 UTC (rev 1070)
@@ -1,6 +1,6 @@
 Template: swat/smb_conf_warn
 Type: note
-_Description: Your smb.conf will be re-written!
- SWAT will rewrite your smb.conf file. It will rearrange the entries and
- delete all comments, include= and copy= options. If you have a carefully
- crafted smb.conf then back it up or don't use SWAT!
+_Description: Configuration file rewritten by SWAT
+ SWAT will rewrite the smb.conf file. It will rearrange the entries and
+ delete all comments, include= and copy= options. If you use a carefully
+ crafted smb.conf, you should probably avoid using SWAT.


