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

Sun Aug 13 23:38:27 UTC 2006

Author: vorlon
Date: 2006-08-13 23:38:25 +0000 (Sun, 13 Aug 2006)
New Revision: 1123

Modified:
   trunk/changelog
   trunk/po/ar.po
   trunk/po/ca.po
   trunk/po/cs.po
   trunk/po/da.po
   trunk/po/de.po
   trunk/po/dz.po
   trunk/po/es.po
   trunk/po/eu.po
   trunk/po/fr.po
   trunk/po/gl.po
   trunk/po/it.po
   trunk/po/ja.po
   trunk/po/km.po
   trunk/po/nl.po
   trunk/po/pt.po
   trunk/po/pt_BR.po
   trunk/po/ro.po
   trunk/po/ru.po
   trunk/po/sv.po
   trunk/po/templates.pot
   trunk/po/tr.po
   trunk/po/vi.po
   trunk/po/zh_CN.po
   trunk/samba-common.config
   trunk/samba-common.postinst
   trunk/samba-common.templates
   trunk/samba.config
   trunk/samba.templates
Log:
Drop code and debconf questions specific to upgrades from samba <= 2.2.

Reword some debconf translations as discussed on the list.

Rerun debconf-updatepo.

Switch debian/ca.po to UTF-8.

Restore some reverted strings for Galician, Czech, Brazilian Portuguese,
Spanish, French, Italian, Catalan, Portuguese, Russian, and Japanese.

Update translations for Brazilian Portuguese, Spanish, French, Italian,
Catalan, and Portuguese.



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

--- trunk/changelog	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/changelog	2006-08-13 23:38:25 UTC (rev 1123)
@@ -10,8 +10,18 @@
   * Remove no longer functioning "guest" value from "passdb backend"
     setting in smb.conf on upgrade. Closes: #382296
 
- -- Peter Eisentraut <petere at debian.org>  Sat, 12 Aug 2006 19:21:59 +0200
+  [ Steve Langasek ]
+  * Drop code and debconf questions specific to upgrades from samba <= 2.2.
+  * Reword some debconf translations as discussed on the list.
+  * Rerun debconf-updatepo.
+  * Switch debian/ca.po to UTF-8.
+  * Restore some reverted strings for Galician, Czech, Brazilian Portuguese,
+    Spanish, French, Italian, Catalan, Portuguese, Russian, and Japanese.
+  * Update translations for Brazilian Portuguese, Spanish, French, Italian,
+    Catalan, and Portuguese.
 
