[Pkg-samba-maint] r1105 - trunk/po

Christian Perrier bubulle at costa.debian.org
Fri Aug 4 01:44:37 UTC 2006


Author: bubulle
Date: 2006-08-04 01:43:58 +0000 (Fri, 04 Aug 2006)
New Revision: 1105

Modified:
   trunk/po/POTFILES.in
   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/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
Log:
Run debconf-updatepo (and update POTFILES.in)
Update French translation


Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/POTFILES.in	2006-08-04 01:43:58 UTC (rev 1105)
@@ -1,3 +1,2 @@
 [type: gettext/rfc822deb] samba-common.templates
 [type: gettext/rfc822deb] samba.templates
-[type: gettext/rfc822deb] swat.templates

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/ar.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: samba_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-14 21:41+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -18,75 +18,90 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "مجموعة الرموز لنظام ملفات Unix"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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 لأسماء الملفات المتواجدة على نظام الملفات."
+msgstr ""
+"إن خيار \"مجموعة الرموز\" يتواجد حاليا في smb.conf مع نسخة Samba ـ 3.0, هذا "
+"الخيار قد استبدل بخيار جديد, \"مجموعة الرموز لنظام ملفات Unix\" من فضلك عين "
+"مجموعة الرموز المراد استعمالها لهذا الخيار الجديد,و الذي يتحكم في كيفية "
+"تفسير Samba لأسماء الملفات المتواجدة على نظام الملفات."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 فقط."
+msgstr ""
+" يتواجد خيار \"صفحة رموز المستخدم\" في ملف smb.conf. و قد استبدل هذا الخيار "
+"مع النسخة Samba 3.0. بخيار \"dos charset\". من فضلك حدد صفحة الرموز التي "
+"ترغب في استعمالها لهذا الخيار الجديد. عادة الخيار الإفتراضي يكفي. لاحظ أن "
+"هذا الخيار غير لازم لمماشات مستخدمي Windows, هو يعني مستخدمي DOS فقط."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "إذا تركت هذا الخيار فارغا,  فإن ملف smb.conf  لن يُغيَّر."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "تغيير smb.conf لاستعمال إعدادات WINS عبر DHCP"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../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 "إذا كان حاسوبك يحصل على معلومات عنوانه (IP adresse)  من خادم DHCP  المتواجد على الشبكة, فأنه باﻹمكان أيضا الحصول غلى معلومات حول خُدَّم  WINS (\"خدم أسماء NetBIOS\") المتواجد على الشبكة, هذا يتطلب تغييرا في ملفsmb.conf بحيث ان إعدادات  WINS المُقدمة من طرف DHCP ستقرأ آليا من ملف /etc/samba/dhcp.conf."
+msgstr ""
+"إذا كان حاسوبك يحصل على معلومات عنوانه (IP adresse)  من خادم DHCP  المتواجد "
+"على الشبكة, فأنه باﻹمكان أيضا الحصول غلى معلومات حول خُدَّم  WINS (\"خدم أسماء "
+"NetBIOS\") المتواجد على الشبكة, هذا يتطلب تغييرا في ملفsmb.conf بحيث ان "
+"إعدادات  WINS المُقدمة من طرف DHCP ستقرأ آليا من ملف /etc/samba/dhcp.conf."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
+#: ../samba-common.templates:3001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "يجب تثبيت رزمة dhcp3-client للاستفادة من هذه الميزة."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "إعداد آلي لملف smb.conf ؟"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -94,107 +109,135 @@
 "line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
-msgstr "بقية إعدادات Samba  تعالج أسئلة تؤثر في المقاييس المتواجدة في الملف /etc/samba/smb.conf و الذي يستعمل لإعداد برامج Samba التالية ( nmbd و smbd). ملفك الحالي smb.conf يحتوي على سطر  'include' او على خيار يمتد لعدة أسطر, الشي الذي يمكن أن يشوش على عملية الإعداد الآلية, ويستلزم منك تحرير ملفك smb.conf يدويا لكي تتمكن من تشغبل ذلك مرة أخرى."
+msgstr ""
+"بقية إعدادات Samba  تعالج أسئلة تؤثر في المقاييس المتواجدة في الملف /etc/"
+"samba/smb.conf و الذي يستعمل لإعداد برامج Samba التالية ( nmbd و smbd). ملفك "
+"الحالي smb.conf يحتوي على سطر  'include' او على خيار يمتد لعدة أسطر, الشي "
+"الذي يمكن أن يشوش على عملية الإعداد الآلية, ويستلزم منك تحرير ملفك smb.conf "
+"يدويا لكي تتمكن من تشغبل ذلك مرة أخرى."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "في حالة عدم اختيارك لهذا الخيار, عليك معالجة أي تغيير في الإعدادات بنفسك, و لن تستفيد من تحسينات الإعداد الدورية."
+msgstr ""
+"في حالة عدم اختيارك لهذا الخيار, عليك معالجة أي تغيير في الإعدادات بنفسك, و "
+"لن تستفيد من تحسينات الإعداد الدورية."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr " اسم مجموعة العمل/الحقل:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "من فضلك حدِّد مجموعة العمل التي سيظهر داخلها هذا الخادم عند استفساره من طرف الزبائن. لاحظ أن هذا المقياس يتحكم في إسم الحقل المستعمل مع الخيار security=domain setting."
+msgstr ""
+"من فضلك حدِّد مجموعة العمل التي سيظهر داخلها هذا الخادم عند استفساره من طرف "
+"الزبائن. لاحظ أن هذا المقياس يتحكم في إسم الحقل المستعمل مع الخيار "
+"security=domain setting."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "تشفير كلمة المرور ؟"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 "أغلبية زبائن Windows يتصلون مع خُدّام SMB مستعملين كلمات مرور مشفرة. إذا أردت استعمال كلمات مرور واضخة عليك بتغيير إعداد في قاعدة تسجيلات Windows."
+msgstr ""
+"أغلبية زبائن Windows يتصلون مع خُدّام SMB مستعملين كلمات مرور مشفرة. إذا أردت "
+"استعمال كلمات مرور واضخة عليك بتغيير إعداد في قاعدة تسجيلات Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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."
+msgstr ""
+"ينصح كثيرا باختيار هذا الخيار, إذا فعلت تأكد من وجود ملف /etc/samba/"
+"smbpasswd صالح و من وضعك كلمة مرور لكل مستخدم باستعمال اﻷمر smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "إحداث قاعدة كلمات المرور لSamba  في /var/lib/samba/passdb.tdb ؟"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
-msgstr "حتى يكون هناك توافق مع اﻹعدادت الافتراصية لأغلبية نسخ    Windows,  يجب إعداد Samba لاستعمال كلمات مرور مشفرة, اﻷمر الذي يتطلب حفظها في ملف منفصل عن /etc/passwd"
+"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,  يجب إعداد "
+"Samba لاستعمال كلمات مرور مشفرة, اﻷمر الذي يتطلب حفظها في ملف منفصل عن /etc/"
+"passwd"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
-msgstr "يمكن إحداث هذا الملف آليا, لكن يجب إضافة كلمات المرور يدويا (باستعمال smbpasswd) مع المحافظة على تجديده في المستقبل. إذا لم تُحدث الملف فعليك بإعادة إعداد samba (و ربما زبائن جهازك) لاستعمال كلمات مرور واضحة."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
+msgstr ""
+"يمكن إحداث هذا الملف آليا, لكن يجب إضافة كلمات المرور يدويا (باستعمال "
+"smbpasswd) مع المحافظة على تجديده في المستقبل. إذا لم تُحدث الملف فعليك "
+"بإعادة إعداد samba (و ربما زبائن جهازك) لاستعمال كلمات مرور واضحة."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 في رزمة samba-doc لتفاصيل أكثر."
+msgstr ""
+"راجع /usr/share/doc/samba-doc/htmldocs/ENCRYPTION في رزمة samba-doc لتفاصيل "
+"أكثر."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr " نُقلت ملفات تسجيل Samba."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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 على الترتيب."
+msgstr ""
+"ملفات التسجيل لكل من رقيبي Samba ـ (nmbd و smbd)  محفوظة الآن في /var/log/"
+"samba . اسماء الملفات هي   log.nmbd و log.smbd لكل من nmbd و smbd على "
+"الترتيب."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
@@ -202,35 +245,38 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../samba.templates:3001
 msgid "Running nmbd from inetd no longer supported"
 msgstr "تشغيل nmbd من inetd لم يعد مدعوما"
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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 أيضا."
+msgstr ""
+"هذا النظام أُعِدّ مسبّقا لتشغيل nmbd و smbd عبر inetd. مع نُسخ Samba الحديثة, لا "
+"يمكن لرقيب nmbd أن يُشَغّل عبر inetd. إذا كنت قد غيرت مخطوط الاشتغال /etc/init."
+"d/samba, عليك بتعديله لتشغيل nmbd أيضا."
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "رقباء, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "طريقة تشغيل Samba:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -238,39 +284,40 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
-msgstr "النسخة 3.0 من Samba أدخلت  واجهة أكمل لقاعدة  SAM, و التي تلغي بدورها ملف /etc/samba/smbpasswd."
+msgstr ""
+"النسخة 3.0 من Samba أدخلت  واجهة أكمل لقاعدة  SAM, و التي تلغي بدورها ملف /"
+"etc/samba/smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 backend) مثل LDAP."
+msgstr ""
+"من فضلك أكّد إذا ما كنت تفضل هجرة آلية لملف smbpasswd المتواجد إلى /var/lib/"
+"samba/passdb.tdb. لا تختر هذا الخيار إذا كنت تنوي استعمال قاعدة كلمات مرور "
+"خلفية ( pdb backend) مثل LDAP."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "ملف الإعدادات أعيد تخريره اخرى من طرف SWAT"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "ملف الإعدادات أعيد تخريره اخرى من طرف SWAT"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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.  "
-
+#~ 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-04 00:28:05 UTC (rev 1104)
+++ trunk/po/ca.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba_3.0.0beta2-1_templates\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\n"
 "PO-Revision-Date: 2004-03-13 21:32-0500\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -16,13 +16,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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:3
+#: ../samba-common.templates:1001
 #, fuzzy
 msgid ""
 "The \"character set\" option is currently configured in smb.conf.  In Samba "
@@ -38,13 +38,22 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "The \"client code page\" option is currently configured in smb.conf.  In "
@@ -60,16 +69,9 @@
 "pels clients de DOS. Si deixeu aquesta opció en blanc no es canviarà el smb."
 "conf."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-#, fuzzy
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Si deixeu aquesta opció en blanc no es modificarà el smb.conf."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Voleu modificar el smb.conf perquè utilitza els paràmetres de configuració "
@@ -77,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../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 "
@@ -94,7 +96,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
@@ -104,14 +106,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid "Configure smb.conf automatically?"
 msgstr "Voleu configurar el smb.conf a través del debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
@@ -129,7 +131,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "If you do not choose this option, you will have to handle any configuration "
@@ -142,14 +144,14 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid "Workgroup/Domain Name:"
 msgstr "Grup de treball/nom del domini?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid ""
 "Please specify the workgroup this server will appear to be in when queried "
@@ -162,13 +164,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Voleu utilitzar l'encriptació de contrasenyes?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
 "Most Windows clients communicate with SMB servers using encrypted passwords. "
@@ -184,10 +186,10 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -200,29 +202,29 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
 "Es crea la base de dades de contrasenyes de Samba, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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."
+"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 ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 #, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"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ò "
@@ -237,7 +239,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -245,14 +247,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
@@ -265,7 +267,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
@@ -276,14 +278,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../samba.templates:3001
 #, fuzzy
 msgid ""
 "This system was previously configured to start nmbd and smbd from inetd. In "
@@ -299,19 +301,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "dimonis, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -321,13 +323,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr "Es desplaça etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -335,7 +337,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 #, fuzzy
 msgid ""
 "Please confirm whether you would like the existing smbpasswd file to be "
@@ -347,24 +349,15 @@
 "fitxer smbpasswd a /var/lib/samba/passdb.tdb?  Si la vostra intenció és "
 "utilitzar un altre pdb (ex, LDAP), haurieu de respondre 'no' aquí."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
 #, 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 ""
+#~ "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?"

Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/cs.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -25,13 +25,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Znaková sada pro unixový souborový systém"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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 "
@@ -45,13 +45,21 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -65,21 +73,15 @@
 "postačuje implicitní hodnota. Tato volba není potřebná pro Windowsové "
 "klienty, pouze pro ty DOSové."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-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: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -95,7 +97,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -103,13 +105,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "Konfigurovat smb.conf automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -127,24 +129,24 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 ""
-"Pokud tuto možnost nepovolíte, budete muset zvládnout všechna nastavení "
-"sami a nebudete moci využívat výhod pravidelných vylepšení tohoto souboru."
+"Pokud tuto možnost nepovolíte, budete muset zvládnout všechna nastavení sami "
+"a nebudete moci využívat výhod pravidelných vylepšení tohoto souboru."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Skupina/Doménové jméno:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "
@@ -156,27 +158,28 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Použít šifrování hesel?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 ""
-"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 registrech systému Windows."
+"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 "
+"registrech systému Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -185,30 +188,32 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Vytvořit databázi hesel /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
+"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 ""
-"Aby byla Samba kompatibilní s výchozím nastavením většiny verzí Windows, musí být "
-"nastavena pro používání šifrovaných hesel. To vyžaduje, aby byla uživatelská "
-"hesla uložena v jiném souboru než /etc/passwd."
+"Aby byla Samba kompatibilní s výchozím nastavením většiny verzí Windows, "
+"musí být nastavena pro používání šifrovaných hesel. To vyžaduje, aby byla "
+"uživatelská hesla uložena v jiném souboru než /etc/passwd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
 msgstr ""
 "Tento soubor může být vytvořen automaticky, ale hesla do něj musíte přidat "
 "ručně programem smbpasswd a také ho musíte udržovat aktualizovaný. Pokud "
