[Pkg-samba-maint] r3879 - in branches/samba/experimental/debian: . patches po

bubulle at alioth.debian.org bubulle at alioth.debian.org
Wed Aug 10 06:55:52 UTC 2011


tags 572483 pending
tags 221618 pending
tags 629183 pending
tags 789097 pending
tags 627813 pending
tags 627849 pending
tags 627866 pending
tags 601406 pending
tags 626674 pending
tags 627519 pending
tags 627442 pending
tags 560318 pending
tags 606320 pending
tags 619132 pending
tags 597987 pending
tags 626474 pending
tags 626477 pending
tags 626487 pending
tags 626523 pending
tags 626531 pending
tags 626558 pending
tags 626638 pending
tags 626674 pending
tags 626890 pending
tags 627224 pending
tags 627354 pending
tags 627442 pending
thanks

Author: bubulle
Date: 2011-08-10 06:55:52 +0000 (Wed, 10 Aug 2011)
New Revision: 3879

Added:
   branches/samba/experimental/debian/libwbclient-dev.files
   branches/samba/experimental/debian/patches/bug_221618_precise-64bit-prototype.patch
   branches/samba/experimental/debian/patches/bug_601406_fix-perl-path-in-example.patch
   branches/samba/experimental/debian/samba.examples
Removed:
   branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/patches/series
   branches/samba/experimental/debian/po/ar.po
   branches/samba/experimental/debian/po/ast.po
   branches/samba/experimental/debian/po/be.po
   branches/samba/experimental/debian/po/bg.po
   branches/samba/experimental/debian/po/bn.po
   branches/samba/experimental/debian/po/bs.po
   branches/samba/experimental/debian/po/ca.po
   branches/samba/experimental/debian/po/cs.po
   branches/samba/experimental/debian/po/da.po
   branches/samba/experimental/debian/po/de.po
   branches/samba/experimental/debian/po/dz.po
   branches/samba/experimental/debian/po/el.po
   branches/samba/experimental/debian/po/eo.po
   branches/samba/experimental/debian/po/es.po
   branches/samba/experimental/debian/po/et.po
   branches/samba/experimental/debian/po/eu.po
   branches/samba/experimental/debian/po/fi.po
   branches/samba/experimental/debian/po/fr.po
   branches/samba/experimental/debian/po/gl.po
   branches/samba/experimental/debian/po/gu.po
   branches/samba/experimental/debian/po/he.po
   branches/samba/experimental/debian/po/hu.po
   branches/samba/experimental/debian/po/id.po
   branches/samba/experimental/debian/po/it.po
   branches/samba/experimental/debian/po/ja.po
   branches/samba/experimental/debian/po/ka.po
   branches/samba/experimental/debian/po/km.po
   branches/samba/experimental/debian/po/ko.po
   branches/samba/experimental/debian/po/ku.po
   branches/samba/experimental/debian/po/lt.po
   branches/samba/experimental/debian/po/ml.po
   branches/samba/experimental/debian/po/mr.po
   branches/samba/experimental/debian/po/nb.po
   branches/samba/experimental/debian/po/ne.po
   branches/samba/experimental/debian/po/nl.po
   branches/samba/experimental/debian/po/nn.po
   branches/samba/experimental/debian/po/pl.po
   branches/samba/experimental/debian/po/pt.po
   branches/samba/experimental/debian/po/pt_BR.po
   branches/samba/experimental/debian/po/ro.po
   branches/samba/experimental/debian/po/ru.po
   branches/samba/experimental/debian/po/sk.po
   branches/samba/experimental/debian/po/sl.po
   branches/samba/experimental/debian/po/sq.po
   branches/samba/experimental/debian/po/sv.po
   branches/samba/experimental/debian/po/ta.po
   branches/samba/experimental/debian/po/templates.pot
   branches/samba/experimental/debian/po/th.po
   branches/samba/experimental/debian/po/tl.po
   branches/samba/experimental/debian/po/tr.po
   branches/samba/experimental/debian/po/vi.po
   branches/samba/experimental/debian/po/wo.po
   branches/samba/experimental/debian/po/zh_CN.po
   branches/samba/experimental/debian/po/zh_TW.po
   branches/samba/experimental/debian/rules
   branches/samba/experimental/debian/samba-common.config
   branches/samba/experimental/debian/samba-common.templates
   branches/samba/experimental/debian/samba-tools.files
   branches/samba/experimental/debian/samba.config
   branches/samba/experimental/debian/samba.files
   branches/samba/experimental/debian/samba.init
   branches/samba/experimental/debian/samba.templates
Log:
Merge changes from unstable branch since last sync (changes between 2:3.5.8~dfsg-1 and 2:3.5.11~dfsg-1)

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/changelog	2011-08-10 06:55:52 UTC (rev 3879)
@@ -46,6 +46,106 @@
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 09 May 2011 11:29:52 +0200
 
+samba (2:3.5.11~dfsg-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Christian Perrier <bubulle at debian.org>  Fri, 05 Aug 2011 20:12:01 +0200
+
+samba (2:3.5.10~dfsg-1) unstable; urgency=low
+
+  * New upstream release
+  * Security update, fixing the following issues:
+    - CVE-2011-2694: possible XSS attack in SWAT
+    - CVE-2011-2522: Cross-Site Request Forgery vulnerability in SWAT
+
+ -- Christian Perrier <bubulle at debian.org>  Thu, 28 Jul 2011 12:19:01 +0200
+
+samba (2:3.5.9~dfsg-1) unstable; urgency=low
+
+  * New upstream release
+  * Add "--quiet" to start-stop-daemon call in reload target in init
+    script. Closes: #572483
+  * Add examples/LDAP in examples for the samba package. With this,
+    samba.schema will be provided in some way in the package.
+    This very partially addresses #190162
+  * patches/bug_221618_precise-64bit-prototype.patch: precise
+    64bits prototype in libsmbclient-dev. Closes: #221618
+  * patches/no-unnecessary-cups.patch: dropped after upstream
+    changes to printing code
+  * Update Standards to 3.9.2 (checked, no change)
+  * Add build-arch and build-indep targets in debian/rules
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 18 Jun 2011 07:08:00 +0200
+
+samba (2:3.5.8~dfsg-5) unstable; urgency=low
+
+  * Fix "tdb2.so undefined symbol: dyn_get_STATEDIR" by fixing a typo
+    in fhs-filespath.patch. Closes: #629183, LP: #789097
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 04 Jun 2011 13:48:32 +0200
+
+samba (2:3.5.8~dfsg-4) unstable; urgency=low
+
+  [ Debconf translations ]
+  * Spanish (Omar Campagne).  Closes: #627813
+  * Swedish (Martin Bagge / brother).  Closes: #627849
+  * Brazilian Portuguese (Adriano Rafael Gomes).  Closes: #627866
+
+  [ Christian Perrier ]
+  * bug_601406_fix-perl-path-in-example.patch:  fix path to perl
+    binary in example file. Closes: #601406
+
+ -- Christian Perrier <bubulle at debian.org>  Fri, 27 May 2011 12:23:05 +0200
+
+samba (2:3.5.8~dfsg-3) unstable; urgency=low
+
+  [ Debconf translations ]
+  * Italian (Luca Monducci).  Closes: #626674
+  * Dutch (Vincent Zweije).  Closes: #627519
+  * Czech (Miroslav Kure).  Closes: #627442
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 24 May 2011 22:40:04 +0200
+
+samba (2:3.5.8~dfsg-2) unstable; urgency=low
+
+  [ Jelmer Vernooij ]
+  * Add libwbclient-dev package.
+  * Build against external libtdb.
+  * Bump standards version to 3.9.1 (no changes).
+
+  [ Mathieu Parent ]
+  * Builddep on libctdb-dev or ctdb < 1.10 
+
+  [ Christian Perrier ]
+  * Use db_settitle in debconf questions and make these
+    titles translatable. Closes: #560318
+  * Test the presence of testparm before trying to use it in init script
+    Closes: #606320
+  * Add cups to Should-{Start,Stop} in LSB headers of
+    samba init script to guarantee that CUPS is started
+    before samba. Closes: #619132
+  * Drop libsmbclient-dev useless dependency on samba-common
+    Closes: #597987
+
+  [ Debconf translations ]
+  * French (Christian Perrier)
+  * Japanese (Kenshi Muto).  Closes: #626474
+  * Galician (Miguel Anxo Bouzada).  Closes: #626477
+  * Thai (Theppitak Karoonboonyanan).  Closes: #626487
+  * Russian (Yuri Kozlov).  Closes: #626523
+  * Danish (Joe Hansen).  Closes: #626531
+  * Esperanto (Felipe Castro).  Closes: #626558
+  * Hebrew (Eran Cohen).  Closes: #626638
+  * Bokmål, (Bjørn Steensrud).
+  * Italian (Luca Monducci).  Closes: #626674
+  * Finnish (Tapio Lehtonen).  Closes: #626890
+  * Portuguese (Miguel Figueiredo).  Closes: #627224
+  * German (Holger Wansing).  Closes: #627354
+  * Czech (Miroslav Kure).  Closes: #627442
+
+ -- Christian Perrier <bubulle at sesostris.kheops.frmug.org>  Sun, 22 May 2011 21:15:21 +0200
+
 samba (2:3.5.8~dfsg-1) unstable; urgency=low
 
   * New upstream release. This fixes the following bugs:

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/control	2011-08-10 06:55:52 UTC (rev 3879)
@@ -8,12 +8,13 @@
 	libacl1-dev [linux-any],
 	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
 	libtalloc-dev (>= 2.0.1-1~bpo50+1),
+	libtdb-dev (>= 1.2.1~),
 	libcap-dev [linux-any],
 	libkeyutils-dev [linux-any],
 	libctdb-dev (>= 1.10+git20110412) [linux-any],
 	pkg-config
 Build-Conflicts: libfam-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
 Homepage: http://www.samba.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba
@@ -21,7 +22,7 @@
 Package: samba
 Architecture: any
 Depends: samba-common (= ${source:Version}), libwbclient0 (= ${binary:Version}),${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-11), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
-Recommends: logrotate
+Recommends: logrotate, tdb-tools
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools, ctdb
 Replaces: samba-common (<= 2.0.5a-2)
 Conflicts: samba4 (<< 4.0.0~alpha6-2)
@@ -164,7 +165,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libsmbclient (= ${binary:Version}), ${misc:Depends}, samba-common (>= 2:3.4.0~pre1-2)
+Depends: libsmbclient (= ${binary:Version}), ${misc:Depends}
 Description: development files for libsmbclient
  This package provides the development files (static library and headers)
  required for building applications against libsmbclient, a library that
@@ -226,3 +227,18 @@
  .
  This package provides a library for client applications that interact
  via the winbind pipe protocol with a Samba winbind server.
+
+Package: libwbclient-dev
+Section: libdevel
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version})
+Description: Samba winbind client library - development files
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package provides the development files (static library and headers)
+ required for building applications against libwbclient, a library for client
+ applications that interact via the winbind pipe protocol with a Samba
+ winbind server.

Copied: branches/samba/experimental/debian/libwbclient-dev.files (from rev 3878, tags/samba/2:3.5.11~dfsg-1/debian/libwbclient-dev.files)
===================================================================
--- branches/samba/experimental/debian/libwbclient-dev.files	                        (rev 0)
+++ branches/samba/experimental/debian/libwbclient-dev.files	2011-08-10 06:55:52 UTC (rev 3879)
@@ -0,0 +1,3 @@
+usr/lib/libwbclient.so
+usr/include/wbclient.h
+usr/include/wbc_async.h

Copied: branches/samba/experimental/debian/patches/bug_221618_precise-64bit-prototype.patch (from rev 3878, tags/samba/2:3.5.11~dfsg-1/debian/patches/bug_221618_precise-64bit-prototype.patch)
===================================================================
--- branches/samba/experimental/debian/patches/bug_221618_precise-64bit-prototype.patch	                        (rev 0)
+++ branches/samba/experimental/debian/patches/bug_221618_precise-64bit-prototype.patch	2011-08-10 06:55:52 UTC (rev 3879)
@@ -0,0 +1,15 @@
+Index: samba/source3/include/libsmbclient.h
+===================================================================
+--- samba.orig/source3/include/libsmbclient.h
++++ samba/source3/include/libsmbclient.h
+@@ -79,6 +79,10 @@
+ #include <fcntl.h>
+ #include <utime.h>
+ 
++  /* Debian bug #221618 */
++#define _LARGEFILE64_SOURCE
++#define _FILE_OFFSET_BITS 64
++
+ #define SMBC_BASE_FD        10000 /* smallest file descriptor returned */
+ 
+ #define SMBC_WORKGROUP      1

Copied: branches/samba/experimental/debian/patches/bug_601406_fix-perl-path-in-example.patch (from rev 3878, tags/samba/2:3.5.11~dfsg-1/debian/patches/bug_601406_fix-perl-path-in-example.patch)
===================================================================
--- branches/samba/experimental/debian/patches/bug_601406_fix-perl-path-in-example.patch	                        (rev 0)
+++ branches/samba/experimental/debian/patches/bug_601406_fix-perl-path-in-example.patch	2011-08-10 06:55:52 UTC (rev 3879)
@@ -0,0 +1,15 @@
+Description: Fix path to perl binary in example file
+Author: Christian Perrier <bubulle at debian.org>
+Bug-Debian: http://bugs.debian.org/601406
+Forwarded: no
+
+Index: samba/examples/misc/wall.perl
+===================================================================
+--- samba.orig/examples/misc/wall.perl
++++ samba/examples/misc/wall.perl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ # 
+ #@(#) smb-wall.pl Description:
+ #@(#) A perl script which allows you to announce whatever you choose to

