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

[Christian Perrier]

Author: bubulle
Date: 2006-08-15 13:02:44 +0000 (Tue, 15 Aug 2006)
New Revision: 1136

Modified:
   trunk/changelog
   trunk/po/ar.po
   trunk/po/ca.po
   trunk/po/cs.po
   trunk/po/da.po
   trunk/po/de.po
   trunk/po/dz.po
   trunk/po/es.po
   trunk/po/eu.po
   trunk/po/fr.po
   trunk/po/gl.po
   trunk/po/it.po
   trunk/po/ja.po
   trunk/po/km.po
   trunk/po/nl.po
   trunk/po/pt.po
   trunk/po/pt_BR.po
   trunk/po/ro.po
   trunk/po/ru.po
   trunk/po/sv.po
   trunk/po/templates.pot
   trunk/po/tl.po
   trunk/po/tr.po
   trunk/po/vi.po
   trunk/po/zh_CN.po
   trunk/samba.templates
Log:
Split out samba/run_mode to avoid problems like the one we had with Dzongkha
Translations unfuzzied with the trick described in po-debconf(7)


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/changelog	2006-08-15 13:02:44 UTC (rev 1136)
@@ -12,8 +12,11 @@
   * Updated Dzongkha. Closes: #383125.
   * Updated Vietnamese. Closes: #383126.
 
- -- Steve Langasek <vorlon at debian.org>  Tue, 15 Aug 2006 01:21:09 -0700
+  [ Christian Perrier ]
+  * Split out samba/run_mode with "__Choices".
 
+ -- Christian Perrier <bubulle at debian.org>  Tue, 15 Aug 2006 08:01:30 -0500
+
 samba (3.0.23b-2) unstable; urgency=low
 
   [ Debconf translations ]

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/ar.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -173,10 +173,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "رقباء, inetd"
+msgid "daemons"
+msgstr "رقباء"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -218,3 +224,5 @@
 "samba/passdb.tdb. لا تختر هذا الخيار إذا كنت تنوي استعمال قاعدة كلمات مرور "
 "خلفية ( pdb backend) مثل LDAP."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "رقباء, inetd"

Modified: trunk/po/ca.po
===================================================================
--- trunk/po/ca.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/ca.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.0beta2-1_templates\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-13 15:16-0700\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -97,9 +97,9 @@
 "queried by clients. Note that this parameter also controls the domain name "
 "used with the security=domain setting."
 msgstr ""
-"Indiqueu en quin grup de treball voleu que aparegui el vostre servidor "
-"quan ho consultin els clients. Recordeu que aquest parà metre també controla "
-"el nom de domini utilitzat pel parà metre de configuració security=domain."
+"Indiqueu en quin grup de treball voleu que aparegui el vostre servidor quan "
+"ho consultin els clients. Recordeu que aquest parà metre també controla el "
+"nom de domini utilitzat pel parà metre de configuració security=domain."
 
 #. Type: boolean
 #. Description
@@ -162,8 +162,8 @@
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"Si no el creeu, haureu de reconfigurar el Samba (i probablement els "
-"vostres ordinadors clients) per tal que utilitzin contrasenyes de text pla. "
+"Si no el creeu, haureu de reconfigurar el Samba (i probablement els vostres "
+"ordinadors clients) per tal que utilitzin contrasenyes de text pla. "
 
 #. Type: boolean
 #. Description
@@ -178,10 +178,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "dimonis, inetd"
+msgid "daemons"
+msgstr "dimonis"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -224,3 +230,6 @@
 "Confirmeu si voleu que es migri el fitxer smbpasswd a /var/lib/samba/passdb."
 "tdb.  No esculliu aquesta opció si la vostra intenció és utilitzar un altre "
 "pdb (ex, LDAP)."
+
+#~ msgid "daemons, inetd"
+#~ msgstr "dimonis, inetd"

Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/cs.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -185,10 +185,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "démoni, inetd"
+msgid "daemons"
+msgstr "démoni"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -232,3 +238,5 @@
 "na /var/lib/samba/passwd.tdb. Pokud plánujete použít jinou pdb databázi "
 "(třeba LDAP), měli byste odpovědět záporně."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "démoni, inetd"

Modified: trunk/po/da.po
===================================================================
--- trunk/po/da.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/da.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-14 18:37+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -178,10 +178,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "dæmoner, inetd"
+msgid "daemons"
+msgstr "dæmoner"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -224,3 +230,6 @@
 "Bekræft om du ønsker at migrere den eksisterende smbpasswd-fil til /var/lib/"
 "samba/passdb.tdb automatisk. Vælg ikke denne indstilling, hvis du i stedet "
 "planlægger at benytte en anden pdb-håndtering (f.eks. LDAP)."
+
+#~ msgid "daemons, inetd"
+#~ msgstr "dæmoner, inetd"

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/de.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.14a-6.de\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -205,10 +205,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "daemons, inetd"
+msgid "daemons"
+msgstr "daemons"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -254,3 +260,5 @@
 "ein anderes pdb-Backend (z.B. LDAP) zu verwenden, sollten Sie hier mit "
 "'Nein' antworten."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "daemons, inetd"

Modified: trunk/po/dz.po
===================================================================
--- trunk/po/dz.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/dz.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po.pot\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-14 15:36+0530\n"
 "Last-Translator: Jurmey Rabgay <jur_gay at yahoo.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -31,19 +31,33 @@
 #. Description
 #: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