@@ -217,23 +222,23 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
 msgstr ""
-"Podrobnosti naleznete v souboru /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html z balíku samba-doc."
+"Podrobnosti naleznete v souboru /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
+"html z balíku samba-doc."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Logovací soubory Samby se přesunuly"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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 "
@@ -244,7 +249,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
@@ -253,13 +258,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../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 "
@@ -267,25 +272,25 @@
 "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 "
+"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:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "démoni, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Způsob spouštění Samby:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -295,13 +300,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -311,7 +316,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 "
@@ -321,20 +326,14 @@
 "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ě."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "SWAT přepíše konfigurační soubor"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "SWAT přepíše konfigurační soubor"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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."
+#~ 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-04 00:28:05 UTC (rev 1104)
+++ trunk/po/da.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -17,13 +17,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Tegnsæt til Unix-filsystemet"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 #, fuzzy
 msgid ""
 "The \"character set\" option is currently configured in smb.conf.  In Samba "
@@ -38,13 +38,22 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "The \"client code page\" option is currently configured in smb.conf.  In "
@@ -60,22 +69,15 @@
 "understøtte Windows-klienter; den gælder kun DOS-klienter. Hvis du ikke "
 "skriver noget her, vil smb.conf ikke blive ændret."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-#, fuzzy
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Hvis du ikke skriver noget her, vil din smb.conf ikke blive ændret."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -91,7 +93,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
@@ -101,14 +103,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid "Configure smb.conf automatically?"
 msgstr "Sæt smb.conf op med debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
@@ -127,7 +129,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "If you do not choose this option, you will have to handle any configuration "
@@ -141,14 +143,14 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid "Workgroup/Domain Name:"
 msgstr "Navn på arbejdsgruppe/domæne?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid ""
 "Please specify the workgroup this server will appear to be in when queried "
@@ -161,13 +163,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Kryptér adgangskoder?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
 "Most Windows clients communicate with SMB servers using encrypted passwords. "
@@ -183,10 +185,10 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -199,28 +201,28 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Opret samba-adgangskodedatabasen /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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."
+"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 ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 #, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
 msgstr ""
 "For at være kompatibel med standardindstillingerne i de fleste udgaver af "
 "Windows, skal Samba være sat op til at benytte krypterede adgangskoder. Det "
@@ -234,7 +236,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -242,14 +244,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid "Samba's log files moved"
 msgstr "Sambas logfiler er flyttet."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
@@ -262,7 +264,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
@@ -273,14 +275,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../samba.templates:3001
 #, fuzzy
 msgid ""
 "This system was previously configured to start nmbd and smbd from inetd. In "
@@ -295,19 +297,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "dæmoner, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -317,13 +319,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -331,7 +333,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 #, fuzzy
 msgid ""
 "Please confirm whether you would like the existing smbpasswd file to be "
@@ -343,25 +345,16 @@
 "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."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
 #, 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 ""
+#~ "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?"

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/de.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: samba_3.0.14a-6.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -25,13 +25,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Zeichensatz für Unix-Dateisystem"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 #, fuzzy
 msgid ""
 "The \"character set\" option is currently configured in smb.conf.  In Samba "
@@ -46,13 +46,22 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "The \"client code page\" option is currently configured in smb.conf.  In "
@@ -69,16 +78,9 @@
 "nicht für Windows-Clients. Wenn Sie diese Option leer lassen, wird Ihre smb."
 "conf nicht verändert."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-#, fuzzy
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Wenn Sie diese Option leer lassen, wird Ihre smb.conf nicht verändert."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Soll smb.conf so abgeändert werden, dass WINS-Einstellungen von DHCP "
@@ -86,7 +88,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../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 "
@@ -103,7 +105,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
@@ -113,14 +115,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid "Configure smb.conf automatically?"
 msgstr "Soll smb.conf durch debconf konfiguriert werden?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
@@ -138,7 +140,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "If you do not choose this option, you will have to handle any configuration "
@@ -152,14 +154,14 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid "Workgroup/Domain Name:"
 msgstr "Arbeitsgruppe/Domain Name?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid ""
 "Please specify the workgroup this server will appear to be in when queried "
@@ -172,13 +174,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Verschlüsselte Passwörter verwenden?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
 "Most Windows clients communicate with SMB servers using encrypted passwords. "
@@ -195,10 +197,10 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -212,28 +214,28 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Samba-Passwort-Datenbank in /var/lib/samba/passdb.tdb erstellen?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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."
+"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 ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 #, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
 msgstr ""
 "Um mit den neusten Versionen von Windows kompatibel zu sein, muss Samba mit "
 "verschlüsselten Passwörtern konfiguriert werden. Dies zwingt jedoch dazu, "
@@ -249,7 +251,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -257,14 +259,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid "Samba's log files moved"
 msgstr "Sambas Log-Dateien wurden verschoben."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
@@ -277,7 +279,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
@@ -288,14 +290,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../samba.templates:3001
 #, fuzzy
 msgid ""
 "This system was previously configured to start nmbd and smbd from inetd. In "
@@ -311,19 +313,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -333,14 +335,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -348,7 +350,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 #, fuzzy
 msgid ""
 "Please confirm whether you would like the existing smbpasswd file to be "
@@ -361,25 +363,16 @@
 "ein anderes pdb-Backend (z.B. LDAP) zu verwenden, sollten Sie hier mit "
 "'Nein' antworten."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
 #, 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 ""
+#~ "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?"

Modified: trunk/po/dz.po
===================================================================
--- trunk/po/dz.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/dz.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba_po.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\n"
 "PO-Revision-Date: 2006-07-28 09:50+0530\n"
 "Last-Translator: Jurmey Rabgay <jur_gay at yahoo.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -29,199 +29,320 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "ཡུ་ནིགསི་ཡིག་སྣོད་རིམ་ལུགས་ཀྱི་དོན་ལུ་ ཡིག་འབྲུ་གཞི་སྒྲིག"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-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\"གིས་ ཚབ་བཙུགས་འབད་ཡི། གདམ་ཁ་གསརཔ་གི་དོན་ལུ་ ཁྱོད་ཀྱིས་ ཡིག་སྣོད་རིམ་ལུགས་གུ་ཡིག་སྣོད་མིང་ཚུ་ག་དེ་སྦེ་ཁ་བསྒྱུར་འབདཝ་ཨིན་ན་ཚད་འཛིན་འབད་བའི་ལག་ལེན་འཐབ་དགོ་མནོ་མི་ ཡིག་འབྲུ་གཞི་སྒྲིག་འདི་གསལ་བཀོད་འབད་གནང་།"
