merge revisions 2238:2521 from experimental

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2576 fc4039ab-9d04-0410-8cac-899223bdd6b0

94 files changed, 2356 insertions, 1159 deletions

diff --git a/debian/changelog b/debian/changelog
index 69e5821d54..f1e53a8beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,100 @@ samba (2:3.2.5-1) unstable; urgency=high
 
  -- Christian Perrier <bubulle@debian.org>  Thu, 27 Nov 2008 11:36:35 +0100
 
+samba (2:3.3.0~rc2-5) experimental; urgency=low
+
+  * Use alternatives for the smbstatus, nmblookup, net and 
+    testparm binaries and various data files in samba-common 
+    to allow installation of Samba 3 together with Samba 4. 
+  * Add myself to uploaders.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 25 Jan 2009 20:32:34 +0100
+
+samba (2:3.3.0~rc2-4) experimental; urgency=low
+
+  [ Steve Langasek ]
+  * Revert one of the template depersonalization changes from the -2 upload,
+    because it loses important context
+
+  [ Christian Perrier ]
+  * Use double quotation marks in debconf templates
+  * Add 'status" option to init scripts. Thansk to Dustin Kirkland for
+    providing the patch. Closes: #488275
+  * Move WHATSNEW.txt, README, Roadmap to samba-common. Closes: #491997
+  * [Lintian] Add ${misc:Depends} to dependencies of binary packages
+    that didn't have it already as we're using debhelper in the source
+    package
+  * [Lintian] Don't ignore errors in swat.postrm
+  * [Lintian] Fix "local foo=bar" bashisms in samba-common.dhcp, samba.config
+    and samba-common.config
+  * smb.conf.5-undefined-configure.patch: fix syntax error in smb.conf(5)
+    Closes: #512843
+
+  [ Debconf translations ]
+  * Asturian added. Closes: #511730
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 24 Jan 2009 16:04:57 +0100
+
+samba (2:3.3.0~rc2-3) experimental; urgency=low
+
+  * Fix around the libsmbclient/libsmbclient-dev descriptions, which got
+    swapped in the last upload.
+  * Drop a boilerplate sentence from the samba-common, smbclient, swat, 
+    samba-doc, samba-doc-pdf, samba-dbg, and libwbclient0 descriptions
+    that's not relevant for these packages.
+  * Hyphenate "command-line" in the smbclient short description.
+  * Fix up the smbclient description, which got crossed with the smbfs one.
+  * Fix the smbfs description, which was not actually fixed in the previous
+    upload.  Really closes: #496206.
+  * Further minor adjustments to the description of the swat package.
+  * Fix various inaccuracies in the winbind package description.
+  * Clarify in the description that samba-tools are extra, only useful for
+    testing.
+
+ -- Steve Langasek <vorlon@debian.org>  Tue, 30 Dec 2008 18:42:05 -0800
+
+samba (2:3.3.0~rc2-2) experimental; urgency=low
+
+  [ Steve Langasek ]
+  * Handle clearing out netbios settings whenever the DHCP server has gone
+    away.  Closes: #299618.
+
+  [ Christian Perrier ]
+  * Point the correct document about password encryption in debconf templates
+    Corrected in translations as well. Closes: #502838
+  * Reword debconf templates to avoid mentioning the local host as a "server".
+    Closes: #171177
+  * Use this opportunity for other minor rewording:
+    - replace "SMB" by "SMB/CIFS"
+    - more strongly discouraging the use of plain text passwords
+    - unpersonnalization
+  * Reword the libpam-smbpass package description
+    Thanks to Justin B. Rye for the very useful suggestions
+    Closes: #496196
+  * Improve the package descriptions by rewording the description overhaul
+    Also improve the specific information for samba and samba-dbg
+    Thanks again to Justin B. Rye for the invaluable help
+    Closes: #496200
+  * Improve libsmbclient package description. Closes: #496197
+  * Improve libwbclient0 package description. Closes: #496199
+  * Improve samba-doc package description. Closes: #496202
+  * Improve samba-tools package description. Closes: #496203
+  * Improve samba-common package description. Closes: #496204
+  * Improve smbclient package description. Closes: #496205
+  * Improve smbfs package description. Closes: #496206
+  * Improve swat package description. Closes: #496207
+  * Improve winbind package description. Closes: #496208
+  * Improve samba-doc-pdf package description. Closes: #496211
+  * Update French debconf translation
+
+ -- Christian Perrier <bubulle@debian.org>  Mon, 29 Dec 2008 11:50:04 +0100
+
+samba (2:3.3.0~rc2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 17 Dec 2008 08:22:18 +0100
+
 samba (2:3.3.0~rc1-2) experimental; urgency=low
 
   * Provide idmap_adex and idmap_hash in winbind.
diff --git a/debian/control b/debian/control
index 0d51e61cd8..f70353dbf2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: samba
 Section: net
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint@lists.alioth.debian.org>
-Uploaders: Eloy A. Paris <peloy@debian.org>, Steve Langasek <vorlon@debian.org>, Christian Perrier <bubulle@debian.org>, Noèl Köthe <noel@debian.org>, Adam Conrad <adconrad@0c3.net>
+Uploaders: Eloy A. Paris <peloy@debian.org>, Steve Langasek <vorlon@debian.org>, Christian Perrier <bubulle@debian.org>, Noèl Köthe <noel@debian.org>, Adam Conrad <adconrad@0c3.net>, Jelmer Vernooij <jelmer@debian.org>
 Build-Depends: debhelper, libpam0g-dev, libreadline5-dev, libcups2-dev | libcupsys2-dev, libacl1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev, libtalloc-dev (>= 1.2.0~git20080616), libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
 Build-Conflicts: libfam-dev
 Standards-Version: 3.8.0
@@ -10,179 +10,156 @@ Homepage: http://www.samba.org
 
 Package: samba
 Architecture: any
-Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps, update-inetd, adduser
+Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools
 Replaces: samba-common (<= 2.0.5a-2)
-Description: a LanManager-like file and printer server for Unix
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains all the components necessary to turn your
- Debian GNU/Linux box into a powerful file and printer server.
- .
- Currently, the Samba Debian packages consist of the following:
- .
-  samba - LanManager-like file and printer server for Unix.
-  samba-common - Samba common files used by both the server and the client.
-  smbclient - LanManager-like simple client for Unix.
-  swat - Samba Web Administration Tool
-  samba-doc - Samba documentation.
-  samba-doc-pdf - Samba documentation in PDF format.
-  smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
-  libpam-smbpass - pluggable authentication module for SMB/CIFS password 
-                   database
-  libsmbclient - Shared library that allows applications to talk to SMB/CIFS
-                 servers
-  libsmbclient-dev - libsmbclient shared libraries
-  libwbclient0 - Shared library for interfacing with the winbind service
-  winbind - Service to resolve user and group information from Windows NT 
-            servers
- .
- It is possible to install a subset of these packages depending on
- your particular needs. For example, to access other SMB/CIFS servers you
- should only need the smbclient and samba-common packages.
+Conflicts: samba (<< 4.0.0~alpha6-2)
+Description: SMB/CIFS file, print, and login server for Unix
+ 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.  Samba can also function
+ as an NT4-style domain controller, and can integrate with both NT4 domains
+ and Active Directory realms as a member server.
+ .
+ This package provides the components necessary to use Samba as a
+ stand-alone file and print server.  For use in an NT4 domain or Active
+ Directory realm, you will also need the winbind package.
+ .
+ This package is not required for connecting to existing SMB/CIFS servers
+ (see smbclient) or for mounting remote filesystems (see smbfs).
 
 Package: samba-common
 Architecture: any
 Depends: libpam-modules, ucf, ${shlibs:Depends}, ${misc:Depends}
 Replaces: samba (<< 3.0.20b-1)
-Description: Samba common files used by both the server and the client
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
+Description: common files used by both the Samba server and client
+ 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 contains the common files that are used by both the server
- (provided in the samba package) and the client (provided in the smbclient
- package).
+ This package contains files and programs needed by Samba when used as
+ either a client or a server.
 
 Package: samba-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: tools provided by the Samba suite
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains tools such as smbtorture which may help
- testing the performance of CIFS servers or clients.
+Conflicts: samba4, samba4-testsuite
+Description: Samba testing utilities
+ 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 contains extra command-line tools such as smbtorture for
+ performance-testing CIFS servers and clients.
 
 Package: smbclient
 Architecture: any
-Depends: samba-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: samba-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
 Provides: samba-client
 Suggests: smbfs
-Description: a LanManager-like simple client for Unix
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains some client components of the Samba suite. In
- particular it includes the command line utilities smbclient, smbtar,
- and smbspool. If you want to mount shares exported from Microsoft
- Windows machines or a Samba server you must install the smbfs package.
+Conflicts: samba4-clients
+Description: command-line SMB/CIFS clients for Unix
+ 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 contains command-line utilities for accessing Microsoft
+ Windows and Samba servers, including smbclient, smbtar, and smbspool.
+ Utilities for mounting shares locally are found in the package smbfs.
 
 Package: swat
 Architecture: any
 Depends: samba (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, openbsd-inetd | inet-superserver
 Recommends: samba-doc (= ${source:Version})
 Description: Samba Web Administration Tool
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains the components of the Samba suite that are needed
- for Web administration of the Samba server.
- .
- SWAT will rewrite the smb.conf file. It will rearrange the entries and
- delete all comments, include= and copy= options. If you use a carefully
- crafted smb.conf, you should probably avoid using SWAT.
+ 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 allows you to administer a Samba server via a web browser.
+ .
+ SWAT is no longer actively maintained, and its default configuration is
+ not secure for use over an untrusted network.  SWAT will also rewrite
+ smb.conf, rearranging the entries and deleting all comments as well as
+ include= and copy= options, so is not suitable for use in conjunction
+ with hand-edited smb.conf files or the default package-managed
+ configuration.
 
 Package: samba-doc
 Section: doc
 Architecture: all
 Suggests: samba-doc-pdf
+Depends: ${misc:Depends}
 Description: Samba documentation
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
+ 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 contains all the documentation that comes in the original
- tarball, except in PDF format.
+ This package contains all the non-PDF documentation for the Samba
+ suite. See also samba-doc-pdf.
 
 Package: samba-doc-pdf
 Section: doc
 Architecture: all
-Description: Samba documentation (PDF format)
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
+Depends: ${misc:Depends}
+Description: Samba documentation in PDF format
+ 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 contains all the documentation that comes in the original
- tarball in PDF format.
+ This package contains all the PDF documentation for the Samba suite.
 
 Package: smbfs
 Section: otherosfs
 Priority: optional
 Architecture: any
-Depends: netbase (>= 2.02), samba-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: netbase (>= 2.02), samba-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: smbclient
 Replaces: smbfsx
-Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
- Smbfs is a filesystem which understands the SMB/CIFS protocol.
- This is the protocol Windows for Workgroups, Windows NT or
- LAN Manager use to talk to each other. It was inspired by
- samba, the program by Andrew Tridgell that turns any unix
- site into a file server for DOS or Windows clients.
- .
- If you want to use command-line utilities like smbclient, smbtar
- and/or smbspool you just need to install the smbclient package.
+Description: Samba file system utilities
+ 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 utilities for mounting and unmounting cifs network
+ file systems. Other command-line utilities such as smbclient, smbtar
+ and smbspool are in the package smbclient.
 
 Package: libpam-smbpass
 Section: admin
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, samba-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, samba-common (= ${binary:Version}), ${misc:Depends}
 Suggests: samba
-Description: pluggable authentication module for SMB/CIFS password database
- This is a stackable PAM module that allows a system administrator to easily
- migrate to using encrypted passwords for Samba and to keep smb passwords in
- sync with unix passwords.  Unlike other solutions, it does this without
- requiring users to change their existing passwords or login to Samba using
- cleartext passwords.
+Description: pluggable authentication module for Samba
+ This is a module for PAM that enables a system administrator to migrate
+ user passwords from the Unix password database to the SMB password
+ database as used by Samba, and to subsequently keep the two databases in
+ sync.  Unlike other solutions, it does this without needing users to log
+ in to Samba using cleartext passwords, or requiring them to change their
+ existing passwords.
 
 Package: libsmbclient
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: shared library that allows applications to talk to SMB/CIFS servers
- libsmbclient allows to write applications that use the SMB/CIFS protocol.
- This gives applications the ability to talk to Microsoft Windows servers
- and Unix servers running Samba.
- .
- This package contains the libsmbclient shared library.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: shared library for communication with SMB/CIFS servers
+ This package provides a shared library that enables client applications
+ to talk to Microsoft Windows and Samba servers using the SMB/CIFS
+ protocol.
 
 Package: libsmbclient-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libsmbclient (= ${binary:Version})
-Description: libsmbclient static libraries and headers
- libsmbclient allows to write applications that use the SMB/CIFS protocol.
- This gives applications the ability to talk to Microsoft Windows servers
- and Unix servers running Samba.
- .
- This package contains libraries and headers needed to build applications
- that use SMB/CIFS services.
+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
+ enables client applications to talk to Microsoft Windows and Samba servers
+ using the SMB/CIFS protocol.
 
 Package: winbind
 Section: net
@@ -190,36 +167,42 @@ Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${binary:Version}), lsb-base (>= 3.0-6), adduser
 Replaces: samba (<= 2.2.3-2)
-Description: service to resolve user and group information from Windows NT servers
- This package provides the winbindd daemon, which provides a
- service for the Name Service Switch capability that is present
- in most modern C libraries (like the GNU C Library - glibc.)
- .
- The service provided by winbindd is called `winbind' and
- can be used to resolve user and group information from a
- Windows NT server. The service can also provide authentication
- services via an associated PAM module.
+Description: Samba nameservice integration server
+ 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.  Samba can also function
+ as an NT4-style domain controller, and can integrate with both NT4 domains
+ and Active Directory realms as a member server.
+ .
+ This package provides winbindd, a daemon which integrates authentication
+ and directory service (user/group lookup) mechanisms from a Windows
+ domain on a Linux system.  User/group lookups are configured via
+ /etc/nsswitch.conf, and authentication is integrated using the winbind
+ module for PAM.
 
 Package: samba-dbg
 Section: devel
 Priority: extra
 Architecture: any
-Depends: samba (= ${binary:Version})
+Depends: samba (= ${binary:Version}), ${misc:Depends}
 Description: Samba debugging symbols
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
+ 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 contains debugging symbols for the programs included in
- the samba and smbclient packages.
+ This package provides debugging information for the software in the
+ Samba suite. Install it to get a better backtrace in the event of a
+ crash.
 
 Package: libwbclient0
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: client library for interfacing with winbind service
- libwbclient is an API for client interactions with the winbind service.
- This library abstracts the winbind pipe protocol into a stable API that
- allows the winbind server to be independently upgraded.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Samba winbind client library
+ 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 a library for client applications that interact
+ via the winbind pipe protocol with a Samba winbind server.
diff --git a/debian/patches/README_nosmbldap-tools.patch b/debian/patches/README_nosmbldap-tools.patch
index a1f73b3319..7aa6ef1ad4 100644
--- a/debian/patches/README_nosmbldap-tools.patch
+++ b/debian/patches/README_nosmbldap-tools.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.3.0rc1/examples/LDAP/README
+Index: samba-3.3.0rc2/examples/LDAP/README
 ===================================================================
---- samba-3.3.0rc1.orig/examples/LDAP/README
-+++ samba-3.3.0rc1/examples/LDAP/README
+--- samba-3.3.0rc2.orig/examples/LDAP/README
++++ samba-3.3.0rc2/examples/LDAP/README
 @@ -69,6 +69,9 @@
  The smbldap-tools package can be downloaded individually from
  https://gna.org/projects/smbldap-tools/
diff --git a/debian/patches/VERSION.patch b/debian/patches/VERSION.patch
index 0ac419f143..54a06d603e 100644
--- a/debian/patches/VERSION.patch
+++ b/debian/patches/VERSION.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: Should be kept
 
-Index: samba-3.3.0rc1/source/VERSION
+Index: samba-3.3.0rc2/source/VERSION
 ===================================================================
---- samba-3.3.0rc1.orig/source/VERSION
-+++ samba-3.3.0rc1/source/VERSION
+--- samba-3.3.0rc2.orig/source/VERSION
++++ samba-3.3.0rc2/source/VERSION
 @@ -84,7 +84,7 @@
  #       SAMBA_VERSION_VENDOR_FUNCTION                  #
  #                                                      #
diff --git a/debian/patches/adapt_machine_creation_script.patch b/debian/patches/adapt_machine_creation_script.patch
index 2a4883ac1c..39dc751b4e 100644
--- a/debian/patches/adapt_machine_creation_script.patch
+++ b/debian/patches/adapt_machine_creation_script.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.3.0rc1/docs/manpages/smb.conf.5
+Index: samba-3.3.0rc2/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/smb.conf.5
-+++ samba-3.3.0rc1/docs/manpages/smb.conf.5
+--- samba-3.3.0rc2.orig/docs/manpages/smb.conf.5
++++ samba-3.3.0rc2/docs/manpages/smb.conf.5
 @@ -750,8 +750,8 @@
  Default:
  \fI\fIadd machine script\fR\fR\fI = \fR\fI\fR\fI \fR
diff --git a/debian/patches/autoconf.patch b/debian/patches/autoconf.patch
index 23bd011cfa..d3598533a0 100644
--- a/debian/patches/autoconf.patch
+++ b/debian/patches/autoconf.patch
@@ -25,10 +25,10 @@ Note: This patch will normally have to be updated by hand after every
  quilt refresh
  find . -name '*.rej' | xargs rm
 
-Index: samba-3.3.0rc1/source/configure
+Index: samba-3.3.0rc2/source/configure
 ===================================================================
---- samba-3.3.0rc1.orig/source/configure
-+++ samba-3.3.0rc1/source/configure
+--- samba-3.3.0rc2.orig/source/configure
++++ samba-3.3.0rc2/source/configure
 @@ -791,6 +791,7 @@
  LIBTALLOC_SHARED
  LIBTALLOC_STATIC
@@ -131,7 +131,7 @@ Index: samba-3.3.0rc1/source/configure
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -41166,7 +41193,7 @@
+@@ -41223,7 +41250,7 @@
  #
  #
  case "$host_os" in
@@ -140,7 +140,7 @@ Index: samba-3.3.0rc1/source/configure
         # glibc <= 2.3.2 has a broken getgrouplist
         if test "$cross_compiling" = yes; then
    { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -46402,11 +46429,14 @@
+@@ -46459,11 +46486,14 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -157,7 +157,7 @@ Index: samba-3.3.0rc1/source/configure
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -67596,7 +67626,8 @@
+@@ -67653,7 +67683,8 @@
  LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
  LIBTALLOC_SHARED=
  LIBTALLOC_STATIC=
@@ -167,7 +167,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBTALLOC=
  UNINSTALL_LIBTALLOC=
  
-@@ -67611,6 +67642,7 @@
+@@ -67668,6 +67699,7 @@
  
  
  
@@ -175,7 +175,7 @@ Index: samba-3.3.0rc1/source/configure
  { echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
  echo $ECHO_N "checking whether to build the libtalloc shared library... $ECHO_C" >&6; }
  
-@@ -67645,15 +67677,17 @@
+@@ -67702,15 +67734,17 @@
  	UNINSTALL_LIBTALLOC=uninstalllibtalloc
  	if eval $BLDSHARED = true; then
  		LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
@@ -195,7 +195,7 @@ Index: samba-3.3.0rc1/source/configure
  		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
  echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -67680,7 +67714,8 @@
+@@ -67737,7 +67771,8 @@
  LIBTDB_STATIC_TARGET=bin/libtdb.a
  LIBTDB_SHARED=
  LIBTDB_STATIC=
@@ -205,7 +205,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBTDB=
  UNINSTALL_LIBTDB=
  
-@@ -67695,6 +67730,7 @@
+@@ -67752,6 +67787,7 @@
  
  
  
@@ -213,7 +213,7 @@ Index: samba-3.3.0rc1/source/configure
  { echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
  echo $ECHO_N "checking whether to build the libtdb shared library... $ECHO_C" >&6; }
  
-@@ -67729,15 +67765,17 @@
+@@ -67786,15 +67822,17 @@
  	UNINSTALL_LIBTDB=uninstalllibtdb
  	if eval $BLDSHARED = true; then
  		LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
@@ -233,7 +233,7 @@ Index: samba-3.3.0rc1/source/configure
  		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
  echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -67764,7 +67802,8 @@
+@@ -67821,7 +67859,8 @@
  LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
  LIBNETAPI_SHARED=
  LIBNETAPI_STATIC=
@@ -243,7 +243,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBNETAPI=
  UNINSTALL_LIBNETAPI=
  
-@@ -67779,6 +67818,7 @@
+@@ -67836,6 +67875,7 @@
  
  
  
@@ -251,7 +251,7 @@ Index: samba-3.3.0rc1/source/configure
  { echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
  echo $ECHO_N "checking whether to build the libnetapi shared library... $ECHO_C" >&6; }
  
-@@ -67813,15 +67853,17 @@
+@@ -67870,15 +67910,17 @@
  	UNINSTALL_LIBNETAPI=uninstalllibnetapi
  	if eval $BLDSHARED = true; then
  		LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
@@ -271,7 +271,7 @@ Index: samba-3.3.0rc1/source/configure
  		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
  echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -67848,7 +67890,8 @@
+@@ -67905,7 +67947,8 @@
  LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
  LIBSMBCLIENT_SHARED=
  LIBSMBCLIENT_STATIC=
@@ -281,7 +281,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBSMBCLIENT=
  UNINSTALL_LIBSMBCLIENT=
  
-@@ -67863,6 +67906,7 @@
+@@ -67920,6 +67963,7 @@
  
  
  
@@ -289,7 +289,7 @@ Index: samba-3.3.0rc1/source/configure
  { echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
  echo $ECHO_N "checking whether to build the libsmbclient shared library... $ECHO_C" >&6; }
  
-@@ -67897,15 +67941,17 @@
+@@ -67954,15 +67998,17 @@
  	UNINSTALL_LIBSMBCLIENT=uninstalllibsmbclient
  	if eval $BLDSHARED = true; then
  		LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
@@ -309,7 +309,7 @@ Index: samba-3.3.0rc1/source/configure
  		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
  echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -67932,7 +67978,8 @@
+@@ -67989,7 +68035,8 @@
  LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
  LIBSMBSHAREMODES_SHARED=
  LIBSMBSHAREMODES_STATIC=
@@ -319,7 +319,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBSMBSHAREMODES=
  UNINSTALL_LIBSMBSHAREMODES=
  
-@@ -67947,6 +67994,7 @@
+@@ -68004,6 +68051,7 @@
  
  
  
@@ -327,7 +327,7 @@ Index: samba-3.3.0rc1/source/configure
  { echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
  echo $ECHO_N "checking whether to build the libsmbsharemodes shared library... $ECHO_C" >&6; }
  
-@@ -67981,15 +68029,17 @@
+@@ -68038,15 +68086,17 @@
  	UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
  	if eval $BLDSHARED = true; then
  		LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -347,7 +347,7 @@ Index: samba-3.3.0rc1/source/configure
  		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
  echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -68016,7 +68066,8 @@
+@@ -68073,7 +68123,8 @@
  LIBADDNS_STATIC_TARGET=bin/libaddns.a
  LIBADDNS_SHARED=
  LIBADDNS_STATIC=
@@ -357,7 +357,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBADDNS=
  UNINSTALL_LIBADDNS=
  
-@@ -68031,6 +68082,7 @@
+@@ -68088,6 +68139,7 @@
  
  
  
@@ -365,7 +365,7 @@ Index: samba-3.3.0rc1/source/configure
  { echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
  echo $ECHO_N "checking whether to build the libaddns shared library... $ECHO_C" >&6; }
  
-@@ -68067,15 +68119,17 @@
+@@ -68124,15 +68176,17 @@
  	UNINSTALL_LIBADDNS=uninstalllibaddns
  	if eval $BLDSHARED = true; then
  		LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
@@ -385,7 +385,7 @@ Index: samba-3.3.0rc1/source/configure
  		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
  echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -70148,7 +70202,7 @@
+@@ -70205,7 +70259,7 @@
  echo "${ECHO_T}yes" >&6; };
  
  	case "$host_os" in
@@ -394,7 +394,7 @@ Index: samba-3.3.0rc1/source/configure
  		{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
  echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
  if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -71356,11 +71410,11 @@
+@@ -71413,11 +71467,11 @@
  WINBIND_NSS_PTHREAD=""
  
  case "$host_os" in
@@ -408,7 +408,7 @@ Index: samba-3.3.0rc1/source/configure
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
  		NSSSONAMEVERSIONSUFFIX=".1"
-@@ -77544,6 +77598,7 @@
+@@ -77601,6 +77655,7 @@
  LIBTALLOC_SHARED!$LIBTALLOC_SHARED$ac_delim
  LIBTALLOC_STATIC!$LIBTALLOC_STATIC$ac_delim
  LIBTALLOC_LIBS!$LIBTALLOC_LIBS$ac_delim
@@ -416,7 +416,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBTALLOC!$INSTALL_LIBTALLOC$ac_delim
  UNINSTALL_LIBTALLOC!$UNINSTALL_LIBTALLOC$ac_delim
  LIBTALLOC_SOVER!$LIBTALLOC_SOVER$ac_delim
-@@ -77552,6 +77607,7 @@
+@@ -77609,6 +77664,7 @@
  LIBTDB_SHARED!$LIBTDB_SHARED$ac_delim
  LIBTDB_STATIC!$LIBTDB_STATIC$ac_delim
  LIBTDB_LIBS!$LIBTDB_LIBS$ac_delim
@@ -424,7 +424,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBTDB!$INSTALL_LIBTDB$ac_delim
  UNINSTALL_LIBTDB!$UNINSTALL_LIBTDB$ac_delim
  LIBTDB_SOVER!$LIBTDB_SOVER$ac_delim
-@@ -77560,9 +77616,7 @@
+@@ -77617,9 +77673,7 @@
  LIBNETAPI_SHARED!$LIBNETAPI_SHARED$ac_delim
  LIBNETAPI_STATIC!$LIBNETAPI_STATIC$ac_delim
  LIBNETAPI_LIBS!$LIBNETAPI_LIBS$ac_delim
@@ -435,7 +435,7 @@ Index: samba-3.3.0rc1/source/configure
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -77604,11 +77658,15 @@
+@@ -77661,11 +77715,15 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -451,7 +451,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBSMBCLIENT!$INSTALL_LIBSMBCLIENT$ac_delim
  UNINSTALL_LIBSMBCLIENT!$UNINSTALL_LIBSMBCLIENT$ac_delim
  LIBSMBCLIENT_SOVER!$LIBSMBCLIENT_SOVER$ac_delim
-@@ -77617,6 +77675,7 @@
+@@ -77674,6 +77732,7 @@
  LIBSMBSHAREMODES_SHARED!$LIBSMBSHAREMODES_SHARED$ac_delim
  LIBSMBSHAREMODES_STATIC!$LIBSMBSHAREMODES_STATIC$ac_delim
  LIBSMBSHAREMODES_LIBS!$LIBSMBSHAREMODES_LIBS$ac_delim
@@ -459,7 +459,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBSMBSHAREMODES!$INSTALL_LIBSMBSHAREMODES$ac_delim
  UNINSTALL_LIBSMBSHAREMODES!$UNINSTALL_LIBSMBSHAREMODES$ac_delim
  LIBSMBSHAREMODES_SOVER!$LIBSMBSHAREMODES_SOVER$ac_delim
-@@ -77625,6 +77684,7 @@
+@@ -77682,6 +77741,7 @@
  LIBADDNS_SHARED!$LIBADDNS_SHARED$ac_delim
  LIBADDNS_STATIC!$LIBADDNS_STATIC$ac_delim
  LIBADDNS_LIBS!$LIBADDNS_LIBS$ac_delim
@@ -467,7 +467,7 @@ Index: samba-3.3.0rc1/source/configure
  INSTALL_LIBADDNS!$INSTALL_LIBADDNS$ac_delim
  UNINSTALL_LIBADDNS!$UNINSTALL_LIBADDNS$ac_delim
  LIBADDNS_SOVER!$LIBADDNS_SOVER$ac_delim
-@@ -77664,7 +77724,7 @@
+@@ -77721,7 +77781,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -476,10 +476,10 @@ Index: samba-3.3.0rc1/source/configure
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-3.3.0rc1/source/include/config.h.in
+Index: samba-3.3.0rc2/source/include/config.h.in
 ===================================================================
---- samba-3.3.0rc1.orig/source/include/config.h.in
-+++ samba-3.3.0rc1/source/include/config.h.in
+--- samba-3.3.0rc2.orig/source/include/config.h.in
++++ samba-3.3.0rc2/source/include/config.h.in
 @@ -66,6 +66,9 @@
  /* Whether to use fully FHS-compatible paths */
  #undef FHS_COMPATIBLE
diff --git a/debian/patches/documentation.patch b/debian/patches/documentation.patch
index 3b31342717..eb9ef52278 100644
--- a/debian/patches/documentation.patch
+++ b/debian/patches/documentation.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: Some part should maybe go in the FHS patch
 
-Index: samba-3.3.0rc1/docs/manpages/swat.8
+Index: samba-3.3.0rc2/docs/manpages/swat.8
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/swat.8
-+++ samba-3.3.0rc1/docs/manpages/swat.8
+--- samba-3.3.0rc2.orig/docs/manpages/swat.8
++++ samba-3.3.0rc2/docs/manpages/swat.8
 @@ -103,85 +103,6 @@
  .RS 4
  Print a summary of command line options\.
@@ -113,10 +113,10 @@ Index: samba-3.3.0rc1/docs/manpages/swat.8
  .RE
  .SH "WARNINGS"
  .PP
-Index: samba-3.3.0rc1/docs/manpages/nmbd.8
+Index: samba-3.3.0rc2/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/nmbd.8
-+++ samba-3.3.0rc1/docs/manpages/nmbd.8
+--- samba-3.3.0rc2.orig/docs/manpages/nmbd.8
++++ samba-3.3.0rc2/docs/manpages/nmbd.8
 @@ -107,11 +107,9 @@
  to answer any name queries\. Adding a line to this file affects name NetBIOS resolution from this host
  \fIONLY\fR\.
@@ -162,10 +162,10 @@ Index: samba-3.3.0rc1/docs/manpages/nmbd.8
  nmbd
  to dump out its server database in the
  \fIlog\.nmb\fR
-Index: samba-3.3.0rc1/docs/manpages/smbd.8
+Index: samba-3.3.0rc2/docs/manpages/smbd.8
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/smbd.8
-+++ samba-3.3.0rc1/docs/manpages/smbd.8
+--- samba-3.3.0rc2.orig/docs/manpages/smbd.8
++++ samba-3.3.0rc2/docs/manpages/smbd.8
 @@ -161,14 +161,11 @@
  inetd, this file must contain a mapping of service name (e\.g\., netbios\-ssn) to service port (e\.g\., 139) and protocol type (e\.g\., tcp)\.
  .RE
@@ -183,10 +183,10 @@ Index: samba-3.3.0rc1/docs/manpages/smbd.8
  .sp
  This file describes all the services the server is to make available to clients\. See
  \fBsmb.conf\fR(5)
-Index: samba-3.3.0rc1/docs/manpages/lmhosts.5
+Index: samba-3.3.0rc2/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/lmhosts.5
-+++ samba-3.3.0rc1/docs/manpages/lmhosts.5
+--- samba-3.3.0rc2.orig/docs/manpages/lmhosts.5
++++ samba-3.3.0rc2/docs/manpages/lmhosts.5
 @@ -83,10 +83,8 @@
  file\.
  .SH "FILES"
@@ -200,10 +200,10 @@ Index: samba-3.3.0rc1/docs/manpages/lmhosts.5
  .SH "VERSION"
  .PP
  This man page is correct for version 3 of the Samba suite\.
-Index: samba-3.3.0rc1/docs/manpages/ntlm_auth.1
+Index: samba-3.3.0rc2/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.3.0rc1/docs/manpages/ntlm_auth.1
+--- samba-3.3.0rc2.orig/docs/manpages/ntlm_auth.1
++++ samba-3.3.0rc2/docs/manpages/ntlm_auth.1
 @@ -35,7 +35,7 @@
  Some of these commands also require access to the directory
  \fIwinbindd_privileged\fR
@@ -231,10 +231,10 @@ Index: samba-3.3.0rc1/docs/manpages/ntlm_auth.1
  .RE
  .PP
  gss\-spnego\-client
-Index: samba-3.3.0rc1/docs/manpages/tdbbackup.8
+Index: samba-3.3.0rc2/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/tdbbackup.8
-+++ samba-3.3.0rc1/docs/manpages/tdbbackup.8
+--- samba-3.3.0rc2.orig/docs/manpages/tdbbackup.8
++++ samba-3.3.0rc2/docs/manpages/tdbbackup.8
 @@ -69,7 +69,7 @@
  .\}
  
@@ -262,10 +262,10 @@ Index: samba-3.3.0rc1/docs/manpages/tdbbackup.8
  .SH "VERSION"
  .PP
  This man page is correct for version 3 of the Samba suite\.
-Index: samba-3.3.0rc1/docs/manpages/winbindd.8
+Index: samba-3.3.0rc2/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/winbindd.8
-+++ samba-3.3.0rc1/docs/manpages/winbindd.8
+--- samba-3.3.0rc2.orig/docs/manpages/winbindd.8
++++ samba-3.3.0rc2/docs/manpages/winbindd.8
 @@ -513,16 +513,16 @@
  file are owned by root\.
  .RE
diff --git a/debian/patches/fhs-assignpaths.patch b/debian/patches/fhs-assignpaths.patch
index d4b081aff6..3d5a678a43 100644
--- a/debian/patches/fhs-assignpaths.patch
+++ b/debian/patches/fhs-assignpaths.patch
@@ -7,10 +7,10 @@ Fixes: #49011
 Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
                      change their default behaviour
 
-Index: samba-3.3.0rc1/source/param/loadparm.c
+Index: samba-3.3.0rc2/source/param/loadparm.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/param/loadparm.c
-+++ samba-3.3.0rc1/source/param/loadparm.c
+--- samba-3.3.0rc2.orig/source/param/loadparm.c
++++ samba-3.3.0rc2/source/param/loadparm.c
 @@ -120,6 +120,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -56,10 +56,10 @@ Index: samba-3.3.0rc1/source/param/loadparm.c
  	{
  		.label		= "pid directory",
  		.type		= P_STRING,
-Index: samba-3.3.0rc1/source/m4/check_path.m4
+Index: samba-3.3.0rc2/source/m4/check_path.m4
 ===================================================================
---- samba-3.3.0rc1.orig/source/m4/check_path.m4
-+++ samba-3.3.0rc1/source/m4/check_path.m4
+--- samba-3.3.0rc2.orig/source/m4/check_path.m4
++++ samba-3.3.0rc2/source/m4/check_path.m4
 @@ -26,9 +26,9 @@
  pammodulesdir="${libdir}/security"
  configdir="${libdir}"
@@ -87,10 +87,10 @@ Index: samba-3.3.0rc1/source/m4/check_path.m4
      AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
      ;;
    esac])
-Index: samba-3.3.0rc1/source/configure
+Index: samba-3.3.0rc2/source/configure
 ===================================================================
---- samba-3.3.0rc1.orig/source/configure
-+++ samba-3.3.0rc1/source/configure
+--- samba-3.3.0rc2.orig/source/configure
++++ samba-3.3.0rc2/source/configure
 @@ -2245,7 +2245,7 @@
  swatdir="\${prefix}/swat"
  codepagedir="\${MODULESDIR}"
diff --git a/debian/patches/fhs-filespaths-debatable.patch b/debian/patches/fhs-filespaths-debatable.patch
index a6032c89c0..151d7fbbe1 100644
--- a/debian/patches/fhs-filespaths-debatable.patch
+++ b/debian/patches/fhs-filespaths-debatable.patch
@@ -46,10 +46,10 @@ Note: Use dedicated directories for:
       grep -r lp_lockdir source/ | grep -vE \
          '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
 
-Index: samba-3.3.0rc1/source/lib/util.c
+Index: samba-3.3.0rc2/source/lib/util.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/lib/util.c
-+++ samba-3.3.0rc1/source/lib/util.c
+--- samba-3.3.0rc2.orig/source/lib/util.c
++++ samba-3.3.0rc2/source/lib/util.c
 @@ -2637,6 +2637,15 @@
  	return xx_path(name, get_dyn_STATEDIR());
  }
@@ -66,10 +66,10 @@ Index: samba-3.3.0rc1/source/lib/util.c
  /**
   * @brief Returns the platform specific shared library extension.
   *
-Index: samba-3.3.0rc1/source/libsmb/samlogon_cache.c
+Index: samba-3.3.0rc2/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.3.0rc1/source/libsmb/samlogon_cache.c
+--- samba-3.3.0rc2.orig/source/libsmb/samlogon_cache.c
++++ samba-3.3.0rc2/source/libsmb/samlogon_cache.c
 @@ -34,7 +34,7 @@
  bool netsamlogon_cache_init(void)
  {
@@ -79,10 +79,10 @@ Index: samba-3.3.0rc1/source/libsmb/samlogon_cache.c
  					       TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
  	}
  
-Index: samba-3.3.0rc1/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.3.0rc2/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.3.0rc1/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.3.0rc2.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.3.0rc2/source/nmbd/nmbd_serverlistdb.c
 @@ -326,7 +326,7 @@
  
  	updatecount++;
@@ -92,10 +92,10 @@ Index: samba-3.3.0rc1/source/nmbd/nmbd_serverlistdb.c
  	if (!fname) {
  		return;
  	}
-Index: samba-3.3.0rc1/source/passdb/login_cache.c
+Index: samba-3.3.0rc2/source/passdb/login_cache.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/passdb/login_cache.c
-+++ samba-3.3.0rc1/source/passdb/login_cache.c
+--- samba-3.3.0rc2.orig/source/passdb/login_cache.c
++++ samba-3.3.0rc2/source/passdb/login_cache.c
 @@ -35,7 +35,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -105,10 +105,10 @@ Index: samba-3.3.0rc1/source/passdb/login_cache.c
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.3.0rc1/source/printing/printing.c
+Index: samba-3.3.0rc2/source/printing/printing.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/printing/printing.c
-+++ samba-3.3.0rc1/source/printing/printing.c
+--- samba-3.3.0rc2.orig/source/printing/printing.c
++++ samba-3.3.0rc2/source/printing/printing.c
 @@ -183,8 +183,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -120,10 +120,10 @@ Index: samba-3.3.0rc1/source/printing/printing.c
  
  	/* handle a Samba upgrade */
  
-Index: samba-3.3.0rc1/source/printing/printing_db.c
+Index: samba-3.3.0rc2/source/printing/printing_db.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/printing/printing_db.c
-+++ samba-3.3.0rc1/source/printing/printing_db.c
+--- samba-3.3.0rc2.orig/source/printing/printing_db.c
++++ samba-3.3.0rc2/source/printing/printing_db.c
 @@ -91,7 +91,7 @@
  	}
  
@@ -133,10 +133,10 @@ Index: samba-3.3.0rc1/source/printing/printing_db.c
  				printername) < 0) {
  		DLIST_REMOVE(print_db_head, p);
  		SAFE_FREE(p);
-Index: samba-3.3.0rc1/source/smbd/lanman.c
+Index: samba-3.3.0rc2/source/smbd/lanman.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/smbd/lanman.c
-+++ samba-3.3.0rc1/source/smbd/lanman.c
+--- samba-3.3.0rc2.orig/source/smbd/lanman.c
++++ samba-3.3.0rc2/source/smbd/lanman.c
 @@ -1154,9 +1154,9 @@
  	bool local_list_only;
  	int i;
@@ -149,10 +149,10 @@ Index: samba-3.3.0rc1/source/smbd/lanman.c
  		return 0;
  	}
  
-Index: samba-3.3.0rc1/source/utils/smbcontrol.c
+Index: samba-3.3.0rc2/source/utils/smbcontrol.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/utils/smbcontrol.c
-+++ samba-3.3.0rc1/source/utils/smbcontrol.c
+--- samba-3.3.0rc2.orig/source/utils/smbcontrol.c
++++ samba-3.3.0rc2/source/utils/smbcontrol.c
 @@ -868,10 +868,10 @@
  	/* Remove the entry in the winbindd_cache tdb to tell a later
  	   starting winbindd that we're online. */
@@ -182,10 +182,10 @@ Index: samba-3.3.0rc1/source/utils/smbcontrol.c
  		return False;
  	}
  
-Index: samba-3.3.0rc1/source/libgpo/gpo_fetch.c
+Index: samba-3.3.0rc2/source/libgpo/gpo_fetch.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.3.0rc1/source/libgpo/gpo_fetch.c
+--- samba-3.3.0rc2.orig/source/libgpo/gpo_fetch.c
++++ samba-3.3.0rc2/source/libgpo/gpo_fetch.c
 @@ -59,7 +59,7 @@
  
  	if ((path = talloc_asprintf(mem_ctx,
@@ -204,10 +204,10 @@ Index: samba-3.3.0rc1/source/libgpo/gpo_fetch.c
  	char *current_dir;
  	char *tok;
  
-Index: samba-3.3.0rc1/source/winbindd/winbindd_cache.c
+Index: samba-3.3.0rc2/source/winbindd/winbindd_cache.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/winbindd/winbindd_cache.c
-+++ samba-3.3.0rc1/source/winbindd/winbindd_cache.c
+--- samba-3.3.0rc2.orig/source/winbindd/winbindd_cache.c
++++ samba-3.3.0rc2/source/winbindd/winbindd_cache.c
 @@ -2532,7 +2532,7 @@
  		return true;
  
@@ -256,10 +256,10 @@ Index: samba-3.3.0rc1/source/winbindd/winbindd_cache.c
  
  	DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
  	smb_panic_fn = validate_panic;
-Index: samba-3.3.0rc1/source/printing/nt_printing.c
+Index: samba-3.3.0rc2/source/printing/nt_printing.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/printing/nt_printing.c
-+++ samba-3.3.0rc1/source/printing/nt_printing.c
+--- samba-3.3.0rc2.orig/source/printing/nt_printing.c
++++ samba-3.3.0rc2/source/printing/nt_printing.c
 @@ -2552,7 +2552,7 @@
  
  	if (geteuid() == 0) {
diff --git a/debian/patches/fhs-filespaths.patch b/debian/patches/fhs-filespaths.patch
index 96707fa767..23ca8df7b8 100644
--- a/debian/patches/fhs-filespaths.patch
+++ b/debian/patches/fhs-filespaths.patch
@@ -50,10 +50,10 @@ Note: Use dedicated directories for:
       grep -r lp_lockdir source/ | grep -vE \
          '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm|smbd/oplock_irix)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
 
-Index: samba-3.3.0rc1/source/passdb/pdb_tdb.c
+Index: samba-3.3.0rc2/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/passdb/pdb_tdb.c
-+++ samba-3.3.0rc1/source/passdb/pdb_tdb.c
+--- samba-3.3.0rc2.orig/source/passdb/pdb_tdb.c
++++ samba-3.3.0rc2/source/passdb/pdb_tdb.c
 @@ -1613,7 +1613,7 @@
  	/* save the path for later */
  
@@ -63,10 +63,10 @@ Index: samba-3.3.0rc1/source/passdb/pdb_tdb.c
  			     PASSDB_FILE_NAME) < 0) {
  			return NT_STATUS_NO_MEMORY;
  		}
-Index: samba-3.3.0rc1/source/modules/vfs_xattr_tdb.c
+Index: samba-3.3.0rc2/source/modules/vfs_xattr_tdb.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/modules/vfs_xattr_tdb.c
-+++ samba-3.3.0rc1/source/modules/vfs_xattr_tdb.c
+--- samba-3.3.0rc2.orig/source/modules/vfs_xattr_tdb.c
++++ samba-3.3.0rc2/source/modules/vfs_xattr_tdb.c
 @@ -576,7 +576,7 @@
  	const char *dbname;
  
@@ -76,10 +76,10 @@ Index: samba-3.3.0rc1/source/modules/vfs_xattr_tdb.c
  
  	if (dbname == NULL) {
  		errno = ENOSYS;
-Index: samba-3.3.0rc1/source/passdb/secrets.c
+Index: samba-3.3.0rc2/source/passdb/secrets.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/passdb/secrets.c
-+++ samba-3.3.0rc1/source/passdb/secrets.c
+--- samba-3.3.0rc2.orig/source/passdb/secrets.c
++++ samba-3.3.0rc2/source/passdb/secrets.c
 @@ -59,7 +59,7 @@
  		return True;
  
diff --git a/debian/patches/installswat.sh.patch b/debian/patches/installswat.sh.patch
index 9d5ec0206d..ac4653b792 100644
--- a/debian/patches/installswat.sh.patch
+++ b/debian/patches/installswat.sh.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.3.0rc1/source/script/installswat.sh
+Index: samba-3.3.0rc2/source/script/installswat.sh
 ===================================================================
---- samba-3.3.0rc1.orig/source/script/installswat.sh
-+++ samba-3.3.0rc1/source/script/installswat.sh
+--- samba-3.3.0rc2.orig/source/script/installswat.sh
++++ samba-3.3.0rc2/source/script/installswat.sh
 @@ -198,7 +198,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)
diff --git a/debian/patches/no-unnecessary-cups.patch b/debian/patches/no-unnecessary-cups.patch
index 7bec275fac..0ee25d0962 100644
--- a/debian/patches/no-unnecessary-cups.patch
+++ b/debian/patches/no-unnecessary-cups.patch
@@ -5,11 +5,11 @@ Fixes: bug #479512
 
 Upstream status: submitted as bugzilla bug #5525
 
-Index: samba-3.3.0rc1/source/smbd/server.c
+Index: samba-3.3.0rc2/source/smbd/server.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/smbd/server.c
-+++ samba-3.3.0rc1/source/smbd/server.c
-@@ -807,6 +807,10 @@
+--- samba-3.3.0rc2.orig/source/smbd/server.c
++++ samba-3.3.0rc2/source/smbd/server.c
+@@ -806,6 +806,10 @@
  	int pnum = lp_servicenumber(PRINTERS_NAME);
  	const char *pname;
  
diff --git a/debian/patches/non-linux-ports.patch b/debian/patches/non-linux-ports.patch
index 187a8b5aa5..af2736bb65 100644
--- a/debian/patches/non-linux-ports.patch
+++ b/debian/patches/non-linux-ports.patch
@@ -7,10 +7,10 @@ Status wrt upstream: Forwarded, will be in 3.0.26
 Note: Upstream would probably welcome patches allowing to build on new architectures. 
       As this patch is the most often broken by new upstream releases, everybody would benefit from it.
 
-Index: samba-3.3.0rc1/source/configure.in
+Index: samba-3.3.0rc2/source/configure.in
 ===================================================================
---- samba-3.3.0rc1.orig/source/configure.in
-+++ samba-3.3.0rc1/source/configure.in
+--- samba-3.3.0rc2.orig/source/configure.in
++++ samba-3.3.0rc2/source/configure.in
 @@ -553,6 +553,15 @@
        fi
      ;;
@@ -27,7 +27,7 @@ Index: samba-3.3.0rc1/source/configure.in
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -1208,7 +1217,7 @@
+@@ -1222,7 +1231,7 @@
  #
  #
  case "$host_os" in
@@ -36,7 +36,7 @@ Index: samba-3.3.0rc1/source/configure.in
         # glibc <= 2.3.2 has a broken getgrouplist
         AC_TRY_RUN([
  #include <unistd.h>
-@@ -1642,7 +1651,10 @@
+@@ -1656,7 +1665,10 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -48,7 +48,7 @@ Index: samba-3.3.0rc1/source/configure.in
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5361,7 +5373,7 @@
+@@ -5375,7 +5387,7 @@
  	AC_MSG_RESULT(yes);
  
  	case "$host_os" in
@@ -57,7 +57,7 @@ Index: samba-3.3.0rc1/source/configure.in
  		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
  		AC_TRY_LINK([#include <sys/sendfile.h>],
  [\
-@@ -5687,11 +5699,11 @@
+@@ -5701,11 +5713,11 @@
  WINBIND_NSS_PTHREAD=""
  
  case "$host_os" in
diff --git a/debian/patches/pam-examples.patch b/debian/patches/pam-examples.patch
index ddb77cbcdf..114593bd78 100644
--- a/debian/patches/pam-examples.patch
+++ b/debian/patches/pam-examples.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.3.0rc1/source/pam_smbpass/README
+Index: samba-3.3.0rc2/source/pam_smbpass/README
 ===================================================================
---- samba-3.3.0rc1.orig/source/pam_smbpass/README
-+++ samba-3.3.0rc1/source/pam_smbpass/README
+--- samba-3.3.0rc2.orig/source/pam_smbpass/README
++++ samba-3.3.0rc2/source/pam_smbpass/README
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.
diff --git a/debian/patches/proper-static-lib-linking.patch b/debian/patches/proper-static-lib-linking.patch
index 523c932dd0..71d83ef7a1 100644
--- a/debian/patches/proper-static-lib-linking.patch
+++ b/debian/patches/proper-static-lib-linking.patch
@@ -7,10 +7,10 @@ Status wrt upstream: not yet forwarded
 Note:
 
 === modified file 'source/Makefile.in'
-Index: samba-3.3.0rc1/source/Makefile.in
+Index: samba-3.3.0rc2/source/Makefile.in
 ===================================================================
---- samba-3.3.0rc1.orig/source/Makefile.in
-+++ samba-3.3.0rc1/source/Makefile.in
+--- samba-3.3.0rc2.orig/source/Makefile.in
++++ samba-3.3.0rc2/source/Makefile.in
 @@ -239,7 +239,7 @@
  TDB_OBJ = lib/util_tdb.o \
  	  lib/dbwrap.o lib/dbwrap_tdb.o \
@@ -474,10 +474,10 @@ Index: samba-3.3.0rc1/source/Makefile.in
  	$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
  		torture/t_strappend.o -L ./bin -lbigballofmud
  
-Index: samba-3.3.0rc1/source/m4/aclocal.m4
+Index: samba-3.3.0rc2/source/m4/aclocal.m4
 ===================================================================
---- samba-3.3.0rc1.orig/source/m4/aclocal.m4
-+++ samba-3.3.0rc1/source/m4/aclocal.m4
+--- samba-3.3.0rc2.orig/source/m4/aclocal.m4
++++ samba-3.3.0rc2/source/m4/aclocal.m4
 @@ -68,7 +68,8 @@
  LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
  LIBUC[_SHARED]=
diff --git a/debian/patches/series b/debian/patches/series
index 24ce4a5043..bcba06efb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,5 @@ swat-de.patch
 smbtar-bashism.patch
 no-unnecessary-cups.patch
 shrink-dead-code.patch
+smb.conf.5-undefined-configure.patch
+swat-status-page.patch
diff --git a/debian/patches/shrink-dead-code.patch b/debian/patches/shrink-dead-code.patch
index 1b0c4d0ec9..2567499fb7 100644
--- a/debian/patches/shrink-dead-code.patch
+++ b/debian/patches/shrink-dead-code.patch
@@ -1,7 +1,7 @@
-Index: samba-3.3.0rc1/source/Makefile.in
+Index: samba-3.3.0rc2/source/Makefile.in
 ===================================================================
---- samba-3.3.0rc1.orig/source/Makefile.in
-+++ samba-3.3.0rc1/source/Makefile.in
+--- samba-3.3.0rc2.orig/source/Makefile.in
++++ samba-3.3.0rc2/source/Makefile.in
 @@ -1321,37 +1321,47 @@
  
  bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
diff --git a/debian/patches/smb.conf.5-undefined-configure.patch b/debian/patches/smb.conf.5-undefined-configure.patch
new file mode 100644
index 0000000000..de813c1c77
--- /dev/null
+++ b/debian/patches/smb.conf.5-undefined-configure.patch
@@ -0,0 +1,21 @@
+Goal: Fix a syntax error in smb.conf(5)
+
+Fixes: #512843
+
+Status wrt upstream: Reported
+
+Note: Should rather be fixed in the original XML file
+
+Index: samba-3.3.0rc2/docs/manpages/smb.conf.5
+===================================================================
+--- samba-3.3.0rc2.orig/docs/manpages/smb.conf.5
++++ samba-3.3.0rc2/docs/manpages/smb.conf.5
+@@ -7769,7 +7769,7 @@
+ This option is only available if Samba was configured with the argument
+ \-\-with\-sys\-quotas
+ or on linux when
+-\./configure \-\-with\-quotas
++ \./configure \-\-with\-quotas
+ was used and a working quota api was found in the system\. Most packages are configured with these options already\.
+ .sp
+ This parameter should specify the path to a script that can set quota for the specified arguments\.
diff --git a/debian/patches/smbclient-pager.patch b/debian/patches/smbclient-pager.patch
index 7a4ae86688..070400051e 100644
--- a/debian/patches/smbclient-pager.patch
+++ b/debian/patches/smbclient-pager.patch
@@ -8,10 +8,10 @@ Author: Steve Langasek <vorlon@debian.org>
 
 Note: 
 
-Index: samba-3.3.0rc1/source/include/local.h
+Index: samba-3.3.0rc2/source/include/local.h
 ===================================================================
---- samba-3.3.0rc1.orig/source/include/local.h
-+++ samba-3.3.0rc1/source/include/local.h
+--- samba-3.3.0rc2.orig/source/include/local.h
++++ samba-3.3.0rc2/source/include/local.h
 @@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */
diff --git a/debian/patches/smbpasswd-syslog.patch b/debian/patches/smbpasswd-syslog.patch
index 53374780a5..ddc8763e86 100644
--- a/debian/patches/smbpasswd-syslog.patch
+++ b/debian/patches/smbpasswd-syslog.patch
@@ -4,10 +4,10 @@ Fixes: bug #434372
 
 Upstream status: submitted as bugzilla bug #4831
 
-Index: samba-3.3.0rc1/source/pam_smbpass/support.c
+Index: samba-3.3.0rc2/source/pam_smbpass/support.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/pam_smbpass/support.c
-+++ samba-3.3.0rc1/source/pam_smbpass/support.c
+--- samba-3.3.0rc2.orig/source/pam_smbpass/support.c
++++ samba-3.3.0rc2/source/pam_smbpass/support.c
 @@ -14,6 +14,7 @@
   * this program; if not, see <http://www.gnu.org/licenses/>.
   */
@@ -281,10 +281,10 @@ Index: samba-3.3.0rc1/source/pam_smbpass/support.c
  	}
  	make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
  				"No password supplied" : "Password unchanged" );
-Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_auth.c
+Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_auth.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.3.0rc1/source/pam_smbpass/pam_smb_auth.c
+--- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_auth.c
++++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_auth.c
 @@ -81,10 +81,9 @@
  
  	/* Samba initialization. */
@@ -359,10 +359,10 @@ Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_auth.c
  			, "pam_get_item returned error to pam_sm_authenticate" );
  		return PAM_AUTHTOK_RECOVER_ERR;
  	} else if (pass == NULL) {
-Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_acct.c
+Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_acct.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.3.0rc1/source/pam_smbpass/pam_smb_acct.c
+--- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_acct.c
++++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_acct.c
 @@ -58,26 +58,25 @@
  
  	/* Samba initialization. */
@@ -423,10 +423,10 @@ Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_acct.c
  		}
  		make_remark( pamh, ctrl, PAM_ERROR_MSG
  			, "Your account has been disabled; "
-Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_passwd.c
+Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_passwd.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.3.0rc1/source/pam_smbpass/pam_smb_passwd.c
+--- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_passwd.c
++++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_passwd.c
 @@ -106,10 +106,9 @@
  
      /* Samba initialization. */
@@ -563,10 +563,10 @@ Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_passwd.c
          retval = PAM_ABORT;
  
      }
-Index: samba-3.3.0rc1/source/pam_smbpass/support.h
+Index: samba-3.3.0rc2/source/pam_smbpass/support.h
 ===================================================================
---- samba-3.3.0rc1.orig/source/pam_smbpass/support.h
-+++ samba-3.3.0rc1/source/pam_smbpass/support.h
+--- samba-3.3.0rc2.orig/source/pam_smbpass/support.h
++++ samba-3.3.0rc2/source/pam_smbpass/support.h
 @@ -1,8 +1,8 @@
  /* syslogging function for errors and other information */
 -extern void _log_err(int, const char *, ...);
diff --git a/debian/patches/smbtar-bashism.patch b/debian/patches/smbtar-bashism.patch
index af93f12253..1abf1ac600 100644
--- a/debian/patches/smbtar-bashism.patch
+++ b/debian/patches/smbtar-bashism.patch
@@ -8,10 +8,10 @@ Author: Jelmer Vernooij <jelmer@samba.org>
 
 Note:
 
-Index: samba-3.3.0rc1/source/script/smbtar
+Index: samba-3.3.0rc2/source/script/smbtar
 ===================================================================
---- samba-3.3.0rc1.orig/source/script/smbtar
-+++ samba-3.3.0rc1/source/script/smbtar
+--- samba-3.3.0rc2.orig/source/script/smbtar
++++ samba-3.3.0rc2/source/script/smbtar
 @@ -151,7 +151,7 @@
  if [ -z "$verbose" ]; then
        echo "server    is $server"
diff --git a/debian/patches/swat-de.patch b/debian/patches/swat-de.patch
index bcafc9f77b..9b8daf0999 100644
--- a/debian/patches/swat-de.patch
+++ b/debian/patches/swat-de.patch
@@ -5,10 +5,10 @@ Fixes: bug #487681
 Upstream status: should be forwarded (however, a translation round
                  was made a while ago, which is rotting in upstream's BTS)
 
-Index: samba-3.3.0rc1/source/po/de.msg
+Index: samba-3.3.0rc2/source/po/de.msg
 ===================================================================
---- samba-3.3.0rc1.orig/source/po/de.msg
-+++ samba-3.3.0rc1/source/po/de.msg
+--- samba-3.3.0rc2.orig/source/po/de.msg
++++ samba-3.3.0rc2/source/po/de.msg
 @@ -1,5 +1,6 @@
  # German messages for international release of SWAT.
  # Copyright (C) 2001 Andreas Moroder
diff --git a/debian/patches/swat-status-page.patch b/debian/patches/swat-status-page.patch
new file mode 100644
index 0000000000..4263d419f4
--- /dev/null
+++ b/debian/patches/swat-status-page.patch
@@ -0,0 +1,22 @@
+Goal: Correct headers in SWAT status page
+
+Fixes: #511275
+
+Status wrt upstream: Will be fixed in 3.3.0
+
+Note: 
+
+Index: samba-3.3.0rc2/source/web/statuspage.c
+===================================================================
+--- samba-3.3.0rc2.orig/source/web/statuspage.c
++++ samba-3.3.0rc2/source/web/statuspage.c
+@@ -427,7 +427,8 @@
+ 
+ 	printf("<h3>%s</h3>\n", _("Open Files"));
+ 	printf("<table border=1>\n");
+-	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", _("PID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
++	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
++		_("PID"), _("UID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
+ 
+ 	locking_init_readonly();
+ 	share_mode_forall(print_share_mode, NULL);
diff --git a/debian/patches/undefined-symbols.patch b/debian/patches/undefined-symbols.patch
index 78933b1ace..00a86f8a12 100644
--- a/debian/patches/undefined-symbols.patch
+++ b/debian/patches/undefined-symbols.patch
@@ -9,10 +9,10 @@ for it.
 
 Note: 
 
-Index: samba-3.3.0rc1/source/Makefile.in
+Index: samba-3.3.0rc2/source/Makefile.in
 ===================================================================
---- samba-3.3.0rc1.orig/source/Makefile.in
-+++ samba-3.3.0rc1/source/Makefile.in
+--- samba-3.3.0rc2.orig/source/Makefile.in
++++ samba-3.3.0rc2/source/Makefile.in
 @@ -1962,7 +1962,7 @@
  
  $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
diff --git a/debian/patches/usershare.patch b/debian/patches/usershare.patch
index a48f17e5d4..8d18e15899 100644
--- a/debian/patches/usershare.patch
+++ b/debian/patches/usershare.patch
@@ -8,10 +8,10 @@ Authors: Mathias Gug <mathiaz@ubuntu.com>,
 
 Status wrt upstream: Debian-specific
 
-Index: samba-3.3.0rc1/docs/manpages/smb.conf.5
+Index: samba-3.3.0rc2/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/smb.conf.5
-+++ samba-3.3.0rc1/docs/manpages/smb.conf.5
+--- samba-3.3.0rc2.orig/docs/manpages/smb.conf.5
++++ samba-3.3.0rc2/docs/manpages/smb.conf.5
 @@ -269,7 +269,7 @@
  .PP
  usershare path
@@ -54,7 +54,7 @@ Index: samba-3.3.0rc1/docs/manpages/smb.conf.5
  .PP
  net usershare add sharename path [comment] [acl] [guest_ok=[y|n]]
  .RS 4
-@@ -8839,25 +8815,25 @@
+@@ -8841,25 +8817,25 @@
  usershare path (G)
  .PP
  .RS 4
@@ -86,10 +86,10 @@ Index: samba-3.3.0rc1/docs/manpages/smb.conf.5
  .RE
  
  usershare prefix allow list (G)
-Index: samba-3.3.0rc1/docs/manpages/net.8
+Index: samba-3.3.0rc2/docs/manpages/net.8
 ===================================================================
---- samba-3.3.0rc1.orig/docs/manpages/net.8
-+++ samba-3.3.0rc1/docs/manpages/net.8
+--- samba-3.3.0rc2.orig/docs/manpages/net.8
++++ samba-3.3.0rc2/docs/manpages/net.8
 @@ -666,9 +666,9 @@
  Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\. In this case the secret is used as the password for the user DN used to bind to the ldap server\.
  .SS "USERSHARE"
@@ -102,10 +102,10 @@ Index: samba-3.3.0rc1/docs/manpages/net.8
  .PP
  The usershare commands are:
  .IP "" 4
-Index: samba-3.3.0rc1/source/param/loadparm.c
+Index: samba-3.3.0rc2/source/param/loadparm.c
 ===================================================================
---- samba-3.3.0rc1.orig/source/param/loadparm.c
-+++ samba-3.3.0rc1/source/param/loadparm.c
+--- samba-3.3.0rc2.orig/source/param/loadparm.c
++++ samba-3.3.0rc2/source/param/loadparm.c
 @@ -4913,7 +4913,7 @@
  	string_set(&Globals.szUsersharePath, s);
  	SAFE_FREE(s);
diff --git a/debian/po/ar.po b/debian/po/ar.po
index deb262b3bc..2738821e10 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-14 11:37+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -58,8 +58,8 @@ msgstr "إعداد آلي لملف smb.conf ؟"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -89,10 +89,16 @@ 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."
 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."
+"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 ""
 "من فضلك حدِّد مجموعة العمل التي تريد أن يظهر داخلها هذا الخادم عند استفساره من "
 "طرف الزبائن. لاحظ أن هذا المقياس يتحكم في إسم الحقل المستعمل مع الخيار "
@@ -107,8 +113,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -118,10 +129,16 @@ msgstr ""
 #. 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."
 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."
+"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."
@@ -161,8 +178,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "راجع /usr/share/doc/samba-doc/htmldocs/ENCRYPTION في رزمة samba-doc لتفاصيل "
 "أكثر."
diff --git a/debian/po/ast.po b/debian/po/ast.po
new file mode 100644
index 0000000000..0a4deb0dfa
--- /dev/null
+++ b/debian/po/ast.po
@@ -0,0 +1,211 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba package\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"PO-Revision-Date: 2009-01-15 09:17+0100\n"
+"Last-Translator: astur <malditoastur@gmail.com>\n"
+"Language-Team: Asturian <softast-xeneral@lists.sourceforge.net>\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-Poedit-Language: Asturian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Country: SPAIN\n"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:1001
+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
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Si'l to ordenador garra información dende direiciones IP dende un sirvidor "
+"DHCP nuna rede, el sirvidor DHCP tamién-y podría dar información acerca de "
+"sirvidores WINS (\"NetBIOS name servers\") presentes na rede. Esto requier "
+"camudar el to ficheru smb.conf ya que DHCP da la configuración de WINS qué "
+"será automáticamente lleío dende /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:1001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"El paquete dhcp3-client tien qu'instálase p'algamar la ventaxa d'esta "
+"carauterística."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Configure smb.conf automatically?"
+msgstr "¿Configurar smb.conf automáticamente?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"El restu de la configuración de Samba fina con entrugues qu'afeuten a los "
+"parámetros de /etc/samba/smb.conf, el cual ye'l ficheru usáu pa configurar "
+"el programa Samba (nmbd y smbd). El to smb.conf actual contién una llinia de "
+"'include' o una opción que rellena múltiples llinies, lo cual puede "
+"confundir nel procesu de configuración automática y requier qu'edites el to "
+"smb.conf a manu pa poder a trabayar con él."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Si nun escueyes esta opción, tendrás que camudar manualmente la "
+"configuración por ti mesmu, y nun tendrás les ventaxes de les meyores de "
+"configuración periódiques."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3001
+msgid "Workgroup/Domain Name:"
+msgstr "Nome de Grupu/Dominiu:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3001
+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 ""
+"Por favor, pon el grupu de trabayu pa esti sistema. Esta opción remana'l "
+"sistema de grupos de trabayu que s'espublizará cuando s'usa como un "
+"sirvidor, por defeutu el grupu de trabayu a ser usaos mientres la ñavegación "
+"con distintos interfaces, y el nome de dominiu usáu cola configuración "
+"\"security=domain\""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:4001
+msgid "Use password encryption?"
+msgstr "¿Usar contraseña encriptada?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:4001
+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 ""
+"Tolos clientes con Windows recientes comuniquense con sirvidores SMB/CIFS "
+"usando contraseñes encriptaes. Si quies usar contraseñes con testu nidiu "
+"necesites camudar un parámetru nel to rexistru de Windows."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:4001
+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 ""
+"Activar esta opción ye altamente recomendable. Si lo faes, tate seguru que "
+"tienes un ficheru /etc/samba/smbpasswd válidu y que afitastes les "
+"contraseñes nél pa cada usuariu usando'l comandu smbpasswd."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr ""
+"¿Criar una contraseña pa la base de datos de samba, /var/lib/samba/passdb."
+"tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords.  This requires user passwords to "
+"be stored in a file separate from /etc/passwd.  This file can be created "
+"automatically, but the passwords must be added manually by running smbpasswd "
+"and be kept up-to-date in the future."
+msgstr ""
+"Pa ser compatible col comportamientu por defeutu na mayor de les versiones "
+"Windows, Samba debe configurase pa usar contraseñes encriptaes. Esto requier "
+"qu'una contraseña d'usuariu seya almacenada nun ficheru separtáu dende /etc/"
+"passwd. Esti ficheru puede criase automáticamente, pero les contraseñes "
+"deben amestase-y manualmente executando smbpasswd y mantenelu nel futuru."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
+msgid ""
+"If you do not create it, you will have to reconfigure Samba (and probably "
+"your client machines) to use plaintext passwords."
+msgstr ""
+"Si nun la crias, tendrás que reconfigurar Samba (y probablemente'l to "
+"cliente) pa usar contraseñes de testu planu."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:1001
+msgid ""
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
+msgstr ""
+"Mira /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+"html dende'l paquete samba-doc pa más detalles."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "degorrios"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "¿Cómo quies executar Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"El degorriu Samba smbd puede correr como un degorriu normal o dende inetd. "
+"Corriendo como un degorriu ye la escoyeta recomendada."
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 3d3450e875..cc53563e33 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.23c-1_bg\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-12 22:58+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsoftsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,8 +55,8 @@ msgstr "Автоматична настройка на smb.conf?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -85,10 +85,16 @@ 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."
 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."
+"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 ""
 "Въведете името на работната група, от която ще бъде част компютъра. Този "
 "параметър контролира и името на домейна, което ще се използва при "
@@ -103,8 +109,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -115,10 +126,16 @@ msgstr ""
 #. 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."
 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."
+"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 "Използването на шифрирани пароли е силно препоръчително."
 
 #. Type: boolean
@@ -156,10 +173,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"За повече информация вижте /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html."
+"За повече информация вижте /usr/share/doc/samba-doc/htmldocs/Samba3-"
+"Developers-Guide/pwencrypt.html."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/bs.po b/debian/po/bs.po
index 656e2079b6..d8f49fff99 100644
--- a/debian/po/bs.po
+++ b/debian/po/bs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-11-01 22:14+0100\n"
 "Last-Translator: Safir Secerovic <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -66,8 +66,8 @@ msgstr "Podesiti smb.conf automatski?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -98,10 +98,16 @@ msgstr "Workgroup/Domain Name:"
 #. 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."
 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."
+"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 ""
 "Molim navedite workgroup u kojoj želite da se ovaj server nalazi prilikom "
 "upita od strane klijenata. Primijetite da ovaj parametar takođe kontroliše "
@@ -116,8 +122,13 @@ msgstr "Koristiti enkripciju šifre?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -128,10 +139,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Uključivanje ove opcije je veoma preporučeno. Ako to uradite, pobrinite se "
 "da imate ispravnu /etc/samba/smbpasswd datoteku i da u njoj postavite šifre "
@@ -173,11 +190,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Vidjeti /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html iz samba-doc "
-"paketa za više detalja."
+"Vidjeti /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+"html iz samba-doc paketa za više detalja."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/ca.po b/debian/po/ca.po
index e12bd12cbd..ef14a68358 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.0beta2-1_templates\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-08-13 15:16-0700\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -60,8 +60,8 @@ msgstr "Voleu configurar el smb.conf automàticament?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -92,10 +92,16 @@ msgstr "Grup de treball/nom del domini:"
 #. 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."
 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."
+"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 ""
 "Indiqueu en quin grup de treball voleu que aparegui el vostre servidor quan "
 "ho consultin els clients. Recordeu que aquest paràmetre també controla el "
@@ -110,8 +116,13 @@ msgstr "Voleu utilitzar el xifrat de contrasenyes?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -122,10 +133,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "És recomanable habilitar aquesta opció. Si ho feu, assegureu-vos de tenir un "
 "fitxer /etc/samba/smbpasswd vàlid i que hi especifiqueu la contrasenya de "
@@ -170,8 +187,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Per més informació feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html del paquet samba-doc."
@@ -215,8 +232,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Des de la versió 3.0.23, Samba ja no permet l'encadenament de més d'un "
 #~ "passdb al paràmetre «passdb backend». Sembla que el vostre smb.conf conté "
-#~ "un paràmetre «passdb backend» que consta d'una llista de rerefons. La "
-#~ "nova versió de Samba no funcionarà fins que ho corregiu."
+#~ "un paràmetre «passdb backend» que consta d'una llista de rerefons. La nova "
+#~ "versió de Samba no funcionarà fins que ho corregiu."
 
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr "Voleu moure /etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 36ca62a681..76f4633f7a 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 22:31+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -65,8 +65,8 @@ msgstr "Konfigurovat smb.conf automaticky?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -97,10 +97,16 @@ msgstr "Skupina/název domény:"
 #. 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."
 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."
+"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 ""
 "Zadejte prosím jméno skupiny, do které má server patřit (resp. se to tak "
 "bude jevit klientům. Tento parametr také určuje název domény v případech, "
@@ -115,8 +121,13 @@ msgstr "Použít šifrování hesel?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -127,10 +138,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Povolení této volby je silně doporučeno. Dáte-li na naši radu, měli byste se "
 "ujistit, že máte platný soubor /etc/samba/smbpasswd a že v něm nastavíte "
@@ -172,8 +189,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Podrobnosti naleznete v souboru /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 "html z balíku samba-doc."
diff --git a/debian/po/da.po b/debian/po/da.po
index aa55da01b7..1a61d30e7e 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-05-30 22:20+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -59,8 +59,8 @@ msgstr "S�t smb.conf op automatisk?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -92,10 +92,16 @@ msgstr "Arbejdsgruppe/dom�ne-navn:"
 #. 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."
 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."
+"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 ""
 "Angiv den arbejdsgruppe, din server skal optr�de i, n�r den bliver spurgt af "
 "klienter. Bem�rk at dette ogs� styrer det dom�nenavn, der bruges ved "
@@ -110,8 +116,13 @@ msgstr "Krypt�r adgangskoder?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -122,10 +133,16 @@ msgstr ""
 #. 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."
 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."
+"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 at du v�lger denne indstilling. Hvis du g�r, s� s�rg for at du "
 "har en gyldig /etc/samba/smbpasswd-fil og at du her angiver adgangskoder for "
@@ -167,11 +184,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html i pakken samba-doc for "
-"flere detaljer."
+"Se /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"i pakken samba-doc for flere detaljer."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/de.po b/debian/po/de.po
index c8d22c1943..71ca454bbb 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-12 22:27+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -69,8 +69,8 @@ msgstr "Soll smb.conf automatisch konfiguriert werden?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -102,10 +102,16 @@ msgstr "Arbeitsgruppen-/Domain-Name:"
 #. 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."
 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."
+"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 ""
 "Bitte geben Sie die Arbeitsgruppe an, in der der Server bei Anfragen von "
 "Clients erscheinen soll. Beachten Sie, dass dieser Parameter auch den Domain-"
@@ -120,8 +126,13 @@ msgstr "Verschlüsselte Passwörter verwenden?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -132,10 +143,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Es wird dringendst empfohlen, diese Option zu aktivieren. Stellen Sie in dem "
 "Fall sicher, dass Sie eine gültige /etc/samba/smbpasswd-Datei haben und dort "
@@ -179,11 +196,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Details finden Sie in /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html aus "
-"dem samba-doc-Paket."
+"Details finden Sie in /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+"Guide/pwencrypt.html aus dem samba-doc-Paket."
 
 #. Type: select
 #. Choices
@@ -223,9 +240,9 @@ msgstr ""
 #~ "backends.  The new version of samba will not work until you correct this."
 #~ msgstr ""
 #~ "Seit Version 3.0.23 wird die Angabe von mehreren Backends im »passdb "
-#~ "backend«-Parameter von Samba nicht mehr unterstützt. Es scheint so, als "
-#~ "ob Ihre smb.conf-Datei einen »passdb backend«-Parameter mit einer "
-#~ "Auflistung mehrerer Backends enthält. Die neue Samba-Version wird nicht "
+#~ "backend«-Parameter von Samba nicht mehr unterstützt. Es scheint so, als ob "
+#~ "Ihre smb.conf-Datei einen »passdb backend«-Parameter mit einer Auflistung "
+#~ "mehrerer Backends enthält. Die neue Samba-Version wird nicht "
 #~ "funktionieren, bevor dies behoben wurde."
 
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
diff --git a/debian/po/dz.po b/debian/po/dz.po
index 7416897142..185495ae6c 100644
--- a/debian/po/dz.po
+++ b/debian/po/dz.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po.pot\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 02:22+0530\n"
 "Last-Translator: translator <pemai_jurmey@hotmail.com>\n"
 "Language-Team: dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -71,8 +71,8 @@ msgstr "smb.conf འདི་རང་བཞིན་གྱིས་རིམ་
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -102,10 +102,16 @@ 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."
 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."
+"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 ""
 "ཞབས་ཏོག་སྤྱོད་མི་གིས་འདྲི་དཔྱད་འབདཝ་ད་ དེ་ནང་ལུ་སར་བར་འབྱུང་ནི་ཨིན་པའི་ལཱ་གི་སྡེ་ཚན་འདི་གསལ་བཀོད་"
 "འབད་གནང་། ཚད་བཟུང་འདི་གིས་ སྲུང་སྐྱོབ་=ཌཱ་མཱེན་སྒྲིག་སྟངས་དང་གཅིག་ཁར་ལག་ལེན་འཐབ་ཡོད་པའི་ཌཱ་མཱེན་མིང་"
@@ -120,8 +126,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -132,10 +143,16 @@ msgstr ""
 #. 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."
 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."
+"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 བརྡ་བཀོད་"
@@ -178,8 +195,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "ཁ་གསལ་མཁྱེན་ནིའི་དོན་ལུ་ སམ་བ་-ཌོཀ་ཐུམ་སྒྲིལ་ནང་ལས་ /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html ལུ་ལྟ།"
diff --git a/debian/po/el.po b/debian/po/el.po
index 303b0c1f18..05681def76 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_el\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-16 11:29+0200\n"
 "Last-Translator: galaxico\n"
 "Language-Team:  <en@li.org>\n"
@@ -71,8 +71,8 @@ msgstr "Αυτόματη ρύθμιση του αρχείου smb.conf;"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -105,10 +105,16 @@ 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."
 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."
+"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 ""
 "Παρακαλώ προσδιορίστε το όνομα της ομάδας εργασίας (workgroup) στην οποία "
 "θέλετε να εμφανίζει αυτός ο εξυπηρετητής ότι ανήκει όταν ερωτάται από τους "
@@ -124,8 +130,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -137,10 +148,16 @@ msgstr ""
 #. 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."
 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."
+"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 και ότι ορίζετε "
@@ -188,8 +205,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Δείτε το αρχείο usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html από το "
 "πακέτο samba-doc για περισσότερες λεπτομέρειες."
diff --git a/debian/po/eo.po b/debian/po/eo.po
index 18fc152b4f..1d87f66d8c 100644
--- a/debian/po/eo.po
+++ b/debian/po/eo.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-04-04 17:14+0200\n"
 "Last-Translator: Serge Leblanc <serge.leblanc@wanadoo.fr>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
@@ -56,8 +56,8 @@ msgstr "Akomodu mem la 'smb.conf'-dosieron?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -88,10 +88,16 @@ msgstr "Laborgrupo/Domajnnomo:"
 #. 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."
 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."
+"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 ""
 "Bonvolu indiki la laborgrupon, kies klientoj devas trovi la servilon. Notu, "
 "tiu parametro ankaŭ kontrolas la uzitan domajnnomon de la parametro "
@@ -106,8 +112,13 @@ msgstr "Uzu pasvortan ĉifradon?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -118,10 +129,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Ege rekomendita tiu eblo estas. Se vi elektas ĝin, kontrolu ĉu vi havas "
 "validan '/etc/samba/smbpasswd'-dosieron, en kiu vi enmetis pasvortojn por "
@@ -163,11 +180,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Vidu la '/usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html'-dosieron de "
-"'samba-doc'-pako por pliaj informoj."
+"Vidu la '/usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+"html'-dosieron de 'samba-doc'-pako por pliaj informoj."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/es.po b/debian/po/es.po
index 365fcf0fc6..8e4f4d923a 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -37,8 +37,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.23c-1\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-10-08 13:43+0200\n"
 "Last-Translator: Steve Langasek <vorlon@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -89,8 +89,8 @@ msgstr "¿Configurar smb.conf automaticamente?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -122,10 +122,16 @@ msgstr "Nombre del dominio o del grupo de trabajo:"
 #. 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."
 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."
+"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 ""
 "Indique el grupo de trabajo en el cual quiere que su servidor aparezca "
 "cuando se lo pregunten los clientes de la red. Este parámetro también "
@@ -141,8 +147,13 @@ msgstr "¿Utilizar contraseñas cifradas?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -153,10 +164,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Es muy recomendable habilitar esta opción. Compruebe que tiene un fichero /"
 "etc/samba/smbpasswd válido y que configura las contraseñas para cada usuario "
@@ -183,8 +200,7 @@ msgstr ""
 "sistemas Windows. Para hacer esto es necesario crear un fichero, distinto "
 "del /etc/passwd, donde se guarden las contraseñas de los usuarios. El "
 "fichero se puede crear automaticamente, aunque es necesario añadir las "
-"contraseñas manualmente mediante el programa «smbpasswd» y mantenerlas al "
-"día."
+"contraseñas manualmente mediante el programa «smbpasswd» y mantenerlas al día."
 
 #. Type: boolean
 #. Description
@@ -200,8 +216,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Si desea más información consulte /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html, disponible en el paquete samba-doc."
diff --git a/debian/po/et.po b/debian/po/et.po
index acc5a13706..51769d17ae 100644
--- a/debian/po/et.po
+++ b/debian/po/et.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 10:26+0300\n"
 "Last-Translator: Siim Põder <siim@p6drad-teel.net>\n"
 "Language-Team: \n"
@@ -65,8 +65,8 @@ msgstr "Seadistada smb.conf automaatselt?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -96,10 +96,16 @@ msgstr "Töögrupi/domeeni 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."
 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."
+"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 ""
 "Palun vali töögrupp, kuhu see server kuulub. Pane tähele, et seesama seade "
 "määrab ka domeeni, mida kasutatakse koos security=domain valikuga."
@@ -113,8 +119,13 @@ msgstr "Kasutada paroolide krüpteerimist?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -125,10 +136,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Selle seade valimine on ülimalt soovitatav. Kui ta valid, palun veendu et "
 "sul oleks sobiv /etc/samba/smbpasswd fail ning sea igale seal olevale "
@@ -169,8 +186,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "End detailidega kurssi viimaks loe /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html pakist samba-doc."
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 4c502400db..d6a708c7ba 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-04-07 23:18+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -69,8 +69,8 @@ msgstr "Smb.conf automatikoki konfiguratu?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -100,10 +100,16 @@ msgstr "Lan Talde/Domeinu izena?"
 #. 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."
 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."
+"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 ""
 "Mesede ezarri zure zerbitzariari sareko bezeroek galdetzean bistaraziko duen "
 "lan taldea. Kontutan izan parametro honek security=domain ezarpeneko domeinu "
@@ -118,8 +124,13 @@ msgstr "Zifraturiko pasahitzak erabili?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -130,10 +141,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Aukera hau erabiltzea oso gomendagarri da. Erabiltzea hautatu ezkero "
 "ziurtatu baliozko /etc/samba/smbpasswd fitxategi bat duzula eta pasahitzak "
@@ -176,11 +193,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
-"begiratu argibide gehiagorako"
+"Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+"pwencrypt.html begiratu argibide gehiagorako"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 68e165d40f..d28ea1edab 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba fi\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 18:35+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -56,8 +56,8 @@ msgstr "Tehd��nk� asetukset tiedostoon smb.conf automaattisesti?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -87,10 +87,16 @@ 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."
 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."
+"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 "
@@ -105,8 +111,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -117,10 +128,16 @@ msgstr ""
 #. 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."
 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."
+"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� "
@@ -162,8 +179,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Katso lis�tietoja paketin samba-doc tiedostosta /usr/share/doc/samba-doc/"
 "htmldocs/ENCRYPTION.html."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 59e10abe91..c7d0570232 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -1,24 +1,13 @@
-# translation of fr.po to French
+# samba debconf screens: French translation.
+# Copyright (C) 2006-2009, Christian Perrier <bubulle@debian.org>
+# This file is distributed under the same license as the samba package.
 #
-#    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.
-#
-# Christian Perrier <bubulle@debian.org>, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
-"PO-Revision-Date: 2007-03-12 20:08+0100\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
+"PO-Revision-Date: 2008-12-29 12:32+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -68,8 +57,8 @@ msgstr "Voulez-vous configurer smb.conf automatiquement ?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -102,13 +91,16 @@ msgstr "Nom de domaine ou de groupe de travail :"
 #. Description
 #: ../samba-common.templates:3001
 msgid ""
-"Please specify the workgroup you want this server to appear to be in when "
-"queried by clients. Note that this parameter also controls the domain name "
-"used with the security=domain setting."
+"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 ""
-"Veuillez indiquer le groupe de travail où les clients doivent trouver le "
-"serveur. Il indique aussi le nom de domaine utilisé par le paramètre "
-"« security=domain » quand celui-ci est utilisé."
+"Veuillez indiquer le groupe de travail pour ce système. Ce réglage définit "
+"le groupe de travail où le système apparaîtra s'il est utilisé comme "
+"serveur, le groupe de travail utilisé par défaut avec les divers outils de "
+"Samba ainsi que le nom de domaine utilisé le cas échéant avec le paramètre "
+"« security=domain »."
 
 #. Type: boolean
 #. Description
@@ -120,11 +112,11 @@ msgstr "Voulez-vous chiffrer les mots de passe ?"
 #. Description
 #: ../samba-common.templates:4001
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
-"Tous les clients Windows récents communiquent avec les serveurs SMB en "
+"Tous les clients Windows récents communiquent avec les serveurs SMB/CIFS en "
 "utilisant des mots de passe chiffrés. Si vous voulez utiliser des mots de "
 "passe sans chiffrement, vous devez modifier un paramètre dans le registre de "
 "Windows."
@@ -133,14 +125,16 @@ msgstr ""
 #. Description
 #: ../samba-common.templates:4001
 msgid ""
-"Enabling this option is highly recommended. If you do, make sure you have a "
-"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
-"user using the smbpasswd command."
+"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 ""
-"Il est recommandé d'utiliser des mots de passe chiffrés. Si vous le faites, "
-"n'oubliez pas de créer un fichier /etc/samba/smbpasswd et d'y établir les "
-"mots de passe de tous les utilisateurs, à l'aide de la commande "
-"« smbpasswd »."
+"Il est fortement recommandé d'utiliser des mots de passe chiffrés car les "
+"mots de passe en clair ne sont plus gérés dans les produits Microsoft "
+"Windows. Si vous le faites, n'oubliez pas de créer un fichier /etc/samba/"
+"smbpasswd et d'y établir les mots de passe de tous les utilisateurs, à "
+"l'aide de la commande « smbpasswd »."
 
 #. Type: boolean
 #. Description
@@ -180,8 +174,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Veuillez consulter le fichier /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 "html dans le paquet samba-doc pour plus d'informations."
@@ -213,40 +207,3 @@ msgid ""
 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."
-
-#~ msgid "Chaining passdb backends is not supported"
-#~ msgstr ""
-#~ "Chaînage de méthodes multiples pour la gestion des mots de passe non géré"
-
-#~ 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 ""
-#~ "À partir de la version 3.0.23, samba ne gère plus le chaînage de méthodes "
-#~ "multiples dans le paramètre « passdb backend » qui décrit les méthodes de "
-#~ "stockage des mots de passe. Il semble que le fichier smb.conf de ce "
-#~ "système utilise un tel chaînage avec une liste de méthodes multiples. La "
-#~ "nouvelle version de samba ne fonctionnera pas correctement tant que ce "
-#~ "réglage n'aura pas été modifié."
-
-#~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
-#~ msgstr ""
-#~ "Faut-il convertir /etc/samba/smbpasswd en /var/lib/samba/passdb.tdb ?"
-
-#~ msgid ""
-#~ "Samba 3.0 introduced a more complete SAM database interface which "
-#~ "supersedes the /etc/samba/smbpasswd file."
-#~ msgstr ""
-#~ "Avec Samba 3.0, une nouvelle interface pour les bases de données SAM, "
-#~ "plus complète, vient remplacer le fichier /etc/samba/smbpasswd."
-
-#~ 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 ""
-#~ "Veuillez confirmer si vous souhaitez que le fichier actuel soit remplacé "
-#~ "par /var/lib/samba/passdb.tdb. Ne choisissez pas cette option si vous "
-#~ "envisagez d'utiliser une autre interface d'authentification (p. ex. LDAP)."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index c2fd273bfd..7938709009 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-12 20:24+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -66,8 +66,8 @@ msgstr "¿Configurar o ficheiro smb.conf automaticamente?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -99,10 +99,16 @@ msgstr "Nome do grupo de traballo/dominio:"
 #. 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."
 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."
+"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 ""
 "Indique o grupo de traballo no que quere que apareza este servidor cando lle "
 "pregunten os clientes. Teña en conta que este parámetro tamén controla o "
@@ -117,8 +123,13 @@ msgstr "¿Empregar cifrado de contrasinais?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -129,10 +140,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Recoméndase activar esta opción. Se o fai, asegúrese de ter un ficheiro /etc/"
 "samba/smbpasswd válido e de establecer nel os contrasinais de cada usuario "
@@ -176,11 +193,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"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/ENCRYPTION.html do "
-"paquete samba-doc para ter máis detalles."
+"Consulte o ficheiro /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+"Guide/pwencrypt.html do paquete samba-doc para ter máis detalles."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/gu.po b/debian/po/gu.po
index 4e21c22c4c..deec8ac304 100644
--- a/debian/po/gu.po
+++ b/debian/po/gu.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_gu\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-06-08 20:22+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -63,8 +63,8 @@ msgstr "smb.conf આપમેળે રુપરેખાંકિત કરશ�
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -94,10 +94,16 @@ 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."
 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."
+"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 ""
 "જ્યારે ક્લાયન્ટો દ્વારા પૂછવામાં આવે ત્યારે વપરાતું આ સર્વર માટેનું વર્કગ્રુપનું નામ મહેરબાની કરી "
 "સ્પષ્ટ કરો. ધ્યાનમાં રાખો કે આ વિકલ્પ ડોમેઇન નામને પણ નિયંત્રણ કરે છે જ્યારે સલામતી=ડોમેઇન "
@@ -112,8 +118,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -124,10 +135,16 @@ msgstr ""
 #. 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."
 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."
+"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 "
@@ -168,11 +185,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"samba-doc પેકેજમાં /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html વધુ માહિતી "
-"માટે જુઓ."
+"samba-doc પેકેજમાં /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+"pwencrypt.html વધુ માહિતી માટે જુઓ."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/he.po b/debian/po/he.po
index a5ec00e0c2..f27e0577a4 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-09-25 21:03+0200\n"
 "Last-Translator: Katriel Traum <katriel.traum@gmail.com>\n"
 "Language-Team: Hebrew <debian-hebrew-common@lists.alioth.debian.org>\n"
@@ -57,8 +57,8 @@ msgstr "האם להגדיר את smb.conf בצורה אוטומטית?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -89,10 +89,16 @@ msgstr "מהו שם קבוצת העבודה/מתחם (Workgroup/Domain)?"
 #. 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."
 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."
+"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 ""
 "אנא ציין את שם קבוצת העבודה (Workgroup) ששרת זה יציג ללקוחות אשר יתחברו "
 "אליו. שים לב כי שם קבוצת העבודה גם קובע את שם המתחם (Domain) בעת שימוש "
@@ -107,8 +113,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -119,10 +130,16 @@ msgstr ""
 #. 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."
 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."
+"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, וכי הוא תקין. בנוסף, יש לדאוג שהקובץ יכיל סיסמה בעבור כל משתמש "
@@ -165,11 +182,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"ראה עוד מידע בקובץ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html מתוך "
-"החבילה samba-doc."
+"ראה עוד מידע בקובץ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+"pwencrypt.html מתוך החבילה samba-doc."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/hu.po b/debian/po/hu.po
index 60b6bf4a3c..ac9e58037c 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 09:20+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -60,8 +60,8 @@ msgstr "Az smb.conf-ot automatikusan állítod be?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -92,10 +92,16 @@ msgstr "Munkacsoport/Tartomány neve:"
 #. 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."
 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."
+"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 ""
 "Add meg e kiszolgáló által megjelenítendő munkacsoport, mikor azt lekérdezik "
 "a kliensek. Vedd figyelembe, hogy e paraméter meghatározza a tartomány nevét "
@@ -110,8 +116,13 @@ msgstr "Használsz kódolt jelszavakat?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -122,10 +133,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "E lehetőség bekapcsolása erősen ajánlott. Ha ezt teszed, győződj meg róla "
 "hogy érvényes /etc/samba/smbpasswd fájllal rendelkezel és hogy beállítottad "
@@ -167,11 +184,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Lásd a samba-doc csomag /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
-"odalát a részletekért."
+"Lásd a samba-doc csomag /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+"Guide/pwencrypt.html odalát a részletekért."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/id.po b/debian/po/id.po
index 4090ef2dfb..b36e17f7fc 100644
--- a/debian/po/id.po
+++ b/debian/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po-id\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2008-03-08 18:24+0700\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
 "Language-Team: Bahasa Indonesia <debian-l10n-id@gurame.fisika.ui.ac.id>\n"
@@ -58,8 +58,8 @@ msgstr "Konfigurasikan smb.conf secara otomatis?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -91,10 +91,16 @@ msgstr "Nama Domain/Workgrop:"
 #. 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."
 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."
+"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 ""
 "Mohon tentukan workgroup yang Anda ingin server ini dikenali oleh klien. "
 "Ingat bahwa parameter ini juga mengendalikan nama domain yang digunakan oleh "
@@ -109,8 +115,13 @@ msgstr "Gunakan enkripsi sandi?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -121,10 +132,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Mengaktifkan pilihan ini sangat dianjurkan. Jika demikian, pastikan Anda "
 "memiliki berkas /etc/samba/smbpasswd tempat Anda menyimpan semua sandi "
@@ -166,11 +183,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Lihat /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html dalam paket samba-"
-"doc."
+"Lihat /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+"html dalam paket samba-doc."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/it.po b/debian/po/it.po
index 69cd19b5b5..63ad26bef2 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2004 Software in the Public Interest
 # This file is distributed under the same license as the samba package.
 # Luca Monducci <luca.mo@tiscali.it>, 2004-2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.24-4 italian debconf templates\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-03-13 13:47+0100\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -58,8 +58,8 @@ msgstr "Configurare automaticamente smb.conf?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -91,10 +91,16 @@ msgstr "Nome del Workgroup/Dominio:"
 #. 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."
 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."
+"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 ""
 "Specificare in quale workgroup deve apparire il server quando verrà "
 "interrogato dai client. Notare che questo parametro controlla anche il nome "
@@ -109,8 +115,13 @@ msgstr "Usare password cifrate?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -121,10 +132,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Si raccomanda d'accettare, in questo caso assicurarsi che il file /etc/samba/"
 "smbpasswd sia valido e che le password di tutti gli utenti siano state "
@@ -167,11 +184,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Si veda /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html, contenuto nel "
-"pacchetto samba-doc, per ulteriori dettagli."
+"Si veda /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+"html, contenuto nel pacchetto samba-doc, per ulteriori dettagli."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/ja.po b/debian/po/ja.po
index bd2e2dc8ec..5e2fd606d1 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 16:39+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -66,8 +66,8 @@ msgstr "自動的に smb.conf を設定しますか?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -97,10 +97,16 @@ 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."
 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."
+"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 設定が使われたときのドメイン"
@@ -115,8 +121,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -127,10 +138,16 @@ msgstr ""
 #. 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."
 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."
+"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 コマン"
@@ -172,8 +189,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "詳細については、samba-doc パッケージにある /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html を参照してください。"
diff --git a/debian/po/ka.po b/debian/po/ka.po
index f2c16a5896..342c8c20f9 100644
--- a/debian/po/ka.po
+++ b/debian/po/ka.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2008-09-10 01:45+0400\n"
 "Last-Translator: Aiet Kolkhi <aietkolkhi@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "გსურთ smb.conf-ის ავტომატური კონ
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -89,10 +89,16 @@ 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."
 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."
+"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 ""
 "მიუთითეთ სამუშაო ჯგუფი (workgroup), რომელსაც სერვერმა თავი უნდა მიაკუთვნოს "
 "კლიენტების მიერ მოთხოვნის გამოგზავნისას. გაითვალისწინეთ, რომ ეს პარამეტრი "
@@ -107,8 +113,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -119,10 +130,16 @@ msgstr ""
 #. 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."
 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."
+"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 ფაილი და რომ იქ ყოველ "
@@ -164,8 +181,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "დამატებითი ინფორმაციისათვის იხილეთ /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html სტატია samba-doc პაკეტიდან."
diff --git a/debian/po/km.po b/debian/po/km.po
index ec3e3d9015..c8f8513594 100644
--- a/debian/po/km.po
+++ b/debian/po/km.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po_km\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 08:39+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -76,8 +76,8 @@ msgstr "កំណត់​រចនាសម្ព័ន្ធ smb.conf ដោ�
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -113,10 +113,16 @@ 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."
 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."
+"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 ""
 "សូម​បញ្ជាក់​ក្រុម​ការងារ​ដែល​អ្នក​ចង់​ឲ្យ​ម៉ាស៊ីន​បម្រើ​នេះ​បង្ហាញ​នៅ​ពេល​ដែល​បាន​សួរ ដោយ​ម៉ាស៊ីន​ភ្ញៀវ ។ ចំណាំ​ថា "
 "ប៉ារ៉ាម៉ែត្រ​នេះ​ក៏​ត្រួត​ពិនិត្យ​ឈ្មោះ​ដែន ដែល​បាន​ប្រើ​ដោយ​សុវត្ថិភាព=ការ​កំណត់​ដែន ។"
@@ -134,8 +140,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -148,10 +159,16 @@ msgstr ""
 #. 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."
 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."
+"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 ត្រឹមត្រូវ ហើយ​អ្នក​បាន​កំណត់​ពាក្យ​សម្ងាត់​ ដូច្នេះ​សម្រាប់​អ្នក​ប្រើ​"
@@ -200,11 +217,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"សម្រាប់​សេចក្តី​លម្អិត​បន្ថែម​សូម​មើល  /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html ពី​"
-"កញ្ចប់ samba-doc ។"
+"សម្រាប់​សេចក្តី​លម្អិត​បន្ថែម​សូម​មើល  /usr/share/doc/samba-doc/htmldocs/Samba3-"
+"Developers-Guide/pwencrypt.html ពី​កញ្ចប់ samba-doc ។"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 51168d74c6..96f37580b1 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -1,10 +1,10 @@
 # Sunjae Park <darehanl@gmail.com>, 2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-14 09:28-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -54,8 +54,8 @@ msgstr "smb.conf을 자동으로 설정할까요?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -85,10 +85,16 @@ 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."
 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."
+"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 방식의 설정을 사용할 경우 사용하는 도메인 이름도 이 매"
@@ -103,8 +109,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -115,10 +126,16 @@ msgstr ""
 #. 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."
 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."
+"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 명령을 사용하여 각 사용자들의 비밀번호"
@@ -160,8 +177,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "자세한 사항은 samba-doc 꾸러미에서 제공하는 /usr/share/doc/samba-doc/"
 "htmldocs/ENCRYPTION.html를 참조하십시오."
diff --git a/debian/po/ku.po b/debian/po/ku.po
index b2066b8955..68a67b34ac 100644
--- a/debian/po/ku.po
+++ b/debian/po/ku.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_ku\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2008-05-08 13:02+0200\n"
 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -54,8 +54,8 @@ msgstr "Bila smb.conf were jixweber mîhengkirin?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -79,9 +79,10 @@ msgstr "Navê Koma Xebate/Domain:"
 #. Description
 #: ../samba-common.templates:3001
 msgid ""
-"Please specify the workgroup you want this server to appear to be in when "
-"queried by clients. Note that this parameter also controls the domain name "
-"used with the security=domain setting."
+"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 ""
 
 #. Type: boolean
@@ -94,7 +95,7 @@ msgstr ""
 #. Description
 #: ../samba-common.templates:4001
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -103,9 +104,10 @@ msgstr ""
 #. Description
 #: ../samba-common.templates:4001
 msgid ""
-"Enabling this option is highly recommended. If you do, make sure you have a "
-"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
-"user using the smbpasswd command."
+"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 ""
 
 #. Type: boolean
@@ -137,8 +139,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 
 #. Type: select
diff --git a/debian/po/lt.po b/debian/po/lt.po
index 8f5ecdbef2..f62a85a8e1 100644
--- a/debian/po/lt.po
+++ b/debian/po/lt.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba-lt\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-11-26 00:20+0200\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -68,8 +68,8 @@ msgstr "Automatiškai konfigūruoti smb.conf?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -101,10 +101,16 @@ msgstr "Grupė (workgroup) / domeno vardas:"
 #. 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."
 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."
+"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 ""
 "Nurodykite grupę (workgroup), kuriai priklauso šis Samba serveris. Jei "
 "nurodyta „security=domain“, šis parametras nurodo domeno vardą."
@@ -118,8 +124,13 @@ msgstr "Naudoti slaptažodžių šifravimą?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -130,10 +141,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Labai rekomenduojama pasirinkti šią galimybę. Jei pasirinksite šifruotus "
 "slaptažodžius, įsitikinkite, kad turite taisyklingą /etc/samba/smbpasswd "
@@ -176,8 +193,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Daugiau informacijos galite rasti rinkmenoje /usr/share/doc/samba-doc/"
 "htmldocs/ENCRYPTION.html iš paketo samba-doc."
diff --git a/debian/po/ml.po b/debian/po/ml.po
index 7470f40654..2726a1c422 100644
--- a/debian/po/ml.po
+++ b/debian/po/ml.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-12-11 19:30+0530\n"
 "Last-Translator: Praveen A <pravi.a@gmail.com>\n"
 "Language-Team: Swathanthra Malayalam Computing <smc-discuss@googlegroups."
@@ -67,8 +67,8 @@ msgstr "smb.conf സ്വയമേ ക്രമീകരിക്കണോ?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -100,10 +100,16 @@ 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."
 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."
+"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 എന്ന സജ്ജീകരണത്തിലുപയോഗിക്കുന്ന ഡൊമൈന്‍ നാമത്തേയും നിയന്ത്രിക്കുന്നു "
@@ -118,8 +124,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -131,10 +142,16 @@ msgstr ""
 #. 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."
 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."
+"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 ഫയലുണ്ടെന്നും  "
@@ -177,8 +194,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി samba-doc പാക്കേജിലെ /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html കാണുക."
diff --git a/debian/po/mr.po b/debian/po/mr.po
index bb92f86e09..b24f4a2a98 100644
--- a/debian/po/mr.po
+++ b/debian/po/mr.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-08-15 07:59-0500\n"
 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -68,8 +68,8 @@ msgstr "एसएमबी।सीओएनएफ smb.conf आपोआप स�
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -100,10 +100,16 @@ 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."
 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."
+"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 ""
 "ग्राहकांनी पृच्छा केल्यावर हा परिसेवक कोणत्या कार्यगटात दिसायला हवा याचा नेमका उल्लेख "
 "करा. लक्षात ठेवा की हेच चलितमूल्य सुरक्षा-प्रक्षेत्र निर्धारण बरोबर वापरले असता "
@@ -118,8 +124,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -130,10 +141,16 @@ msgstr ""
 #. 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."
 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."
+"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)ईटीसी/सांबा/एसएमबी पासवर्ड संचिका आहे, तसेच ,एसएमबी पासवर्ड "
@@ -176,8 +193,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "अधिक माहितीसाठी सांबा-डीओसी पॅकेजमधील /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html (यूएसआर/शेअर/डीओसी/सांबा-डीओसी/एचटीएमएलडीओसीएस/एनक्रिप्शन."
diff --git a/debian/po/nb.po b/debian/po/nb.po
index ec674caf8a..4aebec66a2 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_debian_po_nb\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@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@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -42,9 +42,9 @@ msgid ""
 msgstr ""
 "Hvis din datamaskin får informasjon om IP-adressen fra en DHCP-tjener på "
 "nettet, så kan DHCP-tjeneren også skaffe informasjon om WINS-tjenere "
-"(«NetBIOS navnetjenere») på nettet. For å bruke dette må smb.conf-fila "
-"endres slik at WINS-innstillinger fra DHCP automatisk leses fra /etc/samba/"
-"dhcp.conf."
+"(«NetBIOS navnetjenere») på nettet. For å bruke dette må smb.conf-fila endres "
+"slik at WINS-innstillinger fra DHCP automatisk leses fra /etc/samba/dhcp."
+"conf."
 
 #. Type: boolean
 #. Description
@@ -65,15 +65,15 @@ msgstr "Sette opp smb.conf automatisk?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
 "Resten av Samba-oppsettet dreier seg om spørsmål som påvirker parametre i /"
 "etc/samba/smb.conf, som er oppsettsfila for Samba-programmene (nmbd og "
-"smbd). smb.conf-fila inneholder nå en  «include»-linje eller en parameter "
-"som går over flere linjer, som kanskje kan forvirre den automatiske "
+"smbd). smb.conf-fila inneholder nå en  «include»-linje eller en parameter som "
+"går over flere linjer, som kanskje kan forvirre den automatiske "
 "oppsettsprosessen slik at du må endre smb.conf for hånd for å få den til å "
 "virke igjen."
 
@@ -97,10 +97,16 @@ 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."
 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."
+"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 "
@@ -115,8 +121,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -127,10 +138,16 @@ msgstr ""
 #. 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."
 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."
+"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 "
@@ -172,11 +189,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Mer detaljer finnes i fila /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
-"fra pakka samba-doc."
+"Mer detaljer finnes i fila /usr/share/doc/samba-doc/htmldocs/Samba3-"
+"Developers-Guide/pwencrypt.html fra pakka samba-doc."
 
 #  Using same translation as in debian.edu/Skolelinux. A bit controversial.
 #. Type: select
diff --git a/debian/po/ne.po b/debian/po/ne.po
index fedcf51abd..95c39723a4 100644
--- a/debian/po/ne.po
+++ b/debian/po/ne.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ne\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-14 05:36+0545\n"
 "Last-Translator: Shiva Pokharel <shiva@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -68,8 +68,8 @@ msgstr "स्वचालित रुपमा smb.conf कन्फिगर
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -99,10 +99,16 @@ 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."
 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."
+"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 ""
 "कृपया ग्राहकले प्रश्न गर्दा यो सर्भर भित्र देखाउन चाहेका कार्य समूह निर्दिष्ट गर्नुहोस् । याद "
 "गर्नुहोस् यो परामितिले पनि सुरक्षा=डोमेन सेटिङमा प्रयोग गरिएका डोमेन नाम नियन्त्रण गर्छ ।"
@@ -116,8 +122,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -128,10 +139,16 @@ msgstr ""
 #. 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."
 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."
+"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 फाइल र त्यहाँ प्रत्येक प्रयोगकर्ताका लागि सेट गरिएका पासवर्ड "
@@ -172,11 +189,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"अधिक जानकारीका लागि /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html  बाट "
-"samba-doc प्याकेज हेर्नुहोस् ।"
+"अधिक जानकारीका लागि /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+"Guide/pwencrypt.html  बाट samba-doc प्याकेज हेर्नुहोस् ।"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/nl.po b/debian/po/nl.po
index c488111906..c9445eb6eb 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-12 21:30+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -67,8 +67,8 @@ msgstr "smb.conf automatisch instellen?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -100,10 +100,16 @@ msgstr "Werkgroep/Domeinnaam:"
 #. 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."
 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."
+"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 ""
 "Van welke werkgroep moet deze server deel lijken uit te maken, wanneer "
 "clients hierom vragen? Merk op dat deze parameter ook de domeinnaam bepaald "
@@ -118,8 +124,13 @@ msgstr "Wachtwoordversleuteling gebruiken?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -130,10 +141,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Het activeren van deze optie is ten sterkste aangeraden. Indien u hiervoor "
 "kiest dient u er wel voor te zorgen dat u een geldig '/etc/samba/smbpasswd'- "
@@ -178,11 +195,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"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/ENCRYPTION.html "
-"uit het pakket 'samba-doc'."
+"Meer informatie vindt u in /usr/share/doc/samba-doc/htmldocs/Samba3-"
+"Developers-Guide/pwencrypt.html uit het pakket 'samba-doc'."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/nn.po b/debian/po/nn.po
index 773c373ac2..badf21a9d7 100644
--- a/debian/po/nn.po
+++ b/debian/po/nn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_nn\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-17 18:35+0100\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@gmail.com>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -58,17 +58,17 @@ msgstr "Setje opp smb.conf automatisk?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
 "Resten av oppsettet av Samba er spørsmål som handlar om parametrar i /etc/"
 "samba/smb.conf, som er fila som blir brukt til å setje opp Sambaprogram "
-"(nmbd og smbd). Den noverande smb.conf-fila inneheld ei «include»-linje "
-"eller ein opsjon som går over fleire linjer, noko som kan forvirre den "
-"automatiske oppsettsprosessen og gjer at du må redigere smb.conf-fila "
-"manuelt for å få det til å fungere igjen."
+"(nmbd og smbd). Den noverande smb.conf-fila inneheld ei «include»-linje eller "
+"ein opsjon som går over fleire linjer, noko som kan forvirre den automatiske "
+"oppsettsprosessen og gjer at du må redigere smb.conf-fila manuelt for å få "
+"det til å fungere igjen."
 
 #. Type: boolean
 #. Description
@@ -91,10 +91,16 @@ msgstr "Arbeidsgruppe/Domenenamn:"
 #. 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."
 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."
+"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 ""
 "Oppgje den arbeidsgruppa (workgroup) som du vil at denne tenaren skal vere i "
 "når han blir spurd av klientar. Merk at denne parameteren også kontrollerer "
@@ -109,8 +115,13 @@ msgstr "Bruke krypterte passord?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -121,10 +132,16 @@ msgstr ""
 #. 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."
 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."
+"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 er sterkt tilrådd at du slår på dette valet. Viss du gjer det, må du sjå "
 "etter at du har ei gyldig /etc/samba/smbpasswd-fil, og du set inn passord "
@@ -166,11 +183,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Sjå /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html frå pakken samba-doc "
-"for fleire detaljar."
+"Sjå /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"frå pakken samba-doc for fleire detaljar."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 91246b7c02..72fc3dae3c 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_2:3.2.3-1_pl_2008-09-12\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2008-09-12 10:08+0200\n"
 "Last-Translator: Tomasz Majbaum <genobis@genobis.pl>\n"
 "Language-Team: polski <debian-l10n-pl@lists.debian.org>\n"
@@ -59,8 +59,8 @@ msgstr "Czy automatycznie skonfigurować smb.conf?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -92,10 +92,16 @@ msgstr "Nazwa Grupy Roboczej/Domeny:"
 #. 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."
 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."
+"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 ""
 "Określ grupę roboczą którą ten serwer powinien się podawać, gdy będzie o to "
 "odpytywany przez klientów. Uwaga, ten parametr dotyczy również nazwy domeny "
@@ -110,8 +116,13 @@ msgstr "Czy używać szyfrowania haseł?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -123,10 +134,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Zaznaczenie tej opcji jest wysoce zalecane. Jeśli to zrobisz, upewnij się, "
 "że masz poprawny plik /etc/samba/smbpasswd i że ustawisz w nim hasła dla "
@@ -169,11 +186,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Zobacz plik /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html z pakietu "
-"samba-doc, by poznać szczegóły."
+"Zobacz plik /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+"pwencrypt.html z pakietu samba-doc, by poznać szczegóły."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 6cfe25c3fc..2444610f54 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.9-1\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-08-14 07:42-0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debian.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -59,8 +59,8 @@ msgstr "Configurar automaticamente o smb.conf?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -92,10 +92,16 @@ msgstr "Nome do Grupo de trabalho/Domínio:"
 #. 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."
 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."
+"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 ""
 "Por favor especifique o grupo de trabalho em que quer que este servidor "
 "apareça quando questionado pelos clientes. Note que este parâmetro também "
@@ -110,8 +116,13 @@ msgstr "Utilizar encriptação de passwords?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -122,10 +133,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "É altamente recomendado que escolha esta opção. Se o fizer, assegure-se que "
 "tem um ficheiro /etc/samba/smbpasswd válido e que define as passwords para "
@@ -168,11 +185,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Para mais detalhes veja /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html do "
-"pacote samba-doc."
+"Para mais detalhes veja /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+"Guide/pwencrypt.html do pacote samba-doc."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 13e5eed731..bc2f6e4206 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-12 16:16-0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -67,8 +67,8 @@ msgstr "Configurar smb.conf automaticamente ?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -100,10 +100,16 @@ msgstr "Nome de Domínio/Grupo de Trabalho :"
 #. 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."
 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."
+"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 ""
 "Por favor, especifique o grupo de trabalho no qual quer que este servidor "
 "pareça estar quando questionado por clientes. Note que este parâmetro também "
@@ -118,8 +124,13 @@ msgstr "Usar senhas criptografadas ?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -130,10 +141,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Habilitar esta opção é altamente recomendado. Caso você o faça, certifique-"
 "se de possuir um arquivo /etc/samba/smbpasswd e que você tenha senhas "
@@ -176,8 +193,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Consulte o arquivo /usr/share/doc/samba-doc/htmldos/ENCRYPTION.html, "
 "fornecido pelo pacote samba-doc, para conhecer maiores detalhes."
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 20efbdf4ee..306ffd5982 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba/debian/po/ro.po\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2008-06-29 19:42+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -70,8 +70,8 @@ msgstr "Se configurează smb.conf automat?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -104,10 +104,16 @@ msgstr "Grupul de lucru/Numele de domeniu:"
 #. 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."
 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."
+"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 ""
 "Vă rugăm să specificați grupul de lucru de care acest server va aparține "
 "când va fi chestionat de clienți. A se reține că acest parametru controlează "
@@ -122,8 +128,13 @@ msgstr "Se folosesc parole criptate? "
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -134,10 +145,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Activarea acestei opțiuni este recomandată în mod deosebit. Dacă o activați, "
 "asigurați-vă că fișierul /etc/samba/smbpasswd este valid și că aveți "
@@ -179,11 +196,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"A se vedea /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html din pachetul "
-"samba-doc pentru mai multe detalii."
+"A se vedea /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+"pwencrypt.html din pachetul samba-doc pentru mai multe detalii."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 05bec009b0..ab87bc273f 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.23c-1\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 22:22+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Настроить smb.conf автоматически?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -90,10 +90,16 @@ 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."
 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."
+"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 ""
 "Укажите рабочую группу, к которой будет принадлежать сервер при опросе "
 "клиентами. Обратите внимание, что этот параметр также определяет имя домена, "
@@ -108,8 +114,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -120,10 +131,16 @@ msgstr ""
 #. 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."
 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."
+"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 и в том, что для всех пользователей "
@@ -166,8 +183,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Более подробная информация доступна в файле /usr/share/doc/samba-doc/"
 "htmldocs/ENCRYPTION.html из пакета samba-doc."
diff --git a/debian/po/sk.po b/debian/po/sk.po
index e55cde056e..194777d8dc 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -17,8 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 07:17+0100\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -67,8 +67,8 @@ msgstr "Automaticky nastaviť smb.conf?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -99,10 +99,16 @@ msgstr "Pracovná skupina/Názov domény:"
 #. 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."
 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."
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
 msgstr ""
 "Zadajte názov pracovnej skupiny, v ktorej sa má objaviť server pri prístupe "
 "klientov. Tento parameter zároveň určuje názov domény, ktorá sa používa pri "
@@ -117,8 +123,13 @@ msgstr "Použiť šifrovanie hesiel?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -129,10 +140,16 @@ msgstr ""
 #. 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."
 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."
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
 msgstr ""
 "Povolenie tejto voľby sa veľmi odporúča. V tom prípade sa uistite, že máte "
 "platný súbor /etc/samba/smbpasswd a že v ňom nastavíte heslá všetkým "
@@ -174,8 +191,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Podrobnosti nájdete v súbore /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 "html z balíka samba-doc."
diff --git a/debian/po/sl.po b/debian/po/sl.po
index b42f6ae642..d86a5661ea 100644
--- a/debian/po/sl.po
+++ b/debian/po/sl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 08:06+0100\n"
 "Last-Translator: Matej Kovačič <matej.kovacic@owca.info>\n"
 "Language-Team: Sl <skrat@owca.info>\n"
@@ -68,8 +68,8 @@ msgstr "Samodejna nastavitev smb.conf?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -102,10 +102,16 @@ msgstr "Ime delovne skupine/domene:"
 #. 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."
 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."
+"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 ""
 "Prosimo, nastavite ime delovne skupine, v kateri se bo pojavil ta strežnik "
 "ko ga bodo klienti iskali. Ta parameter določa tudi ime domene, ki je "
@@ -120,8 +126,13 @@ msgstr "Uporaba šifriranja gesel?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -132,10 +143,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Močno priporočamo vklop te možnosti. Če jo boste vključili, preverite da "
 "imate veljavno datoteko /etc/samba/smbpasswd in da ste tam nastavili gesla "
@@ -178,8 +195,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Za podrobnejše informacije si oglejte /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html iz paketa samba-doc."
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 79d4af5e1f..74bc94dfdd 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 21:25+0100\n"
 "Last-Translator: Elian Myftiu <elian.myftiu@gmail.com>\n"
 "Language-Team: Debian L10n Albanian <debian-l10n-albanian@lists.debian.org>\n"
@@ -64,8 +64,8 @@ msgstr "Ta konfiguroj smb.conf automatikisht?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -97,10 +97,16 @@ msgstr "Grup Pune/Emër Zone:"
 #. 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."
 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."
+"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 ""
 "Të lutem saktëso grupin e punës ku dëshiron që ky shërbyes të shfaqet kur të "
 "pyetet nga klientë. Vër re që ky parametër kontrollon gjithashtu emrin e "
@@ -115,8 +121,13 @@ msgstr "Të përdor kriptim fjalëkalimi?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -127,10 +138,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Aktivizimi i kësaj mundësie këshillohet fuqimisht. Nëse e bën, sigurohu që "
 "ke një skedar të vlefshëm /etc/samba/smbpasswd dhe që i cakton fjalëkalimet "
@@ -172,11 +189,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Shih /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html nga paketa samba-doc "
-"për hollësi të mëtejshme."
+"Shih /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+"html nga paketa samba-doc për hollësi të mëtejshme."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 0df8b1fea9..6e6ea98723 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.20b-3\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-12 20:57+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -64,8 +64,8 @@ msgstr "Konfigurera smb.conf automatiskt?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -97,10 +97,16 @@ msgstr "Arbetsgrupp/Dom�nnamn:"
 #. 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."
 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."
+"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 ""
 "Ange vilken arbetsgrupp som denna server ska synas i n�r klienterna fr�gar. "
 "Notera att denna parameter �ven kontrollerar dom�nnamnet som anv�nds med "
@@ -115,8 +121,13 @@ msgstr "Anv�nd l�senordskryptering?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -127,10 +138,16 @@ msgstr ""
 #. 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."
 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."
+"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 rekommenderas varmt att du aktiverar detta alternativ. Om du g�r det, "
 "kontrollera att du har en giltig /etc/samba/smbpasswd och att du har st�llt "
@@ -172,11 +189,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html fr�n paketet samba-doc "
-"f�r mer information."
+"Se /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"fr�n paketet samba-doc f�r mer information."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/ta.po b/debian/po/ta.po
index 3533d8c672..7d50ccd567 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-12-16 20:10+0530\n"
 "Last-Translator: drtvasudevan <agnihot3@gmail.com>\n"
 "Language-Team: TAMIL <Ubuntu-tam@lists.ubuntu.com>\n"
@@ -65,8 +65,8 @@ msgstr "smb.conf ஐ தானியங்கியாக வடிவமைக�
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -97,10 +97,16 @@ 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."
 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."
+"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 வடிவமைப்பில் உள்ள களப் "
@@ -115,8 +121,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -127,10 +138,16 @@ msgstr ""
 #. 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."
 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."
+"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 கோப்பு உங்களிடம் இருப்பதையும் நீங்கள் ஒவ்வொரு "
@@ -173,8 +190,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "சாம்பா ஆவணங்கள் (samba-doc) பொதிகளில் இருந்து /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html ஐ மேலதிக விவரங்களுக்குப் பார்க்கவும்."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 1c32103ed7..2cd5029aad 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,8 +52,8 @@ msgstr ""
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -77,9 +77,10 @@ msgstr ""
 #. Description
 #: ../samba-common.templates:3001
 msgid ""
-"Please specify the workgroup you want this server to appear to be in when "
-"queried by clients. Note that this parameter also controls the domain name "
-"used with the security=domain setting."
+"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 ""
 
 #. Type: boolean
@@ -92,7 +93,7 @@ msgstr ""
 #. Description
 #: ../samba-common.templates:4001
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -101,9 +102,10 @@ msgstr ""
 #. Description
 #: ../samba-common.templates:4001
 msgid ""
-"Enabling this option is highly recommended. If you do, make sure you have a "
-"valid /etc/samba/smbpasswd file and that you set passwords in there for each "
-"user using the smbpasswd command."
+"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 ""
 
 #. Type: boolean
@@ -135,8 +137,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 
 #. Type: select
diff --git a/debian/po/th.po b/debian/po/th.po
index 744a9bee63..1d05871c92 100644
--- a/debian/po/th.po
+++ b/debian/po/th.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 10:05+0700\n"
 "Last-Translator:  Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -55,8 +55,8 @@ msgstr "จะตั้งค่า smb.conf แบบอัตโนมัต�
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -85,10 +85,16 @@ 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."
 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."
+"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 ด้วย"
@@ -102,8 +108,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -113,10 +124,16 @@ msgstr ""
 #. 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."
 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."
+"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 ที่ใช้การได้ และคุณได้ตั้งรหัสผ่านในนั้นสำหรับผู้ใช้แต่ละคน โดยใช้คำสั่ง "
@@ -157,11 +174,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"ดูรายละเอียดเพิ่มเติมได้ที่ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
-"จากแพกเกจ samba-doc "
+"ดูรายละเอียดเพิ่มเติมได้ที่ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+"Guide/pwencrypt.html จากแพกเกจ samba-doc "
 
 #. Type: select
 #. Choices
diff --git a/debian/po/tl.po b/debian/po/tl.po
index 145308084a..a591a7f09b 100644
--- a/debian/po/tl.po
+++ b/debian/po/tl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 06:13+0800\n"
 "Last-Translator: eric pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -66,8 +66,8 @@ msgstr "Awtomatikong isaayos ang smb.conf?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -99,10 +99,16 @@ msgstr "Pangalan ng Workgroup/Domain:"
 #. 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."
 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."
+"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 ""
 "Pakibigay ang workgroup ng server na ito kapag ito ay tinanong ng mga "
 "client. Ang parameter na ito ang siyang nag-co-control ng Domain name na "
@@ -117,8 +123,13 @@ msgstr "Gumamit ng encryption sa kontrasenyas?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -130,10 +141,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Ang pag-enable ng opsiyon na ito ay rekomendado. Kung gawin niyo ito, "
 "tiyakin na ang inyong talaksang /etc/samba/smbpasswd ay valid at may "
@@ -180,11 +197,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Basahin ang /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html mula sa "
-"paketeng samba-doc para sa karagdagang detalye."
+"Basahin ang /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+"pwencrypt.html mula sa paketeng samba-doc para sa karagdagang detalye."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/tr.po b/debian/po/tr.po
index ffbd6da162..9a9e4a2851 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 18:47+0200\n"
 "Last-Translator: Mehmet Türker <mturker@innova.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -59,8 +59,8 @@ msgstr "smb.conf dosyası otomatik olarak yapılandırılsın mı?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -93,10 +93,16 @@ msgstr "Çalışma Grubu/Etki Alanı İsmi:"
 #. 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."
 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."
+"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 ""
 "Lütfen sunucunuzun istemciler tarafından sorgulandığında içerisinde "
 "gözükmesini istediğiniz Çalışma Grubu'nu belirtiniz. Aklınızda bulunsun, bu "
@@ -112,8 +118,13 @@ msgstr "Parola şifrelenmesi kullanılsın mı?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -124,10 +135,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Bu işlemi yapmanız şiddetle önerilir. Eğer yapacaksanız, geçerli bir /etc/"
 "samba/smbpasswd dosyanız olduğundan emin olun ve smbpasswd komutunu "
@@ -171,8 +188,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "Daha detaylıı bilgi için samba-doc paketinden /usr/share/doc/samba-doc/"
 "htmldocs/ENCRYPTION.html dosyasına gözatın."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 959124f400..e20f56905f 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,12 +1,12 @@
 # Vietnamese translation for Samba.
 # Copyright © 2007 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.23rc1-1\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-06-01 15:32+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -34,10 +34,9 @@ msgid ""
 msgstr ""
 "Nếu máy tính của bạn lấy thông tin địa chỉ IP từ một trình phục vụ DHCP nằm "
 "trên mạng, trình phục vụ DHCP có lẽ cũng có khả năng cung cấp thông tin về "
-"trình phục vụ WINS (« NetBIOS name servers ») cũng nằm trên mạng. Dịch vụ "
-"này cần thiết bạn sửa đổi tập tin « smb.conf » của mình để cho phép thiết "
-"lập WINS do DHCP cung cấp sẽ được đọc tự động từ tập tin </etc/samba/dhcp."
-"conf>."
+"trình phục vụ WINS (« NetBIOS name servers ») cũng nằm trên mạng. Dịch vụ này "
+"cần thiết bạn sửa đổi tập tin « smb.conf » của mình để cho phép thiết lập "
+"WINS do DHCP cung cấp sẽ được đọc tự động từ tập tin </etc/samba/dhcp.conf>."
 
 #. Type: boolean
 #. Description
@@ -58,17 +57,17 @@ msgstr "Cấu hình tự động tập tin « smb.conf » không?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
 "Phần còn lại của cấu hình Samba đề cập các câu hỏi về tham số trong tập tin "
 "</etc/samba/smb.conf>, tập tin được dùng để cấu hình các chương trình Samba "
-"(nmbd và smbd). Tập tin « smb.conf » hiện thời chứa một dòng « include "
-"» (gồm) hay một tùy chọn chiếm nhiều dòng, mà có thể gây ra lỗi trong tiến "
-"trình cấu hình tự động thì cần thiết bạn tự sửa đổi tập tin « smb.conf » "
-"mình để kích hoạt lại nó."
+"(nmbd và smbd). Tập tin « smb.conf » hiện thời chứa một dòng « include » (gồm) "
+"hay một tùy chọn chiếm nhiều dòng, mà có thể gây ra lỗi trong tiến trình cấu "
+"hình tự động thì cần thiết bạn tự sửa đổi tập tin « smb.conf » mình để kích "
+"hoạt lại nó."
 
 #. Type: boolean
 #. Description
@@ -90,10 +89,16 @@ msgstr "Tên nhóm làm việc/miền:"
 #. 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."
 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."
+"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 ""
 "Hãy xác định nhóm làm việc nơi có vẻ nằm trình phục vụ này, khi ứng dụng "
 "khách yêu cầu. Ghi chú rằng tham số này cũng điều khiển tên miền được dùng "
@@ -108,8 +113,13 @@ msgstr "Sử dụng khả năng mật mã hoá mật khẩu không?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -121,10 +131,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Rất khuyên bạn bật tùy chọn này. Nếu có, hãy chắc là bạn có tập tin </etc/"
 "samba/smbpasswd> hợp lệ và bạn cũng đặt mật khẩu trong nó cho mỗi người dùng "
@@ -166,11 +182,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Xem tài liệu </usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html> từ gói "
-"samba-doc để tìm chi tiết."
+"Xem tài liệu </usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
+"pwencrypt.html> từ gói samba-doc để tìm chi tiết."
 
 #. Type: select
 #. Choices
@@ -211,9 +227,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Bắt đầu trong phiên bản 3.0.23, trình samba không còn hỗ trợ lại khả năng "
 #~ "xích lại nhiều hậu phương trong tham số « passdb backend ». Có vẻ là tập "
-#~ "tin cấu hình « smb.conf » của bạn vẫn còn chứa một tham số « passdb "
-#~ "backend » làm danh sách các hậu phương. Phiên bản samba mới sẽ chỉ hoạt "
-#~ "động được sau khi bạn sửa chữa trường hợp này."
+#~ "tin cấu hình « smb.conf » của bạn vẫn còn chứa một tham số « passdb backend "
+#~ "» làm danh sách các hậu phương. Phiên bản samba mới sẽ chỉ hoạt động được "
+#~ "sau khi bạn sửa chữa trường hợp này."
 
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
diff --git a/debian/po/wo.po b/debian/po/wo.po
index e467db87dd..d9228ad81c 100644
--- a/debian/po/wo.po
+++ b/debian/po/wo.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wo\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-04-30 18:13+0000\n"
 "Last-Translator: Mouhamadou Mamoune Mbacke <mouhamadoumamoune@gmail.com>\n"
 "Language-Team: Wolof\n"
@@ -65,8 +65,8 @@ msgstr "Ndax ñu komfigureel smb.conf sunu boppu?"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -98,10 +98,16 @@ msgstr "Grup bu liggéey/Turu domen:"
 #. 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."
 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."
+"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 ""
 "Joxeel grup bu liggéey binga bëgg serwóor bii di mel ne ci bokk buko ay "
 "kiliyaŋ di laaj. Nga bayyi xel ne parameetar bii mooy konturle yitam turu "
@@ -116,8 +122,13 @@ msgstr "Ndax ñu kiripte baatujall yi?"
 #. 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -128,10 +139,16 @@ msgstr ""
 #. 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."
 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."
+"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 ""
 "Ñoongi deŋkaane bubaax nga tann lii. Boo ko defee, na nga wóorlu ne amnga ab "
 "fiise /etc/samba/smbpasswd bu baax, ta nga def foofa baatujall bu "
@@ -175,11 +192,11 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
-"Xoolal /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html bi nekk ci paket bu "
-"samba-doc, ngir am yaneen leeral."
+"Xoolal /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+"html bi nekk ci paket bu samba-doc, ngir am yaneen leeral."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index c321899f55..2fb1711bad 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.0.22-1\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2006-10-03 19:36-0500\n"
 "Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.ent>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -66,8 +66,8 @@ msgstr "自动配置 smb.conf 吗？"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -96,10 +96,16 @@ 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."
 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."
+"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=demain 设置所用的域名。"
@@ -113,8 +119,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -124,10 +135,16 @@ msgstr ""
 #. 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."
 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."
+"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 命令为每个用户设定的密码。"
@@ -166,8 +183,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "更多详情，请参阅 smaba-doc 软件包中的 /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html。"
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index c35f8280e4..72d7549a96 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: pkg-samba-maint@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-09-17 22:34+0200\n"
+"Report-Msgid-Bugs-To: samba@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-02 12:18-0800\n"
 "PO-Revision-Date: 2007-03-13 23:18+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -63,8 +63,8 @@ msgstr "自動設定 smb.conf 嗎？"
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
-"Samba programs (nmbd and smbd). Your current smb.conf contains an 'include' "
-"line or an option that spans multiple lines, which could confuse the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
@@ -93,10 +93,16 @@ 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."
 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."
+"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=demain 設置所用的網域名。"
@@ -110,8 +116,13 @@ 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."
 msgid ""
-"All recent Windows clients communicate with SMB servers using encrypted "
+"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 ""
@@ -121,10 +132,16 @@ msgstr ""
 #. 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."
 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."
+"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 命令為每個用戶設定的密碼。"
@@ -163,8 +180,8 @@ msgstr ""
 #. Description
 #: ../samba.templates:1001
 msgid ""
-"See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc "
-"package for more details."
+"See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
+"from the samba-doc package for more details."
 msgstr ""
 "更多詳情，請參閱 smaba-doc 套件中的 /usr/share/doc/samba-doc/htmldocs/"
 "ENCRYPTION.html。"
diff --git a/debian/rules b/debian/rules
index 05cadaa39e..68e241815e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,6 +137,19 @@ install: build
 
 	$(MAKE) -C source install DESTDIR=$(DESTDIR)
 
+	# Rename to *.samba3 for alternatives
+	mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba3
+	mv $(DESTDIR)/usr/bin/nmblookup $(DESTDIR)/usr/bin/nmblookup.samba3
+	mv $(DESTDIR)/usr/share/man/man1/nmblookup.1 $(DESTDIR)/usr/share/man/man1/nmblookup.samba3.1
+	mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba3
+	mv $(DESTDIR)/usr/share/man/man8/net.8 $(DESTDIR)/usr/share/man/man8/net.samba3.8
+	mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba3
+	mv $(DESTDIR)/usr/share/man/man1/testparm.1 $(DESTDIR)/usr/share/man/man1/testparm.samba3.1
+
+	mv $(DESTDIR)/usr/share/samba/lowcase.dat $(DESTDIR)/usr/share/samba/lowcase.dat.samba3
+	mv $(DESTDIR)/usr/share/samba/upcase.dat $(DESTDIR)/usr/share/samba/upcase.dat.samba3
+	mv $(DESTDIR)/usr/share/samba/valid.dat $(DESTDIR)/usr/share/samba/valid.dat.samba3
+
 	# Starting with Samba 3.0.6 libsmbclient.so is installed in
 	# /usr/lib/samba. We don't want it there since it is not in the
 	# default library path. Here we move it to /usr/lib/.
@@ -174,7 +187,7 @@ endif
 	ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
 
 	cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
-	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/
+	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action.samba3
 	# Install samba-common's conffiles - they'll get moved later to their
 	# correct place by dh_movefiles.
 	cp debian/gdbcommands $(DESTDIR)/etc/samba/
diff --git a/debian/samba-common.config b/debian/samba-common.config
index c6faf31732..2a5099f6dc 100644
--- a/debian/samba-common.config
+++ b/debian/samba-common.config
@@ -10,7 +10,8 @@ smbconf_retr() {
 	fi
 
 	if [ -n "$2" ]; then
-		local FILE="$2"
+		local FILE
+		FILE="$2"
 	fi
 
 	if [ -z "$FILE" ]; then
diff --git a/debian/samba-common.dhcp b/debian/samba-common.dhcp
index 9bbc695753..9295b52e41 100644
--- a/debian/samba-common.dhcp
+++ b/debian/samba-common.dhcp
@@ -5,17 +5,20 @@ SAMBA_DHCP_CONF=/etc/samba/dhcp.conf
 netbios_setup() {
 	# No need to continue if we're called with an unsupported option
 
-	if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \
-	   && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \
-	   && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ]
-	then
+	case $reason in
+	BOUND|RENEW|REBIND|REBOOT|EXPIRE|FAIL|RELEASE|STOP)
+		;;
+	*)
 		return
-	fi
+		;;
+	esac
 
 	umask 022
 
-	local other_servers=""
-	local serverlist=""
+	local other_servers
+	other_servers==""
+	local serverlist
+	serverlist==""
 
 	# the destination file won't exist yet on the first run after 
 	# installing samba
@@ -23,7 +26,8 @@ netbios_setup() {
 	then
 		# don't continue if no settings have changed
 		if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \
-		   && [ "$new_netbios_scope" = "$old_netbios_scope" ]
+		   && [ "$new_netbios_scope" = "$old_netbios_scope" ] \
+		   && [ -n "$new_netbios_name_servers" ]
 		then
 			return
 		fi
diff --git a/debian/samba-common.docs b/debian/samba-common.docs
new file mode 100644
index 0000000000..187fdd3405
--- /dev/null
+++ b/debian/samba-common.docs
@@ -0,0 +1,3 @@
+README 
+Roadmap
+WHATSNEW.txt
diff --git a/debian/samba-common.files b/debian/samba-common.files
index b5e230111d..ea75c1e618 100644
--- a/debian/samba-common.files
+++ b/debian/samba-common.files
@@ -1,20 +1,20 @@
 etc/samba/
 etc/dhcp3/
 etc/pam.d/
-usr/bin/net
-usr/bin/nmblookup
+usr/bin/net.samba3
+usr/bin/nmblookup.samba3
 usr/bin/smbpasswd
-usr/bin/testparm
-usr/share/man/man1/nmblookup.1
-usr/share/man/man1/testparm.1
+usr/bin/testparm.samba3
+usr/share/man/man1/nmblookup.samba3.1
+usr/share/man/man1/testparm.samba3.1
 usr/share/man/man5/lmhosts.5
 usr/share/man/man5/smb.conf.5
 usr/share/man/man5/smbpasswd.5
 usr/share/man/man7/samba.7
-usr/share/man/man8/net.8
+usr/share/man/man8/net.samba3.8
 usr/share/man/man8/smbpasswd.8
-usr/share/samba/lowcase.dat
-usr/share/samba/panic-action
+usr/share/samba/lowcase.dat.samba3
+usr/share/samba/panic-action.samba3
 usr/share/samba/smb.conf*
-usr/share/samba/upcase.dat
-usr/share/samba/valid.dat
+usr/share/samba/upcase.dat.samba3
+usr/share/samba/valid.dat.samba3
diff --git a/debian/samba-common.postinst b/debian/samba-common.postinst
index d29b07e57e..61d3975bcc 100644
--- a/debian/samba-common.postinst
+++ b/debian/samba-common.postinst
@@ -4,6 +4,21 @@
 
 set -e
 
+if [ "$1" = "configure" ]
+then
+	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
+		--slave /usr/share/man/man1/nmblookup.1 nmblookup.1 /usr/share/man/man1/nmblookup.samba3.1
+	update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
+		--slave /usr/share/man/man1/net.8 net.8 /usr/share/man/man1/net.samba3.8
+	update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
+		--slave /usr/share/man/man1/testparm.1 testparm.1 /usr/share/man/man1/testparm.samba3.1
+	for N in valid.dat upcase.dat lowcase.dat
+	do
+		update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba3 0
+	done
+	update-alternatives --install /usr/share/samba/panic-action samba-panic-action /usr/share/samba/panic-action.samba3 0
+fi
+
 # Do debconf stuff here
 . /usr/share/debconf/confmodule
 
diff --git a/debian/samba-common.prerm b/debian/samba-common.prerm
new file mode 100644
index 0000000000..b1d1617221
--- /dev/null
+++ b/debian/samba-common.prerm
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e 
+
+case "$1" in
+    remove|upgrade|deconfigure)
+	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
+	update-alternatives --remove net /usr/bin/net.samba3
+	update-alternatives --remove testparm /usr/bin/testparm.samba3
+	for N in valid.dat upcase.dat lowcase.dat
+	do
+		update-alternatives --remove $N /usr/share/samba/$N.samba3
+	done
+	update-alternatives --remove samba-panic-action /usr/share/samba/panic-action.samba3
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/samba-common.templates b/debian/samba-common.templates
index 613ff7c77b..4cf380bf0a 100644
--- a/debian/samba-common.templates
+++ b/debian/samba-common.templates
@@ -18,7 +18,7 @@ _Description: Configure smb.conf automatically?
  The rest of the configuration of Samba deals with questions that
  affect parameters in /etc/samba/smb.conf, which is the file used to
  configure the Samba programs (nmbd and smbd). Your current smb.conf
- contains an 'include' line or an option that spans multiple lines,
+ contains an "include" line or an option that spans multiple lines,
  which could confuse the automated configuration process and require
  you to edit your smb.conf by hand to get it working again.
  .
@@ -30,19 +30,20 @@ Template: samba-common/workgroup
 Type: string
 Default: WORKGROUP
 _Description: Workgroup/Domain Name:
- 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.
+ 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.
 
 Template: samba-common/encrypt_passwords
 Type: boolean
 Default: true
 _Description: Use password encryption?
- All recent Windows clients communicate with SMB servers using encrypted
+ 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. 
+ a parameter in your Windows registry.
  .
- 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.
-
+ 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.
diff --git a/debian/samba.config b/debian/samba.config
index 2013692dbb..a8eae1e1ba 100644
--- a/debian/samba.config
+++ b/debian/samba.config
@@ -14,7 +14,8 @@ smbconf_retr() {
 	fi
 
 	if [ -n "$2" ]; then
-		local FILE="$2"
+		local FILE
+		FILE="$2"
 	fi
 
 	if [ -z "$FILE" ]; then
diff --git a/debian/samba.docs b/debian/samba.docs
index 7949c615b0..64b9c9f93d 100644
--- a/debian/samba.docs
+++ b/debian/samba.docs
@@ -1,4 +1 @@
-README 
-Roadmap
-WHATSNEW.txt
 docs/htmldocs/Samba3-HOWTO/diagnosis.html
diff --git a/debian/samba.files b/debian/samba.files
index 191c668860..1b90c2a29a 100644
--- a/debian/samba.files
+++ b/debian/samba.files
@@ -1,5 +1,5 @@
 usr/bin/eventlogadm
-usr/bin/smbstatus
+usr/bin/smbstatus.samba3
 usr/bin/smbcontrol
 usr/bin/profiles
 usr/bin/tdbbackup
diff --git a/debian/samba.init b/debian/samba.init
index 88530e1667..cd65127cf6 100644
--- a/debian/samba.init
+++ b/debian/samba.init
@@ -98,8 +98,22 @@ case "$1" in
 		sleep 1
 		$0 start
 		;;
+        status)
+		status="0"
+		NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		if [ "$NMBD_DISABLED" != "Yes" ]; then
+			status_of_proc -p $NMBDPID /usr/sbin/nmbd nmbd || status=$?
+		fi
+		if [ "$RUN_MODE" != "inetd" ]; then
+			status_of_proc -p $SMBDPID /usr/sbin/smbd smbd || status=$?
+		fi
+		if [ "$NMBD_DISABLED" = "Yes" -a "$RUN_MODE" = "inetd" ]; then
+			status="4"
+		fi
+		exit $status
+		;;
 	*)
-		echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
+		echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload|status}"
 		exit 1
 		;;
 esac
diff --git a/debian/samba.postinst b/debian/samba.postinst
index 6a72f147e5..08a334c9d0 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -6,6 +6,7 @@
 
 case "$1" in
 	configure)
+		update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3 10
 		# continue below
 	;;
 
diff --git a/debian/samba.prerm b/debian/samba.prerm
new file mode 100644
index 0000000000..188a059463
--- /dev/null
+++ b/debian/samba.prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e 
+
+case "$1" in
+    remove|upgrade|deconfigure)
+	update-alternatives --remove smbstatus /usr/bin/smbstatus.samba3
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/samba.templates b/debian/samba.templates
index fb9da83858..26f531d556 100644
--- a/debian/samba.templates
+++ b/debian/samba.templates
@@ -11,8 +11,9 @@ _Description: Create samba password database, /var/lib/samba/passdb.tdb?
  If you do not create it, you will have to reconfigure Samba (and probably
  your client machines) to use plaintext passwords.
  .
- See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the
- samba-doc package for more details.
+ See
+ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html
+ from the samba-doc package for more details.
 
 Template: samba/run_mode
 Type: select
diff --git a/debian/swat.postrm b/debian/swat.postrm
index 361e58b811..03f8d9e636 100644
--- a/debian/swat.postrm
+++ b/debian/swat.postrm
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 #
 #
 
diff --git a/debian/winbind.init b/debian/winbind.init
index 20721a82a0..9e677393b4 100644
--- a/debian/winbind.init
+++ b/debian/winbind.init
@@ -16,6 +16,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 DAEMON=/usr/sbin/winbindd
 PIDDIR=/var/run/samba
+WINBINDPID=$PIDDIR/winbindd.pid
 
 # clear conflicting settings from the environment
 unset TMPDIR
@@ -47,8 +48,11 @@ case "$1" in
 		$0 stop && sleep 2 && $0 start
 		;;
 
+	status)
+		status_of_proc -p $WINBINDPID $DAEMON winbind && exit 0 || exit $?
+		;;
 	*)
-		echo "Usage: /etc/init.d/winbind {start|stop|restart|force-reload}"
+		echo "Usage: /etc/init.d/winbind {start|stop|restart|force-reload|status}"
 		exit 1
 		;;
 esac