-msgstr "ཌི་ཨེཅ་སི་པི་ནང་ལས་ ཌབ་ལུ་ཨའི་ཨེན་ཨེསི་སྒྲིག་སྟངས་ཚུ་ལག་ལེན་འདབ་ནི་ལུ་ smb.conf ལེགས་བཅོས་འབད་ནི་ཨིན་ན་?"
+msgstr ""
+"ཌི་ཨེཅ་སི་པི་ནང་ལས་ ཌབ་ལུ་ཨའི་ཨེན་ཨེསི་སྒྲིག་སྟངས་ཚུ་ལག་ལེན་འདབ་ནི་ལུ་ smb.conf ལེགས་བཅོས་འབད་ནི་"
+"ཨིན་ན་?"
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:1001
-msgid "If your computer gets IP address information from a DHCP server on the network, the DHCP server may also provide information about WINS servers (\"NetBIOS name servers\") present on the network.  This requires a change to your smb.conf file so that DHCP-provided WINS settings will automatically be read from /etc/samba/dhcp.conf."
-msgstr "ག་དེམ་ཅིག་འབད་ ཁྱོད་ཀྱི་གློག་རིག་གིས་ཡོངས་འབྲེལ་གུའི་ཌི་ཨེཅ་སི་པི་སར་བར་ནང་ལས་ ཨའི་པི་ཁ་བྱང་བརྡ་དོན་འཐོབ་པ་ཅིན་ ཌི་ཨེཅ་སི་པི་སར་བར་གིས་ཡང་ ཡོངས་འབྲེལ་གུ་ཡོད་པའི་ ཌབ་ལུ་ཨའི་ཨེན་ཨེསི་སར་བརསི་ (\"NetBIOS name servers\")གི་སྐོར་ལས་བརྡ་དོན་བྱིན་འོང་། འདི་གི་དོན་ལུ་ ཁྱོད་རའི་ smb.conf ཡིག་སྣོད་བསྒྱུར་བཅོས་འབད་དགོཔ་ཨིན་ དེ་འབད་བ་ཅིན་ བྱིན་ཡོད་པའི་ཌི་ཨེཅ་སི་པི་ ཌབ་ལུ་ཨའི་ཨེན་ཨེསི་སྒྲིག་སྟངས་འདི་ རང་བཞིན་གྱིས་ /etc/samba/dhcp.conf ནང་ལས་ལྷག་འོང་།"
+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:1001
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "ཌི་ཨེཅ་སི་པི་༣-ཞབས་ཏོག་སྤྱོད་མི་ཐུམ་སྒྲིལ་འདི་ ཁྱད་རྣམ་འདི་གི་ཕན་ཐོགས་ལུ་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།"
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"ཌི་ཨེཅ་སི་པི་༣-ཞབས་ཏོག་སྤྱོད་མི་ཐུམ་སྒྲིལ་འདི་ ཁྱད་རྣམ་འདི་གི་ཕན་ཐོགས་ལུ་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།"
 
 #. Type: boolean
 #. Description
@@ -54,14 +68,30 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:2001
-msgid "The rest of the configuration of Samba deals with questions that affect parameters in /etc/samba/smb.conf, which is the file used to configure the Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' line or an option that spans multiple lines, which could confuse the automated configuration process and require you to edit your smb.conf by hand to get it working again."
-msgstr "སམ་བ་གི་རིམ་སྒྲིག་གཞན་མི་ཚུ་ འདྲི་བ་དང་འབྲེལཝ་ལས་ /etc/samba/smb.conf ནང་ཚད་བཟུང་ལུ་ཕན་གནོད་འབྱུངམ་ཨིན་ འདི་ཡང་སམ་བ་ལས་རིམ་ (nmbd and smbd)ཚུ་རིམ་སྒྲིག་འབད་ནི་ལུ་དགོ་པའི་ཡིག་སྣོད་ཨིན། ཁྱོད་ཀྱི་ད་ལྟོའི་ smb.conf ནང་ལུ་ 'include'གྲལ་ཐིག་ ཡངན་ འཕར་ཚད་འགྱོ་མི་གྲལ་ཐིག་སྣ་མང་གི་གདམ་ཁ་ཚུ་ཡོདཔ་ཨིན་ དེ་གིས་ རང་བཞིན་ཅན་གྱི་རིམ་སྒྲིག་ལས་སྦྱོར་འདི་ མགུ་འཐོམ་བཅུགཔ་ཨིནམ་དང་ ལོག་སྟེ་ལཱ་འབད་ནིའི་དོན་ལུ་ ལག་པའི་ཐོག་ལས་ ཁྱོད་རའི་smb.conf ཞུན་དག་འབད་དགོཔ་ཨིན། "
+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:2001
-msgid "If you do not choose this option, you will have to handle any configuration changes yourself, and will not be able to take advantage of periodic configuration enhancements."
-msgstr "ཁྱོད་ཀྱིས་ གདམ་ཁ་འདི་མ་གདམ་པ་ཅིན་ རིམ་སྒྲིག་གི་འགྱུར་བ་གང་རུང་ཅིག་ ཁྱོད་རང་གིས་ལེགས་སྐྱོང་འཐབ་དགོཔ་དང་ དུས་མཚམས་རིམ་སྒྲིག་གོང་སྤེལ་གྱི་ཁེ་ཕན་འཐོབ་མི་ཚུགས།"
+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
@@ -72,8 +102,14 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-msgid "Please specify the workgroup you want this server to appear to be in when queried by clients. Note that this parameter also controls the domain name used with the security=domain setting."
-msgstr "ཞབས་ཏོག་སྤྱོད་མི་གིས་འདྲི་དཔྱད་འབདཝ་ད་ དེ་ནང་ལུ་སར་བར་འབྱུང་ནི་ཨིན་པའི་ལཱ་གི་སྡེ་ཚན་འདི་གསལ་བཀོད་འབད་གནང་། ཚད་བཟུང་འདི་གིས་ སྲུང་སྐྱོབ་=ཌཱ་མཱེན་སྒྲིག་སྟངས་དང་གཅིག་ཁར་ལག་ལེན་འཐབ་ཡོད་པའི་ཌཱ་མཱེན་མིང་ཡང་ ཚད་འཛིན་འབདཝ་ཨིནམ་དྲན་དགོ"
+msgid ""
+"Please specify the workgroup you want this server to appear to be in when "
+"queried by clients. Note that this parameter also controls the domain name "
+"used with the security=domain setting."
+msgstr ""
+"ཞབས་ཏོག་སྤྱོད་མི་གིས་འདྲི་དཔྱད་འབདཝ་ད་ དེ་ནང་ལུ་སར་བར་འབྱུང་ནི་ཨིན་པའི་ལཱ་གི་སྡེ་ཚན་འདི་གསལ་བཀོད་"
+"འབད་གནང་། ཚད་བཟུང་འདི་གིས་ སྲུང་སྐྱོབ་=ཌཱ་མཱེན་སྒྲིག་སྟངས་དང་གཅིག་ཁར་ལག་ལེན་འཐབ་ཡོད་པའི་ཌཱ་མཱེན་མིང་"
+"ཡང་ ཚད་འཛིན་འབདཝ་ཨིནམ་དྲན་དགོ"
 
 #. Type: boolean
 #. Description