Deleted: branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
===================================================================
--- branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,23 +0,0 @@
-Description: Drop unneeded calls to CUPS server
- Don't try to contact the CUPS server when we can reliably
- determine that no printers are needed
-Author: Steve Langasek <vorlon at debian.org>
-Bug-Debian: http://bugs.debian.org/479512
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=5525
-Forwarded: yes
-
-Index: experimental/source3/smbd/server_reload.c
-===================================================================
---- experimental.orig/source3/smbd/server_reload.c
-+++ experimental/source3/smbd/server_reload.c
-@@ -45,6 +45,10 @@
- 	NTSTATUS status;
- 	bool skip = false;
- 
-+	if (!lp_load_printers()
-+	    && (lp_auto_services() == NULL || !strcmp(lp_auto_services(),"")))
-+		return;
-+
- 	SMB_ASSERT(pcap_cache_loaded());
- 	DEBUG(10, ("reloading printer services from pcap cache\n"));
- 

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/patches/series	2011-08-10 06:55:52 UTC (rev 3879)
@@ -8,6 +8,7 @@
 VERSION.patch
 usershare.patch
 smbtar-bashism.patch
-no-unnecessary-cups.patch
 autoconf.patch
 dont-build-VFS-examples.patch
+bug_601406_fix-perl-path-in-example.patch
+bug_221618_precise-64bit-prototype.patch

Modified: branches/samba/experimental/debian/po/ar.po
===================================================================
--- branches/samba/experimental/debian/po/ar.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ar.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -22,15 +22,21 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: \n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "تغيير smb.conf لاستعمال إعدادات WINS عبر DHCP"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -45,20 +51,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "يجب تثبيت رزمة dhcp3-client للاستفادة من هذه الميزة."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "إعداد آلي لملف smb.conf ؟"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -75,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -86,13 +92,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr " اسم مجموعة العمل/الحقل:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -106,13 +112,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "تشفير كلمة المرور ؟"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -124,7 +130,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -136,15 +142,21 @@
 "إن فعلت ذلك، فتأكد من وجود ملف /etc/samba/smbpasswd صالح وأن تضع فيه كلمات "
 "المرور الخاصة بكل مستخدم باستخدام الأمر smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -159,7 +171,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -169,7 +181,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -179,25 +191,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "كيف تريد تشغيل Samba؟"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ast.po
===================================================================
--- branches/samba/experimental/debian/po/ast.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ast.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: samba package\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -20,15 +20,21 @@
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: SPAIN\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "¿Camudar smb.conf pa usar configuraciones WINS dende DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -44,7 +50,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -53,13 +59,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "¿Configurar smb.conf automáticamente?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -77,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -89,13 +95,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome de Grupu/Dominiu:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -110,13 +116,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "¿Usar contraseña encriptada?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -128,7 +134,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -139,9 +145,15 @@
 "tienes un ficheru /etc/samba/smbpasswd válidu y que afitastes les "
 "contraseñes nél pa cada usuariu usando'l comandu smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -149,7 +161,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -165,7 +177,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -175,7 +187,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -185,25 +197,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "degorrios"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "¿Cómo quies executar Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/be.po
===================================================================
--- branches/samba/experimental/debian/po/be.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/be.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -8,7 +8,7 @@
 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: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -18,9 +18,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Змяніць файл наладак smb.conf такім чынам, каб ужываліся наладкі WINS, "
@@ -28,7 +34,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -45,20 +51,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Каб скарыстацца гэтай магчымасцю, трэба ўсталяваць пакет dhcp3-client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Наладзіць smb.conf аўтаматычна?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -76,7 +82,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -88,13 +94,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Працоўная група/Імя дамену:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -107,13 +113,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Шыфраваць паролі?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -125,7 +131,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -137,15 +143,21 @@
 "што Вы маеце дзейсны файл /etc/samba/smbpasswd і што для кожнага "
 "карыстальніка ў ім створаны пароль з дапамогай каманды smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -161,7 +173,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -172,7 +184,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -182,25 +194,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "дэманы"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Якім чынам мусіць запускацца Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/bg.po
===================================================================
--- branches/samba/experimental/debian/po/bg.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/bg.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: samba_3.0.23c-1_bg\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -16,15 +16,21 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Да се промени ли smb.conf да взима настройките за WINS от DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -40,20 +46,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Тази настройки изисква инсталирането на пакета dhcp3-client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Автоматична настройка на smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -69,7 +75,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -80,13 +86,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Работна група/домейн:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -100,13 +106,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Шифриране на паролите?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -118,7 +124,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -130,15 +136,21 @@
 "файлът /etc/samba/smbpasswd е правилен и използвайте програмата smbpasswd за "
 "задаване на паролите на потребителите."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "Създаване на базата данни с пароли, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -153,7 +165,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -163,7 +175,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -173,25 +185,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "фонов процес"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "при нужда"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Как да се стартира Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/bn.po
===================================================================
--- branches/samba/experimental/debian/po/bn.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/bn.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -17,15 +17,21 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: WordForge 0.5-beta1\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "DHCP থেকে WINS সেটিং ব্যবহারের জন্য smb.conf সম্পাদনা করা হবে?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -40,7 +46,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -48,13 +54,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "স্বয়ংক্রিয়ভাবে smb.conf কনফিগার করা হবে?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -72,7 +78,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -84,13 +90,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "ওয়ার্কগ্রুপ/ডোমেইন নাম:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -104,13 +110,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "পাসওয়ার্ড এনক্রিপশন ব্যবহার করা হবে?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -122,7 +128,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -134,15 +140,21 @@
 "একটি বৈধ /etc/samba/smbpasswd ফাইল আছে এবং আপনি সেখানে smbpasswd কমান্ড "
 "ব্যবহার করে প্রত্যেক ব্যবহারকারীর জন্য পাসওয়ার্ড সেট করেন।"
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "সাম্বা পাসওয়ার্ড ডেটাবেজ তৈরি করা হবে, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -158,7 +170,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -168,7 +180,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -178,25 +190,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "ডিমন"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "আপনি সাম্বা কিভাবে চালাতে চান?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/bs.po
===================================================================
--- branches/samba/experimental/debian/po/bs.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/bs.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -25,15 +25,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: 3\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Izmijeniti smb.conf za korištenje WINS postavki od DHCP-a?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -49,7 +55,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -57,13 +63,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Podesiti smb.conf automatski?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -81,7 +87,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -92,13 +98,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Workgroup/Domain Name:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -116,13 +122,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Koristiti enkripciju Å¡ifre?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -139,7 +145,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -155,15 +161,21 @@
 "da imate ispravnu /etc/samba/smbpasswd datoteku i da u njoj postavite Å¡ifre "
 "za svakog korisnika koristeći smbpasswd naredbu."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -179,7 +191,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -189,7 +201,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -199,25 +211,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Kako želite pokretati Samba-u?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ca.po
===================================================================
--- branches/samba/experimental/debian/po/ca.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ca.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -9,7 +9,7 @@
 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: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -18,16 +18,22 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Voleu modificar el smb.conf perquè utilitzi els paràmetres del WINS del DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -44,7 +50,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -53,13 +59,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Voleu configurar el smb.conf automàticament?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -77,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -88,13 +94,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Grup de treball/nom del domini:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -108,13 +114,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Voleu utilitzar el xifrat de contrasenyes?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -126,7 +132,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -139,9 +145,15 @@
 "vàlid i que hi especifiqueu la contrasenya de cada usuari utilitzant l'ordre "
 "smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -149,7 +161,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -166,7 +178,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -176,7 +188,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -186,25 +198,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "dimonis"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Com voleu executar el Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/cs.po
===================================================================
--- branches/samba/experimental/debian/po/cs.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/cs.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2009-06-27 10:58+0200\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: cs\n"
@@ -24,15 +24,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Samba server a nástroje"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Upravit smb.conf, aby používal WINS nastavení z DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -48,7 +54,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -56,13 +62,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Konfigurovat smb.conf automaticky?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -80,7 +86,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -91,13 +97,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Skupina/název domény:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -112,13 +118,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Použít šifrování hesel?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -130,7 +136,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -142,15 +148,21 @@
 "byste se ujistit, že máte platný soubor /etc/samba/smbpasswd a že v něm "
 "nastavíte hesla všech uživatelů příkazem smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Samba server"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -166,7 +178,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -176,7 +188,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -186,25 +198,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "démoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Jak chcete spouštět Sambu?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/da.po
===================================================================
--- branches/samba/experimental/debian/po/da.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/da.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,15 +1,15 @@
 # Danish translation samba.
-# Copyright (C) 2010 samba & nedenstående oversættere.
+# Copyright (C) 2011 samba & nedenstående oversættere.
 # This file is distributed under the same license as the samba package.
 # Claus Hindsgaul <claus.hindsgaul at gmail.com>, 2004, 2006, 2007.
-# Joe Hansen (joedalton2 at yahoo.dk), 2010.
+# Joe Hansen (joedalton2 at yahoo.dk), 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2010-08-12 17:30+01:00\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: \n"
@@ -17,15 +17,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Sambaserver og -redskaber"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ret smb.conf, så den benytter WINS-indstillinger fra DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -41,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -50,13 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Sæt smb.conf op automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -74,7 +80,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -86,13 +92,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Arbejdsgruppe/domænenavn:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -106,13 +112,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
-msgstr "Kryptér adgangskoder?"
+msgstr "Krypter adgangskoder?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -124,7 +130,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -136,15 +142,21 @@
 "aktiverer, så sørg for at du har en gyldig /etc/samba/smbpasswd-fil, og at "
 "du her angiver adgangskoder for hver bruger med kommandoen smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Sambaserver"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -160,7 +172,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -170,7 +182,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -180,25 +192,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "dæmoner"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Hvordan skal Samba køres?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/de.po
===================================================================
--- branches/samba/experimental/debian/po/de.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/de.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,15 +1,15 @@
-# Translation of samba to German
+# Debconf translation of samba to German
 #
-# Holger Wansing <linux at wansing-online.de>, 2006, 2009.
+# Holger Wansing <linux at wansing-online.de>, 2006, 2009, 2011.
 # Martin Krüger <mkrueger at mkru.de>, 2005.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: samba 3.4.0-1\n"
+"Project-Id-Version: samba 3.5.8~dfsg-2\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2009-07-09 22:59+0200\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: de\n"
@@ -17,9 +17,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Samba-Server und Hilfsprogramme"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Soll smb.conf so abgeändert werden, dass per DHCP angebotene WINS-"
@@ -27,7 +33,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -44,7 +50,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -53,13 +59,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Soll smb.conf automatisch konfiguriert werden?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -77,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -89,7 +95,7 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Arbeitsgruppen-/Domain-Name:"
 
@@ -97,7 +103,7 @@
 #
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -112,7 +118,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Verschlüsselte Passwörter verwenden?"
 
@@ -120,7 +126,7 @@
 #
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -133,7 +139,7 @@
 #
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -146,15 +152,21 @@
 "eine gültige /etc/samba/smbpasswd-Datei haben und dort mittels dem smbpasswd-"
 "Befehl Passwörter für alle Benutzer setzen."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Samba-Server"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -171,7 +183,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -182,7 +194,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -192,25 +204,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "Daemon"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Wie möchten Sie Samba starten?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/dz.po
===================================================================
--- branches/samba/experimental/debian/po/dz.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/dz.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba_po.pot\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -28,9 +28,15 @@
 "X-Poedit-Country: bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "ཌི་ཨེཅ་སི་པི་ནང་ལས་ ཌབ་ལུ་ཨའི་ཨེན་ཨེསི་སྒྲིག་སྟངས་ཚུ་ལག་ལེན་འདབ་ནི་ལུ་ smb.conf ལེགས་བཅོས་འབད་ནི་"
@@ -38,7 +44,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -54,7 +60,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -62,13 +68,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf འདི་རང་བཞིན་གྱིས་རིམ་སྒྲིག་འབད་ནི་ཨིན་ན?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -85,7 +91,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -96,13 +102,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "ལཱ་གི་སྡེ་ཚན་/ཌོ་མེན་མིང་:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -120,13 +126,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "ཆོག་ཡིག་གསང་བཟོ་ལགལེན་འཐབ་ནི་ཨིན་ན?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -143,7 +149,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -159,16 +165,22 @@
 "ནུས་ལྡན་གྱི་/etc/samba/smbpasswd ཡིག་སྣོད་ཅིག་དགོཔ་དང་ འ་ནི་འདི་ཁྱོད་ཀྱིས་ smbpasswd བརྡ་བཀོད་"
 "ལག་ལེན་གྱི་ཐོག་ལས་ ལག་ལེན་པ་རེ་བཞིན་གྱི་དོན་ལས་ དེ་ནང་ལུ་ཆོག་ཡིག་གཞི་སྒྲིག་འབད། "
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
 "སམ་བ་ཆོག་ཡིག་གནད་སྡུད་གཞི་རྟེན་ /var/lib/samba/passdb.tdb གསར་བསྐྲུན་འབད་ནི་ཨིན་ན་?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -184,7 +196,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -194,7 +206,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -204,25 +216,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "ཌེ་མཱོནསི་"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "ཁྱོད་ཀྱིས་ སམ་བ་འདི་ག་དེ་སྦེ་གཡོག་བཀོལ་དགོ་མནོཝ་སྨོ?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/el.po