+ -- Steve Langasek <vorlon at debian.org>  Sun, 13 Aug 2006 16:14:21 -0700
+
 samba (3.0.23b-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/ar.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-07-26 02:18+0200\n"
 "Last-Translator: Younes Behloul <behloul.younes at gmail.com>\n"
 "Language-Team: Arabic <debian-l10n-arabic at lists.debian.org>\n"
@@ -16,64 +16,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø±Ù…ÙˆØ² Ù„Ù†Ø¸Ø§Ù… Ù…Ù„ÙØ§Øª Unix"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"Ø¥Ù† Ø®ÙŠØ§Ø± \"Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø±Ù…ÙˆØ²\" ÙŠØªÙˆØ§Ø¬Ø¯ ØØ§Ù„ÙŠØ§ ÙÙŠ smb.conf Ù…Ø¹ Ù†Ø³Ø®Ø© Samba Ù€ 3.0, Ù‡Ø°Ø§ "
-"Ø§Ù„Ø®ÙŠØ§Ø± Ù‚Ø¯ Ø§Ø³ØªØ¨Ø¯Ù„ Ø¨Ø®ÙŠØ§Ø± Ø¬Ø¯ÙŠØ¯, \"Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø±Ù…ÙˆØ² Ù„Ù†Ø¸Ø§Ù… Ù…Ù„ÙØ§Øª Unix\" Ù…Ù† ÙØ¶Ù„Ùƒ Ø¹ÙŠÙ† "
-"Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø±Ù…ÙˆØ² Ø§Ù„Ù…Ø±Ø§Ø¯ Ø§Ø³ØªØ¹Ù…Ø§Ù„Ù‡Ø§ Ù„Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± Ø§Ù„Ø¬Ø¯ÙŠØ¯,Ùˆ Ø§Ù„Ø°ÙŠ ÙŠØªØÙƒÙ… ÙÙŠ ÙƒÙŠÙÙŠØ© "
-"ØªÙØ³ÙŠØ± Samba Ù„Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…ØªÙˆØ§Ø¬Ø¯Ø© Ø¹Ù„Ù‰ Ù†Ø¸Ø§Ù… Ø§Ù„Ù…Ù„ÙØ§Øª."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Ø¥Ø°Ø§ ØªØ±ÙƒØª Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± ÙØ§Ø±ØºØ§,  ÙØ¥Ù† Ù…Ù„Ù smb.conf  Ù„Ù† ÙŠÙØºÙŠÙ‘ÙŽØ±."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø±Ù…ÙˆØ² Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠ DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-" ÙŠØªÙˆØ§Ø¬Ø¯ Ø®ÙŠØ§Ø± \"ØµÙØØ© Ø±Ù…ÙˆØ² Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…\" ÙÙŠ Ù…Ù„Ù smb.conf. Ùˆ Ù‚Ø¯ Ø§Ø³ØªØ¨Ø¯Ù„ Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± "
-"Ù…Ø¹ Ø§Ù„Ù†Ø³Ø®Ø© Samba 3.0. Ø¨Ø®ÙŠØ§Ø± \"dos charset\". Ù…Ù† ÙØ¶Ù„Ùƒ ØØ¯Ø¯ ØµÙØØ© Ø§Ù„Ø±Ù…ÙˆØ² Ø§Ù„ØªÙŠ "
-"ØªØ±ØºØ¨ ÙÙŠ Ø§Ø³ØªØ¹Ù…Ø§Ù„Ù‡Ø§ Ù„Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± Ø§Ù„Ø¬Ø¯ÙŠØ¯. Ø¹Ø§Ø¯Ø© Ø§Ù„Ø®ÙŠØ§Ø± Ø§Ù„Ø¥ÙØªØ±Ø§Ø¶ÙŠ ÙŠÙƒÙÙŠ. Ù„Ø§ØØ¸ Ø£Ù† "
-"Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± ØºÙŠØ± Ù„Ø§Ø²Ù… Ù„Ù…Ù…Ø§Ø´Ø§Øª Ù…Ø³ØªØ®Ø¯Ù…ÙŠ Windows, Ù‡Ùˆ ÙŠØ¹Ù†ÙŠ Ù…Ø³ØªØ®Ø¯Ù…ÙŠ DOS ÙÙ‚Ø·."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "ØªØºÙŠÙŠØ± smb.conf Ù„Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª WINS Ø¹Ø¨Ø± DHCP"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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 "
@@ -88,20 +39,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "ÙŠØ¬Ø¨ ØªØ«Ø¨ÙŠØª Ø±Ø²Ù…Ø© dhcp3-client Ù„Ù„Ø§Ø³ØªÙØ§Ø¯Ø© Ù…Ù† Ù‡Ø°Ù‡ Ø§Ù„Ù…ÙŠØ²Ø©."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Ø¥Ø¹Ø¯Ø§Ø¯ Ø¢Ù„ÙŠ Ù„Ù…Ù„Ù smb.conf ØŸ"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -118,7 +69,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -129,17 +80,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr " Ø§Ø³Ù… Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø¹Ù…Ù„/Ø§Ù„ØÙ‚Ù„:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "Ù…Ù† ÙØ¶Ù„Ùƒ ØØ¯Ù‘ÙØ¯ Ù…Ø¬Ù…ÙˆØ¹Ø© Ø§Ù„Ø¹Ù…Ù„ Ø§Ù„ØªÙŠ Ø³ÙŠØ¸Ù‡Ø± Ø¯Ø§Ø®Ù„Ù‡Ø§ Ù‡Ø°Ø§ Ø§Ù„Ø®Ø§Ø¯Ù… Ø¹Ù†Ø¯ Ø§Ø³ØªÙØ³Ø§Ø±Ù‡ Ù…Ù† Ø·Ø±Ù "
 "Ø§Ù„Ø²Ø¨Ø§Ø¦Ù†. Ù„Ø§ØØ¸ Ø£Ù† Ù‡Ø°Ø§ Ø§Ù„Ù…Ù‚ÙŠØ§Ø³ ÙŠØªØÙƒÙ… ÙÙŠ Ø¥Ø³Ù… Ø§Ù„ØÙ‚Ù„ Ø§Ù„Ù…Ø³ØªØ¹Ù…Ù„ Ù…Ø¹ Ø§Ù„Ø®ÙŠØ§Ø± "
@@ -147,24 +99,25 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "ØªØ´ÙÙŠØ± ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± ØŸ"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "Ø£ØºÙ„Ø¨ÙŠØ© Ø²Ø¨Ø§Ø¦Ù† Windows ÙŠØªØµÙ„ÙˆÙ† Ù…Ø¹ Ø®ÙØ¯Ù‘Ø§Ù… SMB Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† ÙƒÙ„Ù…Ø§Øª Ù…Ø±ÙˆØ± Ù…Ø´ÙØ±Ø©. Ø¥Ø°Ø§ Ø£Ø±Ø¯Øª "
 "Ø§Ø³ØªØ¹Ù…Ø§Ù„ ÙƒÙ„Ù…Ø§Øª Ù…Ø±ÙˆØ± ÙˆØ§Ø¶Ø®Ø© Ø¹Ù„ÙŠÙƒ Ø¨ØªØºÙŠÙŠØ± Ø¥Ø¹Ø¯Ø§Ø¯ ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© ØªØ³Ø¬ÙŠÙ„Ø§Øª Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -217,66 +170,21 @@
 "Ø±Ø§Ø¬Ø¹ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION ÙÙŠ Ø±Ø²Ù…Ø© samba-doc Ù„ØªÙØ§ØµÙŠÙ„ "
 "Ø£ÙƒØ«Ø±."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr " Ù†ÙÙ‚Ù„Øª Ù…Ù„ÙØ§Øª ØªØ³Ø¬ÙŠÙ„ Samba."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 Ù€ (nmbd Ùˆ smbd)  Ù…ØÙÙˆØ¸Ø© Ø§Ù„Ø¢Ù† ÙÙŠ /var/log/"
-"samba . Ø§Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ù„ÙØ§Øª Ù‡ÙŠ   log.nmbd Ùˆ log.smbd Ù„ÙƒÙ„ Ù…Ù† nmbd Ùˆ smbd Ø¹Ù„Ù‰ "
-"Ø§Ù„ØªØ±ØªÙŠØ¨."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr "Ù…Ù„ÙØ§Øª Ø§Ù„ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ù‚Ø¯ÙŠÙ…Ø© ÙÙŠ /var/log/ Ø³ØªÙ†Ù‚Ù„ Ø¢Ù„ÙŠØ§ Ø¥Ù„Ù‰ Ø§Ù„Ù…ÙˆÙØ¹ Ø§Ù„Ø¬Ø¯ÙŠØ¯."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "ØªØ´ØºÙŠÙ„ nmbd Ù…Ù† inetd Ù„Ù… ÙŠØ¹Ø¯ Ù…Ø¯Ø¹ÙˆÙ…Ø§"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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. Ù…Ø¹ Ù†ÙØ³Ø® Samba Ø§Ù„ØØ¯ÙŠØ«Ø©, Ù„Ø§ "
-"ÙŠÙ…ÙƒÙ† Ù„Ø±Ù‚ÙŠØ¨ nmbd Ø£Ù† ÙŠÙØ´ÙŽØºÙ‘Ù„ Ø¹Ø¨Ø± inetd. Ø¥Ø°Ø§ ÙƒÙ†Øª Ù‚Ø¯ ØºÙŠØ±Øª Ù…Ø®Ø·ÙˆØ· Ø§Ù„Ø§Ø´ØªØºØ§Ù„ /etc/init."
-"d/samba, Ø¹Ù„ÙŠÙƒ Ø¨ØªØ¹Ø¯ÙŠÙ„Ù‡ Ù„ØªØ´ØºÙŠÙ„ nmbd Ø£ÙŠØ¶Ø§."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "Ø±Ù‚Ø¨Ø§Ø¡, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Ø·Ø±ÙŠÙ‚Ø© ØªØ´ØºÙŠÙ„ Samba:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -284,13 +192,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -300,7 +208,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -310,14 +218,3 @@
 "samba/passdb.tdb. Ù„Ø§ ØªØ®ØªØ± Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± Ø¥Ø°Ø§ ÙƒÙ†Øª ØªÙ†ÙˆÙŠ Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ù‚Ø§Ø¹Ø¯Ø© ÙƒÙ„Ù…Ø§Øª Ù…Ø±ÙˆØ± "
 "Ø®Ù„ÙÙŠØ© ( pdb backend) Ù…Ø«Ù„ LDAP."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "Ù…Ù„Ù Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£Ø¹ÙŠØ¯ ØªØ®Ø±ÙŠØ±Ù‡ Ø§Ø®Ø±Ù‰ Ù…Ù† Ø·Ø±Ù SWAT"
-
-#~ msgid ""
-#~ "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.  "

Modified: trunk/po/ca.po
===================================================================
--- trunk/po/ca.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/ca.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -5,81 +5,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.0beta2-1_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
-"PO-Revision-Date: 2004-03-13 21:32-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"PO-Revision-Date: 2006-08-13 15:16-0700\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Joc de caràcters pel sistema de fitxers de Unix"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-#, fuzzy
-msgid ""
-"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 ""
-"El fitxer smb.conf actual té configurat un \"character set\".  En la versió "
-"3.0 de Samba, aquesta opció es reemplaça per l'opció \"unix charset\". "
-"Especifiqueu el joc de caràcters que voleu utilitzar per a aquesta nova "
-"opció que controla el mode que el Samba interpreta els noms de fitxers del "
-"sistema de fitxers."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-#, 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: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Joc de caràcters pels clients DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-#, fuzzy
-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 ""
-"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\". "
-"L'opció per defecte és suficient en la majoria del casos. Recordeu que "
-"aquesta opció no és necessària pel suport dels clients de Windows, només és "
-"pels clients de DOS. Si deixeu aquesta opció en blanc no es canviarà el smb."
-"conf."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
-"Voleu modificar el smb.conf perquè utilitza els paràmetres de configuració "
+"Voleu modificar el smb.conf perquÃ¨ utilitza els parÃ metres de configuraciÃ³ "
 "del WINS del DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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,34 +32,31 @@
 "to your smb.conf file so that DHCP-provided WINS settings will automatically "
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
-"Si el vostre ordinador obté la informació referent a la IP a través d'un "
-"servidor de DHCP, aquest també li donarà informació sobre els servidors de "
-"WINS (\"servidors de nom de NetBIOS\") presents a la xarxa. Aquesta opció "
-"precisa d'una modificació del fitxer smb.conf per tal que els paràmetres de "
-"WINS obtinguts a través del DHCP s'obtinguin a través de la lectura de /etc/"
+"Si el vostre ordinador obtÃ© la informaciÃ³ referent a la IP a travÃ©s d'un "
+"servidor de DHCP, aquest tambÃ© li donarÃ  informaciÃ³ sobre els servidors de "
+"WINS (\"servidors de nom de NetBIOS\") presents a la xarxa. Aquesta opciÃ³ "
+"precisa d'una modificaciÃ³ del fitxer smb.conf per tal que els parÃ metres de "
+"WINS obtinguts a travÃ©s del DHCP s'obtinguin a travÃ©s de la lectura de /etc/"
 "samba/dhcp.conf"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
-#, fuzzy
+#: ../samba-common.templates:1001
 msgid ""
 "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 "
+"Per beneficiar-vos d'aquesta caracterÃstica cal que sigui instalÂ·lat el "
 "paquet dhcp3-client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
-msgstr "Voleu configurar el smb.conf a través del debconf?"
+msgstr "Voleu configurar el smb.conf automÃ ticament?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
+#: ../samba-common.templates:2001
 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 "
@@ -123,81 +65,70 @@
 "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."
-"conf. La versió actual del smb.conf conté una línia 'include' o una opció "
-"que abarca múltiples línies que podria confondre al debconf i precisa de la "
-"seva edició manual per poder-lo fer funcionar de nou."
+"La resta de la configuraciÃ³ del Samba tracta amb qÃ¼estions que afecten els "
+"parÃ metres del fitxer de configuraciÃ³ dels programes de Samba /etc/samba/smb."
+"conf. La versiÃ³ actual del smb.conf contÃ© una lÃnia 'include' o una opciÃ³ "
+"que abarca mÃºltiples lÃnies que podria confondre a la configuraciÃ³ "
+"automÃ tica i precisar de la seva ediciÃ³ manual per poder-lo fer funcionar de "
+"nou."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
-"les millores.  La seva utilització és recomenable en cas que sigui possible."
+"Si no escolliu aquesta opciÃ³, haureu de gestionar manualment qualsevol canvi "
+"de la configuraciÃ³, i no us podreu beneficiar de les millores."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
-#, fuzzy
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
-msgstr "Grup de treball/nom del domini?"
+msgstr "Grup de treball/nom del domini:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
-#, fuzzy
+#: ../samba-common.templates:3001
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
-"Aquesta opció defineix en quin grup de treball apareixerà el vostre servidor "
-"quan ho consultin els clients. Recordeu que aquest paràmetre també controla "
-"el nom de domini utilitzat pel paràmetre de configuració security=domain."
+"Indiqueu en quin grup de treball voleu que aparegui el vostre servidor "
+"quan ho consultin els clients. Recordeu que aquest parÃ metre tambÃ© controla "
+"el nom de domini utilitzat pel parÃ metre de configuraciÃ³ security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
-msgstr "Voleu utilitzar l'encriptació de contrasenyes?"
+msgstr "Voleu utilitzar l'encriptaciÃ³ de contrasenyes?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
-#, fuzzy
+#: ../samba-common.templates:4001
 msgid ""
-"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."
+"All 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."
 msgstr ""
-"Els clients de Windows més recents es comuniquen amb els servidors de Samba "
+"Tots els clients de Windows 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."
+"text pla, haureu de modificar el vostre registre de Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
-#, fuzzy
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
+"Ã‰s recomanable habilitar aquesta opciÃ³. 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
@@ -217,25 +148,22 @@
 "automatically, but the passwords must be added manually by running smbpasswd "
 "and be kept up-to-date in the future."
 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 "
+"del /etc/passwd. Aquest fitxer es pot crear automÃ ticament, perÃ² les "
+"contrasenyes s'han d'afegir manualment executant l'ordre smbpasswd i s'han "
+"d'actualitzar en un futur."
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-#, fuzzy
 msgid ""
 "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 "
-"del /etc/passwd. Aquest fitxer es pot crear automàticament, però les "
-"contrasenyes s'han d'afegir manualment (per vós o per l'usuari) executant "
-"l'ordre smbpasswd i cal que us organitzeu per tenir-lo actualitzat en un "
-"futur.  Si no el creeu, haureu de reconfigurar el Samba (i probablement els "
+"Si no el creeu, haureu de reconfigurar el Samba (i probablement els "
 "vostres ordinadors clients) per tal que utilitzin contrasenyes de text pla. "
-"Per més informació feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html del paquet samba-doc."
 
 #. Type: boolean
 #. Description
@@ -244,123 +172,55 @@
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
 msgstr ""
+"Per mÃ©s informaciÃ³ feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html del paquet samba-doc."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid "Samba's log files moved"
-msgstr "S'han desplaçat els fitxers de registre de Samba."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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. "
-"Els noms dels fitxers són, respectivament, log.nmbd i log.smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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:3001
-#, 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:3001
-#, fuzzy
-msgid ""
-"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 "
-"es pot iniciar a través del inetd.  Si heu modificat la seqüència "
-"d'arrencada /etc/init.d/samba, l'haureu de modificar manualment per tal que "
-"s'iniciï com a dimoni."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "dimonis, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr ""
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Com voleu executar el Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
-"El dimoni de Samba pot executar-se com un dimoni normal o des del inetd. És "
+"El dimoni de Samba pot executar-se com un dimoni normal o des del inetd. Ã‰s "
 "recomanable executar-lo com un dimoni."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
-msgstr "Es desplaça etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
+msgstr "Es desplaÃ§a etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
 msgstr ""
+"El Samba 3.0 introdueix una interfÃcie de base de dades de SAM mÃ©s completa "
+"que reemplaÃ§a el fitxer /etc/samba/smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
-#, fuzzy
+#: ../samba.templates:3001
 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 "
-"utilitzar un altre pdb (ex, LDAP), haurieu de respondre 'no' aquí."
-
-#, fuzzy
-#~ msgid ""
-#~ "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à"
+"Confirmeu si voleu que es migri el fitxer smbpasswd a /var/lib/samba/passdb."
+"tdb.  No esculliu aquesta opciÃ³ si la vostra intenciÃ³ Ã©s utilitzar un altre "
+"pdb (ex, LDAP)."

Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/cs.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-05-29 18:03+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -23,65 +23,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "ZnakovÃ¡ sada pro unixovÃ½ souborovÃ½ systÃ©m"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"MomentÃ¡lnÄ› mÃ¡te ve svÃ©m smb.conf nastavenou volbu \"character set\". V SambÄ› "
-"3.0 je tato volba nahrazena volbou \"unix charset\". Zadejte, prosÃm, "
-"znakovou sadu, kterou chcete pouÅ¾Ãt pro novou volbu. TÃmto nastavÃte, jak mÃ¡ "
-"Samba interpretovat nÃ¡zvy souborÅ¯ v souborovÃ©m systÃ©mu."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Pokud nezadÃ¡te nic, vÃ¡Å¡ soubor smb.conf se nezmÄ›nÃ."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "ZnakovÃ¡ sada pro DOSovÃ© klienty."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"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, "
-"znakovou sadu, kterou chcete pouÅ¾Ãt pro novou volbu. Ve vÄ›tÅ¡inÄ› pÅ™ÃpadÅ¯ "
-"postaÄuje implicitnÃ hodnota. Tato volba nenÃ potÅ™ebnÃ¡ pro WindowsovÃ© "
-"klienty, pouze pro ty DOSovÃ©."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -105,13 +55,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Konfigurovat smb.conf automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -129,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -140,17 +90,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Skupina/DomÃ©novÃ© jmÃ©no:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "Zadejte prosÃm jmÃ©no skupiny, do kterÃ© mÃ¡ server patÅ™it (resp. se to tak "
 "bude jevit klientÅ¯m. Tento parametr takÃ© urÄuje domÃ©novÃ© jmÃ©no pouÅ¾ÃvanÃ© s "
@@ -158,17 +109,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "PouÅ¾Ãt Å¡ifrovÃ¡nÃ hesel?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "VÄ›tÅ¡ina windowsovÃ½ch klientÅ¯ pouÅ¾ÃvÃ¡ pro komunikaci se SMB servery Å¡ifrovanÃ¡ "
 "hesla. Pokud chcete pouÅ¾Ãt hesla neÅ¡ifrovanÃ¡, musÃte zmÄ›nit jeden parametr v "
@@ -176,7 +128,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -230,67 +182,21 @@
 "Podrobnosti naleznete v souboru /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 "html z balÃku samba-doc."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "LogovacÃ soubory Samby se pÅ™esunuly"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"LogovacÃ soubory obou daemonÅ¯ (nmbd a smbd) jsou umÃstÄ›ny ve /var/log/"
-"samba/. JmÃ©na pÅ™ÃsluÅ¡nÃ½ch souborÅ¯ jsou log.nmbd a log.smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "SpouÅ¡tÄ›nÃ nmbd z inetd jiÅ¾ nenÃ podporovÃ¡no"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 dÅ™Ãve nastaven, aby spouÅ¡tÄ›l nmbd a smbd z inetd. V novÄ›jÅ¡Ãch "
-"verzÃch Samby to jiÅ¾ nenÃ moÅ¾nÃ©. Pokud jste si upravili startovacÃ skript /"
-"etc/init.d/samba, moÅ¾nÃ¡ jej nynÃ budete muset upravit, aby se mohl nmbd "
-"spustit."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "dÃ©moni, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "ZpÅ¯sob spouÅ¡tÄ›nÃ Samby:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Jak chcete spouÅ¡tÄ›t Sambu?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -300,13 +206,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -316,7 +222,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -326,14 +232,3 @@
 "na /var/lib/samba/passwd.tdb. Pokud plÃ¡nujete pouÅ¾Ãt jinou pdb databÃ¡zi "
 "(tÅ™eba LDAP), mÄ›li byste odpovÄ›dÄ›t zÃ¡pornÄ›."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "SWAT pÅ™epÃÅ¡e konfiguraÄnÃ soubor"
-
-#~ msgid ""
-#~ "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 svÅ¯j pracnÄ› odladÄ›nÃ½ smb."
-#~ "conf, tak byste se asi mÄ›li SWATu vyhnout."

Modified: trunk/po/da.po
===================================================================
--- trunk/po/da.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/da.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\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"
@@ -15,69 +15,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "TegnsÃ¦t til Unix-filsystemet"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-#, fuzzy
-msgid ""
-"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 ""
-"Du har en \"character set\"-indstilling i din smb.conf. I Samba 3.0 "
-"erstattes denne af en ny indstilling, \"unix charset\". Angiv det tegnsÃ¦t, "
-"du Ã¸nsker at bruge i denne nye indstilling, som styrer hvordan Samba tolker "
-"filnavne pÃ¥ systemet."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-#, 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: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "TegnsÃ¦t til DOS-klienter"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-#, fuzzy
-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 ""
-"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 "
-"Ã¸nsker at bruge i denne nye indstilling. I de fleste tilfÃ¦lde vil det "
-"forvalgte vÃ¦re nok. BemÃ¦rk at denne indstilling ikke krÃ¦ves for at "
-"understÃ¸tte Windows-klienter; den gÃ¦lder kun DOS-klienter. Hvis du ikke "
-"skriver noget her, vil smb.conf ikke blive Ã¦ndret."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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 "
@@ -93,7 +39,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 #, fuzzy
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
@@ -103,14 +49,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid "Configure smb.conf automatically?"
 msgstr "SÃ¦t smb.conf op med debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
@@ -129,7 +75,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "If you do not choose this option, you will have to handle any configuration "
@@ -143,19 +89,19 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid "Workgroup/Domain Name:"
 msgstr "Navn pÃ¥ arbejdsgruppe/domÃ¦ne?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "Dette styrer hvilken arbejdsgruppe din server til tilhÃ¸re, nÃ¥r den bliver "
 "spurgt af klienter. BemÃ¦rk at dette ogsÃ¥ styrer det domÃ¦nenavn, der bruges "
@@ -163,18 +109,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "KryptÃ©r adgangskoder?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "Nyere Windows-klienter kommunikerer med SMB-servere med krypterede "
 "adgangskoder. Hvis du vil bruge adgangkoder i klar tekst, bliver du nÃ¸dt til "
@@ -185,7 +131,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -242,74 +188,21 @@
 "package for more details."
 msgstr ""
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid "Samba's log files moved"
-msgstr "Sambas logfiler er flyttet."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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 "
-"og log.smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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:3001
-#, 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:3001
-#, fuzzy
-msgid ""
-"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. "
-"Hvis du har rettet din opstartsskript /etc/init.d/samba, kan du vÃ¦re nÃ¸dt "
-"til at justere det manuelt nu, sÃ¥ nmbd bliver startet."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "dÃ¦moner, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr ""
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Hvordan skal Samba kÃ¸res?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -319,13 +212,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -333,7 +226,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 #, fuzzy
 msgid ""
 "Please confirm whether you would like the existing smbpasswd file to be "
@@ -345,19 +238,3 @@
 "fil overfÃ¸rt til /var/lib/samba/passdb.tdb?`Hvis du i stedet planlÃ¦gger at "
 "bruge en anden pdb-hÃ¥ndtering (f.eks. LDAP), bÃ¸r du afvise dette."
 
-#, fuzzy
-#~ msgid ""
-#~ "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-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/de.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.14a-6.de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\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"
@@ -23,64 +23,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Zeichensatz für Unix-Dateisystem"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-#, fuzzy
-msgid ""
-"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."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-#, 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: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Zeichensatz für DOS-Clients"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-#, fuzzy
-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 ""
-"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: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Soll smb.conf so abgeändert werden, dass WINS-Einstellungen von DHCP "
@@ -88,7 +33,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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 "
@@ -105,7 +50,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 #, fuzzy
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
@@ -115,14 +60,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid "Configure smb.conf automatically?"
 msgstr "Soll smb.conf durch debconf konfiguriert werden?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
@@ -140,7 +85,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "If you do not choose this option, you will have to handle any configuration "
@@ -154,19 +99,19 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid "Workgroup/Domain Name:"
 msgstr "Arbeitsgruppe/Domain Name?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to 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, "
@@ -174,18 +119,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Verschlüsselte Passwörter verwenden?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "Neuere Windows-Versionen kommunizieren mit SMB-Servern und benutzen dabei "
 "verschlüsselte Passworte. Wenn Sie Passworte im Klartext verwenden wollen, "
@@ -197,7 +142,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -257,75 +202,21 @@
 "package for more details."
 msgstr ""
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid "Samba's log files moved"
-msgstr "Sambas Log-Dateien wurden verschoben."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-#, 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:3001
-#, fuzzy
-msgid ""
-"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."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr ""
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Wie wollen Sie Samba starten?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -335,14 +226,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr ""
 "Soll /etc/samba/smbpasswd nach /var/lib/samba/passdb.tdb verschoben werden?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -350,7 +241,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 #, fuzzy
 msgid ""
 "Please confirm whether you would like the existing smbpasswd file to be "
@@ -363,19 +254,3 @@
 "ein anderes pdb-Backend (z.B. LDAP) zu verwenden, sollten Sie hier mit "
 "'Nein' antworten."
 
-#, fuzzy
-#~ msgid ""
-#~ "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!"
-
-#~ 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/dz.po
===================================================================
--- trunk/po/dz.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/dz.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po.pot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-08-11 10:08+0530\n"
 "Last-Translator: Jurmey Rabgay <jur_gay at yahoo.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -27,204 +27,212 @@
 "X-Poedit-Country: bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. Type: string
+#. Type: boolean
 #. Description
 #: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "à½¡à½´à¼‹à½“à½²à½‚à½¦à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½¢à½²à½˜à¼‹à½£à½´à½‚à½¦à¼‹à½€à¾±à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½¡à½²à½‚à¼‹à½ à½–à¾²à½´à¼‹à½‚à½žà½²à¼‹à½¦à¾’à¾²à½²à½‚"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "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 " \"character set\"à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹ smb.conf à½“à½„à¼‹à½‘à¼‹à½£à¾Ÿà½¼à¼‹à½¢à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½¡à½²à¼ à½¦à½˜à¼‹à½–à¼‹ à¼£.à¼  à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹à½‚à½‘à½˜à¼‹à½à¼‹à½‚à½¦à½¢à½”à¼‹ \"unix charset\"à½‚à½²à½¦à¼‹ à½šà½–à¼‹à½–à½™à½´à½‚à½¦à¼‹à½ à½–à½‘à¼‹à½¡à½²à¼ à½‚à½‘à½˜à¼‹à½à¼‹à½‚à½¦à½¢à½”à¼‹à½‚à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½¢à½²à½˜à¼‹à½£à½´à½‚à½¦à¼‹à½‚à½´à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½˜à½²à½„à¼‹à½šà½´à¼‹à½‚à¼‹à½‘à½ºà¼‹à½¦à¾¦à½ºà¼‹à½à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½ à½–à½‘à½à¼‹à½¨à½²à½“à¼‹à½“à¼‹à½šà½‘à¼‹à½ à½›à½²à½“à¼‹à½ à½–à½‘à¼‹à½–à½ à½²à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½‘à½‚à½¼à¼‹à½˜à½“à½¼à¼‹à½˜à½²à¼‹ à½¡à½²à½‚à¼‹à½ à½–à¾²à½´à¼‹à½‚à½žà½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½‘à½²à¼‹à½‚à½¦à½£à¼‹à½–à½€à½¼à½‘à¼‹à½ à½–à½‘à¼‹à½‚à½“à½„à¼‹à¼"
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-#: ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹à½¦à¾Ÿà½¼à½„à½˜à¼‹à½¦à¾¦à½ºà¼‹à½–à½žà½‚à¼‹à½”à¼‹à½…à½²à½“à¼‹ smb.conf à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½ à½‘à½²à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½˜à½²à¼‹à½ à½–à½‘à¼"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "à½Œà½²à¼‹à½¨à½¼à¼‹à½¨à½ºà½¦à½²à¼‹ à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½¡à½²à¼‹à½‚à½ à½–à¾²à½´à¼‹à½‚à½žà½²à¼‹à½¦à¾’à¾²à½²à½‚"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 "\"client code page\"à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹  smb.conf à½“à½„à¼‹à½‘à¼‹à½£à¾Ÿà½¼à¼‹à½¢à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½¡à½²à¼ à½¦à½˜à¼‹à½–à¼‹ à¼£.à¼ à½“à½„à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹\"dos charset\"à½‚à½²à½¦à¼‹ à½šà½–à¼‹à½–à½™à½´à½‚à½¦à¼‹à½ à½–à½‘à¼‹à½¡à½²à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹à½‚à½¦à½¢à½”à¼‹à½‚à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½£à½‚à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½‘à½‚à½¼à¼‹à½˜à½“à½¼à¼‹à½˜à½²à¼‹à½¡à½²à½‚à¼‹à½ à½–à¾²à½´à¼‹à½‚à½žà½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½‘à½²à¼‹ à½‚à½¦à½£à¼‹à½–à½€à½¼à½‘à¼‹à½ à½–à½‘à¼‹à½‚à½“à½„à¼‹à¼ à½‚à½“à½‘à¼‹à½‘à½¼à½“à¼‹à½˜à½„à¼‹à½¤à½¼à½¦à¼‹à½…à½²à½‚à¼‹à½“à½„à¼‹ à½à¾±à½¼à½‘à¼‹à½£à½´à¼‹à½‚à½‘à½˜à½¦à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½¦à¾”à½¼à½“à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½‘à½²à¼‹à½ à½à½¼à½–à¼‹à½šà½´à½‚à½¦à½”à¼‹à½ à½¼à½„à¼‹à¼ à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹ à½Œà½²à¼‹à½¨à½¼à¼‹à½¨à½ºà½¦à½²à¼‹à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½£à½´à¼‹à½¢à¾à¾±à½„à½˜à¼‹à½…à½²à½‚à¼‹à½˜à¼‹à½‚à½à½¼à½‚à½¦à¼‹ à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½šà½´à¼‹à½£à½´à¼‹à½¢à¾’à¾±à½–à¼‹à½¦à¾à¾±à½¼à½¢à¼‹à½‘à½‚à½¼à½”à¼‹à½˜à½ºà½‘à¼"
-
-#. Type: boolean
-#. Description
-#: ../samba-common.templates:3001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
-msgstr "à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½“à½„à¼‹à½£à½¦à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½šà½´à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½‘à½–à¼‹à½“à½²à¼‹à½£à½´à¼‹ smb.conf à½£à½ºà½‚à½¦à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“à¼‹?"
+msgstr ""
+"à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½“à½„à¼‹à½£à½¦à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½šà½´à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½‘à½–à¼‹à½“à½²à¼‹à½£à½´à¼‹ smb.conf à½£à½ºà½‚à½¦à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹"
+"à½¨à½²à½“à¼‹à½“à¼‹?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
-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."
-msgstr "à½‚à¼‹à½‘à½ºà½˜à¼‹à½…à½²à½‚à¼‹à½ à½–à½‘à¼‹ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½‚à¾³à½¼à½‚à¼‹à½¢à½²à½‚à¼‹à½‚à½²à½¦à¼‹à½¡à½¼à½„à½¦à¼‹à½ à½–à¾²à½ºà½£à¼‹à½‚à½´à½ à½²à¼‹à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½¦à½¢à¼‹à½–à½¢à¼‹à½“à½„à¼‹à½£à½¦à¼‹ à½¨à½ à½²à¼‹à½”à½²à¼‹à½à¼‹à½–à¾±à½„à¼‹à½–à½¢à¾¡à¼‹à½‘à½¼à½“à¼‹à½ à½à½¼à½–à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½¦à½¢à¼‹à½–à½¢à¼‹à½‚à½²à½¦à¼‹à½¡à½„à¼‹ à½¡à½¼à½„à½¦à¼‹à½ à½–à¾²à½ºà½£à¼‹à½‚à½´à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à½¢à¼‹à½–à½¢à½¦à½²à¼‹ (\"NetBIOS name servers\")à½‚à½²à¼‹à½¦à¾à½¼à½¢à¼‹à½£à½¦à¼‹à½–à½¢à¾¡à¼‹à½‘à½¼à½“à¼‹à½–à¾±à½²à½“à¼‹à½ à½¼à½„à¼‹à¼ à½ à½‘à½²à¼‹à½‚à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹ smb.conf à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼‹ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½–à¼‹à½…à½²à½“à¼‹ à½–à¾±à½²à½“à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½ à½‘à½²à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹ /etc/samba/dhcp.conf à½“à½„à¼‹à½£à½¦à¼‹à½£à¾·à½‚à¼‹à½ à½¼à½„à¼‹à¼"
+#: ../samba-common.templates:1001
+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."
+msgstr ""
+"à½‚à¼‹à½‘à½ºà½˜à¼‹à½…à½²à½‚à¼‹à½ à½–à½‘à¼‹ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½‚à¾³à½¼à½‚à¼‹à½¢à½²à½‚à¼‹à½‚à½²à½¦à¼‹à½¡à½¼à½„à½¦à¼‹à½ à½–à¾²à½ºà½£à¼‹à½‚à½´à½ à½²à¼‹à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½¦à½¢à¼‹à½–à½¢à¼‹à½“à½„à¼‹à½£à½¦à¼‹ à½¨à½ à½²à¼‹à½”à½²à¼‹à½à¼‹à½–à¾±à½„à¼‹à½–à½¢à¾¡à¼‹à½‘à½¼à½“à¼‹"
+"à½ à½à½¼à½–à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½¦à½¢à¼‹à½–à½¢à¼‹à½‚à½²à½¦à¼‹à½¡à½„à¼‹ à½¡à½¼à½„à½¦à¼‹à½ à½–à¾²à½ºà½£à¼‹à½‚à½´à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à½¢à¼‹à½–à½¢à½¦à½²à¼‹ "
+"(\"NetBIOS name servers\")à½‚à½²à¼‹à½¦à¾à½¼à½¢à¼‹à½£à½¦à¼‹à½–à½¢à¾¡à¼‹à½‘à½¼à½“à¼‹à½–à¾±à½²à½“à¼‹à½ à½¼à½„à¼‹à¼ à½ à½‘à½²à¼‹à½‚à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹ smb.conf "
+"à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼‹ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½–à¼‹à½…à½²à½“à¼‹ à½–à¾±à½²à½“à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹"
+"à½¦à¾Ÿà½„à½¦à¼‹à½ à½‘à½²à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹ /etc/samba/dhcp.conf à½“à½„à¼‹à½£à½¦à¼‹à½£à¾·à½‚à¼‹à½ à½¼à½„à¼‹à¼"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à¼£-à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½à½´à½˜à¼‹à½¦à¾’à¾²à½²à½£à¼‹à½ à½‘à½²à¼‹ à½à¾±à½‘à¼‹à½¢à¾£à½˜à¼‹à½ à½‘à½²à¼‹à½‚à½²à¼‹à½•à½“à¼‹à½à½¼à½‚à½¦à¼‹à½£à½´à¼‹à½‚à½žà½²à¼‹à½–à½™à½´à½‚à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼"
+#: ../samba-common.templates:1001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à¼£-à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½à½´à½˜à¼‹à½¦à¾’à¾²à½²à½£à¼‹à½ à½‘à½²à¼‹ à½à¾±à½‘à¼‹à½¢à¾£à½˜à¼‹à½ à½‘à½²à¼‹à½‚à½²à¼‹à½•à½“à¼‹à½à½¼à½‚à½¦à¼‹à½£à½´à¼‹à½‚à½žà½²à¼‹à½–à½™à½´à½‚à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf à½ à½‘à½²à¼‹à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-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 the automated configuration process and require you to edit your smb.conf by hand to get it working again."
-msgstr "à½¦à½˜à¼‹à½–à¼‹à½‚à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½žà½“à¼‹à½˜à½²à¼‹à½šà½´à¼‹ à½ à½‘à¾²à½²à¼‹à½–à¼‹à½‘à½„à¼‹à½ à½–à¾²à½ºà½£à½à¼‹à½£à½¦à¼‹ /etc/samba/smb.conf à½“à½„à¼‹à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½£à½´à¼‹à½•à½“à¼‹à½‚à½“à½¼à½‘à¼‹à½ à½–à¾±à½´à½„à½˜à¼‹à½¨à½²à½“à¼‹ à½ à½‘à½²à¼‹à½¡à½„à¼‹à½¦à½˜à¼‹à½–à¼‹à½£à½¦à¼‹à½¢à½²à½˜à¼‹ (nmbd and smbd)à½šà½´à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½£à½´à¼‹à½‘à½‚à½¼à¼‹à½”à½ à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½¨à½²à½“à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½‘à¼‹à½£à¾Ÿà½¼à½ à½²à¼‹ smb.conf à½“à½„à¼‹à½£à½´à¼‹ 'include'à½‚à¾²à½£à¼‹à½à½²à½‚à¼‹ à½¡à½„à½“à¼‹ à½ à½•à½¢à¼‹à½šà½‘à¼‹à½ à½‚à¾±à½¼à¼‹à½˜à½²à¼‹à½‚à¾²à½£à¼‹à½à½²à½‚à¼‹à½¦à¾£à¼‹à½˜à½„à¼‹à½‚à½²à¼‹à½‚à½‘à½˜à¼‹à½à¼‹à½šà½´à¼‹à½¡à½¼à½‘à½”à¼‹à½¨à½²à½“à¼‹ à½‘à½ºà¼‹à½‚à½²à½¦à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½…à½“à¼‹à½‚à¾±à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½£à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½‘à½²à¼‹ à½˜à½‚à½´à¼‹à½ à½à½¼à½˜à¼‹à½–à½…à½´à½‚à½”à¼‹à½¨à½²à½“à½˜à¼‹à½‘à½„à¼‹ à½£à½¼à½‚à¼‹à½¦à¾Ÿà½ºà¼‹à½£à½±à¼‹à½ à½–à½‘à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½£à½‚à¼‹à½”à½ à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹smb.conf à½žà½´à½“à¼‹à½‘à½‚à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼ "
+#: ../samba-common.templates:2001
+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 the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"à½¦à½˜à¼‹à½–à¼‹à½‚à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½žà½“à¼‹à½˜à½²à¼‹à½šà½´à¼‹ à½ à½‘à¾²à½²à¼‹à½–à¼‹à½‘à½„à¼‹à½ à½–à¾²à½ºà½£à½à¼‹à½£à½¦à¼‹ /etc/samba/smb.conf à½“à½„à¼‹à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½£à½´à¼‹à½•à½“à¼‹"
+"à½‚à½“à½¼à½‘à¼‹à½ à½–à¾±à½´à½„à½˜à¼‹à½¨à½²à½“à¼‹ à½ à½‘à½²à¼‹à½¡à½„à¼‹à½¦à½˜à¼‹à½–à¼‹à½£à½¦à¼‹à½¢à½²à½˜à¼‹ (nmbd and smbd)à½šà½´à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½£à½´à¼‹à½‘à½‚à½¼à¼‹à½”à½ à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹"
+"à½¨à½²à½“à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½‘à¼‹à½£à¾Ÿà½¼à½ à½²à¼‹ smb.conf à½“à½„à¼‹à½£à½´à¼‹ 'include'à½‚à¾²à½£à¼‹à½à½²à½‚à¼‹ à½¡à½„à½“à¼‹ à½ à½•à½¢à¼‹à½šà½‘à¼‹à½ à½‚à¾±à½¼à¼‹à½˜à½²à¼‹à½‚à¾²à½£à¼‹à½à½²à½‚à¼‹à½¦à¾£à¼‹à½˜à½„à¼‹à½‚à½²à¼‹"
+"à½‚à½‘à½˜à¼‹à½à¼‹à½šà½´à¼‹à½¡à½¼à½‘à½”à¼‹à½¨à½²à½“à¼‹ à½‘à½ºà¼‹à½‚à½²à½¦à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½…à½“à¼‹à½‚à¾±à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½£à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½‘à½²à¼‹ à½˜à½‚à½´à¼‹à½ à½à½¼à½˜à¼‹à½–à½…à½´à½‚à½”à¼‹à½¨à½²à½“à½˜à¼‹à½‘à½„à¼‹ à½£à½¼à½‚à¼‹à½¦à¾Ÿà½ºà¼‹à½£à½±à¼‹"
+"à½ à½–à½‘à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½£à½‚à¼‹à½”à½ à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹smb.conf à½žà½´à½“à¼‹à½‘à½‚à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼ "
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-msgid "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 "à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹à½˜à¼‹à½‚à½‘à½˜à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½²à¼‹à½ à½‚à¾±à½´à½¢à¼‹à½–à¼‹à½‚à½„à¼‹à½¢à½´à½„à¼‹à½…à½²à½‚à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½„à¼‹à½‚à½²à½¦à¼‹à½£à½ºà½‚à½¦à¼‹à½¦à¾à¾±à½¼à½„à¼‹à½ à½à½–à¼‹à½‘à½‚à½¼à½”à¼‹à½‘à½„à¼‹ à½‘à½´à½¦à¼‹à½˜à½šà½˜à½¦à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½¼à½„à¼‹à½¦à¾¤à½ºà½£à¼‹à½‚à¾±à½²à¼‹à½à½ºà¼‹à½•à½“à¼‹à½ à½à½¼à½–à¼‹à½˜à½²à¼‹à½šà½´à½‚à½¦à¼"
+#: ../samba-common.templates:2001
+msgid ""
+"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:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "à½£à½±à¼‹à½‚à½²à¼‹à½¦à¾¡à½ºà¼‹à½šà½“à¼‹/à½Œà½¼à¼‹à½˜à½ºà½“à¼‹à½˜à½²à½„à¼‹:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
-msgid "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 "à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½‚à½²à½¦à¼‹à½ à½‘à¾²à½²à¼‹à½‘à½”à¾±à½‘à¼‹à½ à½–à½‘à½à¼‹à½‘à¼‹ à½¦à½¢à¼‹à½–à½¢à¼‹à½ à½–à¾±à½´à½„à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½”à½ à½²à¼‹à½£à½±à¼‹à½‚à½²à¼‹à½¦à¾¡à½ºà¼‹à½šà½“à¼‹à½ à½‘à½²à¼‹à½‚à½¦à½£à¼‹à½–à½€à½¼à½‘à¼‹à½ à½–à½‘à¼‹à½‚à½“à½„à¼‹à¼ à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½ à½‘à½²à¼‹à½‚à½²à½¦à¼‹ à½¦à¾²à½´à½„à¼‹à½¦à¾à¾±à½¼à½–à¼‹=à½Œà½¼à¼‹à½˜à½ºà½“à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½‘à½„à¼‹à½‚à½…à½²à½‚à¼‹à½à½¢à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½Œà½¼à¼‹à½˜à½ºà½“à¼‹à½˜à½²à½„à¼‹à½¡à½„à¼‹ à½šà½‘à¼‹à½ à½›à½²à½“à¼‹à½ à½–à½‘à½à¼‹à½¨à½²à½“à½˜à¼‹à½‘à¾²à½“à¼‹à½‘à½‚à½¼"
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
+msgstr ""
+"à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½‚à½²à½¦à¼‹à½ à½‘à¾²à½²à¼‹à½‘à½”à¾±à½‘à¼‹à½ à½–à½‘à½à¼‹à½‘à¼‹ à½¦à½¢à¼‹à½–à½¢à¼‹à½ à½–à¾±à½´à½„à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½”à½ à½²à¼‹à½£à½±à¼‹à½‚à½²à¼‹à½¦à¾¡à½ºà¼‹à½šà½“à¼‹à½ à½‘à½²à¼‹à½‚à½¦à½£à¼‹à½–à½€à½¼à½‘à¼‹à½ à½–à½‘à¼‹à½‚à½“à½„à¼‹"
+"à¼ à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½ à½‘à½²à¼‹à½‚à½²à½¦à¼‹ à½¦à¾²à½´à½„à¼‹à½¦à¾à¾±à½¼à½–à¼‹=à½Œà½¼à¼‹à½˜à½ºà½“à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½‘à½„à¼‹à½‚à½…à½²à½‚à¼‹à½à½¢à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½Œà½¼à¼‹à½˜à½ºà½“à¼‹à½˜à½²à½„à¼‹à½¡à½„à¼‹ à½šà½‘à¼‹"
+"à½ à½›à½²à½“à¼‹à½ à½–à½‘à½à¼‹à½¨à½²à½“à½˜à¼‹à½‘à¾²à½“à¼‹à½‘à½‚à½¼"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à¼‹à½£à½‚à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
-msgid "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 "à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½˜à½„à¼‹à½¤à½¼à½¦à¼‹à½…à½²à½‚à¼‹à½‚à½²à½¦à¼‹ à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à½¦à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½‚à¾±à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½¨à½ºà½¦à½²à¼‹à½¨à½ºà½˜à¼‹à½–à½²à¼‹à½‘à½„à¼‹à½‚à½…à½²à½‚à¼‹à½à½¢à¼‹à½–à½¢à¾’à¾±à½´à½‘à¼‹à½ à½–à¾²à½ºà½£à¼‹à½ à½à½–à¼‹à½¨à½²à½“à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½šà½²à½‚à¼‹à½¡à½²à½‚à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½¦à½£à¼‹à½à½¼à½‚à¼‹à½à½¼à¼‹à½…à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½‘à½‚à½¼à¼‹à½˜à½“à½¼à¼‹à½–à¼‹à½…à½²à½“à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½à½¼à¼‹à½–à½€à½¼à½‘à¼‹à½“à½„à¼‹à½£à½´à¼‹à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½…à½²à½‚à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼"
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid ""
+"All 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."
+msgstr ""
+"à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½˜à½„à¼‹à½¤à½¼à½¦à¼‹à½…à½²à½‚à¼‹à½‚à½²à½¦à¼‹ à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à½¦à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½‚à¾±à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½¨à½ºà½¦à½²à¼‹à½¨à½ºà½˜à¼‹à½–à½²à¼‹à½‘à½„à¼‹à½‚à½…à½²à½‚à¼‹"
+"à½à½¢à¼‹à½–à½¢à¾’à¾±à½´à½‘à¼‹à½ à½–à¾²à½ºà½£à¼‹à½ à½à½–à¼‹à½¨à½²à½“à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½šà½²à½‚à¼‹à½¡à½²à½‚à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½¦à½£à¼‹à½à½¼à½‚à¼‹à½à½¼à¼‹à½…à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½‘à½‚à½¼à¼‹à½˜à½“à½¼à¼‹à½–à¼‹à½…à½²à½“à¼‹ à½à¾±à½¼à½‘à¼‹"
+"à½¢à½ à½²à¼‹à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½à½¼à¼‹à½–à½€à½¼à½‘à¼‹à½“à½„à¼‹à½£à½´à¼‹à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½…à½²à½‚à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
-msgid "Enabling 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 "à½‚à½‘à½˜à¼‹à½à¼‹à½£à¾•à½¼à½‚à½¦à¼‹à½…à½“à¼‹à½–à½Ÿà½¼à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹à½‚à½²à½¦à¼‹ à½‚à½“à½˜à¼‹à½˜à½ºà½‘à¼‹à½¦à¼‹à½˜à½ºà½‘à¼‹à½ à½¼à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½à¾±à½¼à½‘à¼‹à½£à½´à¼‹à½“à½´à½¦à¼‹à½£à¾¡à½“à¼‹à½‚à¾±à½²à¼‹/etc/samba/smbpasswd à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½…à½²à½‚à¼‹à½‘à½‚à½¼à½”à¼‹à½‘à½„à¼‹ à½ à¼‹à½“à½²à¼‹à½ à½‘à½²à¼‹à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ smbpasswd à½–à½¢à¾¡à¼‹à½–à½€à½¼à½‘à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½‚à¾±à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à¼‹à½¢à½ºà¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à¼‹à½‘à½¼à½“à¼‹à½£à½¦à¼‹ à½‘à½ºà¼‹à½“à½„à¼‹à½£à½´à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½žà½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼ "
+#: ../samba-common.templates:4001
+msgid ""
+"Enabling 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 ""
+"à½‚à½‘à½˜à¼‹à½à¼‹à½£à¾•à½¼à½‚à½¦à¼‹à½…à½“à¼‹à½–à½Ÿà½¼à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹à½‚à½²à½¦à¼‹ à½‚à½“à½˜à¼‹à½˜à½ºà½‘à¼‹à½¦à¼‹à½˜à½ºà½‘à¼‹à½ à½¼à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½à¾±à½¼à½‘à¼‹à½£à½´à¼‹"
+"à½“à½´à½¦à¼‹à½£à¾¡à½“à¼‹à½‚à¾±à½²à¼‹/etc/samba/smbpasswd à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½…à½²à½‚à¼‹à½‘à½‚à½¼à½”à¼‹à½‘à½„à¼‹ à½ à¼‹à½“à½²à¼‹à½ à½‘à½²à¼‹à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ smbpasswd à½–à½¢à¾¡à¼‹à½–à½€à½¼à½‘à¼‹"
+"à½£à½‚à¼‹à½£à½ºà½“à¼‹à½‚à¾±à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à¼‹à½¢à½ºà¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à¼‹à½‘à½¼à½“à¼‹à½£à½¦à¼‹ à½‘à½ºà¼‹à½“à½„à¼‹à½£à½´à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½žà½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼ "
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "à½¦à½˜à¼‹à½–à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½“à½‘à¼‹à½¦à¾¡à½´à½‘à¼‹à½‚à½žà½²à¼‹à½¢à¾Ÿà½ºà½“à¼‹ /var/lib/samba/passdb.tdb à½‚à½¦à½¢à¼‹à½–à½¦à¾à¾²à½´à½“à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“à¼‹?"
+msgstr ""
+"à½¦à½˜à¼‹à½–à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½“à½‘à¼‹à½¦à¾¡à½´à½‘à¼‹à½‚à½žà½²à¼‹à½¢à¾Ÿà½ºà½“à¼‹ /var/lib/samba/passdb.tdb à½‚à½¦à½¢à¼‹à½–à½¦à¾à¾²à½´à½“à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“à¼‹?"
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-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 running smbpasswd and be kept up-to-date in the future."
-msgstr "à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½‚à½²à¼‹à½à½¼à½“à¼‹à½¢à½²à½˜à¼‹à½˜à½„à¼‹à½¤à½¼à½¦à¼‹à½…à½²à½‚à¼‹à½“à½„à¼‹ à½¦à¾”à½¼à½“à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‘à½„à¼‹à½–à½…à½¦à¼‹à½˜à½à½´à½“à¼‹à½ à½‚à¾±à½´à½¢à¼‹à½…à½“à¼‹à½¨à½²à½“à¼‹à½‘à½‚à½¼à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à½¦à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à¼‹à½£à½´à¼‹ à½¦à½˜à¼‹à½–à¼‹à½‚à½²à½¦à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼  /etc/passwdà½£à½¦à¼‹à½¦à½¼à¼‹à½¦à½¼à½¢à¼‹à½ à½•à¾±à½£à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½…à½²à½‚à¼‹à½‚à½¦à½¼à½‚à¼‹à½ à½‡à½¼à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½¦à¼‹à½ à½‘à½²à¼‹à½£à½´à¼‹ à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à½ à½²à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼ à½ à¼‹à½“à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½ à½‘à½²à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹à½ à½–à½‘à¼‹à½‚à½¦à½¢à¼‹à½–à½¦à¾à¾²à½´à½“à¼‹à½ à½–à½‘à¼‹à½šà½´à½‚à½¦à¼‹ à½‘à½ºà¼‹à½ à½–à½‘à½à¼‹à½‘à¼‹ à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½šà½´à¼‹ smbpasswd à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½à½¼à½‚à¼‹à½£à½´à¼‹ à½£à½‚à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹à½à¼‹à½¦à¾à½¼à½„à¼‹à½–à½¢à¾à¾±à½–à¼‹à½‘à½‚à½¼à½”à¼‹à½‘à½„à¼‹ à½˜à¼‹à½ à½¼à½„à½¦à¼‹à½”à¼‹à½£à½´à¼‹à½ à½‘à½²à¼‹ à½‘à½´à½¦à¼‹à½˜à½à½´à½“à¼‹à½–à½Ÿà½¼à¼‹à½¦à¾Ÿà½ºà¼‹à½–à½žà½‚à¼‹à½‘à½‚à½¼"
+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 running smbpasswd "
+"and be kept up-to-date in the future."
+msgstr ""
+"à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½‚à½²à¼‹à½à½¼à½“à¼‹à½¢à½²à½˜à¼‹à½˜à½„à¼‹à½¤à½¼à½¦à¼‹à½…à½²à½‚à¼‹à½“à½„à¼‹ à½¦à¾”à½¼à½“à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‘à½„à¼‹à½–à½…à½¦à¼‹à½˜à½à½´à½“à¼‹à½ à½‚à¾±à½´à½¢à¼‹à½…à½“à¼‹à½¨à½²à½“à¼‹à½‘à½‚à½¼à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à½¦à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹"
+"à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à¼‹à½£à½´à¼‹ à½¦à½˜à¼‹à½–à¼‹à½‚à½²à½¦à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼  /etc/passwdà½£à½¦à¼‹à½¦à½¼à¼‹à½¦à½¼à½¢à¼‹à½ à½•à¾±à½£à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹"
+"à½…à½²à½‚à¼‹à½‚à½¦à½¼à½‚à¼‹à½ à½‡à½¼à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½¦à¼‹à½ à½‘à½²à¼‹à½£à½´à¼‹ à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à½ à½²à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼ à½ à¼‹à½“à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½ à½‘à½²à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹"
+"à½ à½–à½‘à¼‹à½‚à½¦à½¢à¼‹à½–à½¦à¾à¾²à½´à½“à¼‹à½ à½–à½‘à¼‹à½šà½´à½‚à½¦à¼‹ à½‘à½ºà¼‹à½ à½–à½‘à½à¼‹à½‘à¼‹ à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½šà½´à¼‹ smbpasswd à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½à½¼à½‚à¼‹à½£à½´à¼‹ à½£à½‚à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹à½à¼‹"
+"à½¦à¾à½¼à½„à¼‹à½–à½¢à¾à¾±à½–à¼‹à½‘à½‚à½¼à½”à¼‹à½‘à½„à¼‹ à½˜à¼‹à½ à½¼à½„à½¦à¼‹à½”à¼‹à½£à½´à¼‹à½ à½‘à½²à¼‹ à½‘à½´à½¦à¼‹à½˜à½à½´à½“à¼‹à½–à½Ÿà½¼à¼‹à½¦à¾Ÿà½ºà¼‹à½–à½žà½‚à¼‹à½‘à½‚à½¼"
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-msgid "If you do not create it, you will have to reconfigure Samba (and probably your client machines) to use plaintext passwords."
-msgstr "à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹à½‚à½¦à½¢à¼‹à½–à½¦à¾à¾²à½´à½“à¼‹à½˜à¼‹à½ à½–à½‘à¼‹à½–à¼‹à½…à½²à½“à¼‹ à½šà½²à½‚à¼‹à½¡à½²à½‚à¼‹à½¢à¾à¾±à½„à¼‹à½”à½¼à½ à½²à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à¼‹à½£à½´à¼‹ à½¦à½˜à¼‹à½–à¼‹(à½‘à½„à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à½ à½²à¼‹à½˜à¼‹à½ à½•à¾²à½´à½£à¼‹)à½ à½‘à½²à¼‹ à½£à½¼à½‚à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼"
+msgid ""
+"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:1001
-msgid "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more details."
-msgstr "à½à¼‹à½‚à½¦à½£à¼‹à½˜à½à¾±à½ºà½“à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½¦à½˜à¼‹à½–à¼‹-à½Œà½¼à½€à¼‹à½à½´à½˜à¼‹à½¦à¾’à¾²à½²à½£à¼‹à½“à½„à¼‹à½£à½¦à¼‹ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html à½£à½´à¼‹à½£à¾Ÿà¼"
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+"à½à¼‹à½‚à½¦à½£à¼‹à½˜à½à¾±à½ºà½“à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½¦à½˜à¼‹à½–à¼‹-à½Œà½¼à½€à¼‹à½à½´à½˜à¼‹à½¦à¾’à¾²à½²à½£à¼‹à½“à½„à¼‹à½£à½¦à¼‹ /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html à½£à½´à¼‹à½£à¾Ÿà¼"
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "à½¦à½˜à¼‹à½–à¼‹à½‚à½²à¼‹à½‘à¾²à½“à¼‹à½‘à½ºà½–à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½šà½´à¼‹ à½¦à¾¤à½¼à¼‹à½–à½¤à½´à½‘à¼‹à½ à½–à½‘à¼‹à½“à½´à½‚"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "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 "à½¦à½˜à¼‹à½–à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à½¦à½²à¼‹à½‚à½²à¼‹à½‘à¾²à½“à¼‹à½‘à½ºà½–à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½‚à½‰à½²à½¦à¼‹à½€à½´à¼‹(nmbd and smbd) à½‘à¼‹à½£à½¦à¼‹à½•à½¢à¼‹ /var/log/samba/à½“à½„à¼‹à½‚à½¦à½¼à½‚à¼‹à½ à½‡à½¼à½‚à¼‹à½ à½–à½‘à½à¼‹à½¨à½²à½“à¼ nmbd à½‘à½„à¼‹smbd à½‚à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½˜à½²à½„à¼‹à½šà½´à¼‹ og.nmbd à½‘à½„à¼‹  log.smbd à½¢à½²à½˜à¼‹à½”à¼‹à½–à½žà½²à½“à¼‹à½¨à½²à½“à¼ "
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "The old log files from /var/log/ will automatically be moved to the new location."
-msgstr "/var/log/ à½“à½„à¼‹à½£à½¦à¼‹à½€à¾±à½²à¼‹à½‘à¾²à½“à¼‹à½‘à½ºà½–à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½¢à¾™à½²à½„à½˜à¼‹à½šà½´à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹à½‚à½“à½¦à¼‹à½à½¼à½„à½¦à¼‹à½‚à½¦à½¢à½”à¼‹à½£à½´à¼‹à½¦à¾¤à½¼à¼‹à½–à½¤à½´à½‘à¼‹à½ à½–à½‘à¼‹à½ à½¼à½„à¼‹à¼"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "inetd à½“à½„à¼‹à½£à½¦à¼‹ nmbdà½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹ à½‘à¼‹à½£à½¦à¼‹à½•à½¢à¼‹à½¢à¾’à¾±à½–à¼‹à½¦à¾à¾±à½¼à½¢à¼‹à½˜à½²à¼‹à½ à½–à½‘à¼"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "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à½‚à½‰à½²à½¦à¼‹à½ à½‚à½¼à¼‹à½–à½™à½´à½‚à½¦à¼‹à½“à½²à¼‹à½£à½´à¼‹ à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½¡à½²à¼ à½ à½•à¾²à½£à¼‹à½‚à¾±à½²à¼‹à½¦à½˜à¼‹à½–à¼‹à½à½¼à½“à¼‹à½¢à½²à½˜à¼‹à½“à½„à¼‹ nmbdà½ à½‘à½²à¼‹ inetdà½£à½¦à¼‹à½ à½‚à½¼à¼‹à½–à½™à½´à½‚à½¦à¼‹à½˜à½²à¼‹à½–à½à½´à½–à¼ à½‚à¼‹à½‘à½ºà½˜à¼‹à½…à½²à½‚à¼‹à½ à½–à½‘à¼‹à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹/etc/init.d/à½¦à½˜à¼‹à½–à¼‹à½ à½‚à½¼à¼‹à½–à½™à½´à½‚à½¦à¼‹à½¡à½²à½‚à¼‹à½šà½´à½‚à½¦à¼‹à½ à½‘à½²à¼‹à½£à½ºà½‚à½¦à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½¡à½¼à½‘à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½‘à¼‹à½£à¾Ÿà½¼à¼‹à½£à½¦à¼‹à½¢à¼‹à½–à½‘à½ºà¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à¼‹ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½–à¼‹à½…à½²à½“à¼‹  nmbdà½ à½‘à½²à¼‹à½ à½‚à½¼à¼‹à½–à½™à½´à½‚à½¦à¼‹à½ à½¼à½„à¼‹à¼"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹ à½¨à½²à¼‹à½“à½²à¼‹à½Šà½ºà½Šà½²à¼"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "à½¦à½˜à¼‹à½–à¼‹à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½à½–à½¦à¼‹à½£à½˜à¼‹:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a daemon is the recommended approach."
-msgstr "à½¦à½˜à¼‹à½–à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹smbdà½ à½‘à½²à¼‹ à½¦à¾¤à¾±à½²à½¢à¼‹à½–à½à½„à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹à½¦à¾¦à½ºà¼‹ à½¡à½„à¼‹à½“à¼‹ inetdà½“à½„à¼‹à½£à½¦à¼‹ à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½šà½´à½‚à½¦à¼ à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹à½¦à¾¦à½ºà¼‹à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹ à½ à½¼à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½–à½‘à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½¢à¾©à½¢à¼‹à½£à½ºà½“à¼‹à½¨à½²à½“à¼"
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"à½¦à½˜à¼‹à½–à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹smbdà½ à½‘à½²à¼‹ à½¦à¾¤à¾±à½²à½¢à¼‹à½–à½à½„à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹à½¦à¾¦à½ºà¼‹ à½¡à½„à¼‹à½“à¼‹ inetdà½“à½„à¼‹à½£à½¦à¼‹ à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½šà½´à½‚à½¦à¼ à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹à½¦à¾¦à½ºà¼‹à½‚à½¡à½¼à½‚à¼‹"
+"à½–à½€à½¼à½£à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹ à½ à½¼à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½–à½‘à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½¢à¾©à½¢à¼‹à½£à½ºà½“à¼‹à½¨à½²à½“à¼"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
-msgid "Samba 3.0 introduced a more complete SAM database interface which supersedes the /etc/samba/smbpasswd file."
-msgstr "à½¦à½–à¼‹à½˜à¼‹à¼£.à¼  à½‚à½²à½¦à¼‹/etc/samba/smbpasswd à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½ à½›à½²à½“à¼‹à½”à½ à½²à¼‹  à½¨à½ºà½¦à½²à¼‹à½¨à½ºà¼‹à½¨à½ºà½˜à¼‹ à½‚à½“à½‘à¼‹à½¦à¾¡à½´à½‘à¼‹à½‚à½žà½²à¼‹à½¢à¾Ÿà½ºà½“à¼‹ à½„à½¼à½¦à¼‹à½ à½‘à¾²à¼‹à½–à¼‹à½†à¼‹à½šà½„à¼‹à½…à½²à½‚à¼‹à½ à½‚à½¼à¼‹à½–à½™à½´à½‚à½¦à¼‹à½¡à½²à¼"
+#: ../samba.templates:3001
+msgid ""
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
+msgstr ""
+"à½¦à½–à¼‹à½˜à¼‹à¼£.à¼  à½‚à½²à½¦à¼‹/etc/samba/smbpasswd à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½ à½›à½²à½“à¼‹à½”à½ à½²à¼‹  à½¨à½ºà½¦à½²à¼‹à½¨à½ºà¼‹à½¨à½ºà½˜à¼‹ à½‚à½“à½‘à¼‹à½¦à¾¡à½´à½‘à¼‹à½‚à½žà½²à¼‹à½¢à¾Ÿà½ºà½“à¼‹ à½„à½¼à½¦à¼‹à½ à½‘à¾²à¼‹"
+"à½–à¼‹à½†à¼‹à½šà½„à¼‹à½…à½²à½‚à¼‹à½ à½‚à½¼à¼‹à½–à½™à½´à½‚à½¦à¼‹à½¡à½²à¼"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
-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 "à½¡à½¼à½‘à¼‹à½–à½žà½²à½“à¼‹à½”à½ à½²à¼‹ smbpasswd à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½ à½‘à½²à¼‹à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹à½¦à¾¦à½ºà¼‹ /var/lib/samba/passdb.tdbà½£à½´à¼‹ à½‚à½žà½²à¼‹à½‚à½“à½¦à¼‹à½¦à¾¤à½¼à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à¼‹à½„à½ºà½¦à¼‹à½‘à½”à¾±à½‘à¼‹à½ à½–à½‘à¼‹à½‚à½“à½„à¼‹à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹pdb à½¢à¾’à¾±à½–à¼‹à½˜à½à½ à¼‹ (à½‘à½”à½ºà½¢à¼‹à½“à¼‹ à½¨à½ºà½£à¼‹à½Œà½²à¼‹à½¨à½ºà¼‹à½”à½²à¼‹) à½ à½‘à½²à¼‹à½‘à½ºà¼‹à½‚à½²à¼‹à½šà½–à¼‹à½¦à¾¦à½ºà¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à½ à½²à¼‹à½ à½†à½¢à¼‹à½‚à½žà½²à¼‹à½¡à½¼à½‘à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹à½‚à¼‹à½‚à½‘à½˜à½¦à¼"
+#: ../samba.templates:3001
+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 ""
+"à½¡à½¼à½‘à¼‹à½–à½žà½²à½“à¼‹à½”à½ à½²à¼‹ smbpasswd à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½ à½‘à½²à¼‹à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹à½¦à¾¦à½ºà¼‹ /var/lib/samba/passdb.tdbà½£à½´à¼‹ à½‚à½žà½²à¼‹"
+"à½‚à½“à½¦à¼‹à½¦à¾¤à½¼à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à¼‹à½„à½ºà½¦à¼‹à½‘à½”à¾±à½‘à¼‹à½ à½–à½‘à¼‹à½‚à½“à½„à¼‹à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹pdb à½¢à¾’à¾±à½–à¼‹à½˜à½à½ à¼‹ (à½‘à½”à½ºà½¢à¼‹à½“à¼‹ à½¨à½ºà½£à¼‹à½Œà½²à¼‹à½¨à½ºà¼‹à½”à½²à¼‹) à½ à½‘à½²à¼‹"
+"à½‘à½ºà¼‹à½‚à½²à¼‹à½šà½–à¼‹à½¦à¾¦à½ºà¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à½ à½²à¼‹à½ à½†à½¢à¼‹à½‚à½žà½²à¼‹à½¡à½¼à½‘à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹à½‚à¼‹à½‚à½‘à½˜à½¦à¼"
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "à½¨à½ºà½¦à½²à¼‹à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ºà¼‹à½Šà½²à¼‹à½‚à½²à½¦à¼‹ à½–à½¦à¾à¾±à½¢à¼‹à½–à¾²à½²à½¦à¼‹à½ à½–à½‘à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼"
-#~ msgid ""
-#~ "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 ""
-#~ "à½¨à½ºà½¦à½²à¼‹à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ºà¼‹à½Šà½²à¼‹à½‚à½²à½¦à¼‹ smb.conf à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹ à½–à½¦à¾à¾±à½¢à¼‹à½ à½–à¾²à½²à¼‹à½ à½–à½‘à¼‹à½ à½¼à½„à¼‹à¼ à½ à½‘à½²à¼‹à½‚à½²à½¦à¼‹ à½à½¼à¼‹à½–à½€à½¼à½‘à¼‹à½šà½´à¼‹à½–à½‘à½ºà¼‹à½žà½²à½–à¼‹à½ à½–à½‘à½à¼‹"
-#~ "à½¨à½²à½“à½˜à¼‹à½‘à½„à¼‹ à½‚à¾²à½„à½¦à¼‹à½¦à½´à¼‹à½–à½™à½´à½‚à½¦à¼‹=à½‘à½„à¼‹à½ à½‘à¾²à¼‹à½–à½¤à½´à½¦à¼‹=à½‚à½‘à½˜à¼‹à½à¼‹à½šà½´à¼‹à½¢à¾©à½²à½¦à¼‹à½à½ºà¼‹ à½–à½¦à½˜à¼‹à½–à½€à½¼à½‘à¼‹à½†à¼‹à½˜à½‰à½˜à¼‹à½–à½à½¼à½“à¼‹à½‚à½à½„à¼‹à½ à½¼à½„à¼‹à¼ "
-#~ "à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½‘à¾²à½“à½˜à¼‹à½–à½à½¼à½“à¼‹à½à½ºà¼‹à½–à½Ÿà½¼à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹smb.conf à½…à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½–à½‘à¼‹à½¡à½¼à½‘à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½¨à½ºà½¦à½²à¼‹à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ºà¼‹à½Šà½²à¼‹à½£à½‚à¼‹"
-#~ "à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à¼‹à½¦à¾¤à½„à¼‹à½‘à½‚à½¼"
-

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/es.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,80 +14,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
-"PO-Revision-Date: 2003-07-02 21:51-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"PO-Revision-Date: 2006-08-13 14:33-0700\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Juego de caracteres para el sistema de ficheros Unix"
-
-#
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-#, fuzzy
-msgid ""
-"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 ""
-"Actualmente hay una opciÃ³n de \"character set\" en smb.conf.  En Samba 3.0 "
-"esta opciÃ³n ha sido reemplazado por una opciÃ³n nueva: \"unix charset\". Por "
-"favor, indique el juego de caracteres que desea usar para esta opciÃ³n nueva, "
-"que controla cÃ³mo Samba interpretarÃ¡ los nombres en el sistema de ficheros."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-#, 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: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Juego de caracteres para los clientes DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-#, fuzzy
-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 ""
-"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 "
-"favor, indique el juego de caracteres que desea usar para esta opciÃ³n "
-"nueva.  Esta opciÃ³n no se necesita en absoluto para clientes Windows; es "
-"exclusivamente para los clientes DOS.  Si deja en blanco este campo, no se "
-"cambiarÃ¡ smb.conf."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,8 +48,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
-#, fuzzy
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -112,15 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
-msgstr "Â¿Configurar smb.conf mediante debconf?"
+msgstr "Â¿Configurar smb.conf automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
+#: ../samba-common.templates:2001
 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 "
@@ -133,78 +75,67 @@
 "contenido de /etc/samba/smb.conf, que es el fichero utilizado para "
 "configurar los programas de Samba (nmbd y smbd). Su smb.conf actual contiene "
 "una lÃnea 'include' o una opciÃ³n que atraviesa mÃ¡s de una lÃnea, asÃ que "
-"debconf puede dejarlo con un smb.conf descompuesto, requiriendo que lo "
-"arregle a mano."
+"el proceso de configuraciÃ³n automÃ¡tica puede dejarlo con un smb.conf "
+"descompuesto, requiriendo que lo arregle a mano."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
-"periÃ³dicos de configuraciÃ³n.  Por eso se recomienda el uso de debconf cuando "
-"sea posible."
+"Si no escoge esta opciÃ³n, tendrÃ¡ que cuidar a mano cualquier cambio a la "
+"configuraciÃ³n de Samba y no disfrutarÃ¡ de aumentos periÃ³dicos de "
+"configuraciÃ³n."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
-#, fuzzy
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
-msgstr "Nombre del dominio o del grupo de trabajo"
+msgstr "Nombre del dominio o del grupo de trabajo:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
-#, fuzzy
+#: ../samba-common.templates:3001
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
-"Es el grupo de trabajo en el que aparecerÃ¡ su servidor cuando se lo "
-"pregunten los clientes de la red. Este parÃ¡metro tambiÃ©n controla el nombre "
-"de dominio que se usa con la configuraciÃ³n security=domain."
+"Favor de indicar el grupo de trabajo en el cual quiere que su servidor "
+"aparezca cuando se lo pregunten los clientes de la red. Este parÃ¡metro "
+"tambiÃ©n controla el nombre de dominio que se usa con la configuraciÃ³n "
+"security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Â¿Utilizar contraseÃ±as cifradas?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
-#, fuzzy
+#: ../samba-common.templates:4001
 msgid ""
-"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."
+"All 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."
 msgstr ""
-"Los clientes Windows mÃ¡s modernos se comunican con los servidores SMB "
+"Todos los clientes Windows corrientes 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."
+"tendrÃ¡ que cambiar un parÃ¡metro en el registro de Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
-#, fuzzy
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
+"Es muy recomendable habilitar esta opciÃ³n. Si elige hacerlo, compruebe "
 "que tiene un fichero /etc/samba/smbpasswd vÃ¡lido y que ha puesto las "
 "contraseÃ±as con el programa smbpasswd."
 
@@ -224,26 +155,23 @@
 "automatically, but the passwords must be added manually by running smbpasswd "
 "and be kept up-to-date in the future."
 msgstr ""
+"Para mantener 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 "
+"del /etc/passwd, donde se guarden las contraseÃ±as de los usuarios. El "
+"fichero se puede crear automaticamente, aunque es necesario aÃ±adir las "
+"contraseÃ±as manualmente mediante el programa 'smbpasswd' y mantenerlas al "
+"dÃa."
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-#, fuzzy
 msgid ""
 "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 "
-"del /etc/passwd, donde se guarden las contraseÃ±as de los usuarios. El "
-"fichero se puede crear automaticamente, aunque es necesario aÃ±adir las "
-"contraseÃ±as manualmente (por usted o por el usuario) mediante el programa "
-"'smbpasswd', y debe encargarse de mantener las contraseÃ±as al dÃa.  Si no "
-"crea este fichero, es imprescindible configurar Samba (y posiblemente los "
-"sistemas Windows) para que use contraseÃ±as no cifradas.  VÃ©a /usr/share/doc/"
-"samba-doc/htmldocs/ENCRYPTION.html del paquete samba-doc para mÃ¡s "
-"informaciÃ³n."
+"Si no crea este fichero, es imprescindible configurar Samba (y posiblemente los "
+"sistemas Windows) para que use contraseÃ±as no cifradas."
 
 #. Type: boolean
 #. Description
@@ -252,76 +180,24 @@
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
 msgstr ""
+"VÃ©a /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html del paquete samba-doc "
+"para mÃ¡s informaciÃ³n."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid "Samba's log files moved"
-msgstr "Se han cambiado de lugar los ficheros de registro de Samba."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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/"
-"log/samba/.  Los nombres de estos ficheros son log.nmbd y log.smbd, para "
-"nmbd y smbd respectivamente."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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:3001
-#, fuzzy
-msgid "Running nmbd from inetd no longer supported"
-msgstr "Ya no se puede ejecutar nmbd desde el inetd"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-#, fuzzy
-msgid ""
-"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 "
-"desde inetd.  Si ha modificado el script de arranque /etc/init.d/samba, "
-"puede que tenga que editarlo ahora para que nmbd se ejecute."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "demonios, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr ""
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Â¿CÃ³mo quiere que se ejecute Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -331,35 +207,30 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
 msgstr ""
+"La versiÃ³n 3.0 de Samba introduce un base de dados \"SAM\" mÃ¡s completo que "
+"suplanta al fichero /etc/samba/smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 #, 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 ""
-"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 "
-"fichero corriente smbpasswd sea convertido en /var/lib/samba/passdb.tdb?  Si "
+"Favor de indicar si quiere que el fichero corriente smbpasswd sea convertido "
+"automaticamente en /var/lib/samba/passdb.tdb.  No escoja esta opciÃ³n si "
 "pretende usar otro  "
-
-#~ 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/eu.po
===================================================================
--- trunk/po/eu.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/eu.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-08-10 23:29+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <librezale at librezale.org\n"
@@ -24,81 +24,45 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 0.10rc1\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Unix fitxategi sistemaren karaktere jokoa"
-
-#
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 "Smb.conf fitxategian \"character set\" aukera bat dago konfiguraturik. Samba 3.0-an aukera hau \"unix charset\" aukeragatik ordeztua izan da. Mesedez ezarri aukera berri honetan erabili nahi duzun karaktere jokoa, zeinek fitxategi sistemako izenak sambak nola interpretatuko dituen ezartzen du."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Aukera hau zurian utzi ezkero, ez da smb.con aldatuko."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "DOS bezeroentzat erabiliko den karaktere jokoa"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 "Smb.con fitxategian \"client code page\" aukera konfiguraturik dago.  Samba 3.0-an aukera hau \"dos charset\" aukeragatik ordeztua izan da. Mesedez ezarri aukera berri honetan erabili nahi duzun karaktere jokoa.   Kasu gehienetan lehenetsiriko aukera nahiko izan beharko zen.  Kontutan izan haukera hau ez dela beharrezkoa Windows bezeroak onartzeko, DOS bezeroentzat bakarrik da. "
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "smb.conf WINS ezarpenak DHCP-tik jasotzeko eraldatu?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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."
-msgstr "Zure sistemak IP helbidea sareko DHCP zerbitzari batetatik jaso ezkero, zerbitzari horrek sareko WINS (\"NetBIOS name servers\") zerbitzarien datuak eman ditzake.  Honek smb.conf fitxategian aldaketa bat behar du DHCP-bidezko WINS ezarpenak /etc/samba/dhcp.conf-etik irakurtzeko."
+msgstr ""
+"Zure sistemak IP helbidea sareko DHCP zerbitzari batetatik jaso ezkero, "
+"zerbitzari horrek sareko WINS (\"NetBIOS name servers\") zerbitzarien datuak "
+"eman ditzake.  Honek smb.conf fitxategian aldaketa bat behar du DHCP-bidezko "
+"WINS ezarpenak /etc/samba/dhcp.conf-etik irakurtzeko."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "Ezaugarri honetaz baliatzeko dhcp3-client bezeroa instalaturik izan behar duzu."
+msgstr ""
+"Ezaugarri honetaz baliatzeko dhcp3-client bezeroa instalaturik izan behar "
+"duzu."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Smb.conf automatikoki konfiguratu?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -106,55 +70,73 @@
 "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 "Konfigurazioaren hurrengo atalak /etc/samba/smb.conf fitxategiari dagozkion ezarpenenak dira, honek Samba programak (smbd eta nmbd) konfiguratzen ditu. Zure smb.conf fitxategiak 'include' lerro bat edo lerro bat baino luzeago den aukera bat badu, horregatik konfigurazio automatiko fitxategia honda daiteke, zuk eskuz konpondu beharko duzularik."
+msgstr ""
+"Konfigurazioaren hurrengo atalak /etc/samba/smb.conf fitxategiari dagozkion "
+"ezarpenenak dira, honek Samba programak (smbd eta nmbd) konfiguratzen ditu. "
+"Zure smb.conf fitxategiak 'include' lerro bat edo lerro bat baino luzeago "
+"den aukera bat badu, horregatik konfigurazio automatiko fitxategia honda "
+"daiteke, zuk eskuz konpondu beharko duzularik."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "Aukera hau ez erabili ezkero, konfigurazioko edozein aldaketa eskuz egin beharko duzu eta ezingo duzu konfigurazio aldaketa automatikoez baliatu."
+msgstr ""
+"Aukera hau ez erabili ezkero, konfigurazioko edozein aldaketa eskuz egin "
+"beharko duzu eta ezingo duzu konfigurazio aldaketa automatikoez baliatu."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Lan Talde/Domeinu izena?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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 "Honek zure zerbitzariari sareko bezeroek galdetzean bistaraziko duen lan taldea ezartzen du. Kontutan izan parametro honek security=domain ezarpeneko domeinu izena ere ezartzen duela."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
+msgstr ""
+"Honek zure zerbitzariari sareko bezeroek galdetzean bistaraziko duen lan "
+"taldea ezartzen du. Kontutan izan parametro honek security=domain ezarpeneko "
+"domeinu izena ere ezartzen duela."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Zifraturiko pasahitzak erabili?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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 "Windoez bezero gehienak SMB zerbitzariekiko harremanak zifraturiko pasahitzak erabiliaz egiten dituzte. Testu laueko pasahitzak erabili nahi izan ezkero parametro bat aldatu behar duzu Windows erregistroan. "
+"All 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."
+msgstr ""
+"Windoez bezero gehienak SMB zerbitzariekiko harremanak zifraturiko "
+"pasahitzak erabiliaz egiten dituzte. Testu laueko pasahitzak erabili nahi "
+"izan ezkero parametro bat aldatu behar duzu Windows erregistroan. "
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "Aukera hau erabiltzea oso gomendagarri da. Erabiltzea hautatu ezkero ziurtatu baliozko /etc/samba/smbpasswd fitxategi bat duzula eta pasahitzak smbpasswd programaren bidez ezarri dituzula."
+msgstr ""
+"Aukera hau erabiltzea oso gomendagarri da. Erabiltzea hautatu ezkero "
+"ziurtatu baliozko /etc/samba/smbpasswd fitxategi bat duzula eta pasahitzak "
+"smbpasswd programaren bidez ezarri dituzula."
 
 #. Type: boolean
 #. Description
@@ -171,7 +153,13 @@
 "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."
-msgstr "Windows sistema gehienen lehenetsiriko portaerarekin bateragarritasuna mantentzeko, Samba zifraturiko pasahitzak erabiltzeko konfiguratu behar da.  Honetako erabiltzaileen pasahitzak gordeko dituen /etc/passwd fitxategiaz bereiziriko beste fitxategi bat sortu behar da. Fitxategia automatikoki sortu daiteke baina pasahitzak eskuz gehitu behar dira 'smbpasswd' programaren bidez eta pasahitzak eguneraturik mantendu behar dira."
+msgstr ""
+"Windows sistema gehienen lehenetsiriko portaerarekin bateragarritasuna "
+"mantentzeko, Samba zifraturiko pasahitzak erabiltzeko konfiguratu behar da.  "
+"Honetako erabiltzaileen pasahitzak gordeko dituen /etc/passwd fitxategiaz "
+"bereiziriko beste fitxategi bat sortu behar da. Fitxategia automatikoki "
+"sortu daiteke baina pasahitzak eskuz gehitu behar dira 'smbpasswd' "
+"programaren bidez eta pasahitzak eguneraturik mantendu behar dira."
 
 #. Type: boolean
 #. Description
@@ -179,7 +167,9 @@
 msgid ""
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
-msgstr " Fixtategi hau ez sortu ezkero beharrezkoa da Samba (eta ziurrenik Windows bezeroak) zifratu gabeko pasahitzak erabiltzeko konfiguratzea."
+msgstr ""
+" Fixtategi hau ez sortu ezkero beharrezkoa da Samba (eta ziurrenik Windows "
+"bezeroak) zifratu gabeko pasahitzak erabiltzeko konfiguratzea."
 
 #. Type: boolean
 #. Description
@@ -187,102 +177,57 @@
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
-msgstr "Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html begiratu argibide gehiagorako"
+msgstr ""
+"Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
+"begiratu argibide gehiagorako"
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Samba erregistro fitxategien kokagunea aldatua izan da."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 bi deabruen (smbd eta nmbd) erregistro fitxategiak /var/log/samba/-n daude kokaturik. Fitxategien izenak nmbd-rentzat log.nmbd eta smbd-rentzat log.smbd dira."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr "/var/log/-en dauden erregistro fitxategi zaharrak kokaleku berrira automatikoki mugituak izango dira."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "Dagoeneko ezin da nmbd inetd bidez abiarazi"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 "Zure sistema nmbd eta smbd inetd bidez abiazteko konfiguraturik dago. Samba bertsio berrietan nmbd ezin da inetd bidez abiarazi. /etc/init.d/samba abiarazte script-a eraldatu egin baduzu, agian editatu egin beharko duzu funtziona dezan."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "deabruak, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Samba abiarazte modua:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Nola nahi duzu Samba abiaraztea?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
-msgstr "Samba smbd zerbitzua deabru arrunt edo inted bidez abiarazi daiteke. Deabru bezala abiaraztea gomendatzen da."
+msgstr ""
+"Samba smbd zerbitzua deabru arrunt edo inted bidez abiarazi daiteke. Deabru "
+"bezala abiaraztea gomendatzen da."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "/etc/samba/smbpasswd /var/lib/samba/passdb.tdb-ra mugitu?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
-msgstr "Samba 3.0 bertsioak SAM datubase sistema osoago bat eskaintzen du /etc/samba/smbpasswd fitxategia ordezteko."
+msgstr ""
+"Samba 3.0 bertsioak SAM datubase sistema osoago bat eskaintzen du /etc/samba/"
+"smbpasswd fitxategia ordezteko."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "Mesedez berretsi smbpasswd fitxategi arrunta /var/lib/samba/passdb.tdb-ra migratzea nahi duzula. Beste pasahitz datubase bat erabiltzea pentsatzen baduzu (adib LDAP) hemen 'ez' erantzun beharko zenuke."
+msgstr ""
+"Mesedez berretsi smbpasswd fitxategi arrunta /var/lib/samba/passdb.tdb-ra "
+"migratzea nahi duzula. Beste pasahitz datubase bat erabiltzea pentsatzen "
+"baduzu (adib LDAP) hemen 'ez' erantzun beharko zenuke."
 
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Nola nahi duzu Samba abiaraztea?"
-
-#~ msgid "Your smb.conf will be re-written!"
-#~ msgstr "Zure smb.conf berridatzia izango da!"
-
-#~ 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!"
-#~ msgstr ""
-#~ "SWAT-ek zure smb.conf fitxategia berridatziko du. Honek erregistroak "
-#~ "ordenatu eta iruzkin, include= eta copy= aukera guztiak ezabatuko ditu. "
-#~ "Eskuz sorturiko smb.conf fitxategi bat izan ezkero babes kopia egin edo "
-#~ "SWAT ez erabili!."

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/fr.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -16,80 +16,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
-"PO-Revision-Date: 2006-08-03 20:43-0500\n"
-"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"PO-Revision-Date: 2006-08-13 14:56-0700\n"
+"Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Jeu de caractères pour les systèmes de fichiers Unix"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"L'option « character set » (jeu de caractères) est utilisée dans le fichier "
-"smb.conf. Avec Samba 3.0, cette option est remplacée par une nouvelle "
-"option, « unix charset » (jeu de caractères Unix).  Veuillez indiquer le jeu "
-"de caractères que vous voulez utiliser avec cette option, qui permet "
-"d'interpréter les noms de fichiers sur le système."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-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: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Jeu de caractères pour les clients DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"L'option « client code page » (page de codes du client) est actuellement "
-"utilisée dans le fichier smb.conf. Avec Samba 3.0, cette option a été "
-"remplacée par l'option « dos charset » (jeu de caractères DOS). Veuillez "
-"indiquer le jeu de caractères que vous voulez utiliser avec la nouvelle "
-"option. En général le jeu de caractères choisi par défaut est suffisant. "
-"Veuillez noter que cette option ne sert pas pour les clients Windows mais "
-"seulement pour les clients DOS."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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 "
@@ -105,19 +50,21 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "Le paquet dhcp3-client doit être installé pour utiliser cette fonctionnalité."
+#: ../samba-common.templates:1001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Le paquet dhcp3-client doit être installé pour utiliser cette fonctionnalité."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Voulez-vous configurer smb.conf automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -135,7 +82,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -147,44 +94,44 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Nom de domaine ou de groupe de travail :"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
-"Veuillez indiquer le groupe de travail où les clients trouveront le serveur. "
-"Il indique aussi le nom de domaine utilisé par le paramètre "
+"Veuillez indiquer le groupe de travail où les clients doivent trouver le "
+"serveur. Il indique aussi le nom de domaine utilisé par le paramètre "
 "« security=domain » quand celui-ci est utilisé."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Voulez-vous chiffrer les mots de passe ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
-"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."
+"All 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."
 msgstr ""
-"La plupart des clients Windows communiquent avec les serveurs SMB en "
+"Tous les 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."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
@@ -214,9 +161,9 @@
 "Pour rester compatible avec les réglages par défaut de la majorité des "
 "versions de Windows, Samba doit être configuré pour utiliser des mots de "
 "passe chiffrés. Cela impose de conserver les mots de passe dans un fichier "
-"distinct de /etc/passwd. Ce fichier peut être créé automatiquement, mais les mots de passe doivent y "
-"être ajoutés manuellement (avec la commande « smbpasswd ») et être tenus à "
-"jour."
+"distinct de /etc/passwd. Ce fichier peut être créé automatiquement, mais les "
+"mots de passe doivent y être ajoutés manuellement avec la commande « "
+"smbpasswd » et être tenus à jour."
 
 #. Type: boolean
 #. Description
@@ -239,68 +186,21 @@
 "Veuillez consulter le fichier /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 "html dans le paquet samba-doc pour plus d'informations."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Déplacement des journaux de Samba"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"Les fichiers-journaux des démons nmbd et smbd se trouvent désormais dans /"
-"var/log/samba/. Pour nmbd et smbd, les noms de ces fichiers sont "
-"respectivement log.nmbd et log.smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr "Les anciens fichiers-journaux dans /var/log/ seront déplacés à cet endroit."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "Lancement de nmbd à partir d'inetd non géré"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 ""
-"Ce système était configuré pour lancer nmbd et smbd à partir d'inetd. Les "
-"versions récentes de Samba ne permettent plus d'exécuter nmbd à partir "
-"d'inetd. Si vous avez modifié le script de lancement /etc/init.d/samba, vous "
-"avez peut-être besoin de le corriger à nouveau pour permettre le lancement "
-"de nmbd. "
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "démons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Méthode de lancement de Samba :"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Comment voulez-vous lancer Samba ?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -310,13 +210,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -326,7 +226,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "

Modified: trunk/po/gl.po
===================================================================
--- trunk/po/gl.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/gl.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-08-08 08:59+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -23,67 +23,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Xogo de caracteres para o sistema de ficheiros Unix"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"A opciÃ³n \"character set\" (xogo de caracteres) estÃ¡ configurada no ficheiro "
-"smb.conf. En Samba 3.0 esta opciÃ³n substitÃºese por unha nova opciÃ³n, \"unix "
-"charset\". Indique o xogo de caracteres que quere empregar nesa nova opciÃ³n, "
-"que controla como interpreta Samba os nomes de ficheiro no sistema de "
-"ficheiros."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-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 ficheiro smb.conf."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Xogo de Caracteres para os clientes DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"A opciÃ³n \"client code page\" (pÃ¡xina de cÃ³digos do cliente) estÃ¡ "
-"configurada no ficheiro smb.conf. En Samba 3.0 esta opciÃ³n substitÃºese pola "
-"opciÃ³n \"dos charset\". Especifique o xogo de caracteres que quere empregar "
-"nesa nova opciÃ³n. Na maiorÃa dos casos a opciÃ³n escollida por defecto ha "
-"servir. TeÃ±a en conta que esta opciÃ³n non Ã© necesaria para soportar clientes "
-"Windows; Ã© sÃ³ para clientes DOS."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -108,13 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Â¿Configurar o ficheiro smb.conf automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -132,7 +80,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -144,43 +92,45 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome do grupo de traballo/dominio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
-"Indique o grupo de traballo no que ha aparecer o seu servidor cando lle "
-"pregunten os clientes. TeÃ±a en conta que este parÃ¡metro tamÃ©n controla o "
-"nome de dominio que se emprega coa configuraciÃ³n security=domain."
+"Indique o grupo de traballo no que quere que o seu servidor ha aparecer "
+"cando lle pregunten os clientes. TeÃ±a en conta que este parÃ¡metro tamÃ©n "
+"controla o nome de dominio que se emprega coa configuraciÃ³n security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Â¿Empregar cifrado de contrasinais?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
-"A maiorÃa dos clientes Windows comunÃcanse cos servidores SMB empregando "
+"Todos os clientes recentes Windows 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."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
@@ -234,69 +184,21 @@
 "Consulte o ficheiro /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html do "
 "paquete samba-doc para ter mÃ¡is detalles."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "TrasladÃ¡ronse os ficheiros de rexistro de Samba"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"Os ficheiros de rexistro de Ã¡mbolos dous servizos de Samba (nmbd e smbd) "
-"estÃ¡n armacenados agora en /var/log/samba. Os nomes dos ficheiros son log."
-"nmbd e log.smbd, para nmbd e smbd respectivamente."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 hanse trasladar "
-"automaticamente Ã¡ nova localizaciÃ³n."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "Xa non se soporta a execuciÃ³n de nmbd desde inetd"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 ""
-"Este sistema estivo antes configurado para iniciar nmbd e smbd desde inetd. "
-"Nas versiÃ³ns recentes de Samba, nmbd non se pode iniciar desde inetd. Se "
-"modificou o seu script de inicio /etc/init.d/samba pode que teÃ±a que "
-"axustalo para que nmbd se inicie."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "servizos, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "MÃ©todo de inicio de Samba:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Â¿Como quere executar Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -306,13 +208,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -322,7 +224,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -332,20 +234,3 @@
 "existente a /var/lib/samba/passdb.tdb. Non escolla esta opciÃ³n se pretende "
 "empregar outro motor pdb (por exemplo, LDAP)."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "SWAT reescribe o ficheiro de configuraciÃ³n"
-
-#~ msgid ""
-#~ "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 reescribir o ficheiro smb.conf. Ha reordear as entradas e "
-#~ "eliminar todos os comentarios, as opciÃ³ns include= e as opciÃ³ns copy=. Se "
-#~ "ten un ficheiro smb.conf creado Ã¡ man non deberÃa empregar 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-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/it.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -6,74 +6,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.23rc1 italian debconf templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
-"PO-Revision-Date: 2006-05-30 20:21+0200\n"
-"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"PO-Revision-Date: 2006-08-13 16:12-0700\n"
+"Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Set di caratteri per il filesystem Unix"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"Attualmente in smb.conf Ã¨ configurato il Â«character setÂ», in Samba 3.0 "
-"questa opzione Ã¨ stata sostituita dall'opzione Â«unixÂ characterÂ». Specificare "
-"il set di caratteri che si desidera usare tramite questa opzione la quale "
-"controlla come Samba interpreta i nomi dei file sul file system."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Lasciando vuoto questo valore il file smb.conf non verrÃ  modificato."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Set di caratteri per i client DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"Attualmente in smb.conf Ã¨ configurato il Â«client code pageÂ», in Samba 3.0 "
-"questa opzione Ã¨ stata sostituita dall'opzione Â«dos characterÂ». Specificare "
-"il set di caratteri che si desidera usare tramite questa opzione. In molti "
-"casi il valore predefinito Ã¨ sufficiente. Notare che questa opzione non Ã¨ "
-"necessaria per i client Windows, invece Ã¨ specifica per i client DOS."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,7 +39,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -98,13 +48,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurare automaticamente smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -122,7 +72,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -134,17 +84,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome del Workgroup/Dominio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "Specificare in quale workgroup apparirÃ  il server quando verrÃ  interrogato "
 "dai client. Notare che questo parametro controlla anche il nome del Dominio "
@@ -152,25 +103,25 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Usare password cifrate?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
-"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."
+"All 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."
 msgstr ""
-"Molti dei client Windows comunicano con i server SMB usando password "
+"Tutti 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."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -190,7 +141,6 @@
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-#, 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 "
@@ -201,20 +151,19 @@
 "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 "
-"da /etc/passwd."
+"da /etc/passwd. Questo file puÃ² essere creato automaticamente ma le password "
+"dovranno essere inserite manualmente con smbpasswd e in futuro il file "
+"dovrÃ  essere tenuto aggiornato."
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-#, fuzzy
 msgid ""
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"Questo file puÃ² essere creato automaticamente ma le password dovranno essere "
-"inserite manualmente (con smbpasswd) e in futuro il file dovrÃ  essere tenuto "
-"aggiornato. Non creando questo file allora Ã¨ necessario riconfigurare samba "
-"(e probabilmente anche le macchine client) per usare password in chiaro."
+"Non creando questo file allora Ã¨ necessario riconfigurare samba (e "
+"probabilmente anche le macchine client) per usare password in chiaro."
 
 #. Type: boolean
 #. Description
@@ -226,68 +175,21 @@
 "Si veda /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html, contenuto nel "
 "pacchetto samba-doc, per ulteriori dettagli."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "I file di log di Samba sono stati spostati"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"I file di log per entrambi i demoni Samba (nmbd e smbd) sono adesso "
-"memorizzati in /var/log/samba/. I nomi dei file di log sono rispettivamente "
-"log.nmbd e log.smbd per nmbd e smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "L'avvio di nmbd da inetd non Ã¨ piÃ¹ supportato"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 ""
-"In precedenza questo sistema era configurato per avviare nmbd e smbd da "
-"inetd. Nelle versioni piÃ¹ recenti di Samba non Ã¨ piÃ¹ possibile avviare nmbd "
-"da inetd. Se si Ã¨ modificato lo script di avvio /etc/init.d/samba potrebbe "
-"essere necessario correggerlo a mano in modo da permettere l'avvio di nmbd."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "demoni, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Metodo d'avvio di Samba:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Come avviare Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -297,13 +199,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -313,7 +215,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -323,14 +225,3 @@
 "migrato in /var/lib/samba/passdb.tdb. Invece, se si pensa di usare un "
 "backend pdb diverso (per esempio LDAP) si dovrebbe rifiutare."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "File di configurazione sovrascritto da SWAT"
-
-#~ msgid ""
-#~ "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 le opzioni "
-#~ "copy=. Se si Ã¨ personalizzato smb.conf tornare indietro e non usare SWAT."

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/ja.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-05-30 08:03+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -23,66 +23,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Unix ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ å‘ã‘ã®æ–‡å—ã‚»ãƒƒãƒˆ"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"ç¾åœ¨ã€smb.conf ã«è¨å®šæ¸ˆã¿ã® \"character set\" ãŒã‚ã‚Šã¾ã™ã€‚Samba 3.0 ã§ã¯ã€ã“"
-"ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã¯æ–°ã—ã„ã‚ªãƒ—ã‚·ãƒ§ãƒ³ \"unix charset\" ã«ç½®ãæ›ãˆã‚‰ã‚Œã¦ã„ã¾ã™ã€‚"
-"Samba ãŒãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã®ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ã©ã®ã‚ˆã†ã«è§£é‡ˆã™ã‚‹ã‹ã‚’åˆ¶å¾¡ã™ã‚‹ã“ã®æ–°ã—"
-"ã„ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã®ãŸã‚ã«ã€åˆ©ç”¨ã‚’å¸Œæœ›ã™ã‚‹æ–‡å—ã‚»ãƒƒãƒˆã‚’æŒ‡å®šã—ã¦ãã ã•ã„ã€‚"
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "ã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’ç©ºã®ã¾ã¾ã«ã™ã‚‹ã¨ã€smb.conf ãƒ•ã‚¡ã‚¤ãƒ«ã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“ã€‚"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "DOS ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆå‘ã‘ã®æ–‡å—ã‚»ãƒƒãƒˆ"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"ç¾åœ¨ã€smb.conf ã«è¨å®šæ¸ˆã¿ã® \"client code page\" ãŒã‚ã‚Šã¾ã™ã€‚Samba 3.0 ã§ã¯ã€"
-"ã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã¯æ–°ã—ã„ã‚ªãƒ—ã‚·ãƒ§ãƒ³ \"dos charset\" ã«ç½®ãæ›ãˆã‚‰ã‚Œã¦ã„ã¾ã™ã€‚ã“ã®"
-"æ–°ã—ã„ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã®ãŸã‚ã«ã€åˆ©ç”¨ã‚’å¸Œæœ›ã™ã‚‹æ–‡å—ã‚»ãƒƒãƒˆã‚’æŒ‡å®šã—ã¦ãã ã•ã„ã€‚ã»ã¨ã‚“"
-"ã©ã®å ´åˆã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®é¸æŠžã®ã¾ã¾ã§ååˆ†ã§ã—ã‚‡ã†ã€‚ã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã¯ Windows ã‚¯ãƒ©"
-"ã‚¤ã‚¢ãƒ³ãƒˆã‚µãƒãƒ¼ãƒˆã«ã¯å¿…è¦ãªãã€DOS ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã®ã¿ã®ãŸã‚ã§ã‚ã‚‹ã“ã¨ã‚’æ³¨æ„ã—ã¦"
-"ãŠãã¾ã™ã€‚"
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "DHCP ã‹ã‚‰ WINS è¨å®šã‚’ä½¿ã†ã‚ˆã† smb.conf ã‚’å¤‰æ›´ã—ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -107,13 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "è‡ªå‹•çš„ã« smb.conf ã‚’è¨å®šã—ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -130,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -141,17 +90,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "ãƒ¯ãƒ¼ã‚¯ã‚°ãƒ«ãƒ¼ãƒ—/ãƒ‰ãƒ¡ã‚¤ãƒ³å:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ç…§ä¼šã•ã‚ŒãŸéš›ã«ã‚ãªãŸã®ã‚µãƒ¼ãƒãŒç¾ã‚Œã‚‹ã“ã¨ã«ãªã‚‹ãƒ¯ãƒ¼ã‚¯ã‚°ãƒ«ãƒ¼ãƒ—"
 "ã‚’æŒ‡å®šã—ã¦ãã ã•ã„ã€‚ã“ã®ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã¯ security=domain è¨å®šãŒä½¿ã‚ã‚ŒãŸã¨ãã®ãƒ‰ãƒ¡"
@@ -159,17 +109,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã®æš—å·åŒ–ã‚’ä½¿ã„ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "ã»ã¨ã‚“ã©ã® Windows ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã¯æš—å·åŒ–ã•ã‚ŒãŸãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ä½¿ã£ã¦ SMB ã‚µãƒ¼ãƒã¨"
 "ã‚„ã‚Šå–ã‚Šã—ã¾ã™ã€‚ã‚¯ãƒªã‚¢ãƒ†ã‚ã‚¹ãƒˆãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ä½¿ã„ãŸã„å ´åˆã¯ã€ã‚ãªãŸã® Windows ã®"
@@ -177,7 +128,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -233,67 +184,21 @@
 "è©³ç´°ã«ã¤ã„ã¦ã¯ã€samba-doc ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã«ã‚ã‚‹ /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚"
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Samba ã®ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã¯ç§»å‹•ã•ã‚Œã¾ã—ãŸ"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ãƒ‡ãƒ¼ãƒ¢ãƒ³ (nmbd ãŠã‚ˆã³ smbd) ã®ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã¯ /var/log/samba/ "
-"ã«æ ¼ç´ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã£ã¦ã„ã¾ã™ã€‚ãƒ•ã‚¡ã‚¤ãƒ«åã¯ nmbd ã¨ smbd ã§åˆ¥å€‹ã«ãªã‚‹ã‚ˆã†ã€"
-"log.nmbd ãŠã‚ˆã³ log.smbd ã¨ãªã‚Šã¾ã™ã€‚"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr "/var/log/ ã«ã‚ã£ãŸå¤ã„ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã¯è‡ªå‹•çš„ã«æ–°ã—ã„å ´æ‰€ã«ç§»å‹•ã•ã‚Œã¾ã™ã€‚"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "inetd ã‹ã‚‰ã® nmbd ã®å®Ÿè¡Œã¯ã‚‚ã†ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 ã‚’èµ·å‹•ã™ã‚‹ã‚ˆã†è¨å®šã•ã‚Œã¦ã„ã¾"
-"ã—ãŸã€‚æœ€è¿‘ã® Samba ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã€nmbd ã¯ inetd ã‹ã‚‰ã¯èµ·å‹•ã§ãã¾ã›ã‚“ã€‚/etc/"
-"init.d/samba ã‚¹ã‚¿ãƒ¼ãƒˆã‚¢ãƒƒãƒ—ã‚¹ã‚¯ãƒªãƒ—ãƒˆã‚’å¤‰æ›´ã—ã¦ã„ã‚‹ã®ã§ã‚ã‚Œã°ã€nmbd ãŒèµ·å‹•ã™"
-"ã‚‹ã‚ˆã†ä»Šèª¿æ•´ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã§ã—ã‚‡ã†ã€‚"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "ãƒ‡ãƒ¼ãƒ¢ãƒ³, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Samba ã®å®Ÿè¡Œæ–¹å¼:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "ã©ã®ã‚ˆã†ã« Samba ã‚’å®Ÿè¡Œã—ãŸã„ã§ã™ã‹?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -303,13 +208,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -319,7 +224,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -329,15 +234,3 @@
 "ã‹ã©ã†ã‹ç¢ºèªã—ã¦ãã ã•ã„ã€‚åˆ¥ã® pdb ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ (LDAP ãªã©) ã‚’ä»£ã‚ã‚Šã«è¨ˆç”»ã—"
 "ã¦ã„ã‚‹ã®ã§ã‚ã‚Œã°ã€ã“ã“ã§ã¯ã€Œã„ã„ãˆã€ã¨ç”ãˆã¦ãã ã•ã„ã€‚"
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "SWAT ã«ã‚ˆã£ã¦æ›¸ãç›´ã•ã‚ŒãŸè¨å®šãƒ•ã‚¡ã‚¤ãƒ«"
-
-#~ msgid ""
-#~ "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 ã‚’ä½¿ã†ã®ã¯é¿ã‘ãŸã»ã†ãŒã‚ˆã„ã§ã—ã‚‡"
-#~ "ã†ã€‚"

Modified: trunk/po/km.po
===================================================================
--- trunk/po/km.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/km.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-08-07 15:41+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -26,71 +26,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "ážŸáŸ†ážŽáž»áŸ†â€‹ážáž½áž¢áž€áŸ’ážŸážšâ€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹áž™áž¼áž“áž¸áž€"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"áž‡áž˜áŸ’ážšáž¾ážŸ \"ážŸáŸ†ážŽáž»áŸ†ážáž½áž¢áž€áŸ’ážŸážš\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹ážáŸ’áž˜áž¸áž€áŸ’áž“áž»áž„ smb.conf.  áž“áŸ…áž€áŸ’áž“áž»áž„ Samba 3.0 áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážáŸ’ážšáž¼ážœâ€‹"
-"áž”áž¶áž“áž‡áŸ†áž“áž½ážŸâ€‹ážŠáŸ„áž™â€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážáŸ’áž˜áž¸â€‹áž˜áž½áž™ \"ážŸáŸ†ážŽáž»áŸ†â€‹ážáž½áž¢áž€áŸ’ážŸážšâ€‹áž™áž¼áž“áž¸áž€\"Â áŸ” ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹ážŸáŸ†ážŽáž»áŸ†â€‹ážáž½áž¢áž€áŸ’ážŸážš ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž”áŸ’ážšáž¾â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážáŸ’áž˜áž¸â€‹"
-"áž“áŸáŸ‡ ážŠáŸ‚áž›â€‹ážáŸ’ážšáž½ážáž–áž·áž“áž·ážáŸ’áž™â€‹ážœáž·áž’áž¸â€‹ážŠáŸ‚áž›â€‹ Samba áž”áž€â€‹áž”áŸ’ážšáž¾â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž¯áž€ážŸáž¶ážšâ€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹áž¯áž€ážŸáž¶ážšÂ áŸ”"
-
-#  Type: string
-#  Description
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž‘áž»áž€â€‹áž²áŸ’áž™â€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž“áŸáŸ‡â€‹áž‘áž‘áŸ áž¯áž€ážŸáž¶ážš smb.conf áž“áž¹áž„â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšÂ áŸ”"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "ážŸáŸ†ážŽáž»áŸ†â€‹ážáž½áž¢áž€áŸ’ážŸážšâ€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœ DOS"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"áž‡áž˜áŸ’ážšáž¾ážŸ \"áž‘áŸ†áž–áŸážšâ€‹áž€áž¼ážŠâ€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœ\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹ážáŸ’áž˜áž¸â€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ smb.conf.  áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ Samba 3.0 "
-"áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“áž‡áŸ†áž“áž½ážŸâ€‹ážŠáŸ„áž™â€‹áž‡áž˜áŸ’ážšáž¾ážŸ \"ážŸáŸ†ážŽáž»áŸ†â€‹ážáž½áž¢áž€áŸ’ážŸážš dos\"Â áŸ”  ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹ážŸáŸ†ážŽáž»áŸ†â€‹ážáž½áž¢áž€áŸ’ážŸážšâ€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž”áŸ’ážšáž¾â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹"
-"áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážáŸ’áž˜áž¸â€‹áž“áŸáŸ‡Â áŸ”  áž€áŸ’áž“áž»áž„â€‹áž€ážšážŽáž¸â€‹áž—áž¶áž‚áž…áŸ’ážšáž¾áž“ áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜â€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž˜áŸ’ážšáž¶áž”áŸ‹áž¢áŸ’áž“áž€â€‹â€‹áž“áž¹áž„â€‹áž˜áž·áž“â€‹áž‚áŸ’ážšáž”áŸ‹áž‚áŸ’ážšáž¶áž“áŸ‹Â áŸ” áž…áŸ†ážŽáž¶áŸ†ážáž¶â€‹ áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž“áŸáŸ‡â€‹"
-"áž˜áž·áž“â€‹áž…áž¶áŸ†áž”áž¶áž…áŸ‹â€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœâ€‹ážœáž¸áž“ážŠáž¼â€‹áž‘áŸ ážœáž¶â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ážáŸ‚â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœ DOS áž”áŸ‰áž»ážŽáŸ’ážŽáŸ„áŸ‡Â áŸ”"
-
 #  Type: boolean
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "áž€áŸ‚áž”áŸ’ážšáŸ‚ smb.conf ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž”áŸ’ážšáž¾â€‹áž€áž¶ážšáž€áŸ†ážŽážáŸ‹â€‹ážšáž”ážŸáŸ‹ WINS áž–áž¸ DHCPÂ ?"
 
@@ -98,7 +38,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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 "
@@ -115,7 +55,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "áž€áž‰áŸ’áž…áž”áŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœ dhcp3 ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž”áž¶áž“â€‹ážŠáŸ†áž¡áž¾áž„â€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž‘áž‘áž½áž›â€‹áž”áž¶áž“â€‹áž•áž›áž”áŸ’ážšáž™áŸ„áž‡áž“áŸážšáž”ážŸáŸ‹â€‹áž›áž€áŸ’ážážŽáŸˆâ€‹áž–áž·ážŸáŸážŸâ€‹áž“áŸáŸ‡Â áŸ”"
@@ -124,7 +64,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’ smb.conf ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·Â ?"
 
@@ -132,7 +72,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -151,7 +91,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -164,7 +104,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž€áŸ’ážšáž»áž˜áž€áž¶ážšáž„áž¶ážš/ážŠáŸ‚áž“Â áŸ–"
 
@@ -172,11 +112,12 @@
 #  Description
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹áž€áŸ’ážšáž»áž˜áž€áž¶ážšáž„áž¶ážšâ€‹ážšáž”ážŸáŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž“áŸáŸ‡â€‹áž“áž¹áž„â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž“áŸ…â€‹áž–áŸáž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž€áž¶ážšâ€‹ážŠáŸ„áž™â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾Â áŸ” áž…áŸ†ážŽáž¶áŸ†ážáž¶ áž”áŸ‰áž¶ážšáŸ‰áž¶áž˜áŸ‰áŸ‚ážáŸ’ážšâ€‹"
 "áž“áŸáŸ‡â€‹áž€áŸâ€‹ážáŸ’ážšáž½ážáž–áž·áž“áž·ážáŸ’áž™â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážŠáŸ‚áž“â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áŸ’ážšáž¾â€‹â€‹ážŠáŸ„áž™â€‹ážŸáž»ážœážáŸ’ážáž·áž—áž¶áž–=áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážŠáŸ‚áž“Â áŸ”"
@@ -185,7 +126,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "áž”áŸ’ážšáž¾â€‹áž€áž¶ážšâ€‹áž¢áŸŠáž·áž“áž‚áŸ’ážšáž¸áž”â€‹áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹Â ?"
 
@@ -193,11 +134,12 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážœáž¸áž“ážŠáž¼â€‹â€‹áž—áž¶áž‚â€‹áž…áŸ’ážšáž¾áž“â€‹áž‘áž¶áž€áŸ‹áž‘áž„â€‹áž‡áž¶áž˜áž½áž™â€‹áž“áž¹áž„â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ SMB ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾â€‹áž–áž¶áž€áŸ’áž™ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž¢áŸŠáž·áž“áž‚áŸ’ážšáž¸áž”Â áŸ” áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹"
 "áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž”áŸ’ážšáž¾â€‹áž–áž¶áž€áŸ’áž™ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž¢ážáŸ’ážáž”áž‘â€‹áž…áŸ’áž”áž¶ážŸáŸ‹áŸ— áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœážáŸ‚â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž”áŸ‰áž¶ážšáŸ‰áž¶áž˜áŸ‰áŸ‚ážáŸ’ážšâ€‹áž€áŸ’áž“áž»áž„â€‹áž”áž‰áŸ’áž‡áž¸â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážšáž”ážŸáŸ‹â€‹ážœáž¸áž“ážŠáž¼Â áŸ”"
@@ -206,7 +148,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
@@ -265,81 +207,25 @@
 "ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž›áž˜áŸ’áž¢áž·ážâ€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŸáž¼áž˜â€‹áž˜áž¾áž›  /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html áž–áž¸â€‹"
 "áž€áž‰áŸ’áž…áž”áŸ‹ samba-docÂ áŸ”"
 
-#  Type: note
-#  Description
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "áž”áž¶áž“â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž‘áž¸â€‹áž¯áž€ážŸáž¶ážšâ€‹â€‹áž€áŸ†ážŽážáŸ‹â€‹áž áŸážáž»â€‹ážšáž”ážŸáŸ‹ Samba"
-
-#  Type: note
-#  Description
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 áž‘áž¶áŸ†áž„áž–áž¸ážš (nmbd áž“áž·áž„ smbd) áž¥áž¡áž¼ážœâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‘áž»áž€â€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ /var/log/"
-"samba/Â áŸ” ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážšáž”ážŸáŸ‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž‚ážº log.nmbd áž“áž·áž„ log.smbd ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ nmbd áž“áž·áž„ smbd ážŠáŸ‚áž›â€‹ážšáŸ†áž–áž¹áž„â€‹áž‘áž»áž€Â áŸ”"
-
-#  Type: note
-#  Description
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž ážáž»â€‹áž…áž¶ážŸáŸ‹áž–áž¸ /var/log/ áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž‘áž¸â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž‘áŸ…â€‹áž‘áž¸ážáž¶áŸ†áž„â€‹ážáŸ’áž˜áž¸Â áŸ”"
-
-#  Type: note
-#  Description
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "áž€áŸ†áž–áž»áž„â€‹ážšážáŸ‹ nmbd áž–áž¸ inetd ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž‘áŸ€ážâ€‹áž‘áŸ"
-
-#  Type: note
-#  Description
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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Â áŸ” áž“áŸ…áž€áŸ’áž“áž»áž„áž€áŸ†ážŽáŸ‚ "
-"Samba áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“ nmbd áž˜áž·áž“áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž…áž¶áž”áŸ‹áž•áŸ’ážŠáž¾áž˜â€‹áž–áž¸ inetdÂ áŸ” áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹áž€áŸ‚áž”áŸ’ážšáŸ‚ážŸáŸ’áž‚áŸ’ážšáž¸áž”áž…áž¶áž”áŸ‹áž•áŸ’ážŠáž¾áž˜ /"
-"etc/init.d/samba ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ áž¢áŸ’áž“áž€â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž›áŸƒážáž˜áŸ’ážšáž¼ážœážœáž¶â€‹áž¥áž¡áž¼ážœ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹ nmbd áž“áž¹áž„â€‹áž…áž¶áž”áŸ‹áž•áŸ’ážŠáž¾áž˜Â áŸ”"
-
 #  Type: select
 #  Choices
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "ážŠáŸáž˜áž·áž“ , inetd"
 
-#  Type: select
-#  Description
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "ážœáž¸áž’áž¸ážŸáž¶ážŸáŸ’ážáŸ’ážšâ€‹ážšážáŸ‹â€‹ážšáž”ážŸáŸ‹ SambaÂ áŸ–"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
 
 #  Type: select
 #  Description
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -350,7 +236,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "áž•áŸ’áž›áž¶ážŸáŸ‹áž‘áž¸áž–áž¸  /etc/samba/smbpasswd áž‘áŸ… /var/lib/samba/passdb.tdbÂ ?"
 
@@ -358,7 +244,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -370,7 +256,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -379,3 +265,4 @@
 "ážŸáž¼áž˜â€‹áž¢áŸ‡áž¢áž¶áž„â€‹ážáž¶ážáž¾â€‹áž¢áŸ’áž“áž€áž…áž„áŸ‹â€‹áž²áŸ’áž™â€‹áž¯áž€ážŸáž¶ážšâ€‹áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážŠáŸ‚áž›â€‹áž˜áž¶áž“â€‹ážŸáŸ’ážšáž¶áž”áŸ‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áŸ’ážŠáž¼ážšážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž‘áŸ…â€‹áž‘áŸ…â€‹ /var/lib/"
 "samba/passdb.tdbÂ áŸ”  áž€áž»áŸ†áž‡áŸ’ážšáž¾ážŸâ€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž“áŸáŸ‡ áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹áž‚áž˜áŸ’ážšáŸ„áž„â€‹áž”áŸ’ážšáž¾â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™ pdb ážŠáž‘áŸƒâ€‹"
 "áž‘áŸ€áž (áž§áž‘áž¶áž ážšážŽáŸ LDAP) áž‡áŸ†áž“áž½ážŸâ€‹ážœáž·áž‰Â áŸ”"
+

Modified: trunk/po/nl.po
===================================================================
--- trunk/po/nl.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/nl.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-06-12 22:13+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -23,68 +23,15 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Karakterset voor Unix bestandsysteem"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"U heeft momenteel de 'character set'-optie ingesteld in uw smb.conf. In "
-"Samba 3.0 werd deze optie vervangen door de nieuwe 'unix charset'-optie. "
-"Gelieve de karakterset die u voor deze nieuwe optie wil gebruiken aan te "
-"geven, deze bepaald hoe Samba de bestandsnamen in het bestandsysteem "
-"interpreteert."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr ""
-"Als u deze optie leeg laat zal uw smb.conf bestand niet aangepast worden."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Karakterset voor DOS-clients"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"U heeft momenteel de 'client code page'-optie ingesteld in uw smb.conf. In "
-"Samba 3.0 werd deze optie vervangen door de 'dos charset'-optie. Gelieve de "
-"karakterset die u voor deze nieuwe optie wilt gebruiken aan te geven. In de "
-"meeste gevallen zal het standaard ingevulde antwoord voldoen. Merk op dat "
-"deze optie niet nodig is voor ondersteuning van Windows-clients, enkel voor "
-"DOS-clients."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -109,13 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf automatisch instellen?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -133,7 +80,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -145,17 +92,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Werkgroep/Domeinnaam:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "Van welke werkgroep moet deze server deel lijken uit te maken, wanneer "
 "clients hierom vragen?. Merk op dat deze parameter ook de domeinnaam die "
@@ -163,17 +111,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Wachtwoordversleuteling gebruiken?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "De meeste windows-clients maken gebruik van versleutelde wachtwoorden bij de "
 "communicatie met SMB-servers. Als u 'onversleutelde tekst'-wachtwoorden wilt "
@@ -181,7 +130,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -239,69 +188,21 @@
 "Meer informatie vindt u in /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
 "uit het 'samba-doc'-pakket."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Samba's log bestanden zijn verhuisd"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"De logbestanden van beide Samba-achtergronddiensten (nmbd en smbd) worden nu "
-"opgeslagen in /var/log/samba/. De logbestanden voor nmbd en smbd zijn "
-"respectievelijk, log.nmbd en log.smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr ""
-"De oude logbestanden in /var/log worden automatisch naar de nieuwe locatie "
-"verplaatst."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "nmbd vanuit inetd draaien wordt niet langer ondersteund"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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. In "
-"recente samba-versies is dit niet langer mogelijk. Indien u uw /etc/init.d/"
-"samba startup-script aangepast heeft, dient u dit mogelijks aan te passen "
-"vooraleer nmbd terug zal starten."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "achtergronddiensten, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Samba uitvoermethode:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Hoe wilt u Samba draaien?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -311,13 +212,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -327,7 +228,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -337,21 +238,3 @@
 "passdb.tdb wilt migreren? Als u een ander pdb-backend gebruikt (bv. LDAP) "
 "dient u hier te weigeren."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "Configuratiebestand is herschreven door SWAT"
-
-#~ msgid ""
-#~ "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 door de de ingangen anders te "
-#~ "schikken en alle commentaar, 'include='- en 'copy='-opties te "
-#~ "verwijderen. Als u een handmatig gemaakt smb.conf bestand heeft is "
-#~ "gebruik van SWAT niet aan te raden!"
-
-#~ 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-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/pt.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -5,77 +5,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.9-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
-"PO-Revision-Date: 2006-06-10 15:32+0000\n"
-"Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"PO-Revision-Date: 2006-08-13 15:44-0700\n"
+"Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Conjunto de caracteres para sistema de ficheiros UNIX"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"A opÃ§Ã£o \"character set\" estÃ¡ actualmente configurada no smb.conf.  Em "
-"Samba 3.0, esta opÃ§Ã£o Ã© substituÃda por uma nova opÃ§Ã£o, \"unix charset\". "
-"Por favor especifique o conjunto de caracteres para utilizar com esta nova "
-"opÃ§Ã£o, que controla como o Samba interpreta os nomes dos ficheiros no "
-"sistema de ficheiros."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Se deixar esta opÃ§Ã£o vazia, o ficheiro smb.conf nÃ£o serÃ¡ alterado."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Conjunto de caracteres para clientes DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"A opÃ§Ã£o \"client code page\" actualmente Ã© configurada no smb.conf.  Em "
-"Samba 3.0, esta opÃ§Ã£o Ã© substituÃda pela opÃ§Ã£o \"dos charset\".  Por favor "
-"especifique o conjunto de caracteres que quer utilizar para esta nova opÃ§Ã£o. "
-"Na maioria dos casos, o valor por omissÃ£o escolhido para si serÃ¡ suficiente. "
-"Note que esta opÃ§Ã£o nÃ£o Ã© necessÃ¡ria para suportar clientes em Windows, Ã© "
-"apenas para clientes em DOS."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,7 +40,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -101,13 +49,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurar automaticamente o smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -125,7 +73,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -137,44 +85,43 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome do Grupo de trabalho/DomÃnio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
-"Por favor especifique o grupo de trabalho em que este servidor irÃ¡ aparecer "
-"qundo questionado pelos clientes. Note que este parÃ¢metro tambÃ©m controla o "
-"nome de DomÃnio utilizado com a configuraÃ§Ã£o security=domain."
+"Por favor especifique o grupo de trabalho em que quer que este servidor "
+"apareÃ§a quando questionado pelos clientes. Note que este parÃ¢metro tambÃ©m "
+"controla o nome de DomÃnio utilizado com a configuraÃ§Ã£o security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Utilizar encriptaÃ§Ã£o de passwords?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
-"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."
+"All 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."
 msgstr ""
-"A maioria dos clientes Windows comunicam com servidores SMB utilizando "
+"Todos os clientes Windows recentes comunicam com servidores SMB utilizando "
 "passwords encriptadas. Se deseja utilizar passwords de texto puro vocÃª vai "
 "ter de alterar um parÃ¢metro no registo do seu Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
-#, fuzzy
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
@@ -193,7 +140,6 @@
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-#, 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 "
@@ -204,20 +150,19 @@
 "Para ser compatÃvel com as omissÃµes na maioria das versÃµes do Windows, o "
 "Samba tem de ser configurado para utilizar passwords encriptadas.  Isto faz "
 "com que as passwords dos utilizadores sejam guardadas noutro ficheiro "
-"separado do /etc/passwd."
+"separado do /etc/passwd. Este ficheiro pode ser criado automaticamente, mas "
+"as passwords tÃªm de ser manualmente adicionadas correndo o smbpasswd e "
+"mantidas actualizadas no futuro."
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-#, fuzzy
 msgid ""
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"Este ficheiro pode ser criado automaticamente, mas as passwords tÃªm de ser "
-"manualmente adicionadas (correndo o smbpasswd) e mantidas actualizadas no "
-"futuro.  Se nÃ£o o criar, terÃ¡ de reconfigurar o samba (e provavelmente as "
-"suas mÃ¡quinas clientes) para utilizar passwords de texto puro."
+"Se nÃ£o o criar, terÃ¡ de reconfigurar o samba (e provavelmente as suas "
+"mÃ¡quinas clientes) para utilizar passwords de texto puro."
 
 #. Type: boolean
 #. Description
@@ -229,69 +174,21 @@
 "Para mais detalhes veja /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html do "
 "pacote samba-doc."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Os ficheiros de log de Samba foram movidos."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"Os ficheiros de log para ambos os daemons de Samba (nmbd e smbd) sÃ£o agora "
-"guardados em /var/log/samba/. Os nomes dos ficheiros sÃ£o respectivamente log."
-"nmbd e log.smbd, para o nmbd e smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 automaticamente "
-"movidos para a nova localizaÃ§Ã£o."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-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:3001
-msgid ""
-"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 ""
-"Este sistema foi anteriormente configurado para iniciar o nmbd e smbd a "
-"partir de inetd. Nas versÃµes recentes do Samba, o nmbd nÃ£o pode ser iniciado "
-"a partir do inetd. Se modificou o seu script de inicializaÃ§Ã£o /etc/init.d/"
-"samba, poderÃ¡ ter de o ajustar agora de modo a que o nmbd inicie."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "MÃ©todo de execuÃ§Ã£o do Samba:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Como deseja correr o Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -301,13 +198,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -317,7 +214,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -327,20 +224,3 @@
 "automaticamente migrado para /var/lib/samba/passdb.tdb.  NÃ£o escolha esta "
 "opÃ§Ã£o se em vez disso planeia utilizar outro backend pdb (e.g., LDAP)."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "Ficheiro de configuraÃ§Ã£o reescrito pelo SWAT"
-
-#~ msgid ""
-#~ "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 ficheiro smb.conf. IrÃ¡ reordenar as entradas e "
-#~ "apagar todos os comentÃ¡rios, e as opÃ§Ãµes include= e copy=. Se utiliza um "
-#~ "smb.conf feito por si vocÃª deve provavlemente evitar usar 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-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/pt_BR.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,76 +14,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
-"PO-Revision-Date: 2006-06-10 13:30-0300\n"
-"Last-Translator: AndrÃ© LuÃs Lopes <andrelop at debian.org>\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"PO-Revision-Date: 2006-08-13 14:15-0700\n"
+"Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Conjunto de caracteres para sistema de arquivos Unix"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"A opÃ§Ã£o \"character set\" estÃ¡ atualmente configurada seu arquivo smb.conf. "
-"No Samba 3.0, esta opÃ§Ã£o foi substituÃda por uma nova opÃ§Ã£o, a opÃ§Ã£o \"unix "
-"charset\". Por favor, especifique o conjunto de caracteres a ser usado para "
-"essa nova opÃ§Ã£o, a qual controla como o Samba interpreta nomes de arquivos "
-"no sistema de arquivos."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr ""
-"Caso vocÃª deixe esta opÃ§Ã£o em branco, o arquivo smb.conf nÃ£o serÃ¡ modificado."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Conjunto de caracteres para clientes DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"A opÃ§Ã£o \"client code page\" estÃ¡ atualmente configurada em seu arquivo smb."
-"conf. No Samba 3.0, essa opÃ§Ã£o foi substituÃda pela opÃ§Ã£o \"dos charset\". "
-"Por favor, especifique o conjunto de caracteres que vocÃª deseja usar para "
-"essa nova opÃ§Ã£o. Note que essa opÃ§Ã£o nÃ£o Ã© necessÃ¡ria para suportar clientes "
-"Windows, mas sim vÃ¡lida somente para clientes DOS."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,7 +48,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -109,13 +57,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurar smb.conf automaticamente ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -133,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -145,50 +93,49 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome de DomÃnio/Grupo de Trabalho :"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
-"Por favor, especifique o grupo de trabalho no qual este servior irÃ¡ parecer "
-"estar quando questionado por clientes. Note que este parÃ¢metro tambÃ©m "
+"Por favor, especifique o grupo de trabalho no qual quer que este servidor "
+"pareÃ§a estar quando questionado por clientes. Note que este parÃ¢metro tambÃ©m "
 "controla o nome de DomÃnio usado com a configuraÃ§Ã£o security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Usar senhas criptografadas ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
-"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."
+"All 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."
 msgstr ""
-"A maioria dos clientes Windows comunicam-se com servidores SMB usando senhas "
-"encriptadas. Caso vocÃª queira usar senhas em texto puro vocÃª precisarÃ¡ "
-"modificar um parÃ¢metro no registro de seu Windows."
+"Todos os clientes Windows atuais comunicam-se com servidores SMB usando "
+"senhas encriptadas. Caso vocÃª queira usar senhas em texto puro vocÃª "
+"precisarÃ¡ modificar um parÃ¢metro no registro de seu Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
-#, fuzzy
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 ""
-"Escolher esta opÃ§Ã£o Ã© altamente recomendado. Caso vocÃª o faÃ§a, certifique-se "
+"Habilitar esta opÃ§Ã£o Ã© altamente recomendado. Caso vocÃª o faÃ§a, certifique-se "
 "de possuir um arquivo /etc/samba/smbpasswd e que vocÃª tenha senhas definidas "
 "no mesmo para cada usuÃ¡rio usando o comando smbpasswd."
 
@@ -212,20 +159,19 @@
 "Para ser compatÃvel com os padrÃµes na maioria das versÃµes do Windows, o "
 "Samba deve ser configurado para utilizar senhas encriptadas. Isto requer que "
 "as senhas dos usuÃ¡rios sejam armazenadas em um arquivo diferente do arquivo /"
-"etc/passwd."
+"etc/passwd. Esse arquivo pode ser criado automaticamente, mas as senhas "
+"devem ser definidas manualmente executando o utilitÃ¡rio smbpasswd e ser "
+"atualizadas futuramente."
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-#, fuzzy
 msgid ""
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"Esse arquivo pode ser criado automaticamente, mas as senhas precisarÃ£o ser "
-"adicionadas manualmente (executando o smbpasswd) e ser mantidas atualizadas "
-"futuramente. Caso vocÃª nÃ£o o crei, vocÃª terÃ¡ que reconfigurar o samba (e "
-"provalmente suas mÃ¡quinas clientes) para utilizaÃ§Ã£o de senhas em texto puro."
+"Caso vocÃª nÃ£o o crie, vocÃª terÃ¡ que reconfigurar o samba (e provavelmente "
+"suas mÃ¡quinas clientes) para utilizaÃ§Ã£o de senhas em texto puro."
 
 #. Type: boolean
 #. Description
@@ -237,70 +183,21 @@
 "Consulte o arquivo /usr/share/doc/samba-doc/htmldos/ENCRYPTION.html, "
 "fornecido pelo pacote samba-doc, para conhecer maiores detalhes."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Arquivos de log do Samba movidos"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"Os arquivos de log para ambos os daemons Samba (nmbd e smbd) sÃ£o agora "
-"armazenados no diretÃ³rio /var/log/samba/. Os nomes desses arquivos sÃ£o log."
-"nmbd e log.smbd, para o nmbd e para o smbd, respectivamente."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 "
-"automaticamente para o novo local."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-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:3001
-msgid ""
-"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 ""
-"Este sistema foi previamente configurado para iniciar os daemons nmbd e smbd "
-"a partir do inetd. Em versÃµes recentes do Samba, o nmbd nÃ£o pode mais ser "
-"iniciado a partir do inetd. Caso vocÃª tenha modificado seu script de "
-"inicializaÃ§Ã£o /etc/init.d/samba, vocÃª precisarÃ¡ ajustÃ¡-lo manualmente agora "
-"para que o nmbd seja iniciado."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "MÃ©todo de execuÃ§Ã£o do Samba :"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Como vocÃª deseja que o Samba seja executado ?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -310,13 +207,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -326,7 +223,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -337,21 +234,3 @@
 "opÃ§Ã£o caso vocÃª planeje utilizar um outro backend pdb (como LDAP, por "
 "exemplo)."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "Arquivo de configuraÃ§Ã£o reescrito pelo SWAT"
-
-#~ msgid ""
-#~ "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, vocÃª provavelmente "
-#~ "deverÃ¡ evitar utilizar 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/ro.po
===================================================================
--- trunk/po/ro.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/ro.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po_ro\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-08-10 17:49+0300\n"
 "Last-Translator: Eddy PetriÅŸor <eddy.petrisor at gmail.com>\n"
 "Language-Team: RomÃ¢nÄƒ <debian-l10n-romanian at lists.debian.org>\n"
@@ -23,71 +23,19 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1))\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Setul de caractere pentru sisteme de fiÅŸiere Unix"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"OpÅ£iunea â€žcharacter setâ€ (setul de caractere) se configureazÄƒ acum Ã®n smb."
-"conf. ÃŽn Samba 3.0, aceastÄƒ opÅ£iune este Ã®nlocuitÄƒ de una nouÄƒ, â€žunix "
-"charsetâ€ (setul de caractere unix). VÄƒ rugÄƒm sÄƒ specificaÅ£i setul de "
-"caractere pe care-l doriÅ£i pentru aceastÄƒ nouÄƒ opÅ£iune ce controleazÄƒ felul "
-"Ã®n care Samba interpreteazÄƒ numele de fiÅŸiere Ã®n sistemul de fiÅŸiere."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "DacÄƒ lÄƒsaÅ£i aceastÄƒ opÅ£iune vidÄƒ, fiÅŸierul smb.conf nu va fi schimbat."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Setul de caractere pentru clienÅ£ii DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"OpÅ£iunea â€žclient code pageâ€ (pagina de coduri a clientului) se configureazÄƒ "
-"acum Ã®n smb.conf. ÃŽn Samba 3.0, aceastÄƒ opÅ£iune este Ã®nlocuitÄƒ de opÅ£iunea "
-"â€ždos charsetâ€ (setul de caractere DOS). VÄƒ rugÄƒm sÄƒ specificaÅ£i setul de "
-"caractere pe care-l doriÅ£i pentru aceastÄƒ nouÄƒ opÅ£iune. ÃŽn cele mai multe "
-"cazuri valoarea implicitÄƒ aleasÄƒ deja pentru dvs. va fi suficientÄƒ. A se "
-"reÅ£ine cÄƒ aceastÄƒ opÅ£iune nu este necesarÄƒ pentru a ofri suport pentru "
-"clienÅ£ii Windows, este necesarÄƒ doar pentru clienÅ£ii DOS."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Se modificÄƒ smb.conf pentru a folosi configuraÅ£iile WINS din DHCP?"
 
 # RO: prefer sÄƒ nu folosesc termeni de genul â€žcalculatorul dvs.â€; de multe ori nu e cazul ÅŸi sunÄƒ mai puÅ£in profesional.
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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,21 +51,22 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
+#: ../samba-common.templates:1001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Pachetul dhcp3-client trebuie sÄƒ fie instalat pentru a beneficia de aceastÄƒ "
 "facilitate."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Se configurÄƒ smb.conf automat?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -136,7 +85,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -148,17 +97,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Grupul de lucru/Numele de domeniu:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "VÄƒ rugÄƒm sÄƒ specificaÅ£i grupul de lucru de care acest server va aparÅ£ine "
 "cÃ¢nd va fi chestionat de clienÅ£i. A se reÅ£ine cÄƒ acest parametru controleazÄƒ "