+#: ../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
-#: ../samba-common.templates:13
-msgid "Character Set for DOS clients"
-msgstr "ཌི་ཨོ་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མིའི་དོན་ལུ་ ཡི་གའབྲུ་གཞི་སྒྲིག"
+#. 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:13
-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\"གིས་ ཚབ་བཙུགས་འབད་ཡི། ཁྱོད་ཀྱིས་ གདམ་ཁ་གསརཔ་གི་དོན་ལུ་ ལགལེན་འཐབ་དགོ་མནོ་མི་ཡིག་འབྲུ་གཞི་སྒྲིག་འདི་ གསལ་བཀོད་འབད་གནང་། གནད་དོན་མང་ཤོས་ཅིག་ནང་ ཁྱོད་ལུ་གདམས་ཡོད་པའི་སྔོན་སྒྲིག་འདི་འཐོབ་ཚུགསཔ་འོང་། གདམ་ཁ་འདི་ ཌི་ཨོ་ཨེསི་ཞབས་ཏོག་སྤྱོད་མི་ལུ་རྐྱངམ་ཅིག་མ་གཏོགས་ ཝིན་ཌཱསི་ཞབས་ཏོག་སྤྱོད་མི་ཚུ་ལུ་རྒྱབ་སྐྱོར་དགོཔ་མེད།"
+#: ../samba-common.templates:2001
+msgid "Character Set for DOS clients"
+msgstr "ཌི་ཨོ་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མིའི་དོན་ལུ་ ཡི་གའབྲུ་གཞི་སྒྲིག"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "ཁྱོད་ཀྱིས་ གདམ་ཁ་འདི་སྟོངམ་སྦེ་བཞག་པ་ཅིན་ smb.conf ཡིག་སྣོད་འདི་བསྒྱུར་བཅོས་མི་འབད།"
+#: ../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:25
+#: ../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:25
-msgid "If your computer gets IP address information from a DHCP server on the network, the DHCP server may also provide information about WINS servers (\"NetBIOS name servers\") present on the network.  This requires a change to your smb.conf file so that DHCP-provided WINS settings will automatically be read from /etc/samba/dhcp.conf."
-msgstr "ག་དེམ་ཅིག་འབད་ ཁྱོད་ཀྱི་གློག་རིག་གིས་ཡོངས་འབྲེལ་གུའི་ཌི་ཨེཅ་སི་པི་སར་བར་ནང་ལས་ ཨའི་པི་ཁ་བྱང་བརྡ་དོན་འཐོབ་པ་ཅིན་ ཌི་ཨེཅ་སི་པི་སར་བར་གིས་ཡང་ ཡོངས་འབྲེལ་གུ་ཡོད་པའི་ ཌབ་ལུ་ཨའི་ཨེན་ཨེསི་སར་བརསི་ (\"NetBIOS name servers\")གི་སྐོར་ལས་བརྡ་དོན་བྱིན་འོང་། འདི་གི་དོན་ལུ་ ཁྱོད་རའི་ smb.conf ཡིག་སྣོད་བསྒྱུར་བཅོས་འབད་དགོཔ་ཨིན་ དེ་འབད་བ་ཅིན་ བྱིན་ཡོད་པའི་ཌི་ཨེཅ་སི་པི་ ཌབ་ལུ་ཨའི་ཨེན་ཨེསི་སྒྲིག་སྟངས་འདི་ རང་བཞིན་གྱིས་ /etc/samba/dhcp.conf ནང་ལས་ལྷག་འོང་།"
+#: ../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 ནང་ལས་ལྷག་འོང་།"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "ཌི་ཨེཅ་སི་པི་༣-ཞབས་ཏོག་སྤྱོད་མི་ཐུམ་སྒྲིལ་འདི་ ཁྱད་རྣམ་འདི་གི་ཕན་ཐོགས་ལུ་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།"
+#: ../samba-common.templates:3001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"ཌི་ཨེཅ་སི་པི་༣-ཞབས་ཏོག་སྤྱོད་མི་ཐུམ་སྒྲིལ་འདི་ ཁྱད་རྣམ་འདི་གི་ཕན་ཐོགས་ལུ་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf འདི་རང་བཞིན་གྱིས་རིམ་སྒྲིག་འབད་ནི་ཨིན་ན?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
-msgid "The rest of the configuration of Samba deals with questions that affect parameters in /etc/samba/smb.conf, which is the file used to configure the Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' line or an option that spans multiple lines, which could confuse 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: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 ཞུན་དག་འབད་དགོཔ་ཨིན། "
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
-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: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 ""
+"ཁྱོད་ཀྱིས་ གདམ་ཁ་འདི་མ་གདམ་པ་ཅིན་ རིམ་སྒྲིག་གི་འགྱུར་བ་གང་རུང་ཅིག་ ཁྱོད་རང་གིས་ལེགས་སྐྱོང་འཐབ་དགོཔ་"
+"དང་ དུས་མཚམས་རིམ་སྒྲིག་གོང་སྤེལ་གྱི་ཁེ་ཕན་འཐོབ་མི་ཚུགས།"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "ལཱ་གི་སྡེ་ཚན་/ཌོ་མེན་མིང་:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
-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: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 ""
+"ཞབས་ཏོག་སྤྱོད་མི་གིས་འདྲི་དཔྱད་འབདཝ་ད་ སར་བར་འབྱུང་ནི་ཨིན་པའི་ལཱ་གི་སྡེ་ཚན་འདི་གསལ་བཀོད་འབད་གནང་"
+"། ཚད་བཟུང་འདི་གིས་ སྲུང་སྐྱོབ་=ཌོ་མེན་སྒྲིག་སྟངས་དང་གཅིག་ཁར་ལག་ལེན་འཐབ་ཡོད་པའི་ཌོ་མེན་མིང་ཡང་ ཚད་"
+"འཛིན་འབདཝ་ཨིནམ་དྲན་དགོ"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "ཆོག་ཡིག་གསང་བཟོ་ལགལེན་འཐབ་ནི་ཨིན་ན?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
-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: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 ""
+"ཝིན་ཌཱསི་ཞབས་ཏོག་སྤྱོད་མི་མང་ཤོས་ཅིག་གིས་ གསང་བཟོས་ཆོག་ཡིག་ལག་ལེན་གྱི་ཐོག་ལས་ ཨེསི་ཨེམ་བི་དང་གཅིག་"
+"ཁར་བརྒྱུད་འབྲེལ་འཐབ་ཨིན། ཁྱོད་ཀྱིས་ ཚིག་ཡིག་ཆོག་ཡིག་གསལ་ཏོག་ཏོ་ཅིག་ལག་ལེན་འཐབ་དགོ་མནོ་བ་ཅིན་ ཁྱོད་"
+"རའི་ཝིན་ཌཱསི་ཐོ་བཀོད་ནང་ལུ་ཚད་བཟུང་ཅིག་བསྒྱུར་བཅོས་འབད་དགོ"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
-msgid "Choosing this option is highly recommended. If you do, make sure you have a valid /etc/samba/smbpasswd file and that you set passwords in there for each user using the smbpasswd command."
-msgstr "གདམ་ཁ་གདམས་མི་འདི་གིས་ གནམ་མེད་ས་མེད་འོས་སྦྱོར་འབད་ཡི། འདི་འབད་ནི་ཨིན་པ་ཅིན་ ཁྱོད་ལུ་ནུས་ལྡན་གྱི་/etc/samba/smbpasswdཡིག་སྣོད་ཅིག་དགོཔ་དང་ འ་ནི་འདི་ཁྱོད་ཀྱིས་ smbpasswd བརྡ་བཀོད་ལག་ལེན་གྱི་ཐོག་ལས་ ལག་ལེན་པ་རེ་བཞིན་གྱི་དོན་ལས་ དེ་ནང་ལུ་ཆོག་ཡིག་གཞི་སྒྲིག་འབད། "
+#: ../samba-common.templates:6001
+#, fuzzy
+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:4
+#: ../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:4
-msgid "To be compatible with the defaults in most versions of Windows, Samba must be configured to use encrypted passwords.  This requires user passwords to be stored in a file separate from /etc/passwd."
-msgstr "ཝིན་ཌཱསི་གི་ཐོན་རིམ་མང་ཤོས་ཅིག་ནང་ སྔོན་སྒྲིག་དང་བཅས་མཐུན་འགྱུར་ཅན་ཨིན་དགོ་པ་ཅིན་ གསང་བཟོས་ཆོག་ཡིག་ལག་ལེན་གྱི་དོན་ལུ་ སམ་བ་གིས་རིམ་སྒྲིག་འབད་དགོཔ་ཨིན།  /etc/passwdལས་སོ་སོར་འཕྱལ་ཡོད་པའི་ཡིག་སྣོད་ཅིག་གསོག་འཇོག་དོན་ལུ་ ལག་ལེན་པའི་ཆོག་ཡིག་དགོཔ་ཨིན། "
+#: ../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 "
+"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ལས་སོ་སོར་འཕྱལ་ཡོད་པའི་ཡིག་སྣོད་"
+"ཅིག་གསོག་འཇོག་དོན་ལུ་ ལག་ལེན་པའི་ཆོག་ཡིག་དགོཔ་ཨིན། "
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
-msgid "This file can be created automatically, but the passwords must be added manually (by running smbpasswd) and be kept up-to-date in the future.  If you do not create it, you will have to reconfigure samba (and probably your client machines) to use plaintext passwords."
-msgstr "ཡིག་སྣོད་འདི་རང་བཞིན་གྱིས་གསར་བསྐྲུན་འབད་ཚུགས་ དེ་འབདཝ་ད་ཆོག་ཡིག་འདི་ལག་ཐོག་ལས་(smbpasswd གཡོག་བཀོལ་ཐོག་ལས་)ཁ་སྐོང་རྐྱབ་དགོཔ་དང་ མ་འོང་ས་པའི་ནང་དུས་མཐུན་སྦེ་བཞག་དགོཔ་ཨིན། ག་དེམ་ཅིག་སྦེ་འདི་གསར་བསྐྲུན་མ་འབད་བ་ཅིན་ ཚིག་ཡིག་རྐྱང་པོའི་ཆོག་ཡིག་ཚུ་ལགལེན་འཐབ་ནི་ལུ་ སམ་བ་(དང་ཁྱོད་རའི་ཞབས་ཏོག་སྤྱོད་པའི་མ་འཕྲུལ་)འདི་སླར་རིམ་སྒྲིག་འབད་དགོཔ་འོང་།"
+#: ../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 ""
+"ཡིག་སྣོད་འདི་རང་བཞིན་གྱིས་གསར་བསྐྲུན་འབད་ཚུགས་ དེ་འབདཝ་ད་ཆོག་ཡིག་འདི་ལག་ཐོག་ལས་(smbpasswd "
+"གཡོག་བཀོལ་ཐོག་ལས་)ཁ་སྐོང་རྐྱབ་དགོཔ་དང་ མ་འོང་ས་པའི་ནང་དུས་མཐུན་སྦེ་བཞག་དགོཔ་ཨིན། ག་དེམ་ཅིག་སྦེ་"
+"འདི་གསར་བསྐྲུན་མ་འབད་བ་ཅིན་ ཚིག་ཡིག་རྐྱང་པོའི་ཆོག་ཡིག་ཚུ་ལགལེན་འཐབ་ནི་ལུ་ སམ་བ་(དང་ཁྱོད་རའི་ཞབས་"
+"ཏོག་སྤྱོད་པའི་མ་འཕྲུལ་)འདི་སླར་རིམ་སྒྲིག་འབད་དགོཔ་འོང་།"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
-msgid "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more details."
-msgstr "ཁ་གསལ་མཁྱེན་ནིའི་དོན་ལུ་ སམ་བ་-ཌོཀ་ཐུམ་སྒྲིལ་ནང་ལས་ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html ལུ་ལྟ།"
+#: ../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 ལུ་ལྟ།"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "སམ་བ་གི་དྲན་དེབ་ཡིག་སྣོད་ཚུ་ སྤོ་བཤུད་འབད་ནུག"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
-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 རིམ་པ་བཞིན་ཨིན། "
+#: ../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:19
-msgid "The old log files from /var/log/ will automatically be moved to the new location."
-msgstr "/var/log/ ནང་ལས་ཀྱི་དྲན་དེབ་ཡིག་སྣོད་རྙིངམ་ཚུ་ རང་བཞིན་གྱིས་གནས་ཁོངས་གསརཔ་ལུ་སྤོ་བཤུད་འབད་འོང་།"
+#: ../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:29
+#: ../samba.templates:3001
 msgid "Running nmbd from inetd no longer supported"
 msgstr "inetd ནང་ལས་ nmbdགཡོག་བཀོལ་མི་འདི་ ད་ལས་ཕར་རྒྱབ་སྐྱོར་མི་འབད།"
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
-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འདི་འགོ་བཙུགས་འོང་།"
+#: ../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:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "ཌེ་མཱོན་ ཨི་ནི་ཊེཊི།"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "སམ་བ་གཡོག་བཀོལ་ཐབས་ལམ་:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
-msgid "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a daemon is the recommended approach."
-msgstr "སམ་བ་ཌེ་མཱོན་smbdའདི་ སྤྱིར་བཏང་ཌེ་མཱོན་སྦེ་ ཡང་ན་ inetdནང་ལས་ གཡོག་བཀོལ་ཚུགས། ཌེ་མཱོན་སྦེ་གཡོག་བཀོལ་མི་འདི་ འོས་སྦྱོར་འབད་ཡོད་པའི་རྩར་ལེན་ཨིན།"
+#: ../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ནང་ལས་ གཡོག་བཀོལ་ཚུགས། ཌེ་མཱོན་སྦེ་གཡོག་"
+"བཀོལ་མི་འདི་ འོས་སྦྱོར་འབད་ཡོད་པའི་རྩར་ལེན་ཨིན།"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
-msgid "Samba 3.0 introduced a more complete SAM database interface which supersedes the /etc/samba/smbpasswd file."
-msgstr "སབ་མ་༣.༠ གིས་/etc/samba/smbpasswd ཡིག་སྣོད་འཛིན་པའི་  ཨེསི་ཨེ་ཨེམ་ གནད་སྡུད་གཞི་རྟེན་ ངོས་འདྲ་བ་ཆ་ཚང་ཅིག་འགོ་བཙུགས་ཡི།"
+#: ../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 ཡིག་སྣོད་འཛིན་པའི་  ཨེསི་ཨེ་ཨེམ་ གནད་སྡུད་གཞི་རྟེན་ ངོས་འདྲ་"
+"བ་ཆ་ཚང་ཅིག་འགོ་བཙུགས་ཡི།"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
-msgid "Please confirm whether you would like the existing smbpasswd file to be automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this option if you plan to use another pdb backend (e.g., LDAP) instead."
-msgstr "ཡོད་བཞིན་པའི་ smbpasswd ཡིག་སྣོད་འདི་རང་བཞིན་གྱིས་སྦེ་ /var/lib/samba/passdb.tdbལུ་ གཞི་གནས་སྤོ་ནི་ཨིན་ན་ ཁྱོད་ར་ངེས་དཔྱད་འབད་གནང་། ཁྱོད་ཀྱིས་pdb རྒྱབ་མཐའ་ (དཔེར་ན་ ཨེལ་ཌི་ཨེ་པི་) འདི་དེ་གི་ཚབ་སྦེ་ལག་ལེན་འཐབ་ནིའི་འཆར་གཞི་ཡོད་པ་ཅིན་ གདམ་ཁ་འདི་ག་གདམས།"
+#: ../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 རྒྱབ་མཐའ་ (དཔེར་ན་ ཨེལ་ཌི་ཨེ་པི་) འདི་"
+"དེ་གི་ཚབ་སྦེ་ལག་ལེན་འཐབ་ནིའི་འཆར་གཞི་ཡོད་པ་ཅིན་ གདམ་ཁ་འདི་ག་གདམས།"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "ཨེསི་ཌབ་ལུ་ཨེ་ཊི་གིས་ བསྐྱར་བྲིས་འབད་ཡོད་པའི་རིམ་སྒྲིག་ཡིག་སྣོད།"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "ཨེསི་ཌབ་ལུ་ཨེ་ཊི་གིས་ བསྐྱར་བྲིས་འབད་ཡོད་པའི་རིམ་སྒྲིག་ཡིག་སྣོད།"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ཅིག་ལག་ལེན་འབད་ཡོད་པ་ཅིན་ ཨེསི་ཌབ་ལུ་ཨེ་ཊི་ལག་ལེན་འཐབ་ནི་སྤང་དགོ"
-
+#~ 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-04 00:28:05 UTC (rev 1104)
+++ trunk/po/es.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\n"
 "PO-Revision-Date: 2003-07-02 21:51-0500\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -25,14 +25,14 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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:3
+#: ../samba-common.templates:1001
 #, fuzzy
 msgid ""
 "The \"character set\" option is currently configured in smb.conf.  In Samba "
@@ -47,13 +47,22 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "The \"client code page\" option is currently configured in smb.conf.  In "
@@ -69,23 +78,16 @@
 "exclusivamente para los clientes DOS.  Si deja en blanco este campo, no se "
 "cambiará smb.conf."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-#, fuzzy
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Si deja en blanco este campo, no se cambiará smb.conf."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -101,7 +103,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
@@ -110,14 +112,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid "Configure smb.conf automatically?"
 msgstr "¿Configurar smb.conf mediante debconf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
@@ -136,7 +138,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "If you do not choose this option, you will have to handle any configuration "
@@ -150,14 +152,14 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid "Workgroup/Domain Name:"
 msgstr "Nombre del dominio o del grupo de trabajo"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid ""
 "Please specify the workgroup this server will appear to be in when queried "
@@ -170,13 +172,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "¿Utilizar contraseñas cifradas?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
 "Most Windows clients communicate with SMB servers using encrypted passwords. "
@@ -192,10 +194,10 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -208,28 +210,28 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "¿Crear el base de dados de contraseñas /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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."
+"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 ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 #, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"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 "
@@ -245,7 +247,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -253,14 +255,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
@@ -274,7 +276,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
@@ -285,14 +287,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../samba.templates:3001
 #, fuzzy
 msgid ""
 "This system was previously configured to start nmbd and smbd from inetd. In "
@@ -307,19 +309,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "demonios, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -329,14 +331,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -344,7 +346,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 #, fuzzy
 msgid ""
 "Please confirm whether you would like the existing smbpasswd file to be "
@@ -356,21 +358,6 @@
 "fichero corriente smbpasswd sea convertido en /var/lib/samba/passdb.tdb?  Si "
 "pretende usar otro  "
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ""
-
 #~ msgid "How do you want to run Samba?"
 #~ msgstr "¿Cómo quiere que se ejecute Samba?"
 

Modified: trunk/po/eu.po
===================================================================
--- trunk/po/eu.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/eu.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\n"
 "PO-Revision-Date: 2003-07-02 21:51-0500\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <librezale at librezale.org\n"
@@ -25,18 +25,19 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Unix fitxategi sistemaren karaktere jokoa"
 
 #
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
+#, fuzzy
 msgid ""
-"You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
-"specify the character set you wish to use for theis new option, which "
+"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 ""
 "Orain smb.conf fitxategian \"character set\" aukera bat dago. Samba 3.0-an "
@@ -46,26 +47,29 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-msgid "If you leave this option blank, your smb.conf will not be changed."
+#. 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 "Aukera hau zurian utzi ezkero, ez da smb.con aldatuko."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#: ../samba-common.templates:2001
 msgid "Character Set for DOS clients"
 msgstr "DOS bezeroentzat erabiliko den karaktere jokoa"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#: ../samba-common.templates:2001
+#, fuzzy
 msgid ""
-"You currently have a \"client code page\" set in your smb.conf.  In Samba "
-"3.0, this option is replaced by the option \"dos charset\".  Please specify "
-"the character set you wish to use for this new option.  In most cases, the "
-"default chosen for you will be sufficient.  Note that this option is not "
-"needed to support Windows clients, it is only for DOS clients.  If you leave "
-"this option blank, your smb.conf will not be changed."
+"The \"client code page\" option is currently configured in smb.conf.  In "
+"Samba 3.0, this option is replaced by the option \"dos charset\".  Please "
+"specify the character set you wish to use for this new option.  In most "
+"cases, the default chosen for you will be sufficient.  Note that this option "
+"is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 "Orain smb.con fitxategian \"client code page\" aukera bat dago. Samba 3.0-an "
 "aukera hau \"dos charset\" aukeragatik ordeztua izanda. Mesedez ezarri "
@@ -76,13 +80,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:24
+#: ../samba-common.templates:3001
 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:24
+#: ../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 "
@@ -91,66 +95,72 @@
 "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."
+"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:24
+#: ../samba-common.templates:3001
+#, fuzzy
 msgid ""