@@ -84,46 +120,83 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-msgid "All recent Windows clients communicate with SMB servers using encrypted passwords. If you want to use clear text passwords you will need to change a parameter in your Windows registry."
-msgstr "ཝིན་ཌཱསི་ཞབས་ཏོག་སྤྱོད་མི་མང་ཤོས་ཅིག་གིས་ གསང་བཟོས་ཆོག་ཡིག་ལག་ལེན་གྱི་ཐོག་ལས་ ཨེསི་ཨེམ་བི་སར་བརསི་དང་གཅིག་ཁར་བརྒྱུད་འབྲེལ་འཐབ་ཨིན། ཁྱོད་ཀྱིས་ ཚིག་ཡིག་ཆོག་ཡིག་གསལ་ཏོག་ཏོ་ཅིག་ལག་ལེན་འཐབ་དགོ་མནོ་བ་ཅིན་ ཁྱོད་རའི་ཝིན་ཌཱསི་ཐོ་བཀོད་ནང་ལུ་ཚད་བཟུང་ཅིག་བསྒྱུར་བཅོས་འབད་དགོ"
+msgid ""
+"All recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"ཝིན་ཌཱསི་ཞབས་ཏོག་སྤྱོད་མི་མང་ཤོས་ཅིག་གིས་ གསང་བཟོས་ཆོག་ཡིག་ལག་ལེན་གྱི་ཐོག་ལས་ ཨེསི་ཨེམ་བི་སར་བརསི་"
+"དང་གཅིག་ཁར་བརྒྱུད་འབྲེལ་འཐབ་ཨིན། ཁྱོད་ཀྱིས་ ཚིག་ཡིག་ཆོག་ཡིག་གསལ་ཏོག་ཏོ་ཅིག་ལག་ལེན་འཐབ་དགོ་མནོ་བ་"
+"ཅིན་ ཁྱོད་རའི་ཝིན་ཌཱསི་ཐོ་བཀོད་ནང་ལུ་ཚད་བཟུང་ཅིག་བསྒྱུར་བཅོས་འབད་དགོ"
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-msgid "Enabling this option is highly recommended. If you do, make sure you have a valid /etc/samba/smbpasswd file and that you set passwords in there for each user using the smbpasswd command."
-msgstr "གདམ་ཁ་ལྕོགས་ཅན་བཟོ་མི་འདི་གིས་ གནམ་མེད་ས་མེད་འོས་སྦྱོར་འབད་ནི་ཨིན། དེ་འབད་ནི་ཨིན་པ་ཅིན་ ཁྱོད་ལུ་ནུས་ལྡན་གྱི་/etc/samba/smbpasswd ཡིག་སྣོད་ཅིག་དགོཔ་དང་ འ་ནི་འདི་ཁྱོད་ཀྱིས་ smbpasswd བརྡ་བཀོད་ལག་ལེན་གྱི་ཐོག་ལས་ ལག་ལེན་པ་རེ་བཞིན་གྱི་དོན་ལས་ དེ་ནང་ལུ་ཆོག་ཡིག་གཞི་སྒྲིག་འབད། "
+msgid ""
+"Enabling this option is highly recommended. If you do, make sure you have a "
+"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"གདམ་ཁ་ལྕོགས་ཅན་བཟོ་མི་འདི་གིས་ གནམ་མེད་ས་མེད་འོས་སྦྱོར་འབད་ནི་ཨིན། དེ་འབད་ནི་ཨིན་པ་ཅིན་ ཁྱོད་ལུ་"
+"ནུས་ལྡན་གྱི་/etc/samba/smbpasswd ཡིག་སྣོད་ཅིག་དགོཔ་དང་ འ་ནི་འདི་ཁྱོད་ཀྱིས་ smbpasswd བརྡ་བཀོད་"
+"ལག་ལེན་གྱི་ཐོག་ལས་ ལག་ལེན་པ་རེ་བཞིན་གྱི་དོན་ལས་ དེ་ནང་ལུ་ཆོག་ཡིག་གཞི་སྒྲིག་འབད། "
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "སམ་བ་ཆོག་ཡིག་གནད་སྡུད་གཞི་རྟེན་ /var/lib/samba/passdb.tdb གསར་བསྐྲུན་འབད་ནི་ཨིན་ན་?"
+msgstr ""
+"སམ་བ་ཆོག་ཡིག་གནད་སྡུད་གཞི་རྟེན་ /var/lib/samba/passdb.tdb གསར་བསྐྲུན་འབད་ནི་ཨིན་ན་?"
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-msgid "To be compatible with the defaults in most versions of Windows, Samba must be configured to use encrypted passwords.  This requires user passwords to be stored in a file separate from /etc/passwd.  This file can be created automatically, but the passwords must be added manually by running smbpasswd and be kept up-to-date in the future."
-msgstr "ཝིན་ཌཱསི་གི་ཐོན་རིམ་མང་ཤོས་ཅིག་ནང་ སྔོན་སྒྲིག་དང་བཅས་མཐུན་འགྱུར་ཅན་ཨིན་དགོ་པ་ཅིན་ གསང་བཟོས་ཆོག་ཡིག་ལག་ལེན་འཐབ་ནི་ལུ་ སམ་བ་གིས་རིམ་སྒྲིག་འབད་དགོཔ་ཨིན།  /etc/passwdལས་སོ་སོར་འཕྱལ་ཡོད་པའི་ཡིག་སྣོད་ཅིག་གསོག་འཇོག་འབད་ནིའི་དོན་ལས་འདི་ལུ་ ལག་ལེན་པའི་ཆོག་ཡིག་དགོཔ་ཨིན། འ་ནི་ཡིག་སྣོད་འདི་ རང་བཞིན་གྱིས་འབད་གསར་བསྐྲུན་འབད་ཚུགས་ དེ་འབདཝ་ད་ ཆོག་ཡིག་ཚུ་ smbpasswd གཡོག་བཀོལ་ཐོག་ལུ་ ལག་ཐོག་ལས་ཁ་སྐོང་བརྐྱབ་དགོཔ་དང་ མ་འོངས་པ་ལུ་འདི་ དུས་མཐུན་བཟོ་སྟེ་བཞག་དགོ"
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords.  This requires user passwords to "
+"be stored in a file separate from /etc/passwd.  This file can be created "
+"automatically, but the passwords must be added manually by running smbpasswd "
+"and be kept up-to-date in the future."
+msgstr ""
+"ཝིན་ཌཱསི་གི་ཐོན་རིམ་མང་ཤོས་ཅིག་ནང་ སྔོན་སྒྲིག་དང་བཅས་མཐུན་འགྱུར་ཅན་ཨིན་དགོ་པ་ཅིན་ གསང་བཟོས་ཆོག་ཡིག་"
+"ལག་ལེན་འཐབ་ནི་ལུ་ སམ་བ་གིས་རིམ་སྒྲིག་འབད་དགོཔ་ཨིན།  /etc/passwdལས་སོ་སོར་འཕྱལ་ཡོད་པའི་ཡིག་སྣོད་"
+"ཅིག་གསོག་འཇོག་འབད་ནིའི་དོན་ལས་འདི་ལུ་ ལག་ལེན་པའི་ཆོག་ཡིག་དགོཔ་ཨིན། འ་ནི་ཡིག་སྣོད་འདི་ རང་བཞིན་གྱིས་"
+"འབད་གསར་བསྐྲུན་འབད་ཚུགས་ དེ་འབདཝ་ད་ ཆོག་ཡིག་ཚུ་ smbpasswd གཡོག་བཀོལ་ཐོག་ལུ་ ལག་ཐོག་ལས་ཁ་"
+"སྐོང་བརྐྱབ་དགོཔ་དང་ མ་འོངས་པ་ལུ་འདི་ དུས་མཐུན་བཟོ་སྟེ་བཞག་དགོ"
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-msgid "If you do not create it, you will have to reconfigure Samba (and probably your client machines) to use plaintext passwords."
-msgstr "ཁྱོད་ཀྱིས་གསར་བསྐྲུན་མ་འབད་བ་ཅིན་ ཚིག་ཡིག་རྐྱང་པོའི་ཆོག་ཡིག་ལག་ལེན་འཐབ་ནི་ལུ་ སམ་བ་(དང་ ཁྱོད་རའི་ཞབས་ཏོག་སྤྱོད་མིའི་མ་འཕྲུལ་)འདི་ ལོག་རིམ་སྒྲིག་འབད་དགོ"
+msgid ""
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
+msgstr ""
+"ཁྱོད་ཀྱིས་གསར་བསྐྲུན་མ་འབད་བ་ཅིན་ ཚིག་ཡིག་རྐྱང་པོའི་ཆོག་ཡིག་ལག་ལེན་འཐབ་ནི་ལུ་ སམ་བ་(དང་ ཁྱོད་རའི་"
+"ཞབས་ཏོག་སྤྱོད་མིའི་མ་འཕྲུལ་)འདི་ ལོག་རིམ་སྒྲིག་འབད་དགོ"
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
-msgid "See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more details."
-msgstr "ཁ་གསལ་མཁྱེན་ནིའི་དོན་ལུ་ སམ་བ་-ཌོཀ་ཐུམ་སྒྲིལ་ནང་ལས་ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html ལུ་ལྟ།"
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
+"package for more details."
+msgstr ""
+"ཁ་གསལ་མཁྱེན་ནིའི་དོན་ལུ་ སམ་བ་-ཌོཀ་ཐུམ་སྒྲིལ་ནང་ལས་ /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html ལུ་ལྟ།"
 
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "ཌེ་མཱོན, ཨི་ནི་ཊེཊི།"
+msgid "daemons"
+msgstr "ཌེ་མཱོན"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "ཨི་ནི་ཊེཊི།"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -132,8 +205,12 @@
 #. Type: select
 #. Description
 #: ../samba.templates:2002