@@ -166,17 +116,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Se folosc parole criptate? "
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "Cei mai mulÅ£i clienÅ£i Windows comunicÄƒ cu serverele SMB folosind parole "
 "criptate. DacÄƒ doriÅ£i sÄƒ folosiÅ£i parole necriptate, va trebui sÄƒ schimbaÅ£i "
@@ -184,7 +135,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
@@ -212,7 +163,9 @@
 msgstr ""
 "Pentru compatibilitate cu majoritatea versiunilor de Windows, Samba trebuie "
 "sÄƒ fie configuratÄƒ sÄƒ foloseascÄƒ parole criptate. Acest lucru necesitÄƒ ca "
-"parolele utilizatorilor sÄƒ fie stocate Ã®n alt fiÅŸier decÃ¢t /etc/passwd.  Acest fiÅŸier poate fi creat automat, dar parolele trebuie sÄƒ fie adÄƒugate manual prin rularea comenzii smbpasswd ÅŸi prin pÄƒstrarea la zi a acestuia."
+"parolele utilizatorilor sÄƒ fie stocate Ã®n alt fiÅŸier decÃ¢t /etc/passwd.  "
+"Acest fiÅŸier poate fi creat automat, dar parolele trebuie sÄƒ fie adÄƒugate "
+"manual prin rularea comenzii smbpasswd ÅŸi prin pÄƒstrarea la zi a acestuia."
 
 #. Type: boolean
 #. Description