===================================================================
--- branches/samba/experimental/debian/po/el.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/el.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: samba_el\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -28,9 +28,15 @@
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Τροποποίηση του smb.conf ώστε να χρησιμοποιεί τις ρυθμίσεις WINS από τον "
@@ -38,7 +44,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -55,7 +61,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -64,13 +70,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Αυτόματη ρύθμιση του αρχείου smb.conf;"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -89,7 +95,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -101,13 +107,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Όνομα Ομάδας Εργασίας/Τομέα:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -122,13 +128,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Να χρησιμοποιηθεί κρυπτογράφηση των κωδικών πρόσβασης;"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -141,7 +147,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -154,9 +160,15 @@
 "smbpasswd και ότι ορίζετε κωδικούς πρόσβασης σ' αυτό για κάθε χρήστη με τη "
 "χρήση της εντολήςsmbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
 "Να δημιουργηθεί η βάση δεδομένων των κωδικών πρόσβασης samba, /var/lib/samba/"
@@ -164,7 +176,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -182,7 +194,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -193,7 +205,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -203,25 +215,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "δαίμονες"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Πώς θέλετε να εκτελείται η υπηρεσία Samba;"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/eo.po
===================================================================
--- branches/samba/experimental/debian/po/eo.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/eo.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,13 +1,13 @@
 # This file is distributed under the same license as the samba package.
 # Copyright 2007, Serge Leblanc <serge.leblanc at wanadoo.fr>.
-# Copyright 2009, Felipe Castro <fefcas at gmail.com>.
+# Copyright 2009, 2011 Felipe Castro <fefcas at gmail.com>.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2009-03-11 06:04-0300\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: eo\n"
@@ -15,15 +15,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Servilo Samba kaj utilaĵoj"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ĉu modifi la dosieron smb.conf por uzi la agordojn WINS el DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -39,20 +45,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "La pako dhcp3-client devas esti instalita por profiti ĉi tiun trajton."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Ĉu aŭtomate akomodi la dosieron smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -69,7 +75,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -80,13 +86,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Laborgrupo/Domajno-Nomo:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -100,13 +106,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Ĉu ĉifri la pasvortojn?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -118,7 +124,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -130,15 +136,21 @@
 "ĉu vi havas validan dosieron /etc/samba/smbpasswd, en kiu vi enmetis "
 "pasvortojn por ĉiu uzanto kiu uzas la komandon smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Servilo Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -154,7 +166,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -164,7 +176,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -174,25 +186,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "demonoj"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Kiel vi volas lanĉi Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/es.po
===================================================================
--- branches/samba/experimental/debian/po/es.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/es.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,11 +1,10 @@
 # samba translation to spanish
-# Copyright (C) 2003-2007 Steve Langasek <vorlon at debian.org>
-# Copyright (C) 2006,2010 Software in the Public Interest, SPI Inc.
+# Copyright (C) 2011 Software in the Public Interest, SPI Inc.
 # This file is distributed under the same license as the samba package.
 #
 #  Changes:
 #  - Initial translation
-#        Steve Langasek, 2003-2006
+#        Steve Langasek <vorlon at debian.org>, 2003-2007
 #
 #  - Revision and update
 #        Javier Fernandez-Sanguino, 2006
@@ -13,7 +12,7 @@
 #  - Translation of new templates
 #        Steve Langasek, 2007
 #  - Update
-# 	 Omar Campagne <ocampagne at gmail.com>, 2010
+# 	 Omar Campagne <ocampagne at gmail.com>, 2010, 2011
 #
 #   Traductores, si no conoce el formato PO, merece la pena leer la 
 #   documentación de gettext, especialmente las secciones dedicadas a este
@@ -38,20 +37,29 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Samba for Debian 3.4.7\n"
+"Project-Id-Version: Samba 2:3.5.8\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2010-04-24 12:27+0200\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.0-beta5\n"
+"X-Project-Style: default\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Servidor Samba y herramientas"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "¿Desea modificar «smb.conf» para usar la configuración WINS que proviene de "
@@ -59,7 +67,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -75,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -83,13 +91,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "¿Desea configurar «smb.conf» automáticamente?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -107,7 +115,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -119,13 +127,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Nombre del dominio o del grupo de trabajo:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -139,13 +147,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "¿Desea utilizar contraseñas cifradas?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -158,7 +166,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -170,16 +178,22 @@
 "de que tiene un fichero «/etc/samba/smbpasswd» válido, donde defina las "
 "contraseñas para cada usuario usando la orden «smbpasswd»."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Servidor Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -196,7 +210,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -206,7 +220,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -216,25 +230,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "demonios"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "¿Cómo quiere que se ejecute Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/et.po
===================================================================
--- branches/samba/experimental/debian/po/et.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/et.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -25,15 +25,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: ESTONIA\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Muuta smb.conf, et kasutataks DHCP WINS seadeid?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -49,20 +55,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Et seda võimalust kasutada, peab olema paigaldatud dhcp3-client pakk."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Seadistada smb.conf automaatselt?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -79,7 +85,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -90,13 +96,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Töögrupi/domeeni nimi:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -113,13 +119,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Kasutada paroolide krüpteerimist?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -136,7 +142,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -152,15 +158,21 @@
 "sul oleks sobiv /etc/samba/smbpasswd fail ning sea igale seal olevale "
 "kasutajale smbpasswd käsu abil parool."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -175,7 +187,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -185,7 +197,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -195,25 +207,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "deemonitena"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd'ist"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Kuidas soovid Samba käivitada?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/eu.po
===================================================================
--- branches/samba/experimental/debian/po/eu.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/eu.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -28,15 +28,21 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "smb.conf WINS ezarpenak DHCP-tik jasotzeko eraldatu?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -51,7 +57,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -60,13 +66,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Smb.conf automatikoki konfiguratu?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -83,7 +89,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -94,13 +100,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Lan Talde/Domeinu izena:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -115,13 +121,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Zifraturiko pasahitzak erabili?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -133,7 +139,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -145,15 +151,21 @@
 "hautatuaz gero ziurtatu baliozko /etc/samba/smbpasswd fitxategi bat duzula "
 "eta pasahitzak smbpasswd programaren bidez ezarri dituzula."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -170,7 +182,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -180,7 +192,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -190,25 +202,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "deabruak"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Nola nahi duzu Samba abiaraztea?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/fi.po
===================================================================
--- branches/samba/experimental/debian/po/fi.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/fi.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,29 +1,35 @@
 # Translation of samba_po.po to finnish.
 #
-# Tapio Lehtonen <tale at debian.org>, 2006.
+# Tapio Lehtonen <tale at debian.org>, 2006, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba fi\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-13 18:35+0200\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Samba-palvelin ja apuohjelmistoja"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
-msgstr "Muokataanko smb.conf käyttämään DHCP:ltä saatua WINS-asetusta?"
+msgstr "Muokataanko smb.conf käyttämään DHCP:ltä saatua WINS-asetusta?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -32,28 +38,28 @@
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
 "Jos tietokone saa verkkoasetukset verkon DHCP-palvelimelta, saattaa DHCP-"
-"palvelin tarjota tietoa myös verkon WINS-palvelimista (\"NetBIOS-"
-"nimipalvelimista\"). Tällöin on tiedostoa smb.conf muutettava, jotta DHCP:n "
+"palvelin tarjota tietoa myös verkon WINS-palvelimista (\"NetBIOS-"
+"nimipalvelimista\"). Tällöin on tiedostoa smb.conf muutettava, jotta DHCP:n "
 "tarjoamat WINS-asetukset luetaan automaattisesti tiedostosta /etc/samba/dhcp."
 "conf."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
-"Tätä ominaisuutta voi käyttää vain jos paketti dhcp3-client on asennettu."
+"Tätä ominaisuutta voi käyttää vain jos paketti dhcp3-client on asennettu."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
-msgstr "Tehdäänkö asetukset tiedostoon smb.conf automaattisesti?"
+msgstr "Tehdäänkö asetukset tiedostoon smb.conf automaattisesti?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -62,97 +68,92 @@
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
-"Loput Samban asetuksista ovat kysymyksiä jotka vaikuttavat parametreihin "
+"Loput Samban asetuksista ovat kysymyksiä jotka vaikuttavat parametreihin "
 "Samban ohjelmien (nmbd ja smbd) asetustiedostossa /etc/samba/smb.conf. Nyt "
-"tiedostossa smb.conf on \"include\"-rivi tai useita rivejä pitkä valitsin, "
-"mikä sotkee automatisoidun asetukset tekevän ohjelman ja pakottaa "
-"muokkaamaan tiedostoa smb.conf käsin, jotta se taas toimisi."
+"tiedostossa smb.conf on \"include\"-rivi tai useita rivejä pitkä valitsin, "
+"mikä sotkee automatisoidun asetukset tekevän ohjelman ja pakottaa "
+"muokkaamaan tiedostoa smb.conf käsin, jotta se taas toimisi."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 ""
-"Jos et valitse tätä toimintoa, on kaikki asetusten muutokset tehtävä itse, "
-"etkä pääse hyötymään julkaistavista asetusten parannuksista."
+"Jos et valitse tätä toimintoa, on kaikki asetusten muutokset tehtävä itse, "
+"etkä pääse hyötymään julkaistavista asetusten parannuksista."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
-msgstr "Työryhmän/Verkkoalueen nimi:"
+msgstr "Työryhmän/Verkkoalueen nimi:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
+#: ../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 ""
-"Anna sen verkkoalueen nimi, johon tämä palvelin ilmoittaa kuuluvansa "
-"asiakaskoneiden kysyessä. Huomaa, että tämä parametri on myös asetuksen "
-"security=domain kanssa käytettävä verkkoalueen nimi."
+"Anna tämän järjestelmän työryhmän nimi. Asetuksella määritetään mihin "
+"työryhmään järjestelmä kuuluu sen toimiessa palvelimena, oletustyöryhmä "
+"selattaessa edustaohjelmilla ja asetuksen \"security=domain\" kanssa "
+"käytettävä verkkoalueen nimi."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Salataanko salasanat?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
+#: ../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 ""
 "Kaikki viime aikoina julkistetut Windows-asiakkaat salaavat salasanat "
-"liikennöitäessä SMB-palvelimien kanssa. Jos halutaan käyttää selväkielisiä "
-"salasanoja, on Windows registryssä olevaa parametria muutettava."
+"liikennöitäessä SMB/CIFS-palvelimien kanssa. Jos halutaan käyttää "
+"selväkielisiä salasanoja, on Windows registryssä olevaa parametria "
+"muutettava."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, 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."
+#: ../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 ""
-"Tämän valitsimen pitämistä päällä suositellaan suuresti. Jos se on päällä, "
-"on varmistuttava tiedoston /etc/samba/smbpasswd kelvollisuudesta ja että "
-"siellä on jokaiselle käyttäjälle tehty salasana komennolla smbpasswd."
+"Tämän valitsimen pitämistä päällä suositellaan suuresti, koska tukea "
+"selväkielisille salasanoille ei enää ylläpidetä Microsoft Windows-"
+"tuotteissa. Jos se on päällä, on varmistuttava tiedoston /etc/samba/"
+"smbpasswd kelvollisuudesta ja että siellä on jokaiselle käyttäjälle tehty "
+"salasana komennolla smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Samba-palvelin"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -161,58 +162,58 @@
 "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 "
+"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."
+"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:1001
+#: ../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ä "
+"Jos tiedostoa ei luoda, on Samba asetettava käyttämään selväkielisiä "
 "salasanoja (kuten asiakaskoneetkin)."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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/"
+"Katso lisätietoja paketin samba-doc tiedostosta /usr/share/doc/samba-doc/"
 "htmldocs/ENCRYPTION.html."
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "palvelinprosessit"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
-msgstr "Kuinka Samba käynnistetään?"
+msgstr "Kuinka Samba käynnistetään?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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 ""
 "Samban palvelinprosessi smbd voi toimia tavallisena prosessina tai inetd voi "
-"käynnistää sen. Tavallisen prosessin käyttämistä suositellaan."
+"käynnistää sen. Tavallisen prosessin käyttämistä suositellaan."
 
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb:n taustaosien ketjuttamista ei tueta"
@@ -223,21 +224,21 @@
 #~ "conf file contains a passdb backend parameter consisting of a list of "
 #~ "backends.  The new version of samba will not work until you correct this."
 #~ msgstr ""
-#~ "Versiosta 3.0.23 alkaen samba ei enää tue useiden taustaosien "
-#~ "ketjuttamista \"passdb backend\" -parametrissa. Tämän koneen smb.conf-"
+#~ "Versiosta 3.0.23 alkaen samba ei enää tue useiden taustaosien "
+#~ "ketjuttamista \"passdb backend\" -parametrissa. Tämän koneen smb.conf-"
 #~ "tiedostossa vaikuttaa olevan bassdb backend -parametri jossa on luettelo "
-#~ "taustaosista. Samban uusi versio ei toimi ennen kuin tämä korjataan."
+#~ "taustaosista. Samban uusi versio ei toimi ennen kuin tämä korjataan."
 
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
-#~ "Siirretäänkö tiedosto /etc/samba/smbpasswd tiedostoksi /var/lib/samba/"
+#~ "Siirretäänkö tiedosto /etc/samba/smbpasswd tiedostoksi /var/lib/samba/"
 #~ "passdb.tdb?"
 
 #~ msgid ""
 #~ "Samba 3.0 introduced a more complete SAM database interface which "
 #~ "supersedes the /etc/samba/smbpasswd file."
 #~ msgstr ""
-#~ "Samban versiossa 3.0 tuli mukaan täydellisempi SAM-tietokantarajapinta "
+#~ "Samban versiossa 3.0 tuli mukaan täydellisempi SAM-tietokantarajapinta "
 #~ "joka korvaa tiedoston /etc/samba/smbpasswd."
 
 #~ msgid ""
@@ -245,6 +246,6 @@
 #~ "automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
 #~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
 #~ msgstr ""