-"You must have the dhcp3-client package installed to take advantage of this "
-"feature."
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 "Ezaugarri honetaz baliatzeko dhcp3-client bezeroa instalaturik izan behar "
 "duzu."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
-msgid "Configure smb.conf through debconf?"
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Configure smb.conf automatically?"
 msgstr "Smb.conf debconf bidez konfiguratu?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse debconf and "
-"require you to edit your smb.conf by hand to get it working again."
+"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 ""
 "Konfigurazioaren hurrengo atalak /etc/samba/smb.conf fitxategiari dagozkion "
-"ezarpenez aro dira, honek Samba programak (smbd eta nmbd) konfiguratzen ditu. "
-"Zure smb.conf fitxategiak 'include' lerro bat edo lerro bat baino luzeago den "
-"aukera bat du, horregatik debconf-ek fitxategia honda dezake, zuk eskuz "
-"konpondu beharko duzlarik."
+"ezarpenez aro dira, honek Samba programak (smbd eta nmbd) konfiguratzen "
+"ditu. Zure smb.conf fitxategiak 'include' lerro bat edo lerro bat baino "
+"luzeago den aukera bat du, horregatik debconf-ek fitxategia honda dezake, "
+"zuk eskuz konpondu beharko duzlarik."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:37
+#: ../samba-common.templates:4001
+#, fuzzy
 msgid ""
-"If you don't use debconf to configure smb.conf, you will have to handle any "
-"configuration changes yourself, and will not be able to take advantage of "
-"periodic configuration enhancements.  Therefore, use of debconf is "
-"recommended if possible."
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
 msgstr ""
-"smb.conf konfiguratzeko debconf ez erabili ezkero, Samba konfigurazioko edozein "
-"aldaketa eskuz egin beharko duzu eta ezingo duzu konfigurazio aldaketa automatikoez "
-"baliatu. Horregatik posible denean debconf erabiltzea gomendatzen da."
+"smb.conf konfiguratzeko debconf ez erabili ezkero, Samba konfigurazioko "
+"edozein aldaketa eskuz egin beharko duzu eta ezingo duzu konfigurazio "
+"aldaketa automatikoez baliatu. Horregatik posible denean debconf erabiltzea "
+"gomendatzen da."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
-msgid "Workgroup/Domain Name?"
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
 msgstr "Lan Talde/Domeinu izena?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
+#, fuzzy
 msgid ""
-"This controls what workgroup your server will appear to be in when queried "
+"Please specify the workgroup this server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
 "the security=domain setting."
 msgstr ""
@@ -160,73 +170,101 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Zifraturiko pasahitzak erabili?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Recent Windows clients communicate with SMB servers using encrypted "
-"passwords. If you want to use clear text passwords you will need to change a "
-"parameter in your Windows registry. It is recommended that you use encrypted "
-"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
-"and that you set passwords in there for each user using the smbpasswd "
-"command."
+"Most Windows clients communicate with SMB servers using encrypted passwords. "
+"If you want to use clear text passwords you will need to change a parameter "
+"in your Windows registry."
 msgstr ""
-"Windoez bezero berrienak SMB zerbitzariekiko harremanak zifraturiko pashitzak "
-"erabiliaz egiten dituzte. Testu laueko pashitzak erabili nahi izan ezkero "
-"parametro bat aldatu behar duzu Windows erregistroan. Pasahitz zifratuak "
-"erabiltzea gomendatzen da. Erabiltzea hautatu ezkero ziurtatu baliozko "
-"/etc/samba/smbpasswd fixtategi bat duzula eta pasahitzak smbpasswd programaren "
-"bidez ezarri dituzula."
+"Windoez bezero berrienak SMB zerbitzariekiko harremanak zifraturiko "
+"pashitzak erabiliaz egiten dituzte. Testu laueko pashitzak erabili nahi izan "
+"ezkero parametro bat aldatu behar duzu Windows erregistroan. Pasahitz "
+"zifratuak erabiltzea gomendatzen da. Erabiltzea hautatu ezkero ziurtatu "
+"baliozko /etc/samba/smbpasswd fixtategi bat duzula eta pasahitzak smbpasswd "
+"programaren bidez ezarri dituzula."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba-common.templates:6001
+#, fuzzy
+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 ""
+"Windoez bezero berrienak SMB zerbitzariekiko harremanak zifraturiko "
+"pashitzak erabiliaz egiten dituzte. Testu laueko pashitzak erabili nahi izan "
+"ezkero parametro bat aldatu behar duzu Windows erregistroan. Pasahitz "
+"zifratuak erabiltzea gomendatzen da. Erabiltzea hautatu ezkero ziurtatu "
+"baliozko /etc/samba/smbpasswd fixtategi bat duzula eta pasahitzak smbpasswd "
+"programaren bidez ezarri dituzula."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "/var/lib/samba/passdb.tdb pasahitz datubase berria sortu?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd. This file can be created "
-"automatically, but the passwords must be added manually (by you or the user) "
-"by running smbpasswd, and you must arrange to keep it up-to-date in the "
-"future.  If you do not create it, you will have to reconfigure samba (and "
-"probably your client machines) to use plaintext passwords. See /usr/share/"
-"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
-"details."
+"be stored in a file separate from /etc/passwd.  This file can be created "
+"automatically, but the passwords must be added manually by running smbpasswd "
+"and be kept up-to-date in the future."
 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 fixtategi bat sortu behar da. Fitxategia automatikoki "
-"sortu daiteke baina pasahitzak eskuz gehitu behar dira (zuk edo erabiltzaileak) "
-"'smbpasswd' programaren bidez eta pasahitzak eguneraturik mantendu behar dira "
-"Fixtategi hau ez sortu ezkero beharrezkoa da Samba (eta ziurrenik Windows "
-"bezeroak) zifratu gabeko pasahitzak erabiltzeko konfiguratzea . Samba-doc "
-"paketeko /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html begiratu argibide "
-"gehiagorako"
+"sortu daiteke baina pasahitzak eskuz gehitu behar dira (zuk edo "
+"erabiltzaileak) 'smbpasswd' programaren bidez eta pasahitzak eguneraturik "
+"mantendu behar dira Fixtategi hau ez sortu ezkero beharrezkoa da Samba (eta "
+"ziurrenik Windows bezeroak) zifratu gabeko pasahitzak erabiltzeko "
+"konfiguratzea . Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html begiratu argibide gehiagorako"
 
+#. 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 ""
+
+#. 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 ""
+
 #. Type: note
 #. Description
-#: ../samba.templates:17
-msgid "Samba's log files have moved."
+#: ../samba.templates:2001
+#, fuzzy
+msgid "Samba's log files moved"
 msgstr "Samba erregistro fitxategien kokagunea aldatua izan da."
 
-
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:2001
+#, fuzzy
 msgid ""
-"Starting with the first packages of Samba 2.2 for Debian the log files for "
-"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
-"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+"The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for nmbd and "
+"smbd respectively."
 msgstr ""
 "Debianeko lehenengo Samba 2.2 paketeetatik Samba bi deabruen (smbd eta nmbd) "
 "erregistro fitxategiak /var/log/samba/-n daud ekokaturik. Fixtategien izenak "
@@ -234,49 +272,52 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:17
+#: ../samba.templates:2001
+#, fuzzy
 msgid ""
-"The old log files that were in /var/log/ will be moved to the new location "
-"for you."
+"The old log files from /var/log/ will automatically be moved to the new "
+"location."
 msgstr ""
-"/var/log/-en daude erregistro fitxategi zaharrak kokaleku berria automatikoki "
-"mugituak izango dira."
+"/var/log/-en daude erregistro fitxategi zaharrak kokaleku berria "
+"automatikoki mugituak izango dira."
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
-msgid "Running nmbd from inetd is no longer supported"
+#: ../samba.templates:3001
+#, fuzzy
+msgid "Running nmbd from inetd no longer supported"
 msgstr "Dagoeneko ezin da nmbd inetd bidez abiarazi"
 
 #. Type: note
 #. Description
-#: ../samba.templates:28
+#: ../samba.templates:3001
+#, fuzzy
 msgid ""
-"Your system was previously configured to start nmbd and smbd from inetd.  As "
-"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
-"If you have modified your /etc/init.d/samba startup script, you may need to "
-"adjust it by hand now so that nmbd will start."
+"This system was previously configured to start nmbd and smbd from inetd. In "
+"recent Samba versions, nmbd cannot be started from inetd. If you have "
+"modified your /etc/init.d/samba startup script, you may need to adjust it "
+"now so that nmbd will start."
 msgstr ""
-"Zure sistema nmbd eta smbd inetd bidez abiazteko konfiguraturik dago. "
-"2.999+3.0.alpha20-4 bertsiotik aurrera nmbd ezin da inetd bidez abiarazi. "
-"/etc/init.d/samba abiarazte script-a eraldatu egin baduzu, agian editatu "
-"egin beharko duzu funtziona dezan."
+"Zure sistema nmbd eta smbd inetd bidez abiazteko konfiguraturik dago. 2.999"
+"+3.0.alpha20-4 bertsiotik aurrera 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:36
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "deabruak, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
-msgid "How do you want to run Samba?"
-msgstr "Nola nahi duzu Samba abiaraztea?"
+#: ../samba.templates:4002
+msgid "Samba run method:"
+msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:38
+#: ../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."
@@ -286,40 +327,44 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:45
+#: ../samba.templates:5001
 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:45
+#: ../samba.templates:5001
 msgid ""
-"Samba 3.0 introduces a newer, more complete SAM database interface which "
-"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
-"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
-"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
-"here."
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
 msgstr ""
-"Samba 3.0 bertsioak /etc/samba/smbpasswd fitxategia ordezten duen \"SAM\" "
-"datubase osoago bat erabiltzen du.  smbpasswd fitxategi arrunta "
-"/var/lib/samba/passdb.tdb-ra moigratzea nahi al duzu? Beste pasahitz datubase "
-"bat erabiltzea pentsatzen baduzu (adib LDAP) hemen 'ez' erantzun beharko zenuke."
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../swat.templates:3
-msgid "Your smb.conf will be re-written!"
-msgstr "Zure smb.conf berridatzia izango da!"
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
+#: ../samba.templates:5001
+#, fuzzy
 msgid ""
-"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
-"delete all comments, include= and copy= options. If you have a carefully "
-"crafted smb.conf then back it up or don't use SWAT!"
+"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 ""
-"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!."
+"Samba 3.0 bertsioak /etc/samba/smbpasswd fitxategia ordezten duen \"SAM\" "
+"datubase osoago bat erabiltzen du.  smbpasswd fitxategi arrunta /var/lib/"
+"samba/passdb.tdb-ra moigratzea nahi al duzu? 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-04 00:28:05 UTC (rev 1104)
+++ trunk/po/fr.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -1,4 +1,4 @@
-# translation of fr2.po to French
+# translation of fr.po to French
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -15,10 +15,10 @@
 # Christian Perrier <bubulle at debian.org>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: fr2\n"
+"Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
-"PO-Revision-Date: 2006-05-29 09:35+0200\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"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,34 +28,44 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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:3
+#: ../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."
+"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
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -71,23 +81,15 @@
 "Veuillez noter que cette option ne sert pas pour les clients Windows mais "
 "seulement pour les clients DOS."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr ""
-"Le fichier smb.conf ne sera pas modifié si vous laissez cette option sans "
-"réponse."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -103,21 +105,19 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
-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: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é."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "Voulez-vous configurer smb.conf automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -135,7 +135,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -147,13 +147,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Nom de domaine ou de groupe de travail :"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "
@@ -165,13 +165,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Voulez-vous chiffrer les mots de passe ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 "
@@ -184,9 +184,9 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -197,41 +197,41 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Faut-il créer une base de données /var/lib/samba/passdb.tdb ?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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."
+"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 ""
 "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."
+"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
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
 msgstr ""
-"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. Si vous ne voulez pas créer le fichier maintenant, Samba (ainsi, "
+"Si vous ne voulez pas créer le fichier maintenant, Samba (ainsi, "
 "probablement, que les clients Windows) devra utiliser des mots de passe non "
 "chiffrés."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -241,13 +241,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Déplacement des journaux de Samba"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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 "
@@ -259,22 +259,21 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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."
+msgstr "Les anciens fichiers-journaux dans /var/log/ seront déplacés à cet endroit."
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../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 "
@@ -289,19 +288,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "démons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Méthode de lancement de Samba :"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -311,13 +310,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -327,7 +326,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 "
@@ -337,27 +336,3 @@
 "par /var/lib/samba/passdb.tdb. Ne choisissez pas cette option si vous "
 "envisagez d'utiliser une autre interface d'authentification (p. ex. LDAP)."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "Réécriture du fichier de configuration par SWAT"
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 va modifier le fichier smb.conf. Les entrées seront réorganisées et les "
-"commentaires détruits, ainsi que les entrées « include = » et « copy = ». Si "
-"le fichier smb.conf de ce système a été soigneusement personnalisé, vous "
-"devriez éviter d'utiliser SWAT."
-
-msgid "How do you want to run Samba?"
-msgstr "Comment voulez-vous lancer Samba ?"
-
-msgid "Your smb.conf will be re-written!"
-msgstr "Ré-écriture de votre fichier smb.conf !"

Modified: trunk/po/gl.po
===================================================================
--- trunk/po/gl.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/gl.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\n"
 "PO-Revision-Date: 2006-05-29 17:47+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -25,13 +25,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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:3
+#: ../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 "
@@ -46,13 +46,21 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -67,21 +75,15 @@
 "servir. Teña en conta que esta opción non é necesaria para soportar clientes "
 "Windows; é só para clientes DOS."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-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: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -97,7 +99,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -106,13 +108,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "¿Configurar o ficheiro smb.conf automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -130,7 +132,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -142,13 +144,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome do grupo de traballo/dominio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "
@@ -160,13 +162,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "¿Empregar cifrado de contrasinais?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 "
@@ -178,9 +180,10 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -190,18 +193,21 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
 "¿Crear a base de datos de contrasinais de samba, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
+"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 ""
 "Para que sexa compatible coa configuración por defecto da maioría das "
 "versións de Windows, Samba ten que se configurar para empregar contrasinais "
@@ -210,12 +216,11 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
 msgstr ""
 "Este ficheiro pódese crear automaticamente, pero os contrasinais hai que "
 "engadilos a man (executando smbpasswd), e debe manterse actualizado no "
@@ -224,7 +229,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -234,13 +239,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Trasladáronse os ficheiros de rexistro de Samba"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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 "
@@ -252,7 +257,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
@@ -262,13 +267,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../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 "
@@ -282,19 +287,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "servizos, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Método de inicio de Samba:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -304,13 +309,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -320,7 +325,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 "
@@ -330,23 +335,17 @@
 "existente a /var/lib/samba/passdb.tdb. Non escolla esta opción se pretende "
 "empregar outro motor pdb (por exemplo, LDAP)."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "SWAT reescribe o ficheiro de configuración"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "SWAT reescribe o ficheiro de configuración"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ""
+#~ "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?"

Modified: trunk/po/it.po
===================================================================
--- trunk/po/it.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/it.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.0.23rc1 italian debconf templates\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\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"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -17,13 +17,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Set di caratteri per il filesystem Unix"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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 "
@@ -37,13 +37,21 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -57,21 +65,15 @@
 "casi il valore predefinito è sufficiente. Notare che questa opzione non è "
 "necessaria per i client Windows, invece è specifica per i client DOS."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-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: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -87,7 +89,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -96,13 +98,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurare automaticamente smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -120,7 +122,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -132,13 +134,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome del Workgroup/Dominio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "
@@ -150,47 +152,51 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Usare password cifrate?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 ""
 "Molti dei client Windows comunicano con i server SMB usando password "
-"cifrate. Per usare password in chiaro è necessario cambiare un parametro "
-"nel registro di Windows."
+"cifrate. Per usare password in chiaro è necessario cambiare un parametro nel "
+"registro di Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
-"Si raccomanda d'accettare, in questo caso assicurarsi che il file /etc/samba"
-"/smbpasswd sia valido e che le password di tutti gli utenti siano state "
+"Si raccomanda d'accettare, in questo caso assicurarsi che il file /etc/samba/"
+"smbpasswd sia valido e che le password di tutti gli utenti siano state "
 "impostate con il comando smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Creare il database delle password samba /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
+"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 ""
 "Per essere compatibile con le impostazioni predefinite di molte versioni di "
 "Windows, Samba deve essere configurato per usare password cifrate. Questo "
@@ -199,12 +205,11 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"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 "
@@ -213,7 +218,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -223,13 +228,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "I file di log di Samba sono stati spostati"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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 "
@@ -241,7 +246,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
@@ -250,13 +255,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../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 "
@@ -270,19 +275,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "demoni, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Metodo d'avvio di Samba:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -292,13 +297,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -308,7 +313,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 "
@@ -318,20 +323,14 @@
 "migrato in /var/lib/samba/passdb.tdb. Invece, se si pensa di usare un "
 "backend pdb diverso (per esempio LDAP) si dovrebbe rifiutare."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "File di configurazione sovrascritto da SWAT"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "File di configurazione sovrascritto da SWAT"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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."
+#~ 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-04 00:28:05 UTC (rev 1104)
+++ trunk/po/ja.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -25,52 +25,64 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Unix ファイルシステム向けの文字セット"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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 がファイルシステムのファイル名をどのように解釈するかを制御するこの新しいオプションのために、利用を希望する文字セットを指定してください。"
+msgstr ""
+"現在、smb.conf に設定済みの \"character set\" があります。Samba 3.0 では、こ"
+"のオプションは新しいオプション \"unix charset\" に置き換えられています。"
+"Samba がファイルシステムのファイル名をどのように解釈するかを制御するこの新し"
+"いオプションのために、利用を希望する文字セットを指定してください。"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 クライアントのみのためであることを注意しておきます。"
+msgstr ""
+"現在、smb.conf に設定済みの \"client code page\" があります。Samba 3.0 では、"
+"このオプションは新しいオプション \"dos charset\" に置き換えられています。この"
+"新しいオプションのために、利用を希望する文字セットを指定してください。ほとん"
+"どの場合、デフォルトの選択のままで十分でしょう。このオプションは Windows クラ"
+"イアントサポートには必要なく、DOS クライアントのみのためであることを注意して"
+"おきます。"
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "このオプションを空のままにすると、smb.conf ファイルは変更されません。"
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "DHCP から WINS 設定を使うよう smb.conf を変更しますか?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../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 "
@@ -86,20 +98,22 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "この機能を使うためには、dhcp3-client パッケージがインストールされている必要があります。"
+msgstr ""
+"この機能を使うためには、dhcp3-client パッケージがインストールされている必要が"
+"あります。"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "自動的に smb.conf を設定しますか?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -107,107 +121,139 @@
 "line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
-msgstr "Samba の設定の残りの部分は、Samba プログラム (nmbd および smbd) を設定するのに使うファイル /etc/samba/smb.conf にあるパラメータに影響する質問です。現在の smb.conf は、'include' 行または複数行にまたがるオプションを含んでいます。これは自動設定処理を混乱させる可能性があり、再びそれが作動するようにすべく smb.conf の手動での修正を必要とします。"
+msgstr ""
+"Samba の設定の残りの部分は、Samba プログラム (nmbd および smbd) を設定するの"
+"に使うファイル /etc/samba/smb.conf にあるパラメータに影響する質問です。現在"
+"の smb.conf は、'include' 行または複数行にまたがるオプションを含んでいます。"
+"これは自動設定処理を混乱させる可能性があり、再びそれが作動するようにすべく "
+"smb.conf の手動での修正を必要とします。"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "この選択肢で「いいえ」と答えると、すべての設定の変更をあなた自身が面倒を見る必要があります。これは定期的な設定改善には向いていません。"
+msgstr ""
+"この選択肢で「いいえ」と答えると、すべての設定の変更をあなた自身が面倒を見る"
+"必要があります。これは定期的な設定改善には向いていません。"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "ワークグループ/ドメイン名:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "クライアントから照会された際にあなたのサーバが現れることになるワークグループを指定してください。このパラメータは security=domain 設定が使われたときのドメイン名も制御することに注意してください。"
+msgstr ""
+"クライアントから照会された際にあなたのサーバが現れることになるワークグループ"
+"を指定してください。このパラメータは security=domain 設定が使われたときのドメ"
+"イン名も制御することに注意してください。"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "パスワードの暗号化を使いますか?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 "ほとんどの Windows クライアントは暗号化されたパスワードを使って SMB サーバとやり取りします。クリアテキストパスワードを使いたい場合は、あなたの Windows のレジストリのパラメータを変更する必要があります。"
+msgstr ""
+"ほとんどの Windows クライアントは暗号化されたパスワードを使って SMB サーバと"
+"やり取りします。クリアテキストパスワードを使いたい場合は、あなたの Windows の"
+"レジストリのパラメータを変更する必要があります。"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 コマンドを使って設定してください。"
+msgstr ""
+"「はい」と答えることを強くお勧めします。この場合、有効な /etc/samba/"
+"smbpasswd ファイルがあることを確認し、各ユーザのパスワードは smbpasswd コマン"
+"ドを使って設定してください。"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Samba パスワードデータベース /var/lib/samba/passdb.tdb を作成しますか?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
-msgstr "Windows のほとんどのバージョンのデフォルトとの互換性のために、Samba を暗号化パスワードを使うように設定する必要があります。これはユーザのパスワードを /etc/passwd とは別のファイルに格納することを必要とします。"
+"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 のほとんどのバージョンのデフォルトとの互換性のために、Samba を暗号化"
+"パスワードを使うように設定する必要があります。これはユーザのパスワードを /"
+"etc/passwd とは別のファイルに格納することを必要とします。"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
-msgstr "このファイルは自動的に作成することができますが、パスワードは手動で (smbpasswd を使って) 追加しなければならず、将来に渡って最新状態を保ち続けるよう整えておく必要があります。このファイルを作成しない場合、プレインテキストパスワードを使うよう Samba (およびおそらくあなたのクライアントマシン) の再設定が必要です。"
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
+msgstr ""
+"このファイルは自動的に作成することができますが、パスワードは手動で "
+"(smbpasswd を使って) 追加しなければならず、将来に渡って最新状態を保ち続けるよ"
+"う整えておく必要があります。このファイルを作成しない場合、プレインテキストパ"
+"スワードを使うよう Samba (およびおそらくあなたのクライアントマシン) の再設定"
+"が必要です。"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
-msgstr "詳細については、samba-doc パッケージにある /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html を参照してください。"
+msgstr ""
+"詳細については、samba-doc パッケージにある /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html を参照してください。"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Samba のログファイルは移動されました"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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 となります。"
+msgstr ""
+"現在、両 Samba デーモン (nmbd および smbd) のログファイルは /var/log/samba/ "
+"に格納されるようになっています。ファイル名は nmbd と smbd で別個になるよう、"
+"log.nmbd および log.smbd となります。"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
@@ -215,35 +261,39 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../samba.templates:3001
 msgid "Running nmbd from inetd no longer supported"
 msgstr "inetd からの nmbd の実行はもうサポートされません"
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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 が起動するよう今調整する必要があるでしょう。"
+msgstr ""
+"このシステムは以前に inetd から nmbd および smbd を起動するよう設定されていま"
+"した。最近の Samba バージョンでは、nmbd は inetd からは起動できません。/etc/"
+"init.d/samba スタートアップスクリプトを変更しているのであれば、nmbd が起動す"
+"るよう今調整する必要があるでしょう。"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "デーモン, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Samba の実行方式:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -253,38 +303,41 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
-msgstr "Samba 3.0 では、/etc/samba/smbpasswd ファイルに代わる、より完全な SAM データベースインターフェイスが導入されています。"
+msgstr ""
+"Samba 3.0 では、/etc/samba/smbpasswd ファイルに代わる、より完全な SAM データ"
+"ベースインターフェイスが導入されています。"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 バックエンド (LDAP など) を代わりに計画しているのであれば、ここでは「いいえ」と答えてください。"
+msgstr ""
+"既存の smbpasswd ファイルを自動的に /var/lib/samba/passdb.tdb に移行してよい"
+"かどうか確認してください。別の pdb バックエンド (LDAP など) を代わりに計画し"
+"ているのであれば、ここでは「いいえ」と答えてください。"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "SWAT によって書き直された設定ファイル"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "SWAT によって書き直された設定ファイル"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 を使うのは避けたほうがよいでしょう。"
+#~ 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/nl.po
===================================================================
--- trunk/po/nl.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/nl.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -25,204 +25,333 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Karakterset voor Unix bestandsysteem"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-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."
+#: ../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
-#: ../samba-common.templates:13
-msgid "Character Set for DOS clients"
-msgstr "Karakterset voor DOS-clients"
+#. 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:13
-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."
+#: ../samba-common.templates:2001
+msgid "Character Set for DOS clients"
+msgstr "Karakterset voor DOS-clients"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
-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."
+#: ../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:25
+#: ../samba-common.templates:3001
 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:25