@@ -221,8 +174,8 @@
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"DacÄƒ nu-l creaÅ£i, va trebui sÄƒ reconfiguraÅ£i Samba (probabil ÅŸi calculatoarele client) "
-"sÄƒ foloseascÄƒ parole necriptate."
+"DacÄƒ nu-l creaÅ£i, va trebui sÄƒ reconfiguraÅ£i Samba (probabil ÅŸi "
+"calculatoarele client) sÄƒ foloseascÄƒ parole necriptate."
 
 #. Type: boolean
 #. Description
@@ -234,67 +187,21 @@
 "A se vedea /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html din pachetul "
 "samba-doc pentru mai multe detalii."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Jurnalele lui Samba au fost mutate"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"Jurnalele atÃ¢t pentru demonii Samba (nmbd ÅŸi smbd) sunt stocate acum Ã®n var/"
-"log/samba/. Numele fiÅŸierelor sunt log.nmbd ÅŸi log.smbd, pentru nmbd ÅŸi "
-"respectiv smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr "Vechile fiÅŸiere jurnal din /var/log/ vor fi mutate automat Ã®n noul loc."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "Rularea nmbd din inetd nu mai este posibilÄƒ"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 ""
-"Acest sistem a fost anterior configurat sÄƒ porneascÄƒ nmbd ÅŸi smbd din inetd. "
-"ÃŽn versiunile recente de Samba nmbd nu mai poate fi pornit din inetd. DacÄƒ "
-"aÅ£i modificat fiÅŸierul-script de pornire /etc/init.d/samba, probabil cÄƒ va "
-"trebui sÄƒ-l modificaÅ£i ca nmbd sÄƒ porneascÄƒ."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "demoni, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Metoda de rulare a Samba:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -304,13 +211,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Se mutÄƒ /etc/samba/smbpasswd Ã®n /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -320,7 +227,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/ru.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba-3.0.23rc1-1_ru\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-05-29 22:08+1000\n"
 "Last-Translator: Yuriy Talakan' <yt at amur.elektra.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -14,65 +14,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "ÐšÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Unix"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñƒ Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð¾Ð¿Ñ†Ð¸Ñ \"character set\" Ð² smb.conf. Ð’ Samba 3.0 ÑÑ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ "
-"Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð° Ð½Ð¾Ð²Ð¾Ð¹ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹, \"unix charset\". Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÑƒ, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð²Ñ‹ "
-"Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ð½Ð¾Ð²Ð¾Ð¹ Ð¾Ð¿Ñ†Ð¸Ð¸. ÐžÐ½Ð° Ð¾Ñ‚Ð²ÐµÑ‡Ð°ÐµÑ‚ Ð·Ð° Ñ‚Ð¾, ÐºÐ°Ðº Samba "
-"Ð¸Ð½Ñ‚ÐµÑ€Ð¿Ñ€ÐµÑ‚Ð¸Ñ€ÑƒÐµÑ‚ Ð¸Ð¼ÐµÐ½Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð² Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ ÑÑ‚Ñƒ Ð¾Ð¿Ñ†Ð¸ÑŽ Ð¿ÑƒÑÑ‚Ð¾Ð¹, Ð²Ð°Ñˆ Ñ„Ð°Ð¹Ð» smb.conf Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "ÐšÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° Ð´Ð»Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñƒ Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð¾Ð¿Ñ†Ð¸Ñ \"client code page\" Ð² smb.conf. Ð’ Samba 3.0 ÑÑ‚Ð° "
-"Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð° Ð½Ð° \"dos charset\". Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÑƒ, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð²Ñ‹ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ "
-"Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ð½Ð¾Ð²Ð¾Ð¹ Ð¾Ð¿Ñ†Ð¸Ð¸. Ð’ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ ÑÐ»ÑƒÑ‡Ð°ÐµÐ² Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ "
-"ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð±ÑƒÐ´ÐµÑ‚ Ð´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾. ÐžÐ±Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ, Ñ‡Ñ‚Ð¾ ÑÑ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ Ð½Ðµ Ð½ÑƒÐ¶Ð½Ð° Ð´Ð»Ñ "
-"Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² Windows, Ð¾Ð½Ð° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² DOS."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ smb.conf Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº WINS Ð¸Ð· DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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 "
@@ -88,7 +38,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -97,13 +47,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ smb.conf Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -121,7 +71,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -133,17 +83,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Ð˜Ð¼Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹/Ð´Ð¾Ð¼ÐµÐ½Ð°?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "Ð—Ð°Ð´Ð°Ð¹Ñ‚Ðµ Ñ€Ð°Ð±Ð¾Ñ‡ÑƒÑŽ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¿Ð¾ÑÐ²Ð¸Ñ‚ÑÑ Ð²Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€. ÐžÐ±Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ, "
 "Ñ‡Ñ‚Ð¾ ÑÑ‚Ð¾Ñ‚ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ Ñ‚Ð°ÐºÐ¶Ðµ Ð·Ð°Ð´Ð°ÐµÑ‚ Ð¸Ð¼Ñ Ð´Ð¾Ð¼ÐµÐ½Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð¿Ñ€Ð¸ "