-msgid "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a daemon is the recommended approach."
-msgstr "སམ་བ་ཌེ་མཱོན་smbdའདི་ སྤྱིར་བཏང་ཌེ་མཱོན་སྦེ་ ཡང་ན་ inetdནང་ལས་ གཡོག་བཀོལ་ཚུགས། ཌེ་མཱོན་སྦེ་གཡོག་བཀོལ་མི་འདི་ འོས་སྦྱོར་འབད་ཡོད་པའི་རྩར་ལེན་ཨིན།"
+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
@@ -144,12 +221,24 @@
 #. Type: boolean
 #. Description
 #: ../samba.templates:3001
-msgid "Samba 3.0 introduced a more complete SAM database interface which supersedes the /etc/samba/smbpasswd file."
-msgstr "སབ་མ་༣.༠ གིས་/etc/samba/smbpasswd ཡིག་སྣོད་འཛིན་པའི་  ཨེསི་ཨེ་ཨེམ་ གནད་སྡུད་གཞི་རྟེན་ ངོས་འདྲ་བ་ཆ་ཚང་ཅིག་འགོ་བཙུགས་ཡི།"
+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:3001
-msgid "Please confirm whether you would like the existing smbpasswd file to be automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this option if you plan to use another pdb backend (e.g., LDAP) instead."
-msgstr "ཡོད་བཞིན་པའི་ smbpasswd ཡིག་སྣོད་འདི་རང་བཞིན་གྱིས་སྦེ་ /var/lib/samba/passdb.tdbལུ་ གཞི་གནས་སྤོ་ནི་ཨིན་ན་ ཁྱོད་ར་ངེས་དཔྱད་འབད་གནང་། ཁྱོད་ཀྱིས་pdb རྒྱབ་མཐའ་ (དཔེར་ན་ ཨེལ་ཌི་ཨེ་པི་) འདི་དེ་གི་ཚབ་སྦེ་ལག་ལེན་འཐབ་ནིའི་འཆར་གཞི་ཡོད་པ་ཅིན་ གདམ་ཁ་འདི་ག་གདམས།"
+msgid ""
+"Please confirm whether you would like the existing smbpasswd file to be "
+"automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
+"option if you plan to use another pdb backend (e.g., LDAP) instead."
+msgstr ""
+"ཡོད་བཞིན་པའི་ smbpasswd ཡིག་སྣོད་འདི་རང་བཞིན་གྱིས་སྦེ་ /var/lib/samba/passdb.tdbལུ་ གཞི་"
+"གནས་སྤོ་ནི་ཨིན་ན་ ཁྱོད་ར་ངེས་དཔྱད་འབད་གནང་། ཁྱོད་ཀྱིས་pdb རྒྱབ་མཐའ་ (དཔེར་ན་ ཨེལ་ཌི་ཨེ་པི་) འདི་"
+"དེ་གི་ཚབ་སྦེ་ལག་ལེན་འཐབ་ནིའི་འཆར་གཞི་ཡོད་པ་ཅིན་ གདམ་ཁ་འདི་ག་གདམས།"
 