-msgid "If your computer gets IP address information from a DHCP server on the network, the DHCP server may also provide information about WINS servers (\"NetBIOS name servers\") present on the network.  This requires a change to your smb.conf file so that DHCP-provided WINS settings will automatically be read from /etc/samba/dhcp.conf."
-msgstr "Indien uw computer zijn ip-adresinformatie van een DHCP-server op het netwerk haalt, voorziet deze mogelijks ook informatie betreffende de op het netwerk aanwezige WINS-servers (\"NetBIOS naam servers\").\" Dit vereist een verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS instellingen automatisch gelezen worden van /etc/samba/dhcp.conf."
+#: ../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 ""
+"Indien uw computer zijn ip-adresinformatie van een DHCP-server op het "
+"netwerk haalt, voorziet deze mogelijks ook informatie betreffende de op het "
+"netwerk aanwezige WINS-servers (\"NetBIOS naam servers\").\" Dit vereist een "
+"verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS "
+"instellingen automatisch gelezen worden van /etc/samba/dhcp.conf."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "Het dhcp3-client-pakket dient geïnstalleerd te zijn om van deze optie gebruik te kunnen maken."
+#: ../samba-common.templates:3001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Het dhcp3-client-pakket dient geïnstalleerd te zijn om van deze optie "
+"gebruik te kunnen maken."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf automatisch instellen?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
-msgid "The rest of the configuration of Samba deals with questions that affect parameters in /etc/samba/smb.conf, which is the file used to configure the Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' line or an option that spans multiple lines, which could confuse the automated configuration process and require you to edit your smb.conf by hand to get it working again."
-msgstr "De resterende Samba configuratievragen hebben betrekking op parameters in /etc/samba/smb.conf, het configuratiebestand dat gebruikt wordt voor de Samba programmas (nmbd en smbd). Uw huidige smb.conf bevat een 'include'-regel of een optie die meerdere regels beslaat, het kan zijn dat dit dit het automatische configuratieproces in verwarring brengt. In dat geval dient u uw smb.conf handmatig aan te passen om samba terug werkend te krijgen."
+#: ../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 ""
+"De resterende Samba configuratievragen hebben betrekking op parameters in /"
+"etc/samba/smb.conf, het configuratiebestand dat gebruikt wordt voor de Samba "
+"programmas (nmbd en smbd). Uw huidige smb.conf bevat een 'include'-regel of "
+"een optie die meerdere regels beslaat, het kan zijn dat dit dit het "
+"automatische configuratieproces in verwarring brengt. In dat geval dient u "
+"uw smb.conf handmatig aan te passen om samba terug werkend te krijgen."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
-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 "Indien u geen gebruik maakt van deze optie, dient u alle configuratie instellingen zelf te doen, en zult u geen voordeel halen uit de periodieke configuratie-verbeteringen."
+#: ../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 ""
+"Indien u geen gebruik maakt van deze optie, dient u alle configuratie "
+"instellingen zelf te doen, en zult u geen voordeel halen uit de periodieke "
+"configuratie-verbeteringen."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Werkgroep/Domeinnaam:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
-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 "Van welke werkgroep moet deze server deel lijken uit te maken, wanneer clients hierom vragen?. Merk op dat deze parameter ook de domeinnaam die gebruikt wordt voor de security=domein instelling bepaald."
+#: ../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 ""
+"Van welke werkgroep moet deze server deel lijken uit te maken, wanneer "
+"clients hierom vragen?. Merk op dat deze parameter ook de domeinnaam die "
+"gebruikt wordt voor de security=domein instelling bepaald."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Wachtwoordversleuteling gebruiken?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
-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 "De meeste windows-clients maken gebruik van versleutelde wachtwoorden bij de communicatie met SMB-servers. Als u 'onversleutelde tekst'-wachtwoorden wilt gebruiken dient u een parameter te veranderen in de Windows registry."
+#: ../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 ""
+"De meeste windows-clients maken gebruik van versleutelde wachtwoorden bij de "
+"communicatie met SMB-servers. Als u 'onversleutelde tekst'-wachtwoorden wilt "
+"gebruiken dient u een parameter te veranderen in de Windows registry."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
-msgid "Choosing this option is highly recommended. If you do, make sure you have a valid /etc/samba/smbpasswd file and that you set passwords in there for each user using the smbpasswd command."
-msgstr "Deze optie is ten sterkste aangeraden. Indien u hiervoor kiest dient u er wel voor te zorgen dat u een geldig /etc/samba/smbpasswd bestand heeft en dat u de wachtwoorden daar voor elke gebruiker met behulp van smbpasswd insteld. "
+#: ../samba-common.templates:6001
+#, fuzzy
+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 ""
+"Deze optie is ten sterkste aangeraden. Indien u hiervoor kiest dient u er "
+"wel voor te zorgen dat u een geldig /etc/samba/smbpasswd bestand heeft en "
+"dat u de wachtwoorden daar voor elke gebruiker met behulp van smbpasswd "
+"insteld. "
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Samba wachtwoord database, /var/lib/samba/passdb.tdb, aanmaken?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
-msgid "To be compatible with the defaults in most versions of Windows, Samba must be configured to use encrypted passwords.  This requires user passwords to be stored in a file separate from /etc/passwd."
-msgstr "Om compatibel te zijn met de standaardwaarden van de meeste Windows-versies dient Samba ingesteld te zijn om gebruik te maken van versleutelde wachtwoorden. De door samba gebruikte gebruikerswachtwoorden worden niet opgeslagen in /etc/passwd maar in een apart bestand."
+#: ../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 "
+"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 ""
+"Om compatibel te zijn met de standaardwaarden van de meeste Windows-versies "
+"dient Samba ingesteld te zijn om gebruik te maken van versleutelde "
+"wachtwoorden. De door samba gebruikte gebruikerswachtwoorden worden niet "
+"opgeslagen in /etc/passwd maar in een apart bestand."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
-msgid "This file can be created automatically, but the passwords must be added manually (by running smbpasswd) and be kept up-to-date in the future.  If you do not create it, you will have to reconfigure samba (and probably your client machines) to use plaintext passwords."
-msgstr "Dit bestand kan automatisch aangemaakt worden. De wachtwoorden dienen nu echter wel handmatig toegevoegd (en bijgehouden) te worden (via smbpasswd). Als u dit bestand niet automatisch laat aanmaken dient de samba-configuratie (en waarschijnlijk die van uw client-machines) aangepast te worden om 'onversleutelde tekst'-wachtwoorden te gebruiken."
+#: ../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 ""
+"Dit bestand kan automatisch aangemaakt worden. De wachtwoorden dienen nu "
+"echter wel handmatig toegevoegd (en bijgehouden) te worden (via smbpasswd). "
+"Als u dit bestand niet automatisch laat aanmaken dient de samba-configuratie "
+"(en waarschijnlijk die van uw client-machines) aangepast te worden om "
+"'onversleutelde tekst'-wachtwoorden te gebruiken."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
-msgid "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more details."
-msgstr "Meer informatie vindt u in /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html uit het 'samba-doc'-pakket."
+#: ../samba.templates:1001
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+"Meer informatie vindt u in /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
+"uit het 'samba-doc'-pakket."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Samba's log bestanden zijn verhuisd"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
-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."
+#: ../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:19
-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."
+#: ../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:29
+#: ../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:29
-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."
+#: ../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:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "achtergronddiensten, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Samba uitvoermethode:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
-msgid "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a daemon is the recommended approach."
-msgstr "De Samba-achtergronddienst smbd kan als een normale achtergronddienst of via inetd draaien. Als een achtergronddienst is de aangeraden aanpak."
+#: ../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 ""
+"De Samba-achtergronddienst smbd kan als een normale achtergronddienst of via "
+"inetd draaien. Als een achtergronddienst is de aangeraden aanpak."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
-msgid "Samba 3.0 introduced a more complete SAM database interface which supersedes the /etc/samba/smbpasswd file."
-msgstr "Samba 3.0 introduceerde een meer complete SAM-databaseinterface die het /etc/samba/smbpasswd bestand vervangt. "
+#: ../samba.templates:5001
+msgid ""
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
+msgstr ""
+"Samba 3.0 introduceerde een meer complete SAM-databaseinterface die het /etc/"
+"samba/smbpasswd bestand vervangt. "
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
-msgid "Please confirm whether you would like the existing smbpasswd file to be automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this option if you plan to use another pdb backend (e.g., LDAP) instead."
-msgstr "Bent u zeker dat u het bestaande 'smbpasswd'-bestand naar /var/lib/samba/passdb.tdb wilt migreren? Als u een ander pdb-backend gebruikt (bv. LDAP) dient u hier te weigeren."
+#: ../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 ""
+"Bent u zeker dat u het bestaande 'smbpasswd'-bestand naar /var/lib/samba/"
+"passdb.tdb wilt migreren? Als u een ander pdb-backend gebruikt (bv. LDAP) "
+"dient u hier te weigeren."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "Configuratiebestand is herschreven door SWAT"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "Configuratiebestand is herschreven door SWAT"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ""
+#~ "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-04 00:28:05 UTC (rev 1104)
+++ trunk/po/pt.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.0.9-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\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"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -16,13 +16,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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:3
+#: ../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 "
@@ -37,13 +37,21 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -51,29 +59,23 @@
 "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 "
+"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: string
-#. Description
-#: ../samba-common.templates:13
-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: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -90,22 +92,22 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
-"Para tirar partido desta funcionalidade tem de ter instalado o pacote "
-"dhcp3-client."
+"Para tirar partido desta funcionalidade tem de ter instalado o pacote dhcp3-"
+"client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurar automaticamente o smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -123,7 +125,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -135,13 +137,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome do Grupo de trabalho/Domínio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "
@@ -153,13 +155,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Utilizar encriptação de passwords?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 "
@@ -171,29 +173,33 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
-"É altamente recomendado que escolha esta opção. Se o fizer, assegure-se "
-"que tem um ficheiro /etc/samba/smbpasswd válido e que define as passwords "
-"para cada utilizador utilizando o comando smbpasswd."
+"É altamente recomendado que escolha esta opção. Se o fizer, assegure-se que "
+"tem um ficheiro /etc/samba/smbpasswd válido e que define as passwords para "
+"cada utilizador utilizando o comando smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Criar base de dados de passwords samba, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
+"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 ""
 "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 "
@@ -202,49 +208,48 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"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."
+"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."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
 msgstr ""
-"Para mais detalhes veja /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
-"do pacote samba-doc."
+"Para mais detalhes veja /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html do "
+"pacote samba-doc."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Os ficheiros de log de Samba foram movidos."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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."
+"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:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
@@ -254,13 +259,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../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 "
@@ -268,25 +273,25 @@
 "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."
+"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:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Método de execução do Samba:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -296,13 +301,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -312,7 +317,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 "
@@ -322,23 +327,17 @@
 "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)."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "Ficheiro de configuração reescrito pelo SWAT"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "Ficheiro de configuração reescrito pelo SWAT"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ""
+#~ "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?"

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/pt_BR.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\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"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -25,34 +25,43 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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:3
+#: ../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."
+"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
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -60,30 +69,21 @@
 "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."
+"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: string
-#. Description
-#: ../samba-common.templates:13
-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: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -100,22 +100,22 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
-"O pacote dhcp3-client deve estar instalado para que esse recurso possa "
-"ser utilizado."
+"O pacote dhcp3-client deve estar instalado para que esse recurso possa ser "
+"utilizado."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurar smb.conf automaticamente ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -128,107 +128,108 @@
 "no arquivo /etc/samba/smb.conf, que é o arquivo usado para configurar os "
 "programas Samba (nmbd e smbd). Seu arquivo smb.conf atual contém uma linha "
 "'include' ou uma opção que ocupa diversas linhas, o que pode confundir o "
-"processo de configuração automatizado e requerer que você edite seu "
-"arquivo smb.conf manualmente para torná-lo funcional novamente."
+"processo de configuração automatizado e requerer que você edite seu arquivo "
+"smb.conf manualmente para torná-lo funcional novamente."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 ""
-"Caso você opte por essa opção, você precisará lidar com quaisquer "
-"mudanças de configuração manualmente e você não poderá aproveitar "
-"os melhoramentos periódicos de configuração."
+"Caso você opte por essa opção, você precisará lidar com quaisquer mudanças "
+"de configuração manualmente e você não poderá aproveitar os melhoramentos "
+"periódicos de configuração."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome de Domínio/Grupo de Trabalho :"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 ""
-"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 controla o nome de Domínio usado com a configuração security=domain."
+"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 "
+"controla o nome de Domínio usado com a configuração security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Usar senhas criptografadas ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 ""
-"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."
+"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."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 de possuir um arquivo /etc/samba/smbpasswd e que você "
-"tenha senhas definidas no mesmo para cada usuário usando o comando "
-"smbpasswd."
+"Escolher 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."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Gerar a base de dados para senhas /var/lib/samba/passdb.tdb ?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
+"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 ""
 "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."
+"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."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"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."
+"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."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -238,41 +239,41 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Arquivos de log do Samba movidos"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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."
+"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:19
+#: ../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."
+"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:29
+#: ../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:29
+#: ../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 "
@@ -287,19 +288,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Método de execução do Samba :"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -309,51 +310,45 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
 msgstr ""
-"O Samba 3.0 introduziu uma interface mais completa com a base de dados "
-"SAM, a qual substitui o arquivo /etc/samba/smbpasswd."
+"O Samba 3.0 introduziu uma interface mais completa com a base de dados SAM, "
+"a qual substitui o arquivo /etc/samba/smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 ""
-"Por favor, confirme se você gostaria que o arquivo smbpasswd existente "
-"fosse migrado automaticamente para /var/lib/samba/passdb.tdb. Não "
-"aceite essa opção caso você planeje utilizar um outro backend pdb "
-"(como LDAP, por exemplo)."
+"Por favor, confirme se você gostaria que o arquivo smbpasswd existente fosse "
+"migrado automaticamente para /var/lib/samba/passdb.tdb. Não aceite essa "
+"opção caso você planeje utilizar um outro backend pdb (como LDAP, por "
+"exemplo)."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "Arquivo de configuração reescrito pelo SWAT"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "Arquivo de configuração reescrito pelo SWAT"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ""
+#~ "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 ?"

Modified: trunk/po/ro.po
===================================================================
--- trunk/po/ro.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/ro.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: samba_po_ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\n"
 "PO-Revision-Date: 2006-07-22 16:24+0300\n"
 "Last-Translator: Eddy PetriÅŸor <eddy.petrisor at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -22,80 +22,103 @@
 "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:3
+#: ../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:3
+#: ../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."
+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
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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."
+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: string
-#. Description
-#: ../samba-common.templates:13
-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: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
-# RO: prefer să nu folosesc termeni de genul „calculatorul dvs.”; de multe ori nu e cazul şi sună mai puţin profesional.
+#: ../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 "Dacă acest calculator primeşte informaţiile IP (de configurare a reţelei) de la un server DHCP din reţea, acel server ar putea să ofere informaţii şi despre serverele WINS („Serverele NetBIOS de nume”) prezente în reţea. Acest lucru necesită o schimbare a fişierului smb.conf astfel încât configuraţiile WINS oferite prin DHCP vor fi citite automat din /etc/samba/dhcp.conf."
+msgstr ""
+"Dacă acest calculator primeşte informaţiile IP (de configurare a reţelei) de "
+"la un server DHCP din reţea, acel server ar putea să ofere informaţii şi "
+"despre serverele WINS („Serverele NetBIOS de nume”) prezente în reţea. Acest "
+"lucru necesită o schimbare a fişierului smb.conf astfel încât configuraţiile "
+"WINS oferite prin DHCP vor fi citite automat din /etc/samba/dhcp.conf."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
-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."
+#: ../samba-common.templates:3001
+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:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "Se configură smb.conf automat?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -103,186 +126,226 @@
 "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 "Restul configuraţiei Samba tratează întrebările care afectează parametrii din /etc/samba/smb.conf, fişierul utilizat pentru a configura programele Samba (nmbd şi smbd). Actualul fişier smb.conf conţine o linie „include” sau o opţiune care se desfăşoară de-a lungul a mai multor linii, lucru care ar putea să creeze confuzie în procesul de configurare automată şi ar putea duce la necesitatea editării manuale a fişierului smb.conf pentru a-l face din nou funcţional."