@@ -151,17 +102,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð°Ñ†Ð¸ÑŽ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "Ð‘Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ð¾ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² Windows Ð¾Ð±Ñ‰Ð°ÑŽÑ‚ÑÑ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°Ð¼Ð¸ SMB Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ "
 "ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð¾Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ð¸, Ð²Ð°Ð¼ "
@@ -169,7 +121,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -224,68 +176,21 @@
 "Ð‘Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾ ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ Ð² /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
 "Ð¸Ð· Ð¿Ð°ÐºÐµÑ‚Ð° samba-doc."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "log-Ñ„Ð°Ð¹Ð»Ñ‹ Samba Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ð»Ð¸ÑÑŒ."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 (nmbd Ð¸ smbd) Ñ…Ñ€Ð°Ð½ÑÑ‚ÑÑ Ñ‚ÐµÐ¿ÐµÑ€ÑŒ Ð² /var/log/"
-"samba/. Ð¤Ð°Ð¹Ð»Ñ‹ Ð½Ð°Ð·Ñ‹Ð²Ð°ÑŽÑ‚ÑÑ log.nmbd Ð¸ log.smbd Ð´Ð»Ñ nmbd Ð¸ smbd ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÐµÐ½Ð½Ð¾."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr ""
-"Ð¡Ñ‚Ð°Ñ€Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð¾Ð² Ð±ÑƒÐ´ÑƒÑ‚ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ñ‹ Ð¸Ð· /var/log/ Ð² Ð½Ð¾Ð²Ð¾Ðµ "
-"Ð¼ÐµÑÑ‚Ð¾."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "Ð—Ð°Ð¿ÑƒÑÐº nmbd Ð¸Ð· inetd Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 Ð² "
-"Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ… Ð²ÐµÑ€ÑÐ¸ÑÑ… Samba Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ Ð·Ð°Ð¿ÑƒÑÐºÐ°ÐµÑ‚ÑÑ Ð¸Ð· inetd. Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð»Ð¸ Ð²Ð°Ñˆ "
-"ÑÑ‚Ð°Ñ€Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÐºÑ€Ð¸Ð¿Ñ‚ /etc/init.d/samba, Ñ‚Ð¾ Ð²Ð°Ð¼ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¾Ñ‚ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐµÐ³Ð¾ "
-"Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ nmbd Ð·Ð°Ð¿ÑƒÑÐºÐ°Ð»ÑÑ."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Ð¡Ð¿Ð¾ÑÐ¾Ð± Ð·Ð°Ð¿ÑƒÑÐºÐ° Samba:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "ÐšÐ°Ðº Ð²Ñ‹ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð·Ð°Ð¿ÑƒÑÐºÐ°Ñ‚ÑŒ Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -295,13 +200,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -311,7 +216,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -321,14 +226,3 @@
 "passdb.tdb?  Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð»Ð°Ð½Ð¸Ñ€ÑƒÐµÑ‚Ðµ Ð²Ð¼ÐµÑÑ‚Ð¾ Ð½ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ "
 "pdb (Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, LDAP), Ð²Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð·Ð´ÐµÑÑŒ 'Ð½ÐµÑ‚'."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "SWAT Ð¿ÐµÑ€ÐµÐ¿Ð¸ÑˆÐµÑ‚ Ñ„Ð°Ð¹Ð» Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº"