+#~ msgid "daemons, inetd"
+#~ msgstr "ཌེ་མཱོན, ཨི་ནི་ཊེཊི།"

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/es.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-13 14:33-0700\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -74,8 +74,8 @@
 "El resto de la configuración de Samba trata sobre cuestiones que afectan al "
 "contenido de /etc/samba/smb.conf, que es el fichero utilizado para "
 "configurar los programas de Samba (nmbd y smbd). Su smb.conf actual contiene "
-"una línea 'include' o una opción que atraviesa más de una línea, así que "
-"el proceso de configuración automática puede dejarlo con un smb.conf "
+"una línea 'include' o una opción que atraviesa más de una línea, así que el "
+"proceso de configuración automática puede dejarlo con un smb.conf "
 "descompuesto, requiriendo que lo arregle a mano."
 
 #. Type: boolean
@@ -135,9 +135,9 @@
 "valid /etc/samba/smbpasswd file and that you set passwords in there for each "
 "user using the smbpasswd command."
 msgstr ""
-"Es muy recomendable habilitar esta opción. Si elige hacerlo, compruebe "
-"que tiene un fichero /etc/samba/smbpasswd válido y que ha puesto las "
-"contraseñas con el programa smbpasswd."
+"Es muy recomendable habilitar esta opción. Si elige hacerlo, compruebe que "
+"tiene un fichero /etc/samba/smbpasswd válido y que ha puesto las contraseñas "
+"con el programa smbpasswd."
 
 #. Type: boolean
 #. Description