+msgstr ""
+"Restul configuraţiei Samba tratează întrebările care afectează parametrii "
+"din /etc/samba/smb.conf, fiÅŸierul utilizat pentru a configura programele "
+"Samba (nmbd şi smbd). Actualul fişier smb.conf conţine o linie „include” sau "
+"o opţiune care se desfăşoară de-a lungul a mai multor linii, lucru care ar "
+"putea să creeze confuzie în procesul de configurare automată şi ar putea "
+"duce la necesitatea editării manuale a fişierului smb.conf pentru a-l face "
+"din nou funcţional."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "Dacă nu selectaţi aceasta opţiune, va trebui să gestionaţi personal orice schimbare a configuraţiei şi nu veţi putea beneficia de îmbunătăţirile periodice ale configuraţiei."
+msgstr ""
+"Dacă nu selectaţi aceasta opţiune, va trebui să gestionaţi personal orice "
+"schimbare a configuraţiei şi nu veţi putea beneficia de îmbunătăţirile "
+"periodice ale configuraţiei."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Grupul de lucru/Numele de domeniu:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "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ă şi numele de domeniu folosit cu opţiunea security=domain."
+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ă "
+"şi numele de domeniu folosit cu opţiunea security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Se folosc parole criptate? "
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 "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 un parametru în registrul Windows."
+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 "
+"un parametru în registrul Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 "Alegerea acestei opţiuni este puternic recomandată. Dacă o alegeţi, asiguraţi-vă că fişierul /etc/samba/smbpasswd este valid şi că aţi pus acolo o parolă pentru fiecare utillizator folosind comanda smbpasswd."
+msgstr ""
+"Alegerea acestei opţiuni este puternic recomandată. Dacă o alegeţi, "
+"asiguraţi-vă că fişierul /etc/samba/smbpasswd este valid şi că aţi pus acolo "
+"o parolă pentru fiecare utillizator folosind comanda smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Se creează baza de date cu parole /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
-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."
+"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 ""
+"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."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
-msgstr "Acest fişier poate fi creat automat, dar parolele trebuie adăugate manual (prin rularea smbpasswd) şi trebuie actualizat de acum înainte. Dacă nu-l creaţi va trebui să reconfiguraţi samba (probabil şi calculatoarele client) să folosească parole necriptate."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
+msgstr ""
+"Acest fişier poate fi creat automat, dar parolele trebuie adăugate manual "
+"(prin rularea smbpasswd) şi trebuie actualizat de acum înainte. Dacă nu-l "
+"creaţi va trebui să reconfiguraţi samba (probabil şi calculatoarele client) "
+"să folosească parole necriptate."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
-msgstr "A se vedea /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html din pachetul samba-doc pentru mai multe detalii."
+msgstr ""
+"A se vedea /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html din pachetul "
+"samba-doc pentru mai multe detalii."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Jurnalele lui Samba s-au mutat"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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."
+"log/samba/. Numele fiÅŸierelor sunt log.nmbd ÅŸi log.smbd, pentru nmbd ÅŸi "
+"respectiv smbd."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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."
+msgstr ""
+"Vechile fişiere jurnal din /var/log/ vor fi mutate automat în noul loc."
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../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ă."
+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:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "demoni, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Metoda de rulare a Samba:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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 "Demonul Samba smbd poate rula ca un demon normal sau din inetd. Rularea ca demon este abordarea recomandată."
+msgstr ""
+"Demonul Samba smbd poate rula ca un demon normal sau din inetd. Rularea ca "
+"demon este abordarea recomandată."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
-msgstr "Samba 3.0 a introdus o interfaţă pentru baza de date SAM mai completă care înlocuieşte fişierul /etc/samba/smbpasswd."
+msgstr ""
+"Samba 3.0 a introdus o interfaţă pentru baza de date SAM mai completă care "
+"înlocuieşte fişierul /etc/samba/smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 "Vă rugăm să confirmaţi dacă doriţi ca fişierul smbpasswd existent să fie migrat automat în /var/lib/samba/passdb.tdb. Nu alegeţi această opţiune dacă plănuiţi să folosiţi un alt suport pentru pdb (ex. LDAP)."
+msgstr ""
+"Vă rugăm să confirmaţi dacă doriţi ca fişierul smbpasswd existent să fie "
+"migrat automat în /var/lib/samba/passdb.tdb. Nu alegeţi această opţiune dacă "
+"plănuiţi să folosiţi un alt suport pentru pdb (ex. LDAP)."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "FiÅŸier de configurare rescris de SWAT"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "FiÅŸier de configurare rescris de SWAT"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 va rescrie fişierul smb.conf. Va rearanja intrările şi va şterge toate comentariile, şi opţiunile include= şi copy=. Dacă folosiţi un fişier smb.conf modificat mult, probabil că ar trebui sa evitaţi să folosiţ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 va rescrie fişierul smb.conf. Va rearanja intrările şi va şterge "
+#~ "toate comentariile, şi opţiunile include= şi copy=. Dacă folosiţi un "
+#~ "fişier smb.conf modificat mult, probabil că ar trebui sa evitaţi să "
+#~ "folosiţi SWAT."

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/ru.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: samba-3.0.23rc1-1_ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -16,13 +16,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Кодировка для файловой системы Unix"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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 "
@@ -30,19 +30,27 @@
 "controls how Samba interprets filenames on the file system."
 msgstr ""
 "Сейчас у вас есть опция \"character set\" в smb.conf. В Samba 3.0 эта опция "
-"заменена новой опцией, \"unix charset\". Укажите кодировку, которую вы желаете "
-"использовать для этой новой опции. Она отвечает за то, как Samba "
+"заменена новой опцией, \"unix charset\". Укажите кодировку, которую вы "
+"желаете использовать для этой новой опции. Она отвечает за то, как Samba "
 "интерпретирует имена файлов в файловой системе."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -53,24 +61,18 @@
 "Сейчас у вас есть опция \"client code page\" в smb.conf. В Samba 3.0 эта "
 "опция заменена на \"dos charset\". Укажите кодировку, которую вы желаете "
 "использовать для этой новой опции. В большинстве случаев значения по "
-"умолчанию будет достаточно. Обратите внимание, что эта опция не нужна для поддержки "
-"клиентов Windows, она только для клиентов DOS."
+"умолчанию будет достаточно. Обратите внимание, что эта опция не нужна для "
+"поддержки клиентов Windows, она только для клиентов DOS."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Если вы оставите эту опцию пустой, ваш файл smb.conf не будет изменен."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Изменить smb.conf для использования настроек WINS из DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../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 "
@@ -86,19 +88,22 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "Чтобы воспользоваться этой возможностью, должен быть установлен пакет dhcp3-client."
+#: ../samba-common.templates:3001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Чтобы воспользоваться этой возможностью, должен быть установлен пакет dhcp3-"
+"client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "Настроить smb.conf автоматически?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -110,77 +115,87 @@
 "Оставшаяся часть настройки Samba состоит из вопросов, которые затрагивают "
 "параметры в /etc/samba/smb.conf. Этот файл используется для настройки "
 "программ Samba (nmbd и smbd). Ваш текущий smb.conf содержит строку 'include' "
-"или опцию, которая состоит из нескольких строк. Это может смутить процесс автонастройки и "
-"потребовать от вас ручного редактирования вашего smb.conf для восстановления "
-"работоспособности."
+"или опцию, которая состоит из нескольких строк. Это может смутить процесс "
+"автонастройки и потребовать от вас ручного редактирования вашего smb.conf "
+"для восстановления работоспособности."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "Если вы не используете эту возможность, то должны будете самостоятельно заботиться обо всех изменениях настроек, и не сможете воспользоваться преимуществами периодического улучшения настроек."
+msgstr ""
+"Если вы не используете эту возможность, то должны будете самостоятельно "
+"заботиться обо всех изменениях настроек, и не сможете воспользоваться "
+"преимуществами периодического улучшения настроек."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Имя рабочей группы/домена?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "Задайте рабочую группу, в которой появится ваш сервер. Обратите внимание, что этот параметр также задает имя домена, которое используется при security=domain."
+msgstr ""
+"Задайте рабочую группу, в которой появится ваш сервер. Обратите внимание, "
+"что этот параметр также задает имя домена, которое используется при "
+"security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Использовать шифрацию паролей?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 ""
-"Большинство клиентов Windows общаются с серверами SMB с использованием шифрованных "
-"паролей. Если вы пожелаете использовать открытые пароли, вам придется "
-"изменить параметр в реестре Windows."
+"Большинство клиентов Windows общаются с серверами SMB с использованием "
+"шифрованных паролей. Если вы пожелаете использовать открытые пароли, вам "
+"придется изменить параметр в реестре Windows."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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."
+"Рекомендуется выбрать эту опцию. В этом случае убедитесь, что у вас "
+"правильный файл /etc/samba/smbpasswd и что вы установили там пароли для "
+"каждого пользователя командой smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Создать базу данных паролей samba, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
+"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, "
 "Samba должна быть настроена на использование шифрованных паролей.  Это "
@@ -188,76 +203,89 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
-msgstr "Этот файл может быть создан автоматически, но пароли должны быть добавлены вручную (с помощью smbpasswd) и постоянно поддерживаться в актуальном состоянии. Если вы не создадите этот файл, то должны перенастроить samba (и, вероятно, ваши клиентские машины) на использование открытых паролей."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
+msgstr ""
+"Этот файл может быть создан автоматически, но пароли должны быть добавлены "
+"вручную (с помощью smbpasswd) и постоянно поддерживаться в актуальном "
+"состоянии. Если вы не создадите этот файл, то должны перенастроить samba (и, "
+"вероятно, ваши клиентские машины) на использование открытых паролей."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 из пакета samba-doc."
+msgstr ""
+"Более подробно смотрите в /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
+"из пакета samba-doc."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "log-файлы Samba переместились."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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 соответственно."
+msgstr ""
+"Файлы журналов для демонов Samba (nmbd и smbd) хранятся теперь в /var/log/"
+"samba/. Файлы называются log.nmbd и log.smbd для nmbd и smbd соответственно."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
-msgstr "Старые файлы журналов будут автоматически перемещены из /var/log/ в новое место."
+msgstr ""
+"Старые файлы журналов будут автоматически перемещены из /var/log/ в новое "
+"место."
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../samba.templates:3001
 msgid "Running nmbd from inetd no longer supported"
 msgstr "Запуск nmbd из inetd более не поддерживается"
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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 запускался."
+msgstr ""
+"Ваша система была ранее настроена на запуск nmbd и smbd из inetd. nmbd в "
+"последних версиях Samba более не запускается из inetd. Если вы изменили ваш "
+"стартовый скрипт /etc/init.d/samba, то вам необходимо откорректировать его "
+"вручную, чтобы nmbd запускался."
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "daemons, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Способ запуска Samba:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -267,13 +295,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -283,30 +311,24 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 (например, LDAP), вы должны "
-"ответить здесь 'нет'."
+"Желаете, чтобы ваш существующий файл smbpasswd мигрировал в /var/lib/samba/"
+"passdb.tdb?  Если вы планируете вместо него использовать другой интерфейс "
+"pdb (например, LDAP), вы должны ответить здесь 'нет'."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "SWAT перепишет файл настроек"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "SWAT перепишет файл настроек"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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."
-
+#~ 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-04 00:28:05 UTC (rev 1104)
+++ trunk/po/sv.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.0.20b-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -24,204 +24,327 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Teckenuppsättning för UNIX-filsystem"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
-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."
+#: ../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
-#: ../samba-common.templates:13
-msgid "Character Set for DOS clients"
-msgstr "Teckenuppsättning för DOS-klienter"
+#. 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:13
-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."
+#: ../samba-common.templates:2001
+msgid "Character Set for DOS clients"
+msgstr "Teckenuppsättning för DOS-klienter"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
-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."
+#: ../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:25
+#: ../samba-common.templates:3001
 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:25