-
-#~ msgid ""
-#~ "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."

Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/sv.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.20b-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-06-01 00:19+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -22,66 +22,15 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Teckenuppsättning för UNIX-filsystem"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"Alternativet \"character set\" är konfigurerat i din smb.conf.  I Samba 3.0 "
-"är detta alternativ ersatt av en nytt alternativ, \"unix charset\". Ange den "
-"teckenuppsättning du önskar att använda för detta alternativ, vilken "
-"kontrollerar hur Samba tolkar filnamn på filsystemet."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr ""
-"Om du lämnar detta alternativ blankt kommer din smb.conf inte att ändras."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Teckenuppsättning för DOS-klienter"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"Alternativet \"client code page\" är konfigurerat i din smb.conf.  I Samba "
-"3.0 är detta alternativ ersatt med \"dos charset\".  Ange den "
-"teckenuppsättning du önskar använda för detta alternativ.  I de flesta fall "
-"är standardvärdet tillräckligt.  Notera att detta alternativ inte krävs för "
-"att erbjuda stöd för Windows-klienter utan endast för DOS-klienter."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,7 +46,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -105,13 +54,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Konfigurera smb.conf automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -129,7 +78,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -141,17 +90,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "Arbetsgrupp/Domännamn:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "Ange vilken arbetsgrupp som denna server ska synas i när klienterna frågar. "
 "Notera att denna parameter också kontrollerar domännamnet som används med "
@@ -159,17 +109,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Använd lösenordskryptering?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "De flesta Windows-klienter kommunicerar med SMB-servrar med krypterade "
 "lösenord. Om du vill använda lösenord i klartext behöver du ändra en "
@@ -177,7 +128,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -232,69 +183,21 @@
 "Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html från paketet samba-doc "
 "för mer information."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Sambas loggfiler har flyttats"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"Loggfilerna för de båda Samba-demonerna (nmbd och smbd) lagras nu i /var/log/"
-"samba/. Namnen på filerna är log.nmbd och log.smbd för respektive nmbd och "
-"smbd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr ""
-"De gamla loggfilerna från /var/log kommer att flyttas automatiskt till den "
-"nya platsen."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "Köra nmbd från inetd stöds inte längre"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 och smbd från inetd.  "
-"I senare Samba-versioner kan nmbd inte startas från inetd.  Om du har "
-"modifierat ditt startskript /etc/init.d/samba måste du kanske justera den "
-"för hand nu så att nmbd kan starta."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "demoner, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Körmetod för Samba:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Hur vill du köra Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -304,13 +207,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -320,7 +223,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -330,21 +233,3 @@
 "passdb.tdb.  Välj inte detta alternativ om du istället planerar att använda "
 "ett annat pdb-baksystem (till exempel LDAP)."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "Konfigurationsfilen omskriven av SWAT"
-
-#~ msgid ""
-#~ "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 smb.conf. Den kommer att arrangera om "
-#~ "raderna och radera alla kommentarer, alternativen include= och copy= . Om "
-#~ "du har en känslig och välstrukturerad smb.conf bör du undvika att använda "
-#~ "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-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/templates.pot	2006-08-13 23:38:25 UTC (rev 1123)
@@ -1,22 +1,14 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\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"
@@ -24,56 +16,15 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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 "
@@ -84,20 +35,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -109,7 +60,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -118,37 +69,37 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
-"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."
+"All 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."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
@@ -188,60 +139,21 @@
 "package for more details."
 msgstr ""
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -249,13 +161,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -263,7 +175,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "

Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/tr.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\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"
@@ -14,64 +14,9 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Unix dosya sistemi iÃ§in karakter seti"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-#, fuzzy
-msgid ""
-"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 ""
-"HalihazÄ±rda smb.conf yapÄ±landÄ±rma dosyanÄ±zda \"character set\" ayarÄ± mevcut. "
-"Samba 3.0'da bu seÃ§enek yenisiyle: \"unix charset\" ile deÄŸiÅŸtirildi. LÃ¼tfen "
-"Samba'nÄ±n sistemdeki dosya isimlerini Ã§evirirken dikkate aldÄ±ÄŸÄ± bu yeni "
-"seÃ§enekle kullanÄ±lmasÄ±nÄ± istediÄŸiniz karakter setini girin."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-#, 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: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "DOS istemcileri iÃ§in karakter seti"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-#, fuzzy
-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 ""
-"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.  "
-"LÃ¼tfen bu yeni seÃ§enekle beraber kullanmak iÃ§in bir karakter seti seÃ§in.  "
-"Ã‡oÄŸu durumda Ã¶ntanÄ±mlÄ± olarak seÃ§ilmiÅŸ bulunan seÃ§enek uygundur.  AklÄ±nÄ±zda "
-"bulunsun bu seÃ§enek Windows istemcilerini desteklemek iÃ§in gerekli deÄŸildir, "
-"sadece DOS istemcileri iÃ§indir.  EÄŸer bu seÃ§eneÄŸi boÅŸ bÄ±rakÄ±rsanÄ±z smb.conf "
-"dosyanÄ±z deÄŸiÅŸtirilmeyecektir."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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 "
@@ -79,7 +24,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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 "
@@ -95,7 +40,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 #, fuzzy
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
@@ -105,14 +50,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid "Configure smb.conf automatically?"
 msgstr "\"smb.conf\" dosyasÄ± debconf ile yapÄ±landÄ±rÄ±lsÄ±n mÄ±?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
@@ -131,7 +76,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "If you do not choose this option, you will have to handle any configuration "
@@ -146,19 +91,19 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid "Workgroup/Domain Name:"
 msgstr "Ã‡alÄ±ÅŸma Grubu/Etki AlanÄ± Ä°smi?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "Bu ayar, sunucunuzun istemciler tarafÄ±ndan sorgulandÄ±ÄŸÄ±nda hangi Ã‡alÄ±ÅŸma "
 "Grubu iÃ§erisinde gÃ¶zÃ¼keceÄŸini kontrol eder. AklÄ±nÄ±zda bulunsun, bu parametre "
@@ -167,18 +112,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Parola ÅŸifrelenmesi kullanÄ±lsÄ±n mÄ±?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "Yeni Windows istemcileri SBM sunucularÄ±yla ÅŸifrelenmiÅŸ parolalar kullanarak "
 "iletiÅŸim kurarlar. EÄŸer dÃ¼z metin parolalarÄ± kullanmak istiyorsanÄ±z Windows "
@@ -189,7 +134,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "Enabling this option is highly recommended. If you do, make sure you have a "
@@ -246,74 +191,21 @@
 "package for more details."
 msgstr ""
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid "Samba's log files moved"
-msgstr "Samba'nÄ±n gÃ¼nce dosyalarÄ± taÅŸÄ±ndÄ±."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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 "
-"dosyalarÄ±n isimleri nmbd ve smbd iÃ§in sÄ±rasÄ±yla log.nmbd ve log.smbd'dir."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-#, fuzzy
-msgid ""
-"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:3001
-#, 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:3001
-#, fuzzy
-msgid ""
-"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 "
-"Ã§alÄ±ÅŸtÄ±rÄ±lmÄ±yor.  EÄŸer /etc/init.d/samba baÅŸlangÄ±Ã§ betiÄŸini kendiniz "
-"dÃ¼zenlediyseniz, nmbd'nin Ã§alÄ±ÅŸabilmesi iÃ§in bu dosyayÄ± elle ayarlamak "
-"zorunda kalabilirsiniz."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "artalan sÃ¼reÃ§leri, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr ""
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Samba'nÄ±n nasÄ±l Ã§alÄ±ÅŸmasÄ±nÄ± istersiniz?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -323,13 +215,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -337,7 +229,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 #, fuzzy
 msgid ""
 "Please confirm whether you would like the existing smbpasswd file to be "