@@ -170,8 +170,8 @@
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"Si no crea este fichero, es imprescindible configurar Samba (y posiblemente los "
-"sistemas Windows) para que use contraseñas no cifradas."
+"Si no crea este fichero, es imprescindible configurar Samba (y posiblemente "
+"los sistemas Windows) para que use contraseñas no cifradas."
 
 #. Type: boolean
 #. Description
@@ -186,10 +186,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "demonios, inetd"
+msgid "daemons"
+msgstr "demonios"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -234,3 +240,6 @@
 "Favor de indicar si quiere que el fichero corriente smbpasswd sea convertido "
 "automaticamente en /var/lib/samba/passdb.tdb.  No escoja esta opción si "
 "pretende usar otro  "
+
+#~ msgid "daemons, inetd"
+#~ msgstr "demonios, inetd"

Modified: trunk/po/eu.po
===================================================================
--- trunk/po/eu.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/eu.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-10 23:29+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <librezale at librezale.org\n"
@@ -184,10 +184,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "deabruak, inetd"
+msgid "daemons"
+msgstr "deabruak"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -231,3 +237,5 @@
 "migratzea nahi duzula. Beste pasahitz datubase bat erabiltzea pentsatzen "
 "baduzu (adib LDAP) hemen 'ez' erantzun beharko zenuke."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "deabruak, inetd"

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/fr.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-13 14:56-0700\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -189,10 +189,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "démons, inetd"
+msgid "daemons"
+msgstr "démons"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -236,3 +242,5 @@
 "par /var/lib/samba/passdb.tdb. Ne choisissez pas cette option si vous "
 "envisagez d'utiliser une autre interface d'authentification (p. ex. LDAP)."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "démons, inetd"

Modified: trunk/po/gl.po
===================================================================
--- trunk/po/gl.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/gl.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-14 17:39+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -185,10 +185,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "servizos, inetd"
+msgid "daemons"
+msgstr "servizos"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -231,3 +237,6 @@
 "Confirme se quere que se migre automaticamente o ficheiro smbpasswd "
 "existente a /var/lib/samba/passdb.tdb. Non escolla esta opción se pretende "
 "empregar outro motor pdb (por exemplo, LDAP)."
+
+#~ msgid "daemons, inetd"
+#~ msgstr "servizos, inetd"

Modified: trunk/po/it.po
===================================================================
--- trunk/po/it.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/it.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.23rc1 italian debconf templates\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-13 16:12-0700\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -152,8 +152,8 @@
 "Windows, Samba deve essere configurato per usare password cifrate. Questo "
 "richiede che le password degli utenti siano memorizzate in un file diverso "
 "da /etc/passwd. Questo file può essere creato automaticamente ma le password "
-"dovranno essere inserite manualmente con smbpasswd e in futuro il file "
-"dovrà essere tenuto aggiornato."
+"dovranno essere inserite manualmente con smbpasswd e in futuro il file dovrà "
+"essere tenuto aggiornato."
 
 #. Type: boolean
 #. Description
@@ -178,10 +178,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "demoni, inetd"
+msgid "daemons"
+msgstr "demoni"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -225,3 +231,5 @@
 "migrato in /var/lib/samba/passdb.tdb. Invece, se si pensa di usare un "
 "backend pdb diverso (per esempio LDAP) si dovrebbe rifiutare."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "demoni, inetd"

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/ja.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -187,10 +187,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "デーモン, inetd"
+msgid "daemons"
+msgstr "デーモン"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -234,3 +240,5 @@
 "かどうか確認してください。別の pdb バックエンド (LDAP など) を代わりに計画し"
 "ているのであれば、ここでは「いいえ」と答えてください。"
 
+#~ msgid "daemons, inetd"
+#~ msgstr "デーモン, inetd"

Modified: trunk/po/km.po
===================================================================
--- trunk/po/km.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/km.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po_km\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-15 09:31+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -56,7 +56,8 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:1001
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "កញ្ចប់​ម៉ាស៊ីន​ភ្ញៀវ dhcp3 ត្រូវ​តែ​បាន​ដំឡើង​ដើម្បី​ទទួល​បាន​ផលប្រយោជន៍របស់​លក្ខណៈ​ពិសេស​នេះ ។"
 
 #  Type: boolean
@@ -117,8 +118,8 @@
 "queried by clients. Note that this parameter also controls the domain name "
 "used with the security=domain setting."
 msgstr ""
-"សូម​បញ្ជាក់​ក្រុម​ការងារ​ដែល​អ្នក​ចង់​ឲ្យ​ម៉ាស៊ីន​បម្រើ​នេះ​បង្ហាញ​នៅ​ពេល​ដែល​បាន​សួរ "
-"ដោយ​ម៉ាស៊ីន​ភ្ញៀវ ។ ចំណាំ​ថា ប៉ារ៉ាម៉ែត្រ​នេះ​ក៏​ត្រួត​ពិនិត្យ​ឈ្មោះ​ដែន ដែល​បាន​ប្រើ​ដោយ​សុវត្ថិភាព=ការ​កំណត់​ដែន ។"
+"សូម​បញ្ជាក់​ក្រុម​ការងារ​ដែល​អ្នក​ចង់​ឲ្យ​ម៉ាស៊ីន​បម្រើ​នេះ​បង្ហាញ​នៅ​ពេល​ដែល​បាន​សួរ ដោយ​ម៉ាស៊ីន​ភ្ញៀវ ។ ចំណាំ​ថា "
+"ប៉ារ៉ាម៉ែត្រ​នេះ​ក៏​ត្រួត​ពិនិត្យ​ឈ្មោះ​ដែន ដែល​បាន​ប្រើ​ដោយ​សុវត្ថិភាព=ការ​កំណត់​ដែន ។"
 
 #  Type: boolean
 #  Description
