[Pkg-samba-maint] r4092 - trunk/samba/debian/po

bubulle at alioth.debian.org bubulle at alioth.debian.org
Fri May 11 17:55:41 UTC 2012


Author: bubulle
Date: 2012-05-11 17:55:40 +0000 (Fri, 11 May 2012)
New Revision: 4092

Modified:
   trunk/samba/debian/po/ar.po
   trunk/samba/debian/po/ast.po
   trunk/samba/debian/po/be.po
   trunk/samba/debian/po/bg.po
   trunk/samba/debian/po/bn.po
   trunk/samba/debian/po/bs.po
   trunk/samba/debian/po/ca.po
   trunk/samba/debian/po/cs.po
   trunk/samba/debian/po/da.po
   trunk/samba/debian/po/de.po
   trunk/samba/debian/po/dz.po
   trunk/samba/debian/po/el.po
   trunk/samba/debian/po/eo.po
   trunk/samba/debian/po/es.po
   trunk/samba/debian/po/et.po
   trunk/samba/debian/po/eu.po
   trunk/samba/debian/po/fi.po
   trunk/samba/debian/po/fr.po
   trunk/samba/debian/po/gl.po
   trunk/samba/debian/po/gu.po
   trunk/samba/debian/po/he.po
   trunk/samba/debian/po/hu.po
   trunk/samba/debian/po/id.po
   trunk/samba/debian/po/it.po
   trunk/samba/debian/po/ja.po
   trunk/samba/debian/po/ka.po
   trunk/samba/debian/po/km.po
   trunk/samba/debian/po/ko.po
   trunk/samba/debian/po/ku.po
   trunk/samba/debian/po/lt.po
   trunk/samba/debian/po/ml.po
   trunk/samba/debian/po/mr.po
   trunk/samba/debian/po/nb.po
   trunk/samba/debian/po/ne.po
   trunk/samba/debian/po/nl.po
   trunk/samba/debian/po/nn.po
   trunk/samba/debian/po/pl.po
   trunk/samba/debian/po/pt.po
   trunk/samba/debian/po/pt_BR.po
   trunk/samba/debian/po/ro.po
   trunk/samba/debian/po/ru.po
   trunk/samba/debian/po/sk.po
   trunk/samba/debian/po/sl.po
   trunk/samba/debian/po/sq.po
   trunk/samba/debian/po/sv.po
   trunk/samba/debian/po/ta.po
   trunk/samba/debian/po/templates.pot
   trunk/samba/debian/po/th.po
   trunk/samba/debian/po/tl.po
   trunk/samba/debian/po/tr.po
   trunk/samba/debian/po/vi.po
   trunk/samba/debian/po/wo.po
   trunk/samba/debian/po/zh_CN.po
   trunk/samba/debian/po/zh_TW.po
Log:
Run debconf-updatepo to update translation afterremoval of a template

Modified: trunk/samba/debian/po/ar.po
===================================================================
--- trunk/samba/debian/po/ar.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ar.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2010-09-09 01:19+0300\n"
 "Last-Translator: Ossama Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
@@ -148,73 +148,61 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "إحداث قاعدة كلمات المرور لSamba  في /var/lib/samba/passdb.tdb ؟"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"حتى يكون هناك توافق مع اﻹعدادت الافتراصية لأغلبية نسخ Windows، يجب تهيئة "
-"Samba لاستعمال كلمات مرور مشفرة، اﻷمر الذي يتطلب حفظها في ملف منفصل عن /etc/"
-"passwd. ويمكن إنشاء ذلك الملف تلقائياً، إلا أن كلمات المرور يجب أن تضاف يدوياً "
-"بتنفيذ الأمر smbpaswd وإبقاء الملف محدثاً في المستقبل."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"إن لم تنشئه، فستضطر إلى إعادة تهيئة Samba (وربما بعض الأجهزة العميلة) "
-"لاستخدام كلمات مرور مجردة."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"راجع /usr/share/doc/samba-doc/htmldocs/ENCRYPTION في رزمة samba-doc لتفاصيل "
-"أكثر."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "كيف تريد تشغيل Samba؟"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "إحداث قاعدة كلمات المرور لSamba  في /var/lib/samba/passdb.tdb ؟"
+
+#~ 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 ""
+#~ "حتى يكون هناك توافق مع اﻹعدادت الافتراصية لأغلبية نسخ Windows، يجب تهيئة "
+#~ "Samba لاستعمال كلمات مرور مشفرة، اﻷمر الذي يتطلب حفظها في ملف منفصل عن /"
+#~ "etc/passwd. ويمكن إنشاء ذلك الملف تلقائياً، إلا أن كلمات المرور يجب أن "
+#~ "تضاف يدوياً بتنفيذ الأمر smbpaswd وإبقاء الملف محدثاً في المستقبل."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "إن لم تنشئه، فستضطر إلى إعادة تهيئة Samba (وربما بعض الأجهزة العميلة) "
+#~ "لاستخدام كلمات مرور مجردة."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "راجع /usr/share/doc/samba-doc/htmldocs/ENCRYPTION في رزمة samba-doc "
+#~ "لتفاصيل أكثر."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "الربط التسلسلي لملفات passdb غير مدعوم"
 

