summaryrefslogtreecommitdiff
path: root/packaging/Debian
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2005-10-29 13:31:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:15 -0500
commit7ec71aa20d43fd45dd9321e42ada93ee10fd1d45 (patch)
tree829da267bc12da10dbdb2b3cf735d5de27639dd5 /packaging/Debian
parentfa75e8c1d482cdbad2ff074eccb2baf8d5bba856 (diff)
downloadsamba-7ec71aa20d43fd45dd9321e42ada93ee10fd1d45.tar.gz
r11398: Keep s3 in sync with trunk
(This used to be commit 7fc05b79643c93eaf0ef028a7337889ed21c52ba)
Diffstat (limited to 'packaging/Debian')
-rw-r--r--packaging/Debian/debian-unstable/changelog371
-rw-r--r--packaging/Debian/debian-unstable/config.cache.alpha-linux-gnu12
-rw-r--r--packaging/Debian/debian-unstable/config.cache.sparc-linux-gnu13
-rw-r--r--packaging/Debian/debian-unstable/control31
-rw-r--r--packaging/Debian/debian-unstable/control.in203
-rw-r--r--packaging/Debian/debian-unstable/copyright9
-rw-r--r--packaging/Debian/debian-unstable/libsmbclient.shlibs2
-rw-r--r--packaging/Debian/debian-unstable/patches/VERSION.patch2
-rw-r--r--packaging/Debian/debian-unstable/patches/cups.patch14
-rw-r--r--packaging/Debian/debian-unstable/patches/documentation.patch34
-rw-r--r--packaging/Debian/debian-unstable/patches/fhs.patch332
-rw-r--r--packaging/Debian/debian-unstable/patches/installswat.sh.patch2
-rw-r--r--packaging/Debian/debian-unstable/patches/make-distclean.patch27
-rw-r--r--packaging/Debian/debian-unstable/patches/non-linux-ports.patch62
-rw-r--r--packaging/Debian/debian-unstable/patches/nonpic-libsmbclient.patch26
-rw-r--r--packaging/Debian/debian-unstable/patches/samba.patch6
-rw-r--r--packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch6
-rw-r--r--packaging/Debian/debian-unstable/patches/smbmount-unix-caps.patch14
-rw-r--r--packaging/Debian/debian-unstable/patches/smbstatus-locking.patch2
-rw-r--r--packaging/Debian/debian-unstable/patches/undefined-symbols.patch22
-rw-r--r--packaging/Debian/debian-unstable/po/ca.po320
-rw-r--r--packaging/Debian/debian-unstable/po/cs.po318
-rw-r--r--packaging/Debian/debian-unstable/po/da.po317
-rw-r--r--packaging/Debian/debian-unstable/po/de.po350
-rw-r--r--packaging/Debian/debian-unstable/po/es.po31
-rw-r--r--packaging/Debian/debian-unstable/po/fr.po31
-rw-r--r--packaging/Debian/debian-unstable/po/it.po314
-rw-r--r--packaging/Debian/debian-unstable/po/ja.po118
-rw-r--r--packaging/Debian/debian-unstable/po/nl.po31
-rw-r--r--packaging/Debian/debian-unstable/po/pt.po324
-rw-r--r--packaging/Debian/debian-unstable/po/pt_BR.po118
-rw-r--r--packaging/Debian/debian-unstable/po/ru.po315
-rw-r--r--packaging/Debian/debian-unstable/po/sv.po281
-rw-r--r--packaging/Debian/debian-unstable/po/templates.pot31
-rw-r--r--packaging/Debian/debian-unstable/po/tr.po322
-rw-r--r--packaging/Debian/debian-unstable/po/vi.po322
-rwxr-xr-xpackaging/Debian/debian-unstable/rules120
-rw-r--r--packaging/Debian/debian-unstable/samba-common.files1
-rw-r--r--packaging/Debian/debian-unstable/samba-doc.docs7
-rw-r--r--packaging/Debian/debian-unstable/samba.docs3
-rw-r--r--packaging/Debian/debian-unstable/samba.files3
-rw-r--r--packaging/Debian/debian-unstable/samba.init31
-rw-r--r--packaging/Debian/debian-unstable/samba.logrotate2
-rw-r--r--packaging/Debian/debian-unstable/samba.postinst6
-rwxr-xr-xpackaging/Debian/debian-unstable/scripts/unpatch-source2
-rw-r--r--packaging/Debian/debian-unstable/smb.conf6
-rw-r--r--packaging/Debian/debian-unstable/smbfs.files2
-rw-r--r--packaging/Debian/debian-unstable/winbind.init16
48 files changed, 4600 insertions, 332 deletions
diff --git a/packaging/Debian/debian-unstable/changelog b/packaging/Debian/debian-unstable/changelog
index 382ee43eced..bf2b1b65243 100644
--- a/packaging/Debian/debian-unstable/changelog
+++ b/packaging/Debian/debian-unstable/changelog
@@ -1,8 +1,375 @@
-samba (3.0.2-0.1) unstable; urgency=low
+samba (3.0.20b-2) unstable; urgency=low
+
+ * Don't build with -gstabs any more; -g no longer gives a problematic
+ size hit, and -gstabs is no longer supported on ia64.
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 19 Oct 2005 19:02:44 -0700
+
+samba (3.0.20b-1) unstable; urgency=low
+
+ * Christian Perrier:
+ - Debconf translations:
+ - Added Vietnamese. Closes: #317876
+ - Updated German. Closes: #322907
+ * Steve Langasek:
+ - Use ${misc:Depends} in debian/control instead of depending on
+ debconf directly, allowing use of cdebconf as an alternative.
+ Closes: #332088.
+ * Noèl Köthe
+ - corrected libsmbclient priority to optional. Closes: #310045
+ - corrected the path of ServerType.html in smb.conf. Closes: #296500
+ - updated Standards-Version to 3.6.2 (no changes needed)
+ - added homepage to description
+ - switched init scripts (samba and winbind) to lsb-functions
+ (took patches from ubuntu)
+ - added Swedish. Closes: #331437
+ - removed outdated "guest" value in "passdb backend" in default smb.conf
+ Closes: #289519
+ - moved smbpasswd(5) to samba-common where the binary and smbpasswd(8)
+ is; Replaces: all previous versions of samba. Closes: #253603
+ - new upstream release 3.0.20b (from 2005-10-13). Closes: #324515
+ - support for Windows Vista. Closes: #323489
+ - Mac OS Tiger Problem fixed. Closes: #309836
+ - BUG 2688: re-implement support for the -P (--port) option.
+ Closes: #307746
+ - "man smb.conf" warnings fixed. Closes: #266320
+ - testprns removed by upstream so removed in samba.files
+ - corrected docs/*.pdf names (samba-doc.docs)
+ - corrected diagnosis.html path (samba.docs)
+ - removing patches which are included upstream:
+ dos7-xcopy-always-copies-files.patch
+ (* BUG 2622: Remove DPTR_MASK as it makes no sense.)
+ hide-special-file-fix.patch
+ (* Hide dot files and directory logic fixes.)
+ rap-printing-bigendian.patch
+ (* BUG 1998: Correct byte ordering bug when storing
+ 16-bit RAP print job ids.)
+ smbclient-vfat-loop.patch
+ smbclient-vfat-loop2.patch
+ (* BUG 2698: Fix infinite listing loop in smbclient
+ caused by an invalid character set conversion.)
+ - fixed the following patches which didn't applied cleanly
+ fhs.patch
+ non-linux-ports.patch
+
+ -- Steve Langasek <vorlon@debian.org> Tue, 18 Oct 2005 19:02:21 -0700
+
+samba (3.0.14a-6) unstable; urgency=low
+
+ * Use DEB_HOST_ARCH_OS instead of DEB_HOST_GNU_SYSTEM to detect
+ Linux in debian/rules, for compatibility with dpkg-dev >= 1.13.9;
+ add a versioned build-depend accordingly. Closes: #315955
+ * Switch to libreadline5.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 1 Jul 2005 00:13:12 -0700
+
+samba (3.0.14a-5) unstable; urgency=low
+
+ * Fix libsmbclient.a to be built as non-PIC instead of PIC.
+ Closes: #279243.
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 8 Jun 2005 05:46:52 -0700
+
+samba (3.0.14a-4) unstable; urgency=high
+
+ * Last-minute upload for sarge, because I don't listen to anything
+ that RM guy says
+ * Patch smbmount to strip CAP_UNIX out of the capabilities passed to
+ the kernel when uid, gid, dmask, or fmask options have been
+ specified; this keeps the mount permissions from changing out from
+ under the user when upgrading to a server (or to a kernel) that
+ supports unix extensions. Closes: #310982.
+ * Second patch to smbclient search continuation logic, from upstream:
+ preserve the original UCS2 filename to guard against lossy
+ conversions, and break out if we find ourselves looping.
+ Closes: #311157.
+ * Upstream fix to make print job cancellations work on big-endian
+ systems when talking to RAP-style clients (i.e., smbclient).
+ Closes: #311213.
+ * Add build-dependency on libpopt-dev, so that we consistently use the
+ system popt lib instead of the bundled one.
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 2 Jun 2005 07:02:46 -0700
+
+samba (3.0.14a-3) unstable; urgency=high
+
+ * Urgency set to high for a bug that makes smbclient/libsmbclient
+ /almost/ mostly unusable
+ * Fix smbclient's search continuation logic so that it works correctly
+ against 2K servers offering VFAT-hosted shares; many thanks to
+ Jeremy Allison for the timely upstream fix. Closes: #309798.
+ * Update pt_BR debconf translation. Thanks to Andre Luis Lopes
+ <andrelop@debian.org>. (closes: #308510)
+ * Add Russian debconf translation, thanks to Yuriy Talakan
+ <yt@amur.elektra.ru>. (closes: #310063)
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 26 May 2005 23:37:57 -0700
+
+samba (3.0.14a-2) unstable; urgency=low
+
+ * Point the sense of the file_is_special() check right way around;
+ thanks to Matthijs Mohlmann for catching this. Closes: #305747.
+ * debian/patches/dos7-xcopy-always-copies-files.patch:
+ Fix the MS-DOS 7 XCOPY copying files over and over bug
+ Closes: #309003
+ * Steve Langasek <vorlon@debian.org>:
+ - Add Christian Perrier to Uploaders:. Thanks, Christian :)
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 8 May 2005 04:43:21 -0700
+
+samba (3.0.14a-1) unstable; urgency=low
+
+ * New upstream version
+ - A more complete upstream fix for missing files in file listings,
+ should really give us working (closes: #302771); drop
+ xp-missing-files.patch, which has been superseded.
+ * Use the right path when removing mount.cifs binary in the clean
+ target. Closes: #303318.
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 18 Apr 2005 03:22:29 -0700
+
+samba (3.0.11-1) unstable; urgency=high
+
+ * New upstream version
+ - Fixes duplicated entry in swat(8) manpage (closes: #292957).
+ - Fix queue handling so that processes serving print clients don't
+ spin off into infinity and clobber the system (closes: #274969).
+ - Make sure we use C-locale toupper/tolower functions for case
+ conversion, since Turkish pairing rules are incompatible
+ (closes: #286174).
+ * Fix logrotate script to exit true instead of false when nmbd.pid is
+ missing (closes: #287263).
+ * Added Portuguese debconf translation. Thanks to Miguel Figueiredo
+ <elmig@debianpt.org>. (closes: #286375)
+ * Added Italian debconf translation. Thanks to Luca Monducci
+ <luca.mo@tiscali.it>. (closes: #284125)
+ * Add support for building on the Debian BSD and Hurd ports; thanks to
+ Robert Millan for the patch. (closes: #266693)
+ * debian/patches/xp-missing-files.patch: import patch from upstream to
+ fix missing entries in directory listings when talking to WinXP
+ servers (closes: #297771).
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 23 Mar 2005 00:13:16 -0800
+
+samba (3.0.10-1) unstable; urgency=high
* New upstream release.
+ - CAN-2004-1154: integer overflow can lead to remote code execution
+ by authenticated users; closes: #286023.
+ * High-urgency upload for sarge-targetted RC bugfix.
+ * Sync the fhs.patch to samba 3.0.10.
+ * Install mount.cifs suid root, to make user mounts possible
+ (closes: #283819).
+ * debian/patches/cups.patch: Change the default printing system, so we
+ can compile in CUPS support without making it the default -- CUPS is
+ not a reasonable default on Debian, at least for sarge.
- -- Debian User <debian-user@somewhere.net> Wed, 4 Feb 2004 23:15:46 -0500
+ -- Steve Langasek <vorlon@debian.org> Fri, 17 Dec 2004 11:56:01 -0800
+
+samba (3.0.9-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixes Win9x printing; closes: #283530, #282571, #283818.
+ - Fixes a problem with setting dosmodes on filesystems without ACL
+ support; closes: #283661.
+ - Drop ldapsam_compat.patch, redundant now that a fix is integrated
+ upstream
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 2 Dec 2004 01:11:39 -0800
+
+samba (3.0.8-2) unstable; urgency=low
+
+ * Fix the module paths for python2.3-samba so that "import foo from samba"
+ works, and include the __init__.py glue; closes: #222867).
+ * Enable quota support; closes: #246839.
+ * Fix missing symbols in libsmbclient (and libnss_wins), and add
+ -Wl,-z,defs to the libsmbclient link options to prevent future
+ instances of undefined symbols (closes: #281181).
+ * Fix for the legacy ldapsam_compat backend; thanks to Fabien
+ Chevalier for the patch (closes: #274155).
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 15 Nov 2004 06:54:13 -0800
+
+samba (3.0.8-1) unstable; urgency=high
+
+ * New upstream package. Urgency set to "high" because of a potential
+ Denial of Service vulnerability in previous 3.0.x releases
+ (CAN-2004-0930). (Eloy)
+ * Introduce new -dbg package, so we can make better sense out of the
+ cleverly-supplied backtrace emails. (Vorlon)
+ * Applied patch from Luke Mewburn <luke@mewburn.net> to fix missing
+ lock_path() to state_path() change in the FHS patches. (Eloy)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 8 Nov 2004 13:39:34 -0500
+
+samba (3.0.7-2) unstable; urgency=high
+
+ * High-urgency upload for sarge-targetted RC fixes.
+ * Use autogen.sh in unpatch-source as well as in patch-source, to get
+ rid of the autom4te.cache cruft.
+ * debian/patches/make-distclean.patch: add some missing files to the
+ distclean target in source/Makefile.in (mostly-fixes: #276203).
+ * Change compile-time default of 'use sendfile' to 'no', since the
+ current Samba implementation is broken (closes: #261917, #275741,
+ #270175).
+ * Add mount.cifs into the smbfs package; thanks to Igor Belyi for
+ showing us just how simple this patch should be. ;) Since cifs is
+ the preferred kernel driver in 2.6, bugs related to smbfs and 2.6
+ are considered closed unless someone can show that they exist with
+ the cifs driver as well (closes: #249890, #269443, #227791, #236869,
+ #260707, #261808, #270175).
+ * Fix FHS migration code so that it only affects upgrades from old
+ package versions, and doesn't cause us to mess with non-standard
+ directories that may have been re-added by the admin
+ (closes: #251858).
+
+ -- Steve Langasek <vorlon@debian.org> Tue, 26 Oct 2004 01:35:23 -0700
+
+samba (3.0.7-1) unstable; urgency=high
+
+ * New upstream release. This release fixes two possible denial of
+ service conditions; one in nmbd and one in smbd. The CVE numbers
+ for these vulnerabilities are:
+
+ CAN-2004-0807 for the smbd DoS
+ CAN-2004-0808 for the nmbd DoS
+
+ Urgency is set to "high" because of these vulnerabilities; so this
+ new release propagates to testing ASAP.
+
+ Thanks to the Samba Team and the Debian Security Team for the
+ heads up.
+ * Remove post-3.0.6 patches that are now in 3.0.7.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 13 Sep 2004 00:53:38 -0400
+
+samba (3.0.6-4) unstable; urgency=low
+
+ * Update LDAP schema (closes: #269797).
+ * Applied a couple of upstream fixes that will be present in Samba 3.0.7.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 7 Sep 2004 15:28:42 -0400
+
+samba (3.0.6-3) unstable; urgency=low
+
+ * Put libsmbclient where it belongs, in /usr/lib. (closes: #267704)
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 25 Aug 2004 01:58:37 -0400
+
+samba (3.0.6-2) unstable; urgency=low
+
+ * Added Danish debconf translation. Thanks to Claus Hindsgaul
+ <claus_h@image.dk>. (closes: #232884)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 23 Aug 2004 17:24:19 -0400
+
+samba (3.0.6-1) unstable; urgency=low
+
+ * New upstream version.
+ * Incorporate Turkish debconf translation; thanks to Recai Oktas
+ <roktas@omu.edu.tr>. (closes: #252031)
+ * Update pt_BR debconf translation. Thanks to Andre Luis Lopes
+ <andrelop@debian.org>. (closes: #208113)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 23 Aug 2004 12:34:44 -0400
+
+samba (3.0.5-2) unstable; urgency=high
+
+ * Patches from Fabien Chevalier <fabien.chevalier@supelec.fr>
+ to fix:
+ + libnss_wins crashes other programs (closes: #252591)
+ + Can't list share files/dirs, but can acces deeper files/dirs
+ (closes: #264572)
+ + Samba 3.0.5 Printserver doesn't work with WinXP SP2 (closes: #265871)
+ * Urgency "high" to make it into testing as soon as possible since
+ at least #265871 is pretty bad now that WinXP SP2 has been released.
+ Thanks for the help Fabien! Both Vorlon and I have been very busy
+ lately.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 18 Aug 2004 13:25:41 -0400
+
+samba (3.0.5-1) unstable; urgency=high
+
+ * New upstream version. Urgency "high" because of potential buffer
+ overflows. The security fixes are the only difference between
+ 3.0.4 and 3.0.5.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 22 Jul 2004 08:07:36 -0400
+
+samba (3.0.4-5) unstable; urgency=low
+
+ * Doh! Build-depends on libcupsys2-dev (>=1.1.20final+cvs20040330-4),
+ not an unversioned libcupsys2-dev. (closes# 250523)
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 25 May 2004 07:43:54 -0400
+
+samba (3.0.4-4) unstable; urgency=low
+
+ * Rebuilt with libcupsys2-gnutls10 for unstable.
+ Closes: #250424, #250483, #250491, #250515, #250523, #250592, #250736
+ Closes: #250742, #250733
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 24 May 2004 22:32:52 -0400
+
+samba (3.0.4-3) unstable; urgency=low
+
+ * Color me stupid; I uploaded an experimental version to unstable.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 22 May 2004 00:40:58 -0400
+
+samba (3.0.4-1) unstable; urgency=low
+
+ Eloy:
+
+ * New upstream version.
+ Closes: #247640 (New upstream version available)
+ Closes: #238905 (Printing crash fix)
+ Closes: #247090 (panic in viewing printerqueue)
+
+ Vorlon:
+
+ * Incorporate Catalan debconf translations; thanks to
+ Aleix Badia i Bosch <abadia@ica.es> and the Debian L10n Catalan Team.
+ (closes: #236640)
+ * Incorporate Czech debconf translations; thanks to
+ Miroslav Kure <kurem@upcase.inf.upol.cz> (closes: #236274).
+ * Update libsmbclient shlibs, due to an incompatibility with older
+ versions that prevents gnome-vfs from working correctly
+ (closes: #245869).
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 21 May 2004 11:42:19 -0400
+
+samba (3.0.2a-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 24 Feb 2004 10:30:47 -0500
+
+samba (3.0.2-2) unstable; urgency=high
+
+ * Apply patch from Urban Widmark <urban@teststation.com> to prevent
+ users from mounting remote filesystems containing suid files
+ (closes: 232327). This represents an exploitable security hole on
+ systems running Linux 2.6 kernels.
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 12 Feb 2004 21:38:40 -0600
+
+samba (3.0.2-1) unstable; urgency=high
+
+ * New upstream release.
+ - LaMont Jones: correct false failure LFS test that resulted
+ in _GNU_SOURCE not being defined (thus resulting in strndup()
+ not being defined) (closes: #226694)
+ - Segfault fixes. (closes: #230012) (maybe more, but we need bug
+ reporters to confirm.)
+
+ Urgency "high" due to a password initialization bug that could grant
+ an attacker unauthorized access to a user account created by the
+ mksmbpasswd.sh shell script. See WHATSNEWS.txt for details and
+ workarounds for those not wishing to upgrade (which is a bad idea
+ anyway since this new release fixes lots of other bugs.)
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 8 Feb 2004 10:06:29 -0500
samba (3.0.1-2) unstable; urgency=low
diff --git a/packaging/Debian/debian-unstable/config.cache.alpha-linux-gnu b/packaging/Debian/debian-unstable/config.cache.alpha-linux-gnu
new file mode 100644
index 00000000000..6d171920263
--- /dev/null
+++ b/packaging/Debian/debian-unstable/config.cache.alpha-linux-gnu
@@ -0,0 +1,12 @@
+# 22 Aug 2001 Steve Langasek <vorlon@debian.org>
+
+# This file contains autoconf settings specific to the alpha-linux
+# platform that should be preloaded when building for this architecture.
+
+
+# Linux 2.2 on Alpha doesn't have a functional setresgid() call, but
+# Linux 2.4 does. Ensure that packages compiled for woody remain
+# compatible with 2.2 kernels, even if the build machine is running 2.4.
+samba_cv_have_setresgid=${samba_cv_have_setresgid=no}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=no}
+samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/packaging/Debian/debian-unstable/config.cache.sparc-linux-gnu b/packaging/Debian/debian-unstable/config.cache.sparc-linux-gnu
new file mode 100644
index 00000000000..a2a21b1d3ad
--- /dev/null
+++ b/packaging/Debian/debian-unstable/config.cache.sparc-linux-gnu
@@ -0,0 +1,13 @@
+# 24 Spe 2001 Steve Langasek <vorlon@debian.org>
+
+# This file contains autoconf settings specific to the sparc-linux
+# platform that should be preloaded when building for this architecture.
+
+
+# Linux 2.2 on Sparc doesn't have setresgid() or setresuid(), but
+# Linux 2.4 does. Ensure that packages compiled for woody remain
+# compatible with 2.2 kernels, even if the build machine is running 2.4.
+samba_cv_have_setresuid=${samba_cv_have_setresuid=no}
+samba_cv_have_setresgid=${samba_cv_have_setresgid=no}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=no}
+samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/packaging/Debian/debian-unstable/control b/packaging/Debian/debian-unstable/control
index 7bfb41b79d9..1ac2b3bd762 100644
--- a/packaging/Debian/debian-unstable/control
+++ b/packaging/Debian/debian-unstable/control
@@ -2,13 +2,13 @@ Source: samba
Section: net
Priority: optional
Maintainer: Eloy A. Paris <peloy@debian.org>
-Uploaders: Steve Langasek <vorlon@debian.org>
-Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev
-Standards-Version: 3.5.10
+Uploaders: Steve Langasek <vorlon@debian.org>, Christian Perrier <bubulle@debian.org>
+Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9)
+Standards-Version: 3.6.2
Package: samba
Architecture: any
-Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules
+Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6)
Replaces: samba-common (<= 2.0.5a-2)
Suggests: samba-doc
Description: a LanManager-like file and printer server for Unix
@@ -37,11 +37,13 @@ Description: a LanManager-like file and printer server for Unix
It is possible to install a subset of these packages depending on
your particular needs. For example, to access other SMB servers you
should only need the smbclient and samba-common packages.
+ .
+ http://www.samba.org/
Package: samba-common
Architecture: any
-Depends: debconf, libpam-modules, ${shlibs:Depends}
-Replaces: samba (<< 2.999+3.0.alpha21-4)
+Depends: libpam-modules, ${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 protocol for unix systems, allowing you to serve
@@ -71,7 +73,7 @@ Description: a LanManager-like simple client for Unix
Package: swat
Architecture: any
-Depends: debconf, samba (= ${Source-Version}), ${shlibs:Depends}
+Depends: samba (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: samba-doc
Description: Samba Web Administration Tool
The Samba software suite is a collection of programs that
@@ -136,7 +138,7 @@ Description: pluggable authentication module for SMB password database
Package: libsmbclient
Section: libs
-Priority: extra
+Priority: optional
Architecture: any
Depends: ${shlibs:Depends}
Description: shared library that allows applications to talk to SMB servers
@@ -186,3 +188,16 @@ Description: Python bindings that allow access to various aspects of Samba
to work well.
.
See /usr/share/doc/python2.3-samba/examples for a couple of examples.
+
+Package: samba-dbg
+Section: devel
+Architecture: any
+Depends: samba (= ${Source-Version})
+Description: Samba debugging symbols
+ The Samba software suite is a collection of programs that
+ implements the SMB 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 debugging symbols for the programs included in
+ the samba and smbclient packages.
diff --git a/packaging/Debian/debian-unstable/control.in b/packaging/Debian/debian-unstable/control.in
new file mode 100644
index 00000000000..1beeb702500
--- /dev/null
+++ b/packaging/Debian/debian-unstable/control.in
@@ -0,0 +1,203 @@
+Source: samba
+Section: net
+Priority: optional
+Maintainer: Eloy A. Paris <peloy@debian.org>
+Uploaders: Steve Langasek <vorlon@debian.org>, Christian Perrier <bubulle@debian.org>
+Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9)
+Standards-Version: 3.6.2
+
+Package: samba
+Architecture: any
+Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6)
+Replaces: samba-common (<= 2.0.5a-2)
+Suggests: samba-doc
+Description: a LanManager-like file and printer server for Unix
+ The Samba software suite is a collection of programs that
+ implements the SMB 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.
+ smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
+ libpam-smbpass - pluggable authentication module for SMB password database
+ libsmbclient - Shared library that allows applications to talk to SMB servers
+ libsmbclient-dev - libsmbclient shared libraries
+ winbind: Service to resolve user and group information from Windows NT servers
+ python2.3-samba: Python bindings that allow access to various aspects of Samba
+ .
+ It is possible to install a subset of these packages depending on
+ your particular needs. For example, to access other SMB servers you
+ should only need the smbclient and samba-common packages.
+ .
+ http://www.samba.org/
+
+Package: samba-common
+Architecture: any
+Depends: libpam-modules, ${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 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 common files that are used by both the server
+ (provided in the samba package) and the client (provided in the smbclient
+ package).
+
+Package: smbclient
+Architecture: any
+Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
+Replaces: samba (<< 2.999+3.0.alpha21-4)
+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 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.
+
+Package: swat
+Architecture: any
+Depends: samba (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: samba-doc
+Description: Samba Web Administration Tool
+ The Samba software suite is a collection of programs that
+ implements the SMB 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.
+ .
+ Note: if you want to use the on-line documentation that is accesible
+ through the Swat front-end you must install the samba-doc package.
+
+Package: samba-doc
+Section: doc
+Architecture: all
+Description: Samba documentation
+ The Samba software suite is a collection of programs that
+ implements the SMB 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 documentation that comes in the original
+ tarball.
+
+Package: smbfs
+Section: otherosfs
+Priority: optional
+Architecture: any
+Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends}
+Suggests: smbclient
+Replaces: smbfsx
+Conflicts: smbfsx, suidmanager (<< 0.50)
+Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
+ Smbfs is a filesystem which understands the SMB 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.
+ .
+ Starting with the Debian Samba packages version 2.2.0-1, the old smbfs
+ utilities for 2.0.x have been removed. There are no wrapper scripts
+ that call a specific smbmount/smbumount depending on the kernel
+ version. If you are using a 2.0.x kernel please upgrade or use the
+ latest Samba 2.0.7 Debian package.
+
+Package: libpam-smbpass
+Section: admin
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: samba
+Description: pluggable authentication module for SMB 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.
+
+Package: libsmbclient
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: shared library that allows applications to talk to SMB servers
+ libsmbclient allows to write applications that use the SMB protocol.
+ This gives applications the ability to talk to Microsoft Windows servers
+ and Unix servers running Samba.
+ .
+ This package contains the libsmbclient shared library.
+
+Package: libsmbclient-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libsmbclient (= ${Source-Version})
+Description: libsmbclient static libraries and headers
+ libsmbclient allows to write applications that use the SMB protocol.
+ This gives applications the ability to talk to Microsoft Windows servers
+ and Unix servers running Samba.
+ .
+ This package contains the libsmbclient static libraries and headers
+ needed to build applications that use SMB services.
+
+Package: winbind
+Section: net
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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.
+
+Package: python2.3-samba
+Section: python
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, python2.3
+Description: Python bindings that allow access to various aspects of Samba
+ The Samba Python bindings allow you to access various aspects of Samba.
+ At the moment their status is "experimental" but they have been reported
+ to work well.
+ .
+ See /usr/share/doc/python2.3-samba/examples for a couple of examples.
+
+Package: samba-dbg
+Section: devel
+Architecture: any
+Depends: samba (= ${Source-Version})
+Description: Samba debugging symbols
+ The Samba software suite is a collection of programs that
+ implements the SMB 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 debugging symbols for the programs included in
+ the samba and smbclient packages.
diff --git a/packaging/Debian/debian-unstable/copyright b/packaging/Debian/debian-unstable/copyright
index e74a64fa5b8..f4529a826fd 100644
--- a/packaging/Debian/debian-unstable/copyright
+++ b/packaging/Debian/debian-unstable/copyright
@@ -2,10 +2,11 @@ This is the Debian Linux prepackaged version of the Samba SMB
(LAN-Manager) server. Samba was written by Andrew Tridgell
<Andrew.Tridgell@anu.edu.au> and many others.
-This package was put together by Eloy Paris <peloy@debian.org>
-and Steve Langasek <vorlon@debian.org> based on previous work by
-Klee Dienes <klee@debian.org>, Andrew Howell <andrew@it.com.au>
-and Bruce Perens <bruce@pixar.com> from sources found at
+This package was put together by Eloy Paris <peloy@debian.org>,
+Steve Langasek <vorlon@debian.org>, and Víctor Pérez Pereira
+<vperez@debianvenezuela.org> based on previous work by Klee Dienes
+<klee@debian.org>, Andrew Howell <andrew@it.com.au> and Bruce Perens
+<bruce@pixar.com> from sources found at
<URL:ftp://ftp.samba.org/pub/samba>.
Copyright:
diff --git a/packaging/Debian/debian-unstable/libsmbclient.shlibs b/packaging/Debian/debian-unstable/libsmbclient.shlibs
index 9c6eea200a9..532b5de4d1c 100644
--- a/packaging/Debian/debian-unstable/libsmbclient.shlibs
+++ b/packaging/Debian/debian-unstable/libsmbclient.shlibs
@@ -1 +1 @@
-libsmbclient 0 libsmbclient (>= 2.2.2-11)
+libsmbclient 0 libsmbclient (>= 3.0.2a-1)
diff --git a/packaging/Debian/debian-unstable/patches/VERSION.patch b/packaging/Debian/debian-unstable/patches/VERSION.patch
index 0f5c129c564..efa7d85d4d4 100644
--- a/packaging/Debian/debian-unstable/patches/VERSION.patch
+++ b/packaging/Debian/debian-unstable/patches/VERSION.patch
@@ -1,6 +1,6 @@
--- samba-3.0.0rc2/source/VERSION.orig 2003-09-02 21:56:11.000000000 -0400
+++ samba-3.0.0rc2/source/VERSION 2003-09-02 21:56:30.000000000 -0400
-@@ -120,4 +120,4 @@
+@@ -78,4 +78,4 @@
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
diff --git a/packaging/Debian/debian-unstable/patches/cups.patch b/packaging/Debian/debian-unstable/patches/cups.patch
new file mode 100644
index 00000000000..8b1b8653d92
--- /dev/null
+++ b/packaging/Debian/debian-unstable/patches/cups.patch
@@ -0,0 +1,14 @@
+--- samba-3.0.10.orig/source/include/includes.h
++++ samba-3.0.10/source/include/includes.h
+@@ -940,10 +940,7 @@
+ #endif
+
+ #ifndef DEFAULT_PRINTING
+-#ifdef HAVE_CUPS
+-#define DEFAULT_PRINTING PRINT_CUPS
+-#define PRINTCAP_NAME "cups"
+-#elif defined(SYSV)
++#if defined(SYSV)
+ #define DEFAULT_PRINTING PRINT_SYSV
+ #define PRINTCAP_NAME "lpstat"
+ #else
diff --git a/packaging/Debian/debian-unstable/patches/documentation.patch b/packaging/Debian/debian-unstable/patches/documentation.patch
index 922b93f9900..505a53c51b6 100644
--- a/packaging/Debian/debian-unstable/patches/documentation.patch
+++ b/packaging/Debian/debian-unstable/patches/documentation.patch
@@ -1,6 +1,6 @@
---- samba_3_0/docs/manpages/swat.8.orig 2003-06-06 16:16:24.000000000 -0400
-+++ samba_3_0/docs/manpages/swat.8 2003-06-06 16:25:13.000000000 -0400
-@@ -91,6 +91,13 @@
+--- samba-3.0.4/docs/manpages/swat.8.orig 2004-05-05 10:22:50.000000000 -0400
++++ samba-3.0.4/docs/manpages/swat.8 2004-05-10 13:25:53.000000000 -0400
+@@ -80,6 +80,13 @@
.SH "INSTALLATION"
.PP
@@ -14,26 +14,24 @@
Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
.PP
-@@ -98,15 +105,15 @@
+@@ -87,13 +94,13 @@
.TP 3
\(bu
--/usr/local/samba/bin/swat
+-/usr/local/samba/sbin/swat
+/usr/sbin/swat
-
.TP
\(bu
-/usr/local/samba/swat/images/*
+/usr/share/samba/swat/images/*
-
.TP
\(bu
-/usr/local/samba/swat/help/*
+/usr/share/samba/swat/help/*
-
.LP
-@@ -116,7 +123,7 @@
+ .SS "Inetd Installation"
+@@ -102,7 +109,7 @@
You need to edit your \fI/etc/inetd\&.conf \fR and \fI/etc/services\fR to enable SWAT to be launched via \fBinetd\fR\&.
.PP
@@ -42,27 +40,27 @@
.PP
\fBswat 901/tcp\fR
-@@ -128,10 +135,10 @@
+@@ -114,10 +121,10 @@
the choice of port number isn't really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your\fBinetd\fR daemon)\&.
.PP
-In \fI/etc/inetd\&.conf\fR you should add a line like this:
-+In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it. You need to uncomment the line, though, because it is added commented out for security reasons):
++In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it automatically. You need to uncomment the line, though, because it is added commented out for security reasons):
.PP
--\fBswat stream tcp nowait\&.400 root /usr/local/samba/bin/swat swat\fR
-+\fBswat stream tcp nowait.400 root /usr/sbin/swat swat\fR
+-\fBswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\fR
++\fBswat stream tcp nowait\&.400 root /usr/sbin/swat swat\fR
.PP
- One you have edited \fI/etc/services\fR and \fI/etc/inetd\&.conf\fR you need to send a HUP signal to inetd\&. To do this use \fBkill \-1 PID \fR where PID is the process ID of the inetd daemon\&.
-@@ -157,8 +164,8 @@
-
+ Once you have edited \fI/etc/services\fR and \fI/etc/inetd\&.conf\fR you need to send a HUP signal to inetd\&. To do this use \fBkill \-1 PID \fR where PID is the process ID of the inetd daemon\&.
+@@ -141,8 +148,8 @@
+ This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
.TP
-\fI/usr/local/samba/lib/smb\&.conf\fR
-This is the default location of the \fBsmb\&.conf\fR(5) server configuration file that swat edits\&. Other common places that systems install this file are \fI /usr/samba/lib/smb\&.conf\fR and \fI/etc/smb\&.conf \fR\&. This file describes all the services the server is to make available to clients\&.
+\fI/etc/samba/smb\&.conf\fR
-+This is the default location of the \fBsmb.conf\fR(5) server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
-
++This is the default location of the \fBsmb\&.conf\fR(5) server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
.SH "WARNINGS"
+
diff --git a/packaging/Debian/debian-unstable/patches/fhs.patch b/packaging/Debian/debian-unstable/patches/fhs.patch
index 2ea7d96103b..a3cc7f38260 100644
--- a/packaging/Debian/debian-unstable/patches/fhs.patch
+++ b/packaging/Debian/debian-unstable/patches/fhs.patch
@@ -1,7 +1,7 @@
-diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in
---- samba-3.0.0beta2.orig/source/Makefile.in 2003-07-02 23:26:46.000000000 -0500
-+++ samba-3.0.0beta2/source/Makefile.in 2003-07-02 23:19:46.000000000 -0500
-@@ -92,6 +93,13 @@
+diff -uNr samba-3.0.10.orig/source/Makefile.in samba-3.0.10/source/Makefile.in
+--- samba-3.0.10.orig/source/Makefile.in 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/Makefile.in 2004-12-17 03:55:29.000000000 -0800
+@@ -90,6 +90,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -15,7 +15,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
# the directory where pid files go
PIDDIR = @piddir@
# man pages language(s)
-@@ -116,7 +124,7 @@
+@@ -114,7 +121,7 @@
PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
@@ -24,48 +24,39 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
# Note that all executable programs now provide for an optional executable suffix.
-@@ -1234,7 +1242,7 @@
+@@ -1319,7 +1326,7 @@
@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
installdat: installdirs
- @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir)
+ @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(CODEPAGEDIR) $(srcdir)
- installswat: installdirs
- @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
---- samba-3.0.1/source/configure.in.orig 2003-12-17 11:05:40.000000000 -0500
-+++ samba-3.0.1/source/configure.in 2003-12-17 11:05:42.000000000 -0500
-@@ -17,19 +17,26 @@
- AC_ARG_WITH(fhs,
+ installmsg: installdirs
+ @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR)$(LIBDIR) $(srcdir)
+diff -uNr samba-3.0.10.orig/source/configure.in samba-3.0.10/source/configure.in
+--- samba-3.0.10.orig/source/configure.in 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/configure.in 2004-12-17 03:55:29.000000000 -0800
+@@ -35,7 +35,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
- configdir="${sysconfdir}/samba"
+ [ case "$withval" in
+ yes)
- lockdir="\${VARDIR}/lib/samba"
+ lockdir="\${VARDIR}/run/samba"
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
- privatedir="\${CONFIGDIR}/private"
+@@ -43,6 +43,10 @@
libdir="\${prefix}/lib/samba"
-- swatdir="\${DATADIR}/samba/swat",
-+ swatdir="\${DATADIR}/samba/swat"
+ configdir="${sysconfdir}/samba"
+ swatdir="\${DATADIR}/samba/swat"
+ codepagedir="\${DATADIR}/samba"
+ statedir="\${VARDIR}/lib/samba"
+ cachedir="\${VARDIR}/cache/samba"
-+ AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths]),
- configdir="\${LIBDIR}"
- logfilebase="\${VARDIR}"
- lockdir="\${VARDIR}/locks"
- piddir="\${VARDIR}/locks"
- privatedir="\${prefix}/private"
-- swatdir="\${prefix}/swat")
-+ codepagedir="\${LIBDIR}"
-+ swatdir="\${prefix}/swat"
-+ statedir="\${LOCKDIR}"
-+ cachedir="\${LOCKDIR}")
-
- #################################################
- # set private directory location
-@@ -154,6 +161,9 @@
++ AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
+ ;;
+ esac])
+
+@@ -201,6 +205,9 @@
AC_SUBST(swatdir)
AC_SUBST(bindir)
AC_SUBST(sbindir)
@@ -75,9 +66,9 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
dnl Unique-to-Samba variables we'll be playing with.
AC_SUBST(SHELL)
-diff -uNr samba-3.0.0beta2.orig/source/dynconfig.c samba-3.0.0beta2/source/dynconfig.c
---- samba-3.0.0beta2.orig/source/dynconfig.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/dynconfig.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/dynconfig.c samba-3.0.10/source/dynconfig.c
+--- samba-3.0.10.orig/source/dynconfig.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/dynconfig.c 2004-12-17 03:55:29.000000000 -0800
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -120,21 +111,21 @@ diff -uNr samba-3.0.0beta2.orig/source/dynconfig.c samba-3.0.0beta2/source/dynco
+ return lp_lockdir();
+#endif
+}
-diff -uNr samba-3.0.0beta2.orig/source/groupdb/mapping.c samba-3.0.0beta2/source/groupdb/mapping.c
---- samba-3.0.0beta2.orig/source/groupdb/mapping.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/groupdb/mapping.c 2003-07-02 23:19:02.000000000 -0500
-@@ -134,7 +134,7 @@
+diff -uNr samba-3.0.10.orig/source/groupdb/mapping.c samba-3.0.10/source/groupdb/mapping.c
+--- samba-3.0.10.orig/source/groupdb/mapping.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/groupdb/mapping.c 2004-12-17 03:55:29.000000000 -0800
+@@ -140,7 +140,7 @@
- if (tdb && local_pid == sys_getpid())
+ if (tdb)
return True;
- tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
if (!tdb) {
DEBUG(0,("Failed to open group mapping database\n"));
return False;
-diff -uNr samba-3.0.0beta2.orig/source/include/dynconfig.h samba-3.0.0beta2/source/include/dynconfig.h
---- samba-3.0.0beta2.orig/source/include/dynconfig.h 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/include/dynconfig.h 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/include/dynconfig.h samba-3.0.10/source/include/dynconfig.h
+--- samba-3.0.10.orig/source/include/dynconfig.h 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/include/dynconfig.h 2004-12-17 03:55:29.000000000 -0800
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -148,43 +139,34 @@ diff -uNr samba-3.0.0beta2.orig/source/include/dynconfig.h samba-3.0.0beta2/sour
+
+char *dyn_STATEDIR(void);
+char *dyn_CACHEDIR(void);
-diff -uNr samba-3.0.0beta2.orig/source/intl/lang_tdb.c samba-3.0.0beta2/source/intl/lang_tdb.c
---- samba-3.0.0beta2.orig/source/intl/lang_tdb.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/intl/lang_tdb.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/intl/lang_tdb.c samba-3.0.10/source/intl/lang_tdb.c
+--- samba-3.0.10.orig/source/intl/lang_tdb.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/intl/lang_tdb.c 2004-12-17 03:55:29.000000000 -0800
@@ -128,7 +128,7 @@
- /* if no lang then we don't translate */
- if (!lang) return True;
+ if (!lang)
+ return True;
- asprintf(&msg_path, "%s.msg", lib_path((const char *)lang));
+ asprintf(&msg_path, "%s.msg", data_path((const char *)lang));
if (stat(msg_path, &st) != 0) {
/* the msg file isn't available */
- free(msg_path);
-@@ -136,7 +136,7 @@
- }
-
-
-- asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang);
-+ asprintf(&path, "%s%s.tdb", state_path("lang_"), lang);
+ DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
+diff -uNr samba-3.0.10.orig/source/lib/account_pol.c samba-3.0.10/source/lib/account_pol.c
+--- samba-3.0.10.orig/source/lib/account_pol.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/lib/account_pol.c 2004-12-17 03:55:29.000000000 -0800
+@@ -35,7 +35,7 @@
- tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644);
- if (!tdb) {
-diff -uNr samba-3.0.0beta2.orig/source/lib/account_pol.c samba-3.0.0beta2/source/lib/account_pol.c
---- samba-3.0.0beta2.orig/source/lib/account_pol.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/lib/account_pol.c 2003-07-02 23:19:02.000000000 -0500
-@@ -36,7 +36,7 @@
-
- if (tdb && local_pid == sys_getpid())
+ if (tdb)
return True;
- tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
if (!tdb) {
DEBUG(0,("Failed to open account policy database\n"));
return False;
-diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/util.c
---- samba-3.0.0beta2.orig/source/lib/util.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/lib/util.c 2003-07-02 23:19:02.000000000 -0500
-@@ -2195,6 +2195,61 @@
+diff -uNr samba-3.0.10.orig/source/lib/util.c samba-3.0.10/source/lib/util.c
+--- samba-3.0.10.orig/source/lib/util.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/lib/util.c 2004-12-17 03:55:29.000000000 -0800
+@@ -2362,6 +2362,61 @@
}
/**
@@ -246,9 +228,9 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/ut
* @brief Returns the platform specific shared library extension.
*
* @retval Pointer to a static #fstring containing the extension.
-diff -uNr samba-3.0.0beta2.orig/source/lib/util_unistr.c samba-3.0.0beta2/source/lib/util_unistr.c
---- samba-3.0.0beta2.orig/source/lib/util_unistr.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/lib/util_unistr.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/lib/util_unistr.c samba-3.0.10/source/lib/util_unistr.c
+--- samba-3.0.10.orig/source/lib/util_unistr.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/lib/util_unistr.c 2004-12-17 03:55:29.000000000 -0800
@@ -54,8 +54,8 @@
if (initialised) return;
initialised = 1;
@@ -269,9 +251,9 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/util_unistr.c samba-3.0.0beta2/source
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/source/libsmb/samlogon_cache.c
---- samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c 2003-07-01 09:40:37.000000000 -0500
-+++ samba-3.0.0beta2/source/libsmb/samlogon_cache.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/libsmb/samlogon_cache.c samba-3.0.10/source/libsmb/samlogon_cache.c
+--- samba-3.0.10.orig/source/libsmb/samlogon_cache.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/libsmb/samlogon_cache.c 2004-12-17 03:55:29.000000000 -0800
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -290,8 +272,9 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
---- samba_3_0/source/nmbd/nmbd_serverlistdb.c.orig 2003-09-08 10:53:13.000000000 -0400
-+++ samba_3_0/source/nmbd/nmbd_serverlistdb.c 2003-09-08 11:22:03.000000000 -0400
+diff -uNr samba-3.0.10.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0.10/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.0.10.orig/source/nmbd/nmbd_serverlistdb.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/nmbd/nmbd_serverlistdb.c 2004-12-17 03:55:29.000000000 -0800
@@ -327,7 +327,7 @@
updatecount++;
@@ -301,8 +284,9 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
trim_char(fname,'\0' ,'/');
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
---- samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c.orig 2003-08-28 17:42:44.000000000 -0400
-+++ samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c 2003-08-31 08:09:11.000000000 -0400
+diff -uNr samba-3.0.10.orig/source/nmbd/nmbd_winsserver.c samba-3.0.10/source/nmbd/nmbd_winsserver.c
+--- samba-3.0.10.orig/source/nmbd/nmbd_winsserver.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/nmbd/nmbd_winsserver.c 2004-12-17 03:55:30.000000000 -0800
@@ -234,7 +234,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -312,7 +296,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
WINS_LIST, strerror(errno) ));
return True;
-@@ -1765,7 +1765,7 @@
+@@ -1810,7 +1810,7 @@
}
}
@@ -321,9 +305,21 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
all_string_sub(fname,"//", "/", 0);
slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
-diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta2/source/nsswitch/winbindd_cache.c
---- samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/nsswitch/winbindd_cache.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.20b.orig/source/passdb/login_cache.c samba-3.0.20b/source/passdb/login_cache.c
+--- samba-3.0.20b.orig/source/passdb/login_cache.c
++++ samba-3.0.20b/source/passdb/login_cache.c
+@@ -36,7 +36,7 @@
+ /* skip file open if it's already opened */
+ if (cache) return True;
+
+- asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE);
++ asprintf(&cache_fname, "%s/%s", dyn_CACHEDIR(), LOGIN_CACHE_FILE);
+ if (cache_fname)
+ DEBUG(5, ("Opening cache file at %s\n", cache_fname));
+ else {
+diff -uNr samba-3.0.20b.orig/source/nsswitch/winbindd_cache.c samba-3.0.20b/source/nsswitch/winbindd_cache.c
+--- samba-3.0.20b.orig/source/nsswitch/winbindd_cache.c
++++ samba-3.0.20b/source/nsswitch/winbindd_cache.c
@@ -57,7 +57,7 @@
if (opt_nocache)
return;
@@ -333,10 +329,19 @@ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta
TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
if (!wcache->tdb) {
-diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2/source/nsswitch/winbindd_util.c
---- samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c 2003-07-01 15:44:25.000000000 -0500
-+++ samba-3.0.0beta2/source/nsswitch/winbindd_util.c 2003-07-02 23:19:02.000000000 -0500
-@@ -874,7 +874,7 @@
+@@ -1471,7 +1471,7 @@
+ if (wcache->tdb != NULL)
+ return True;
+
+- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
++ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000,
+ TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
+
+ if (wcache->tdb == NULL) {
+diff -uNr samba-3.0.10.orig/source/nsswitch/winbindd_util.c samba-3.0.10/source/nsswitch/winbindd_util.c
+--- samba-3.0.10.orig/source/nsswitch/winbindd_util.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/nsswitch/winbindd_util.c 2004-12-17 03:55:30.000000000 -0800
+@@ -957,7 +957,7 @@
SMB_STRUCT_STAT stbuf;
TDB_CONTEXT *idmap_tdb;
@@ -345,9 +350,9 @@ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2
if (!file_exist(idmap_name, &stbuf)) {
/* nothing to convert return */
-diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/param/loadparm.c
---- samba-3.0.0beta2.orig/source/param/loadparm.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/param/loadparm.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/param/loadparm.c samba-3.0.10/source/param/loadparm.c
+--- samba-3.0.10.orig/source/param/loadparm.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/param/loadparm.c 2004-12-17 03:55:30.000000000 -0800
@@ -104,6 +104,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -358,7 +363,7 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/
char *szLockDir;
char *szPidDir;
char *szRootdir;
-@@ -1083,8 +1083,13 @@
+@@ -1105,8 +1108,13 @@
{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED},
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED},
@@ -372,10 +377,10 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/
{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED},
#ifdef WITH_UTMP
{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED},
-diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/passdb/pdb_tdb.c
---- samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/passdb/pdb_tdb.c 2003-07-02 23:19:02.000000000 -0500
-@@ -501,10 +501,7 @@
+diff -uNr samba-3.0.10.orig/source/passdb/pdb_tdb.c samba-3.0.10/source/passdb/pdb_tdb.c
+--- samba-3.0.10.orig/source/passdb/pdb_tdb.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/passdb/pdb_tdb.c 2004-12-17 03:55:30.000000000 -0800
+@@ -734,10 +734,7 @@
if (location) {
tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
} else {
@@ -387,22 +392,10 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/
tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
}
-diff -uNr samba-3.0.0beta2.orig/source/passdb/privileges.c samba-3.0.0beta2/source/passdb/privileges.c
---- samba-3.0.0beta2.orig/source/passdb/privileges.c 2003-06-07 12:57:35.000000000 -0500
-+++ samba-3.0.0beta2/source/passdb/privileges.c 2003-07-02 23:19:02.000000000 -0500
-@@ -62,7 +62,7 @@
- /* initialise the privilege database */
- BOOL privilege_init(void)
- {
-- tdb = tdb_open_log(lock_path("privilege.tdb"), 0, TDB_DEFAULT,
-+ tdb = tdb_open_log(state_path("privilege.tdb"), 0, TDB_DEFAULT,
- O_RDWR|O_CREAT, 0600);
- if (!tdb) {
- DEBUG(0,("Failed to open privilege database\n"));
-diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/passdb/secrets.c
---- samba-3.0.0beta2.orig/source/passdb/secrets.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/passdb/secrets.c 2003-07-02 23:19:02.000000000 -0500
-@@ -38,8 +38,7 @@
+diff -uNr samba-3.0.10.orig/source/passdb/secrets.c samba-3.0.10/source/passdb/secrets.c
+--- samba-3.0.10.orig/source/passdb/secrets.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/passdb/secrets.c 2004-12-17 03:55:30.000000000 -0800
+@@ -55,8 +55,7 @@
if (tdb)
return True;
@@ -412,10 +405,10 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/
tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/source/printing/nt_printing.c
---- samba-3.0.0beta2.orig/source/printing/nt_printing.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/printing/nt_printing.c 2003-07-02 23:19:02.000000000 -0500
-@@ -293,28 +293,28 @@
+diff -uNr samba-3.0.10.orig/source/printing/nt_printing.c samba-3.0.10/source/printing/nt_printing.c
+--- samba-3.0.10.orig/source/printing/nt_printing.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/printing/nt_printing.c 2004-12-17 03:55:31.000000000 -0800
+@@ -298,28 +298,28 @@
if (tdb_drivers)
tdb_close(tdb_drivers);
@@ -450,12 +443,12 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/s
return False;
}
-diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/source/printing/printing.c
---- samba-3.0.0beta2.orig/source/printing/printing.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/printing/printing.c 2003-07-02 23:19:02.000000000 -0500
-@@ -175,8 +175,8 @@
- if (local_pid == sys_getpid())
- return True;
+diff -uNr samba-3.0.10.orig/source/printing/printing.c samba-3.0.10/source/printing/printing.c
+--- samba-3.0.10.orig/source/printing/printing.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/printing/printing.c 2004-12-17 03:55:31.000000000 -0800
+@@ -177,8 +177,8 @@
+ int services = lp_numservices();
+ int snum;
- unlink(lock_path("printing.tdb"));
- pstrcpy(printing_path,lock_path("printing"));
@@ -463,11 +456,11 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/sour
+ pstrcpy(printing_path,cache_path("printing"));
mkdir(printing_path,0755);
- local_pid = sys_getpid();
-diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/source/printing/printing_db.c
---- samba-3.0.0beta2.orig/source/printing/printing_db.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/printing/printing_db.c 2003-07-02 23:19:02.000000000 -0500
-@@ -87,7 +87,7 @@
+ /* handle a Samba upgrade */
+diff -uNr samba-3.0.10.orig/source/printing/printing_db.c samba-3.0.10/source/printing/printing_db.c
+--- samba-3.0.10.orig/source/printing/printing_db.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/printing/printing_db.c 2004-12-17 03:55:31.000000000 -0800
+@@ -89,7 +89,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -476,29 +469,28 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/s
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-diff -uNr samba-3.0.0beta2.orig/source/registry/reg_db.c samba-3.0.0beta2/source/registry/reg_db.c
---- samba-3.0.0beta2.orig/source/registry/reg_db.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/registry/reg_db.c 2003-07-02 23:19:02.000000000 -0500
-@@ -131,13 +131,13 @@
- * if we need to init the data in the registry
- */
-
-- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
-+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
- if ( !tdb_reg )
- {
-- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- if ( !tdb_reg ) {
- DEBUG(0,("init_registry: Failed to open registry %s (%s)\n",
-- lock_path("registry.tdb"), strerror(errno) ));
-+ state_path("registry.tdb"), strerror(errno) ));
- return False;
- }
-
-diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c
---- samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/registry/reg_db.c samba-3.0.10/source/registry/reg_db.c
+--- samba-3.0.10.orig/source/registry/reg_db.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/registry/reg_db.c 2004-12-17 03:55:31.000000000 -0800
+@@ -198,12 +198,12 @@
+ if ( tdb_reg )
+ return True;
+
+- if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
++ if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+ {
+- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if ( !tdb_reg ) {
+ DEBUG(0,("init_registry: Failed to open registry %s (%s)\n",
+- lock_path("registry.tdb"), strerror(errno) ));
++ state_path("registry.tdb"), strerror(errno) ));
+ return False;
+ }
+
+diff -uNr samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c
+--- samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c 2004-12-17 03:55:31.000000000 -0800
@@ -133,10 +133,10 @@
if (share_tdb && local_pid == sys_getpid())
@@ -512,22 +504,22 @@ diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0bet
return False;
}
-diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/sam/idmap_tdb.c
---- samba-3.0.0beta2.orig/source/sam/idmap_tdb.c 2003-07-01 15:44:26.000000000 -0500
-+++ samba-3.0.0beta2/source/sam/idmap_tdb.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/sam/idmap_tdb.c samba-3.0.10/source/sam/idmap_tdb.c
+--- samba-3.0.10.orig/source/sam/idmap_tdb.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/sam/idmap_tdb.c 2004-12-17 03:55:31.000000000 -0800
@@ -487,7 +487,7 @@
BOOL tdb_is_new = False;
/* use the old database if present */
-- tdbfile = strdup(lock_path("winbindd_idmap.tdb"));
-+ tdbfile = strdup(state_path("winbindd_idmap.tdb"));
+- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb"));
if (!tdbfile) {
DEBUG(0, ("idmap_init: out of memory!\n"));
return NT_STATUS_NO_MEMORY;
-diff -uNr samba-3.0.0beta2.orig/source/smbd/lanman.c samba-3.0.0beta2/source/smbd/lanman.c
---- samba-3.0.0beta2.orig/source/smbd/lanman.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/smbd/lanman.c 2003-07-02 23:19:02.000000000 -0500
-@@ -970,9 +970,9 @@
+diff -uNr samba-3.0.10.orig/source/smbd/lanman.c samba-3.0.10/source/smbd/lanman.c
+--- samba-3.0.10.orig/source/smbd/lanman.c 2004-12-17 03:50:10.000000000 -0800
++++ samba-3.0.10/source/smbd/lanman.c 2004-12-17 03:55:31.000000000 -0800
+@@ -969,9 +969,9 @@
BOOL local_list_only;
int i;
@@ -539,9 +531,21 @@ diff -uNr samba-3.0.0beta2.orig/source/smbd/lanman.c samba-3.0.0beta2/source/smb
return(0);
}
-diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/wrepld/process.c
---- samba-3.0.0beta2.orig/source/wrepld/process.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/wrepld/process.c 2003-07-02 23:19:02.000000000 -0500
+diff -uNr samba-3.0.10.orig/source/utils/net_idmap.c samba-3.0.10/source/utils/net_idmap.c
+--- samba-3.0.10.orig/source/utils/net_idmap.c 2004-12-17 03:50:10.000000000 -0800
++++ samba-3.0.10/source/utils/net_idmap.c 2004-12-17 03:55:32.000000000 -0800
+@@ -126,7 +126,7 @@
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb"));
+ if (!tdbfile) {
+ DEBUG(0, ("idmap_init: out of memory!\n"));
+ return NT_STATUS_NO_MEMORY;
+diff -uNr samba-3.0.10.orig/source/wrepld/process.c samba-3.0.10/source/wrepld/process.c
+--- samba-3.0.10.orig/source/wrepld/process.c 2004-12-17 03:50:10.000000000 -0800
++++ samba-3.0.10/source/wrepld/process.c 2004-12-17 03:55:32.000000000 -0800
@@ -197,7 +197,7 @@
{
TDB_CONTEXT *tdb;
@@ -560,3 +564,15 @@ diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/
if (!tdb) {
DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
return;
+diff -uNr samba-3.0.11.orig/source/printing/nt_printing.c samba-3.0.11/source/printing/nt_printing.c
+--- samba-3.0.11.orig/source/printing/nt_printing.c 2005-03-23 02:51:08.000000000 -0800
++++ samba-3.0.11/source/printing/nt_printing.c 2005-03-23 02:54:33.000000000 -0800
+@@ -2065,7 +2065,7 @@
+ close_all_print_db();
+
+ if (geteuid() == 0) {
+- pstrcpy(printdb_path, lock_path("printing/"));
++ pstrcpy(printdb_path, cache_path("printing/"));
+ pstrcat(printdb_path, sharename);
+ pstrcat(printdb_path, ".tdb");
+
diff --git a/packaging/Debian/debian-unstable/patches/installswat.sh.patch b/packaging/Debian/debian-unstable/patches/installswat.sh.patch
index a2b1cf8f437..81e3dcd4447 100644
--- a/packaging/Debian/debian-unstable/patches/installswat.sh.patch
+++ b/packaging/Debian/debian-unstable/patches/installswat.sh.patch
@@ -1,6 +1,6 @@
--- samba-3.0.1/source/script/installswat.sh.orig 2004-01-13 13:43:42.000000000 -0500
+++ samba-3.0.1/source/script/installswat.sh 2004-01-13 12:56:49.000000000 -0500
-@@ -85,7 +85,11 @@
+@@ -114,7 +114,11 @@
# Install Using Samba book (but only if it is there)
diff --git a/packaging/Debian/debian-unstable/patches/make-distclean.patch b/packaging/Debian/debian-unstable/patches/make-distclean.patch
new file mode 100644
index 00000000000..e8595752905
--- /dev/null
+++ b/packaging/Debian/debian-unstable/patches/make-distclean.patch
@@ -0,0 +1,27 @@
+diff -uNr samba-3.0.7.orig/source/Makefile.in samba-3.0.7/source/Makefile.in
+--- samba-3.0.7.orig/source/Makefile.in 2004-10-25 10:06:08.000000000 -0700
++++ samba-3.0.7/source/Makefile.in 2004-10-25 10:03:31.000000000 -0700
+@@ -1371,6 +1371,7 @@
+
+ python_clean:
+ @-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
++ @-rm -rf build/
+
+ # revert to the previously installed version
+ revert:
+@@ -1437,6 +1438,7 @@
+ @rm -f include/proto.h include/build_env.h include/wrepld_proto.h \
+ nsswitch/winbindd_proto.h web/swat_proto.h \
+ client/client_proto.h utils/net_proto.h \
++ utils/ntlm_auth_proto.h \
+ smbd/build_options.c
+
+ MKPROTO_SH = $(srcdir)/script/mkproto.sh
+@@ -1512,6 +1514,7 @@
+
+ distclean: realclean
+ -rm -f include/stamp-h
++ -rm -f script/gen-8bit-gap.sh smbadduser
+ -rm -f include/config.h Makefile
+ -rm -f config.status config.cache so_locations
+ -rm -rf .deps TAGS
diff --git a/packaging/Debian/debian-unstable/patches/non-linux-ports.patch b/packaging/Debian/debian-unstable/patches/non-linux-ports.patch
new file mode 100644
index 00000000000..bd523d6ba3c
--- /dev/null
+++ b/packaging/Debian/debian-unstable/patches/non-linux-ports.patch
@@ -0,0 +1,62 @@
+diff -uNr samba-3.0.11.orig/source/configure.in samba-3.0.11/source/configure.in
+--- samba-3.0.11.orig/source/configure.in 2005-03-23 02:39:11.000000000 -0800
++++ samba-3.0.11/source/configure.in 2005-03-23 02:43:01.000000000 -0800
+@@ -573,6 +573,15 @@
+ fi
+ ;;
+
++# Systems with LFS support.
++#
++ gnu* | k*bsd*-gnu)
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++ AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
++ AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
++ AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
++ ;;
++
+ # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
+ #
+ *linux*)
+@@ -1040,7 +1049,7 @@
+ #
+ #
+ case "$host_os" in
+- *linux*)
++ linux*-gnu* | gnu* | k*bsd*-gnu)
+ # glibc <= 2.3.2 has a broken getgrouplist
+ AC_TRY_RUN([
+ #include <unistd.h>
+@@ -1172,7 +1181,10 @@
+
+ # and these are for particular systems
+ case "$host_os" in
+- *linux*) AC_DEFINE(LINUX,1,[Whether the host os is linux])
++ linux*-gnu* | gnu* | k*bsd*-gnu)
++ case "$host_os" in linux*)
++ AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;;
++ esac
+ BLDSHARED="true"
+ if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
+ LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
+@@ -4044,7 +4056,7 @@
+ AC_MSG_RESULT(yes);
+
+ case "$host_os" in
+- *linux*)
++ linux*-gnu* | gnu* | k*bsd*-gnu)
+ AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
+ AC_TRY_LINK([#include <sys/sendfile.h>],
+ [\
+@@ -4722,10 +4722,10 @@
+ WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
+
+ case "$host_os" in
+- *linux*)
++ linux*-gnu* | gnu* | k*bsd*-gnu)
+ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
+ ;;
+- *freebsd[[5-9]]*)
++ freebsd5*|*freebsd[[6-9]]*)
+ # FreeBSD winbind client is implemented as a wrapper around
+ # the Linux version.
+ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
diff --git a/packaging/Debian/debian-unstable/patches/nonpic-libsmbclient.patch b/packaging/Debian/debian-unstable/patches/nonpic-libsmbclient.patch
new file mode 100644
index 00000000000..55e8be0d152
--- /dev/null
+++ b/packaging/Debian/debian-unstable/patches/nonpic-libsmbclient.patch
@@ -0,0 +1,26 @@
+diff -uNr samba-3.0.14a.orig/source/Makefile.in samba-3.0.14a/source/Makefile.in
+--- samba-3.0.14a.orig/source/Makefile.in 2005-06-08 05:53:54.000000000 -0700
++++ samba-3.0.14a/source/Makefile.in 2005-06-08 05:55:21.000000000 -0700
+@@ -1000,9 +1000,9 @@
+ $(KRB5LIBS) $(LDAP_LIBS) \
+ @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+
+-bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
++bin/libsmbclient.a: $(LIBSMBCLIENT_OBJS)
+ @echo Linking libsmbclient non-shared library $@
+- @-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS)
++ @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJS)
+
+ # This is probably wrong for anything other than the GNU linker.
+ bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS)
+@@ -1251,8 +1251,8 @@
+ @echo "Linking shared library $@"
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS)
+
+-bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
+- @-$(AR) -rc $@ $(LIBMSRPC_PICOBJ)
++bin/libmsrpc.a: $(LIBMSRPC_OBJ)
++ @-$(AR) -rc $@ $(LIBMSRPC_OBJ)
+
+ bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
+ @echo Linking $@
diff --git a/packaging/Debian/debian-unstable/patches/samba.patch b/packaging/Debian/debian-unstable/patches/samba.patch
index 06d436408f5..f4c8ca8742c 100644
--- a/packaging/Debian/debian-unstable/patches/samba.patch
+++ b/packaging/Debian/debian-unstable/patches/samba.patch
@@ -1,7 +1,7 @@
diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source/client/smbmount.c
--- samba-3.0.0beta1.orig/source/client/smbmount.c 2003-06-07 12:57:32.000000000 -0500
+++ samba-3.0.0beta1/source/client/smbmount.c 2003-06-30 20:12:22.000000000 -0500
-@@ -765,7 +765,7 @@
+@@ -766,7 +766,7 @@
*lp = 0;
pstrcpy(password,lp+1);
got_pass = True;
@@ -10,7 +10,7 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source
}
if ((lp=strchr_m(username,'/'))) {
*lp = 0;
-@@ -775,7 +775,7 @@
+@@ -776,7 +776,7 @@
!strcmp(opts, "password")) {
pstrcpy(password,opteq+1);
got_pass = True;
@@ -19,7 +19,7 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source
} else if(!strcmp(opts, "credentials")) {
pstrcpy(credentials,opteq+1);
} else if(!strcmp(opts, "netbiosname")) {
-@@ -889,7 +901,7 @@
+@@ -890,7 +902,7 @@
*p = 0;
pstrcpy(password,p+1);
got_pass = True;
diff --git a/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch b/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch
index 88071481705..f7e9ce4f69a 100644
--- a/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch
+++ b/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch
@@ -123,7 +123,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source
if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
return;
-@@ -466,6 +470,9 @@
+@@ -467,6 +471,9 @@
args[i++] = "-s";
args[i++] = svc2;
@@ -133,7 +133,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source
if (mount_ro) {
args[i++] = "-r";
}
-@@ -661,7 +668,7 @@
+@@ -662,7 +669,7 @@
****************************************************************************/
static void usage(void)
{
@@ -142,7 +142,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source
printf("Version %s\n\n",VERSION);
-@@ -739,8 +746,13 @@
+@@ -740,8 +747,13 @@
argc -= 2;
argv += 2;
diff --git a/packaging/Debian/debian-unstable/patches/smbmount-unix-caps.patch b/packaging/Debian/debian-unstable/patches/smbmount-unix-caps.patch
new file mode 100644
index 00000000000..0c81327987f
--- /dev/null
+++ b/packaging/Debian/debian-unstable/patches/smbmount-unix-caps.patch
@@ -0,0 +1,14 @@
+diff -uNr samba-3.0.14a.orig/source/client/smbmount.c samba-3.0.14a/source/client/smbmount.c
+--- samba-3.0.14a.orig/source/client/smbmount.c 2005-06-02 06:49:31.000000000 -0700
++++ samba-3.0.14a/source/client/smbmount.c 2005-06-02 06:59:41.000000000 -0700
+@@ -213,6 +213,10 @@
+ c->capabilities &= ~CAP_STATUS32;
+ c->force_dos_errors = True;
+ }
++ /* For now, respect requests for uid-flattening mount options
++ by disabling Unix permissions handling in the kernel driver */
++ if (mount_uid || mount_gid || mount_fmask || mount_dmask)
++ c->capabilities &= ~CAP_UNIX;
+
+ if (!cli_session_setup(c, username,
+ password, strlen(password),
diff --git a/packaging/Debian/debian-unstable/patches/smbstatus-locking.patch b/packaging/Debian/debian-unstable/patches/smbstatus-locking.patch
index 50072c5c269..db7fccc68b1 100644
--- a/packaging/Debian/debian-unstable/patches/smbstatus-locking.patch
+++ b/packaging/Debian/debian-unstable/patches/smbstatus-locking.patch
@@ -1,7 +1,7 @@
diff -uNr samba-2.999+3.0.alpha21.orig/source/utils/status.c samba-2.999+3.0.alpha21/source/utils/status.c
--- samba-2.999+3.0.alpha21.orig/source/utils/status.c 2002-11-26 20:54:22.000000000 -0600
+++ samba-2.999+3.0.alpha21/source/utils/status.c 2002-12-16 23:37:14.000000000 -0600
-@@ -667,6 +667,16 @@
+@@ -686,6 +686,16 @@
if (!shares_only) {
int ret;
diff --git a/packaging/Debian/debian-unstable/patches/undefined-symbols.patch b/packaging/Debian/debian-unstable/patches/undefined-symbols.patch
new file mode 100644
index 00000000000..e9a376ea9b8
--- /dev/null
+++ b/packaging/Debian/debian-unstable/patches/undefined-symbols.patch
@@ -0,0 +1,22 @@
+diff -uNr samba-3.0.11.orig/source/Makefile.in samba-3.0.11/source/Makefile.in
+--- samba-3.0.11.orig/source/Makefile.in 2005-03-23 02:40:40.000000000 -0800
++++ samba-3.0.11/source/Makefile.in 2005-03-23 02:48:59.000000000 -0800
+@@ -631,7 +631,8 @@
+ $(RPC_ECHO_OBJ) $(SMBLDAP_OBJ) $(IDMAP_OBJ) libsmb/spnego.o $(PASSCHANGE_OBJ)
+
+ WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
+- $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
++ $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
++ $(SECRETS_OBJ)
+
+ WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=.@PICSUFFIX@)
+
+@@ -997,7 +998,7 @@
+
+ bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
+ @echo Linking libsmbclient shared library $@
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -Wl,-z,defs -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
+ $(KRB5LIBS) $(LDAP_LIBS) \
+ @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+
diff --git a/packaging/Debian/debian-unstable/po/ca.po b/packaging/Debian/debian-unstable/po/ca.po
new file mode 100644
index 00000000000..7489613d2d1
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/ca.po
@@ -0,0 +1,320 @@
+# samba (debconf) translation to Catalan.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Aleix Badia i Bosch <abadia@ica.es> 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba_3.0.0beta2-1_templates\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2004-03-13 21:32-0500\n"
+"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
+"Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Joc de carcters pel sistema de fitxers de Unix"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"El fitxer smb.conf actual t configurat un \"character set\". En la versi "
+"3.0 de Samba, aquesta opci es reemplaa per l'opci \"unix charset\". "
+"Especifiqueu el joc de carcters que voleu utilitzar per a aquesta nova "
+"opci que controla el mode que el Samba interpreta els noms de fitxers del "
+"sistema de fitxers."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Si deixeu aquesta opci en blanc no es modificar el smb.conf."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Joc de carcters pels clients DOS"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"El fitxer smb.conf actual t configurat un \"client code page\". En la "
+"versi 3.0 de Samba, aquesta opci es reemplaa per l'opci \"dos charset\". "
+"L'opci per defecte s suficient en la majoria del casos. Recordeu que "
+"aquesta opci no s necessria pel suport dels clients de Windows, noms s "
+"pels clients de DOS. Si deixeu aquesta opci en blanc no es canviar el smb."
+"conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Voleu modificar el smb.conf perqu utilitza els parmetres de configuraci "
+"del WINS del DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+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 el vostre ordinador obt la informaci referent a la IP a travs d'un "
+"servidor de DHCP, aquest tamb li donar informaci sobre els servidors de "
+"WINS (\"servidors de nom de NetBIOS\") presents a la xarxa. Aquesta opci "
+"precisa d'una modificaci del fitxer smb.conf per tal que els parmetres de "
+"WINS obtinguts a travs del DHCP s'obtinguin a travs de la lectura de /etc/"
+"samba/dhcp.conf"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Per beneficiar-vos d'aquesta caracterstica cal que tingueu installat el "
+"paquet dhcp3-client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Voleu configurar el smb.conf a travs del debconf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"La resta de la configuraci del Samba tracta amb qestions que afecten els "
+"parmetres del fitxer de configuraci els programes de Samba /etc/samba/smb."
+"conf. La versi actual del smb.conf cont una lnia 'include' o una opci "
+"que abarca mltiples lnies que podria confondre al debconf i precisa de la "
+"seva edici manual per poder-lo fer funcionar de nou."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Si no utilitzeu el debconf per configurar el smb.conf, haureu de gestionar "
+"manualment qualsevol canvi de la configuraci, i no us podreu beneficiar de "
+"les millores. La seva utilitzaci s recomenable en cas que sigui possible."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Grup de treball/nom del domini?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Aquesta opci defineix en quin grup de treball apareixer el vostre servidor "
+"quan ho consultin els clients. Recordeu que aquest parmetre tamb controla "
+"el nom de domini utilitzat pel parmetre de configuraci security=domain."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Voleu utilitzar l'encriptaci de contrasenyes?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Els clients de Windows ms recents es comuniquen amb els servidors de Samba "
+"utilitzant contrasenyes encriptades. Si voleu utilitzar contrasenyes amb "
+"text pla, haureu de modificar el vostre registre de Windows. s recomanable "
+"utilitzar contrasenyes encriptades. Si ho feu, assegureu-vos de tenir un "
+"fitxer /etc/samba/smbpasswd vlid i que hi especifiqueu la contrasenya de "
+"cada usuari utilitzant l'ordre smbpasswd."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr ""
+"Es crea la base de dades de contrasenyes de Samba, /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"El Samba s'ha de configurar perqu utilitzi contrasenyes encriptades per tal "
+"que sigui compatible amb la majoria de versions de Windows per defecte. Aix "
+"implica que les contrasenyes d'usuari s'emmagatzemin a un fitxer diferent "
+"del /etc/passwd. Aquest fitxer es pot crear automticament, per les "
+"contrasenyes s'han d'afegir manualment (per vs o per l'usuari) executant "
+"l'ordre smbpasswd i cal que us organitzeu per tenir-lo actualitzat en un "
+"futur. Si no el creeu, haureu de reconfigurar el Samba (i probablement els "
+"vostres ordinadors clients) per tal que utilitzin contrasenyes de text pla. "
+"Per ms informaci feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html del paquet samba-doc."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "S'han desplaat els fitxers de registre de Samba."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"Els fitxers de registre dels dos dimonis de Samba (nmbd i smbd) es desen a /"
+"var/log/samba des de la primera versi dels paquets de Samba 2.2 per Debian. "
+"Els noms dels fitxers sn, respectivament, log.nmbd i log.smbd."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"Els fitxers de registre antics que estaven a /var/log/ es desplacen a la "
+"nova ubicaci."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "L'execuci del nmbd a travs del inetd ja no estar suportada."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"El vostre sistema estava prviament configurat perqu inicies el nmbd i el "
+"smbd a travs del inetd. A partir de la versi 2.999+3.0alpha20-4 el nmbd no "
+"es pot iniciar a travs del inetd. Si heu modificat la seqncia "
+"d'arrencada /etc/init.d/samba, l'haureu de modificar manualment per tal que "
+"s'inici com a dimoni."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "dimonis, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Com voleu executar el Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"El dimoni de Samba pot executar-se com un dimoni normal o des del inetd. s "
+"recomanable executar-lo com un dimoni."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Es desplaa etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"El Samba 3.0 introdueix una interfcie de base de dades de SAM ms nova i "
+"completa que reemplaa el fitxer /etc/samba/smbpassd. Voleu que es migri el "
+"fitxer smbpasswd a /var/lib/samba/passdb.tdb? Si la vostra intenci s "
+"utilitzar un altre pdb (ex, LDAP), haurieu de respondre 'no' aqu."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "El vostre smb.conf es reescriur"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"El SWAT reescriur el vostre fitxer smb.conf. Reorganitzar les entrades i "
+"suprimir els comentaris i les opcions include= i copy=. Si teniu un smb."
+"conf molt elaborat feu una cpia de seguretat o no utilitzeu el SWAT."
diff --git a/packaging/Debian/debian-unstable/po/cs.po b/packaging/Debian/debian-unstable/po/cs.po
new file mode 100644
index 00000000000..903606af057
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/cs.po
@@ -0,0 +1,318 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2004-03-05 12:04+0100\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <provoz@debian.cz>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Znakov sada pro unixov souborov systm"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"Momentln mte ve svm smb.conf nastavenou volbu \"character set\". V Samb "
+"3.0 je tato volba nahrazena volbou \"unix charset\". Zadejte, prosm, "
+"znakovou sadu, kterou chcete pout pro novou volbu. Tmto nastavte, jak m "
+"Samba interpretovat nzvy soubor v souborovm systmu."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Pokud nezadte nic, v smb.conf se nezmn."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Znakov sada pro DOSov klienty."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"Momentln mte ve svm smb.conf nastavenou volbu \"client code page\". V "
+"Samb 3.0 je tato volba nahrazena volbou \"dos charset\". Zadejte, prosm, "
+"znakovou sadu, kterou chcete pout pro novou volbu. Ve vtin ppad "
+"postauje implicitn hodnota. Tato volba nen potebn pro Windowsov "
+"klienty, pouze pro DOSov klienty. Pokud nezadte nic, v smb.conf se "
+"nezmn."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Upravit smb.conf, aby pouval WINS nastaven z DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+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 ""
+"Pokud v pota zskv IP adresu z DHCP serveru, mete vm tento server "
+"nabzet tak informace o WINS serverech (jmennch serverech NetBIOSu), kter "
+"jsou dostupn ve va sti. To vyaduje zsah do souboru smb.conf, kde se "
+"nastav, aby se informace o WINS serverech nataly ze souboru /etc/samba/"
+"dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Pro vyuit tto vlastnosti muste mt nainstalovan balk dhcp3-client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Konfigurovat smb.conf pes debconf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"Zbytek konfigurace Samby se zabv otzkami, kter mn parametry v /etc/"
+"samba/smb.conf, co je soubor pouvan pro nastaven program nmbd a smbd "
+"(dohromady tvo Sambu). V stvajc smb.conf obsahuje dek 'include' "
+"nebo volbu, kter se thne pes vce dk, co me zmst debconf a me "
+"zpsobit, e pro znovuzprovoznn Samby budete muset upravit smb.conf run."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Pokud pro konfiguraci smb.conf nepouvte debconf, budete muset zvldnout "
+"vechna nastaven sami a nebudete moci vyuvat vhod pravidelnch vylepen "
+"tohoto souboru. Z tohoto pohledu je pouit debconf doporuen volba."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Skupina/Domnov jmno?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Zde mete zadat jmno skupiny, do kter m server patit. Tmto parametrem "
+"tak nastavte domnov jmno pouvan s nastavenm security=domain."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Pout ifrovn hesel?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Souasn windowsov klienti pouvaj pi komunikaci se SMB servery "
+"zaifrovan hesla. Pokud chcete pout hesla nezaifrovan, muste zmnit "
+"jeden parametr v registrech systmu Windows. Doporuujeme pouvat "
+"zaifrovan hesla. Hesla mete jednotlivm uivatelm pidat pkazem "
+"smbpasswd."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Vytvoit databzi hesel /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"Pro dosaen co nejvt kompatibility s vtinou verz systmu Windows mus "
+"bt Samba nastavena, aby pouvala ifrovan hesla. To vyaduje, aby byla "
+"hesla uchovna mimo souboru /etc/passwd. Poadovan soubor mete nechat "
+"vytvoit automaticky, ale hesla do nj mus bt pidna run programem "
+"smbpasswd (bu vmi, nebo uivatelem) a tak jej muste udrovat "
+"aktualizovan. Pokud jej nevytvote, budete muset nastavit Sambu (a "
+"pravdpodobn tak klienty), aby pouvala neifrovan hesla. Podrobnosti "
+"naleznete v /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html z balku samba-"
+"doc."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Logovac soubory Samby se pesunuly."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"Od prvnch debianch balk Samby verze 2.2 jsou logovac soubory obou "
+"server (nmbd a smbd) umstny ve /var/log/samba/. Nzvy pslunch soubor "
+"jsou log.nmbd a log.smbd."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"Star soubory z adrese /var/log/ budou pesunuty na nov msto automaticky."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Spoutn nmbd z inetd ji nen podporovno"
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"V systm byl pvodn nastaven, aby spoutl nmbd a smbd z inetd. Od verze "
+"2.999+3.0.alpha20-4 ji nelze nmbd spoutt z inetd. Pokud jste si upravili "
+"startovac skript /etc/init.d/samba, mon jej nyn budete muset upravit pro "
+"korektn start nmbd."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "dmoni, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Jak chcete spoutt Sambu?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Server Samby smbd me bet jako obyejn dmon (doporueno), nebo se me "
+"spoutt z inetd."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Pesunout /etc/samba/smbpasswd do /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"Samba 3.0 zavedla nov, kompletnj rozhran k SAM databzi, je pekonv "
+"pvodn soubor /etc/samba/smbpasswd. Chcete pevst stvajc soubor "
+"smbpasswd na /var/lib/samba/passwd.tdb? Pokud plnujete pout jinou pdb "
+"databzi (teba LDAP), mli byste odpondt 'ne'."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "V smb.conf bude pepsn!"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SWAT pepe v soubor smb.conf. Mj. peskld poloky a smae vechny "
+"komente a volby include= a copy=. Pokud mte pracn odladn smb.conf, tak "
+"si jej zazlohujte, nebo nepouvejte SWAT!"
diff --git a/packaging/Debian/debian-unstable/po/da.po b/packaging/Debian/debian-unstable/po/da.po
new file mode 100644
index 00000000000..42d22569b16
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/da.po
@@ -0,0 +1,317 @@
+# translation of da.po to Danish
+# translation of samba Debian debconf template to Danish
+# Claus Hindsgaul <claus_h@image.dk>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: da\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2004-02-15 17:23+0100\n"
+"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Tegnsæt til Unix-filsystemet"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"Du har en \"character set\"-indstilling i din smb.conf. I Samba 3.0 "
+"erstattes denne af en ny indstilling, \"unix charset\". Angiv det tegnsæt, "
+"du ønsker at bruge i denne nye indstilling, som styrer hvordan Samba tolker "
+"filnavne på systemet."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Hvis du ikke skriver noget her, vil din smb.conf ikke blive ændret."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Tegnsæt til DOS-klienter"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"Du har en \"client code page\"-indstilling i din smb.conf. I Samba 3.0 "
+"erstattes denne af en ny indstilling, \"dos charset\". Angiv det tegnsæt, du "
+"ønsker at bruge i denne nye indstilling. I de fleste tilfælde vil det "
+"forvalgte være nok. Bemærk at denne indstilling ikke kræves for at "
+"understøtte Windows-klienter; den gælder kun DOS-klienter. Hvis du ikke "
+"skriver noget her, vil smb.conf ikke blive ændret."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Ret smb.conf, så den benytter WINS-indstillinger fra DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+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 ""
+"Hvis din computer får IP-adresseoplysninger fra en DHCP-server på netværket, "
+"kan DHCP-serveren også give oplysninger om WINS-servere (\"NetBIOS "
+"navneservere\") på netværket. Dette kræver en ændring i din smb.conf-fil, så "
+"WINS-indstillingerne fra DHCP-serveren automatisk indlæses fra /etc/samba/"
+"dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Ud skal have pakken dhcp3-client installeret for at kunne udnytte denne "
+"funktion."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Sæt smb.conf op med debconf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"Resten af Samba-opsætningen drejer sig om spørgsmål om indstillingerne i "
+"filen /etc/samba/smb.conf, som benyttes til at sætte Samba-programmerne "
+"(nmbd og smbd) op. Din nuværende smb.conf indeholder en 'include'-linje "
+"eller en indstilling, der fylder flere linjer, hvilket kan forvirre debconf "
+"og kræve at du redigerer din smb.conf selv for at få Samba til at fungere "
+"igen."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Hvis du ikke bruger debconf til at sætte smb.conf op, må du selv håndtere "
+"ændringer i opsætningen, og vil ikke kunne drage nytte af de løbende "
+"forbedringer i opsætningen. Derfor anbefales brugen af debconf, hvis det er "
+"muligt."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Navn på arbejdsgruppe/domæne?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Dette styrer hvilken arbejdsgruppe din server til tilhøre, når den bliver "
+"spurgt af klienter. Bemærk at dette også styrer det domænenavn, der bruges "
+"med indstillingen \"security=domain\"."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Kryptér adgangskoder?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Nyere Windows-klienter kommunikerer med SMB-servere med krypterede "
+"adgangskoder. Hvis du vil bruge adgangkoder i klar tekst, bliver du nødt til "
+"at ændre en indstilling i Windows' registreringsdatabase. Det anbefales at "
+"du bruger krypterede adgangskoder. Hvis du gør, så sørg for at du har en "
+"gyldig /etc/samba/smbpasswd-fil og at du her angiver adgangskoder for hver "
+"bruger med kommandoen smbpasswd."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Opret samba-adgangskodedatabasen /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"For at være kompatibel med standardindstillingerne i de fleste udgaver af "
+"Windows, skal Samba være sat op til at benytte krypterede adgangskoder. Det "
+"kræver at brugernes adgangskoder gemmes i en anden fil end /etc/passwd. "
+"Denne fil kan oprettes automatisk, men adgangskoderne er nødt til at blive "
+"tilføjet manuelt (af dig eller af brugeren) ved at køre smbpasswd, og du "
+"skal holde den opdateret i fremtiden. Hvis du ikke opretter den, er du nødt "
+"til at sætte samba (og sikkert også dine klientmaskiner) op til at benytte "
+"adgangskoder i klar tekst. Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
+"html i pakken samba-doc for flere detaljer."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Sambas logfiler er flyttet."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"Fra og med de første Samba 2.2-Debianpakker, bliver begge Samba-dæmonernes "
+"(nmbd og smbd) logfiler gemt i /var/log/samba/. Filernes navne er log.nmbd "
+"og log.smbd."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"De gamle logfiler, der var i /var/log vil blive flyttet til den nye "
+"placering for dig."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Kørsel af nmbd fra inetd understøttes ikke længere."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"Dit system var tidligere sat op til at starte nmbd og smbd fra inetd. Fra og "
+"med version 2.999+3.0.alpha20-4 kan nmbd ikke længere startes med inetd. "
+"Hvis du har rettet din opstartsskript /etc/init.d/samba, kan du være nødt "
+"til at justere det manuelt nu, så nmbd bliver startet."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "dæmoner, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Hvordan skal Samba køres?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba-dæmonen smbd kan køre som en almindelig dæmon eller fra inetd. Det "
+"anbefales at køre den som dæmon."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Flyt /etc/samba/smbpasswd til /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"Samba 3.0 har en nyere og mere komplet SAM-databasegrænseflade, som "
+"erstatter filen /etc/samba/smbpasswd. Vil du have din eksisterende smbpasswd-"
+"fil overført til /var/lib/samba/passdb.tdb?`Hvis du i stedet planlægger at "
+"bruge en anden pdb-håndtering (f.eks. LDAP), bør du afvise dette."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Din smb.conf vil blive omskrevet!"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SWAT vil overskrive din smb.conf-fil. Den vil flytte rundt på linjerne og "
+"slette alle kommentarer, og linjer med \"include=\" og \"copy=\". Hvis du "
+"har brugt tid på at lave din egen smb.conf, så tag en sikkerhedskopi eller "
+"undlad at benytte SWAT!"
diff --git a/packaging/Debian/debian-unstable/po/de.po b/packaging/Debian/debian-unstable/po/de.po
new file mode 100644
index 00000000000..81a9e3c6aaf
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/de.po
@@ -0,0 +1,350 @@
+# translation of samba_3.0.14a-6.de.po to German
+# 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.
+# Martin Krger <mkrueger@mkru.de>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba_3.0.14a-6.de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2005-08-18 08:18+0200\n"
+"Last-Translator: Martin Krger <mkrueger@mkru.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Zeichensatz fr Unix-Dateisystem"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. "
+"In Samba 3.0, this option is replaced by a new option, \"unix charset"
+"\". Please specify the character set you wish to use for theis new "
+"option, which controls how Samba interprets filenames on the file "
+"system."
+msgstr ""
+"Sie haben zurzeit ein \"character set\" in Ihrer smb.conf angegeben. In "
+"Samba 3.0 wurde die Option durch die neue Option \"unix charset\" "
+"ersetzt. Bitte geben Sie einen Zeichensatz an, den Sie verwenden "
+"wollen. Dieser bestimmt, wie Samba Dateinamen auf dem Dateisystem "
+"interpretiert."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"If you leave this option blank, your smb.conf will not be changed."
+msgstr ""
+"Wenn Sie diese Option leer lassen, wird Ihre smb.conf nicht verndert."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Zeichensatz fr DOS-Clients"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In "
+"Samba 3.0, this option is replaced by the option \"dos charset\". "
+"Please specify the character set you wish to use for this new "
+"option. In most cases, the default chosen for you will be "
+"sufficient. Note that this option is not needed to support Windows "
+"clients, it is only for DOS clients. If you leave this option blank, "
+"your smb.conf will not be changed."
+msgstr ""
+"Zurzeit haben Sie \"client code page\" in Ihrer smb.conf angegeben. "
+"In Samba 3.0 wird diese Option durch die Option \"dos charset\" "
+"ersetzt. Bitte geben Sie den Zeichensatz an, den Sie fr die neue "
+"Option benutzen wollen. In den meisten Fllen ist der standardmig "
+"gewhlte Zeichensatz ausreichend. Bemerkung: Diese Option ist nur "
+"fr das Betreiben von DOS-Clients notwendig, nicht fr Windows-"
+"Clients. Wenn Sie diese Option leer lassen, wird Ihre smb.conf nicht "
+"verndert."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Soll smb.conf so abgendert werden, dass WINS-Einstellungen von DHCP "
+"bernommen werden?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+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 ""
+"Wenn Ihr Computer IP-Adress-Informationen von einem DHCP-Server "
+"bezieht, dann kann es sein, dass auch Informationen ber WINS-Server "
+"zur Verfgung gestellt werden, sollten solche Server im Netzwerk "
+"vorhanden sein. Eine automatische Konfiguration von Samba mit diesen "
+"ermittelten Werten ist mglich, erfordert aber eine nderung der smb."
+"conf. Damit wrden automatisch die WINS-Einstellungen aus der Datei /"
+"etc/samba/dhcp.conf bernommen."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of "
+"this feature."
+msgstr ""
+"Sie mssen das Paket dhcp3-client installiert haben, um dieses "
+"Feature nutzen zu knnen."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Soll smb.conf durch debconf konfiguriert werden?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that "
+"affect parameters in /etc/samba/smb.conf, which is the file used to "
+"configure the Samba programs (nmbd and smbd.) Your current smb.conf "
+"contains an 'include' line or an option that spans multiple lines, "
+"which could confuse debconf and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Ihre aktuelle smb.conf enthlt mindestens eine 'include'-Zeile oder "
+"mindestens eine mehrzeilige Option. Dies kann zu einer fehlerhaft "
+"generierten smb.conf-Datei fhren. Es kann daher ntig werden, dass "
+"Sie Ihre smb.conf manuell korrigieren mssen, um den ordnungsgemen "
+"Betrieb von Samba zu gewhrleisten."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to "
+"handle any configuration changes yourself, and will not be able to "
+"take advantage of periodic configuration enhancements. Therefore, "
+"use of debconf is recommended if possible."
+msgstr ""
+"Wenn Sie debconf nicht zur Konfiguration der smb.conf benutzen, "
+"werden Sie jede nderung an der Konfiguration manuell vornehmen "
+"mssen. Erweiterungen der Konfiguration - in neueren Versionen - "
+"werden nicht automatisch in smb.conf einflieen. Daher ist das "
+"Benutzen von debconf empfohlen, falls mglich."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Arbeitsgruppe/Domain Name?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when "
+"queried by clients. Note that this parameter also controls the Domain "
+"name used with the security=domain setting."
+msgstr ""
+"Diese Einstellung gibt an, in welcher Arbeitsgruppe dieser Server bei "
+"Anfragen erscheint. Bemerkung: Dieser Parameter setzt auch den "
+"Domain Name, welcher in der Option security=domain verwendet wird."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Verschlsselte Passwrter verwenden?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to "
+"change a parameter in your Windows registry. It is recommended that "
+"you use encrypted passwords. If you do, make sure you have a valid /"
+"etc/samba/smbpasswd file and that you set passwords in there for each "
+"user using the smbpasswd command."
+msgstr ""
+"Neuere Windows-Versionen kommunizieren mit SMB-Servern und benutzen "
+"dabei verschlsselte Passworte. Wenn Sie Passworte im Klartext "
+"verwenden wollen, dann mssen Sie einen bestimmten Parameter in der "
+"Windows Registry ndern. Es ist empfohlen verschlsselte Passwrter "
+"zu verwenden. Falls Sie verschlsselte Passwrter verwenden, stellen "
+"Sie sicher, dass Sie eine gltige /etc/samba/smbpasswd-Datei haben "
+"und dass die Passworte fr jeden User mit dem Samba-Hilfsprogramm "
+"smbpasswd gesetzt wurden."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr ""
+"Samba-Passwort-Datenbank in /var/lib/samba/passdb.tdb erstellen?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba "
+"must be configured to use encrypted passwords. This requires user "
+"passwords to be stored in a file separate from /etc/passwd. This file "
+"can be created automatically, but the passwords must be added "
+"manually (by you or the user) by running smbpasswd, and you must "
+"arrange to keep it up-to-date in the future. If you do not create "
+"it, you will have to reconfigure samba (and probably your client "
+"machines) to use plaintext passwords. See /usr/share/doc/samba-doc/"
+"htmldocs/ENCRYPTION.html from the samba-doc package for more details."
+msgstr ""
+"Um mit den neusten Versionen von Windows kompatibel zu sein, muss "
+"Samba mit verschlsselten Passwrtern konfiguriert werden. Dies "
+"zwingt jedoch dazu, die Benutzer-Passwrter in einer anderen Datei "
+"als /etc/passwd zu speichern. Diese andere Datei kann automatisch "
+"erzeugt werden, jedoch mssen die Passwrter manuell ergnzt werden "
+"(von Ihnen oder dem Benutzer) durch das Ausfhren von smbpasswd. "
+"Zustzlich mssen Vorkehrungen getroffen werden, die Passwrter in "
+"Zukunft aktuell zu halten. Wenn Sie die Datei nicht erstellen, mssen "
+"Sie Samba anders konfigurieren (und mglicherweise die Clients auch), "
+"um unverschlsselte Passwrter zu benutzen. Siehe /usr/share/doc/"
+"samba-doc/htmldocs/ENCRYPTION.html des Pakets samba-doc fr weitere "
+"Details."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Sambas Log-Dateien wurden verschoben."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log "
+"files for both Samba daemons (nmbd and smbd) are now stored in /var/"
+"log/samba/. The names of the files are log.nmbd and log.smbd, for "
+"nmbd and smbd respectively."
+msgstr ""
+"Beginnend mit den ersten Paketen von Samba 2.2 fr Debian befinden "
+"sich die Log-Dateien fr beide Samba-Prozesse (nmbd und smbd) jetzt "
+"in /var/log/samba/. Die Namen der Dateien sind log.nmbd und log.smbd."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new "
+"location for you."
+msgstr ""
+"Die alten Log-Dateien, welche in /var/log/ waren, werden fr Sie in "
+"das neue Verzeichnis verschoben."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Starten von nmbd ber inetd wird nicht mehr untersttzt"
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from "
+"inetd. As of version 2.999+3.0.alpha20-4, nmbd will no longer be "
+"started from inetd. If you have modified your /etc/init.d/samba "
+"startup script, you may need to adjust it by hand now so that nmbd "
+"will start."
+msgstr ""
+"Ihr System war zuvor so konfiguriert, dass es nmbd und smbd ber "
+"inetd startete. Seit Version 2.999+3.0.alpha20-4 wird nmbd nicht "
+"lnger ber inetd gestartet. Sollten Sie Ihr Startup-Skript /etc/init."
+"d/samba abgendert haben, mssen Sie fr einen korrekten Start von "
+"nmbd mglicherweise manuelle Korrekturen vornehmen."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Wie wollen Sie Samba starten?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. "
+"Running as a daemon is the recommended approach."
+msgstr ""
+"Der Samba-Prozess smbd kann als normaler Hintergrunddienst (Daemon) "
+"laufen oder ber inetd gestartet werden. Ersteres wird jedoch "
+"empfohlen."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr ""
+"Soll /etc/samba/smbpasswd nach /var/lib/samba/passdb.tdb verschoben "
+"werden?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface "
+"which supersedes the /etc/samba/smbpasswd file. Would you like your "
+"existing smbpasswd file to be migrated to /var/lib/samba/passdb.tdb "
+"for you? If you plan to use another pdb backend (e.g., LDAP) "
+"instead, you should answer 'no' here."
+msgstr ""
+"Samba 3.0 fhrt eine neue, komplexere SAM-Datenbank-Schnittstelle ein, "
+"welche die Datei /etc/samba/smbpasswd ablst. Wollen Sie Ihre "
+"bestehende smbpasswd-Datei nach /var/lib/samba/passdb.tdb migrieren? "
+"Wenn Sie planen ein anderes pdb-Backend (z.B. LDAP) zu verwenden, "
+"sollten Sie hier mit 'Nein' antworten."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Ihre smb.conf wird berschrieben!"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries "
+"and delete all comments, include= and copy= options. If you have a "
+"carefully crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SWAT wird Ihre smb.conf berschreiben. Es wird die Eintrge "
+"umorganisieren und alle Kommentare, sowie die Optionen include= und "
+"copy=, lschen. Wenn Sie eine mhsam erstellte smb.conf haben, machen "
+"Sie eine Datensicherung oder benutzen Sie SWAT nicht!"
diff --git a/packaging/Debian/debian-unstable/po/es.po b/packaging/Debian/debian-unstable/po/es.po
index 0d1d1a770de..a34544bed54 100644
--- a/packaging/Debian/debian-unstable/po/es.po
+++ b/packaging/Debian/debian-unstable/po/es.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
"PO-Revision-Date: 2003-07-02 21:51-0500\n"
"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -23,12 +23,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "Character Set for Unix filesystem"
msgstr "Juego de caracteres para el sistema de ficheros Unix"
#
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid ""
@@ -42,16 +44,19 @@ msgstr ""
"favor, indique el juego de caracteres que desea usar para esta opción nueva, "
"que controla cómo Samba interpretará los nombres en el sistema de ficheros."
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "If you leave this option blank, your smb.conf will not be changed."
msgstr "Si deja en blanco este campo, no se cambiará smb.conf."
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid "Character Set for DOS clients"
msgstr "Juego de caracteres para los clientes DOS"
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid ""
@@ -69,12 +74,14 @@ msgstr ""
"exclusivamente para los clientes DOS. Si deja en blanco este campo, no se "
"cambiará smb.conf."
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid "Modify smb.conf to use WINS settings from DHCP?"
msgstr ""
"¿Modificar smb.conf para usar la configuración WINS que proviene de DHCP?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -90,6 +97,7 @@ msgstr ""
"para que la configuración de WINS proveniente de DHCP se lea automaticamente "
"de /etc/samba/dhcp.conf."
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -98,11 +106,13 @@ msgid ""
msgstr ""
"Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad."
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid "Configure smb.conf through debconf?"
msgstr "¿Configurar smb.conf mediante debconf?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -119,6 +129,7 @@ msgstr ""
"debconf puede dejarlo con un smb.conf descompuesto, requiriendo que lo "
"arregle a mano."
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -132,11 +143,13 @@ msgstr ""
"periódicos de configuración. Por eso se recomienda el uso de debconf cuando "
"sea posible."
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid "Workgroup/Domain Name?"
msgstr "Nombre del dominio o del grupo de trabajo"
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid ""
@@ -148,11 +161,13 @@ msgstr ""
"pregunten los clientes de la red. Este parámetro también controla el nombre "
"de dominio que se usa con la configuración security=domain."
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid "Use password encryption?"
msgstr "¿Utilizar contraseñas cifradas?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid ""
@@ -170,11 +185,13 @@ msgstr ""
"que tiene un fichero /etc/samba/smbpasswd válido y que ha puesto las "
"contraseñas con el programa smbpasswd."
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
msgstr "¿Crear el base de dados de contraseñas /var/lib/samba/passdb.tdb?"
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid ""
@@ -200,11 +217,13 @@ msgstr ""
"samba-doc/htmldocs/ENCRYPTION.html del paquete samba-doc para más "
"información."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid "Samba's log files have moved."
msgstr "Se han cambiado de lugar los ficheros de registro de Samba."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -217,6 +236,7 @@ msgstr ""
"log/samba/. Los nombres de estos ficheros son log.nmbd y log.smbd, para "
"nmbd y smbd respectivamente."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -226,11 +246,13 @@ msgstr ""
"Los ficheros de registro antiguos que había en /var/log se moverán "
"automáticamente a su nueva ubicación."
+#. Type: note
#. Description
#: ../samba.templates:28
msgid "Running nmbd from inetd is no longer supported"
msgstr "Ya no se puede ejecutar nmbd desde el inetd"
+#. Type: note
#. Description
#: ../samba.templates:28
msgid ""
@@ -244,16 +266,19 @@ msgstr ""
"desde inetd. Si ha modificado el script de arranque /etc/init.d/samba, "
"puede que tenga que editarlo ahora para que nmbd se ejecute."
+#. Type: select
#. Choices
#: ../samba.templates:36
msgid "daemons, inetd"
msgstr "demonios, inetd"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid "How do you want to run Samba?"
msgstr "¿Cómo quiere que se ejecute Samba?"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid ""
@@ -263,12 +288,14 @@ msgstr ""
"El servicio Samba smbd puede ejecutarse como demonio normal o desde el "
"inetd. Se recomienda que se ejecute como demonio independiente."
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
msgstr ""
"¿Convertir el fichero /etc/samba/smbpasswd en /var/lib/samba/passdb.tdb?"
+#. Type: boolean
#. Description
#: ../samba.templates:45
#, fuzzy
@@ -284,11 +311,13 @@ msgstr ""
"fichero corriente smbpasswd sea convertido en /var/lib/samba/passdb.tdb? Si "
"pretende usar otro "
+#. Type: note
#. Description
#: ../swat.templates:3
msgid "Your smb.conf will be re-written!"
msgstr "¡Se sobrescribirá su configuración smb.conf!"
+#. Type: note
#. Description
#: ../swat.templates:3
msgid ""
diff --git a/packaging/Debian/debian-unstable/po/fr.po b/packaging/Debian/debian-unstable/po/fr.po
index 6be14c19b43..daf4e8c029a 100644
--- a/packaging/Debian/debian-unstable/po/fr.po
+++ b/packaging/Debian/debian-unstable/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
"PO-Revision-Date: 2003-07-02 21:52-0500\n"
"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -23,11 +23,13 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "Character Set for Unix filesystem"
msgstr "Jeu de caractres pour les systmes de fichiers Unix"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid ""
@@ -42,6 +44,7 @@ msgstr ""
"indiquer le jeu de caractres que vous voulez utiliser avec cette option, "
"qui permet d'interprter les noms de fichiers sur le systme."
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "If you leave this option blank, your smb.conf will not be changed."
@@ -49,11 +52,13 @@ msgstr ""
"Le fichier smb.conf ne sera pas modifi si vous laissez cette option sans "
"rponse."
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid "Character Set for DOS clients"
msgstr "Jeu de caractres pour les clients DOS"
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid ""
@@ -73,11 +78,13 @@ msgstr ""
"DOS. Le fichier smb.conf ne sera pas modifi si vous laissez cette option "
"sans rponse. "
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid "Modify smb.conf to use WINS settings from DHCP?"
msgstr "Modifier smb.conf pour utiliser les paramtres WINS fournis par DHCP?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -93,6 +100,7 @@ msgstr ""
"fichier smb.conf est ncessaire afin que les rglages WINS fournis par le "
"serveur DHCP soient lus dans /etc/samba/dhcp.conf."
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -100,11 +108,13 @@ msgid ""
"feature."
msgstr "Pour cela, le paquet dhcp3-client doit tre install."
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid "Configure smb.conf through debconf?"
msgstr "Voulez-vous configurer smb.conf avec debconf?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -120,6 +130,7 @@ msgstr ""
"une option qui s'tale sur plusieurs lignes: cela peut perturber debconf et "
"il vaut mieux grer manuellement le contenu de ce fichier."
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -133,11 +144,13 @@ msgstr ""
"bnficier des amliorations faites dans la configuration. Si possible, il "
"est conseill d'utiliser debconf."
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid "Workgroup/Domain Name?"
msgstr "Groupe de travail et nom de domaine?"
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid ""
@@ -149,11 +162,13 @@ msgstr ""
"serveur. Il indique aussi le nom de domaine utilis par le paramtre "
"security=domain."
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid "Use password encryption?"
msgstr "Voulez-vous chiffrer les mots de passe?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid ""
@@ -172,11 +187,13 @@ msgstr ""
"mots de passe de tous les utilisateurs qui se servent de la commande "
"smbpasswd."
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
msgstr "Faut-il crer une base de donnes /var/lib/samba/passdb.tdb?"
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid ""
@@ -201,11 +218,13 @@ msgstr ""
"mots de passe non chiffrs. Voyez /usr/share/doc/samba-doc/htmldocs/"
"ENCRYPTION.html dans le paquet samba-doc pour plus de dtails."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid "Samba's log files have moved."
msgstr "Les fichiers-journaux de Samba ont chang de place."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -217,6 +236,7 @@ msgstr ""
"journaux des dmons nmbd et smbd se trouvent dans /var/log/samba/. Les noms "
"de ces fichiers sont log.nmbd et log.smbd pour, respectivement, nmbd et smbd."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -225,11 +245,13 @@ msgid ""
msgstr ""
"Les anciens fichiers-journaux dans /var/log/ seront mis au bon endroit."
+#. Type: note
#. Description
#: ../samba.templates:28
msgid "Running nmbd from inetd is no longer supported"
msgstr "L'utilisation de nmbd partir d'inetd n'est plus supporte"
+#. Type: note
#. Description
#: ../samba.templates:28
msgid ""
@@ -243,16 +265,19 @@ msgstr ""
"modifi le script de lancement /etc/init.d/samba, vous avez peut-tre besoin "
"de le corriger manuellement pour permettre le lancement de nmbd. "
+#. Type: select
#. Choices
#: ../samba.templates:36
msgid "daemons, inetd"
msgstr "dmons, inetd"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid "How do you want to run Samba?"
msgstr "Comment voulez-vous lancer Samba?"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid ""
@@ -263,11 +288,13 @@ msgstr ""
"tre lanc par inetd. L'approche recommande est qu'il s'excute en tant que "
"dmon."
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
msgstr "Faut-il convertir /etc/samba/smbpasswd en /var/lib/samba/passdb.tdb?"
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid ""
@@ -283,11 +310,13 @@ msgstr ""
"envisagez d'utiliser une autre interface d'authentification (p.ex. LDAP), "
"refusez la proposition maintenant."
+#. Type: note
#. Description
#: ../swat.templates:3
msgid "Your smb.conf will be re-written!"
msgstr "R-criture de votre fichier smb.conf!"
+#. Type: note
#. Description
#: ../swat.templates:3
msgid ""
diff --git a/packaging/Debian/debian-unstable/po/it.po b/packaging/Debian/debian-unstable/po/it.po
new file mode 100644
index 00000000000..37b206aad07
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/it.po
@@ -0,0 +1,314 @@
+# samba po-debconf translation to italian
+# Copyright (C) 2004 Software in the Public Interest
+# This file is distributed under the same license as the samba package.
+# Luca Monducci, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba 3.0.7 debconf templates\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2004-12-03 21:10+0100\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Set di caratteri per il filesystem Unix"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"Attualmente in smb.conf è configurato il «character set», in Samba 3.0, "
+"questa opzione è sostituita da una nuova opzione «unix character». "
+"Specificare il set di caratteri che si desidera usare per questa opzione che "
+"controlla come Samba interpreta i nomi dei file sul file system."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Lasciando vuoto questo valore smb.conf non verrà modificato."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Set di caratteri per i client DOS"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"Attualmente in smb.conf è configurato il «client code page», in Samba 3.0, "
+"questa opzione è sostituita dall'opzione «dos character». Specificare il set "
+"di caratteri che si desidera usare per questa opzione. In molti casi il "
+"valore predefinito è sufficiente. Notare che questa opzione non è necessaria "
+"per i client Windows, invece è specifica per i client DOS. Lasciando vuoto "
+"questo valore smb.conf non verrà modificato."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Modificare smb.conf per usare le impostazioni WINS da DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+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 ""
+"Se il computer prende le informazioni sull'indirizzo IP da un server DHCP "
+"allora il server DHCP può fornire anche informazioni sui server WINS (i name "
+"server per NetBIOS) presenti nella rete. Questo necessita una modifica al "
+"file smb.conf in modo le impostazioni di WINS fornite dal DHCP siano lette "
+"automaticamente da /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Deve essere installato il pacchetto dhcp3-client per usare questa "
+"funzionalità."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Configurare smb.conf usando debconf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"Il resto della configurazione di Samba fa delle domande sui parametri di /"
+"etc/samba/smb.conf, il file usato per configurare i programmi di Samba (nmbd "
+"e smbd). L'attuale file smb.conf contiene una riga «include» o una opzione "
+"che si estende su più righe: questo potrebbe confondere debconf e richiedere "
+"una modifica manuale a smb.conf per renderlo nuovamente funzionante."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Se non si vuole usare usare debconf per configurare smb.conf si dovranno "
+"gestire tutti i cambiamenti della configurazione da soli e non sarà "
+"possibile beneficiare dei miglioramenti periodici della configurazione; se "
+"possibile, si consiglia l'uso di debconf."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Nome del Workgroup/Dominio"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Questo imposta in quale workgroup apparirà il server quando i client "
+"tenteranno l'accesso. Notare che questo parametro controlla anche il nome "
+"del Dominio usato del parametro «security=domain»."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Usare password cifrate?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"I client Windows recenti comunicano con i server SMB usando password "
+"cifrate. Per usare password in chiaro è necessario cambiare un parametro nel "
+"registro di Windows. Si raccomanda l'uso di password cifrate. In caso "
+"contrario assicurarsi che il file /etc/samba/smbpasswd sia valido e usare il "
+"comando smbpasswd per inserirci le password di ciascun utente."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Creare il database delle password samba /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"Per essere compatibile con le impostazioni predefinite di molte versioni di "
+"Windows, Samba deve essere configurato per usare password cifrate. Questo "
+"richiede che le password degli utenti siano memorizzate in un file diverso "
+"da /etc/passwd. Questo file può essere creato automaticamente ma qualcuno "
+"(l'amministratore o l'utente) dovrà inserire manualmente e poi tenere "
+"aggiornate le password usando smbpasswd. Se non si crea questo file sarà "
+"necessario riconfigurare samba (e probabilmente anche le macchine client) "
+"per usare password in chiaro. Vedere /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html contenuto nel pacchetto samba-doc per ulteriori dettagli."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "I file di log di Samba sono stati spostati."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"A partire dai primi pacchetti Samba 2.2 per Debian i file di log per "
+"entrambi i demoni Samba (nmbd e smbd) sono memorizzati in /var/log/samba/. I "
+"nomi dei file di log sono log.nmbd e log.smbd rispettivamente per nmbd e "
+"smbd."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"I vecchi file di log in /var/log/ verranno spostati nella nuova directory."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "L'avvio di nmbd da inetd non è più supportato"
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"Il sistema è configurato per avviare nmbd e smbd da inetd. Dalla versione "
+"2.999+3.0.alpha20-4 non è più possibile avviare nmbd da inetd. Se si è "
+"modificato lo script di avvio /etc/init.d/samba potrebbe essere necessario "
+"correggerlo a mano in modo da permettere l'avvio di nmbd."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "demoni, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Come avviare Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Il demone Samba smbd può essere avviato come un normale demone oppure da "
+"inetd. Si raccomanda l'avvio come demone."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Spostare /etc/samba/smbpasswd in /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"Samba 3.0 introduce una nuova e più completa interfaccia al database SAM che "
+"sostituisce il file /etc/samba/smbpasswd. Si vuole che il file smbpasswd sia "
+"migrato a /var/lib/samba/passdb.tdb? Se si pensa di usare un backend pdb "
+"diverso (p.e. LDAP), si dovrebbe rispondere «no»."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Sovrascrittura di smb.conf!"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SWAT sovrascriverà il file smb.conf, verranno riordinate le impostazioni e "
+"verranno cancellati tutti i commenti, le opzioni include= e copy=. Se si è "
+"personalizzato smb.conf tornare indietro e non usare SWAT."
diff --git a/packaging/Debian/debian-unstable/po/ja.po b/packaging/Debian/debian-unstable/po/ja.po
index 610b80f0d82..1f1f50129bd 100644
--- a/packaging/Debian/debian-unstable/po/ja.po
+++ b/packaging/Debian/debian-unstable/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
"PO-Revision-Date: 2003-09-09 09:26+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -24,11 +24,13 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "Character Set for Unix filesystem"
msgstr "Unix ե륷ƥʸå"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid ""
@@ -36,18 +38,25 @@ msgid ""
"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
"specify the character set you wish to use for theis new option, which "
"controls how Samba interprets filenames on the file system."
-msgstr "ߡsmb.conf Ѥߤ \"character set\" ޤSamba 3.0 ǤϡΥץϿץ \"unix charset\" ֤ƤޤSamba ե륷ƥΥե̾ɤΤ褦˲᤹뤫椹뤳οץΤˡ˾ʸåȤꤷƤ"
+msgstr ""
+"ߡsmb.conf Ѥߤ \"character set\" ޤSamba 3.0 Ǥϡ"
+"ΥץϿץ \"unix charset\" ֤Ƥޤ"
+"Samba ե륷ƥΥե̾ɤΤ褦˲᤹뤫椹뤳ο"
+"ץΤˡ˾ʸåȤꤷƤ"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "If you leave this option blank, your smb.conf will not be changed."
msgstr "ΥץΤޤޤˤȡsmb.conf ѹޤ"
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid "Character Set for DOS clients"
msgstr "DOS 饤ȸʸå"
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid ""
@@ -57,13 +66,21 @@ msgid ""
"default chosen for you will be sufficient. Note that this option is not "
"needed to support Windows clients, it is only for DOS clients. If you leave "
"this option blank, your smb.conf will not be changed."
-msgstr "ߡsmb.conf Ѥߤ \"client code page\" ޤSamba 3.0 ǤϡΥץϿץ \"dos charset\" ֤ƤޤοץΤˡ˾ʸåȤꤷƤۤȤɤξ硢ǥեȤΤޤޤǽʬǤ礦Υץ Windows 饤ȥݡȤˤɬפʤDOS 饤ȤΤߤΤǤ뤳ȤդƤޤΥץΤޤޤˤȡsmb.conf ѹޤ"
+msgstr ""
+"ߡsmb.conf Ѥߤ \"client code page\" ޤSamba 3.0 Ǥϡ"
+"ΥץϿץ \"dos charset\" ֤Ƥޤ"
+"ץΤˡ˾ʸåȤꤷƤۤȤɤξ"
+"硢ǥեȤΤޤޤǽʬǤ礦Υץ Windows 饤"
+"ȥݡȤˤɬפʤDOS 饤ȤΤߤΤǤ뤳ȤդƤ"
+"ΥץΤޤޤˤȡsmb.conf ѹޤ"
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid "Modify smb.conf to use WINS settings from DHCP?"
msgstr "DHCP WINS Ȥ褦 smb.conf ѹޤ?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -72,20 +89,30 @@ msgid ""
"(\"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 "ʤΥԥ塼ͥåȥ DHCP Ф IP ɥ쥹ƤΤǤСDHCP Фϥͥåȥˤ WINS (NetBIOS ͡ॵ) ˤĤƤξ󶡤뤳ȤǤޤDHCP 󶡤 WINS /etc/samba/dhcp.conf 鼫ưŪɤ߹ޤ뤿ᡢsmb.conf եѹɬפޤ"
+msgstr ""
+"ʤΥԥ塼ͥåȥ DHCP Ф IP ɥ쥹"
+"ƤΤǤСDHCP Фϥͥåȥˤ WINS (NetBIOS "
+"͡ॵ) ˤĤƤξ󶡤뤳ȤǤޤDHCP 󶡤 WINS "
+" /etc/samba/dhcp.conf 鼫ưŪɤ߹ޤ뤿ᡢsmb.conf ե"
+"ѹɬפޤ"
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
"You must have the dhcp3-client package installed to take advantage of this "
"feature."
-msgstr "εǽȤˤϡdhcp3-client ѥå󥹥ȡ뤵Ƥɬפޤ"
+msgstr ""
+"εǽȤˤϡdhcp3-client ѥå󥹥ȡ뤵Ƥɬפ"
+"ޤ"
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid "Configure smb.conf through debconf?"
msgstr "debconf ̤ smb.conf ꤷޤ?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -94,8 +121,14 @@ msgid ""
"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
"line or an option that spans multiple lines, which could confuse debconf and "
"require you to edit your smb.conf by hand to get it working again."
-msgstr "Samba λĤʬϡSamba ץ (nmbd smbd) ꤹΤ˻Ȥե /etc/samba/smb.conf ˤѥ᡼˱ƶǤߤ smb.conf ϡ'include' ԤޤʣԤˤޤ륪ץޤǤޤ debconf 𤵤ǽꡢƤ debconf ư褦ˤ٤ smb.conf μưǤνɬפȤޤ"
+msgstr ""
+"Samba λĤʬϡSamba ץ (nmbd smbd) ꤹ"
+"˻Ȥե /etc/samba/smb.conf ˤѥ᡼˱ƶǤ"
+" smb.conf ϡ'include' ԤޤʣԤˤޤ륪ץޤǤޤ"
+" debconf 𤵤ǽꡢƤ debconf ư褦ˤ٤ "
+"smb.conf μưǤνɬפȤޤ"
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -103,26 +136,36 @@ msgid ""
"configuration changes yourself, and will not be able to take advantage of "
"periodic configuration enhancements. Therefore, use of debconf is "
"recommended if possible."
-msgstr "smb.conf debconf Ȥʤ硢٤Ƥѹ򤢤ʤȤݤ򸫤ɬפޤŪˤϸƤޤ󡣤Τᡢǽʤ debconf ȤΤǤ"
+msgstr ""
+"smb.conf debconf Ȥʤ硢٤Ƥѹ򤢤ʤȤ"
+"ݤ򸫤ɬפޤŪˤϸƤޤ󡣤Τᡢ"
+"ǽʤ debconf ȤΤǤ"
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid "Workgroup/Domain Name?"
msgstr "롼/ɥᥤ̾ϲǤ?"
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid ""
"This controls what workgroup your server will appear to be in when queried "
"by clients. Note that this parameter also controls the Domain name used with "
"the security=domain setting."
-msgstr "ϥ饤ȤȲ񤵤줿ݤˤʤΥФ롼פ椷ޤΥѥ᡼ security=domain ꤬Ȥ줿ȤΥɥᥤ̾椷ޤ"
+msgstr ""
+"ϥ饤ȤȲ񤵤줿ݤˤʤΥФ롼פ"
+"椷ޤΥѥ᡼ security=domain ꤬Ȥ줿ȤΥɥᥤ̾"
+"椷ޤ"
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid "Use password encryption?"
msgstr "ѥɤΰŹ沽Ȥޤ?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid ""
@@ -132,13 +175,20 @@ msgid ""
"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
"and that you set passwords in there for each user using the smbpasswd "
"command."
-msgstr "Ƕ Windows 饤ȤϰŹ沽줿ѥɤȤä SMB ФȤꤷޤꥢƥȥѥɤȤϡʤ Windows Υ쥸ȥΥѥ᡼ѹɬפޤŹ沽줿ѥɤȤȤ侩ޤ硢ͭ /etc/samba/smbpasswd ե뤬뤳Ȥǧƥ桼Υѥɤ smbpasswd ޥɤȤäꤷޤ"
+msgstr ""
+"Ƕ Windows 饤ȤϰŹ沽줿ѥɤȤä SMB ФȤ"
+"ꤷޤꥢƥȥѥɤȤϡʤ Windows Υ쥸"
+"ȥΥѥ᡼ѹɬפޤŹ沽줿ѥɤȤ"
+"侩ޤ硢ͭ /etc/samba/smbpasswd ե뤬뤳Ȥ"
+"ǧƥ桼Υѥɤ smbpasswd ޥɤȤäꤷޤ"
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
msgstr "Samba ѥɥǡ١ /var/lib/samba/passdb.tdb ޤ?"
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid ""
@@ -151,21 +201,36 @@ msgid ""
"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."
-msgstr "Windows ΤۤȤɤΥСΥǥեȤȸߴݤĤᡢSamba ϰŹ沽줿ѥɤȤäꤵޤϥ桼Υѥɤ /etc/passwd Ȥ̤Υե˳Ǽ뤳ȤɬפȤޤΥեϼưŪ˺뤳ȤǤޤѥɤ smbpasswd ¹ԤƼư (ʤ뤤ϥ桼) ɲäʤФʤ餺Ϥäƺǿ֤ݤ³褦ƤɬפޤΥեʤ硢ץ쥤ƥȥѥɤȤ褦 Samba (Ӥ餯ʤΥ饤ȥޥ) κ꤬ɬפǤܺ٤ˤĤƤϡsamba-doc ѥåˤ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html 򻲾ȤƤ"
+msgstr ""
+"Windows ΤۤȤɤΥСΥǥեȤȸߴݤĤᡢSamba ϰŹ沽"
+"줿ѥɤȤäꤵޤϥ桼Υѥɤ /etc/passwd "
+"Ȥ̤Υե˳Ǽ뤳ȤɬפȤޤΥեϼưŪ˺"
+"ȤǤޤѥɤ smbpasswd ¹ԤƼư (ʤ뤤ϥ桼"
+") ɲäʤФʤ餺Ϥäƺǿ֤ݤ³褦Ƥɬ"
+"פޤΥեʤ硢ץ쥤ƥȥѥɤȤ"
+"褦 Samba (Ӥ餯ʤΥ饤ȥޥ) κ꤬ɬפǤ"
+"٤ˤĤƤϡsamba-doc ѥåˤ /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html 򻲾ȤƤ"
+#. Type: note
#. Description
#: ../samba.templates:17
msgid "Samba's log files have moved."
msgstr "Samba Υեϰưޤ"
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
"Starting with the first packages of Samba 2.2 for Debian the log files for "
"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
-msgstr "Debian Samba 2.2 νѥå顢ξ Samba ǡ (nmbd smbd) Υե /var/log/samba ˳Ǽ褦ˤʤäƤޤե̾ nmbd smbd ̸Ĥˤʤ褦log.nmbd log.smbd Ȥʤޤ"
+msgstr ""
+"Debian Samba 2.2 νѥå顢ξ Samba ǡ (nmbd "
+"smbd) Υե /var/log/samba ˳Ǽ褦ˤʤäƤޤե"
+"̾ nmbd smbd ̸Ĥˤʤ褦log.nmbd log.smbd Ȥʤޤ"
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -173,11 +238,13 @@ msgid ""
"for you."
msgstr "/var/log/ ˤäŤեϿ˰ưޤ"
+#. Type: note
#. Description
#: ../samba.templates:28
msgid "Running nmbd from inetd is no longer supported"
msgstr "inetd nmbd μ¹ԤϤ⤦ݡȤޤ"
+#. Type: note
#. Description
#: ../samba.templates:28
msgid ""
@@ -185,30 +252,41 @@ msgid ""
"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
"If you have modified your /etc/init.d/samba startup script, you may need to "
"adjust it by hand now so that nmbd will start."
-msgstr "ʤΥƥˤ inetd nmbd smbd ư꤬ޤС 2.999+3.0.alpha20-4 ʹߤǤϡnmbd inetd Ϥ⤦ưޤ/etc/init.d/samba ȥåץץȤѹƤΤǤСnmbd ư褦ưĴɬפǤ礦"
+msgstr ""
+"ʤΥƥˤ inetd nmbd smbd ư꤬"
+"С 2.999+3.0.alpha20-4 ʹߤǤϡnmbd inetd Ϥ⤦ư"
+"/etc/init.d/samba ȥåץץȤѹƤΤǤС"
+"nmbd ư褦ưĴɬפǤ礦"
+#. Type: select
#. Choices
#: ../samba.templates:36
msgid "daemons, inetd"
msgstr "ǡ, inetd"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid "How do you want to run Samba?"
msgstr "ɤΤ褦 Samba ¹ԤǤ?"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid ""
"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
"daemon is the recommended approach."
-msgstr "Samba ǡ smbd ̾ΥǡȤƤμ¹Ԥޤ inetd μ¹ԤǤޤǡȤƼ¹ԤΤμʤǤ"
+msgstr ""
+"Samba ǡ smbd ̾ΥǡȤƤμ¹Ԥޤ inetd μ¹ԤǤ"
+"ޤǡȤƼ¹ԤΤμʤǤ"
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
msgstr "/etc/samba/smbpasswd /var/lib/samba/passdb.tdb ˰ưޤ?"
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid ""
@@ -217,17 +295,27 @@ msgid ""
"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
"here."
-msgstr "Samba 3.0 Ǥϡ/etc/samba/smbpasswd ե롢꿷괰 SAM ǡ١󥿡եƳƤޤ¸ smbpasswd ե /var/lib/samba/passdb.tdb ˰ܹԤޤ? ̤ pdb Хå (LDAP ʤ) ˷ײ褷ƤΤǤСǤ '' ٤Ǥ"
+msgstr ""
+"Samba 3.0 Ǥϡ/etc/samba/smbpasswd ե롢꿷괰"
+" SAM ǡ١󥿡եƳƤޤ¸ smbpasswd ե"
+" /var/lib/samba/passdb.tdb ˰ܹԤޤ? ̤ pdb Хå (LDAP "
+"ʤ) ˷ײ褷ƤΤǤСǤ '' ٤Ǥ"
+#. Type: note
#. Description
#: ../swat.templates:3
msgid "Your smb.conf will be re-written!"
msgstr "ʤ smb.conf Ͻľޤ!"
+#. Type: note
#. Description
#: ../swat.templates:3
msgid ""
"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
"delete all comments, include= and copy= options. If you have a carefully "
"crafted smb.conf then back it up or don't use SWAT!"
-msgstr "SWAT Ϥʤ smb.conf եľޤSWAT ϥȥ٤ƤΥȤ include= copy= ץޤŤ˺줿 smb.conf äƤΤǤСХååפƤSWAT ȤʤǤ!"
+msgstr ""
+"SWAT Ϥʤ smb.conf եľޤSWAT ϥȥ"
+"٤ƤΥȤ include= copy= ץޤŤ˺"
+"줿 smb.conf äƤΤǤСХååפƤSWAT Ȥʤ"
+"Ǥ!"
diff --git a/packaging/Debian/debian-unstable/po/nl.po b/packaging/Debian/debian-unstable/po/nl.po
index 61e8742dbb5..616d3702e33 100644
--- a/packaging/Debian/debian-unstable/po/nl.po
+++ b/packaging/Debian/debian-unstable/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: samba\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
"PO-Revision-Date: 2003-08-30 02:03+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -23,11 +23,13 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "Character Set for Unix filesystem"
msgstr "Karakterset voor Unix bestandsysteem"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid ""
@@ -42,17 +44,20 @@ msgstr ""
"geven, deze bepaald hoe Samba de bestandsnamen in het bestandsysteem "
"interpreteerd."
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "If you leave this option blank, your smb.conf will not be changed."
msgstr ""
"Uw smb.conf bestand wordt niet aangepast indien u deze optie leeg laat."
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid "Character Set for DOS clients"
msgstr "Karakterset voor DOS-clients"
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid ""
@@ -71,11 +76,13 @@ msgstr ""
"enkel voor DOS-clients. Uw smb.conf wordt niet veranderd wanneer u deze "
"optie blank laat."
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid "Modify smb.conf to use WINS settings from DHCP?"
msgstr "smb.conf aanpassen om de WINS instellingen van DHCP te gebruiken?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -91,6 +98,7 @@ msgstr ""
"verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS "
"instellingen automatisch gelezen worden van /etc/samba/dhcp.conf."
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -100,11 +108,13 @@ msgstr ""
"U dient het dhcp3-client-pakket genstalleert te hebben om van deze optie "
"gebruik te maken."
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid "Configure smb.conf through debconf?"
msgstr "Configuratie in smb.conf met debconf beheren?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -121,6 +131,7 @@ msgstr ""
"Indien debconf in verwarring raakt dient u uw smb.conf handmatig aan te "
"passen om samba terug werkend te krijgen."
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -134,11 +145,13 @@ msgstr ""
"uit de periodieke configuratie verbeteringen. Het gebruik van debconf wordt "
"dan ook aangeraden. "
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid "Workgroup/Domain Name?"
msgstr "Werkgroep/Domeinnaam?"
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid ""
@@ -150,11 +163,13 @@ msgstr ""
"het beantwoorden van vragen door clients. Merk op dat deze parameter ook de "
"domeinnaam die gebruikt wordt voor de security=domein instelling bepaald."
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid "Use password encryption?"
msgstr "Wachtwoord versleuteling gebruiken?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid ""
@@ -173,11 +188,13 @@ msgstr ""
"dat u de wachtwoorden daar voor elke gebruiker met behulp van smbpasswd "
"insteld. "
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
msgstr "Samba wachtwoord database, /var/lib/samba/passdb.tdb, aanmaken?"
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid ""
@@ -202,11 +219,13 @@ msgstr ""
"deze onversleutelde wachtwoorden gebruiken. Zie /usr/share/doc/samba-doc/"
"htmldocs/ENCRYPTION.html uit het samba-doc pakket voor meer details."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid "Samba's log files have moved."
msgstr "Samba's log bestanden zijn verhuisd."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -218,6 +237,7 @@ msgstr ""
"van beide Samba daemons (nmbd en smbd) opgeslagen in /var/log/samba/. De log "
"bestanden voor nmbd en smbd zijn, respectievelijk, log.nmbd en log.smbd."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -227,11 +247,13 @@ msgstr ""
"De oude logbestanden in /var/log worden voor u naar de nieuwe locatie "
"verplaatst."
+#. Type: note
#. Description
#: ../samba.templates:28
msgid "Running nmbd from inetd is no longer supported"
msgstr "nmbd vanuit inetd draaien wordt niet langer ondersteund"
+#. Type: note
#. Description
#: ../samba.templates:28
msgid ""
@@ -245,16 +267,19 @@ msgstr ""
"Indien u uw /etc/init.d/samba startup-script aangepast had, dient u dit "
"mogelijks aan te passen opdat nmbd zou starten."
+#. Type: select
#. Choices
#: ../samba.templates:36
msgid "daemons, inetd"
msgstr "daemons, inetd"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid "How do you want to run Samba?"
msgstr "Hoe wilt u Samba draaien?"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid ""
@@ -264,11 +289,13 @@ msgstr ""
"De Samba daemon smbd kan als een normale daemon of via inetd draaien. Als "
"een daemon is de aangeraden aanpak."
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
msgstr "/etc/samba/smbpasswd verplaatsen naar /var/lib/samba/passdb.tdb?"
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid ""
@@ -284,11 +311,13 @@ msgstr ""
"van plan bent om, in plaats hiervan, een ander pdb-backend (e.g. LDAP) te "
"gebruiken dient u hier 'nee' te antwoorden."
+#. Type: note
#. Description
#: ../swat.templates:3
msgid "Your smb.conf will be re-written!"
msgstr "Uw smb.conf wordt herschreven!"
+#. Type: note
#. Description
#: ../swat.templates:3
msgid ""
diff --git a/packaging/Debian/debian-unstable/po/pt.po b/packaging/Debian/debian-unstable/po/pt.po
new file mode 100644
index 00000000000..7c77427b395
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/pt.po
@@ -0,0 +1,324 @@
+# translation of pt.po to Portuguese
+# translation of samba Debian debconf template to Portuguese
+# Miguel Figueiredo <elmig@debianpt.org>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba 3.0.9-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2005-01-05 19:25+0000\n"
+"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Conjunto de caracteres para sistema de ficheiros UNIX"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"Actualmente tem um \"character set\" configurado no seu smb.conf. No Samba "
+"3.0, esta opção é substituída por uma nova opção, \"unix charset\". Por "
+"favor especifique o conjunto de caracteres para utilizar com esta nova "
+"opção, que controla como o Samba interpreta os nomes dos ficheiros no "
+"sistema de ficheiros."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Se deixar esta opção vazia, o seu smb.conf não será alterado."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Conjunto de caracteres para clientes DOS"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"Actualmente tem um \"client code page\" definido no seu smb.conf. No Samba "
+"3.0, esta opção é substituída pela opção \"dos charset\". Por favor "
+"especifique o conjunto de caracteres que quer utilizar para esta nova opção. "
+"Na maioria dos casos, o valor por omissão escolhido para si será suficiente. "
+"Note que esta opção não é necessária para suportar clientes em Windows, é "
+"apenas para clientes em DOS. Se deixar esta opção vazia, o seu smb.conf não "
+"será alterado."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Modificar o smb.conf para utilizar definições de WINS a partir de DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+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 ""
+"Se o seu computador obtém a informação do endereço IP a partir de um "
+"servidor de DHCP na rede, o servidor de DHCP pode também fornecer informação "
+"acerca de servidores de WINS (\"servidor de nomes NetBIOS\") presentes na "
+"rede. Isto requer uma alteração no seu ficheiro smb.conf de modo que as "
+"definições de WINS fornecidas por DHCP sejam automaticamente lidas a partir "
+"de /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Tem de ter o pacote dhcp3-client instalado para tirar vantagem desta "
+"característica."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Configurar o smb.conf através de debconf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"O resto da configuração de Samba trata de questões que afectam parâmetros "
+"em /etc/samba/smb.conf, que é o ficheiro utilizado para configurar os "
+"programas de Samba (nmbd e smbd). O seu smb.conf actual contém uma linha "
+"'include' ou uma opção que se espalha em multiplas linhas, a qual pode "
+"confundir o debconf e necessitar que você edite à mão o smb.conf par o ter "
+"novamente operacional."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Se não utilizar o debconf para configurar o smb.conf, terá de lidar você "
+"mesmo com quaisquer alterações da configuração, e não poderá tirar partido "
+"de melhorias de configuração periódicas. Assim sendo, a utilização do "
+"debconf é remomendada se possível."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Nome do Grupo de trabalho/Domínio ?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Isto controla qual o grupo de trabalho em que o seu servidor vai aparecer "
+"quando questionado pelos clientes. Note que este parâmetro também controla o "
+"nome de Domínio quando utilizado com a definição security=domain."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Utilizar encriptação de passwords?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Os clientes de Windows recentes comunicam com servidores de SMB utilizando "
+"passwords encriptadas. Se deseja utilizar passwords de texto puro você vai "
+"necessitar alterar um parâmetro no seu registo do Windows. É recomendado que "
+"utilize passwords encriptadas. Se o fizer, assegure-se que tem um ficheiro /"
+"etc/samba/smbpasswd válido e que defina lá passwords para cada um dos "
+"utilizadores utilizando o comando smbpasswd."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Criar base de dados de passwords samba, /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"Para ser compatível com valores por omissão na maioria das versões do "
+"Windows, o Samba tem de ser configurado para utilizar passwords encriptadas. "
+"Isto requer que as passwords de utilizador sejam guardadas num ficheiro "
+"separado de /etc/passwd. Este ficheiro pode ser criado automaticamente, mas "
+"as passwords têm de ser adicionadas manualmente (por si ou pelo utilizador) "
+"executando o comando smbpasswd, e você tem de mantê-las actualizadas no "
+"futuro. Se não o criar, você terá de reconfigurar o samba (e provavelmente "
+"as máquinas clientes) para utilizar passwords de texto puro. Veja /usr/share/"
+"doc/samba-doc/htmldocs/ENCRIPTION.html do pacote samba-doc para mais "
+"detalhes."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Os ficheiros de log de Samba foram movidos."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"Desde os primeiros pacotes para Debian de Samba 2.2 que os ficheiros de log "
+"para ambos os daemons de Samba (nmbd e smbd) são agora guardados em /var/log/"
+"samba/. Os nomes dos ficheiros são respectivamente log.nmbd e log.smbd, para "
+"o nmbd e smbd."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"Os ficheiros de log antigos que estavam em /var/log/ vão ser movidos, para "
+"si, para a nova localização."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Executar o nmbd a partir de inetd já não é suportado"
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"O seu sistema foi previamente configurado para iniciar o nmbd e smbd a "
+"partir de inetd. A partir da versão 2.999+3.0.alpha20-4, o nmbd já não "
+"inicia a partir do inetd. Se você modificou o seu script de inicialização /"
+"etc/init.d/samba, pode ter de o ajustar agora à mão de modo a que o nmbd "
+"inicie."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Como deseja correr o Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"O daemon de Samba smbd pode correr como um daemon normal ou a partir de "
+"inetd. Executá-lo como um daemon é a aproximação recomendada."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Mover /etc/samba/smbpasswd para /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"O Samba 3.0 introduz um novo e mais completo interface com a base de dados "
+"SAM, que suplanta o ficheiro /etc/samba/smbpasswd. Deseja que o seu ficheiro "
+"existente smbpasswd seja migrado para /var/lib/samba/passdb.tdb para si? Se "
+"planeia utilizar em vez disso outro backend pdb (e.g., LDAP), deve responder "
+"aqui 'no'."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "A sua configuração smb.conf será re-escrita!"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"O SWAT irá reescrever o seu ficheiro smb.conf. Irá reordenar as entradas e "
+"apagar todos os comentários, e opções include= e copy=. Se tem um smb.conf "
+"cuidadosamente trabalhado faça uma cópia de segurança dele ou não utilize o "
+"SWAT!"
diff --git a/packaging/Debian/debian-unstable/po/pt_BR.po b/packaging/Debian/debian-unstable/po/pt_BR.po
index 2af42a562b9..33e136e8b30 100644
--- a/packaging/Debian/debian-unstable/po/pt_BR.po
+++ b/packaging/Debian/debian-unstable/po/pt_BR.po
@@ -13,24 +13,25 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: samba_3.0.0beta2-1\n"
+"Project-Id-Version: samba\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-30 19:08-0500\n"
-"PO-Revision-Date: 2003-07-02 21:56-0500\n"
-"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2005-05-10 14:07-0300\n"
+"Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "Character Set for Unix filesystem"
msgstr "Conjunto de caracteres para sistema de arquivos Unix"
+#. Type: string
#. Description
#: ../samba-common.templates:3
-#, fuzzy
msgid ""
"You currently have a \"character set\" configured in your smb.conf. In "
"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
@@ -39,10 +40,12 @@ msgid ""
msgstr ""
"Atualmente existe um \"conjunto de caracteres\" (\"character set\") "
"configurado em seu arquivo smb.conf. No Samba 3.0, esta opo foi "
-"substituda por uma nova opo, \"unix charset\". Por favor especifique o "
-"conjunto de caracteres a ser usado para essa nova opo, a qual controla "
-"como o Samba interpreta nomes de arquivos no sistema de arquivos."
+"substituda por uma nova opo, a opo \"unix charset\". Por favor, "
+"especifique o conjunto de caracteres a ser usado para essa nova opo, a "
+"qual controla como o Samba interpreta nomes de arquivos no sistema de "
+"arquivos."
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "If you leave this option blank, your smb.conf will not be changed."
@@ -50,11 +53,13 @@ msgstr ""
"Caso voc deixe esta opo em branco, seu arquivo smb.conf no ser "
"modificado."
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid "Character Set for DOS clients"
msgstr "Conjunto de caracteres para clientes DOS"
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid ""
@@ -69,15 +74,17 @@ msgstr ""
"definido em seu arquivo smb.conf. No Samba 3.0, essa opo foi substituda "
"pela opo \"dos charset\". Por favor, especifique o conjunto de caracteres "
"que voc deseja usar para essa nova opo. Note que essa opo no "
-"necessria para suportar clientes Windows mas sim vlida somente para "
+"necessria para suportar clientes Windows, mas sim vlida somente para "
"clientes DOS. Caso voc deixe essa opo em branco, seu arquivo smb.conf no "
"ser modificado."
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid "Modify smb.conf to use WINS settings from DHCP?"
msgstr "Modificar smb.conf para usar configuraes WINS fornecidas via DHCP ?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -88,26 +95,29 @@ msgid ""
"be read from /etc/samba/dhcp.conf."
msgstr ""
"Caso seu computador obtenha as informaes de endereamento IP de um "
-"servidor DHCP na rede, o servidor DHCP pode tambm fornecer informaes "
+"servidor DHCP na rede, o servidor DHCP poder tambm fornecer informaes "
"sobre servidor WINS (\"Servidor de Nomes NetBIOS\") presentes na rede. Para "
-"o Samba ler as configuraes WINS fornecidas pelo servidor DHCP "
+"que o Samba leia as configuraes WINS fornecidas pelo servidor DHCP "
"automaticamente do arquivo /etc/samba/dhcp.conf, preciso modificar seu "
"arquivo smb.conf."
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
"You must have the dhcp3-client package installed to take advantage of this "
"feature."
msgstr ""
-"Voc deve possuir o pacote dhcp3-client instalado para poder usar este "
+"Voc deve possuir o pacote dhcp3-client instalado para poder usar esse "
"recurso."
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid "Configure smb.conf through debconf?"
-msgstr "Configurar smb.conf atravs do debconf ?"
+msgstr "Configurar o arquivo smb.conf atravs do debconf ?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -121,9 +131,10 @@ msgstr ""
"no arquivo /etc/samba/smb.conf, que o arquivo usado para configurar os "
"programas Samba (nmbd e smbd). Seu arquivo smb.conf atual contm uma linha "
"'include' ou uma opo que ocupa diversas linhas, o que pode confundir o "
-"debconf e requerer que voc edite seu arquivo smb.conf manualmente para t-"
-"lo funcional novamente."
+"debconf e requerer que voc edite seu arquivo smb.conf manualmente para "
+"torn-lo funcional novamente."
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -132,16 +143,19 @@ msgid ""
"periodic configuration enhancements. Therefore, use of debconf is "
"recommended if possible."
msgstr ""
-"Caso voc opte por no usar o debconf para configurar o smb.conf, ser "
-"necessrio que voc lide com quaisquer mudanas de configuraes manualmente "
-"e voc no poder aproveitar os melhoramentos peridicos de configurao. "
-"Por esse motivo, recomendado usar o debconf, caso seja possvel."
+"Caso voc opte por no usar o debconf para configurar o arquivo smb.conf, "
+"ser necessrio que voc lide com quaisquer mudanas de configuraes "
+"manualmente e voc no poder aproveitar os melhoramentos peridicos de "
+"configurao. Por esse motivo, recomendado usar o debconf, caso seja "
+"possvel."
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid "Workgroup/Domain Name?"
msgstr "Nome de Domnio/Grupo de Trabalho ?"
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid ""
@@ -150,15 +164,17 @@ msgid ""
"the security=domain setting."
msgstr ""
"Este parmetro controla em qual grupo de trabalho (workgroup) seu servidor "
-"parecer estar quando o mesmo for pesquisado por clientes. Note que este "
-"parmetro tambm controla o nome de Domnio usado com a configurao "
-"security=domain."
+"parecer estar quando uma pesquisa pelo mesmo for feita por clientes. Note "
+"que este parmetro tambm controla o nome de Domnio usado com a "
+"configurao security=domain."
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid "Use password encryption?"
-msgstr "Usar encriptao de senhas ?"
+msgstr "Usar senhas criptografadas ?"
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid ""
@@ -170,17 +186,19 @@ msgid ""
"command."
msgstr ""
"Clientes Windows atuais comunicam-se com servidores SMB usando senhas "
-"encriptadas. Caso voc queira usar senhas em texto puro voc precisar "
+"criptografadas. Caso voc queira usar senhas em texto puro voc precisar "
"modificar um parmetro no registro de seu Windows. recomendado que voc "
-"use senhas encriptadas. Se for us-las, certifique-se de possuir um arquivo /"
-"etc/samba/smbpasswd vlido e que voc tenha definido senhas no mesmo para "
-"cada usurio, utilizando o comando smbpasswd."
+"use senhas criptografadas. Caso as utilize, certifique-se de possuir um "
+"arquivo /etc/samba/smbpasswd vlido e que voc tenha definido senhas no "
+"mesmo para cada usurio, utilizando o comando smbpasswd."
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
msgstr "Gerar a base de dados para senhas /var/lib/samba/passdb.tdb ?"
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid ""
@@ -195,22 +213,24 @@ msgid ""
"details."
msgstr ""
"Para compatibilidade com os padres adotados em todas as verses atuais do "
-"Windows o Samba deve ser configurado para usar senhas encriptadas. Isso "
+"Windows, o Samba deve ser configurado para usar senhas criptografadas. Isso "
"requer que as senhas dos usurios sejam armazenadas em um arquivo diferente "
-"do /etc/passwd. Esse arquivo pode ser criado automaticamente, mas as senhas "
-"devem ser definidas manualmente (por voc ou pelo usurio) executando o "
-"utilitrio smbpasswd. Voc deve certificar-se de manter esse arquivo "
+"do arquivo /etc/passwd. Esse arquivo pode ser criado automaticamente, mas as "
+"senhas devem ser definidas manualmente (por voc ou pelo usurio) executando "
+"o utilitrio smbpasswd. Voc deve certificar-se de manter esse arquivo "
"atualizado futuramente. Caso voc no crie esse arquivo, voc ter que "
"reconfigurar o Samba (e provavelmente suas mquinas clientes) para "
"utilizao de senhas em texto puro. Consulte a documentao do pacote samba-"
"doc em /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html para maiores "
"detalhes."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid "Samba's log files have moved."
msgstr "Arquivos de log do Samba foram movidos."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -218,25 +238,28 @@ msgid ""
"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
msgstr ""
-"Desde os primeiros pacotes Debian do Samba 2.2 os arquivos de log para ambos "
-"os daemons Samba (nmbd e smbd) so armazenados no diretrio /var/log/samba/. "
-"Os nomes desses arquivos so log.nmbd e log.smbd, para o nmbd e para o smbd, "
-"respectivamente."
+"Desde os primeiros pacotes Debian do Samba 2.2, os arquivos de log para "
+"ambos os daemons Samba (nmbd e smbd) so armazenados no diretrio /var/log/"
+"samba/. Os nomes desses arquivos so log.nmbd e log.smbd, para o nmbd e para "
+"o smbd, respectivamente."
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
"The old log files that were in /var/log/ will be moved to the new location "
"for you."
msgstr ""
-"Os antigos arquivos de log que estavam em /var/log/ sero movidos para a "
-"nova localizao automaticamente para voc."
+"Os antigos arquivos de log que estavam no diretrio /var/log/ sero movidos "
+"para o novo local para voc."
+#. Type: note
#. Description
#: ../samba.templates:28
msgid "Running nmbd from inetd is no longer supported"
msgstr "A execuo do nmbd a partir do inetd no mais suportada"
+#. Type: note
#. Description
#: ../samba.templates:28
msgid ""
@@ -248,19 +271,22 @@ msgstr ""
"Seu sistema foi previamente configurado para iniciar os daemons nmbd e smbd "
"a partir do inetd. Desde a verso 2.999+3.0.alpha20-4, o nmbd no mais ser "
"iniciado a partir do inetd. Caso voc tenha modificado seu script de "
-"inicializao /etc/init.d/samba, voc pode precisar ajust-lo manualmente "
-"agora para que o nmbd seja iniciado."
+"inicializao /etc/init.d/samba, voc precisar ajust-lo manualmente agora "
+"para que o nmbd seja iniciado."
+#. Type: select
#. Choices
#: ../samba.templates:36
msgid "daemons, inetd"
msgstr "daemons, inetd"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid "How do you want to run Samba?"
msgstr "Como voc deseja que o Samba seja executado ?"
+#. Type: select
#. Description
#: ../samba.templates:38
msgid ""
@@ -270,11 +296,13 @@ msgstr ""
"O servio Samba smbd pode ser executado como daemon normal ou a partir do "
"inetd. Execut-lo como daemon o mtodo recomendado."
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
msgstr "Mover /etc/samba/smbpasswd para /var/lib/samba/passdb.tdb ?"
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid ""
@@ -284,17 +312,19 @@ msgid ""
"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
"here."
msgstr ""
-"O Samba 3.0 introduz uma nova e mais complete interface de base de dados SAM "
-"que substitui o arquivo /etc/samba/smbpasswd. Voc gostaria que o arquivo "
-"smbpasswd existente fosse migrado para /var/lib/samba/passdb.tdb para voc ? "
-"Caso voc planeje usar um outro backend (como LDAP, por exemplo) voc dever "
-"escolher 'no' aqui."
+"O Samba 3.0 introduziu uma nova e mais completa interface de base de dados "
+"SAM que substituiu o arquivo /etc/samba/smbpasswd. Voc gostaria que o "
+"arquivo smbpasswd existente fosse migrado para /var/lib/samba/passdb.tdb "
+"para voc ? Caso voc planeje usar um outro backend (como LDAP, por "
+"exemplo), no aceite mover o arquivo smbpasswd."
+#. Type: note
#. Description
#: ../swat.templates:3
msgid "Your smb.conf will be re-written!"
msgstr "Seu arquivo smb.conf ser reescrito !"
+#. Type: note
#. Description
#: ../swat.templates:3
msgid ""
diff --git a/packaging/Debian/debian-unstable/po/ru.po b/packaging/Debian/debian-unstable/po/ru.po
new file mode 100644
index 00000000000..a09e4edcbd3
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/ru.po
@@ -0,0 +1,315 @@
+# translation of samba_3.0.14a-2_ru.po to Russian
+# Yuriy Talakan' <yt@amur.elektra.ru>, 2005.
+msgid ""
+msgstr ""
+"Project-Id-Version: samba_3.0.14a-2_ru\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2005-05-21 21:43+1000\n"
+"Last-Translator: Yuriy Talakan' <yt@amur.elektra.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Кодировка для файловой системы Unix"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"Сейчас у вас есть опция \"character set\" в smb.conf. В Samba 3.0, эта опция "
+"заменена на \"unix charset\". Укажите кодировку, которую вы желаете "
+"использовать для этой новой опции. Она отвечает за то, как Samba "
+"интерпретирует имена файлов в файловой системе."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Если вы оставите опцию пустой, ваш smb.conf не будет изменен."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Кодировка для клиентов DOS"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"Сейчас у вас есть опция \"client code page\" в smb.conf. В Samba 3.0, эта "
+"опция заменена на \"dos charset\". Укажите кодировку, которую вы желаете "
+"использовать для этой новой опции. В большинстве случаев значения по "
+"умолчанию будет достаточно. Запомните, что эта опция не нужна для поддержки "
+"клиентов Windows, она только для клиентов DOS. Если вы оставите опцию "
+"пустой, ваш smb.conf не будет изменен."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Изменить smb.conf для использования настроек WINS из DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network. This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Если ваш компьютер получает информацию о своем IP-адресе от сервера DHCP "
+"через сеть, то DHCP-сервер также может предоставлять информацию о серверах "
+"WINS(\"серверы имен NetBIOS\"), присутствующих в сети. Это требует внесения "
+"изменений в ваш файл smb.conf, чтобы предоставленные через DHCP настройки "
+"WINS автоматически читались из /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Чтобы воспользоваться этой возможностью, вы должны установить пакет dhcp3-"
+"client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Настроить smb.conf через debconf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"Оставшаяся часть настройки Samba состоит из вопросов, которые затрагивают "
+"параметры в /etc/samba/smb.conf. Этот файл используется для настройки "
+"программ Samba (nmbd и smbd.) Ваш текущий smb.conf содержит строку 'include' "
+"или опцию, которая состоит из нескольких строк. Это может смутить debconf и "
+"потребовать от вас ручного редактирования вашего smb.conf для восстановления "
+"работоспособности."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Если вы не используете debconf для настройки smb.conf, то должны "
+"самостоятельно позаботиться обо всех изменениях настроек и не сможете "
+"воспользоваться преимуществами периодического улучшения настроек. Таким "
+"образом, рекомендуется по возможности использовать debconf."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Имя рабочей группы/домена?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Задает рабочую группу, в которой появится ваш сервер, когда его увидят "
+"клиенты. Обратите внимение, что этот параметр также задает имя домена, "
+"которое используется при security=domain."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Использовать шифрацию паролей?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Современные клиенты Windows общаются с серверами SMB используя шифрованные "
+"пароли. Если вы пожелаете использовать открытые пароли, вам придется "
+"изменить параметр в реестре Windows. Рекомендуется использовать шифрованные "
+"пароли. В этом случае убедитесь, что у вас правильный файл /etc/samba/"
+"smbpasswd и что вы установили там пароли для каждого пользователя командой "
+"smbpasswd."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Создать базу данных паролей samba, /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"Для совместимости со значением по умолчанию в большинстве версий Windows, "
+"Samba должна быть настроена на использование шифрованных паролей. Это "
+"требует хранения пользовательских паролей в файле, отдельном от /etc/passwd. "
+"Этот файл может быть создан автоматически, но пароли должны быть добавлены "
+"вручную (вами или пользователем) посредством запуска smbpasswd, и вы должны "
+"заботиться о поддержании его в актуальном состоянии в будущем. Если вы не "
+"создадите его, то должны перенастроить samba (и вероятно ваши клиентские "
+"машины) на использование открытых паролей. Более подробно смотрите в /usr/"
+"share/doc/samba-doc/htmldocs/ENCRYPTION.html из пакета samba-doc."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "log-файлы Samba переместились."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"Начиная с первых пакетов Samba 2.2 для Debian, log-файлы для демонов Samba "
+"(nmbd и smbd) хранятся теперь в /var/log/samba/. Файлы называются log.nmbd и "
+"log.smbd для nmbd и smbd соответственно."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"Старые log-файлы, которые были в /var/log/, будут перемещены в новое для вас "
+"место."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Запуск nmbd из inetd больше не поддерживается"
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"Ваша система была ранее настроена на запуск nmbd и smbd из inetd. nmbd с "
+"версии 2.999+3.0.alpha20-4 больше не запускается из inetd. Если вы изменили "
+"ваш стартовый скрипт /etc/init.d/samba, вам необходимо откорректировать его "
+"вручную, чтобы nmbd запускался."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Как вы желаете запускать Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba-демон smbd может запускаться как обычный демон или из inetd. "
+"Рекомендуем выбрать запуск в качестве демона."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Переместить /etc/samba/smbpasswd в /var/lib/samba/passdb.tdb?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"Samba 3.0 приносит новый, более полный интерфейс базы данных SAM, который "
+"заменяет собой файл /etc/samba/smbpasswd. Желаете, чтобы ваш существующий "
+"файл smbpasswd мигрировал в /var/lib/samba/passdb.tdb? Если вы планируете "
+"вместо него использовать другой интерфейс pdb (например, LDAP), вы должны "
+"ответить здесь 'нет'."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Ваш smb.conf будет перезаписан!"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SWAT перепишет ваш файл smb.conf. Он перегруппирует все записи и удалит все "
+"комментарии, опции include= и copy=. Если у вас тщательно созданный smb."
+"conf, то сохраните его в безопасном месте или не используйте SWAT!"
diff --git a/packaging/Debian/debian-unstable/po/sv.po b/packaging/Debian/debian-unstable/po/sv.po
new file mode 100644
index 00000000000..452e545776a
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/sv.po
@@ -0,0 +1,281 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba 3.0.14a-6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2005-10-04 15:48+0200\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Teckenuppsttning fr UNIX-filsystem"
+
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"Du har fr nrvarande en teckenuppsttning konfigurerad i din smb.conf "
+"I Samba 3.0 r denna funktion utbytt mot en ny funktion \"unix charset\". "
+"Specificera den teckenuppsttning du nskar att anvnda fr denna instllning "
+"som kontrollerar hur Samba lser av filnamn p filsystemet."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Om du lmnar denna blank kommer din smb.conf inte att ndras."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Teckenuppsttning fr DOS-klienter"
+
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"Du har fr nrvarande en \"client code page\" satt i din smb.conf. "
+"I Samba 3.0 r denna instllning utbytt mot \"dos charset\". Specificera "
+"den teckenuppsttning du nskar anvnda fr denna instllning. "
+"I de flesta fall r standard instllningen tillrcklig. Notera att denna instllning "
+"inte r fr att stdja Windows-klienter utan bara fr DOS-klienter. Om du lmnar "
+"denna instllning blank kommer din smb.conf inte att ndras."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Modifiera smb.conf att anvnda WINS-instllningar frn DHCP?"
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network. This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Om din dator fr en IP-address och information frn en DHCP-server p ntverket "
+"kan ven DHCP-server ocks skicka information om WINS-servrar (\"NetBIOS namnservrar\") i ditt ntverk. Detta krver en ndring i din fil smb.conf s att WINS-instllningar frn DHCP-servern automatiskt kan lsas frn /etc/samba/dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Du mste ha paketet dhcp3-client installerat fr att anvnda denna funktion."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Konfigurera smb.conf genom Debconf?"
+
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"Resten av konfigurationen av Samba gller frgor som pverkar parametrar i "
+"/etc/samba/smb.conf vilken r filen som anvnds fr att konfigurera Samba-programmen (nmbd och smbd). Din nuvarande smb.conf innehller en 'include'-rad eller en "
+"instllning som spnner ver flera rader som kan frvirra Debconf och kan innebra "
+"att du mste ndra i din smb.conf p egen hand fr att f det att fungera igen."
+
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Om du inte anvnder Debconf fr att konfigurera smb.conf mste du hantera "
+"alla konfigurationsndringar p egen hand och kan drfr inte utnyttja alla "
+"frbttringar i de periodiska konfigurationsndringarna. Drfr r det rekommenderat "
+"att anvnda Debconf."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Arbetsgrupp/Domnnamn?"
+
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Denna kontrollerar vilken arbetsgrupp din server ska synas i nr klienterna frgar. "
+"Notera att denna parameter ocks kontrollerar domnnamnet som anvnds med "
+"parametern 'security=domain'."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Anvnda lsenordskryptering?"
+
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Tidigare Windows-klienter kommunicerar med SMB-servrar med krypterade lsenord. "
+"Om du vill anvnda lsenord i klartext behver du ndra en parameter i Windows registry. Det rekommenderas att du anvnder krypterade lsenord. Om du gr det, "
+"kontrollera att du har en giltig fil /etc/samba/smbpasswd och att du har satt lsenorden "
+"dr fr varje anvndare med kommandot smbpasswd."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Skapa Samba's lsenordsdatabas, /var/lib/samba/passdb.tdb?"
+
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"Fr att vara kompatibel med de standarder i de flesta versioner av Windows mste "
+"Samba konfigureras fr att anvnda krypterade lsenord. Detta krver att "
+"anvndarnas lsenord lagras i en fil som r separerad frn /etc/passwd. Denna fil "
+"kan skapas automatiskt men lsenorden mste lggas till manuellt (av dig eller anvndaren) genom att kra kommandot smbpasswd och du mste se till att den blir "
+"uppdaterad i framtiden. Om du inte skapar den mste du konfigurera om samba "
+"(och antagligen ven dina klientmaskiner) fr att anvnda lsenord i klartext. Se "
+"/usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html frn paketet samba-doc fr "
+"mer information."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Samba's loggfiler har flyttats."
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+""
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"De gamla loggfilerna som fanns i /var/log har flyttats till den nya mappen t dig."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Kra nmbd frn inetd r inte lngre supporterad"
+
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"Ditt system var tidigare konfigurerat att starta nmbd frn inetd. "
+"Frn och med version 2.999+3.0.alpha20-4 kommer inte nmbd att startas via inetd. "
+"Om du har modifierat ditt startskript /etc/init.d/samba mste du kanske justera den "
+"fr hand nu s att nmbd kan starta."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Hur vill du kra Samba?"
+
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba-daemonen smbd kan kras som en normal daemon eller frn inetd. "
+"Kra som en daemon r den rekommenderade metoden."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Flytta /etc/samba/smbpasswd till /var/lib/samba/passdb.tdb?"
+
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"Samba 3.0 introducerar en ny, mer komplett SAM-databasinterface som erstter "
+"filen /etc/samba/smbpasswd. Vill du migrera din existerande smbpasswd till /var/lib/samba/passdb.tdb? Om du planerar att anvnda ett annat pdb-baksystem (till exempel LDAP) instllet fr detta br du svara 'nej' hr."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Din smb.conf kommer att skrivas om!"
+
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SAWT kommer att skriva om din fil smb.conf. Den kommer att arrangera om raderna "
+"och radera alla kommentarer, include= och copy= instllningarna. Om du har en "
+"knslig och vlstrukturerad smb.conf s ta en backup frst eller anvnd inte SWAT!"
+
diff --git a/packaging/Debian/debian-unstable/po/templates.pot b/packaging/Debian/debian-unstable/po/templates.pot
index 465f4719b0d..2eeea8efab8 100644
--- a/packaging/Debian/debian-unstable/po/templates.pot
+++ b/packaging/Debian/debian-unstable/po/templates.pot
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\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"
@@ -24,11 +24,13 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "Character Set for Unix filesystem"
msgstr ""
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid ""
@@ -38,16 +40,19 @@ msgid ""
"controls how Samba interprets filenames on the file system."
msgstr ""
+#. Type: string
#. Description
#: ../samba-common.templates:3
msgid "If you leave this option blank, your smb.conf will not be changed."
msgstr ""
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid "Character Set for DOS clients"
msgstr ""
+#. Type: string
#. Description
#: ../samba-common.templates:13
msgid ""
@@ -59,11 +64,13 @@ msgid ""
"this option blank, your smb.conf will not be changed."
msgstr ""
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid "Modify smb.conf to use WINS settings from DHCP?"
msgstr ""
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -74,6 +81,7 @@ msgid ""
"be read from /etc/samba/dhcp.conf."
msgstr ""
+#. Type: boolean
#. Description
#: ../samba-common.templates:24
msgid ""
@@ -81,11 +89,13 @@ msgid ""
"feature."
msgstr ""
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid "Configure smb.conf through debconf?"
msgstr ""
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -96,6 +106,7 @@ msgid ""
"require you to edit your smb.conf by hand to get it working again."
msgstr ""
+#. Type: boolean
#. Description
#: ../samba-common.templates:37
msgid ""
@@ -105,11 +116,13 @@ msgid ""
"recommended if possible."
msgstr ""
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid "Workgroup/Domain Name?"
msgstr ""
+#. Type: string
#. Description
#: ../samba-common.templates:52
msgid ""
@@ -118,11 +131,13 @@ msgid ""
"the security=domain setting."
msgstr ""
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid "Use password encryption?"
msgstr ""
+#. Type: boolean
#. Description
#: ../samba-common.templates:60
msgid ""
@@ -134,11 +149,13 @@ msgid ""
"command."
msgstr ""
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
msgstr ""
+#. Type: boolean
#. Description
#: ../samba.templates:4
msgid ""
@@ -153,11 +170,13 @@ msgid ""
"details."
msgstr ""
+#. Type: note
#. Description
#: ../samba.templates:17
msgid "Samba's log files have moved."
msgstr ""
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -166,6 +185,7 @@ msgid ""
"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
msgstr ""
+#. Type: note
#. Description
#: ../samba.templates:17
msgid ""
@@ -173,11 +193,13 @@ msgid ""
"for you."
msgstr ""
+#. Type: note
#. Description
#: ../samba.templates:28
msgid "Running nmbd from inetd is no longer supported"
msgstr ""
+#. Type: note
#. Description
#: ../samba.templates:28
msgid ""
@@ -187,16 +209,19 @@ msgid ""
"adjust it by hand now so that nmbd will start."
msgstr ""
+#. Type: select
#. Choices
#: ../samba.templates:36
msgid "daemons, inetd"
msgstr ""
+#. Type: select
#. Description
#: ../samba.templates:38
msgid "How do you want to run Samba?"
msgstr ""
+#. Type: select
#. Description
#: ../samba.templates:38
msgid ""
@@ -204,11 +229,13 @@ msgid ""
"daemon is the recommended approach."
msgstr ""
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
msgstr ""
+#. Type: boolean
#. Description
#: ../samba.templates:45
msgid ""
@@ -219,11 +246,13 @@ msgid ""
"here."
msgstr ""
+#. Type: note
#. Description
#: ../swat.templates:3
msgid "Your smb.conf will be re-written!"
msgstr ""
+#. Type: note
#. Description
#: ../swat.templates:3
msgid ""
diff --git a/packaging/Debian/debian-unstable/po/tr.po b/packaging/Debian/debian-unstable/po/tr.po
new file mode 100644
index 00000000000..180efad3f03
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/tr.po
@@ -0,0 +1,322 @@
+# Turkish translation of samba.
+# This file is distributed under the same license as the samba package.
+# Mehmet Türker <mturker@innova.com.tr>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2004-06-01 09:42+0300\n"
+"Last-Translator: Mehmet Türker <mturker@innova.com.tr>\n"
+"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Unix dosya sistemi için karakter seti"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"Halihazırda smb.conf yapılandırma dosyanızda \"character set\" ayarı mevcut. "
+"Samba 3.0'da bu seçenek yenisiyle: \"unix charset\" ile değiştirildi. Lütfen "
+"Samba'nın sistemdeki dosya isimlerini çevirirken dikkate aldığı bu yeni "
+"seçenekle kullanılmasını istediğiniz karakter setini girin."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Bu seçeneği boş bırakırsanız, smb.conf dosyanız değiştirilmeyecektir."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "DOS istemcileri için karakter seti"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"Halihazırda smb.conf yapılandırma dosyanızda \"client code page\" ayarı "
+"mevcut. Samba 3.0'da bu seçenek \"dos charset\" seçeneğiyle değiştirildi. "
+"Lütfen bu yeni seçenekle beraber kullanmak için bir karakter seti seçin. "
+"Çoğu durumda öntanımlı olarak seçilmiş bulunan seçenek uygundur. Aklınızda "
+"bulunsun bu seçenek Windows istemcilerini desteklemek için gerekli değildir, "
+"sadece DOS istemcileri içindir. Eğer bu seçeneği boş bırakırsanız smb.conf "
+"dosyanız değiştirilmeyecektir."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"WINS ayarlarını DHCP'den kullanmak için smb.conf dosyasında değişiklik "
+"yapılsın mı?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+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 ""
+"Eğer bilgisayarınız IP adresini ağınızdaki bir DHCP sunucusundan alıyorsa, "
+"DHCP sunucusu ayrıca ağınızda bulunan WINS sunucuları (\"NetBIOS alanadı "
+"sunucuları\") hakkında da bilgi verebilir. Bu, smb.conf dosyanızda DHCP "
+"tarafından sunulan WINS ayarlarının otomatik olarak /etc/samba/dhcp.conf "
+"dosyasından okunmasını sağlayan bir değişikliği gerektirir."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Bu özellikten yararlanabilmek için dhcp3-client paketinin kurulmuş olması "
+"gerekir."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "\"smb.conf\" dosyası debconf ile yapılandırılsın mı?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"Geri kalan Samba yapılandırması Samba uygulamalarını (nmbd ve smbd) "
+"yapılandırmak için kullanılan /etc/samba/smb.conf dosyasındaki parametreleri "
+"etkileyen sorularla devam edecektir. Mevcut smb.conf dosyası, debconf'u "
+"şaşırtabilecek ve smb.conf dosyanızı elle değiştirilmesi zorunda kılacak bir "
+"'include' satırı veya birden fazla satır boyunca devam eden bir seçenek "
+"içeriyor."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Eğer smb.conf'u yapılandırmak için debconf'u kullanmıyorsanız bütün "
+"yapılandırma değişikliklerini kendiniz elle yapmanız gerekir. Bu durumda "
+"periyodik olarak sunulan yapılandırma iyileştirmelerinden de "
+"yararlanamayacaksınız. Bu nedenlerle eğer mümkünse debconf kullanımı "
+"tavsiye edilir."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Çalışma Grubu/Etki Alanı İsmi?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Bu ayar, sunucunuzun istemciler tarafından sorgulandığında hangi Çalışma "
+"Grubu içerisinde gözükeceğini kontrol eder. Aklınızda bulunsun, bu parametre "
+"ayrıca security=domain ayarı ile beraber kullanılacak Etki Alanını da "
+"kontrol eder."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Parola şifrelenmesi kullanılsın mı?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Yeni Windows istemcileri SBM sunucularıyla şifrelenmiş parolalar kullanarak "
+"iletişim kurarlar. Eğer düz metin parolaları kullanmak istiyorsanız Windows "
+"registry içinde bir parametreyi değiştirmelisiniz. Eğer bu işlemi "
+"yapmışsanız, geçerli bir /etc/samba/smbpasswd dosyanız olduğundan ve buraya "
+"smbpasswd komutu kullanarak bütün kullanıcılar için parola kaydı "
+"eklendiğinden emin olun."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Samba parola veritabanı /var/lib/samba/passwd.tdb yaratılsın mı?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"Windows'un çoğu sürümüyle uyumlu olması için, Samba'nın şifreli parolaları "
+"kullanmak üzere yapılandırılması gerekir. Bu işlem kullanıcı parolalarının /"
+"etc/passwd dosyasından farklı bir yerde saklanmasını gerektirir. Bu dosya "
+"otomatik olarak yaratılabilir, fakat parolaların (siz veya kullanıcı "
+"tarafından) smbpasswd çalıştırılarak elle girilmesi ve gelecekte de güncel "
+"tutulması gerekir. Eğer bunu yaratmazsanız, düz metin parolalar "
+"kullanabilmek için samba'yı (ve muhtemelen istemci makineleri) yeniden "
+"yapılandırmanız gerekir. Daha ayrıntılı bilgi için samba-doc paketinden "
+"çıkan /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html'ye başvurun."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Samba'nın günce dosyaları taşındı."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"Samba 2.2'nin ilk paketlerinden itibaren, Samba artalan süreçlerine (nmbd ve "
+"smbd) ait Debian günce dosyaları artık /var/log/samba altında saklanıyor. Bu "
+"dosyaların isimleri nmbd ve smbd için sırasıyla log.nmbd ve log.smbd'dir."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"/var/log/ içinde bulunan eski günce dosyaları yeni bir konuma taşınacak."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Nmbd'nin inetd'den çalıştırılması artık desteklenmiyor"
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"Sisteminiz, nmbd ve smbd'yi inetd üzerinden çalıştıracak şekilde "
+"ayarlanmış. Sürüm 2.999+3.0.alpha20-4'ten sonra artık nmbd inetd'den "
+"çalıştırılmıyor. Eğer /etc/init.d/samba başlangıç betiğini kendiniz "
+"düzenlediyseniz, nmbd'nin çalışabilmesi için bu dosyayı elle ayarlamak "
+"zorunda kalabilirsiniz."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "artalan süreçleri, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Samba'nın nasıl çalışmasını istersiniz?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba artalan süreci smbd, normal bir artalan süreci olarak veya inetd'den "
+"çalışabilir. Tavsiye edilen yaklaşım artalan süreci olarak çalıştırmaktır."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "/etc/samba/smbpasswd /var/lib/samba/passwd.tdb'ye taşınsın mı?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"Samba 3.0, /etc/samba/smbpasswd'nin yerini alan yeni ve daha eksiksiz bir "
+"SAM veritabanı arayüzü ile birlikte geliyor. Mevcut smbpasswd dosyasının /"
+"var/lib/samba/passdb.tbd dosyasına dönüştürülmesini ister misiniz? Eğer "
+"başka bir pdb arkayüzü (ör. LDAP) kullanmayı planlıyorsanız, burada 'hayır' "
+"cevabını vermelisiniz."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Smb.conf dosyanız tekrar yazılacak!"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SWAT smb.conf dosyanızın üzerine yazacak. Bu işlem kayıtları tekrar "
+"düzenleyecek, bütün yorumları, include= ve copy= seçeneklerini silecek. Eğer "
+"özel olarak tasarladığınız bir smb.conf dosyanız varsa, bunu yedekleyin veya "
+"SWAT kullanmayın!"
diff --git a/packaging/Debian/debian-unstable/po/vi.po b/packaging/Debian/debian-unstable/po/vi.po
new file mode 100644
index 00000000000..bae046c1ee4
--- /dev/null
+++ b/packaging/Debian/debian-unstable/po/vi.po
@@ -0,0 +1,322 @@
+# Vietnamese translation for samba.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba 3.0.14a-6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-13 17:05-0700\n"
+"PO-Revision-Date: 2005-07-12 16:17+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list@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=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.2.2\n"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Bộ ký tự cho hệ thống tập tin Unix"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf. In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"Hiện thời bạn có cấu hình một «character set» (bộ ký tự) trong tập tin «smb."
+"conf». Trong Samba phiên bản 3.0, tùy chọn này được thay thế bằng một tùy "
+"chọn mới, «unix charset» (bộ ký tự Unix: 'charset' là viết tắt cho "
+"'character set'). Bạn hãy ghi rõ bộ ký tự nào bạn muốn sử dụng cho tùy chọn "
+"mới này, mà điều khiển cách Samba giải thích tên tập tin trong hệ thống tập "
+"tin này."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr ""
+"Nếu bạn bỏ rỗng tùy chọn này thì sẽ không sửa đổi tập tin «smb.conf» của bạn."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Bộ ký tự cho trình khách DOS"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf. In Samba "
+"3.0, this option is replaced by the option \"dos charset\". Please specify "
+"the character set you wish to use for this new option. In most cases, the "
+"default chosen for you will be sufficient. Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients. If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"Hiện thời bạn có lập một «client code page» (trang mã khách) trong tập tin "
+"«smb.conf». Trong Samba phiên bản 3.0, tùy chọn này được thay thế bằng tùy "
+"chọn «dos charset» (bộ ký tự DOS). Bạn hãy ghi rõ bộ ký tự nào bạn muốn sử "
+"dụng cho tùy chọn mới này. Trong phần lớn trường hợp, giá trị mặc định là "
+"đúng. Hãy ghi chú rằng không cần thiết tùy chọn này để hỗ trợ trình khách "
+"Windows: chỉ trình khách DOS cần thiết nó. Nếu bạn bỏ rỗng tùy chọn này thì "
+"sẽ không sửa đổi tập tin «smb.conf» của bạn."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Sửa đổi «smb.conf» để dùng thiết lập WINS từ DHCP không?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+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 ""
+"Nếu máy tính bạn gọi thông tin địa chỉ IP từ một trình phục vụ DHCP 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ó trên mạng. Dịch vụ này cần thiết "
+"bạn thay đổi tập tin «smb.conf» mình để cho phép thiết lập WINS do DHCP cung "
+"cấp sẽ tự động được đọc từ tập tin «/etc/samba/dhcp.conf»."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr "Để nhớ dịp tính năng này, bạn cần phải cài đặt gói tin «dhcp3-client»."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Cấu hình «smb.conf» bằng debconf không?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"Những phần còn lại của cấu hình Samba đề cập 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 chương trình Samba "
+"(nmbd và smbd). Tập tin «smb.conf» hiện thời của bạn chứa một dòng "
+"«include» (gồm) hay một tùy chọn theo nhiều dòng, mà có thể gây ra lỗi trong "
+"trình debconf nên bạn sẽ phải tự sửa đổi tập tin «smb.conf» mình để hoạt hóa "
+"lại nó."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements. Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Nếu bạn không sử dụng debconf để cấu hình tập tin «smb.conf», bạn sẽ phải tự "
+"quản lý sự thay đổi cấu hình nào, và sẽ không thể nhớ dịp cấu hình tăng "
+"cường định kỳ. Vì vậy, khuyến khích bạn sử dụng debconf nếu có thể."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Tên nhóm làm việc hay tên miền?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Tùy chọn này điều khiển nhóm làm việc (workgroup) nào hình như trình phục vụ "
+"bạn có trong, khi trình khách yêu cầu. Hãy ghi chú rằng tham số này cũng "
+"điều khiển tên miền được dùng với thiết lập «security=domain» (bảo mật = "
+"miền)."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Mật mã hóa mật khẩu không?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Trình khách Windows mới hơn có liên lạc với trình phục vụ SMB dùng mật khẩu "
+"mật mã. Nếu bạn có muốn sử dụng mật khẩu «chữ rõ» (chữ thô, không có mật mã) "
+"thì bạn sẽ cần phải thay đổi một tham số trong sổ đăng ký (registry) Windows "
+"mình. Khuyến khích bạn sử dụng mật khẩu mật mã. Nếu bạn làm như thế, hãy "
+"kiểm tra xem có một tập tin «/etc/samba/smbpasswd» hợp lệ, và bạn đã lập mật "
+"khẩu trong nó cho mỗi người dùng có dùng lệnh «smbpasswd»."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Tạo cơ sở dữ liệu mật khẩu samba «/var/lib/samba/passdb.tdb» không?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords. This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future. If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"Để tương thích với những giá trị mặc định trong phần lớn phiên bản Windows, "
+"trình Samba phải có cấu hình dùng mật khẩu mật mã. Làm như thế cần thiết các "
+"mật khẩu người dùng được lưu vào một tập tin khác với «/etc/passwd». Có thể "
+"tự động tạo tập tin riêng này, nhưng mà phải tự thêm mật khẩu (bạn hay người "
+"dùng thêm) bằng cách chạy lệnh «smbpasswd», và bạn phải định bảo quản nó cập "
+"nhật. Nếu bạn không tạo tập tin này thì bạn sẽ phải cấu hình lại trình samba "
+"(rất có thể cùng với các máy khách) để dùng mật khẩu chữ thô. Hãy xem tập "
+"tin «/usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html» từ gói tin «samba-"
+"doc» để tìm chi tiết."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Tập tin bản ghi Samba đã di chuyển rồi."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"Từ gói tin thứ nhất của Samba phiên bản 2.2 cho Debian, những tập tin bản "
+"ghi cho cả hai trình nền Samba (nmbd và smbd) được lưu vào «/var/log/"
+"samba/». Tên của tập tin này là «log.nmbd» và «log.smbd» cho trình nmdb và "
+"trình smbd riêng từng cái."
+
+#. Type: note
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"Các tập tin bản ghi cũ đã trong «/var/log/» sẽ được di chuyển sang vị trí "
+"mới cho bạn dùng."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Không còn hỗ trợ lại chạy trình nmbd từ inetd."
+
+#. Type: note
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd. As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd. "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"Trước này, hệ thống bạn được cấu hình để khởi chạy trình nền nmbd và smbd từ "
+"inetd. Từ phiên bản 2.999+3.0.alpha20-4, nmbd sẽ không còn được khởi chạy "
+"lại từ inetd. Nếu bạn đã sửa đổi tập lệnh khởi chạy «/etc/init.d/samba» thì "
+"có lẽ bạn muốn tự điều chỉnh nó, để khởi chạy nmbd trong trường hợp mới này."
+
+#. Type: select
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "trình nền, inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Bạn có muốn chạy Samba như thế nào?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Trình nền (dæmon) Samba smbd có thể chạy với tư cách trình nền bình thường, "
+"hoặc từ inetd. Khuyên bạn chạy nó là trình nền."
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr ""
+"Di chuyển «/etc/samba/smbpasswd» sang «/var/lib/samba/passdb.tdb» không?"
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file. Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you? If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"Samba phiên bản 3.0 giới thiệu một giao diện cơ sở dữ liệu SAM mới hơn, hoàn "
+"thành hơn mà thay thế tập tin «/etc/samba/smbpasswd». Bạn có muốn trình này "
+"di chuyển tập tin «smbpasswd» đã có sang «/var/lib/samba/passdb.tdb» không? "
+"Nếu bạn định sử dụng hậu phương «pdb» khác (v.d. LDAP) thì bạn nên trả lời "
+"Không (no) tại đây."
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "• Sẽ ghi lại tập tin «smb.conf» của bạn. •"
+
+#. Type: note
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SWAT sẽ ghi lại tập tin «smb.conf» của bạn. Nó sẽ sắp xếp lại các mục nhập, "
+"và xóa bỏ mọi chú thích và tùy chon «include=» và «copy=». Nếu bạn không "
+"muốn mất tập tin «smb.conf» mình thì hãy lưu trữ nó, hoặc không sử dụng SWAT."
diff --git a/packaging/Debian/debian-unstable/rules b/packaging/Debian/debian-unstable/rules
index e00693a814c..71f833d4cb2 100755
--- a/packaging/Debian/debian-unstable/rules
+++ b/packaging/Debian/debian-unstable/rules
@@ -19,13 +19,14 @@ export DH_OPTIONS
# cross-building, etc.
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
export DEB_HOST_GNU_TYPE
export DEB_BUILD_GNU_TYPE
-
+export DEB_HOST_ARCH_OS
# Support the DEB_BUILD_OPTIONS variable
-CFLAGS = -gstabs -Wall
+CFLAGS = -g -Wall
INSTALL = install
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -41,28 +42,7 @@ endif
DESTDIR=`pwd`/debian/tmp
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- if [ ! -f patch-stamp ]; then /bin/sh debian/scripts/patch-source; fi
- touch patch-stamp
-
-unpatch:
- dh_testdir
- if [ -f patch-stamp ]; then /bin/sh debian/scripts/unpatch-source; fi
- rm -f patch-stamp
-
-configure: patch-stamp configure-stamp
-configure-stamp:
- dh_testdir
-
- if [ -f debian/config.cache ]; then \
- cp -f debian/config.cache source/config.cache; \
- fi
-
- [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
+conf_args = \
--cache-file=./config.cache \
--with-fhs \
--enable-shared \
@@ -74,7 +54,6 @@ configure-stamp:
--with-piddir=/var/run/samba \
--localstatedir=/var \
--with-netatalk \
- --with-smbmount \
--with-pam \
--with-syslog \
--with-utmp \
@@ -84,10 +63,49 @@ configure-stamp:
--with-winbind \
--with-msdfs \
--with-automount \
- --with-acl-support \
--with-tdbsam \
--with-ldap \
- --with-python=python2.3)
+ --with-python=python2.3
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ conf_args += \
+ --with-smbmount \
+ --with-acl-support \
+ --with-quotas
+ mount_cifs = yes
+ smbfs = yes
+else
+ conf_args += --without-quotas
+ mount_cifs = no
+ smbfs = no
+endif
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ conf_args += --build $(DEB_HOST_GNU_TYPE)
+else
+ conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+patch: patch-stamp
+patch-stamp:
+ dh_testdir
+ if [ ! -f patch-stamp ]; then /bin/sh debian/scripts/patch-source; fi
+ touch patch-stamp
+
+unpatch:
+ dh_testdir
+ if [ -f patch-stamp ]; then /bin/sh debian/scripts/unpatch-source; fi
+ rm -f patch-stamp
+
+configure: patch-stamp configure-stamp
+configure-stamp:
+ dh_testdir
+
+ if [ -f debian/config.cache ]; then \
+ cp -f debian/config.cache source/config.cache; \
+ fi
+
+ [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure $(conf_args))
touch configure-stamp
@@ -97,6 +115,9 @@ build-stamp:
$(MAKE) -C source headers
$(MAKE) -C source all nsswitch/libnss_wins.so python_ext
+ifeq ($(mount_cifs),yes)
+ $(MAKE) -C source client/mount.cifs
+endif
touch build-stamp
@@ -112,7 +133,11 @@ clean: unpatch
# Delete stuff left after a build that is not deleted by 'make clean'
rm -f source/bin/wbinfo source/bin/winbindd source/bin/debug2html \
- source/bin/libsmbclient.a source/include/stamp-h
+ source/bin/libsmbclient.a source/client/mount.cifs \
+ source/include/stamp-h
+
+ sed -e "s/@libacl@/`type-handling any linux-gnu`/g" \
+ < debian/control.in > debian/control
dh_clean
@@ -123,11 +148,11 @@ install: build
dh_clean -k
dh_installdirs
- mkdir -p $(DESTDIR)/usr/share/man $(DESTDIR)/usr/lib \
+ mkdir -p $(DESTDIR)/usr/share/man $(DESTDIR)/usr/lib/samba \
$(DESTDIR)/lib/security $(DESTDIR)/sbin \
$(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
$(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d \
- $(DESTDIR)/usr/lib/python2.3/site-packages
+ $(DESTDIR)/usr/lib/python2.3/site-packages/samba
# Add here commands to install the package into debian/tmp.
$(MAKE) -C source install DESTDIR=$(DESTDIR)
@@ -135,9 +160,15 @@ install: build
# libsmbclient files are not installed by the standard
# 'make install' - do it manually.
$(MAKE) -C source installclientlib DESTDIR=$(DESTDIR)
- mv $(DESTDIR)/usr/lib/libsmbclient.so $(DESTDIR)/usr/lib/libsmbclient.so.0.1
- ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/libsmbclient.so.0
- ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/libsmbclient.so
+ mv $(DESTDIR)/usr/lib/samba/libsmbclient.so $(DESTDIR)/usr/lib/samba/libsmbclient.so.0.1
+ ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/samba/libsmbclient.so.0
+ ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/samba/libsmbclient.so
+
+ # 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/.
+ mv $(DESTDIR)/usr/lib/samba/libsmbclient* \
+ $(DESTDIR)/usr/lib/
# Install other stuff not installed by "make install"
install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
@@ -158,6 +189,7 @@ install: build
# right location in the libpam-smbpass package.
install -m 0644 source/bin/pam_smbpass.so $(DESTDIR)/lib/security/
+ifeq ($(smbfs),yes)
# Create the symlinks that will allow us to do "mount -t smbfs ..."
# and "mount -t smb ...". Note that the source/script/installbin.sh
# tries to create the first symlink, but we have commented
@@ -167,6 +199,13 @@ install: build
ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smb
ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smb.8
ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8
+endif
+
+ifeq ($(mount_cifs),yes)
+ # Install mount.cifs and its man page
+ install -m 04755 source/client/mount.cifs $(DESTDIR)/sbin/
+ install -m 0644 docs/manpages/mount.cifs.8 $(DESTDIR)/usr/share/man/man8/
+endif
# For CUPS to support printing to samba printers, it's necessary
# to make the following symlink (according to
@@ -206,7 +245,8 @@ install: build
# and lib.linux-i686-2.3 directories. Using only the stuff from
# the 2.3 directory for now. peloy.-
#cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/
- cp source/build/lib.linux-*-2.3/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/
+ cp source/build/lib.*-*-2.3/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
+ cp source/python/samba/* $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
dh_movefiles
@@ -244,7 +284,11 @@ binary-indep: build install
# Build architecture-dependent files here.
# Pass -a to all debhelper commands in this target to reduce clutter.
-binary-arch: DH_OPTIONS=-a
+ifeq ($(smbfs),no)
+ DH_EXTRAS=-Nsmbfs
+endif
+
+binary-arch: DH_OPTIONS=-a $(DH_EXTRAS)
binary-arch: build install
dh_testdir
dh_testroot
@@ -273,7 +317,9 @@ binary-arch: build install
# dh_undocumented
dh_installchangelogs -Nlibpam-smbpass
DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG
- dh_strip
+ dh_strip --dbg-package=samba --dbg-package=smbclient
+ cp -a debian/smbclient-dbg/* debian/samba-dbg
+ rm -rf debian/smbclient-dbg
dh_link
dh_compress
dh_fixperms
@@ -281,6 +327,7 @@ binary-arch: build install
# Why this is executable, I have NO idea...
chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h
+ifeq ($(smbfs),yes)
# You may want to make some executables suid here.
# The smbmnt and smbumount binaries should be setuid-root. This
# has security implications because these programs haven't had
@@ -288,6 +335,7 @@ binary-arch: build install
# the setuid bit set. In fact, it is a security hole.
chmod u+s debian/smbfs/usr/bin/smbmnt
chmod u+s debian/smbfs/usr/bin/smbumount
+endif
# Set some reasonable default perms for the samba logdir.
chmod 0750 debian/samba/var/log/samba/
diff --git a/packaging/Debian/debian-unstable/samba-common.files b/packaging/Debian/debian-unstable/samba-common.files
index f5779fa8270..aec13dd851b 100644
--- a/packaging/Debian/debian-unstable/samba-common.files
+++ b/packaging/Debian/debian-unstable/samba-common.files
@@ -9,6 +9,7 @@ usr/share/man/man1/nmblookup.1
usr/share/man/man1/testparm.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/smbpasswd.8
diff --git a/packaging/Debian/debian-unstable/samba-doc.docs b/packaging/Debian/debian-unstable/samba-doc.docs
index 4d2cec2ee22..0845082145f 100644
--- a/packaging/Debian/debian-unstable/samba-doc.docs
+++ b/packaging/Debian/debian-unstable/samba-doc.docs
@@ -1,7 +1,8 @@
README
-docs/Samba-HOWTO-Collection.pdf
+docs/Samba3-ByExample.pdf
+docs/Samba3-Developers-Guide.pdf
+docs/Samba3-HOWTO.pdf
docs/THANKS
docs/history
-docs/faq/
docs/htmldocs/
-docs/Registry/
+docs/registry/
diff --git a/packaging/Debian/debian-unstable/samba.docs b/packaging/Debian/debian-unstable/samba.docs
index b8cc5419fb1..7949c615b02 100644
--- a/packaging/Debian/debian-unstable/samba.docs
+++ b/packaging/Debian/debian-unstable/samba.docs
@@ -1,5 +1,4 @@
README
Roadmap
WHATSNEW.txt
-docs/htmldocs/diagnosis.html
-docs/README.ldap
+docs/htmldocs/Samba3-HOWTO/diagnosis.html
diff --git a/packaging/Debian/debian-unstable/samba.files b/packaging/Debian/debian-unstable/samba.files
index f52e6c5e4f7..c308ec77159 100644
--- a/packaging/Debian/debian-unstable/samba.files
+++ b/packaging/Debian/debian-unstable/samba.files
@@ -1,4 +1,3 @@
-usr/bin/testprns
usr/bin/smbstatus
usr/bin/smbcontrol
usr/bin/tdbbackup
@@ -9,8 +8,6 @@ usr/sbin/mksmbpasswd
usr/lib/samba/vfs
usr/share/man/man1/smbcontrol.1
usr/share/man/man1/smbstatus.1
-usr/share/man/man1/testprns.1
-usr/share/man/man5/smbpasswd.5
usr/share/man/man8/nmbd.8
usr/share/man/man8/pdbedit.8
usr/share/man/man8/smbd.8
diff --git a/packaging/Debian/debian-unstable/samba.init b/packaging/Debian/debian-unstable/samba.init
index 5d0f4671a00..c4e19ee54c8 100644
--- a/packaging/Debian/debian-unstable/samba.init
+++ b/packaging/Debian/debian-unstable/samba.init
@@ -19,22 +19,29 @@ unset TMPDIR
# See if the daemons are there
test -x /usr/sbin/nmbd -a -x /usr/sbin/smbd || exit 0
+. /lib/lsb/init-functions
+
case "$1" in
start)
- echo -n "Starting Samba daemons:"
+ log_daemon_msg "Starting Samba daemons" "nmbd"
- echo -n " nmbd"
- start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- -D
+ if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/nmbd -- -D; then
+ log_end_msg 1
+ exit 1
+ fi
if [ "$RUN_MODE" != "inetd" ]; then
- echo -n " smbd"
- start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D
+ log_progress_msg "smbd"
+ if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd -- -D; then
+ log_end_msg 1
+ exit 1
+ fi
fi
- echo "."
+ log_end_msg 0
;;
stop)
- echo -n "Stopping Samba daemons: "
+ log_daemon_msg "Stopping Samba daemons" "nmbd"
start-stop-daemon --stop --quiet --pidfile $NMBDPID
# Wait a little and remove stale PID file
@@ -45,9 +52,9 @@ case "$1" in
# remove it (should be removed by nmbd itself IMHO.)
rm -f $NMBDPID
fi
- echo -n "nmbd"
if [ "$RUN_MODE" != "inetd" ]; then
+ log_progress_msg "smbd"
start-stop-daemon --stop --quiet --pidfile $SMBDPID
# Wait a little and remove stale PID file
sleep 1
@@ -57,17 +64,17 @@ case "$1" in
# remove it (should be removed by smbd itself IMHO.)
rm -f $SMBDPID
fi
- echo -n " smbd"
fi
- echo "."
+ log_end_msg 0
;;
reload)
- echo -n "Reloading /etc/samba/smb.conf (smbd only)"
+ log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only"
+
start-stop-daemon --stop --signal HUP --pidfile $SMBDPID
- echo "."
+ log_end_msg 0
;;
restart|force-reload)
$0 stop
diff --git a/packaging/Debian/debian-unstable/samba.logrotate b/packaging/Debian/debian-unstable/samba.logrotate
index f90437bf2ad..57f4228a7ce 100644
--- a/packaging/Debian/debian-unstable/samba.logrotate
+++ b/packaging/Debian/debian-unstable/samba.logrotate
@@ -14,7 +14,7 @@
missingok
rotate 7
postrotate
- [ -f /var/run/samba/nmbd.pid ] && kill -HUP `cat /var/run/samba/nmbd.pid`
+ [ ! -f /var/run/samba/nmbd.pid ] || kill -HUP `cat /var/run/samba/nmbd.pid`
endscript
compress
notifempty
diff --git a/packaging/Debian/debian-unstable/samba.postinst b/packaging/Debian/debian-unstable/samba.postinst
index 7b0bdd92ad5..0fb03f8768e 100644
--- a/packaging/Debian/debian-unstable/samba.postinst
+++ b/packaging/Debian/debian-unstable/samba.postinst
@@ -56,7 +56,8 @@ EOFMAGICNUMBER1234
# moving the files in the old directories (/var/samba/ and
# /var/state/samba) to the new FHS-compliant directories.
-if [ -d /var/samba/ ]; then
+if [ -d /var/samba/ ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.0.7-4
+then
mv /var/samba/* /var/lib/samba/ 2>/dev/null || true
rmdir /var/samba/
fi
@@ -64,7 +65,8 @@ fi
# Default for anything we don't know about (see next two 'for' loops)
# is /var/lib/samba -- guaranteed not to accidentally tromp on any
# files the admin thought were safe.
-if [ -d /var/state/samba ]; then
+if [ -d /var/state/samba ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.3-4
+then
mv /var/state/samba/* /var/lib/samba/ 2>/dev/null || true
rmdir /var/state/samba/
diff --git a/packaging/Debian/debian-unstable/scripts/unpatch-source b/packaging/Debian/debian-unstable/scripts/unpatch-source
index d3681cfa504..3ded1150ba8 100755
--- a/packaging/Debian/debian-unstable/scripts/unpatch-source
+++ b/packaging/Debian/debian-unstable/scripts/unpatch-source
@@ -15,6 +15,6 @@ done
#mv -f ${TMPFILE} source/VERSION
# Regenerate configure only if it is older than configure.in
-[ source/configure -ot source/configure.in ] && (cd source && autoheader && autoconf)
+[ source/configure -ot source/configure.in ] && (cd source && sh ./autogen.sh)
exit 0
diff --git a/packaging/Debian/debian-unstable/smb.conf b/packaging/Debian/debian-unstable/smb.conf
index 8a75979945a..3de3e7c5065 100644
--- a/packaging/Debian/debian-unstable/smb.conf
+++ b/packaging/Debian/debian-unstable/smb.conf
@@ -71,8 +71,8 @@
# "security = user" is always a good idea. This will require a Unix account
# in this server for every user accessing the server. See
-# /usr/share/doc/samba-doc/htmldocs/ServerType.html in the samba-doc
-# package for details.
+# /usr/share/doc/samba-doc/htmldocs/Samba-HOWTO-Collection/ServerType.html
+# in the samba-doc package for details.
; security = user
# You may wish to use password encryption. See the section on
@@ -81,7 +81,7 @@
# If you are using encrypted passwords, Samba will need to know what
# password database type you are using.
- passdb backend = tdbsam guest
+ passdb backend = tdbsam
obey pam restrictions = yes
diff --git a/packaging/Debian/debian-unstable/smbfs.files b/packaging/Debian/debian-unstable/smbfs.files
index 870db7d6453..359754ebf98 100644
--- a/packaging/Debian/debian-unstable/smbfs.files
+++ b/packaging/Debian/debian-unstable/smbfs.files
@@ -1,5 +1,6 @@
sbin/mount.smbfs
sbin/mount.smb
+sbin/mount.cifs
usr/bin/smbmount
usr/bin/smbumount
usr/bin/smbmnt
@@ -8,3 +9,4 @@ usr/share/man/man8/smbumount.8
usr/share/man/man8/smbmnt.8
usr/share/man/man8/mount.smb.8
usr/share/man/man8/mount.smbfs.8
+usr/share/man/man8/mount.cifs.8
diff --git a/packaging/Debian/debian-unstable/winbind.init b/packaging/Debian/debian-unstable/winbind.init
index 2dfdf3b8352..18e342597b4 100644
--- a/packaging/Debian/debian-unstable/winbind.init
+++ b/packaging/Debian/debian-unstable/winbind.init
@@ -14,29 +14,33 @@ unset TMPDIR
# See if the daemon is there
test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
case "$1" in
start)
- echo -n "Starting the Winbind daemon: winbindd"
+ log_daemon_msg "Starting the Winbind daemon" "winbind"
start-stop-daemon --start --quiet --exec $DAEMON
- echo "."
+ log_end_msg $?
;;
+
stop)
- echo -n "Stopping the Winbind daemon: winbindd"
+ log_daemon_msg "Stopping the Winbind daemon" "winbind"
start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
- echo "."
+ log_end_msg $?
;;
+
restart|force-reload)
- echo -n "Restarting the Winbind daemon: winbindd"
+ log_daemon_msg "Restarting the Winbind daemon" "winbind"
start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
sleep 2
start-stop-daemon --start --quiet --exec $DAEMON
- echo "."
+ log_end_msg $?
;;
*)
echo "Usage: /etc/init.d/winbind {start|stop|restart|force-reload}"