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

Steve Langasek vorlon at costa.debian.org
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.
 




More information about the Pkg-samba-maint mailing list