-msgid "If your computer gets IP address information from a DHCP server on the network, the DHCP server may also provide information about WINS servers (\"NetBIOS name servers\") present on the network.  This requires a change to your smb.conf file so that DHCP-provided WINS settings will automatically be read from /etc/samba/dhcp.conf."
-msgstr "Om din dator får en IP-address och information från en DHCP-server på nätverket kan även DHCP-server också skicka information om WINS-servrar (\"NetBIOS namnservrar\") i ditt nätverk.  Detta kräver en ändring i din fil smb.conf så att WINS-inställningar från DHCP-servern automatiskt kan läsas från /etc/samba/dhcp.conf."
+#: ../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 ""
+"Om din dator får en IP-address och information från en DHCP-server på "
+"nätverket kan även DHCP-server också skicka information om WINS-servrar "
+"(\"NetBIOS namnservrar\") i ditt nätverk.  Detta kräver en ändring i din fil "
+"smb.conf så att WINS-inställningar från DHCP-servern automatiskt kan läsas "
+"från /etc/samba/dhcp.conf."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "Paketet dhcp3-client måste installeras för att kunna använda denna funktion."
+#: ../samba-common.templates:3001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Paketet dhcp3-client måste installeras för att kunna använda denna funktion."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr "Konfigurera smb.conf automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
-msgid "The rest of the configuration of Samba deals with questions that affect parameters in /etc/samba/smb.conf, which is the file used to configure the Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' line or an option that spans multiple lines, which could confuse the automated configuration process and require you to edit your smb.conf by hand to get it working again."
-msgstr "Resten av Samba-konfigurationen hanterar frågor som rör parametrar i /etc/samba/smb.conf, vilken är den fil som används för att konfigurera Samba-programmen (nmbd och smbd). Din aktuella smb.conf innehåller en \"include\"-rad eller ett alternativ som spänner över flera rader som kan göra Debconf förvirrad och kan innebära att du måste redigera din smb.conf på egen hand för att få det att fungera igen."
+#: ../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 ""
+"Resten av Samba-konfigurationen hanterar frågor som rör parametrar i /etc/"
+"samba/smb.conf, vilken är den fil som används för att konfigurera Samba-"
+"programmen (nmbd och smbd). Din aktuella smb.conf innehåller en \"include\"-"
+"rad eller ett alternativ som spänner över flera rader som kan göra Debconf "
+"förvirrad och kan innebära att du måste redigera din smb.conf på egen hand "
+"för att få det att fungera igen."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
-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 "Om du inte väljer detta alternativ måste du hantera alla konfigurationsändringar på egen hand och kan därför inte utnyttja fördelarna med periodiska konfigurationsförbättringar."
+#: ../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 ""
+"Om du inte väljer detta alternativ måste du hantera alla "
+"konfigurationsändringar på egen hand och kan därför inte utnyttja fördelarna "
+"med periodiska konfigurationsförbättringar."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Arbetsgrupp/Domännamn:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
-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 "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 parametern \"security=domain\"."
+#: ../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 ""
+"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 "
+"parametern \"security=domain\"."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Använd lösenordskryptering?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
-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 "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 parameter i Windows registry."
+#: ../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 ""
+"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 "
+"parameter i Windows registry."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
-msgid "Choosing this option is highly recommended. If you do, make sure you have a valid /etc/samba/smbpasswd file and that you set passwords in there for each user using the smbpasswd command."
-msgstr "Det rekommenderas att du väljer detta alternativ. Om du gör det, kontrollera att du har en giltig /etc/samba/smbpasswd och att du har ställt in lösenorden där för varje användare med kommandot smbpasswd."
+#: ../samba-common.templates:6001
+#, fuzzy
+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 ""
+"Det rekommenderas att du väljer detta alternativ. Om du gör det, kontrollera "
+"att du har en giltig /etc/samba/smbpasswd och att du har ställt in "
+"lösenorden där för varje användare med kommandot smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Skapa Sambas lösenordsdatabas, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
-msgid "To be compatible with the defaults in most versions of Windows, Samba must be configured to use encrypted passwords.  This requires user passwords to be stored in a file separate from /etc/passwd."
-msgstr "För att vara kompatibel med standardvärden i de flesta versioner av Windows måste Samba konfigureras att använda krypterade lösenord.  Detta kräver att användarnas lösenord lagras i en fil separerad från /etc/passwd."
+#: ../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 "
+"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 ""
+"För att vara kompatibel med standardvärden i de flesta versioner av Windows "
+"måste Samba konfigureras att använda krypterade lösenord.  Detta kräver att "
+"användarnas lösenord lagras i en fil separerad från /etc/passwd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
-msgid "This file can be created automatically, but the passwords must be added manually (by running smbpasswd) and be kept up-to-date in the future.  If you do not create it, you will have to reconfigure samba (and probably your client machines) to use plaintext passwords."
-msgstr "Denna fil kan skapas automatiskt men lösenorden måste läggas till manuellt (genom att köra smbpasswd) och måste hållas uppdaterad i framtiden.  Om du inte skapar den måste du konfigurera om samba (och antagligen även dina klientmaskiner) till att använda lösenord i klartext."
+#: ../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 ""
+"Denna fil kan skapas automatiskt men lösenorden måste läggas till manuellt "
+"(genom att köra smbpasswd) och måste hållas uppdaterad i framtiden.  Om du "
+"inte skapar den måste du konfigurera om samba (och antagligen även dina "
+"klientmaskiner) till att använda lösenord i klartext."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
-msgid "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more details."
-msgstr "Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html från paketet samba-doc för mer information."
+#: ../samba.templates:1001
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+"Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html från paketet samba-doc "
+"för mer information."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr "Sambas loggfiler har flyttats"
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
-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."
+#: ../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:19
-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."
+#: ../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:29
+#: ../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:29
-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."
+#: ../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:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "demoner, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Körmetod för Samba:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
-msgid "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a daemon is the recommended approach."
-msgstr "Samba-demonen smbd kan köras som en normal demon eller från inetd. Köra som en demon är den rekommenderade metoden."
+#: ../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 ""
+"Samba-demonen smbd kan köras som en normal demon eller från inetd. Köra som "
+"en demon är den rekommenderade metoden."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
-msgid "Samba 3.0 introduced a more complete SAM database interface which supersedes the /etc/samba/smbpasswd file."
-msgstr "Samba 3.0 introducerade ett mer komplett gränssnitt för SAM-databasen som åsidosätter filen /etc/samba/smbpasswd."
+#: ../samba.templates:5001
+msgid ""
+"Samba 3.0 introduced a more complete SAM database interface which supersedes "
+"the /etc/samba/smbpasswd file."
+msgstr ""
+"Samba 3.0 introducerade ett mer komplett gränssnitt för SAM-databasen som "
+"åsidosätter filen /etc/samba/smbpasswd."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
-msgid "Please confirm whether you would like the existing smbpasswd file to be automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this option if you plan to use another pdb backend (e.g., LDAP) instead."
-msgstr "Bekräfta att du vill migrera din existerande smbpasswd till /var/lib/samba/passdb.tdb.  Välj inte detta alternativ om du istället planerar att använda ett annat pdb-baksystem (till exempel LDAP)."
+#: ../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 ""
+"Bekräfta att du vill migrera din existerande smbpasswd till /var/lib/samba/"
+"passdb.tdb.  Välj inte detta alternativ om du istället planerar att använda "
+"ett annat pdb-baksystem (till exempel LDAP)."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "Konfigurationsfilen omskriven av SWAT"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "Konfigurationsfilen omskriven av SWAT"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ""
+#~ "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-04 00:28:05 UTC (rev 1104)
+++ trunk/po/templates.pot	2006-08-04 01:43:58 UTC (rev 1105)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -26,13 +26,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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 "
@@ -42,13 +42,21 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -57,21 +65,15 @@
 "is not needed to support Windows clients, it is only for DOS clients."
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr ""
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../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 "
@@ -82,20 +84,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 msgid "Configure smb.conf automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -107,7 +109,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -116,13 +118,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "
@@ -131,13 +133,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../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 "
@@ -146,41 +148,41 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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."
+"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 ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -188,13 +190,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid "Samba's log files moved"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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 "
@@ -203,7 +205,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
@@ -211,13 +213,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../samba.templates:3001
 msgid "Running nmbd from inetd no longer supported"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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 "
@@ -227,19 +229,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -247,13 +249,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -261,24 +263,9 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 ""
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ""

Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/tr.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\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"
@@ -16,13 +16,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 msgid "Character Set for Unix filesystem"
 msgstr "Unix dosya sistemi için karakter seti"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../samba-common.templates:1001
 #, fuzzy
 msgid ""
 "The \"character set\" option is currently configured in smb.conf.  In Samba "
@@ -37,13 +37,22 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../samba-common.templates:2001
 #, fuzzy
 msgid ""
 "The \"client code page\" option is currently configured in smb.conf.  In "
@@ -60,16 +69,9 @@
 "sadece DOS istemcileri içindir.  Eğer bu seçeneği boş bırakırsanız smb.conf "
 "dosyanız değiştirilmeyecektir."
 
-#. Type: string
-#. Description
-#: ../samba-common.templates:13
-#, fuzzy
-msgid "If you leave this option blank, the smb.conf file will not be changed."
-msgstr "Bu seçeneği boş bırakırsanız, smb.conf dosyanız değiştirilmeyecektir."
-
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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 "
@@ -77,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../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 "
@@ -93,7 +95,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 #, fuzzy
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
@@ -103,14 +105,14 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid "Configure smb.conf automatically?"
 msgstr "\"smb.conf\" dosyası debconf ile yapılandırılsın mı?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
@@ -129,7 +131,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../samba-common.templates:4001
 #, fuzzy
 msgid ""
 "If you do not choose this option, you will have to handle any configuration "
@@ -144,14 +146,14 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid "Workgroup/Domain Name:"
 msgstr "Çalışma Grubu/Etki Alanı İsmi?"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 #, fuzzy
 msgid ""
 "Please specify the workgroup this server will appear to be in when queried "
@@ -165,13 +167,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 msgid "Use password encryption?"
 msgstr "Parola şifrelenmesi kullanılsın mı?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
 "Most Windows clients communicate with SMB servers using encrypted passwords. "
@@ -187,10 +189,10 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 #, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -203,28 +205,28 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Samba parola veritabanı /var/lib/samba/passwd.tdb yaratılsın mı?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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."
+"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 ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 #, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
 msgstr ""
 "Windows'un çoğu sürümüyle uyumlu olması için, Samba'nın şifreli parolaları "
 "kullanmak üzere yapılandırılması gerekir.  Bu işlem kullanıcı parolalarının /"
@@ -238,7 +240,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -246,14 +248,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid "Samba's log files moved"
 msgstr "Samba'nın günce dosyaları taşındı."
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The log files for both Samba daemons (nmbd and smbd) are now stored in /var/"
@@ -266,7 +268,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 #, fuzzy
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
@@ -276,14 +278,14 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../samba.templates:3001
 #, fuzzy
 msgid ""
 "This system was previously configured to start nmbd and smbd from inetd. In "
@@ -299,19 +301,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "artalan süreçleri, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -321,13 +323,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -335,7 +337,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 #, fuzzy
 msgid ""
 "Please confirm whether you would like the existing smbpasswd file to be "
@@ -348,25 +350,16 @@
 "başka bir pdb arkayüzü (ör. LDAP) kullanmayı planlıyorsanız, burada 'hayır' "
 "cevabını vermelisiniz."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../swat.templates:3
 #, 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 ""
+#~ "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?"

Modified: trunk/po/vi.po
===================================================================
--- trunk/po/vi.po	2006-08-04 00:28:05 UTC (rev 1104)
+++ trunk/po/vi.po	2006-08-04 01:43:58 UTC (rev 1105)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.0.23rc1-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 07:59+0200\n"
+"POT-Creation-Date: 2006-08-03 20:39-0500\n"
 "PO-Revision-Date: 2006-05-30 22:26+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -18,13 +18,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3
+#: ../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:3
+#: ../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 "
@@ -40,13 +40,23 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:13
+#. 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:13
+#: ../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 "
@@ -61,23 +71,15 @@
 "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: string
-#. Description
-#: ../samba-common.templates:13
-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: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:25
+#: ../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 "
@@ -94,20 +96,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:25
+#: ../samba-common.templates:3001
 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:38
+#: ../samba-common.templates:4001
 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:38
+#: ../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 "
@@ -125,7 +127,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:38
+#: ../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 "
@@ -136,13 +138,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../samba-common.templates:5001
 msgid "Workgroup/Domain Name:"
 msgstr "Tên nhóm làm việc/miền:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:52
+#: ../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 "
@@ -154,13 +156,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
 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:60
+#: ../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 "
@@ -173,9 +175,10 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:60
+#: ../samba-common.templates:6001
+#, fuzzy
 msgid ""
-"Choosing this option is highly recommended. If you do, make sure you have a "
+"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 ""
@@ -185,17 +188,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Tạo cơ sở dữ liệu mật khẩu samba </var/lib/samba/passdb.tdb> không?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../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 "
-"be stored in a file separate from /etc/passwd."
+"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 ""
 "Để tương thích với các giá trị mặc định trong phần lớn phiên bản Windows, "
 "phần mềm Samba phải được cấu hình để sử dụng mật khẩu đã mật mã. Việc này "
@@ -204,12 +210,11 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
+#, fuzzy
 msgid ""
-"This file can be created automatically, but the passwords must be added "
-"manually (by running smbpasswd) and be kept up-to-date in the future.  If "
-"you do not create it, you will have to reconfigure samba (and probably your "
-"client machines) to use plaintext passwords."
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
 msgstr ""
 "Tập tin này có thể được tạo tự động, còn các mật khẩu phải được thêm thủ "
 "công (bằng cách chạy lệnh « smbpasswd ») và được cập nhật trong tương lai. "
@@ -218,7 +223,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:4
+#: ../samba.templates:1001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
 "package for more details."
@@ -228,13 +233,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../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:19
+#: ../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 "
@@ -246,7 +251,7 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:19
+#: ../samba.templates:2001
 msgid ""
 "The old log files from /var/log/ will automatically be moved to the new "
 "location."
@@ -256,13 +261,13 @@
 
 #. Type: note
 #. Description
-#: ../samba.templates:29
+#: ../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:29
+#: ../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 "
@@ -276,19 +281,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:37
+#: ../samba.templates:4001
 msgid "daemons, inetd"
 msgstr "trình nền, inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../samba.templates:4002
 msgid "Samba run method:"
 msgstr "Cách chạy Samba:"
 
 #. Type: select
 #. Description
-#: ../samba.templates:39
+#: ../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."
@@ -298,7 +303,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 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> "
@@ -306,7 +311,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../samba.templates:5001
 msgid ""
 "Samba 3.0 introduced a more complete SAM database interface which supersedes "
 "the /etc/samba/smbpasswd file."
@@ -316,7 +321,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:46
+#: ../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 "
@@ -326,24 +331,18 @@
 "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ế."
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-msgid "Configuration file rewritten by SWAT"
-msgstr "Tập tin cấu hình bị ghi lại bởi SWAT"
+#~ msgid "Configuration file rewritten by SWAT"
+#~ msgstr "Tập tin cấu hình bị ghi lại bởi SWAT"
 
-#. Type: note
-#. Description
-#: ../swat.templates:3
-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 ""
+#~ "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?"




More information about the Pkg-samba-maint mailing list