-#~ "Vahvista, että olemassa oleva tiedosto smbpasswd siirretään "
-#~ "automaattisesti tiedostoksi /var/lib/samba/passdb.tdb. Älä valitse tätä "
-#~ "jos aiot käyttää jotain muuta pdb-taustaosaa (esim. LDAP)."
+#~ "Vahvista, että olemassa oleva tiedosto smbpasswd siirretään "
+#~ "automaattisesti tiedostoksi /var/lib/samba/passdb.tdb. Älä valitse tätä "
+#~ "jos aiot käyttää jotain muuta pdb-taustaosaa (esim. LDAP)."

Modified: branches/samba/experimental/debian/po/fr.po
===================================================================
--- branches/samba/experimental/debian/po/fr.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/fr.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -2,29 +2,37 @@
 # Copyright (C) 2006-2009, Christian Perrier <bubulle at debian.org>
 # This file is distributed under the same license as the samba package.
 #
+# Christian Perrier <bubulle at debian.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2008-12-29 12:32+0100\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Serveur et utilitaires Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modifier smb.conf pour utiliser les paramètres WINS fournis par DHCP ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -40,7 +48,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -48,13 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Voulez-vous configurer smb.conf automatiquement ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -72,7 +80,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -84,13 +92,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Nom de domaine ou de groupe de travail :"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -105,13 +113,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Voulez-vous chiffrer les mots de passe ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -124,7 +132,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -137,15 +145,21 @@
 "smbpasswd et d'y établir les mots de passe de tous les utilisateurs, à "
 "l'aide de la commande « smbpasswd »."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Serveur Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -162,7 +176,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -173,7 +187,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -183,28 +197,29 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "démons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Comment voulez-vous lancer Samba ?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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 ""
 "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."
+

Modified: branches/samba/experimental/debian/po/gl.po
===================================================================
--- branches/samba/experimental/debian/po/gl.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/gl.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,4 +1,4 @@
-# translation of samba_2:3.4.8~dfsg-2_gl.po to Galician
+# translation of samba_2:3.5.8~dfsg-2_gl.po to Galician
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -13,29 +13,38 @@
 #    Developers do not need to manually edit POT or PO files.
 #
 # Jorge Barreiro <yortx.barry at gmail.com>, 2010.
+# Miguel Anxo Bouzada <mbouzada at gmail.com>, 2011.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: samba_2:3.4.8~dfsg-2_gl\n"
+"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: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2010-08-13 02:10+0200\n"
-"Last-Translator: Jorge Barreiro <yortx.barry at gmail.com>\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Language: Galician\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Servidor e utilidades Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
-msgstr "¿Modificar smb.conf para empregar a configuración WINS de DHCP?"
+msgstr "Modificar smb.conf para empregar a configuración WINS de DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -43,15 +52,15 @@
 "to your smb.conf file so that DHCP-provided WINS settings will automatically "
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
-"Se o seu ordenador obtén o enderezo IP dun servidor DHCP da rede, o servidor "
-"DHCP tamén pode fornecer información sobre os servidores WINS (servidores de "
-"nomes NetBIOS) que estean presentes na rede. Para facelo hai que modificar o "
-"ficheiro smb.conf para que a configuración WINS fornecida por DHCP se lea "
-"automaticamente de /etc/samba/dhcp.conf."
+"Se o seu computador obtén o enderezo IP dun servidor DHCP da rede, o "
+"servidor DHCP tamén pode fornecer información sobre os servidores WINS "
+"(servidores de nomes NetBIOS) que estean presentes na rede. Para facelo hai "
+"que modificar o ficheiro smb.conf para que a configuración WINS fornecida "
+"por DHCP sexa lida automaticamente de /etc/samba/dhcp.conf."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -60,13 +69,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
-msgstr "¿Configurar o ficheiro smb.conf automaticamente?"
+msgstr "Configurar automaticamente o ficheiro smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -78,13 +87,13 @@
 "O resto da configuración de Samba trata con cuestións que afectan aos "
 "parámetros de /etc/samba/smb.conf, que é o ficheiro que se emprega para "
 "configurar os programas de Samba (nmbd e smbd). O seu ficheiro smb.conf "
-"actual contén unha liña \"include\" ou unha opción que cubre varias liñas, o "
+"actual contén unha liña «include» ou unha opción que cobre varias liñas, o "
 "que pode confundir ao proceso de configuración automático e facer que teña "
 "que editar o ficheiro smb.conf a man para poñelo a funcionar outra vez."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -96,13 +105,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome do grupo de traballo/dominio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -111,18 +120,19 @@
 msgstr ""
 "Indique o grupo de traballo para este sistema. Este parámetro controla o "
 "grupo de traballo no que este sistema aparecerá cando funcione como "
-"servidor, o grupo de traballo que se usará ó navegar usando varios clientes, "
-"e o nome de dominio que se emprega coa configuración security=domain."
+"servidor, o grupo de traballo que se usará ao navegar usando varios "
+"clientes, e o nome de dominio que se emprega coa configuración "
+"security=domain."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
-msgstr "¿Empregar cifrado de contrasinais?"
+msgstr "Empregar cifrado de contrasinais?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -134,7 +144,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -142,20 +152,26 @@
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
 "Recoméndase activar esta opción xa que os contrasinais en texto claro xa non "
-"son mantidos nos productos Microsoft. Se o fai, asegúrese de ter un "
-"ficheiro  /etc/samba/smbpasswd válido e de establecer nel os contrasinais de "
-"cada usuario coa orde smbpasswd."
+"son mantidos nos produtos Microsoft. Se o fai, asegúrese de ter un "
+"ficheiro  /etc/samba/smbpasswd válido e de estabelecer nel os contrasinais "
+"de cada usuario coa orde smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Servidor Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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?"
+"Crear a base de datos de contrasinais de samba, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -163,54 +179,54 @@
 "automatically, but the passwords must be added manually by running smbpasswd "
 "and be kept up-to-date in the future."
 msgstr ""
-"Para que sexa compatible coa configuración por defecto da maioría das "
+"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 armacenar os contrasinais dos usuarios nun "
+"cifrados. Para facelo, hai que almacenar os contrasinais dos usuarios nun "
 "ficheiro separado de /etc/passwd. Este ficheiro pódese crear "
-"automaticamente, pero os contrasinais hai que engadilos á man empregando "
+"automaticamente, mais os contrasinais hai que engadilos á man empregando "
 "smbpasswd e hai que mantelo actualizado no futuro."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 probablemente tamén as "
-"máquinas cliente) para que empreguen contrasinais en texto normal."
+"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:1001
+#: ../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 ter máis detalles."
+"Guide/pwencrypt.html do paquete samba-doc para obter máis detalles."
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "servizos"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
-msgstr "¿Como quere executar Samba?"
+msgstr "Como quere executar Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/gu.po
===================================================================
--- branches/samba/experimental/debian/po/gu.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/gu.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba_gu\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -24,15 +24,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "DHCP માંથી WINS ગોઠવણીઓ ઉપયોગ કરવા માટે smb.conf બદલશો?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -47,20 +53,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "આ લાક્ષણિકતાનો લાભ લેવા માટે dhcp3-ક્લાયન્ટ પેકેજ સ્થાપિત કરેલ હોવું જ જોઇએ."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf આપમેળે રુપરેખાંકિત કરશો?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -77,7 +83,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -88,13 +94,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "વર્કગ્રુપ/ડોમેઇન નામ:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -112,13 +118,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "પાસવર્ડ એન્ક્રિપ્શન વાપરશો?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -135,7 +141,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -151,15 +157,21 @@
 "પાસે યોગ્ય /etc/samba/smbpasswd ફાઇલ હોય અને દરેક વપરાશકર્તા માટે તમે smbpasswd "
 "ઉપયોગ કરીને પાસવર્ડ ગોઠવેલો છે."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "સામ્બા પાસવર્ડ ડેટાબેઝ, /var/lib/samba/passdb.tdb બનાવશો?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -174,7 +186,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -184,7 +196,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -194,25 +206,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "ડેમોન્સ"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "તમે સામ્બા કઇ રીતે ઉપયોગ કરશો?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/he.po
===================================================================
--- branches/samba/experimental/debian/po/he.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/he.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -9,26 +9,32 @@
 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: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2010-10-26 18:04+0200\n"
-"Last-Translator: Omer Zak <w1 at zak.co.il>\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "שרת סמבה ושירותים"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
-msgstr "האם לשנות את הקובץ smb.conf כדי שישתמש באופציית WINS מתוך DHCP?"
+msgstr "האם לשנות את הקובץ smb.conf כדי שישתמש בהגדרות WINS מתוך DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -36,27 +42,27 @@
 "to your smb.conf file so that DHCP-provided WINS settings will automatically "
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
-"במידה ומחשב זה מקבל כתובת IP משרת DHCP ברשת, ייתכן כי שרת ה-DHCP גם מספק "
-"מידע על שרתי WINS  (שרתי מיפוי כתובות NetBIOS) הזמינים ברשת. שימוש במידע זה "
-"מצריך שינוי בקובץ smb.conf כדי שכתובת שרת ה-WINS שמספק שרת ה-DHCP, תיקרא "
+"במידה שמחשב זה מקבל כתובת IP משרת DHCP ברשת, ייתכן כי שרת ה-DHCP גם מספק "
+"מידע על שרתי WINS  (\"שרתי מיפוי כתובות NetBIOS\") הזמינים ברשת. שימוש במידע "
+"זה מצריך שינוי בקובץ smb.conf כדי שכתובת שרת ה-WINS שמספק שרת ה-DHCP, תיקרא "
 "בצורה אוטומטית מהקובץ /etc/samba/dhcp.conf."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "על החבילה dhcp3-client להיות מותקנת כדי לאפשר מאפיין זה."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "האם להגדיר את smb.conf בצורה אוטומטית?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -65,16 +71,16 @@
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
-"שאר תהליך ההגדרה של Samba עוסק בשאלות אשר משפיעות על פרמטרים בקובץ /etc/"
-"samba/smb.conf. קובץ זה הוא קובץ ההגדרות הראשי אשר מכיל את הפרמטרים של שרתי "
-"הרקע של Samba (שהם smbd ו-nmbd). הקובץ smb.conf הנוכחי שלך כולל שורת "
-"'include' או פרמטר אשר מתפרש על כמה שורות. פרמטרים אלו עשויים לבלבל את תהליך "
-"ההגדרה האוטומטי, ויצריכו עריכה ידנית של הקובץ smb.conf על מנת לתקן את הבעיות "
-"ולאפשר ל-Samba לעבוד."
+"שאר תהליך ההגדרה של סמבה עוסק בשאלות אשר משפיעות על פרמטרים בקובץ /etc/samba/"
+"smb.conf. קובץ זה הוא קובץ ההגדרות הראשי אשר מכיל את הפרמטרים של שרתי הרקע "
+"של סמבה (שהם smbd ו-nmbd). הקובץ smb.conf הנוכחי שלך כולל שורת 'include' או "
+"פרמטר אשר מתפרש על כמה שורות. פרמטרים אלו עשויים לבלבל את תהליך ההגדרה "
+"האוטומטי, ויצריכו עריכה ידנית של הקובץ smb.conf על מנת לתקן את הבעיות ולאפשר "
+"לסמבה לעבוד."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -85,13 +91,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "שם קבוצת העבודה/מתחם (Workgroup/Domain):"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -105,13 +111,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
-msgstr "האם להשתמש בסיסמאות מוצפנות?"
+msgstr "האם להשתמש בססמאות מוצפנות?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -123,7 +129,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -135,17 +141,23 @@
 "קיים הקובץ /etc/samba/smbpasswd, וכי הוא תקין. בנוסף, יש לדאוג שהקובץ יכיל "
 "סיסמה בעבור כל משתמש בעזרת שימוש בפקודה smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "שרת סמבה"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
-"האם לצור מסד נתונים של סיסמאות עבור שרת ה-Samba, בקובץ /var/lib/samba/passdb."
+"האם ליצור מסד נתונים של ססמאות עבור שרת הסמבה, בקובץ /var/lib/samba/passdb."
 "tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -160,17 +172,17 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -180,28 +192,28 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "תהליכי רקע"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
-msgstr "כיצד תרצה להריץ את Samba?"
+msgstr "כיצד תרצה להריץ את סמבה?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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 שנקרא smbd יכול לרוץ כתהליך רקע רגיל או דרך inetd. ריצה "
+"תהליך הרקע של סמבה שנקרא smbd יכול לרוץ כתהליך רקע רגיל או דרך inetd. ריצה "
 "כתהליך רקע רגיל היא השיטה המומלצת."

Modified: branches/samba/experimental/debian/po/hu.po
===================================================================
--- branches/samba/experimental/debian/po/hu.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/hu.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -18,9 +18,15 @@
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Módosítod az smb.conf-ot, hogy a WINS beállításokat a DHCP-n keresztül érje "
@@ -28,7 +34,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -43,7 +49,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -51,13 +57,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Az smb.conf-ot automatikusan állítod be?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -75,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -86,13 +92,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Munkacsoport/Tartomány neve:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -110,13 +116,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Használsz kódolt jelszavakat?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -133,7 +139,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -149,15 +155,21 @@
 "hogy érvényes /etc/samba/smbpasswd fájllal rendelkezel és hogy beállítottad "
 "a jelszavakat minden felhasználóhoz a smbpasswd paranccsal."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -173,7 +185,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -183,7 +195,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -193,25 +205,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "démonok"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Hogyan induljon a Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/id.po
===================================================================
--- branches/samba/experimental/debian/po/id.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/id.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: samba_po-id\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+0200\n"
 "PO-Revision-Date: 2008-03-08 18:24+0700\n"
 "Last-Translator: Arief S Fitrianto <arief at gurame.fisika.ui.ac.id>\n"
 "Language-Team: Bahasa Indonesia <debian-l10n-id at gurame.fisika.ui.ac.id>\n"