@@ -138,8 +139,9 @@
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"គ្រប់​ម៉ាស៊ីន​ភ្ញៀវ​ដែល​ប្រើ​វីនដូ​ថ្មីៗ​ទាំង​អស់​ទាក់ទង​ជា​មួយ​ម៉ាស៊ីន​បម្រើ SMB ដោយ​ប្រើ​ពាក្យសម្ងាត់​ដែល​បាន​អ៊ិនគ្រីប ។ ប្រសិន​បើ​អ្នក​ចង់​ជម្រះ​ពាក្យសម្ងាត់​អត្ថបទ អ្នក​នឹង​ត្រូវតែ​ផ្លាស់ប្ដូរ​ប៉ារ៉ាម៉ែត្រ​នៅ​ក្នុង "
-"បញ្ជី​ឈ្មោះ​របស់​វីនដូ ។"
+"គ្រប់​ម៉ាស៊ីន​ភ្ញៀវ​ដែល​ប្រើ​វីនដូ​ថ្មីៗ​ទាំង​អស់​ទាក់ទង​ជា​មួយ​ម៉ាស៊ីន​បម្រើ SMB ដោយ​ប្រើ​ពាក្យសម្ងាត់​ដែល​បាន​"
+"អ៊ិនគ្រីប ។ ប្រសិន​បើ​អ្នក​ចង់​ជម្រះ​ពាក្យសម្ងាត់​អត្ថបទ អ្នក​នឹង​ត្រូវតែ​ផ្លាស់ប្ដូរ​ប៉ារ៉ាម៉ែត្រ​នៅ​ក្នុង បញ្ជី​ឈ្មោះ​"
+"របស់​វីនដូ ។"
 
 #  Type: boolean
 #  Description
@@ -204,15 +206,19 @@
 "សម្រាប់​សេចក្តី​លម្អិត​បន្ថែម​សូម​មើល  /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html ពី​"
 "កញ្ចប់ samba-doc ។"
 
-#  Type: select
-#  Choices
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "ដេមិន , inetd"
+msgid "daemons"
+msgstr "ដេមិន "
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -226,7 +232,8 @@
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
-msgstr "ដេមិន Samba smbd អាចរត់ជាដេមិនធម្មតា ឬពី inetd ។ ការរត់ជាដេមិនមួយត្រូវបានផ្ដល់អនុសាសន៍ ។"
+msgstr ""
+"ដេមិន Samba smbd អាចរត់ជាដេមិនធម្មតា ឬពី inetd ។ ការរត់ជាដេមិនមួយត្រូវបានផ្ដល់អនុសាសន៍ ។"
 
 #  Type: boolean
 #  Description
@@ -262,3 +269,7 @@
 "samba/passdb.tdb ។  កុំជ្រើស​ជម្រើស​នេះ ប្រសិន​បើ​អ្នក​មាន​គម្រោង​ប្រើ​កម្មវិធី​ខាង​ក្រោយ pdb ដទៃ​"
 "ទៀត (ឧទាហរណ៍ LDAP) ជំនួស​វិញ ។"
 
+#  Type: select
+#  Choices
+#~ msgid "daemons, inetd"
+#~ msgstr "ដេមិន , inetd"

Modified: trunk/po/nl.po
===================================================================
--- trunk/po/nl.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/nl.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -191,10 +191,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "achtergronddiensten, inetd"
+msgid "daemons"
+msgstr "achtergronddiensten"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -238,3 +244,5 @@
 "passdb.tdb wilt migreren? Als u een ander pdb-backend gebruikt (bv. LDAP) "
 "dient u hier te weigeren."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "achtergronddiensten, inetd"

Modified: trunk/po/pt.po
===================================================================
--- trunk/po/pt.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/pt.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.9-1\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-13 15:44-0700\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -177,10 +177,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "daemons, inetd"
+msgid "daemons"
+msgstr "daemons"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -224,3 +230,5 @@
 "automaticamente migrado para /var/lib/samba/passdb.tdb.  Não escolha esta "
 "opção se em vez disso planeia utilizar outro backend pdb (e.g., LDAP)."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "daemons, inetd"

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/pt_BR.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-13 14:15-0700\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -135,9 +135,9 @@
 "valid /etc/samba/smbpasswd file and that you set passwords in there for each "
 "user using the smbpasswd command."
 msgstr ""
-"Habilitar esta opção é altamente recomendado. Caso você o faça, certifique-se "
-"de possuir um arquivo /etc/samba/smbpasswd e que você tenha senhas definidas "
-"no mesmo para cada usuário usando o comando smbpasswd."
+"Habilitar esta opção é altamente recomendado. Caso você o faça, certifique-"
+"se de possuir um arquivo /etc/samba/smbpasswd e que você tenha senhas "
+"definidas no mesmo para cada usuário usando o comando smbpasswd."
 
 #. Type: boolean
 #. Description