Modified: trunk/samba/debian/po/ast.po
===================================================================
--- trunk/samba/debian/po/ast.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ast.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba package\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2009-01-15 09:17+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <softast-xeneral at lists.sourceforge.net>\n"
@@ -151,74 +151,63 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"¿Criar una contraseña pa la base de datos de samba, /var/lib/samba/passdb."
-"tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Pa ser compatible col comportamientu por defeutu na mayor de les versiones "
-"Windows, Samba debe configurase pa usar contraseñes encriptaes. Esto requier "
-"qu'una contraseña d'usuariu seya almacenada nun ficheru separtáu dende /etc/"
-"passwd. Esti ficheru puede criase automáticamente, pero les contraseñes "
-"deben amestase-y manualmente executando smbpasswd y mantenelu nel futuru."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Si nun la crias, tendrás que reconfigurar Samba (y probablemente'l to "
-"cliente) pa usar contraseñes de testu planu."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Mira /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
-"html dende'l paquete samba-doc pa más detalles."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "degorrios"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "¿Cómo quies executar Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
 "El degorriu Samba smbd puede correr como un degorriu normal o dende inetd. "
 "Corriendo como un degorriu ye la escoyeta recomendada."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "¿Criar una contraseña pa la base de datos de samba, /var/lib/samba/passdb."
+#~ "tdb?"
+
+#~ 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 ""
+#~ "Pa ser compatible col comportamientu por defeutu na mayor de les "
+#~ "versiones Windows, Samba debe configurase pa usar contraseñes encriptaes. "
+#~ "Esto requier qu'una contraseña d'usuariu seya almacenada nun ficheru "
+#~ "separtáu dende /etc/passwd. Esti ficheru puede criase automáticamente, "
+#~ "pero les contraseñes deben amestase-y manualmente executando smbpasswd y "
+#~ "mantenelu nel futuru."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Si nun la crias, tendrás que reconfigurar Samba (y probablemente'l to "
+#~ "cliente) pa usar contraseñes de testu planu."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Mira /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html dende'l paquete samba-doc pa más detalles."

Modified: trunk/samba/debian/po/be.po
===================================================================
--- trunk/samba/debian/po/be.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/be.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_2:3.3.0-3_be\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2009-02-19 04:33+0200\n"
 "Last-Translator: Pavel Piatruk <piatruk.p at gmail.com>\n"
 "Language-Team: Belarusian (Official spelling) <be at d-i.tanatos.org>\n"
@@ -149,73 +149,61 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Стварыць базу пароляў samba у файле /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Каб адпавядаць стандартным наладкам большасці версіяў Windows, Samba мусіць "
-"выкарыстоўваць шыфраваныя паролі. Дзеля гэтага паролі трэба захоўваць у "
-"месцы, адрозным ад файлу /etc/passwd. Адпаведнае сховішча можна стварыць "
-"аўтаматычна, але паролі трэба дадаваць самастойна з дапамогай каманды "
-"smbpasswd, і сачыць за іх адпаведнасцю надалей."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Калі сховішча не будзе створана, трэба пераналадзіць Samba (і, верагодна, "
-"кліентскія машыны таксама) такім чынам, каб выкарыстоўваць паролі простым "
-"тэкстам."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Больш інфармацыі даступна ў файле /usr/share/doc/samba-doc/htmldocs/Samba3-"
-"Developers-Guide/pwencrypt.html ю"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "дэманы"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Якім чынам мусіць запускацца Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
 "Служба Samba smbd можа запускацца як звычайны дэман, або з дапамогай inetd. "
 "Рэкамендаваны падыход -- запуск у якасці звычайнага дэмана."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Стварыць базу пароляў samba у файле /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Каб адпавядаць стандартным наладкам большасці версіяў Windows, Samba "
+#~ "мусіць выкарыстоўваць шыфраваныя паролі. Дзеля гэтага паролі трэба "
+#~ "захоўваць у месцы, адрозным ад файлу /etc/passwd. Адпаведнае сховішча "
+#~ "можна стварыць аўтаматычна, але паролі трэба дадаваць самастойна з "
+#~ "дапамогай каманды smbpasswd, і сачыць за іх адпаведнасцю надалей."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Калі сховішча не будзе створана, трэба пераналадзіць Samba (і, верагодна, "
+#~ "кліентскія машыны таксама) такім чынам, каб выкарыстоўваць паролі простым "
+#~ "тэкстам."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Больш інфармацыі даступна ў файле /usr/share/doc/samba-doc/htmldocs/"
+#~ "Samba3-Developers-Guide/pwencrypt.html ю"

Modified: trunk/samba/debian/po/bg.po
===================================================================
--- trunk/samba/debian/po/bg.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/bg.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.23c-1_bg\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2010-10-25 10:44+0300\n"
 "Last-Translator: Damyan Ivanov <dmn at debian.org>\n"
 "Language-Team: Bulgarian <>\n"
@@ -142,68 +142,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Създаване на базата данни с пароли, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"За съвместимост с повечето версии на Windows, Samba трябва да използва "
-"шифрирани пароли. Това изисква паролите да се съхраняват във файл, отделен "
-"от /etc/passwd. Този файл може да бъде създаден автоматично, но "
-"потребителите и паролите трябва да се добавят ръчно чрез командата smbpasswd."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Ако не създадете този файл, трябва да настроите Samba (а вероятно и "
-"компютрите с Windows) да не използват шифрирани пароли."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"За повече информация вижте /usr/share/doc/samba-doc/htmldocs/Samba3-"
-"Developers-Guide/pwencrypt.html."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "фонов процес"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "при нужда"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Как да се стартира Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -212,6 +171,36 @@
 "фонов процес (със зареждането на операционната система). Препоръчителният "
 "начин за изпълнение е като фонов процес."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Създаване на базата данни с пароли, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "За съвместимост с повечето версии на Windows, Samba трябва да използва "
+#~ "шифрирани пароли. Това изисква паролите да се съхраняват във файл, "
+#~ "отделен от /etc/passwd. Този файл може да бъде създаден автоматично, но "
+#~ "потребителите и паролите трябва да се добавят ръчно чрез командата "
+#~ "smbpasswd."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Ако не създадете този файл, трябва да настроите Samba (а вероятно и "
+#~ "компютрите с Windows) да не използват шифрирани пароли."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "За повече информация вижте /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr ""
 #~ "Новата версия на samba не поддържа работа с няколко бази данни с пароли"

Modified: trunk/samba/debian/po/bn.po
===================================================================
--- trunk/samba/debian/po/bn.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/bn.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2009-04-16 12:12+0600\n"
 "Last-Translator: Md. Rezwan Shahid <rezwan at ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n at googlegroups.com>\n"
@@ -146,72 +146,60 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "সাম্বা পাসওয়ার্ড ডেটাবেজ তৈরি করা হবে, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"আরো তথ্যের জন্য সাম্বা-ডক প্যাকেজ থেকে /usr/share/doc/samba-doc/htmldocs/Samba3-"
-"Developers-Guide/pwencrypt.html দেখুন।"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "ডিমন"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "আপনি সাম্বা কিভাবে চালাতে চান?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "সাম্বা পাসওয়ার্ড ডেটাবেজ তৈরি করা হবে, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "আপনি যদি এটি তৈরি না করেন, তাহলে সরল টেক্সট পাসওয়ার্ড ব্যবহারের জন্য আপনাকে "
+#~ "সাম্বা (এবং হয়তো আপনার ক্লায়েন্ট মেশিনগুলো) পুনরায় কনফিগার করতে হবে।"
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "আরো তথ্যের জন্য সাম্বা-ডক প্যাকেজ থেকে /usr/share/doc/samba-doc/htmldocs/"
+#~ "Samba3-Developers-Guide/pwencrypt.html দেখুন।"

Modified: trunk/samba/debian/po/bs.po
===================================================================
--- trunk/samba/debian/po/bs.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/bs.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2006-11-01 22:14+0100\n"
 "Last-Translator: Safir Secerovic <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at linux.org.ba>\n"
@@ -106,10 +106,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -130,10 +126,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -147,10 +139,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -167,69 +155,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Kreirati samba bazu podataka sa šiframa, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Kako bi bila kompatibilna s većinom Windows verzija, Samba mora biti "
-"podešena da koristi enkriptovane šifre.  Ovo zahtijeva da korisničke šifre "
-"budu spremljene u zasebnu datoteku od /etc/passwd.  Ova datoteka može biti "
-"kreirana automatski, ali šifre moraju biti dodane ručno pokrečući smbpasswd "
-"i ubuduće održavane."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Ako ju ne kreirate, morati ćete rekonfigurisati Samba-u (i vjerovatno vaše "
-"klijente) da koristi šifre u obliku čistog teksta."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Vidjeti /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
-"html iz samba-doc paketa za više detalja."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Kako želite pokretati Samba-u?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -237,6 +183,36 @@
 "Samba daemon smbd može biti pokrenut kao normalni daemon ili preko inetd-a. "
 "Pokretanje kao daemon je preporučeni pristup."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Kreirati samba bazu podataka sa šiframa, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Kako bi bila kompatibilna s većinom Windows verzija, Samba mora biti "
+#~ "podešena da koristi enkriptovane šifre.  Ovo zahtijeva da korisničke "
+#~ "šifre budu spremljene u zasebnu datoteku od /etc/passwd.  Ova datoteka "
+#~ "može biti kreirana automatski, ali šifre moraju biti dodane ručno "
+#~ "pokrečući smbpasswd i ubuduće održavane."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Ako ju ne kreirate, morati ćete rekonfigurisati Samba-u (i vjerovatno "
+#~ "vaše klijente) da koristi šifre u obliku čistog teksta."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Vidjeti /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+#~ "pwencrypt.html iz samba-doc paketa za više detalja."
+
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr "Premjestiti /etc/samba/smbpasswd u /var/lib/samba/passdb.tdb?"
 

Modified: trunk/samba/debian/po/ca.po
===================================================================
--- trunk/samba/debian/po/ca.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ca.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 2.3.5.6~dfsg1-1\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2010-10-23 13:13+0200\n"
 "Last-Translator: Jordi Mallach <jordi at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -151,72 +151,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"Voleu crear la base de dades de contrasenyes de Samba, /var/lib/samba/passdb."
-"tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"El Samba s'ha de configurar perquè utilitzi contrasenyes xifrades per tal "
-"que sigui compatible amb la majoria de versions de Windows per defecte. Això "
-"implica que les contrasenyes d'usuari s'emmagatzemin a un fitxer diferent "
-"del /etc/passwd. Aquest fitxer es pot crear automàticament, però les "
-"contrasenyes s'han d'afegir manualment executant l'ordre smbpasswd i s'han "
-"de mantindre actualitzades en el futur."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"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."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Per més informació feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html del paquet samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "dimonis"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Com voleu executar el Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -224,6 +179,40 @@
 "El dimoni de Samba pot executar-se com un dimoni normal o des de l'inetd. És "
 "recomanable executar-lo com a dimoni."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "Voleu crear la base de dades de contrasenyes de Samba, /var/lib/samba/"
+#~ "passdb.tdb?"
+
+#~ 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 ""
+#~ "El Samba s'ha de configurar perquè utilitzi contrasenyes xifrades per tal "
+#~ "que sigui compatible amb la majoria de versions de Windows per defecte. "
+#~ "Això implica que les contrasenyes d'usuari s'emmagatzemin a un fitxer "
+#~ "diferent del /etc/passwd. Aquest fitxer es pot crear automàticament, però "
+#~ "les contrasenyes s'han d'afegir manualment executant l'ordre smbpasswd i "
+#~ "s'han de mantindre actualitzades en el futur."
+
+#~ msgid ""
+#~ "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."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Per més informació feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html del paquet samba-doc."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "L'encadenament dels passdb no es permet"
 

Modified: trunk/samba/debian/po/cs.po
===================================================================
--- trunk/samba/debian/po/cs.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/cs.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-20 18:41+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -154,69 +154,27 @@
 msgid "Samba server"
 msgstr "Samba server"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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 ""
-"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. 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ý."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Pokud soubor nevytvoříte, budete muset nastavit Sambu (a pravděpodobně také "
-"klienty), aby používali nešifrovaná hesla."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.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."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "démoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Jak chcete spouštět Sambu?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -224,6 +182,36 @@
 "Server Samby smbd může běžet jako obyčejný daemon (doporučeno), nebo se může "
 "spouštět z inetd."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Vytvořit databázi hesel /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "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. 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ý."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Pokud soubor nevytvoříte, budete muset nastavit Sambu (a pravděpodobně "
+#~ "také klienty), aby používali nešifrovaná hesla."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "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."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Řetězení backendů passdb není podporováno"
 

Modified: trunk/samba/debian/po/da.po
===================================================================
--- trunk/samba/debian/po/da.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/da.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 17:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
@@ -148,72 +148,60 @@
 msgid "Samba server"
 msgstr "Sambaserver"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Opret samba-adgangskodedatabasen /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"For at være kompatibel med standardindstillingerne i de fleste udgaver af "
-"Windows, skal Samba sættes op til at benytte krypterede adgangskoder. Dette "
-"kræver, at brugernes adgangskoder gemmes i en anden fil end /etc/passwd. "
-"Denne fil kan oprettes automatisk, men adgangskoderne skal tilføjes manuelt "
-"ved at køre smbpasswd, og skal fremover holdes opdateret."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Hvis du ikke opretter den, er du nødt til at sætte samba (og sikkert også "
-"dine klientmaskiner) op til at benytte adgangskoder i klar tekst."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Se /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"i pakken samba-doc for flere detaljer."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "dæmoner"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Hvordan skal Samba køres?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
 "Samba-dæmonen smbd kan køre som en almindelig dæmon eller fra inetd. Det "
 "anbefales at køre den som dæmon."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Opret samba-adgangskodedatabasen /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "For at være kompatibel med standardindstillingerne i de fleste udgaver af "
+#~ "Windows, skal Samba sættes op til at benytte krypterede adgangskoder. "
+#~ "Dette kræver, at brugernes adgangskoder gemmes i en anden fil end /etc/"
+#~ "passwd. Denne fil kan oprettes automatisk, men adgangskoderne skal "
+#~ "tilføjes manuelt ved at køre smbpasswd, og skal fremover holdes opdateret."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Hvis du ikke opretter den, er du nødt til at sætte samba (og sikkert også "
+#~ "dine klientmaskiner) op til at benytte adgangskoder i klar tekst."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Se /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html i pakken samba-doc for flere detaljer."

Modified: trunk/samba/debian/po/de.po
===================================================================
--- trunk/samba/debian/po/de.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/de.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.5.8~dfsg-2\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-19 22:08+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -158,74 +158,62 @@
 msgid "Samba server"
 msgstr "Samba-Server"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Samba-Passwort-Datenbank (/var/lib/samba/passdb.tdb) erstellen?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Um mit den Standards in den meisten Windows-Versionen kompatibel zu sein, "
-"muss Samba konfiguriert werden, verschlüsselte Passwörter zu benutzen. Dies "
-"erfordert es, Benutzerpasswörter in einer anderen Datei als in /etc/passwd "
-"abzulegen. Diese Datei kann automatisch erstellt werden, aber die Passwörter "
-"müssen über den Befehl smbpasswd manuell eingefügt werden und in der Zukunft "
-"aktuell gehalten werden."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Wenn Sie sie nicht erstellen, müssen Sie Samba (und möglicherweise auch die "
-"Clients) neu konfigurieren, so dass diese unverschlüsselte Passwörter "
-"benutzen."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Details finden Sie in /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
-"Guide/pwencrypt.html aus dem samba-doc-Paket."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "Daemon"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Wie möchten Sie Samba starten?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "Der Samba-Prozess smbd kann als normaler Hintergrunddienst (Daemon) laufen "
 "oder über inetd gestartet werden. Ersteres wird jedoch empfohlen."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Samba-Passwort-Datenbank (/var/lib/samba/passdb.tdb) erstellen?"
+
+#~ 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 ""
+#~ "Um mit den Standards in den meisten Windows-Versionen kompatibel zu sein, "
+#~ "muss Samba konfiguriert werden, verschlüsselte Passwörter zu benutzen. "
+#~ "Dies erfordert es, Benutzerpasswörter in einer anderen Datei als in /etc/"
+#~ "passwd abzulegen. Diese Datei kann automatisch erstellt werden, aber die "
+#~ "Passwörter müssen über den Befehl smbpasswd manuell eingefügt werden und "
+#~ "in der Zukunft aktuell gehalten werden."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Wenn Sie sie nicht erstellen, müssen Sie Samba (und möglicherweise auch "
+#~ "die Clients) neu konfigurieren, so dass diese unverschlüsselte Passwörter "
+#~ "benutzen."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Details finden Sie in /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+#~ "Guide/pwencrypt.html aus dem samba-doc-Paket."

Modified: trunk/samba/debian/po/dz.po
===================================================================
--- trunk/samba/debian/po/dz.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/dz.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po.pot\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-13 02:22+0530\n"
 "Last-Translator: translator <pemai_jurmey at hotmail.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -110,10 +110,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -134,10 +130,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -151,10 +143,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -171,70 +159,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"སམ་བ་ཆོག་ཡིག་གནད་སྡུད་གཞི་རྟེན་ /var/lib/samba/passdb.tdb གསར་བསྐྲུན་འབད་ནི་ཨིན་ན་?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"ཁ་གསལ་མཁྱེན་ནིའི་དོན་ལུ་ སམ་བ་-ཌོཀ་ཐུམ་སྒྲིལ་ནང་ལས་ /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html ལུ་ལྟ།"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "ཌེ་མཱོནསི་"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "ཁྱོད་ཀྱིས་ སམ་བ་འདི་ག་དེ་སྦེ་གཡོག་བཀོལ་དགོ་མནོཝ་སྨོ?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -242,6 +187,37 @@
 "སམ་བ་ཌེ་མཱོན་smbdའདི་ སྤྱིར་བཏང་ཌེ་མཱོན་སྦེ་ ཡང་ན་ inetdནང་ལས་ གཡོག་བཀོལ་ཚུགས། ཌེ་མཱོན་སྦེ་གཡོག་"
 "བཀོལ་མི་འདི་ འོས་སྦྱོར་འབད་ཡོད་པའི་རྩར་ལེན་ཨིན།"
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "སམ་བ་ཆོག་ཡིག་གནད་སྡུད་གཞི་རྟེན་ /var/lib/samba/passdb.tdb གསར་བསྐྲུན་འབད་ནི་ཨིན་ན་?"
+
+#~ 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 ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "ཁྱོད་ཀྱིས་གསར་བསྐྲུན་མ་འབད་བ་ཅིན་ ཚིག་ཡིག་རྐྱང་པོའི་ཆོག་ཡིག་ལག་ལེན་འཐབ་ནི་ལུ་ སམ་བ་(དང་ ཁྱོད་"
+#~ "རའི་ཞབས་ཏོག་སྤྱོད་མིའི་མ་འཕྲུལ་)འདི་ ལོག་རིམ་སྒྲིག་འབད་དགོ"
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "ཁ་གསལ་མཁྱེན་ནིའི་དོན་ལུ་ སམ་བ་-ཌོཀ་ཐུམ་སྒྲིལ་ནང་ལས་ /usr/share/doc/samba-doc/"
+#~ "htmldocs/ENCRYPTION.html ལུ་ལྟ།"
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "རྒྱུན་ཐག་ passdb རྒྱབ་མཐའ་འདི་ རྒྱབ་སྐྱོར་མ་འབད་བས་"
 

Modified: trunk/samba/debian/po/el.po
===================================================================
--- trunk/samba/debian/po/el.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/el.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_el\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2010-11-23 15:27+0200\n"
 "Last-Translator: Konstantinos Margaritis <markos at debian.org>\n"
 "Language-Team: American English <debian-l10n-greek at lists.debian.org>\n"
@@ -166,74 +166,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"Να δημιουργηθεί η βάση δεδομένων των κωδικών πρόσβασης samba, /var/lib/samba/"
-"passdb.tdb;"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Για να είναι συμβατή με τις προεπιλογές στις περισσότερες εκδόσεις των "
-"Windows, η υπηρεσία Samba θα πρέπει να ρυθμιστεί ώστε να χρησιμοποιεί "
-"κρυπτογραφημένους κωδικούς πρόσβασης. Αυτό απαιτεί την φύλαξη των κωδικών "
-"πρόσβασης σε ένα αρχείο ξεχωριστά από το /etc/passwd. Αυτό το αρχείο μπορεί "
-"να δημιουργηθεί αυτόματα, αλλά οι κωδικοί πρόσβασης θα πρέπει να προστεθούν "
-"με το χέρι εκτελώντας την εντολή smbpasswd και να διατηρούνται πάντα "
-"ενημερωμένα στο μέλλον."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Αν δεν δημιουργήσετε το αρχείο, θα πρέπει να ξαναρυθμίσετε την υπηρεσία "
-"Samba (και πιθανόν τα μηχανήματα πελάτης της υπηρεσίας) ώστε βα "
-"χρησιμοποιούν μη κρυπτογραφημένους κωδικούς πρόσβασης."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Δείτε το αρχείο usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html από το "
-"πακέτο samba-doc για περισσότερες λεπτομέρειες."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "δαίμονες"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Πώς θέλετε να εκτελείται η υπηρεσία Samba;"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -242,6 +195,41 @@
 "δαίμονας ή από τον inetd. Η εκτέλεσή του σαν συνηθισμένου δαίμονα είναι η "
 "συνιστώμενη προσέγγιση."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "Να δημιουργηθεί η βάση δεδομένων των κωδικών πρόσβασης samba, /var/lib/"
+#~ "samba/passdb.tdb;"
+
+#~ 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 ""
+#~ "Για να είναι συμβατή με τις προεπιλογές στις περισσότερες εκδόσεις των "
+#~ "Windows, η υπηρεσία Samba θα πρέπει να ρυθμιστεί ώστε να χρησιμοποιεί "
+#~ "κρυπτογραφημένους κωδικούς πρόσβασης. Αυτό απαιτεί την φύλαξη των κωδικών "
+#~ "πρόσβασης σε ένα αρχείο ξεχωριστά από το /etc/passwd. Αυτό το αρχείο "
+#~ "μπορεί να δημιουργηθεί αυτόματα, αλλά οι κωδικοί πρόσβασης θα πρέπει να "
+#~ "προστεθούν με το χέρι εκτελώντας την εντολή smbpasswd και να διατηρούνται "
+#~ "πάντα ενημερωμένα στο μέλλον."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Αν δεν δημιουργήσετε το αρχείο, θα πρέπει να ξαναρυθμίσετε την υπηρεσία "
+#~ "Samba (και πιθανόν τα μηχανήματα πελάτης της υπηρεσίας) ώστε βα "
+#~ "χρησιμοποιούν μη κρυπτογραφημένους κωδικούς πρόσβασης."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Δείτε το αρχείο usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html από το "
+#~ "πακέτο samba-doc για περισσότερες λεπτομέρειες."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Η αλύσωση των backend των passdb δεν υποστηρίζεται"
 

Modified: trunk/samba/debian/po/eo.po
===================================================================
--- trunk/samba/debian/po/eo.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/eo.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 19:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas at gmail.com>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto at lists.debian.org>\n"
@@ -142,72 +142,60 @@
 msgid "Samba server"
 msgstr "Servilo Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Ĉu krei pasvortan datumbazon de samba, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Por kongrui kun implicita regulo el plejmultaj eldonoj de Windows, Samba "
-"devas esti agordita por uzi ĉifritajn pasvortojn. Tio postulas ke uzant-"
-"pasvortoj estu konservitaj en dosiero aparta de /etc/passwd. Tiu ĉi dosiero "
-"povas esti aŭtomate kreata, sed oni devas mane aldoni la pasvortojn lanĉante "
-"smbpasswd kaj tenante ilin ĝisdataj estonte."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Se vi ne kreos ĝin, vi devos reakomodi Samba (kaj verŝajne viajn klientajn "
-"maŝinojn) por uzi purtekstajn pasvortojn."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Vidu /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
-"html el la pako samba-doc por pliaj informoj."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "demonoj"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Kiel vi volas lanĉi Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "La Samba-demono smbd povas esti lanĉita kiel normala demono aŭ per la "
 "programo inetd. Oni rekomendas lanĉi ĝin kiel demonon."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Ĉu krei pasvortan datumbazon de samba, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Por kongrui kun implicita regulo el plejmultaj eldonoj de Windows, Samba "
+#~ "devas esti agordita por uzi ĉifritajn pasvortojn. Tio postulas ke uzant-"
+#~ "pasvortoj estu konservitaj en dosiero aparta de /etc/passwd. Tiu ĉi "
+#~ "dosiero povas esti aŭtomate kreata, sed oni devas mane aldoni la "
+#~ "pasvortojn lanĉante smbpasswd kaj tenante ilin ĝisdataj estonte."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Se vi ne kreos ĝin, vi devos reakomodi Samba (kaj verŝajne viajn "
+#~ "klientajn maŝinojn) por uzi purtekstajn pasvortojn."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Vidu /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html el la pako samba-doc por pliaj informoj."

Modified: trunk/samba/debian/po/es.po
===================================================================
--- trunk/samba/debian/po/es.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/es.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -38,8 +38,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba 2:3.5.8\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 22:37+0200\n"
 "Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -184,71 +184,27 @@
 msgid "Samba server"
 msgstr "Servidor Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"¿Desea crear la base de datos de contraseñas «/var/lib/samba/passdb.tdb»?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Hay que configurar Samba para que use contraseñas cifradas para mantener la "
-"compatibilidad con el comportamiento por omisión de la mayoría de los "
-"sistemas Windows. Para hacer esto es necesario crear un fichero, distinto de "
-"«/etc/passwd», donde se guarden las contraseñas de los usuarios. El fichero "
-"se puede crear automáticamente, aunque es necesario añadir las contraseñas "
-"manualmente mediante el programa «smbpasswd» y mantenerlas al día."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Es imprescindible que configure Samba (y probablemente también los sistemas "
-"cliente) para que use contraseñas en texto claro si no crea este fichero."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Si desea más información consulte «/usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html», disponible en el paquete samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "demonios"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "¿Cómo quiere que se ejecute Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -256,3 +212,37 @@
 "El demonio de Samba «smbd» puede ejecutarse como un demonio normal "
 "independiente o iniciarse desde el demonio «inetd». Se recomienda que se "
 "ejecute como demonio independiente."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "¿Desea crear la base de datos de contraseñas «/var/lib/samba/passdb.tdb»?"
+
+#~ 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 ""
+#~ "Hay que configurar Samba para que use contraseñas cifradas para mantener "
+#~ "la compatibilidad con el comportamiento por omisión de la mayoría de los "
+#~ "sistemas Windows. Para hacer esto es necesario crear un fichero, distinto "
+#~ "de «/etc/passwd», donde se guarden las contraseñas de los usuarios. El "
+#~ "fichero se puede crear automáticamente, aunque es necesario añadir las "
+#~ "contraseñas manualmente mediante el programa «smbpasswd» y mantenerlas al "
+#~ "día."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Es imprescindible que configure Samba (y probablemente también los "
+#~ "sistemas cliente) para que use contraseñas en texto claro si no crea este "
+#~ "fichero."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Si desea más información consulte «/usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html», disponible en el paquete samba-doc."

Modified: trunk/samba/debian/po/et.po
===================================================================
--- trunk/samba/debian/po/et.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/et.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-13 10:26+0300\n"
 "Last-Translator: Siim Põder <siim at p6drad-teel.net>\n"
 "Language-Team: \n"
@@ -104,10 +104,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -127,10 +123,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -144,10 +136,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -164,68 +152,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Luua samba paroolide andmebaas, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Et ühilduda enamike Windows versioonidega, tuleb Samba seadistada "
-"krüpteeritud paroole kasutama. Selle jaoks on tarvis kasutajate paroole "
-"väljaspool /etc/passwd hoida. Selle faili võib automaatselt luua, kuid "
-"paroolid tuleb sinna käsitsi lisada ning ka hiljem värsketena hoida."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Kui sa seda ei loo, tuleb sul Samba ümber seadistada (ning tõenäoliselt ka "
-"kliendimasinad) kasutamaks avatud paroole."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"End detailidega kurssi viimaks loe /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html pakist samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "deemonitena"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd'ist"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Kuidas soovid Samba käivitada?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -233,6 +180,35 @@
 "Samba deemon võib käivituda kui tavaline deemon või inetd'ist. Soovitatav "
 "lähenemine on käivitamine tavalise deemonina."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Luua samba paroolide andmebaas, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Et ühilduda enamike Windows versioonidega, tuleb Samba seadistada "
+#~ "krüpteeritud paroole kasutama. Selle jaoks on tarvis kasutajate paroole "
+#~ "väljaspool /etc/passwd hoida. Selle faili võib automaatselt luua, kuid "
+#~ "paroolid tuleb sinna käsitsi lisada ning ka hiljem värsketena hoida."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Kui sa seda ei loo, tuleb sul Samba ümber seadistada (ning tõenäoliselt "
+#~ "ka kliendimasinad) kasutamaks avatud paroole."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "End detailidega kurssi viimaks loe /usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html pakist samba-doc."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr ""
 #~ "passdb backends mitme järjestikkuse variandi määramine pole toetatud"

Modified: trunk/samba/debian/po/eu.po
===================================================================
--- trunk/samba/debian/po/eu.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/eu.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-04-07 23:18+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
@@ -157,70 +157,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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 ""
-"Windows sistema gehienen lehenetsiriko portaerarekin bateragarritasuna "
-"mantentzeko, Samba zifraturiko pasahitzak erabiltzeko konfiguratu behar da.  "
-"Honetako erabiltzaileen pasahitzak gordeko dituen /etc/passwd fitxategiaz "
-"bereiziriko beste fitxategi bat sortu behar da. Fitxategia automatikoki "
-"sortu daiteke baina pasahitzak eskuz gehitu behar dira 'smbpasswd' "
-"programaren bidez eta pasahitzak eguneraturik mantendu behar dira."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Fitxategi hau ez sortuaz gero beharrezkoa da Samba (eta ziurrenik Windows "
-"bezeroak) zifratu gabeko pasahitzak erabiltzeko konfiguratzea."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
-"pwencrypt.html begiratu argibide gehiagorako."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "deabruak"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Nola nahi duzu Samba abiaraztea?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -228,6 +185,38 @@
 "Samba smbd zerbitzua deabru arrunt edo inted bidez abiarazi daiteke. Deabru "
 "bezala abiaraztea gomendatzen da."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "/var/lib/samba/passdb.tdb pasahitz datubase berria sortu?"
+
+#~ 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 ""
+#~ "Windows sistema gehienen lehenetsiriko portaerarekin bateragarritasuna "
+#~ "mantentzeko, Samba zifraturiko pasahitzak erabiltzeko konfiguratu behar "
+#~ "da.  Honetako erabiltzaileen pasahitzak gordeko dituen /etc/passwd "
+#~ "fitxategiaz bereiziriko beste fitxategi bat sortu behar da. Fitxategia "
+#~ "automatikoki sortu daiteke baina pasahitzak eskuz gehitu behar dira "
+#~ "'smbpasswd' programaren bidez eta pasahitzak eguneraturik mantendu behar "
+#~ "dira."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Fitxategi hau ez sortuaz gero beharrezkoa da Samba (eta ziurrenik Windows "
+#~ "bezeroak) zifratu gabeko pasahitzak erabiltzeko konfiguratzea."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+#~ "Guide/pwencrypt.html begiratu argibide gehiagorako."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "\"passbd\" motore kateatzea ez da onartzen"
 

Modified: trunk/samba/debian/po/fi.po
===================================================================
--- trunk/samba/debian/po/fi.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/fi.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba fi\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-13 12:50+0300\n"
 "Last-Translator: Tapio Lehtonen <tale at debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -145,69 +145,27 @@
 msgid "Samba server"
 msgstr "Samba-palvelin"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Luodaanko samban salasanatietokanta, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Jotta Samba olisi yhteensopiva useimpien Windows-versioiden oletusten "
-"kanssa, on Samban käytettävä salattuja salasanoja. Tällöin on salasanat "
-"tallennettava muualle kuin tiedostoon /etc/passwd. Tallennustiedosto voidaan "
-"luoda automaattisesti, mutta salasanat on itse lisättävä komennolla "
-"smbpasswd ja ne on itse pidettävä ajan tasalla jatkossa."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Jos tiedostoa ei luoda, on Samba asetettava käyttämään selväkielisiä "
-"salasanoja (kuten asiakaskoneetkin)."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Katso lisätietoja paketin samba-doc tiedostosta /usr/share/doc/samba-doc/"
-"htmldocs/ENCRYPTION.html."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "palvelinprosessit"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Kuinka Samba käynnistetään?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -215,6 +173,36 @@
 "Samban palvelinprosessi smbd voi toimia tavallisena prosessina tai inetd voi "
 "käynnistää sen. Tavallisen prosessin käyttämistä suositellaan."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Luodaanko samban salasanatietokanta, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Jotta Samba olisi yhteensopiva useimpien Windows-versioiden oletusten "
+#~ "kanssa, on Samban käytettävä salattuja salasanoja. Tällöin on salasanat "
+#~ "tallennettava muualle kuin tiedostoon /etc/passwd. Tallennustiedosto "
+#~ "voidaan luoda automaattisesti, mutta salasanat on itse lisättävä "
+#~ "komennolla smbpasswd ja ne on itse pidettävä ajan tasalla jatkossa."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Jos tiedostoa ei luoda, on Samba asetettava käyttämään selväkielisiä "
+#~ "salasanoja (kuten asiakaskoneetkin)."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Katso lisätietoja paketin samba-doc tiedostosta /usr/share/doc/samba-doc/"
+#~ "htmldocs/ENCRYPTION.html."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb:n taustaosien ketjuttamista ei tueta"
 

Modified: trunk/samba/debian/po/fr.po
===================================================================
--- trunk/samba/debian/po/fr.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/fr.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 10:48+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -151,71 +151,27 @@
 msgid "Samba server"
 msgstr "Serveur Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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 ""
-"Pour rester compatible avec les réglages par défaut de la majorité des "
-"versions de Windows, Samba doit être configuré pour utiliser des mots de "
-"passe chiffrés. Cela impose de conserver les mots de passe dans un fichier "
-"distinct de /etc/passwd. Ce fichier peut être créé automatiquement, mais les "
-"mots de passe doivent y être ajoutés manuellement avec la commande "
-"« smbpasswd » et être tenus à jour."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Veuillez consulter le fichier /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
-"html dans le paquet samba-doc pour plus d'informations."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "démons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Comment voulez-vous lancer Samba ?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -223,3 +179,34 @@
 "Le service de Samba smbd peut s'exécuter en tant que démon classique ou bien "
 "être lancé par inetd. Il est recommandé de l'exécuter en tant que démon."
 
+#~ 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 ?"
+
+#~ 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 ""
+#~ "Pour rester compatible avec les réglages par défaut de la majorité des "
+#~ "versions de Windows, Samba doit être configuré pour utiliser des mots de "
+#~ "passe chiffrés. Cela impose de conserver les mots de passe dans un "
+#~ "fichier distinct de /etc/passwd. Ce fichier peut être créé "
+#~ "automatiquement, mais les mots de passe doivent y être ajoutés "
+#~ "manuellement avec la commande « smbpasswd » et être tenus à jour."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "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."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Veuillez consulter le fichier /usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html dans le paquet samba-doc pour plus d'informations."

Modified: trunk/samba/debian/po/gl.po
===================================================================
--- trunk/samba/debian/po/gl.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/gl.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_2:3.5.8~dfsg-2_gl\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 11:46+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -162,71 +162,27 @@
 msgid "Samba server"
 msgstr "Servidor Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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 ""
-"Para que sexa compatíbel coa configuración predeterminada da maioría das "
-"versións de Windows, Samba ten que se configurar para empregar contrasinais "
-"cifrados. Para facelo, hai que almacenar os contrasinais dos usuarios nun "
-"ficheiro separado de /etc/passwd. Este ficheiro pódese crear "
-"automaticamente, mais os contrasinais hai que engadilos á man empregando "
-"smbpasswd e hai que mantelo actualizado no futuro."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Se non o crea ha ter que reconfigurar samba (e probabelmente tamén as "
-"máquinas cliente) para que empreguen contrasinais en texto simple."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Consulte o ficheiro /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
-"Guide/pwencrypt.html do paquete samba-doc para obter máis detalles."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "servizos"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Como quere executar Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -234,6 +190,38 @@
 "O servizo de Samba smbd pode funcionar coma un servizo normal ou desde "
 "inetd. Recoméndase executalo coma un servizo."
 
+#~ 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?"
+
+#~ 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 ""
+#~ "Para que sexa compatíbel coa configuración predeterminada da maioría das "
+#~ "versións de Windows, Samba ten que se configurar para empregar "
+#~ "contrasinais cifrados. Para facelo, hai que almacenar os contrasinais dos "
+#~ "usuarios nun ficheiro separado de /etc/passwd. Este ficheiro pódese crear "
+#~ "automaticamente, mais os contrasinais hai que engadilos á man empregando "
+#~ "smbpasswd e hai que mantelo actualizado no futuro."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Se non o crea ha ter que reconfigurar samba (e probabelmente tamén as "
+#~ "máquinas cliente) para que empreguen contrasinais en texto simple."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Consulte o ficheiro /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+#~ "Guide/pwencrypt.html do paquete samba-doc para obter máis detalles."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Non está soportado o encadeamento de motores de passdb"
 

Modified: trunk/samba/debian/po/gu.po
===================================================================
--- trunk/samba/debian/po/gu.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/gu.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_gu\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-06-08 20:22+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry at gmail.com>\n"
 "Language-Team: Gujarati <team at utkarsh.org>\n"
@@ -102,10 +102,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -126,10 +122,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -143,10 +135,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -163,68 +151,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "સામ્બા પાસવર્ડ ડેટાબેઝ, /var/lib/samba/passdb.tdb બનાવશો?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"samba-doc પેકેજમાં /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
-"pwencrypt.html વધુ માહિતી માટે જુઓ."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "ડેમોન્સ"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "તમે સામ્બા કઇ રીતે ઉપયોગ કરશો?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -232,6 +179,35 @@
 "સામ્બા ડેમોન smbd સામાન્ય ડેમોન અથવા inetd તરીકે ચાલી શકે છે. ડેમોન તરીકે ચલાવવાનું "
 "સલાહભર્યું છે."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "સામ્બા પાસવર્ડ ડેટાબેઝ, /var/lib/samba/passdb.tdb બનાવશો?"
+
+#~ 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 ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "જો તમે નહી બનાવો તો, તમારે સાદા પાસવર્ડો વાપરવા માટે સામ્બા (અને કદાચ તમારા "
+#~ "ક્લાયન્ટ મશીનોને) ફરીથી રુપરેખાંકિત કરવાં પડશે."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "samba-doc પેકેજમાં /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+#~ "pwencrypt.html વધુ માહિતી માટે જુઓ."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb બેકએન્ડ બદલવાનું આધાર આપવામાં આવતું નથી"
 

Modified: trunk/samba/debian/po/he.po
===================================================================
--- trunk/samba/debian/po/he.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/he.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_2_3_5_6_dfsg_2_debconf_he\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-14 00:25+0200\n"
 "Last-Translator: Eran Cohen <shokocham at gmail.com>\n"
 "Language-Team: Hebrew <debian-hebrew-common at lists.alioth.debian.org>\n"
@@ -147,73 +147,61 @@
 msgid "Samba server"
 msgstr "שרת סמבה"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"האם ליצור מסד נתונים של ססמאות עבור שרת הסמבה, בקובץ /var/lib/samba/passdb."
-"tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"כדי להתאים לברירת המחדל ברוב הגרסאות של Windows, על Samba להיות מוגדרת "
-"להשתמש בסיסמאות מוצפנות. אפשרות זו מצריכה אחסון של סיסמאות בקובץ שונה מ /etc/"
-"passwd. ניתן ליצור קובץ זה בצורה אוטומטית, אך יש צורך להוסיף את הסיסמאות "
-"ולתחזק אותן בעתיד בצורה ידנית בעזרת הפקודה smbpasswd."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"ראה מידע נוסף בקובץ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
-"Guide/pwencrypt.html מתוך החבילה samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "תהליכי רקע"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "כיצד תרצה להריץ את סמבה?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "האם ליצור מסד נתונים של ססמאות עבור שרת הסמבה, בקובץ /var/lib/samba/"
+#~ "passdb.tdb?"
+
+#~ 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 ""
+#~ "כדי להתאים לברירת המחדל ברוב הגרסאות של Windows, על Samba להיות מוגדרת "
+#~ "להשתמש בסיסמאות מוצפנות. אפשרות זו מצריכה אחסון של סיסמאות בקובץ שונה מ /"
+#~ "etc/passwd. ניתן ליצור קובץ זה בצורה אוטומטית, אך יש צורך להוסיף את "
+#~ "הסיסמאות ולתחזק אותן בעתיד בצורה ידנית בעזרת הפקודה smbpasswd."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "אם לא תיצור קובץ זה, יהיה עליך לקנפג מחדש את סמבה (וסביר להניח שגם של כל "
+#~ "לקוחותיו) כדי להשתמש בססמאות שאינן מוצפנות."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "ראה מידע נוסף בקובץ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+#~ "Guide/pwencrypt.html מתוך החבילה samba-doc."

Modified: trunk/samba/debian/po/hu.po
===================================================================
--- trunk/samba/debian/po/hu.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/hu.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-13 09:20+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <hu at li.org>\n"
@@ -100,10 +100,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -124,10 +120,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -141,10 +133,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -161,69 +149,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Létrehozod a samba jelszóadatbázist (/var/lib/samba/passdb.tdb)?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Az újabb Windows kliensekkel való kompatibilitás érdekében a Samba-t kódolt "
-"jelszavak használatára kell beállítani. Ez megköveteli a jelszavak /etc/"
-"passwd fájltól különálló tárolását. Ez a fájl automatikusan létrejön, de a "
-"jelszavakat kézzel kell felvenni az smbpasswd parancs futtatásával és a "
-"továbbiakban kezelni."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Ha nem hozod létre, újra be kell állítani a Samba-t (és valószínűleg a "
-"klienseket is) a sima szöveges jelszavakhoz."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Lásd a samba-doc csomag /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
-"Guide/pwencrypt.html odalát a részletekért."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "démonok"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Hogyan induljon a Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -231,6 +177,36 @@
 "Az smbd Samba démon futhat normál démonként vagy az inetd-n keresztül. A "
 "démonként való futtatása a javasolt beállítás."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Létrehozod a samba jelszóadatbázist (/var/lib/samba/passdb.tdb)?"
+
+#~ 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 ""
+#~ "Az újabb Windows kliensekkel való kompatibilitás érdekében a Samba-t "
+#~ "kódolt jelszavak használatára kell beállítani. Ez megköveteli a "
+#~ "jelszavak /etc/passwd fájltól különálló tárolását. Ez a fájl "
+#~ "automatikusan létrejön, de a jelszavakat kézzel kell felvenni az "
+#~ "smbpasswd parancs futtatásával és a továbbiakban kezelni."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Ha nem hozod létre, újra be kell állítani a Samba-t (és valószínűleg a "
+#~ "klienseket is) a sima szöveges jelszavakhoz."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Lásd a samba-doc csomag /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html odalát a részletekért."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "A passdb hátterek láncolása nem támogatott"
 

Modified: trunk/samba/debian/po/id.po
===================================================================
--- trunk/samba/debian/po/id.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/id.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 2:3.6.3-1\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2012-02-18 10:57+0700\n"
 "Last-Translator: Mahyuddin Susanto <udienz at ubuntu.com>\n"
 "Language-Team: Debian Indonesia Translators <debian-l10n-indonesian at lists."
@@ -157,72 +157,61 @@
 msgid "Samba server"
 msgstr "Server Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Buat basis data sandi samba dalam /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Agar kompatibel dengan semua versi Windows, Samba harus dikonfigurasi untuk "
-"menggunakan sandi terenkripsi. Hal ini mengharuskan sandi pengguna disimpan "
-"dalam berkas selain /etc/passwd. Berkas ini dapat dibuat otomatis, tetapi "
-"kata sandi harus ditambahkan secara manual dengan menjalankan perintah "
-"smbpasswd dan diperbaharui setiap ada perubahan pengguna."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Jika Anda tidak membuatnya, Anda harus mengonfigurasi ulang Samba (dan juga "
-"komputer klien) untuk menggunakan sandi teks-murni."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Lihat /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
-"html dalam paket samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "server"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Bagaimana Anda ingin menjalankan Samba"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "Server samba (smbd) dapat berjalan sebagai server normal (daemon) atau dari "
 "inetd. Sangat dianjurkan menjalankannya sebagai server normal."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Buat basis data sandi samba dalam /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Agar kompatibel dengan semua versi Windows, Samba harus dikonfigurasi "
+#~ "untuk menggunakan sandi terenkripsi. Hal ini mengharuskan sandi pengguna "
+#~ "disimpan dalam berkas selain /etc/passwd. Berkas ini dapat dibuat "
+#~ "otomatis, tetapi kata sandi harus ditambahkan secara manual dengan "
+#~ "menjalankan perintah smbpasswd dan diperbaharui setiap ada perubahan "
+#~ "pengguna."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Jika Anda tidak membuatnya, Anda harus mengonfigurasi ulang Samba (dan "
+#~ "juga komputer klien) untuk menggunakan sandi teks-murni."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Lihat /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html dalam paket samba-doc."

Modified: trunk/samba/debian/po/it.po
===================================================================
--- trunk/samba/debian/po/it.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/it.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.5.8 italian debconf templates\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-22 14:07+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -147,70 +147,27 @@
 msgid "Samba server"
 msgstr "Server Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Creare il database delle password di samba /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Per essere compatibile con le impostazioni predefinite di molte versioni di "
-"Windows, Samba deve essere configurato per usare password cifrate. Ciò "
-"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 usando smbpasswd e in futuro il file "
-"dovrà essere tenuto aggiornato."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Se non si crea questo file è necessario riconfigurare Samba (e probabilmente "
-"anche le macchine client) per usare password in chiaro."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Si veda /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
-"html, contenuto nel pacchetto samba-doc, per ulteriori dettagli."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "demoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Come avviare Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -218,6 +175,38 @@
 "Il demone Samba smbd può essere avviato come un normale demone oppure da "
 "inetd. Si raccomanda l'avvio come demone."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "Creare il database delle password di samba /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Per essere compatibile con le impostazioni predefinite di molte versioni "
+#~ "di Windows, Samba deve essere configurato per usare password cifrate. Ciò "
+#~ "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 usando smbpasswd e in "
+#~ "futuro il file dovrà essere tenuto aggiornato."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Se non si crea questo file è necessario riconfigurare Samba (e "
+#~ "probabilmente anche le macchine client) per usare password in chiaro."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Si veda /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+#~ "pwencrypt.html, contenuto nel pacchetto samba-doc, per ulteriori dettagli."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Il caricamento a catena dei backend passdb non è supportato"
 

Modified: trunk/samba/debian/po/ja.po
===================================================================
--- trunk/samba/debian/po/ja.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ja.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 18:19+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -153,72 +153,62 @@
 msgid "Samba server"
 msgstr "Samba サーバ"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Samba パスワードデータベース /var/lib/samba/passdb.tdb を作成しますか?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Windows のほとんどのバージョンのデフォルトとの互換性のために、Samba を暗号化"
-"パスワードを使うように設定する必要があります。これはユーザのパスワードを /"
-"etc/passwd とは別のファイルに格納することを必要とします。このファイルは自動的"
-"に作成することができますが、パスワードは手動で (smbpasswd を使って) 追加しな"
-"ければならず、将来に渡って最新状態を保ち続けるよう整えておく必要があります。"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"このファイルを作成しない場合、プレインテキストパスワードを使うよう Samba (お"
-"よびおそらくあなたのクライアントマシン) の再設定が必要です。"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"詳細については、samba-doc パッケージにある /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html を参照してください。"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "デーモン"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "どのように Samba を実行したいですか?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
 "Samba デーモン smbd は通常のデーモンとしての実行または inetd からの実行ができ"
 "ます。デーモンとして実行するのがお勧めの手段です。"
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "Samba パスワードデータベース /var/lib/samba/passdb.tdb を作成しますか?"
+
+#~ 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 ""
+#~ "Windows のほとんどのバージョンのデフォルトとの互換性のために、Samba を暗号"
+#~ "化パスワードを使うように設定する必要があります。これはユーザのパスワード"
+#~ "を /etc/passwd とは別のファイルに格納することを必要とします。このファイル"
+#~ "は自動的に作成することができますが、パスワードは手動で (smbpasswd を使っ"
+#~ "て) 追加しなければならず、将来に渡って最新状態を保ち続けるよう整えておく必"
+#~ "要があります。"
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "このファイルを作成しない場合、プレインテキストパスワードを使うよう Samba "
+#~ "(およびおそらくあなたのクライアントマシン) の再設定が必要です。"
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "詳細については、samba-doc パッケージにある /usr/share/doc/samba-doc/"
+#~ "htmldocs/ENCRYPTION.html を参照してください。"

Modified: trunk/samba/debian/po/ka.po
===================================================================
--- trunk/samba/debian/po/ka.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ka.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2008-09-10 01:45+0400\n"
 "Last-Translator: Aiet Kolkhi <aietkolkhi at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -97,10 +97,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -121,10 +117,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -138,10 +130,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -158,72 +146,61 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "გსურთ samba-ს პაროლთა ბაზის, /var/lib/samba/passdb.tdb-ს შექმნა?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Windows-ის უმეტეს ვერსიების ნაგულისხმევ პარამეტრებთან თავსებადობისათვის, "
-"Samba-მ დაშიფრული პაროლები უნდა გამოიყენოს. ეს საჭიროებს, რომ მომხმარებელთა "
-"პაროლები /etc/passwd-ისაგან განცხალკევებით იქნას შენახული.  ამ ფაილის შექმნა "
-"ავტომატურად არის შესაძლებელი, თუმცა პაროლების ჩამატება ხელით უნდა მოხდეს "
-"smbpasswd ბრძანებით და სამომავლოდ მუდამ განახლებული უნდა იყოს."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"თუ მას არ შექმნით, Samba-ს (და სავარაუდოდ თქვენი კლიენტისაც) ხელახალი "
-"კონფიგურაცია მოგიწევთ დაუშიფრავი პაროლების გამოსაყენებლად."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"დამატებითი ინფორმაციისათვის იხილეთ /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html სტატია samba-doc პაკეტიდან."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "დემონები"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "როგორ გსურთ Samba-ს გაშვება?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
 "Samba-ს დემონი smbd შეიძლება გაეშვას როგორც ჩვეულებრივი დემო inetd-დან. "
 "დემონად გაშვება რეკომენდირებული მიდგომაა."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "გსურთ samba-ს პაროლთა ბაზის, /var/lib/samba/passdb.tdb-ს შექმნა?"
+
+#~ 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 ""
+#~ "Windows-ის უმეტეს ვერსიების ნაგულისხმევ პარამეტრებთან თავსებადობისათვის, "
+#~ "Samba-მ დაშიფრული პაროლები უნდა გამოიყენოს. ეს საჭიროებს, რომ "
+#~ "მომხმარებელთა პაროლები /etc/passwd-ისაგან განცხალკევებით იქნას შენახული.  "
+#~ "ამ ფაილის შექმნა ავტომატურად არის შესაძლებელი, თუმცა პაროლების ჩამატება "
+#~ "ხელით უნდა მოხდეს smbpasswd ბრძანებით და სამომავლოდ მუდამ განახლებული "
+#~ "უნდა იყოს."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "თუ მას არ შექმნით, Samba-ს (და სავარაუდოდ თქვენი კლიენტისაც) ხელახალი "
+#~ "კონფიგურაცია მოგიწევთ დაუშიფრავი პაროლების გამოსაყენებლად."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "დამატებითი ინფორმაციისათვის იხილეთ /usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html სტატია samba-doc პაკეტიდან."

Modified: trunk/samba/debian/po/km.po
===================================================================
--- trunk/samba/debian/po/km.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/km.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po_km\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-13 08:39+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -121,10 +121,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -148,10 +144,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -167,10 +159,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -187,70 +175,21 @@
 msgid "Samba server"
 msgstr ""
 
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "បង្កើត​មូលដ្ឋាន​ទិន្នន័យពាក្យសម្ងាត់ samba /var/lib/samba/passdb.tdb ?"
-
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"ដើម្បី​ឆប​ជា​មួយ​នឹង​លំនាំដើម​នៅ​ក្នុង​កំណែ​ភាគ​ច្រើន​របស់​វីនដូ Samba ត្រូវ​តែ​បាន​កំណត់​រចនាសម្ព័ន្ធ​ដើម្បី​ប្រើ​ពាក្យ​"
-"សម្ងាត់​ដែល​បាន​អ៊ិនគ្រីប ។  វា​ត្រូវ​ការ​ពាក្យសម្ងាត់​អ្នក​ប្រើ​ដើម្បី​ទុក​ក្នុង​ឯកសារ​ដោយ​ឡែក​ពី /etc/"
-"passwd ។ ឯកសារ​នេះ​អាច​ត្រូវ​បាន​បង្កើត​ដោយ​ស្វ័យប្រវត្តិ ប៉ុន្តែ​ពាក្យ​សម្ងាត់​ត្រូវ​តែ​បាន​បន្ថែម​ដោយ​ដៃ​ដោយ​"
-"រត់ smbpasswd និង​ត្រូវ​បាន​ធ្វើឲ្យ​ទាន់​សម័យ​ក្នុង​ពេល​អនាគត ។"
-
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"ប្រសិន​បើ​អ្នក​មិន​បង្កើត​វា អ្នក​ត្រូវ​តែ​កំណត់​រចនាសម្ព័ន្ធ Samba (និង​ប្រហែល​ជាម៉ាស៊ីន​ភ្ញៀវ​របស់​អ្នក) ដើម្បី​"
-"ប្រើពាក្យសម្ងាត់អត្ថបទ​ធម្មតា ។"
-
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"សម្រាប់​សេចក្តី​លម្អិត​បន្ថែម​សូម​មើល  /usr/share/doc/samba-doc/htmldocs/Samba3-"
-"Developers-Guide/pwencrypt.html ពី​កញ្ចប់ samba-doc ។"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "ដេមិន "
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "តើ​អ្នក​ចង់​រត់ Samba តាម​វិធី​ណា ?"
 
@@ -258,13 +197,50 @@
 #  Description
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
 "ដេមិន Samba smbd អាចរត់ជាដេមិនធម្មតា ឬពី inetd ។ ការរត់ជាដេមិនមួយត្រូវបានផ្ដល់អនុសាសន៍ ។"
 
+#  Type: boolean
+#  Description
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "បង្កើត​មូលដ្ឋាន​ទិន្នន័យពាក្យសម្ងាត់ samba /var/lib/samba/passdb.tdb ?"
+
+#  Type: boolean
+#  Description
+#~ 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 ""
+#~ "ដើម្បី​ឆប​ជា​មួយ​នឹង​លំនាំដើម​នៅ​ក្នុង​កំណែ​ភាគ​ច្រើន​របស់​វីនដូ Samba ត្រូវ​តែ​បាន​កំណត់​រចនាសម្ព័ន្ធ​ដើម្បី​ប្រើ​"
+#~ "ពាក្យ​សម្ងាត់​ដែល​បាន​អ៊ិនគ្រីប ។  វា​ត្រូវ​ការ​ពាក្យសម្ងាត់​អ្នក​ប្រើ​ដើម្បី​ទុក​ក្នុង​ឯកសារ​ដោយ​ឡែក​ពី /etc/"
+#~ "passwd ។ ឯកសារ​នេះ​អាច​ត្រូវ​បាន​បង្កើត​ដោយ​ស្វ័យប្រវត្តិ ប៉ុន្តែ​ពាក្យ​សម្ងាត់​ត្រូវ​តែ​បាន​បន្ថែម​ដោយ​ដៃ​"
+#~ "ដោយ​រត់ smbpasswd និង​ត្រូវ​បាន​ធ្វើឲ្យ​ទាន់​សម័យ​ក្នុង​ពេល​អនាគត ។"
+
+#  Type: boolean
+#  Description
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "ប្រសិន​បើ​អ្នក​មិន​បង្កើត​វា អ្នក​ត្រូវ​តែ​កំណត់​រចនាសម្ព័ន្ធ Samba (និង​ប្រហែល​ជាម៉ាស៊ីន​ភ្ញៀវ​របស់​អ្នក) "
+#~ "ដើម្បី​ប្រើពាក្យសម្ងាត់អត្ថបទ​ធម្មតា ។"
+
+#  Type: boolean
+#  Description
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "សម្រាប់​សេចក្តី​លម្អិត​បន្ថែម​សូម​មើល  /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html ពី​កញ្ចប់ samba-doc ។"
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "មិនគាំទ្រ​ការ​ដាក់​កម្មវិធី​ខាង​ក្រោយ passdb ជា​លំដាប់"
 

Modified: trunk/samba/debian/po/ko.po
===================================================================
--- trunk/samba/debian/po/ko.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ko.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -3,8 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-14 09:28-0400\n"
 "Last-Translator: Sunjae Park <darehanl at gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -93,10 +93,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -117,10 +113,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -134,10 +126,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -154,69 +142,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "samba의 비밀번호 데이터베이스 /var/lib/samba/passdb.tdb를 만들까요?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"대부분의 윈도우 버전들과의 호환성을 위해 Samba는 암호화된 비밀번호를 사용하도"
-"록 해야 합니다. 이를 위해서는 사용자들의 비밀번호를 /etc/passwd와 다른 곳에 "
-"저장해야 합니다. 이 파일은 자동으로 생성할 수는 있지만, 비밀번호들은 "
-"smbpasswd 명령을 통해 직접 입력하셔야 하며 꾸준히 최신 상태로 유지하셔야 합니"
-"다."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"생성하지 않을 경우, Samba(와 대부분의 클라이언트 머신)을 다시 설정하여 플레인"
-"텍스트 비밀번호를 사용하도록 해야 합니다."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"자세한 사항은 samba-doc 꾸러미에서 제공하는 /usr/share/doc/samba-doc/"
-"htmldocs/ENCRYPTION.html를 참조하십시오."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "데몬"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Samba를 어떻게 실행하시겠습니까?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -224,6 +170,36 @@
 "Samba의 데몬인 smbd은 일반적인 데몬으로 실행할 수도 있고 inetd을 통해 실행할 "
 "수도 있습니다. 데몬으로 실행할 것을 권장합니다."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "samba의 비밀번호 데이터베이스 /var/lib/samba/passdb.tdb를 만들까요?"
+
+#~ 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 ""
+#~ "대부분의 윈도우 버전들과의 호환성을 위해 Samba는 암호화된 비밀번호를 사용"
+#~ "하도록 해야 합니다. 이를 위해서는 사용자들의 비밀번호를 /etc/passwd와 다"
+#~ "른 곳에 저장해야 합니다. 이 파일은 자동으로 생성할 수는 있지만, 비밀번호들"
+#~ "은 smbpasswd 명령을 통해 직접 입력하셔야 하며 꾸준히 최신 상태로 유지하셔"
+#~ "야 합니다."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "생성하지 않을 경우, Samba(와 대부분의 클라이언트 머신)을 다시 설정하여 플"
+#~ "레인텍스트 비밀번호를 사용하도록 해야 합니다."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "자세한 사항은 samba-doc 꾸러미에서 제공하는 /usr/share/doc/samba-doc/"
+#~ "htmldocs/ENCRYPTION.html를 참조하십시오."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "연쇄 passdb 백엔드는 작업은 지원되지 않습니다"
 

Modified: trunk/samba/debian/po/ku.po
===================================================================
--- trunk/samba/debian/po/ku.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ku.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_ku\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2010-10-30 01:33+0200\n"
 "Last-Translator: Erdal Ronahî <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: Kurdish Team http://pckurd.net\n"
@@ -145,72 +145,60 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Danegeha şîfreyên samba, /var/lib/samba/passdb.tdb, were afirandin?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Ji bo hevgirtîkirina srandard a di piraniya guhertoyên Windowsê de, divê "
-"Samba ji bo bikaranîna şîfreya kilîlkirî bê vesazkirin. Ji bo vê divê "
-"şîfreyên bikarhêneran di /etc/passwdê de hatibin tomarkirin. Dibe ku ev pel "
-"xweber bê afirandin, lê divê şîfre bi destan bi meşandina smbpasswd hatibin "
-"lêzêdekirin û di siberojê de rojane bê girtin."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Eger tu vê neafirînî, divê Sambayê veasz bikî (û pêkan e ku makîneya navrûyê "
-"jî) ji bo şîfreya deqa sade."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Ji bo agahiyên zêdetir ji pakêta samba-docê /usr/share/doc/samba-doc/"
-"htmldocs/Samba3-Developers-Guide/pwencrypt.htmlê bibîne."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "daemon"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Dixwazî Samba çawa bixebitînî?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "Daemona Sambayê dikare wekî daemon'eke ji rêzê an jî inetd'ê bixebite. "
 "Xebitandina wekî daemonekê tê pêşniyarkirin."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Danegeha şîfreyên samba, /var/lib/samba/passdb.tdb, were afirandin?"
+
+#~ 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 ""
+#~ "Ji bo hevgirtîkirina srandard a di piraniya guhertoyên Windowsê de, divê "
+#~ "Samba ji bo bikaranîna şîfreya kilîlkirî bê vesazkirin. Ji bo vê divê "
+#~ "şîfreyên bikarhêneran di /etc/passwdê de hatibin tomarkirin. Dibe ku ev "
+#~ "pel xweber bê afirandin, lê divê şîfre bi destan bi meşandina smbpasswd "
+#~ "hatibin lêzêdekirin û di siberojê de rojane bê girtin."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Eger tu vê neafirînî, divê Sambayê veasz bikî (û pêkan e ku makîneya "
+#~ "navrûyê jî) ji bo şîfreya deqa sade."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Ji bo agahiyên zêdetir ji pakêta samba-docê /usr/share/doc/samba-doc/"
+#~ "htmldocs/Samba3-Developers-Guide/pwencrypt.htmlê bibîne."

Modified: trunk/samba/debian/po/lt.po
===================================================================
--- trunk/samba/debian/po/lt.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/lt.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba-lt\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2006-11-26 00:20+0200\n"
 "Last-Translator: Gintautas Miliauskas <gintas at akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -109,10 +109,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -132,10 +128,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -149,10 +141,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -170,69 +158,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Sukurti slaptažodžių duomenų bazę, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Kad būtų suderinama su standartine daugumos Windows sistemų konfigūracija, "
-"Samba turi naudoti šifruotus slaptažodžius. Tokiu atveju naudotojų "
-"slaptažodžiai turi būti saugomi atskirai nuo bendrų slaptažodžių rinkmenoje /"
-"etc/passwd. Ši rinkmena gali būti sukurta automatiškai, tačiau slaptažodžiai "
-"turi būti pridėti rankiniu būdu, leidžiant programą smbpasswd."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Jei nesukursite rinkmenos, turėsite perkonfigūruoti Samba (greičiausiai ir "
-"kitus tinklo kompiuterius), kad būtų naudojami nešifruoti slaptažodžiai."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Daugiau informacijos galite rasti rinkmenoje /usr/share/doc/samba-doc/"
-"htmldocs/ENCRYPTION.html iš paketo samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "tarnybos"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Kokiu būdu norite leisti Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -240,6 +186,38 @@
 "Samba tarnyba smbd gali veikti kaip įprastinė tarnyba arba ji gali būti "
 "paleidžiama iš inetd. Rekomenduojama Samba naudoti kaip įprastinę tarnybą."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Sukurti slaptažodžių duomenų bazę, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Kad būtų suderinama su standartine daugumos Windows sistemų "
+#~ "konfigūracija, Samba turi naudoti šifruotus slaptažodžius. Tokiu atveju "
+#~ "naudotojų slaptažodžiai turi būti saugomi atskirai nuo bendrų "
+#~ "slaptažodžių rinkmenoje /etc/passwd. Ši rinkmena gali būti sukurta "
+#~ "automatiškai, tačiau slaptažodžiai turi būti pridėti rankiniu būdu, "
+#~ "leidžiant programą smbpasswd."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Jei nesukursite rinkmenos, turėsite perkonfigūruoti Samba (greičiausiai "
+#~ "ir kitus tinklo kompiuterius), kad būtų naudojami nešifruoti "
+#~ "slaptažodžiai."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Daugiau informacijos galite rasti rinkmenoje /usr/share/doc/samba-doc/"
+#~ "htmldocs/ENCRYPTION.html iš paketo samba-doc."
+
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr "Perkelti /etc/samba/smbpasswd į /var/lib/samba/passdb.tdb?"
 

Modified: trunk/samba/debian/po/ml.po
===================================================================
--- trunk/samba/debian/po/ml.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ml.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2006-12-11 19:30+0530\n"
 "Last-Translator: Praveen A <pravi.a at gmail.com>\n"
 "Language-Team: Swathanthra Malayalam Computing <smc-discuss at googlegroups."
@@ -108,10 +108,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -132,10 +128,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -150,10 +142,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -171,69 +159,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "സാംബ അടയാള വാക്കുകളുടെ ഡാറ്റാബേസായ /var/lib/samba/passdb.tdb സൃഷ്ടിയ്ക്കട്ടേ?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി samba-doc പാക്കേജിലെ /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html കാണുക."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "ഡെമണുകള്‍"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "സാംബ എങ്ങനെ പ്രവര്‍ത്തിപ്പിക്കാനാണ് നിങ്ങളാഗ്രഹിക്കുന്നത്?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -241,6 +187,38 @@
 "സാംബ ഡെമണ്‍ smbd ഒരു സാധാരണ ഡെമണായോ അല്ലെങ്കില്‍ inetd യില്‍ നിന്നോ "
 "പ്രവര്‍ത്തിപ്പിക്കാവുന്നതാണ്. ഡെമണായി ഓടിക്കുന്നതാണ് ശുപാര്‍ശ ചെയ്തിട്ടുള്ള വഴി."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "സാംബ അടയാള വാക്കുകളുടെ ഡാറ്റാബേസായ /var/lib/samba/passdb.tdb സൃഷ്ടിയ്ക്കട്ടേ?"
+
+#~ 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 ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "ഇത് നിങ്ങള്‍ സൃഷ്ടിച്ചില്ലെങ്കില്‍ നിങ്ങള്‍ക്ക് പ്ലെയിന്‍ ടെക്സ്റ്റ് അടയാള വാക്കുകള്‍ "
+#~ "ഉപയോഗിക്കണമെങ്കില്‍ സാംബ (യും ഒരു പക്ഷേ നിങ്ങളുടെ ക്ലയന്റ് മഷീനുകളും) പുനഃക്രമീകരിക്കേണ്ടി "
+#~ "വരും."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി samba-doc പാക്കേജിലെ /usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html കാണുക."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb ബാക്കെന്‍ഡുകള്‍ ചെയിന്‍ ചെയ്യുന്നതിനെ പിന്‍തുണയ്ക്കുന്നില്ല"
 

Modified: trunk/samba/debian/po/mr.po
===================================================================
--- trunk/samba/debian/po/mr.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/mr.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2006-08-15 07:59-0500\n"
 "Last-Translator: Priti Patil <prithisd at gmail.com>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -108,10 +108,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -132,10 +128,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -149,10 +141,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -169,71 +157,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"var/lib/samba/passdb.tdb /व्हीएआर /एलआयबी/सांबा /एसएमबी पासडीबी.टीडीबी? या "
-"सांबा परवलीच्या शब्दाची डेटाबेस (माहिती) तयार करा."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"विंडोजच्या बहुतेक आवृत्तींमधील डिफॉल्टशी सहत्व ठेवण्यासाठी कूटलिखित परवलीचे शब्द वापरुन "
-"सांबा संरचित केला पाहिजे. यासाठी परवलीचे शब्द,ईटीसी/पासवर्ड पेक्षा अलग संचिकेत साठवून "
-"ठेवणे आवश्यक आहे. ही या संचिकेची रचना स्वयंचलित करता येते,परंतु यात परवलीचे शब्द,एसएमबी "
-"पासवर्ड चालवून स्वहस्ते टाकले पाहिजेत व भविष्यकाळात अद्ययावत ठेवले पाहिजे."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"अधिक माहितीसाठी सांबा-डीओसी पॅकेजमधील /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html (यूएसआर/शेअर/डीओसी/सांबा-डीओसी/एचटीएमएलडीओसीएस/एनक्रिप्शन."
-"एचटीएमएल) हे पॅकेज पहा."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "डिमन्स"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "आयएनइटीडी"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "तुम्हाला सांबा कशा प्रकारे चालू करावयाचा आहे?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -241,6 +185,38 @@
 "सांबा डिमन एसएमबीडी हा प्रोग्राम सर्वसाधारण डिमन म्हणून किंवा आयएनइटीडी मधून चालविता "
 "येतो. डिमन म्हणून चालविणे अधिक श्रेयस्कर."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "var/lib/samba/passdb.tdb /व्हीएआर /एलआयबी/सांबा /एसएमबी पासडीबी.टीडीबी? या "
+#~ "सांबा परवलीच्या शब्दाची डेटाबेस (माहिती) तयार करा."
+
+#~ 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 ""
+#~ "विंडोजच्या बहुतेक आवृत्तींमधील डिफॉल्टशी सहत्व ठेवण्यासाठी कूटलिखित परवलीचे शब्द वापरुन "
+#~ "सांबा संरचित केला पाहिजे. यासाठी परवलीचे शब्द,ईटीसी/पासवर्ड पेक्षा अलग संचिकेत साठवून "
+#~ "ठेवणे आवश्यक आहे. ही या संचिकेची रचना स्वयंचलित करता येते,परंतु यात परवलीचे शब्द,एसएमबी "
+#~ "पासवर्ड चालवून स्वहस्ते टाकले पाहिजेत व भविष्यकाळात अद्ययावत ठेवले पाहिजे."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "तुम्ही ही रचना न केल्यास तुम्हाला सांबा(व कदाचित तुमच्या ग्राहकांचे संगणक),साध्या शब्दांचे "
+#~ "परवलीचे शब्द वापरुन पुनःसंरचित करावे लागतील."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "अधिक माहितीसाठी सांबा-डीओसी पॅकेजमधील /usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html (यूएसआर/शेअर/डीओसी/सांबा-डीओसी/एचटीएमएलडीओसीएस/एनक्रिप्शन."
+#~ "एचटीएमएल) हे पॅकेज पहा."
+
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "/ईटीसी/सांबा/एसएमबी पासवर्ड,/व्हीएआर/एलआयबी/सांबा/पासवर्ड।टीडीबी कडे हलवायचा का?"

Modified: trunk/samba/debian/po/nb.po
===================================================================
--- trunk/samba/debian/po/nb.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/nb.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_debian_po_nb\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 18:00+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst at skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -155,70 +155,28 @@
 msgid "Samba server"
 msgstr "Ingen Samba-tjener er installert på dette systemet"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Opprette samba passord-database, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Samba må settes opp til å bruke krypterte passord for å være kompatibel med "
-"de fleste Windows-versjoner. Dette krever at brukerpassord må lagres i en "
-"egen fil unna /etc/passwd. Denne fila kan opprettes automatisk, men "
-"passordene må legges inn manuelt med smbpasswd og holdes oppdatert i "
-"fremtiden."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Hvis du ikke oppretter den, må du endre oppsettet på Samba (og trolig også "
-"klientmaskinene) til å bruke klartekst-passord."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Mer detaljer finnes i fila /usr/share/doc/samba-doc/htmldocs/Samba3-"
-"Developers-Guide/pwencrypt.html fra pakka samba-doc."
-
 #  Using same translation as in debian.edu/Skolelinux. A bit controversial.
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "nisser"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Hvordan vil du at Samba skal kjøres?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -226,6 +184,36 @@
 "Samba-prosessen smbd kan kjøres som en normal nisse eller fra inetd. Det "
 "anbefales å kjøre som en nisse."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Opprette samba passord-database, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Samba må settes opp til å bruke krypterte passord for å være kompatibel "
+#~ "med de fleste Windows-versjoner. Dette krever at brukerpassord må lagres "
+#~ "i en egen fil unna /etc/passwd. Denne fila kan opprettes automatisk, men "
+#~ "passordene må legges inn manuelt med smbpasswd og holdes oppdatert i "
+#~ "fremtiden."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Hvis du ikke oppretter den, må du endre oppsettet på Samba (og trolig "
+#~ "også klientmaskinene) til å bruke klartekst-passord."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Mer detaljer finnes i fila /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html fra pakka samba-doc."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Det er ikke støtte for å kjede sammen passdb-motorer"
 

Modified: trunk/samba/debian/po/ne.po
===================================================================
--- trunk/samba/debian/po/ne.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ne.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ne\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-14 05:36+0545\n"
 "Last-Translator: Shiva Pokharel <shiva at mpp.org.np>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -107,10 +107,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -130,10 +126,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -147,10 +139,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -167,68 +155,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "साम्बा पासवर्ड डाटाबेस /var/lib/samba/passdb.tdb सिर्जना गर्नुहुन्छ ?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"अधिक जानकारीका लागि /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
-"Guide/pwencrypt.html  बाट samba-doc प्याकेज हेर्नुहोस् ।"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "डेइमोन"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "तपाईँ साम्बा कसरी चलाउन चाहनुहुन्छ?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -236,6 +183,35 @@
 "साम्बा डेइमोन समान्य डेइमोनको रुपमा वा inetd बाट चलाउन सकिन्छ । डेइमोनको रूपमा चलाउनु "
 "सिफारिस गरिएको तरिका हो ।"
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "साम्बा पासवर्ड डाटाबेस /var/lib/samba/passdb.tdb सिर्जना गर्नुहुन्छ ?"
+
+#~ 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 ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "यदि तपाईँले यसलाई सिर्जना गर्नु भएको छैन भने, तपाईँले प्लेनटेक्स्ट पासवर्ड प्रयोग गर्न "
+#~ "साम्बा (र सम्भवत तपाईँको ग्राहकको मेसिन) पुन: कन्फिगर गरेको हुनु पर्छ ।"
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "अधिक जानकारीका लागि /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+#~ "Guide/pwencrypt.html  बाट samba-doc प्याकेज हेर्नुहोस् ।"
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb ब्याकेन्ड चेन गर्नेका लागि समर्थन छैन "
 

Modified: trunk/samba/debian/po/nl.po
===================================================================
--- trunk/samba/debian/po/nl.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/nl.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.5.8~dfsg-1\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-13 14:32+0000\n"
 "Last-Translator: Vincent Zweije <vincent at zweije.nl>\n"
 "Language-Team: Debian-Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -150,74 +150,63 @@
 msgid "Samba server"
 msgstr "Samba-server"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Samba-wachtwoorddatabase /var/lib/samba/passdb.tdb aanmaken?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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. Dit vereist dat gebruikerswachtwoorden opgeslagen worden in "
-"een apart bestand (niet /etc/passwd). Dit bestand kan automatisch aangemaakt "
-"worden, de wachtwoorden zelf dient u echter handmatig aan te maken (en in de "
-"toekomst bij te houden) via het commando \"smbpasswd\"."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Als u dit bestand niet automatisch laat aanmaken dient de samba-configuratie "
-"(en waarschijnlijk die van uw client-machines) aangepast te worden om "
-"onversleutelde wachtwoorden te gebruiken."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Meer informatie vindt u in /usr/share/doc/samba-doc/htmldocs/Samba3-"
-"Developers-Guide/pwencrypt.html uit het pakket \"samba-doc\"."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "achtergronddiensten"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Hoe wilt u Samba draaien?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "De Samba-achtergronddienst smbd kan als een normale achtergronddienst of via "
 "inetd draaien. Als een achtergronddienst is de aangeraden aanpak."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Samba-wachtwoorddatabase /var/lib/samba/passdb.tdb aanmaken?"
+
+#~ 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. Dit vereist dat gebruikerswachtwoorden "
+#~ "opgeslagen worden in een apart bestand (niet /etc/passwd). Dit bestand "
+#~ "kan automatisch aangemaakt worden, de wachtwoorden zelf dient u echter "
+#~ "handmatig aan te maken (en in de toekomst bij te houden) via het commando "
+#~ "\"smbpasswd\"."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Als u dit bestand niet automatisch laat aanmaken dient de samba-"
+#~ "configuratie (en waarschijnlijk die van uw client-machines) aangepast te "
+#~ "worden om onversleutelde wachtwoorden te gebruiken."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Meer informatie vindt u in /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html uit het pakket \"samba-doc\"."

Modified: trunk/samba/debian/po/nn.po
===================================================================
--- trunk/samba/debian/po/nn.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/nn.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_nn\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-17 18:35+0100\n"
 "Last-Translator: Håvard Korsvoll <korsvoll at gmail.com>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -99,10 +99,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -123,10 +119,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -140,10 +132,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -160,69 +148,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Opprette samba passorddatabase, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"For å vere kompatibel med standard i dei fleste versjonar av Windows, må "
-"Samba bli sett opp til å bruke krypterte passord. Dette krev at "
-"brukarpassord må lagrast i ei anna fil enn /etc/passwd. Denne fila kan "
-"lagast automatisk, men passorda må leggjast til manuelt ved å køyre "
-"smbpasswd og haldast oppdatert i framtida."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Viss du ikkje lagar ho, må du endre oppsettet av Samba (og truleg "
-"klientmaskinene også) til å bruke klartekstpassord."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Sjå /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"frå pakken samba-doc for fleire detaljar."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "tenester"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Korleis vil du køyre Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -230,6 +176,36 @@
 "Samba-tenesta smbd kan køyrast som ei normal teneste frå inetd. Å køyre som "
 "ei teneste er den tilrådde måten."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Opprette samba passorddatabase, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "For å vere kompatibel med standard i dei fleste versjonar av Windows, må "
+#~ "Samba bli sett opp til å bruke krypterte passord. Dette krev at "
+#~ "brukarpassord må lagrast i ei anna fil enn /etc/passwd. Denne fila kan "
+#~ "lagast automatisk, men passorda må leggjast til manuelt ved å køyre "
+#~ "smbpasswd og haldast oppdatert i framtida."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Viss du ikkje lagar ho, må du endre oppsettet av Samba (og truleg "
+#~ "klientmaskinene også) til å bruke klartekstpassord."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Sjå /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html frå pakken samba-doc for fleire detaljar."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Lenkjing av passdb-motorar er ikkje støtta"
 

Modified: trunk/samba/debian/po/pl.po
===================================================================
--- trunk/samba/debian/po/pl.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/pl.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_2:3.2.3-1_pl_2008-09-12\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2012-01-28 17:59+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach at gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
@@ -152,74 +152,63 @@
 msgid "Samba server"
 msgstr "Serwer Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Utworzyć bazę haseł samby, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Aby zachować zgodność z domyślnymi ustawieniami większości wersji Windows, "
-"Samba musi korzystać z szyfrowanych haseł. W związku z tym, hasła "
-"użytkowników muszą być przechowywane w innym pliku niż /etc/passwd. Ten plik "
-"może zostać utworzony automatycznie, ale hasła muszą być dodawane ręcznie za "
-"pomocą polecenia smbpasswd, a w przyszłości na bieżąco uaktualniane."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Jeżeli plik nie zostanie utworzony, konieczne będzie przekonfigurowanie "
-"Samby (i prawdopodobnie komputerów klienckich) do używania haseł w postaci "
-"otwartego tekstu."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Proszę zapoznać się z plikiem /usr/share/doc/samba-doc/htmldocs/Samba3-"
-"Developers-Guide/pwencrypt.html z pakietu samba-doc, aby poznać więcej "
-"szczegółów."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "demon"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "W jaki sposób Samba ma być uruchamiana?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "Demon Samby smbd może działać jako zwykły demon, albo z poziomu inetd. "
 "Zalecane jest uruchomienie demona."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Utworzyć bazę haseł samby, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Aby zachować zgodność z domyślnymi ustawieniami większości wersji "
+#~ "Windows, Samba musi korzystać z szyfrowanych haseł. W związku z tym, "
+#~ "hasła użytkowników muszą być przechowywane w innym pliku niż /etc/passwd. "
+#~ "Ten plik może zostać utworzony automatycznie, ale hasła muszą być "
+#~ "dodawane ręcznie za pomocą polecenia smbpasswd, a w przyszłości na "
+#~ "bieżąco uaktualniane."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Jeżeli plik nie zostanie utworzony, konieczne będzie przekonfigurowanie "
+#~ "Samby (i prawdopodobnie komputerów klienckich) do używania haseł w "
+#~ "postaci otwartego tekstu."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Proszę zapoznać się z plikiem /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html z pakietu samba-doc, aby poznać więcej "
+#~ "szczegółów."

Modified: trunk/samba/debian/po/pt.po
===================================================================
--- trunk/samba/debian/po/pt.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/pt.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-14 10:47+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -152,71 +152,27 @@
 msgid "Samba server"
 msgstr "Servidor Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"Criar base de dados de palavras-passe samba, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Para ser compatível com as predefinições na maioria das versões do Windows, "
-"o Samba tem de ser configurado para utilizar palavras-passe encriptadas.  "
-"Isto faz com que as passwords dos utilizadores sejam guardadas noutro "
-"ficheiro separado do /etc/passwd. Este ficheiro pode ser criado "
-"automaticamente, mas as palavras-passe têm de ser manualmente adicionadas "
-"correndo o smbpasswd e mantidas actualizadas no futuro."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Se não o criar, terá de reconfigurar o Samba (e provavelmente as suas "
-"máquinas clientes) para utilizar palavras-passe de texto visível."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Para mais detalhes veja /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
-"Guide/pwencrypt.html do pacote samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Como deseja correr o Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -224,6 +180,38 @@
 "O daemon de Samba smbd pode correr como um daemon normal ou a partir de "
 "inetd. Executá-lo como um daemon é a aproximação recomendada."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "Criar base de dados de palavras-passe samba, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Para ser compatível com as predefinições na maioria das versões do "
+#~ "Windows, o Samba tem de ser configurado para utilizar palavras-passe "
+#~ "encriptadas.  Isto faz com que as passwords dos utilizadores sejam "
+#~ "guardadas noutro ficheiro separado do /etc/passwd. Este ficheiro pode ser "
+#~ "criado automaticamente, mas as palavras-passe têm de ser manualmente "
+#~ "adicionadas correndo o smbpasswd e mantidas actualizadas no futuro."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Se não o criar, terá de reconfigurar o Samba (e provavelmente as suas "
+#~ "máquinas clientes) para utilizar palavras-passe de texto visível."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Para mais detalhes veja /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html do pacote samba-doc."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Não é suportado carregar backends passdb"
 

Modified: trunk/samba/debian/po/pt_BR.po
===================================================================
--- trunk/samba/debian/po/pt_BR.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/pt_BR.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-24 23:14-0300\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
@@ -151,73 +151,63 @@
 msgid "Samba server"
 msgstr "Servidor Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Gerar a base de dados para senhas do samba, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Para ser compatível com os padrões na maioria das versões do Windows, o "
-"Samba deve ser configurado para utilizar senhas criptografadas. Isto requer "
-"que as senhas dos usuários sejam armazenadas em um arquivo diferente do "
-"arquivo /etc/passwd. Esse arquivo pode ser criado automaticamente, mas as "
-"senhas devem ser definidas manualmente através da execução do utilitário "
-"smbpasswd e devem ser mantidas atualizadas no futuro."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Caso você não o crie, você terá que reconfigurar o Samba (e provavelmente "
-"suas máquinas clientes) para utilização de senhas em texto puro."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Veja /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
-"html, fornecido pelo pacote samba-doc, para mais detalhes."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Como você deseja que o Samba seja executado?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "O daemon Samba smbd pode ser executado como daemon normal ou a partir do "
 "inetd. Executá-lo como daemon é o método recomendado."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "Gerar a base de dados para senhas do samba, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Para ser compatível com os padrões na maioria das versões do Windows, o "
+#~ "Samba deve ser configurado para utilizar senhas criptografadas. Isto "
+#~ "requer que as senhas dos usuários sejam armazenadas em um arquivo "
+#~ "diferente do arquivo /etc/passwd. Esse arquivo pode ser criado "
+#~ "automaticamente, mas as senhas devem ser definidas manualmente através da "
+#~ "execução do utilitário smbpasswd e devem ser mantidas atualizadas no "
+#~ "futuro."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Caso você não o crie, você terá que reconfigurar o Samba (e provavelmente "
+#~ "suas máquinas clientes) para utilização de senhas em texto puro."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Veja /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html, fornecido pelo pacote samba-doc, para mais detalhes."

Modified: trunk/samba/debian/po/ro.po
===================================================================
--- trunk/samba/debian/po/ro.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ro.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba/debian/po/ro.po\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2008-06-29 19:42+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -112,10 +112,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -136,10 +132,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -153,10 +145,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -173,72 +161,61 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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 ""
-"Pentru compatibilitate cu majoritatea versiunilor de Windows, Samba trebuie "
-"să fie configurată să folosească parole criptate. Acest lucru necesită ca "
-"parolele utilizatorilor să fie stocate în alt fișier decât /etc/passwd.  "
-"Acest fișier poate fi creat automat, dar parolele trebuie să fie adăugate "
-"manual prin rularea comenzii smbpasswd și, în viitor, trebuie ținut la zi."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Dacă nu-l creați, va trebui să reconfigurați Samba (probabil și "
-"calculatoarele client) să folosească parole necriptate."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"A se vedea /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
-"pwencrypt.html din pachetul samba-doc pentru mai multe detalii."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "demoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Cum doriți să rulați Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "Demonul Samba smbd poate rula ca un demon normal sau din inetd. Rularea ca "
 "demon este recomandată."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Se creează baza de date cu parole /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Pentru compatibilitate cu majoritatea versiunilor de Windows, Samba "
+#~ "trebuie să fie configurată să folosească parole criptate. Acest lucru "
+#~ "necesită ca parolele utilizatorilor să fie stocate în alt fișier decât /"
+#~ "etc/passwd.  Acest fișier poate fi creat automat, dar parolele trebuie să "
+#~ "fie adăugate manual prin rularea comenzii smbpasswd și, în viitor, "
+#~ "trebuie ținut la zi."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Dacă nu-l creați, va trebui să reconfigurați Samba (probabil și "
+#~ "calculatoarele client) să folosească parole necriptate."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "A se vedea /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+#~ "pwencrypt.html din pachetul samba-doc pentru mai multe detalii."

Modified: trunk/samba/debian/po/ru.po
===================================================================
--- trunk/samba/debian/po/ru.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ru.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 2:3.5.8~dfsg-2\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 20:17+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -151,70 +151,27 @@
 msgid "Samba server"
 msgstr "Сервер Samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Создать базу данных паролей Samba — /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Для совместимости со стандартными значениями большинства версий Windows "
-"Samba необходимо настроить на использование шифрованных паролей. При этом "
-"пароли пользователей должны храниться в отдельном файле, а не в /etc/passwd. "
-"Этот файл будет создан автоматически, однако пароли нужно добавить вручную с "
-"помощью команды smbpasswd и не забывать поддерживать их в актуальном "
-"состоянии."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Если этот файл не создан, тогда нужно перенастроить Samba (и, возможно, "
-"клиентские машины) на использование нешифрованных паролей."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Более подробная информация доступна в файле /usr/share/doc/samba-doc/"
-"htmldocs/ENCRYPTION.html из пакета samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "как самостоятельный процесс"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "из inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Как нужно запускать Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -222,3 +179,34 @@
 "Служба Samba smbd может постоянно работать как самостоятельный процесс или "
 "запускаться из inetd. Рекомендуется использовать запуск в виде "
 "самостоятельного процесса."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Создать базу данных паролей Samba — /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Для совместимости со стандартными значениями большинства версий Windows "
+#~ "Samba необходимо настроить на использование шифрованных паролей. При этом "
+#~ "пароли пользователей должны храниться в отдельном файле, а не в /etc/"
+#~ "passwd. Этот файл будет создан автоматически, однако пароли нужно "
+#~ "добавить вручную с помощью команды smbpasswd и не забывать поддерживать "
+#~ "их в актуальном состоянии."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Если этот файл не создан, тогда нужно перенастроить Samba (и, возможно, "
+#~ "клиентские машины) на использование нешифрованных паролей."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Более подробная информация доступна в файле /usr/share/doc/samba-doc/"
+#~ "htmldocs/ENCRYPTION.html из пакета samba-doc."

Modified: trunk/samba/debian/po/sk.po
===================================================================
--- trunk/samba/debian/po/sk.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/sk.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2012-02-24 11:59+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -43,14 +43,26 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:2001
-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 "Ak váš počítač získava IP adresu z DHCP servera, môže vám tento server ponúkať aj údaje o serveroch WINS (menných serveroch NetBIOS-u), ktoré sa nachádzajú na vašej sieti. To vyžaduje zásah do súboru smb.conf, kde sa nastaví načítavanie údajov o WINS serveroch zo súboru /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 ""
+"Ak váš počítač získava IP adresu z DHCP servera, môže vám tento server "
+"ponúkať aj údaje o serveroch WINS (menných serveroch NetBIOS-u), ktoré sa "
+"nachádzajú na vašej sieti. To vyžaduje zásah do súboru smb.conf, kde sa "
+"nastaví načítavanie údajov o WINS serveroch zo súboru /etc/samba/dhcp.conf."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:2001
-msgid "The dhcp3-client package must be installed to take advantage of this feature."
-msgstr "Aby ste mohli využiť túto vlastnosť, musíte mať nainštalovaný balík dhcp3-client."
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Aby ste mohli využiť túto vlastnosť, musíte mať nainštalovaný balík dhcp3-"
+"client."
 
 #. Type: boolean
 #. Description
@@ -61,14 +73,31 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:3001
-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 "Zvyšok nastavenia Samby sa zaoberá otázkami, ktoré ovplyvňujú parametre uvedené v /etc/samba/smb.conf, čo je konfiguračný súbor pre programy Samba (nmbd a smbd). Váš súčasný súbor smb.conf obsahuje riadok „include“ alebo voľbu, ktorá presahuje viac riadkov. Toto môže zapríčiniť zlé automatické nastavenie, takže pre správnu funkčnosť možno budete musieť upraviť smb.conf manuálne."
+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 ""
+"Zvyšok nastavenia Samby sa zaoberá otázkami, ktoré ovplyvňujú parametre "
+"uvedené v /etc/samba/smb.conf, čo je konfiguračný súbor pre programy Samba "
+"(nmbd a smbd). Váš súčasný súbor smb.conf obsahuje riadok „include“ alebo "
+"voľbu, ktorá presahuje viac riadkov. Toto môže zapríčiniť zlé automatické "
+"nastavenie, takže pre správnu funkčnosť možno budete musieť upraviť smb.conf "
+"manuálne."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:3001
-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 "Ak si nezvolíte túto možnosť, budete musieť sami zvládnuť všetky nastavenia a nebudete môcť využívať výhody pravidelných vylepšení tohto súboru."
+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 ""
+"Ak si nezvolíte túto možnosť, budete musieť sami zvládnuť všetky nastavenia "
+"a nebudete môcť využívať výhody pravidelných vylepšení tohto súboru."
 
 #. Type: string
 #. Description
@@ -79,8 +108,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:4001
-msgid "Please specify the workgroup for this system.  This setting controls which workgroup the system will appear in when used as a server, the default workgroup to be used when browsing with various frontends, and the domain name used with the \"security=domain\" setting."
-msgstr "Zadajte názov pracovnej skupiny pre tento počítač. Táto voľba určuje v ktorej pracovnej skupine sa má tento systém objaviť keď sa k nemu pristupuje ako k serveru, pri prehliadaní rôznymi rozhraniami a názov domény, ktorá sa používa pri nastavení „security=domain“."
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+"Zadajte názov pracovnej skupiny pre tento počítač. Táto voľba určuje v "
+"ktorej pracovnej skupine sa má tento systém objaviť keď sa k nemu pristupuje "
+"ako k serveru, pri prehliadaní rôznymi rozhraniami a názov domény, ktorá sa "
+"používa pri nastavení „security=domain“."
 
 #. Type: boolean
 #. Description
@@ -91,14 +128,28 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:5001
-msgid "All recent Windows clients communicate with SMB/CIFS 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šetky súčasné počítače Windows používajú na komunikáciu so SMB/CIFS servermi šifrované heslá. Ak chcete použiť nešifrované heslá, musíte zmeniť parameter v registroch systému Windows."
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS 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šetky súčasné počítače Windows používajú na komunikáciu so SMB/CIFS "
+"servermi šifrované heslá. Ak chcete použiť nešifrované heslá, musíte zmeniť "
+"parameter v registroch systému Windows."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:5001
-msgid "Enabling this option is highly recommended as support for plain text passwords is no longer maintained in Microsoft Windows products. 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 "Povolenie tejto voľby sa dôrazne odporúča, pretože podpora nešifrovaných hesiel v produktoch Microsoft Windows sa už neudržiava. V tom prípade sa uistite, že máte platný súbor /etc/samba/smbpasswd a že v ňom nastavíte heslá všetkým používateľom príkazom smbpasswd."
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. 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 ""
+"Povolenie tejto voľby sa dôrazne odporúča, pretože podpora nešifrovaných "
+"hesiel v produktoch Microsoft Windows sa už neudržiava. V tom prípade sa "
+"uistite, že máte platný súbor /etc/samba/smbpasswd a že v ňom nastavíte "
+"heslá všetkým používateľom príkazom smbpasswd."
 
 #. Type: title
 #. Description
@@ -106,51 +157,60 @@
 msgid "Samba server"
 msgstr "Samba server"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Vytvoriť databázu hesiel /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 "Kvôli kompatibilite s predvoleným nastavením väčšiny verzií Windows sa musí Samba nastaviť na používanie šifrovaných hesiel. To vyžaduje uloženie používateľských hesiel v inom súbore ako /etc/passwd. Tento súbor sa môže vytvoriť automaticky, ale heslá do neho musíte pridať manuálne programom smbpasswd a taktiež ho musíte neustále aktualizovať."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "If you do not create it, you will have to reconfigure Samba (and probably your client machines) to use plaintext passwords."
-msgstr "Ak tento súbor nevytvoríte, budete musieť nastaviť Sambu (a zrejme aj počítače klientov) aby používali nešifrované heslá."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html from the samba-doc package for more details."
-msgstr "Podrobnosti nájdete v súbore /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html z balíka samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "démoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Ako chcete spúšťať Sambu?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
-msgid "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a daemon is the recommended approach."
-msgstr "Samba server smbd sa môže spúšťať ako obyčajný démon (odporúča sa) alebo sa môže spúšťať z inetd."
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba server smbd sa môže spúšťať ako obyčajný démon (odporúča sa) alebo sa "
+"môže spúšťať z inetd."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Vytvoriť databázu hesiel /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Kvôli kompatibilite s predvoleným nastavením väčšiny verzií Windows sa "
+#~ "musí Samba nastaviť na používanie šifrovaných hesiel. To vyžaduje "
+#~ "uloženie používateľských hesiel v inom súbore ako /etc/passwd. Tento "
+#~ "súbor sa môže vytvoriť automaticky, ale heslá do neho musíte pridať "
+#~ "manuálne programom smbpasswd a taktiež ho musíte neustále aktualizovať."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Ak tento súbor nevytvoríte, budete musieť nastaviť Sambu (a zrejme aj "
+#~ "počítače klientov) aby používali nešifrované heslá."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Podrobnosti nájdete v súbore /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
+#~ "html z balíka samba-doc."

Modified: trunk/samba/debian/po/sl.po
===================================================================
--- trunk/samba/debian/po/sl.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/sl.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-13 08:06+0100\n"
 "Last-Translator: Matej Kovačič <matej.kovacic at owca.info>\n"
 "Language-Team: Sl <skrat at owca.info>\n"
@@ -110,10 +110,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -134,10 +130,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -151,10 +143,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -171,70 +159,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Ali naj ustvarim bazo samba gesel, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Če želite doseči kompatibilnost z večino različic operacijskega sistema "
-"Windows, mora biti Samba nastavljena tako, da uporablja šifrirana gesla. "
-"Taka uporabniška gesla morajo biti shranjena v posebni datoteki in ne v /etc/"
-"passwd. Ta datoteko je mogoče ustvariti samodejno, gesla pa je treba "
-"dodajati ročno s pomočjo programa smbpasswd. Za ažurnost gesel morate tudi v "
-"prihodnje skrbeti ročno."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Če je ne boste ustvarili, boste morali nastaviti Sambo (in verjetno tudi "
-"odjemalce) za uporabo nešifriranih gesel."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Za podrobnejše informacije si oglejte /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html iz paketa samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "daemoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Kako želite poganjati Sambo?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -242,6 +187,37 @@
 "Samba demon smbd lahko teče kot običajen demon ali iz inetd. Priporočljivo "
 "je poganjanje sambe kot demon."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Ali naj ustvarim bazo samba gesel, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Če želite doseči kompatibilnost z večino različic operacijskega sistema "
+#~ "Windows, mora biti Samba nastavljena tako, da uporablja šifrirana gesla. "
+#~ "Taka uporabniška gesla morajo biti shranjena v posebni datoteki in ne v /"
+#~ "etc/passwd. Ta datoteko je mogoče ustvariti samodejno, gesla pa je treba "
+#~ "dodajati ročno s pomočjo programa smbpasswd. Za ažurnost gesel morate "
+#~ "tudi v prihodnje skrbeti ročno."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Če je ne boste ustvarili, boste morali nastaviti Sambo (in verjetno tudi "
+#~ "odjemalce) za uporabo nešifriranih gesel."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Za podrobnejše informacije si oglejte /usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html iz paketa samba-doc."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Veriženje (chaining) passdb hrbtenic ni podprto."
 

Modified: trunk/samba/debian/po/sq.po
===================================================================
--- trunk/samba/debian/po/sq.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/sq.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-13 21:25+0100\n"
 "Last-Translator: Elian Myftiu <elian.myftiu at gmail.com>\n"
 "Language-Team: Debian L10n Albanian <debian-l10n-albanian at lists.debian.org>\n"
@@ -105,10 +105,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -129,10 +125,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -146,10 +138,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -166,69 +154,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Të krijoj bazë të dhënash fjalëkalimi, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Për të qenë e pajtueshme me  parazgjedhjet në shumë versione Windows, Samba "
-"duhet të konfigurohet për përdorim fjalëkalimesh të kriptuar.  Kjo kërkon "
-"fjalëkalimet e përdoruesve të ruhen në një skedë të veçantë nga /etc/"
-"passwd.  Kjo skedë mund të krijohet automatikisht, por fjalëkalimet duhet të "
-"shtohen dorazi duke përdorur smbpasswd dhe të mirëmbahen në të ardhmen."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Nëse nuk e krijon, do të duhet të rikonfigurosh Samba (dhe ndoshta "
-"kompjuterët klientë) për të përdorur fjalëkalime tekstualë të qartë."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Shih /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
-"html nga paketa samba-doc për hollësi të mëtejshme."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Si dëshiron të xhirojë Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -236,6 +182,37 @@
 "Daemon Samba smbd mund të xhirojë si një daemon normal ose nga inetd. "
 "Rekomandohet puna si daemon."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Të krijoj bazë të dhënash fjalëkalimi, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Për të qenë e pajtueshme me  parazgjedhjet në shumë versione Windows, "
+#~ "Samba duhet të konfigurohet për përdorim fjalëkalimesh të kriptuar.  Kjo "
+#~ "kërkon fjalëkalimet e përdoruesve të ruhen në një skedë të veçantë nga /"
+#~ "etc/passwd.  Kjo skedë mund të krijohet automatikisht, por fjalëkalimet "
+#~ "duhet të shtohen dorazi duke përdorur smbpasswd dhe të mirëmbahen në të "
+#~ "ardhmen."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Nëse nuk e krijon, do të duhet të rikonfigurosh Samba (dhe ndoshta "
+#~ "kompjuterët klientë) për të përdorur fjalëkalime tekstualë të qartë."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Shih /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html nga paketa samba-doc për hollësi të mëtejshme."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Vargëzimi i passdb nuk suportohet"
 

Modified: trunk/samba/debian/po/sv.po
===================================================================
--- trunk/samba/debian/po/sv.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/sv.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.20b-3\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-24 23:07+0100\n"
 "Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -149,72 +149,60 @@
 msgid "Samba server"
 msgstr "Sambaserver"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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 de standardvärden i de flesta versioner av "
-"Windows måste Samba konfigureras för att använda krypterade lösenord.  Detta "
-"kräver att användarnas lösenord lagras i en fil separerad från /etc/passwd.  "
-"Denna fil kan skapas automatiskt men lösenorden måste läggas till manuellt "
-"genom att köra smbpasswd och hållas uppdaterad i framtiden."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Om du inte skapar den måste du konfigurera Samba (och antagligen även dina "
-"klientmaskiner) till att använda lösenord i klartext."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Se /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"från paketet samba-doc för mer information."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "demoner"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Hur vill du köra Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
 "Samba-demonen smbd kan köras som en normal demon eller från inetd. Att köra "
 "som en demon är den rekommenderade metoden."
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Skapa Sambas lösenordsdatabas, /var/lib/samba/passdb.tdb?"
+
+#~ 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 de standardvärden i de flesta versioner av "
+#~ "Windows måste Samba konfigureras för att använda krypterade lösenord.  "
+#~ "Detta kräver att användarnas lösenord lagras i en fil separerad från /etc/"
+#~ "passwd.  Denna fil kan skapas automatiskt men lösenorden måste läggas "
+#~ "till manuellt genom att köra smbpasswd och hållas uppdaterad i framtiden."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Om du inte skapar den måste du konfigurera Samba (och antagligen även "
+#~ "dina klientmaskiner) till att använda lösenord i klartext."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Se /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html från paketet samba-doc för mer information."

Modified: trunk/samba/debian/po/ta.po
===================================================================
--- trunk/samba/debian/po/ta.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/ta.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2006-12-16 20:10+0530\n"
 "Last-Translator: drtvasudevan <agnihot3 at gmail.com>\n"
 "Language-Team: TAMIL <Ubuntu-tam at lists.ubuntu.com>\n"
@@ -105,10 +105,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -129,10 +125,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -146,10 +138,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -167,69 +155,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr " /var/lib/samba/passdb.tdb என்ற சாம்பா கடவுச் சொல் தரவுத் தளத்தை உருவாக்கவா?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"சாம்பா ஆவணங்கள் (samba-doc) பொதிகளில் இருந்து /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html ஐ மேலதிக விவரங்களுக்குப் பார்க்கவும்."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "கிங்கரன்கள் (டீமன்கள்)"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "சாம்பாவை எப்படி இயக்க விரும்புகிறீர்கள்?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -237,6 +183,37 @@
 "சாம்பா கிங்கரனான எஸ்எம்பிடி இயல்பான கிங்கரனாக இயங்கலாம் அல்லது inetd லிருந்து இயங்கலாம். "
 "கிங்கரனாக இயங்குவதே பரிந்துரைக்கப் படுகிறது."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ " /var/lib/samba/passdb.tdb என்ற சாம்பா கடவுச் சொல் தரவுத் தளத்தை உருவாக்கவா?"
+
+#~ 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 ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "நீங்கள் அதை உருவாக்கவில்லையானால் எளிய உரை கடவுச் சொற்களை பயன் படுத்துமாறு சாம்பாவை "
+#~ "(அனேகமாக உங்கள் சார்ந்தோன் இயந்திரங்களையும்) மீண்டும் வடிவமைக்க வேண்டும்."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "சாம்பா ஆவணங்கள் (samba-doc) பொதிகளில் இருந்து /usr/share/doc/samba-doc/"
+#~ "htmldocs/ENCRYPTION.html ஐ மேலதிக விவரங்களுக்குப் பார்க்கவும்."
+
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr "/etc/samba/smbpasswd ஐ /var/lib/samba/passdb.tdb க்கு நகர்த்தவா?"
 

Modified: trunk/samba/debian/po/templates.pot
===================================================================
--- trunk/samba/debian/po/templates.pot	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/templates.pot	2012-05-11 17:55:40 UTC (rev 4092)
@@ -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: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -121,60 +129,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."

Modified: trunk/samba/debian/po/th.po
===================================================================
--- trunk/samba/debian/po/th.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/th.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2011-05-12 18:06+0700\n"
 "Last-Translator:  Theppitak Karoonboonyanan <thep at linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n at googlegroup.com>\n"
@@ -139,68 +139,27 @@
 msgid "Samba server"
 msgstr "เซิร์ฟเวอร์ samba"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "จะสร้างฐานข้อมูลรหัสผ่าน samba /var/lib/samba/passdb.tdb หรือไม่?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"เพื่อให้ทำงานร่วมกับค่าปกติในวินโดวส์รุ่นส่วนใหญ่ได้ จึงต้องตั้งค่า Samba ให้ใช้รหัสผ่านแบบเข้ารหัสลับ "
-"ซึ่งจำเป็นต้องเก็บรหัสผ่านของผู้ใช้ไว้ในแฟ้มแยกต่างหากจาก /etc/passwd  "
-"แฟ้มดังกล่าวสามารถสร้างโดยอัตโนมัติได้ แต่รหัสผ่านจะต้องเพิ่มเองโดยใช้คำสั่ง smbpasswd "
-"และต้องปรับข้อมูลอยู่เสมอในอนาคต"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"หากจะไม่สร้างแฟ้มดังกล่าว คุณจะต้องตั้งค่า Samba (และอาจจะต้องตั้งค่าเครื่องลูกต่างๆ ด้วย) "
-"ให้ใช้รหัสผ่านแบบข้อความธรรมดา"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"ดูรายละเอียดเพิ่มเติมได้ที่ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
-"Guide/pwencrypt.html จากแพกเกจ samba-doc "
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "ดีมอน"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "คุณต้องการเรียกใช้ Samba แบบไหน?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -208,6 +167,35 @@
 "ดีมอน smbd ของ Samba สามารถทำงานแบบดีมอนธรรมดา หรือเรียกจาก inetd ก็ได้ "
 "ทางที่ขอแนะนำคือเรียกแบบดีมอน"
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "จะสร้างฐานข้อมูลรหัสผ่าน samba /var/lib/samba/passdb.tdb หรือไม่?"
+
+#~ 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 ""
+#~ "เพื่อให้ทำงานร่วมกับค่าปกติในวินโดวส์รุ่นส่วนใหญ่ได้ จึงต้องตั้งค่า Samba "
+#~ "ให้ใช้รหัสผ่านแบบเข้ารหัสลับ ซึ่งจำเป็นต้องเก็บรหัสผ่านของผู้ใช้ไว้ในแฟ้มแยกต่างหากจาก /etc/"
+#~ "passwd  แฟ้มดังกล่าวสามารถสร้างโดยอัตโนมัติได้ แต่รหัสผ่านจะต้องเพิ่มเองโดยใช้คำสั่ง "
+#~ "smbpasswd และต้องปรับข้อมูลอยู่เสมอในอนาคต"
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "หากจะไม่สร้างแฟ้มดังกล่าว คุณจะต้องตั้งค่า Samba (และอาจจะต้องตั้งค่าเครื่องลูกต่างๆ ด้วย) "
+#~ "ให้ใช้รหัสผ่านแบบข้อความธรรมดา"
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "ดูรายละเอียดเพิ่มเติมได้ที่ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+#~ "Guide/pwencrypt.html จากแพกเกจ samba-doc "
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "ไม่สนับสนุนการเชื่อมลูกโซ่แบ็กเอนด์ของ passdb"
 

Modified: trunk/samba/debian/po/tl.po
===================================================================
--- trunk/samba/debian/po/tl.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/tl.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-03-13 06:13+0800\n"
 "Last-Translator: eric pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -107,10 +107,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -131,10 +127,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -149,10 +141,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -170,73 +158,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"Likhain ang talaan ng kontrasenyas ng samba, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Upang makibagay sa mga default ng karamihan ng bersiyon ng Windows, "
-"kailangan na nakasaayos ang Samba na gumamit ng encrypted na kontrasenyas. "
-"Kinakailangan na ang mga kontrasenyas ng mga gumagamit ay nakatago sa "
-"talaksang hiwalay sa /etc/passwd. Maaaring likhain ang talaksang ito na "
-"awtomatiko, ngunit ang mga kontrasenyas dito ay kinakailangang idagdag ng "
-"mano-mano sa pagpapatakbo ng smbpasswd at kailangan na sariwain ito sa "
-"hinaharap."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Kung hindi ito likhain, kailangan ninyong isaayos muli ang Samba (at "
-"malamang ang inyong mga makinang client) na gumamit ng plaintext na "
-"kontrasenyas."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Basahin ang /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
-"pwencrypt.html mula sa paketeng samba-doc para sa karagdagang detalye."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "mga daemon"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Paano ninyo gustong patakbuhin ang Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -244,6 +186,40 @@
 "Ang daemon na smbd ng Samba ay maaaring patakbuhin bilang normal na daemon o "
 "mula sa inetd. Pagpapatakbo nito bilang daemon ang rekomendado."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "Likhain ang talaan ng kontrasenyas ng samba, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Upang makibagay sa mga default ng karamihan ng bersiyon ng Windows, "
+#~ "kailangan na nakasaayos ang Samba na gumamit ng encrypted na "
+#~ "kontrasenyas. Kinakailangan na ang mga kontrasenyas ng mga gumagamit ay "
+#~ "nakatago sa talaksang hiwalay sa /etc/passwd. Maaaring likhain ang "
+#~ "talaksang ito na awtomatiko, ngunit ang mga kontrasenyas dito ay "
+#~ "kinakailangang idagdag ng mano-mano sa pagpapatakbo ng smbpasswd at "
+#~ "kailangan na sariwain ito sa hinaharap."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Kung hindi ito likhain, kailangan ninyong isaayos muli ang Samba (at "
+#~ "malamang ang inyong mga makinang client) na gumamit ng plaintext na "
+#~ "kontrasenyas."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Basahin ang /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+#~ "pwencrypt.html mula sa paketeng samba-doc para sa karagdagang detalye."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Ang pagdudugtong ng mga backend ng passdb ay hindi suportado"
 

Modified: trunk/samba/debian/po/tr.po
===================================================================
--- trunk/samba/debian/po/tr.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/tr.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2012-05-10 10:24+0200\n"
 "Last-Translator: Atila KOÇ <akoc at artielektronik.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -151,71 +151,27 @@
 msgid "Samba server"
 msgstr "Samba sunucusu"
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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:2001
-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 ""
-"Windows'un çoğu sürümünde yapılan öntanımlı ayarlar ile uyumlu olabilmesi "
-"için Samba'nın şifrelenmiş parolaları kullanacak şekilde yapılandırılması "
-"gerekir. Bu seçim kullanıcı parolalarının /etc/passwd dosyası dışında bir "
-"dosyada saklanmasını gerektirir. Bu dosya kendiliğinden yaratılabilir, fakat "
-"daha sonra parolaların smbpasswd komutu çalıştırılarak elle eklenmesi ve "
-"gelecekte de aynı şekilde güncel tutulması gerekecektir."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Eğer bu dosyayı yaratmazsanız, daha sonra Samba'yı (ve büyük olasılıkla "
-"istemci makineleri de) düz metin parolalarını kullanacak şekilde yeniden "
-"yapılandırmanız gerekecektir."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Daha ayrıntılı bilgi için samba-doc paketinden /usr/share/doc/samba-doc/"
-"htmldocs/ENCRYPTION.html dosyasına göz atınız."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "artalan süreçleri"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Samba'nın nasıl çalışmasını istersiniz?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -223,6 +179,38 @@
 "Samba artalan süreci smbd, normal bir artalan süreci olarak ya da inetd'den "
 "çalışabilir. Önerilen yaklaşım artalan süreci olarak çalıştırmaktır."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "Samba parola veritabanı /var/lib/samba/passwd.tdb yaratılsın mı?"
+
+#~ 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 ""
+#~ "Windows'un çoğu sürümünde yapılan öntanımlı ayarlar ile uyumlu olabilmesi "
+#~ "için Samba'nın şifrelenmiş parolaları kullanacak şekilde yapılandırılması "
+#~ "gerekir. Bu seçim kullanıcı parolalarının /etc/passwd dosyası dışında bir "
+#~ "dosyada saklanmasını gerektirir. Bu dosya kendiliğinden yaratılabilir, "
+#~ "fakat daha sonra parolaların smbpasswd komutu çalıştırılarak elle "
+#~ "eklenmesi ve gelecekte de aynı şekilde güncel tutulması gerekecektir."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Eğer bu dosyayı yaratmazsanız, daha sonra Samba'yı (ve büyük olasılıkla "
+#~ "istemci makineleri de) düz metin parolalarını kullanacak şekilde yeniden "
+#~ "yapılandırmanız gerekecektir."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Daha ayrıntılı bilgi için samba-doc paketinden /usr/share/doc/samba-doc/"
+#~ "htmldocs/ENCRYPTION.html dosyasına göz atınız."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr ""
 #~ "Parola veritabanı için çoklu arkayüz kullanılabilmesi özelliği  "

Modified: trunk/samba/debian/po/vi.po
===================================================================
--- trunk/samba/debian/po/vi.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/vi.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.2\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2009-02-15 15:57+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -147,73 +147,61 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 » ?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Để tương thích với các giá trị mặc định trong hậu hết các 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ã. Cấu hình "
-"này cần thiết các mật khẩu người dùng được cất giữ trong một tập tin khác "
-"với « /etc/passwd ». Tập tin này có thể được tự động tạo, còn những mật khẩu "
-"phải được thêm thủ công bằng cách chạy smbpaswd; cũng cần phải cứ cập nhật "
-"chúng trong tương lai."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Không tạo tập tin đó thì bạn cần phải cấu hình lại Samba (rất có thể là cũng "
-"cần cấu hình lại mọi máy khách) để sử dụng mật khẩu nhập thô."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Để tìm chi tiết, xem tài liệu « /usr/share/doc/samba-doc/htmldocs/Samba3-"
-"Developers-Guide/pwencrypt.html » từ gói tài liệu samba-doc."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "trình nền"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Muốn chạy Samba như thế nào?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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 ""
 "Trình nền Samba smbd có khả năng chạy làm một trình nền tiêu chuẩn, hoặc từ "
 "inetd. Phương pháp khuyến khích là chạy làm trình nền."
+
+#~ 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 » ?"
+
+#~ 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 ""
+#~ "Để tương thích với các giá trị mặc định trong hậu hết các 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ã. "
+#~ "Cấu hình này cần thiết các mật khẩu người dùng được cất giữ trong một tập "
+#~ "tin khác với « /etc/passwd ». Tập tin này có thể được tự động tạo, còn "
+#~ "những mật khẩu phải được thêm thủ công bằng cách chạy smbpaswd; cũng cần "
+#~ "phải cứ cập nhật chúng trong tương lai."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Không tạo tập tin đó thì bạn cần phải cấu hình lại Samba (rất có thể là "
+#~ "cũng cần cấu hình lại mọi máy khách) để sử dụng mật khẩu nhập thô."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Để tìm chi tiết, xem tài liệu « /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html » từ gói tài liệu samba-doc."

Modified: trunk/samba/debian/po/wo.po
===================================================================
--- trunk/samba/debian/po/wo.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/wo.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wo\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2007-04-30 18:13+0000\n"
 "Last-Translator: Mouhamadou Mamoune Mbacke <mouhamadoumamoune at gmail.com>\n"
 "Language-Team: Wolof\n"
@@ -106,10 +106,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -130,10 +126,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -147,10 +139,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -167,71 +155,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr ""
-"Ndax ñu sos baasu done bu baatujall yu samba, /var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"Ngir mana dëppóo ak defóo bu li ëppu ci wersioŋ yu Windows yi, samba deeskoo "
-"wara komfigure muy jëfandikoo baatijall yuñu kiripte. Loolu dafay laaj ñu "
-"deñc baatijall yi ci ab fiise bu bokkul ak /etc/passwd.  Fiise boobu "
-"manessna koo sos sosuk otomatik, waaye kon baatijall yi deesleen ciy wara "
-"dugël ak loxo, doxal smbpasswd, ta buko defee ñu leen di yeesal saa yuñu ko "
-"soxlawaatee."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"Boo ko sosul, kon fawwu nga komfigure Samba (amaana yit sa masin yu kiliyaŋ "
-"yi) def leen ñuy jëfandikoo baatijall yu text normaal (plain text)."
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"Xoolal /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
-"html bi nekk ci paket bu samba-doc, ngir am yaneen leeral."
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "daemon yi"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "Nan nga bëgga doxale samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -239,6 +183,39 @@
 "Daemon bu Samba smbd maneesna koo doxal ne ab deamon normaal, maneesna koo "
 "doxale yit ak inetd. Liñuy deŋkaane nak mooy doxalko muy ab daemon."
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr ""
+#~ "Ndax ñu sos baasu done bu baatujall yu samba, /var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "Ngir mana dëppóo ak defóo bu li ëppu ci wersioŋ yu Windows yi, samba "
+#~ "deeskoo wara komfigure muy jëfandikoo baatijall yuñu kiripte. Loolu dafay "
+#~ "laaj ñu deñc baatijall yi ci ab fiise bu bokkul ak /etc/passwd.  Fiise "
+#~ "boobu manessna koo sos sosuk otomatik, waaye kon baatijall yi deesleen "
+#~ "ciy wara dugël ak loxo, doxal smbpasswd, ta buko defee ñu leen di yeesal "
+#~ "saa yuñu ko soxlawaatee."
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "Boo ko sosul, kon fawwu nga komfigure Samba (amaana yit sa masin yu "
+#~ "kiliyaŋ yi) def leen ñuy jëfandikoo baatijall yu text normaal (plain "
+#~ "text)."
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "Xoolal /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+#~ "pwencrypt.html bi nekk ci paket bu samba-doc, ngir am yaneen leeral."
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Ceene passdb backends manula nekk"
 

Modified: trunk/samba/debian/po/zh_CN.po
===================================================================
--- trunk/samba/debian/po/zh_CN.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/zh_CN.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.0.22-1\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2006-10-03 19:36-0500\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"
@@ -104,10 +104,6 @@
 #. Description
 #: ../samba-common.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -127,10 +123,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
@@ -143,10 +135,6 @@
 #. Description
 #: ../samba-common.templates:5001
 #, 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."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
@@ -162,67 +150,27 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "要创建 samba 密码数据库 /var/lib/samba/passdb.tdb 吗?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"要与大多数 Windows 的默认设置兼容,Samba 必须被设置为使用加密口令。这需要将用"
-"户口令保存独立于 /etc/passwd 之外的一个文件中。此文件可以自动创建,但口令必须"
-"通过运行 smbpasswd 来手动添加并保持更新。"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"如果您无法创建它,您就必须重新配置 samba (可能还包括您的客户端机器) 以使用明"
-"文口令。"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"更多详情,请参阅 smaba-doc 软件包中的 /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html。"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "守护进程"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "您想如何运行 Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../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."
@@ -230,6 +178,34 @@
 "Samba 守护进程 smbd 可以作为普通守护进程或者从 inetd 启动。以守护进程的方式运"
 "行是推荐的方式。"
 
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "要创建 samba 密码数据库 /var/lib/samba/passdb.tdb 吗?"
+
+#~ 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 ""
+#~ "要与大多数 Windows 的默认设置兼容,Samba 必须被设置为使用加密口令。这需要"
+#~ "将用户口令保存独立于 /etc/passwd 之外的一个文件中。此文件可以自动创建,但"
+#~ "口令必须通过运行 smbpasswd 来手动添加并保持更新。"
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "如果您无法创建它,您就必须重新配置 samba (可能还包括您的客户端机器) 以使用"
+#~ "明文口令。"
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "更多详情,请参阅 smaba-doc 软件包中的 /usr/share/doc/samba-doc/htmldocs/"
+#~ "ENCRYPTION.html。"
+
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "不支持串联 passdb 后端"
 

Modified: trunk/samba/debian/po/zh_TW.po
===================================================================
--- trunk/samba/debian/po/zh_TW.po	2012-05-11 13:13:12 UTC (rev 4091)
+++ trunk/samba/debian/po/zh_TW.po	2012-05-11 17:55:40 UTC (rev 4092)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2011-05-12 10:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-11 19:55+0200\n"
 "PO-Revision-Date: 2009-02-22 22:58+0800\n"
 "Last-Translator: Tetralet <tetralet at gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5 at lists."
@@ -146,70 +146,58 @@
 msgid "Samba server"
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "是否要建立 samba 密碼資料庫,/var/lib/samba/passdb.tdb?"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-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 ""
-"為了要相容於大多數 Windows 各式版本的預設設定,Samba 必須被設定為使用加密密"
-"碼。這需要將使用者密碼保存在獨立於 /etc/passwd 的另一個檔案中。此檔案可被自動"
-"建立,但密碼必須藉由執行 smbpasswd 來手動加入,並得時時更新。"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"If you do not create it, you will have to reconfigure Samba (and probably "
-"your client machines) to use plaintext passwords."
-msgstr ""
-"如果您不想建立這個檔案,您將必須重新設定 samba(可能還有您的用戶端機器)來使"
-"用明文密碼。"
-
-#. Type: boolean
-#. Description
-#: ../samba.templates:2001
-msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
-"from the samba-doc package for more details."
-msgstr ""
-"請參閱 samba-doc 套件的 /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
-"Guide/pwencrypt.html 以取得更多詳盡資訊。"
-
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "daemons"
 msgstr "常駐程式"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:3001
+#: ../samba.templates:2001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid "How do you want to run Samba?"
 msgstr "您想要如何執行 Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:3002
+#: ../samba.templates:2002
 msgid ""
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
 "Samba 常駐程式 smbd 可以作為普通的常駐程式,或者是由 inetd 啟動。建議是以常駐"
 "程式的方式執行。"
+
+#~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+#~ msgstr "是否要建立 samba 密碼資料庫,/var/lib/samba/passdb.tdb?"
+
+#~ 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 ""
+#~ "為了要相容於大多數 Windows 各式版本的預設設定,Samba 必須被設定為使用加密"
+#~ "密碼。這需要將使用者密碼保存在獨立於 /etc/passwd 的另一個檔案中。此檔案可"
+#~ "被自動建立,但密碼必須藉由執行 smbpasswd 來手動加入,並得時時更新。"
+
+#~ msgid ""
+#~ "If you do not create it, you will have to reconfigure Samba (and probably "
+#~ "your client machines) to use plaintext passwords."
+#~ msgstr ""
+#~ "如果您不想建立這個檔案,您將必須重新設定 samba(可能還有您的用戶端機器)來"
+#~ "使用明文密碼。"
+
+#~ msgid ""
+#~ "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+#~ "html from the samba-doc package for more details."
+#~ msgstr ""
+#~ "請參閱 samba-doc 套件的 /usr/share/doc/samba-doc/htmldocs/Samba3-"
+#~ "Developers-Guide/pwencrypt.html 以取得更多詳盡資訊。"





More information about the Pkg-samba-maint mailing list