@@ -18,15 +18,21 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplural=1, plural>1\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ubah smb.conf agar menggunakan setelan WINS dari DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -42,20 +48,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Paket dhcp3-client harus dipasang agar fitur ini dapat digunakan."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Konfigurasikan smb.conf secara otomatis?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -73,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -85,13 +91,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Nama Domain/Workgrop:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -109,13 +115,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Gunakan enkripsi sandi?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -132,7 +138,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -148,15 +154,21 @@
 "memiliki berkas /etc/samba/smbpasswd tempat Anda menyimpan semua sandi "
 "pengguna menggunakan perintah smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -172,7 +184,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -182,7 +194,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -192,25 +204,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "server"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Bagaimana Anda ingin menjalankan Samba"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/it.po
===================================================================
--- branches/samba/experimental/debian/po/it.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/it.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,14 +1,13 @@
 # Italian (it) translation of debconf templates for samba
-# Copyright (C) 2004 Software in the Public Interest
 # This file is distributed under the same license as the samba package.
-# Luca Monducci <luca.mo at tiscali.it>, 2004-2009.
+# Luca Monducci <luca.mo at tiscali.it>, 2004-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: samba 3.3.4 italian debconf templates\n"
+"Project-Id-Version: samba 3.5.8 italian debconf templates\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2009-05-18 21:47+0200\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: it\n"
@@ -16,15 +15,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Server e utilità Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modificare smb.conf per usare le impostazioni WINS da DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -32,15 +37,15 @@
 "to your smb.conf file so that DHCP-provided WINS settings will automatically "
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
-"Se il computer prende le informazioni sull'indirizzo IP da un server DHCP "
-"allora il server DHCP può fornire anche informazioni sui server WINS (i name "
-"server per NetBIOS) presenti nella rete. Ciò richiede una modifica al file "
-"smb.conf in modo che le impostazioni WINS, fornite da DHCP, siano lette "
-"automaticamente da /etc/samba/dhcp.conf."
+"Se il computer acquisisce l'indirizzo IP da un server DHCP, tale server DHCP "
+"potrebbe fornire anche le informazioni sui server WINS (i name server per "
+"NetBIOS) presenti nella rete. È necessario modificare il file smb.conf per "
+"far leggere automaticamente da /etc/samba/dhcp.conf le impostazioni WINS "
+"fornite da DHCP."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -49,13 +54,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurare automaticamente smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -68,12 +73,12 @@
 "smb.conf, il file usato per configurare i programmi di Samba (nmbd e smbd). "
 "L'attuale file smb.conf contiene una riga «include» o un'opzione che si "
 "estende su più righe; ciò potrebbe confondere il processo di configurazione "
-"automatica e richiede una modifica manuale a smb.conf per renderlo "
+"automatica e richiere una modifica manuale del file smb.conf per renderlo "
 "nuovamente funzionante."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -85,13 +90,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome del Workgroup/Dominio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -105,13 +110,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Usare password cifrate?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -123,7 +128,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -136,15 +141,21 @@
 "le password di tutti gli utenti siano state inserite usando il comando "
 "smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Server Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -161,7 +172,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -171,7 +182,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -181,25 +192,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "demoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Come avviare Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ja.po
===================================================================
--- branches/samba/experimental/debian/po/ja.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ja.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2010-10-25 22:28+0900\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: ja\n"
@@ -24,15 +24,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Samba サーバおよびユーティリティ"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "DHCP から WINS 設定を使うよう smb.conf を変更しますか?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -48,7 +54,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -57,13 +63,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "自動的に smb.conf を設定しますか?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -80,7 +86,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -91,13 +97,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "ワークグループ/ドメイン名:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -111,13 +117,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "パスワードの暗号化を使いますか?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -129,7 +135,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -141,15 +147,21 @@
 "な /etc/samba/smbpasswd ファイルがあることを確認し、各ユーザのパスワードは "
 "smbpasswd コマンドを使って設定してください。"
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Samba サーバ"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -165,7 +177,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -175,7 +187,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -185,25 +197,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "デーモン"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "どのように Samba を実行したいですか?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ka.po
===================================================================
--- branches/samba/experimental/debian/po/ka.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ka.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -16,15 +16,21 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "გსურთ smb.conf-ის შეცვლა WINS პარამეტრების DHCP-დან გამოსაყენებლად?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -40,7 +46,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -48,13 +54,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "გსურთ smb.conf-ის ავტომატური კონფიგურაცი?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -72,7 +78,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -83,13 +89,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "სამუშაო ჯგუფის/დომენის სახელი:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -107,13 +113,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "გსურთ პაროლის დაშიფვრის გმაოყენება?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -130,7 +136,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -146,15 +152,21 @@
 "რომ გაგაჩნიათ გამართული /etc/samba/smbpasswd ფაილი და რომ იქ ყოველ "
 "მომხმარებელზე პაროლი გქონდეთ დაყენებული smbpasswd ბრძანებით."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -170,7 +182,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -180,7 +192,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -190,25 +202,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "დემონები"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "როგორ გსურთ Samba-ს გაშვება?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/km.po
===================================================================
--- branches/samba/experimental/debian/po/km.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/km.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: samba_po_km\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -27,11 +27,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #  Type: boolean
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "កែប្រែ smb.conf ដើម្បី​ប្រើ​ការកំណត់​របស់ WINS ពី DHCP ?"
 
@@ -39,7 +45,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -56,7 +62,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "កញ្ចប់​ម៉ាស៊ីន​ភ្ញៀវ dhcp3 ត្រូវ​តែ​បាន​ដំឡើង​ដើម្បី​ទទួល​បាន​ផលប្រយោជន៍របស់​លក្ខណៈ​ពិសេស​នេះ ។"
@@ -65,7 +71,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "កំណត់​រចនាសម្ព័ន្ធ smb.conf ដោយ​ស្វ័យ​ប្រវត្តិ ?"
 
@@ -73,7 +79,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -92,7 +98,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -105,7 +111,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "ឈ្មោះ​ក្រុមការងារ/ដែន ៖"
 
@@ -113,7 +119,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -132,7 +138,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "ប្រើ​ការ​អ៊ិនគ្រីប​ពាក្យ​សម្ងាត់ ?"
 
@@ -140,7 +146,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -159,7 +165,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -175,11 +181,17 @@
 "ឯកសារ /etc/samba/smbpasswd ត្រឹមត្រូវ ហើយ​អ្នក​បាន​កំណត់​ពាក្យ​សម្ងាត់​ ដូច្នេះ​សម្រាប់​អ្នក​ប្រើ​"
 "ម្នាក់ៗ អាច​ប្រើ​ពាក្យ​បញ្ជា smbpasswd ។"
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #  Type: boolean
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "បង្កើត​មូលដ្ឋាន​ទិន្នន័យពាក្យសម្ងាត់ samba /var/lib/samba/passdb.tdb ?"
 
@@ -187,7 +199,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -204,7 +216,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -216,7 +228,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -226,19 +238,19 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "ដេមិន "
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "តើ​អ្នក​ចង់​រត់ Samba តាម​វិធី​ណា ?"
 
@@ -246,7 +258,7 @@
 #  Description
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ko.po
===================================================================
--- branches/samba/experimental/debian/po/ko.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ko.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -14,15 +14,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "smb.conf을 수정하여 DHCP의 WINS 설정을 사용하도록 할까요?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -38,20 +44,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "이 기능을 사용하기 위해서는 dhcp3-client 꾸러미를 설치해야 합니다."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf을 자동으로 설정할까요?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -68,7 +74,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -79,13 +85,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "작업그룹/도메인 이름:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -103,13 +109,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "비밀번호 암호화 기능을 사용할까요?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -126,7 +132,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -142,15 +148,21 @@
 "smbpasswd 파일이 제대로이고 smbpasswd 명령을 사용하여 각 사용자들의 비밀번호"
 "를 전부 담고 있는지 확인하십시오."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -166,7 +178,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -176,7 +188,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -186,25 +198,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "데몬"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Samba를 어떻게 실행하시겠습니까?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ku.po
===================================================================
--- branches/samba/experimental/debian/po/ku.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ku.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: samba_ku\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -18,16 +18,22 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Bila smb.conf were guherandin da ku mîhengên WINS ji DHCP werin bikaranîn?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -43,20 +49,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Ji bo bikaranîna vê fonksiyonê divê pakêta dhcp3-client were sazkirin."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Bila smb.conf were jixweber mîhengkirin?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -73,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -84,13 +90,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Navê Koma Xebatê/Domain:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -104,13 +110,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Bila kilîla şîfreyê bê bikaranîn?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -122,7 +128,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -133,15 +139,21 @@
 "nayên parastin ya di berhemên Microsoft Windowsê de, bi tundî tê "
 "pêşniyarkirin."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -157,7 +169,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -167,7 +179,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -177,25 +189,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "daemon"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Dixwazî Samba çawa bixebitînî?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/lt.po
===================================================================
--- branches/samba/experimental/debian/po/lt.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/lt.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba-lt\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -27,15 +27,21 @@
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Pakeisti smb.conf, kad būtų naudojami WINS nustatymai iš DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -50,7 +56,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -59,13 +65,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Automatiškai konfigūruoti smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -83,7 +89,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -95,13 +101,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "GrupÄ— (workgroup) / domeno vardas:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -118,13 +124,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Naudoti slaptažodžių šifravimą?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -141,7 +147,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -158,15 +164,21 @@
 "rinkmeną ir kad ten nurodyti visų naudotojų, naudojančių smbpasswd, "
 "slaptažodžiai."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -182,7 +194,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -192,7 +204,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -202,25 +214,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "tarnybos"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Kokiu būdu norite leisti Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ml.po
===================================================================
--- branches/samba/experimental/debian/po/ml.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ml.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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."
@@ -27,15 +27,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "DHCP യില്‍ നിന്നുള്ള WINS സെറ്റിങ്ങുകള്‍ ഉപയോഗിക്കാന്‍ smb.conf മാറ്റണോ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -51,20 +57,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "ഈ കഴിവുപയോഗിക്കാന്‍ dhcp3-client പാക്കേജ് ഇന്‍സ്റ്റാള്‍‍ ചെയ്തിരിക്കേണ്ടതുണ്ട്."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf സ്വയമേ ക്രമീകരിക്കണോ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -82,7 +88,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -94,13 +100,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "വര്‍ക്ക്ഗ്രൂപ്പ്/ഡൊമൈന്‍ നാമം:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -118,13 +124,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "അടയാളവാക്ക് എന്‍ക്രിപ്ഷന്‍ ഉപയോഗിക്കണോ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -142,7 +148,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -159,15 +165,21 @@
 "smbpasswd എന്ന ആജ്ഞ ഉപയോഗിച്ച് ഓരോ ഉപയോക്താക്കള്‍ക്കും അവിടെ അടയാള വാക്ക് സെറ്റ് ചെയ്തു എന്ന് "
 "ഉറപ്പാക്കുകയും ചെയ്യുക."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "സാംബ അടയാള വാക്കുകളുടെ ഡാറ്റാബേസായ /var/lib/samba/passdb.tdb സൃഷ്ടിയ്ക്കട്ടേ?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -183,7 +195,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -193,7 +205,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -203,25 +215,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "ഡെമണുകള്‍"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "സാംബ എങ്ങനെ പ്രവര്‍ത്തിപ്പിക്കാനാണ് നിങ്ങളാഗ്രഹിക്കുന്നത്?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/mr.po
===================================================================
--- branches/samba/experimental/debian/po/mr.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/mr.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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 "
@@ -25,9 +25,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "डीएचसीपी(डायनमिक होस्ट कानफिगुरेशन प्रोटोकॉल) मधील डब्ल्युआयएनएस(विन्स) निर्धारणांचा "
@@ -35,7 +41,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -51,7 +57,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -59,13 +65,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "एसएमबी।सीओएनएफ smb.conf आपोआप संरचित करायचे का? "
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -83,7 +89,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -94,13 +100,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "कार्यगट/प्रक्षेत्राचे नाव:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -118,13 +124,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "कूटलिखित परवलीचा शब्द वापरावा का?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -141,7 +147,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -157,9 +163,15 @@
 "(/etc/samba/smbpasswd)ईटीसी/सांबा/एसएमबी पासवर्ड संचिका आहे, तसेच ,एसएमबी पासवर्ड "
 "आज्ञावली वापरुन, प्रत्येक उपयोजकासाठी परवलीचे शब्द निर्धारित केल्याची खात्री करा."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
 "var/lib/samba/passdb.tdb /व्हीएआर /एलआयबी/सांबा /एसएमबी पासडीबी.टीडीबी? या "
@@ -167,7 +179,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -182,7 +194,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -192,7 +204,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -203,25 +215,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "डिमन्स"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "आयएनइटीडी"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "तुम्हाला सांबा कशा प्रकारे चालू करावयाचा आहे?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/nb.po
===================================================================
--- branches/samba/experimental/debian/po/nb.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/nb.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -11,29 +11,37 @@
 #    Developers do not need to manually edit POT or PO files.
 #
 # Bjørn Steensrud <bjornst at powertech.no>, 2006.