@@ -186,10 +186,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "daemons, inetd"
+msgid "daemons"
+msgstr "daemons"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -234,3 +240,5 @@
 "opção caso você planeje utilizar um outro backend pdb (como LDAP, por "
 "exemplo)."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "daemons, inetd"

Modified: trunk/po/ro.po
===================================================================
--- trunk/po/ro.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/ro.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po_ro\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-10 17:49+0300\n"
 "Last-Translator: Eddy PetriÅŸor <eddy.petrisor at gmail.com>\n"
 "Language-Team: Română <debian-l10n-romanian at lists.debian.org>\n"
@@ -190,10 +190,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "demoni, inetd"
+msgid "daemons"
+msgstr "demoni"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -237,3 +243,5 @@
 "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)."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "demoni, inetd"

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/ru.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba-3.0.23rc1-1_ru\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -179,10 +179,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "daemons, inetd"
+msgid "daemons"
+msgstr "daemons"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -226,3 +232,5 @@
 "passdb.tdb?  Если вы планируете вместо него использовать другой интерфейс "
 "pdb (например, LDAP), вы должны ответить здесь 'нет'."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "daemons, inetd"

Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/sv.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.20b-3\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -186,10 +186,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "demoner, inetd"
+msgid "daemons"
+msgstr "demoner"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -233,3 +239,5 @@
 "passdb.tdb.  Välj inte detta alternativ om du istället planerar att använda "
 "ett annat pdb-baksystem (till exempel LDAP)."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "demoner, inetd"

Modified: trunk/po/templates.pot
===================================================================
--- trunk/po/templates.pot	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/templates.pot	2006-08-15 13:02:44 UTC (rev 1136)
@@ -1,14 +1,22 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -142,10 +150,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
+msgid "daemons"
 msgstr ""
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"

Modified: trunk/po/tl.po
===================================================================
--- trunk/po/tl.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/tl.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-15 01:28+0800\n"
 "Last-Translator: eric pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -191,10 +191,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "mga daemon, inetd"
+msgid "daemons"
+msgstr "mga daemon"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -237,3 +243,6 @@
 "Pakitiyak kung inyong nais na mailipat ng awtomatiko ang kasalukuyang "
 "talaksang smbpasswd patungong /var/lib/samba/passdb.tdb. Huwag piliin ang "
 "opsiyon na ito kung balak ninyong gumamit ng ibang pdb backend (hal., LDAP)."
+
+#~ msgid "daemons, inetd"
+#~ msgstr "mga daemon, inetd"

Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/tr.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-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"
@@ -194,10 +194,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "artalan süreçleri, inetd"
+msgid "daemons"
+msgstr "artalan süreçleri"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -242,3 +248,5 @@
 "başka bir pdb arkayüzü (ör. LDAP) kullanmayı planlıyorsanız, burada 'hayır' "
 "cevabını vermelisiniz."
 
+#~ msgid "daemons, inetd"
+#~ msgstr "artalan süreçleri, inetd"

Modified: trunk/po/vi.po
===================================================================
--- trunk/po/vi.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/vi.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.23rc1-1\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-15 14:54+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -175,10 +175,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "trình nền, inetd"
+msgid "daemons"
+msgstr "trình nền"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -223,3 +229,6 @@
 "Hãy xác nhận nếu bạn muốn tập tin mật khẩu <smbpasswd> tồn tại được nâng cấp "
 "tự động sang </var/lib/samba/passdb.tdb>. Đừng bật tùy chọn nà y nếu bạn định "
 "sử dụng một hậu phương PBD khác (v.d. LDAP) thay thế."
+
+#~ msgid "daemons, inetd"
+#~ msgstr "trình nền, inetd"

Modified: trunk/po/zh_CN.po
===================================================================
--- trunk/po/zh_CN.po	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/po/zh_CN.po	2006-08-15 13:02:44 UTC (rev 1136)
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.0.22-1\n"
-"Report-Msgid-Bugs-To: peloy at debian.org\n"
-"POT-Creation-Date: 2006-08-13 12:55-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 07:59-0500\n"
 "PO-Revision-Date: 2006-08-12 01:17+1200\n"
 "Last-Translator: Carlos Z.F. Liu <carlosliu at users.sourceforge.ent>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb at lists.debian.org>\n"
@@ -177,10 +177,16 @@
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
-msgid "daemons, inetd"
-msgstr "守护进程, inetd"
+msgid "daemons"
+msgstr "守护进程"
 
 #. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
@@ -223,3 +229,5 @@
 "请确定您是否想将现有的 smbpasswd 文件自动移植为 /var/lib/samba/passdb.tdb。如"
 "果您计划使用其它的 pdb 后端 (如 LDAP) 的话，请不要选中此选项。"
 
+#~ msgid "daemons, inetd"
+#~ msgstr "守护进程, inetd"

Modified: trunk/samba.templates
===================================================================
--- trunk/samba.templates	2006-08-15 08:34:09 UTC (rev 1135)
+++ trunk/samba.templates	2006-08-15 13:02:44 UTC (rev 1136)
@@ -16,7 +16,7 @@
 
 Template: samba/run_mode
 Type: select
-_Choices: daemons, inetd
+__Choices: daemons, inetd
 Default: daemons
 _Description: How do you want to run Samba?
  The Samba daemon smbd can run as a normal daemon or from inetd. Running as