@@ -350,19 +242,3 @@
 "baÅŸka bir pdb arkayÃ¼zÃ¼ (Ã¶r. LDAP) kullanmayÄ± planlÄ±yorsanÄ±z, burada 'hayÄ±r' "
 "cevabÄ±nÄ± vermelisiniz."
 
-#, fuzzy
-#~ msgid ""
-#~ "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-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/vi.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.23rc1-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-08-05 22:20+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -16,70 +16,15 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Bá»™ kÃ½ tá»± cho há»‡ thá»‘ng táºp tin UNIX"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"TÃ¹y chá»n Â« character set Â» (bá»™ kÃ½ tá»±) hiá»‡n thá»i Ä‘Æ°á»£c cáº¥u hÃ¬nh trong táºp tin "
-"Â« smb.conf Â». Trong Samba phiÃªn báº£n 3.0, tÃ¹y chá»n nÃ y bá»‹ thay tháº¿ báº±ng má»™t "
-"tÃ¹y chá»n má»›i, Â« unix charset Â» (bá»™ kÃ½ tá»± UNIX: 'charset' lÃ  viáº¿t táº¯t cho "
-"'character set'). Báº¡n hÃ£y xÃ¡c Ä‘á»‹nh bá»™ kÃ½ tá»± nÃ o báº¡n muá»‘n sá» dá»¥ng cho tÃ¹y "
-"chá»n má»›i nÃ y, mÃ  Ä‘iá»u khiá»ƒn cÃ¡ch Samba giáº£i thÃch tÃªn táºp tin trong há»‡ thá»‘ng "
-"táºp tin nÃ y."
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-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 táºp tin cáº¥u hÃ¬nh Â« smb.conf Â» sáº½ khÃ´ng Ä‘Æ°á»£c "
-"thay Ä‘á»•i."
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "Bá»™ kÃ½ tá»± cho á»©ng dá»¥ng khÃ¡ch DOS"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"TÃ¹y chá»n Â« client code page Â» (trang mÃ£ khÃ¡ch) hiá»‡n thá»i Ä‘Æ°á»£c cáº¥u hÃ¬nh trong "
-"táºp tin Â« smb.conf Â». Trong Samba phiÃªn báº£n 3.0, tÃ¹y chá»n nÃ y bá»‹ thay tháº¿ "
-"báº±ng tÃ¹y chá»n Â« dos charset Â» (bá»™ kÃ½ tá»± DOS). Báº¡n hÃ£y xÃ¡c Ä‘á»‹nh bá»™ kÃ½ tá»± nÃ o "
-"báº¡n muá»‘n sá» dá»¥ng cho tÃ¹y chá»n má»›i nÃ y. Trong pháº§n lá»›n trÆ°á»ng há»£p, giÃ¡ trá»‹ "
-"máº·c Ä‘á»‹nh lÃ  Ä‘Ãºng. HÃ£y ghi chÃº ráº±ng khÃ´ng cáº§n thiáº¿t tÃ¹y chá»n nÃ y Ä‘á»ƒ há»— trá»£ "
-"á»©ng dá»¥ng khÃ¡ch Windows: chá»‰ á»©ng dá»¥ng khÃ¡ch DOS cáº§n thiáº¿t nÃ³ thÃ´i."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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:3001
+#: ../samba-common.templates:1001
 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,20 +41,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "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 Â« dhcp3-client Â»."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "Cáº¥u hÃ¬nh tá»± Ä‘á»™ng táºp tin Â« smb.conf Â» khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -127,7 +72,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -138,17 +83,18 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "TÃªn nhÃ³m lÃ m viá»‡c/miá»n:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "HÃ£y xÃ¡c Ä‘á»‹nh nhÃ³m lÃ m viá»‡c nÆ¡i cÃ³ váº» náº±m trÃ¬nh phá»¥c vá»¥ nÃ y, khi á»©ng dá»¥ng "
 "khÃ¡ch yÃªu cáº§u. HÃ£y ghi chÃº ráº±ng tham sá»‘ nÃ y cÅ©ng Ä‘iá»u khiá»ƒn tÃªn Miá»n Ä‘Æ°á»£c "
@@ -156,17 +102,18 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "Sá» dá»¥ng kháº£ nÄƒng máºt mÃ£ hoÃ¡ máºt kháº©u khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "Pháº§n lá»›n á»©ng dá»¥ng khÃ¡ch Windows liÃªn láº¡c vá»›i trÃ¬nh phá»¥c vá»¥ SMB báº±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Ã³ "
@@ -175,7 +122,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
@@ -227,69 +174,21 @@
 "Xem tÃ i liá»‡u </usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html> tá»« gÃ³i "
 "samba-doc Ä‘á»ƒ tÃ¬m chi tiáº¿t."
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "CÃ¡c táºp tin báº£n ghi Samba Ä‘Ã£ di chuyá»ƒn"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 ""
-"CÃ¡c táºp tin báº£n ghi cá»§a cáº£ hai trÃ¬nh ná»n Samba (nmbd vÃ  smbd) lÃºc nÃ y Ä‘Æ°á»£c "
-"cáº¥t giá»¯ trong </var/log/samba/>. Hai táºp tin báº£n ghi Ä‘Ã³ cÃ³ tÃªn <log.nmbd> vÃ  "
-"<log.smbd>, cho trÃ¬nh ná»n nmbd vÃ  smbd riÃªng tá»«ng cÃ¡i."
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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Å© Ä‘Ã£ náº±m trong </var/log/> sáº½ Ä‘Æ°á»£c di chuyá»ƒn sang vá»‹ "
-"trÃ má»›i."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "KhÃ´ng cÃ²n há»— trá»£ láº¡i kháº£ nÄƒng cháº¡y trÃ¬nh ná»n nmbd tá»« inetd."
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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 ""
-"LÃºc trÆ°á»›c, há»‡ thá»‘ng nÃ y Ä‘Æ°á»£c cáº¥u hÃ¬nh Ä‘á»ƒ khá»Ÿi cháº¡y trÃ¬nh ná»n nmbd vÃ  smbd tá»« "
-"inetd. Trong cÃ¡c phiÃªn báº£n Samba gáº§n Ä‘Ã¢y, khÃ´ng thá»ƒ khá»Ÿi cháº¡y nmbd tá»« inetd. "
-"Náº¿u báº¡n Ä‘Ã£ sá»a Ä‘á»•i táºp lá»‡nh khá»Ÿi cháº¡y </etc/init.d/samba> cá»§a mÃ¬nh, cÃ³ láº½ "
-"báº¡n cáº§n pháº£i Ä‘iá»u chá»‰nh nÃ³ Ä‘á»ƒ mÃ  nmbd sáº½ khá»Ÿi cháº¡y Ä‘Æ°á»£c."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "trÃ¬nh ná»n, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "CÃ¡ch cháº¡y Samba:"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Báº¡n cÃ³ muá»‘n cháº¡y Samba nhÆ° tháº¿ nÃ o?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -299,7 +198,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr ""
 "Di chuyá»ƒn táºp tin </etc/samba/smbpasswd> sang </var/lib/samba/passdb.tdb> "
@@ -307,7 +206,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -317,7 +216,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -327,21 +226,3 @@
 "tá»± Ä‘á»™ng sang </var/lib/samba/passdb.tdb>. Äá»«ng báºt tÃ¹y chá»n nÃ y náº¿u báº¡n Ä‘á»‹nh "
 "sá» dá»¥ng má»™t háºu phÆ°Æ¡ng PBD khÃ¡c (v.d. LDAP) thay tháº¿."
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "Táºp tin cáº¥u hÃ¬nh bá»‹ ghi láº¡i bá»Ÿi SWAT"
-
-#~ msgid ""
-#~ "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>. NÃ³ sáº½ sáº¯p xáº¿p láº¡i cÃ¡c má»¥c nháºp náº±m "
-#~ "trong nÃ³, vÃ  xÃ³a bá» má»i chÃº thÃch vÃ  tÃ¹y chon bao gá»“m Â«nclude= Â» vÃ  sao "
-#~ "chÃ©p Â« copy= Â». Náº¿u báº¡n sá» dá»¥ng táºp tin <smb.conf> riÃªng, ráº¥t cÃ³ thá»ƒ lÃ  "
-#~ "báº¡n nÃªn trÃ¡nh 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/po/zh_CN.po
===================================================================
--- trunk/po/zh_CN.po	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/po/zh_CN.po	2006-08-13 23:38:25 UTC (rev 1123)
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.0.22-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-03 20:39-0500\n"
+"Report-Msgid-Bugs-To: peloy at debian.org\n"
+"POT-Creation-Date: 2006-08-13 12:55-0700\n"
 "PO-Revision-Date: 2006-08-12 01:17+1200\n"
 "Last-Translator: Carlos Z.F. Liu <carlosliu at users.sourceforge.ent>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb at lists.debian.org>\n"
@@ -27,63 +27,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid "Character Set for Unix filesystem"
-msgstr "Unix æ–‡ä»¶ç³»ç»Ÿçš„å—ç¬¦é›†"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001
-msgid ""
-"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 ""
-"â€œcharacter setâ€(å—ç¬¦é›†) é€‰é¡¹å·²ç»åœ¨ smb.conf ä¸è®¾å®šã€‚Samba 3.0 ä¸ï¼Œæ¤é€‰é¡¹è¢«ä¸€"
-"ä¸ªæ–°çš„é€‰é¡¹â€œunix charsetâ€æ‰€å–ä»£ã€‚è¯·ä¸ºæ–°é€‰é¡¹æŒ‡å®šæ‚¨æƒ³è¦ä½¿ç”¨çš„å—ç¬¦é›†ï¼Œè¿™å°†æŽ§åˆ¶ "
-"Samba è§£è¯»æ–‡ä»¶ç³»ç»Ÿä¸Šçš„æ–‡ä»¶åçš„æ–¹å¼ã€‚"
-
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../samba-common.templates:1001 ../samba-common.templates:2001
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "å¦‚æžœæ‚¨å°†æ¤é€‰é¡¹ç½®ç©ºï¼Œsmb.conf å°†ä¸ä¼šè¢«ä¿®æ”¹ã€‚"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-msgid "Character Set for DOS clients"
-msgstr "DOS å®¢æˆ·ç«¯çš„å—ç¬¦é›†"
-
-#. Type: string
-#. Description
-#: ../samba-common.templates:2001
-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 ""
-"â€œclient code pageâ€(å®¢æˆ·ç«¯ä»£ç é¡µ) é€‰é¡¹å·²ç»åœ¨ smb.conf ä¸è®¾å®šã€‚åœ¨ Samba 3.0 "
-"ä¸ï¼Œæ¤é€‰é¡¹å·²è¢«â€œdos charsetâ€(dos å—ç¬¦é›†) é€‰é¡¹æ‰€å–ä»£ã€‚è¯·ä¸ºæ–°é€‰é¡¹æŒ‡å®šæ‚¨æƒ³è¦ä½¿ç”¨"
-"çš„å—ç¬¦é›†ã€‚åœ¨å¤§å¤šæ•°æƒ…å†µä¸‹ï¼Œé»˜è®¤çš„é€‰æ‹©å°±è¶³å¤Ÿäº†ã€‚è¯·æ³¨æ„ï¼Œæ¤é€‰é¡¹å¹¶ä¸æ˜¯æ”¯æŒ "
-"Windows å®¢æˆ·ç«¯æ‰€éœ€è¦çš„ï¼Œè¿™ä»…ç”¨äºŽ DOS å®¢æˆ·ç«¯ã€‚"
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "è¦ä¿®æ”¹ smb.conf ä»¥ä½¿ç”¨ä»Ž DHCP èŽ·å¾—çš„ WINS è®¾å®šå—ï¼Ÿ"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 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,20 +49,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:1001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "å¿…é¡»å®‰è£… dhcp3-client è½¯ä»¶åŒ…ï¼Œæ‰èƒ½ä½¿ç”¨æ¤é¡¹ç‰¹æ€§ã€‚"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
 msgstr "è‡ªåŠ¨é…ç½® smb.conf å—ï¼Ÿ"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 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 "
@@ -126,7 +78,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:2001
 msgid ""
 "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 "
@@ -137,41 +89,43 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
 msgstr "å·¥ä½œç»„/åŸŸåï¼š"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:5001
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"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."
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
 msgstr ""
 "è¯·æŒ‡å®šæœ¬æœåŠ¡å™¨åœ¨æ”¶åˆ°å®¢æˆ·ç«¯æŸ¥è¯¢æ—¶å°†è¦æ˜¾ç¤ºçš„å·¥ä½œç»„ã€‚è¯·æ³¨æ„ï¼Œæ¤å‚æ•°åŒæ ·ä¹ŸæŽ§åˆ¶äº† "
 "security=demain è®¾ç½®æ‰€ç”¨çš„åŸŸåã€‚"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid "Use password encryption?"
 msgstr "ä½¿ç”¨å£ä»¤åŠ å¯†å—ï¼Ÿ"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"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."
+"All 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."
 msgstr ""
 "å¤§å¤šæ•° Windows clients ä½¿ç”¨åŠ å¯†çš„å£ä»¤ä¸Ž SMB æœåŠ¡å™¨é€šè®¯ã€‚å¦‚æžœæ‚¨æƒ³ä½¿ç”¨æ˜Žæ–‡å¯†"
 "ç ï¼Œæ‚¨å°†éœ€è¦ä¿®æ”¹æ‚¨çš„ Windows æ³¨å†Œè¡¨ä¸çš„ä¸€ä¸ªå‚æ•°ã€‚"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:6001
+#: ../samba-common.templates:4001
 msgid ""
 "Enabling 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 "
@@ -220,65 +174,21 @@
 "æ›´å¤šè¯¦æƒ…ï¼Œè¯·å‚é˜… smaba-doc è½¯ä»¶åŒ…ä¸çš„ /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.htmlã€‚"
 
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid "Samba's log files moved"
-msgstr "Samba æ—¥å¿—æ–‡ä»¶è¢«ç§»åŠ¨äº†"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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 å®ˆæŠ¤è¿›ç¨‹ (nmbd å’Œ smbd) çš„æ—¥å¿—æ–‡ä»¶çŽ°åœ¨è¢«å˜æ”¾åœ¨ /var/log/samba/ "
-"ä¸ã€‚å¯¹åº”äºŽ nmbd å’Œ smbdï¼Œæ–‡ä»¶åç§°åˆ†åˆ«ä¸º log.nmbd å’Œ log.smbdã€‚"
-
-#. Type: note
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"The old log files from /var/log/ will automatically be moved to the new "
-"location."
-msgstr "/var/log ä¸çš„æ—§æ—¥å¿—æ–‡ä»¶ å°†ä¼šè‡ªåŠ¨ç§»åˆ°æ–°ä½ç½®ã€‚"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid "Running nmbd from inetd no longer supported"
-msgstr "åœ¨ inetd ä¸è¿è¡Œ nmbd ä¸å†è¢«æ”¯æŒ"
-
-#. Type: note
-#. Description
-#: ../samba.templates:3001
-msgid ""
-"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ã€‚åœ¨æ–°è¿‘çš„ Samba ç‰ˆæœ¬ä¸ï¼Œnmbd "
-"ä¸å†èƒ½å¤Ÿä»Ž inetd å¯åŠ¨ã€‚å¦‚æžœæ‚¨ä¿®æ”¹è¿‡ /etc/init.d/samba å¯åŠ¨è„šæœ¬ï¼Œæ‚¨çŽ°åœ¨å¯èƒ½éœ€"
-"è°ƒæ•´å®ƒä»¥è®© nmbd èƒ½å¤Ÿå¯åŠ¨ã€‚"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:4001
+#: ../samba.templates:2001
 msgid "daemons, inetd"
 msgstr "å®ˆæŠ¤è¿›ç¨‹, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
-msgid "Samba run method:"
-msgstr "Samba è¿è¡Œæ¨¡å¼ï¼š"
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:4002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
@@ -288,13 +198,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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:5001
+#: ../samba.templates:3001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -304,7 +214,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:5001
+#: ../samba.templates:3001
 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 "
@@ -313,14 +223,3 @@
 "è¯·ç¡®å®šæ‚¨æ˜¯å¦æƒ³å°†çŽ°æœ‰çš„ smbpasswd æ–‡ä»¶è‡ªåŠ¨ç§»æ¤ä¸º /var/lib/samba/passdb.tdbã€‚å¦‚"
 "æžœæ‚¨è®¡åˆ’ä½¿ç”¨å…¶å®ƒçš„ pdb åŽç«¯ (å¦‚ LDAP) çš„è¯ï¼Œè¯·ä¸è¦é€‰ä¸æ¤é€‰é¡¹ã€‚"
 
-#~ msgid "Configuration file rewritten by SWAT"
-#~ msgstr "é…ç½®æ–‡ä»¶è¢« SWAT é‡å†™"
-
-#~ msgid ""
-#~ "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ã€‚"

Modified: trunk/samba-common.config
===================================================================
--- trunk/samba-common.config	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/samba-common.config	2006-08-13 23:38:25 UTC (rev 1123)
@@ -76,11 +76,6 @@
 		db_set samba-common/encrypt_passwords "$ENCRYPT"
 	fi
 
-	CHARSET=`smbconf_retr "character set"`
-	CODEPAGE=`smbconf_retr "client code page"`
-	UNIXCHARSET=`smbconf_retr "unix charset"`
-	DOSCHARSET=`smbconf_retr "dos charset"`
-
 	# If we're upgrading from an old version and there's no
 	# 'passdb backend' setting, add one.
 	if [ "$1" = "configure" -a -n "$2" ] \
@@ -108,25 +103,6 @@
 db_input medium samba-common/encrypt_passwords || true
 db_go
 
-# Handle migrating character sets
-if [ -n "$CHARSET" -a -z "$UNIXCHARSET" ]
-then
-	UNIXCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'`
-	db_set samba-common/character_set "$UNIXCHARSET"
-	# FIXME: should eventually be low.
-	db_input medium samba-common/character_set || true
-	db_go
-fi
-
-if [ -n "$CODEPAGE" -a -z "$DOSCHARSET" ]
-then
-	DOSCHARSET=CP`echo $CODEPAGE | sed -e's/[[:alpha:]]*//g'`
-	db_set samba-common/codepage "$DOSCHARSET"
-	# FIXME: should eventually be low.
-	db_input medium samba-common/codepage || true
-	db_go
-fi
-
 DHCPPRIORITY=medium
 #if [ "$DEBCONF_RECONFIGURE" = 1 ] && [ -f /sbin/dhclient3 ]
 if [ -f /sbin/dhclient3 ]

Modified: trunk/samba-common.postinst
===================================================================
--- trunk/samba-common.postinst	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/samba-common.postinst	2006-08-13 23:38:25 UTC (rev 1123)
@@ -75,23 +75,6 @@
 		db_fset samba-common/dhcp applied true
 	fi
 
-	# Update charset settings?
-	if ! grep -q "^[[:space:]]*unix charset[[:space:]]*=" /etc/samba/smb.conf
-	then
-		db_get samba-common/character_set || true
-		UNIXCHARSET="${RET}"
-		if [ -n "$UNIXCHARSET" ]
-		then
-			sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
-				s/^\([[:space:]]*\)character set/\1character set/i
-				/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ {
-					/^[[:space:]]*character set[[:space:]]*=/c \\
-   unix charset = $UNIXCHARSET
-				}" < /etc/samba/smb.conf > ${TMPFILE}
-			mv -f ${TMPFILE} /etc/samba/smb.conf
-		fi
-	fi
-
 	if grep -qi "^[[:space:]]*passdb backend[[:space:]]*=.*unixsam" /etc/samba/smb.conf
 	then
 		sed -e 's/^\([[:space:]]*\)passdb backend/\1passdb backend/i
@@ -101,22 +84,6 @@
 		mv -f ${TMPFILE} /etc/samba/smb.conf
 	fi
 
-	if ! grep -q "^[[:space:]]*dos charset[[:space:]]*=" /etc/samba/smb.conf
-	then
-		db_get samba-common/codepage || true
-		DOSCHARSET="${RET}"
-		if [ -n "$DOSCHARSET" ]
-		then
-			sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
-				s/^\([[:space:]]*\)client code page/\1client code page/i
-				/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ {
-					/^[[:space:]]*client code page[[:space:]]*=/c \\
-   dos charset = $DOSCHARSET
-}" < /etc/samba/smb.conf > ${TMPFILE}
-			mv -f ${TMPFILE} /etc/samba/smb.conf
-		fi
-	fi
-
 	if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4 \
 	   && ! grep -q "^[[:space:]]*panic action[[:space:]]*=" /etc/samba/smb.conf
 	then

Modified: trunk/samba-common.templates
===================================================================
--- trunk/samba-common.templates	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/samba-common.templates	2006-08-13 23:38:25 UTC (rev 1123)
@@ -1,24 +1,3 @@
-Template: samba-common/character_set
-Type: string
-_Description: Character Set for Unix filesystem
- 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, the smb.conf file will not be changed.
-
-Template: samba-common/codepage
-Type: string
-_Description: Character Set for DOS clients
- 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, the smb.conf file will not be changed.
-
 Template: samba-common/dhcp
 Type: boolean
 Default: false
@@ -50,15 +29,15 @@
 Template: samba-common/workgroup
 Type: string
 _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.
+ Please specify the workgroup you want this server to appear to be in
+ when queried by clients. Note that this parameter also controls the
+ domain name used with the security=domain setting.
 
 Template: samba-common/encrypt_passwords
 Type: boolean
 Default: true
 _Description: Use password encryption?
- Most Windows clients communicate with SMB servers using encrypted
+ All 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. 
  .

Modified: trunk/samba.config
===================================================================
--- trunk/samba.config	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/samba.config	2006-08-13 23:38:25 UTC (rev 1123)
@@ -46,14 +46,6 @@
 
 db_title "Samba Server"
 
-# Babysit users who don't read README.Debian
-if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.2"
-then
-	db_input medium samba/log_files_moved || true
-	db_go
-fi
-
-
 # We first read the settings file
 # in order to get admin-modified settings
 read_rcfile

Modified: trunk/samba.templates
===================================================================
--- trunk/samba.templates	2006-08-12 18:33:24 UTC (rev 1122)
+++ trunk/samba.templates	2006-08-13 23:38:25 UTC (rev 1123)
@@ -14,29 +14,11 @@
  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 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 from /var/log/ will automatically be moved to
- the new location.
-
-Template: samba/nmbd_from_inetd
-Type: note
-_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: Samba run method:
+_Description: How do you want to run Samba?
  The Samba daemon smbd can run as a normal daemon or from inetd. Running as
  a daemon is the recommended approach.
 