+# Bjørn Steensrud <bjornst at skogkatt.homelinux.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_debian_po_nb\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-12 21:44+0100\n"
-"Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
-"Language: \n"
+"Language: Norsk Bokmål \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Samba-tjener og verktøy"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Skal smb.conf endres til å bruke WINS-innstillinger fra DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -49,20 +57,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "For å utnytte denne muligheten må pakka dhcp3-client være installert."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Sette opp smb.conf automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -80,7 +88,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -91,78 +99,71 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Arbeidsgruppe/domenenavn:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
+#: ../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 ""
-"Oppgi hvilken arbeidsgruppe denne tjeneren skal vise når klienter spør den. "
-"Merk at denne parameteren også styrer domenenavnet som brukes med "
-"innstillingen security=domain."
+"Oppgi arbeidsgruppen for dette systemet. Denne innstillingen styrer hvilken "
+"arbeidsgruppe systemet blir vist i når det brukes som en tjener, standard "
+"arbeidsgruppe som skal brukes når diverse forgrunnsmotorer brukes til å bla "
+"med, og  domenenavnet som brukes med innstillingen «security=domain»."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Bruke passord-kryptering?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
+#: ../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 ""
 "Alle nyere Windows-klienter bruker krypterte passord når de kommuniserer med "
-"SMB-tjenere. Hvis du vil bruke passord i klartekst må du endre en parameter "
-"i Windows registry på klientene."
+"SMB/CIFS-tjenere. Hvis du vil bruke passord i klartekst må du endre en "
+"parameter i Windows registry på klientene."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, 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."
+#: ../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 ""
-"Det anbefales sterkt å bruke krypterte passord. Gjør du det, så se etter at "
-"du har en gyldig fil i /etc/samba/smbpasswd og at du lagrer passord der for "
-"hver bruker med kommandoen smbpasswd."
+"Det anbefales sterkt å slå på dette for å bruke krypterte passord fordi "
+"passord i klartekst ikke støttes lenger i Microsoft Windows-produkter. Gjør "
+"du det, så se etter at du har en gyldig fil i /etc/samba/smbpasswd og at du "
+"lagrer passord der for hver bruker med kommandoen smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Ingen Samba-tjener er installert på dette systemet"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -178,7 +179,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -188,7 +189,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -199,25 +200,25 @@
 #  Using same translation as in debian.edu/Skolelinux. A bit controversial.
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "nisser"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Hvordan vil du at Samba skal kjøres?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ne.po
===================================================================
--- branches/samba/experimental/debian/po/ne.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ne.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: ne\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -28,15 +28,21 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; nplural(n!=1)\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "DHCP बाट WINS सेटिङ प्रयोग गर्न smb.conf परिमार्जन गर्नुहोस्?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -52,20 +58,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "यो विशेषताको फाइदा लिन dhcp3-क्लाइन्ट प्याकेज स्थापना गरिएको हुन पर्छ ।"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "स्वचालित रुपमा smb.conf कन्फिगर गर्नुहुन्छ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -82,7 +88,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -93,13 +99,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "कार्य समूह/डोमेन नाम:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -116,13 +122,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "पासवर्ड गुप्तिकरण प्रयोग गर्नुहुन्छ ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -139,7 +145,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -155,15 +161,21 @@
 "samba/smbpasswd फाइल र त्यहाँ प्रत्येक प्रयोगकर्ताका लागि सेट गरिएका पासवर्ड "
 "smbpasswd आदेश प्रयोग गरेर वैद्य भएको निश्चिन्त हुनुहोस् ।"
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr "साम्बा पासवर्ड डाटाबेस /var/lib/samba/passdb.tdb सिर्जना गर्नुहुन्छ ?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -178,7 +190,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -188,7 +200,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -198,25 +210,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "डेइमोन"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "तपाईँ साम्बा कसरी चलाउन चाहनुहुन्छ?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/nl.po
===================================================================
--- branches/samba/experimental/debian/po/nl.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/nl.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,39 +1,37 @@
+# Dutch samba po-debconf translation,
+# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the samba package.
+# Vincent Zweije <zweije at xs4all.nl>, 2011.
 #
-#    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.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: samba\n"
+"Project-Id-Version: samba 3.5.8~dfsg-1\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2010-11-02 17:48+0100\n"
-"Last-Translator: Remco Rijnders <remco at webconquest.com>\n"
-"Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Dutch\n"
 
-#. Type: boolean
+#. Type: title
 #. Description
 #: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Samba-server en hulpprogramma's"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "smb.conf aanpassen om de WINS instellingen van DHCP te gebruiken?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -41,7 +39,7 @@
 "to your smb.conf file so that DHCP-provided WINS settings will automatically "
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
-"Indien uw computer zijn ip-adresinformatie van een DHCP-server op het "
+"Indien uw computer zijn IP-adresinformatie van een DHCP-server op het "
 "netwerk haalt, voorziet deze mogelijk ook informatie betreffende de op het "
 "netwerk aanwezige WINS-servers (\"NetBIOS naamservers\"). Dit vereist een "
 "verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS "
@@ -49,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -58,13 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf automatisch instellen?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -74,33 +72,33 @@
 "hand to get it working again."
 msgstr ""
 "De resterende Samba-configuratievragen hebben betrekking op parameters in /"
-"etc/samba/smb.conf, het configuratiebestand dat gebruikt wordt voor de Samba "
-"programma's (nmbd en smbd). Uw huidige smb.conf bevat een 'include'-regel of "
-"een optie die meerdere regels beslaat; Het kan zijn dat dit het automatische "
-"configuratieproces verstoort. In dat geval dient u uw smb.conf handmatig aan "
-"te passen om samba terug werkend te krijgen."
+"etc/samba/smb.conf, het configuratiebestand dat gebruikt wordt voor de Samba-"
+"programma's (nmbd en smbd). Uw huidige smb.conf bevat een \"include\"-regel "
+"of een optie die meerdere regels beslaat; het kan zijn dat dit het "
+"automatische configuratieproces verstoort. In dat geval dient u uw smb.conf "
+"handmatig aan te passen om samba terug werkend te krijgen."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 ""
-"Indien u geen gebruik maakt van deze optie, dient u alle configuratie "
+"Indien u geen gebruik maakt van deze optie, dient u alle configuratie-"
 "instellingen zelf te doen, en zult u geen voordeel halen uit de periodieke "
 "configuratie-verbeteringen."
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Werkgroep/Domeinnaam:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -110,31 +108,30 @@
 "Tot welke werkgroep behoort dit systeem? Deze instelling bepaalt ook de "
 "werkgroep waarin dit systeem zal verschijnen wanneer het als server wordt "
 "gebruikt, de standaard werkgroep die gebruikt wordt bij het verkennen met de "
-"diverse interfaces, en de domeinnaam die wordt gebruikt voor de "
-"\"security=domain\" instelling."
+"diverse interfaces, en de domeinnaam die wordt gebruikt voor de instelling "
+"\"security=domain\"."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Wachtwoordversleuteling gebruiken?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 ""
-"Alle recente windows-clients maken gebruik van versleutelde wachtwoorden bij "
-"de communicatie met SMB/CIFS-servers. Als u 'onversleutelde tekst'-"
-"wachtwoorden wilt gebruiken dient u een parameter te veranderen in het "
-"Windows register."
+"Alle recente Windows-clients maken gebruik van versleutelde wachtwoorden bij "
+"de communicatie met SMB/CIFS-servers. Als u onversleutelde wachtwoorden wilt "
+"gebruiken dient u een parameter te veranderen in het Windows-register."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -142,20 +139,26 @@
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
 "Het activeren van deze optie is ten sterkste aangeraden aangezien er geen "
-"ondersteuning meer is voor platte tekst wachtwoorden in Microsoft Windows "
-"producten. Indien u hiervoor kiest dient u er wel voor te zorgen dat u een "
-"geldig '/etc/samba/smbpasswd'- bestand heeft en dat u de wachtwoorden daar "
-"voor elke gebruiker met behulp van het commando 'smbpasswd' instelt."
+"ondersteuning meer is voor onversleutelde wachtwoorden in Microsoft Windows-"
+"producten. Indien u hiervoor kiest dient u er voor te zorgen dat u een "
+"geldig \"/etc/samba/smbpasswd\"-bestand heeft en dat u de wachtwoorden daar "
+"voor elke gebruiker met behulp van het commando \"smbpasswd\" instelt."
 
-#. Type: boolean
+#. Type: title
 #. Description
 #: ../samba.templates:1001
+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:1001
+#: ../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 "
@@ -168,87 +171,53 @@
 "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'."
+"toekomst bij te houden) via het commando \"smbpasswd\"."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 tekst'-wachtwoorden te gebruiken."
+"onversleutelde wachtwoorden te gebruiken."
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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'."
+"Developers-Guide/pwencrypt.html uit het pakket \"samba-doc\"."
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "achtergronddiensten"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Hoe wilt u Samba draaien?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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 ""
 "De Samba-achtergronddienst smbd kan als een normale achtergronddienst of via "
 "inetd draaien. Als een achtergronddienst is de aangeraden aanpak."
-
-#~ msgid "Chaining passdb backends is not supported"
-#~ msgstr "Aaneenschakelen van passdb-backends wordt niet ondersteund"
-
-#~ msgid ""
-#~ "Beginning with version 3.0.23, samba no longer supports chaining multiple "
-#~ "backends in the \"passdb backend\" parameter.  It appears that your smb."
-#~ "conf file contains a passdb backend parameter consisting of a list of "
-#~ "backends.  The new version of samba will not work until you correct this."
-#~ msgstr ""
-#~ "Startend vanaf versie 3.0.23 ondersteund samba niet langer het "
-#~ "aaneenschakelen van meerdere backends voor de 'passdb backend'-parameter. "
-#~ "Het lijkt erop dat uw 'smb.conf'-bestand een 'passdb backend'-parameter "
-#~ "bevat die bestaat uit een lijst van backends. De nieuwe samba-versie zal "
-#~ "pas juist werken eens u dit gecorrigeerd heeft."
-
-#~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
-#~ msgstr "/etc/samba/smbpasswd verplaatsen naar /var/lib/samba/passdb.tdb?"
-
-#~ msgid ""
-#~ "Samba 3.0 introduced a more complete SAM database interface which "
-#~ "supersedes the /etc/samba/smbpasswd file."
-#~ msgstr ""
-#~ "Samba 3.0 introduceerde een meer complete SAM-database-interface die het /"
-#~ "etc/samba/smbpasswd bestand vervangt."
-
-#~ msgid ""
-#~ "Please confirm whether you would like the existing smbpasswd file to be "
-#~ "automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
-#~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
-#~ msgstr ""
-#~ "Bent u zeker dat u het bestaande 'smbpasswd'-bestand naar /var/lib/samba/"
-#~ "passdb.tdb wilt migreren? Als u een ander pdb-backend gebruikt (bv. LDAP) "
-#~ "dient u hier te weigeren."

Modified: branches/samba/experimental/debian/po/nn.po
===================================================================
--- branches/samba/experimental/debian/po/nn.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/nn.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: samba_nn\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -18,15 +18,21 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Vil du endre smd.conf til å bruke WINS-innstillingar frå DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -42,20 +48,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Pakka dhcp3-client må vere installert for å ta i bruk dette."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Setje opp smb.conf automatisk?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -73,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -85,13 +91,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Arbeidsgruppe/Domenenamn:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -109,13 +115,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Bruke krypterte passord?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -132,7 +138,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -148,15 +154,21 @@
 "etter at du har ei gyldig /etc/samba/smbpasswd-fil, og du set inn passord "
 "der for kvar brukar ved hjelp av kommandoen «smbpasswd»."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -172,7 +184,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -182,7 +194,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -192,25 +204,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "tenester"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Korleis vil du køyre Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/pl.po
===================================================================
--- branches/samba/experimental/debian/po/pl.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/pl.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -7,7 +7,7 @@
 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: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+0200\n"
 "PO-Revision-Date: 2008-09-12 10:08+0200\n"
 "Last-Translator: Tomasz Majbaum <genobis at genobis.pl>\n"
 "Language-Team: polski <debian-l10n-pl at lists.debian.org>\n"
@@ -17,15 +17,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Czy zmienić smb.conf tak, by używał ustawień WINS z DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -41,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -50,13 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Czy automatycznie skonfigurować smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -74,7 +80,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -86,13 +92,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Nazwa Grupy Roboczej/Domeny:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -110,13 +116,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Czy używać szyfrowania haseł?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -134,7 +140,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -150,15 +156,21 @@
 "że masz poprawny plik /etc/samba/smbpasswd i że ustawisz w nim hasła dla "
 "każdego użytkownika korzystającego z polecenia smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -174,7 +186,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -185,7 +197,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -195,25 +207,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "demon"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "W jaki sposób chcesz uruchamiać Sambę?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/pt.po
===================================================================
--- branches/samba/experimental/debian/po/pt.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/pt.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,30 +1,38 @@
 # translation of pt.po to Portuguese
 # translation of samba Debian debconf template to Portuguese
-# Miguel Figueiredo <elmig at debianpt.org>, 2004, 2007, 2010
 #
+# Miguel Figueiredo <elmig at debianpt.org>, 2004, 2007, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2010-03-30 21:36+0100\n"
-"Last-Translator: Miguel Figueiredo <elmig at debian.org>\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Servidor e utilitários Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Modificar o smb.conf para utilizar definições de WINS a partir de DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -41,7 +49,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -50,13 +58,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurar automaticamente o smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -74,7 +82,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -86,13 +94,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Nome do Grupo de trabalho/Domínio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -107,13 +115,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Utilizar encriptação de palavras-passe?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -125,7 +133,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -138,16 +146,22 @@
 "válido e que define as palavras-passe para cada utilizador utilizando o "
 "comando smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Servidor Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -164,7 +178,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -174,7 +188,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -184,25 +198,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Como deseja correr o Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/pt_BR.po
===================================================================
--- branches/samba/experimental/debian/po/pt_BR.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/pt_BR.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -2,14 +2,14 @@
 # Copyright (C) 2010 THE samba'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the samba package.
 # André Luís Lopes <andrelop at debian.org>, 2007.
-# Adriano Rafael Gomes <adrianorg at gmail.com>, 2010.
+# Adriano Rafael Gomes <adrianorg at gmail.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2010-12-11 21:52-0200\n"
+"POT-Creation-Date: 2011-05-12 10:46+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."
 "org>\n"
@@ -17,17 +17,22 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"pt_BR utf-8\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Servidor Samba e utilitários"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -43,7 +48,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -52,13 +57,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Configurar smb.conf automaticamente?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -76,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -88,13 +93,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Grupo de Trabalho/Nome de Domínio:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -109,13 +114,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Usar senhas criptografadas?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -127,7 +132,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -140,15 +145,21 @@
 "você tenha definido senhas no mesmo para cada usuário usando o comando "
 "smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Servidor Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -165,7 +176,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -175,7 +186,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -185,25 +196,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Como você deseja que o Samba seja executado?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ro.po
===================================================================
--- branches/samba/experimental/debian/po/ro.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ro.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba/debian/po/ro.po\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -27,16 +27,22 @@
 "Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Se modifică smb.conf pentru a folosi configurațiile WINS din DHCP?"
 
 # RO: prefer să nu folosesc termeni de genul „calculatorul dvs.”; de multe ori nu e cazul și sună mai puțin profesional.
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -52,7 +58,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -61,13 +67,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Se configurează smb.conf automat?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -86,7 +92,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -98,13 +104,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Grupul de lucru/Numele de domeniu:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -122,13 +128,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Se folosesc parole criptate? "
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -145,7 +151,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -161,15 +167,21 @@
 "asigurați-vă că fișierul /etc/samba/smbpasswd este valid și că aveți "
 "configurată o parolă pentru fiecare utilizator (folosind comanda smbpasswd)."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -185,7 +197,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -195,7 +207,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -205,25 +217,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "demoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Cum doriți să rulați Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ru.po
===================================================================
--- branches/samba/experimental/debian/po/ru.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ru.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,33 +1,39 @@
 # translation of ru.po to Russian
+# Translation of samba_3.0.23c-1.po to Russian
 # Yuriy Talakan' <yt at amur.elektra.ru>, 2005, 2006.
 # Pavel Maryanov <acid_jack at ukr.net>, 2006, 2007.
-# Yuri Kozlov <yuray at komyakino.ru>, 2009.
-# Translation of samba_3.0.23c-1.po to Russian
+# Yuri Kozlov <yuray at komyakino.ru>, 2009, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: samba 2:3.3.5-1\n"
+"Project-Id-Version: samba 2:3.5.8~dfsg-2\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2009-06-27 13:27+0400\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Сервер Samba и утилиты"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Изменить smb.conf для использования настроек WINS из DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -37,13 +43,13 @@
 msgstr ""
 "Если компьютер получает информацию о своём IP-адресе от службы DHCP по сети, "
 "тогда DHCP-сервер также может предоставлять информацию о серверах WINS "
-"(\"серверы имён NetBIOS\"), доступных в сети. Чтобы настройки WINS, "
+"(«серверы имён NetBIOS»), доступных в сети. Чтобы настройки WINS, "
 "предоставленные сервером DHCP, автоматически считывались из /etc/samba/dhcp."
 "conf, нужно изменить файл smb.conf."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -51,13 +57,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Настроить smb.conf автоматически?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -68,14 +74,14 @@
 msgstr ""
 "Оставшаяся часть настройки Samba представляет собой вопросы, влияющие на "
 "параметры в /etc/samba/smb.conf. Этот файл используется для настройки "
-"программ Samba (nmbd и smbd). В текущем файле smb.conf есть строка 'include' "
+"программ Samba (nmbd и smbd). В текущем файле smb.conf есть строка «include» "
 "или параметр, состоящий из нескольких строк. При этом автоматическая "
 "настройка может быть нарушена, и для восстановления работоспособности "
 "потребуется отредактировать smb.conf вручную."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -87,13 +93,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Рабочая группа/домен:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -104,17 +110,17 @@
 "которой будет появляться данный компьютер, если он используется как сервер, "
 "в качестве рабочей группы по умолчанию при просмотре сети из различных "
 "клиентских программ, а также в качестве имени домена при использовании "
-"параметра \"security=domain\"."
+"параметра «security=domain»."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Использовать шифрование паролей?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -127,7 +133,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -139,15 +145,21 @@
 "правильности файла /etc/samba/smbpasswd и в том, что для всех пользователей "
 "в нём установлены пароли с помощью команды smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Сервер Samba"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Создать базу данных паролей Samba - /var/lib/samba/passdb.tdb?"
+msgstr "Создать базу данных паролей Samba — /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -164,7 +176,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -174,7 +186,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -184,28 +196,29 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
-msgstr "daemons"
+msgstr "как самостоятельный процесс"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
-msgstr "inetd"
+msgstr "из inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Как нужно запускать Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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-демон smbd может запускаться как обычный демон или из inetd. "
-"Рекомендуется использовать запуск в виде демона."
+"Служба Samba smbd может постоянно работать как самостоятельный процесс или "
+"запускаться из inetd. Рекомендуется использовать запуск в виде "
+"самостоятельного процесса."

Modified: branches/samba/experimental/debian/po/sk.po
===================================================================
--- branches/samba/experimental/debian/po/sk.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/sk.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+0200\n"
 "PO-Revision-Date: 2009-02-15 08:16+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -28,15 +28,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Upraviť smb.conf, aby používal nastavenie WINS z DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -51,7 +57,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -60,13 +66,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Automaticky nastaviť smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -84,7 +90,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -95,13 +101,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Pracovná skupina/Názov domény:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -115,13 +121,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Použiť šifrovanie hesiel?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -133,7 +139,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -145,15 +151,21 @@
 "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
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -169,7 +181,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -179,7 +191,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -189,25 +201,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "démoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Ako chcete spúšťať Sambu?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/sl.po
===================================================================
--- branches/samba/experimental/debian/po/sl.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/sl.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: Samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -27,16 +27,22 @@
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "Spremeni smb.conf za uporabo WINS nastavitev pridobljenih s strani DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -52,20 +58,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Za uporabo teh možnosti mora biti nameščen paket dhcp3-client."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Samodejna nastavitev smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -84,7 +90,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -96,13 +102,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Ime delovne skupine/domene:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -120,13 +126,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Uporaba Å¡ifriranja gesel?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -143,7 +149,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -159,15 +165,21 @@
 "imate veljavno datoteko /etc/samba/smbpasswd in da ste tam nastavili gesla "
 "za vsakega uporabnika s pomočjo ukaza smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -184,7 +196,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -194,7 +206,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -204,25 +216,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "daemoni"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Kako želite poganjati Sambo?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/sq.po
===================================================================
--- branches/samba/experimental/debian/po/sq.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/sq.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -23,15 +23,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ta ndryshoj smb.conf për të përdorur rregullimet WINS nga DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -47,7 +53,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -55,13 +61,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Ta konfiguroj smb.conf automatikisht?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -79,7 +85,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -91,13 +97,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Grup Pune/Emër Zone:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -115,13 +121,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Të përdor kriptim fjalëkalimi?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -138,7 +144,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -154,15 +160,21 @@
 "ke një skedar të vlefshëm /etc/samba/smbpasswd dhe që i cakton fjalëkalimet "
 "atje për secilin përdorues duke përdorur komandën smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -178,7 +190,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -188,7 +200,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -198,25 +210,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "daemons"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Si dëshiron të xhirojë Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/sv.po
===================================================================
--- branches/samba/experimental/debian/po/sv.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/sv.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,32 +1,39 @@
-# translation of debconf messages for samba to Swedish
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the samba package.
+# Translation of debconf messages for samba to Swedish
+# Copyright (C) 2009, 2011 Martin Bagge <brother at bsnet.se>
+# This file is distributed under the same license as the XX package.
 #
 # Daniel Nylander <po at danielnylander.se>, 2007 2008
-# Martin Bagge <brother at bsnet.se>, 2009.
+# Martin Bagge <brother at bsnet.se>, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.20b-3\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2009-02-23 01:51+0100\n"
-"Last-Translator: Martin Bagge <brother at bsnet.se>\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "Sambaserver och verktyg"
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ändra smb.conf till att använda WINS-inställningar från DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -42,7 +49,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -50,13 +57,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Konfigurera smb.conf automatiskt?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -74,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -86,13 +93,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Arbetsgrupp/Domännamn:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -107,13 +114,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Använd lösenordskryptering?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -125,7 +132,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -136,15 +143,21 @@
 "kontrollera att du har en giltig /etc/samba/smbpasswd och att du har ställt "
 "in lösenorden där för varje användare med kommandot smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr "Sambaserver"
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -160,7 +173,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -170,7 +183,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -180,25 +193,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "demoner"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Hur vill du köra Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/ta.po
===================================================================
--- branches/samba/experimental/debian/po/ta.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/ta.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba_po\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -25,15 +25,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "smb.conf ஐ டிஹெச்சிபி யிலிருந்து WINS அமைப்பை பயன்படுத்த மாற்றியமைக்கவா ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -49,20 +55,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "இந்த வசதியை பயன்படுத்திக் கொள்ள டிஹெச்சிபி3 சார்ந்தோன் பொதியை நிறுவ வேண்டும்."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf ஐ தானியங்கியாக வடிவமைக்கலாமா?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -80,7 +86,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -91,13 +97,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "வேலைக்குழு/களப் பெயர்:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -115,13 +121,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "கடவுச் சொல் குறியீட்டாக்கத்தை பயன்படுத்தவா?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -138,7 +144,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -155,15 +161,21 @@
 "பயனருக்கும் smbpasswd கட்டளை மூலம் தனித்தனி கடவுச் சொல் அமைப்பதையும் உறுதி செய்து "
 "கொள்ளவும். "
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr " /var/lib/samba/passdb.tdb என்ற சாம்பா கடவுச் சொல் தரவுத் தளத்தை உருவாக்கவா?"
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -179,7 +191,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -189,7 +201,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -199,25 +211,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "கிங்கரன்கள் (டீமன்கள்)"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "சாம்பாவை எப்படி இயக்க விரும்புகிறீர்கள்?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/templates.pot
===================================================================
--- branches/samba/experimental/debian/po/templates.pot	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/templates.pot	2011-08-10 06:55:52 UTC (rev 3879)
@@ -8,23 +8,30 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -35,20 +42,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -60,7 +67,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -69,13 +76,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -85,13 +92,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -100,7 +107,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -108,15 +115,21 @@
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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 "
@@ -127,7 +140,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -135,7 +148,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -143,25 +156,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/th.po
===================================================================
--- branches/samba/experimental/debian/po/th.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/th.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,30 +1,36 @@
-# Thai translation of exim4.
-# Copyright (C) 2006 Software in the Public Interest, Inc.
+# Thai translation of samba.
+# Copyright (C) 2006-2011 Software in the Public Interest, Inc.
 # This file is distributed under the same license as the exim4 package.
-# Theppitak Karoonboonyanan <thep at linux.thai.net>, 2006.
+# Theppitak Karoonboonyanan <thep at linux.thai.net>, 2006-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-13 10:05+0700\n"
+"POT-Creation-Date: 2011-05-12 10:46+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 <l10n at opentle.org>\n"
+"Language-Team: Thai <thai-l10n at googlegroup.com>\n"
 "Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
+#. Type: title
 #. Description
 #: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr "เซิร์ฟเวอร์ samba และเครื่องมือ"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "จะแก้ไข smb.conf ให้ใช้ค่าตั้ง WINS จาก DHCP หรือไม่?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -39,20 +45,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "คุณต้องติดตั้งแพกเกจ dhcp3-client ด้วย เพื่อจะใช้ความสามารถนี้"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "จะตั้งค่า smb.conf แบบอัตโนมัติหรือไม่?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -68,7 +74,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -79,76 +85,69 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "เวร์กกรุ๊ป/ชื่อโดเมน:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
+#: ../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 ""
-"กรุณาระบุเวิร์กกรุ๊ปที่คุณต้องการให้เซิร์ฟเวอร์นี้ประกาศเป็นสมาชิกเมื่อถูกถามโดยเครื่องลูก สังเกตว่า "
-"ค่านี้จะควบคุมชื่อโดเมนที่ใช้กับกรณีที่ตั้งค่า security=domain ด้วย"
+"กรุณาระบุเวิร์กกรุ๊ปสำหรับระบบนี้ ค่านี้จะกำหนดเวิร์กกรุ๊ปที่ระบบนี้จะเข้าร่วมเมื่อใช้เป็นเซิร์ฟเวอร์, "
+"กำหนดเวิร์กกรุ๊ปปริยายที่จะใช้เมื่อท่องดูด้วยโปรแกรมต่างๆ และกำหนดชื่อโดเมนที่จะใช้ในกรณีที่ตั้งค่า "
+"\"security=domain\" ด้วย"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "ใช้การเข้ารหัสลับกับรหัสผ่านหรือไม่?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
+#: ../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 ""
-"เครื่องลูกข่ายวินโดวส์รุ่นใหม่ๆ ทั้งหมด จะติดต่อกับเซิร์ฟเวอร์ SMB โดยใช้รหัสผ่านที่เข้ารหัสลับ "
+"เครื่องลูกข่ายวินโดวส์รุ่นใหม่ๆ ทั้งหมด จะติดต่อกับเซิร์ฟเวอร์ SMB/CIFS โดยใช้รหัสผ่านที่เข้ารหัสลับ "
 "ถ้าคุณต้องการจะใช้รหัสผ่านแบบข้อความธรรมดา คุณจะต้องเปลี่ยนค่าค่าหนึ่งในเรจิสตรีของวินโดวส์"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
-#, 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."
+#: ../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 ""
-"ขอแนะนำอย่างยิ่งให้เปิดใช้ตัวเลือกนี้ และถ้าคุณเปิดใช้ กรุณาตรวจสอบให้แน่ใจว่าคุณมีแฟ้ม /etc/"
-"samba/smbpasswd ที่ใช้การได้ และคุณได้ตั้งรหัสผ่านในนั้นสำหรับผู้ใช้แต่ละคน โดยใช้คำสั่ง "
-"smbpasswd"
+"ขอแนะนำอย่างยิ่งให้เปิดใช้ตัวเลือกนี้ "
+"เนื่องจากไม่มีการดูแลการรองรับรหัสผ่านแบบข้อความธรรมดาในผลิตภัณฑ์ต่างๆ "
+"ของไมโครซอฟท์อีกต่อไปแล้ว และถ้าคุณเปิดใช้ กรุณาตรวจสอบให้แน่ใจว่าคุณมีแฟ้ม /etc/samba/"
+"smbpasswd ที่ใช้การได้ และคุณได้ตั้งรหัสผ่านในนั้นสำหรับผู้ใช้แต่ละคน โดยใช้คำสั่ง smbpasswd"
 
-#. Type: boolean
+#. Type: title
 #. Description
 #: ../samba.templates:1001
+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:1001
+#: ../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 "
@@ -163,7 +162,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -173,7 +172,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -183,25 +182,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "ดีมอน"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "คุณต้องการเรียกใช้ Samba แบบไหน?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/tl.po
===================================================================
--- branches/samba/experimental/debian/po/tl.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/tl.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -24,15 +24,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Baguhin ang smb.conf upang gumamit ng WINS setting mula sa DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -48,7 +54,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -57,13 +63,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Awtomatikong isaayos ang smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -81,7 +87,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -93,13 +99,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Pangalan ng Workgroup/Domain:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -117,13 +123,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Gumamit ng encryption sa kontrasenyas?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -141,7 +147,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -158,16 +164,22 @@
 "nakatakda kayong kontrasenyas para sa bawat gumagamit na ginamitan ng "
 "smbpasswd na utos."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -185,7 +197,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -196,7 +208,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -206,25 +218,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "mga daemon"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Paano ninyo gustong patakbuhin ang Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/tr.po
===================================================================
--- branches/samba/experimental/debian/po/tr.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/tr.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+0200\n"
 "PO-Revision-Date: 2010-10-25 12:33+0200\n"
 "Last-Translator: Mehmet Turker <mturker at innova.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -15,9 +15,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "WINS ayarlarını DHCP'den kullanmak için smb.conf dosyasında değişiklik "
@@ -25,7 +31,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -41,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
@@ -50,13 +56,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "smb.conf dosyası otomatik olarak yapılandırılsın mı?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -75,7 +81,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -87,13 +93,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Çalışma Grubu/Etki Alanı İsmi:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -108,13 +114,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Parola şifrelenmesi kullanılsın mı?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -126,7 +132,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -138,15 +144,21 @@
 "ise, geçerli bir /etc/samba/smbpasswd dosyanız olduğundan emin olun ve "
 "smbpasswd komutunu kullanarak bütün kullanıcılar için parola belirleyin."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -163,7 +175,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -174,7 +186,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -184,25 +196,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "artalan süreçleri"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Samba'nın nasıl çalışmasını istersiniz?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/vi.po
===================================================================
--- branches/samba/experimental/debian/po/vi.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/vi.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: samba 3.2\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -17,15 +17,21 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Sửa đổi « smb.conf » để dùng thiết lập WINS từ DHCP ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -42,20 +48,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Để nhớ dịp tính năng này, bạn cần phải cài đặt gói « dhcp3-client »."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Tự động cấu hình « smb.conf » ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -73,7 +79,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -84,13 +90,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Tên Nhóm làm việc/Miền:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -104,13 +110,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Gửi mật khẩu mật mã ?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -123,7 +129,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -135,15 +141,21 @@
 "« /etc/samba/smbpasswd » đúng, và đặt trong nó một mật khẩu cho mỗi người "
 "dùng sẽ sử dụng lệnh smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -160,7 +172,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -170,7 +182,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -180,25 +192,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "trình nền"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Muốn chạy Samba như thế nào?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/wo.po
===================================================================
--- branches/samba/experimental/debian/po/wo.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/wo.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: wo\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -25,15 +25,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Ndax nu soppi smb.con ba muy jëfandikoo komfiguraasioŋ bu DHCP?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -49,20 +55,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "Paket bu dhcp3-client nak wareesna koo istale ngir jariñoo defiin wii."
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "Ndax ñu komfigureel smb.conf sunu boppu?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -80,7 +86,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -92,13 +98,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "Grup bu liggéey/Turu domen:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -116,13 +122,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "Ndax ñu kiripte baatujall yi?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -139,7 +145,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -155,16 +161,22 @@
 "fiise /etc/samba/smbpasswd bu baax, ta nga def foofa baatujall bu "
 "jëfandikukat yéppu. Dangay jëfandikoo komaand bu smbpasswd."
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -181,7 +193,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -191,7 +203,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -201,25 +213,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "daemon yi"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "Nan nga bëgga doxale samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/zh_CN.po
===================================================================
--- branches/samba/experimental/debian/po/zh_CN.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/zh_CN.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: 3.0.22-1\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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"
@@ -28,15 +28,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "要修改 smb.conf 以使用从 DHCP 获得的 WINS 设定吗?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -50,20 +56,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "必须安装 dhcp3-client 软件包,才能使用此项特性。"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "自动配置 smb.conf 吗?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -79,7 +85,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -90,13 +96,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "工作组/域名:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please specify the workgroup you want this server to appear to be in when "
@@ -113,13 +119,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "使用口令加密吗?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "All recent Windows clients communicate with SMB servers using encrypted "
@@ -135,7 +141,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Enabling this option is highly recommended. If you do, make sure you have "
@@ -150,15 +156,21 @@
 "强烈推荐开启此选项。如果选中,请确保您拥有一个有效的 /etc/samba/smbpasswd 文"
 "件,并且此文件包含用 smbpasswd 命令为每个用户设定的密码。"
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -172,7 +184,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -182,7 +194,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -192,25 +204,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "守护进程"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "您想如何运行 Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/po/zh_TW.po
===================================================================
--- branches/samba/experimental/debian/po/zh_TW.po	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/po/zh_TW.po	2011-08-10 06:55:52 UTC (rev 3879)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"POT-Creation-Date: 2011-05-12 10:46+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."
@@ -25,15 +25,21 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "是否要修改 smb.conf 以使用來自 DHCP 的 WINS 設定?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../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 "
@@ -47,20 +53,20 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:1001
+#: ../samba-common.templates:2001
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr "必須安裝了 dhcp3-client 套件,才能受益於這個功能。"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../samba-common.templates:3001
 msgid "Configure smb.conf automatically?"
 msgstr "是否要自動設定 smb.conf?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -76,7 +82,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:2001
+#: ../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 "
@@ -87,13 +93,13 @@
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../samba-common.templates:4001
 msgid "Workgroup/Domain Name:"
 msgstr "群組/網域:"
 
 #. Type: string
 #. Description
-#: ../samba-common.templates:3001
+#: ../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 "
@@ -106,13 +112,13 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../samba-common.templates:5001
 msgid "Use password encryption?"
 msgstr "是否使用加密密碼?"
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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 "
@@ -123,7 +129,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba-common.templates:4001
+#: ../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, "
@@ -134,15 +140,21 @@
 "在維護了。如果您要啟用的話,請確認您有個有效的 /etc/samba/smbpasswd 檔,且其"
 "中包含了使用 smbpasswd 指令替每個使用者所設定的密碼。"
 
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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:1001
+#: ../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 "
@@ -156,7 +168,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../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."
@@ -166,7 +178,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba.templates:1001
+#: ../samba.templates:2001
 msgid ""
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
@@ -176,25 +188,25 @@
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "daemons"
 msgstr "常駐程式"
 
 #. Type: select
 #. Choices
-#: ../samba.templates:2001
+#: ../samba.templates:3001
 msgid "inetd"
 msgstr "inetd"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../samba.templates:3002
 msgid "How do you want to run Samba?"
 msgstr "您想要如何執行 Samba?"
 
 #. Type: select
 #. Description
-#: ../samba.templates:2002
+#: ../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."

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/rules	2011-08-10 06:55:52 UTC (rev 3879)
@@ -61,7 +61,9 @@
 		--with-nmbdsocketdir=/var/run/samba \
 		--enable-external-libtalloc \
 		--without-libtalloc \
-		--disable-avahi
+		--disable-avahi \
+		--without-libtdb \
+		--enable-external-libtdb
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   conf_args += \
@@ -91,7 +93,9 @@
 
 	touch configure-stamp
 
-build: configure build-stamp
+build: configure build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
 	dh_testdir
 
@@ -162,7 +166,6 @@
 	install -m 0755 source3/bin/vfstest $(DESTDIR)/usr/bin/vfstest
 	install -m 0755 source3/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
 	install -m 0755 source3/bin/replacetort $(DESTDIR)/usr/bin/replacetort
-	install -m 0755 source3/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
 	install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
 	mkdir -p $(DESTDIR)/usr/share/pam-configs
 	install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate

Modified: branches/samba/experimental/debian/samba-common.config
===================================================================
--- branches/samba/experimental/debian/samba-common.config	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/samba-common.config	2011-08-10 06:55:52 UTC (rev 3879)
@@ -27,7 +27,7 @@
 
 FILE=/etc/samba/smb.conf
 
-db_title "Samba Server"
+db_settitle samba-common/title
 
 # We ask the question IFF the config contains complex options that could
 # cause us to break the config.

Modified: branches/samba/experimental/debian/samba-common.templates
===================================================================
--- branches/samba/experimental/debian/samba-common.templates	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/samba-common.templates	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,3 +1,7 @@
+Template: samba-common/title
+Type: title
+_Description: Samba server and utilities
+
 Template: samba-common/dhcp
 Type: boolean
 Default: false

Modified: branches/samba/experimental/debian/samba-tools.files
===================================================================
--- branches/samba/experimental/debian/samba-tools.files	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/samba-tools.files	2011-08-10 06:55:52 UTC (rev 3879)
@@ -7,6 +7,5 @@
 usr/bin/vfstest
 usr/bin/pdbtest
 usr/bin/replacetort
-usr/bin/tdbtorture
 usr/bin/smbconftort
 

Modified: branches/samba/experimental/debian/samba.config
===================================================================
--- branches/samba/experimental/debian/samba.config	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/samba.config	2011-08-10 06:55:52 UTC (rev 3879)
@@ -44,7 +44,7 @@
 
 FILE=/etc/samba/smb.conf
 
-db_title "Samba Server"
+db_settitle samba-common/title
 
 # We first read the settings file
 # in order to get admin-modified settings

Copied: branches/samba/experimental/debian/samba.examples (from rev 3878, tags/samba/2:3.5.11~dfsg-1/debian/samba.examples)
===================================================================
--- branches/samba/experimental/debian/samba.examples	                        (rev 0)
+++ branches/samba/experimental/debian/samba.examples	2011-08-10 06:55:52 UTC (rev 3879)
@@ -0,0 +1 @@
+examples/LDAP

Modified: branches/samba/experimental/debian/samba.files
===================================================================
--- branches/samba/experimental/debian/samba.files	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/samba.files	2011-08-10 06:55:52 UTC (rev 3879)
@@ -2,7 +2,6 @@
 usr/bin/smbstatus.samba3
 usr/bin/smbcontrol
 usr/bin/profiles
-usr/bin/tdbbackup
 usr/bin/pdbedit
 usr/sbin/smbd
 usr/sbin/nmbd
@@ -15,6 +14,5 @@
 usr/share/man/man8/pdbedit.8
 usr/share/man/man8/smbd.8
 usr/share/man/man8/mksmbpasswd.8
-usr/share/man/man8/tdbbackup.8
 usr/share/man/man8/eventlogadm.8
 etc/network/if-up.d/samba

Modified: branches/samba/experimental/debian/samba.init
===================================================================
--- branches/samba/experimental/debian/samba.init	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/samba.init	2011-08-10 06:55:52 UTC (rev 3879)
@@ -6,8 +6,8 @@
 # Required-Stop:     $network $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Should-Start:      slapd
-# Should-Stop:       slapd
+# Should-Start:      slapd cups
+# Should-Stop:       slapd cups
 # Short-Description: start Samba daemons (nmbd and smbd)
 ### END INIT INFO
 
@@ -36,7 +36,10 @@
 		# Make sure we have our PIDDIR, even if it's on a tmpfs
 		install -o root -g root -m 755 -d $PIDDIR
 
-		NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		if [ -n `which testparm` ]
+		then
+			NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		fi
 		if [ "$NMBD_DISABLED" != 'Yes' ]; then
 			log_progress_msg "nmbd"
 			if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/nmbd -- -D
@@ -89,7 +92,7 @@
 	reload)
 		log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only"
 
-		start-stop-daemon --stop --signal HUP --pidfile $SMBDPID
+		start-stop-daemon --stop --quiet --signal HUP --pidfile $SMBDPID
 
 		log_end_msg 0
 		;;

Modified: branches/samba/experimental/debian/samba.templates
===================================================================
--- branches/samba/experimental/debian/samba.templates	2011-08-10 06:40:53 UTC (rev 3878)
+++ branches/samba/experimental/debian/samba.templates	2011-08-10 06:55:52 UTC (rev 3879)
@@ -1,3 +1,7 @@
+Template: samba-common/title
+Type: title
+_Description: Samba server
+
 Template: samba/generate_smbpasswd
 Type: boolean
 Default: false





More information about the Pkg-samba-maint mailing list