[Pkg-samba-maint] r3735 - in branches/samba/experimental: debian debian/patches debian/po source3/param

bubulle at alioth.debian.org bubulle at alioth.debian.org
Fri Apr 15 16:57:52 UTC 2011


tags 613624 pending
tags 617429 pending
tags 563372 pending
tags 610678 pending
tags 594088 pending
tags 574468 pending
tags 607402 pending
tags 593823 pending
tags 601101 pending
tags 601364 pending
tags 601366 pending
tags 601633 pending
tags 601719 pending
tags 602220 pending
tags 605729 pending
tags 597203 pending
tags 596891 pending
tags 596040 pending
tags 594325 pending
tags 596164 pending
tags 592789 pending
tags 592809 pending
tags 460494 pending
tags 585056 pending
tags 502801 pending
tags 586337 pending
tags 574011 pending
tags 580561 pending
tags 509135 pending
tags 569926 pending
tags 553904 pending
tags 579011 pending
thanks

Author: bubulle
Date: 2011-04-15 16:57:51 +0000 (Fri, 15 Apr 2011)
New Revision: 3735

Removed:
   branches/samba/experimental/debian/patches/usershare.patch
Modified:
   branches/samba/experimental/debian/NEWS
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/mksmbpasswd.awk
   branches/samba/experimental/debian/patches/series
   branches/samba/experimental/debian/po/ar.po
   branches/samba/experimental/debian/po/ast.po
   branches/samba/experimental/debian/po/be.po
   branches/samba/experimental/debian/po/bg.po
   branches/samba/experimental/debian/po/bn.po
   branches/samba/experimental/debian/po/bs.po
   branches/samba/experimental/debian/po/ca.po
   branches/samba/experimental/debian/po/cs.po
   branches/samba/experimental/debian/po/da.po
   branches/samba/experimental/debian/po/de.po
   branches/samba/experimental/debian/po/dz.po
   branches/samba/experimental/debian/po/el.po
   branches/samba/experimental/debian/po/eo.po
   branches/samba/experimental/debian/po/es.po
   branches/samba/experimental/debian/po/et.po
   branches/samba/experimental/debian/po/eu.po
   branches/samba/experimental/debian/po/fi.po
   branches/samba/experimental/debian/po/fr.po
   branches/samba/experimental/debian/po/gl.po
   branches/samba/experimental/debian/po/gu.po
   branches/samba/experimental/debian/po/he.po
   branches/samba/experimental/debian/po/hu.po
   branches/samba/experimental/debian/po/id.po
   branches/samba/experimental/debian/po/it.po
   branches/samba/experimental/debian/po/ja.po
   branches/samba/experimental/debian/po/ka.po
   branches/samba/experimental/debian/po/km.po
   branches/samba/experimental/debian/po/ko.po
   branches/samba/experimental/debian/po/ku.po
   branches/samba/experimental/debian/po/lt.po
   branches/samba/experimental/debian/po/ml.po
   branches/samba/experimental/debian/po/mr.po
   branches/samba/experimental/debian/po/nb.po
   branches/samba/experimental/debian/po/ne.po
   branches/samba/experimental/debian/po/nl.po
   branches/samba/experimental/debian/po/nn.po
   branches/samba/experimental/debian/po/pl.po
   branches/samba/experimental/debian/po/pt.po
   branches/samba/experimental/debian/po/pt_BR.po
   branches/samba/experimental/debian/po/ro.po
   branches/samba/experimental/debian/po/ru.po
   branches/samba/experimental/debian/po/sk.po
   branches/samba/experimental/debian/po/sl.po
   branches/samba/experimental/debian/po/sq.po
   branches/samba/experimental/debian/po/sv.po
   branches/samba/experimental/debian/po/ta.po
   branches/samba/experimental/debian/po/th.po
   branches/samba/experimental/debian/po/tl.po
   branches/samba/experimental/debian/po/tr.po
   branches/samba/experimental/debian/po/vi.po
   branches/samba/experimental/debian/po/wo.po
   branches/samba/experimental/debian/po/zh_CN.po
   branches/samba/experimental/debian/po/zh_TW.po
   branches/samba/experimental/debian/rules
   branches/samba/experimental/debian/samba-common-bin.postinst
   branches/samba/experimental/debian/samba-common.dhcp
   branches/samba/experimental/debian/samba-common.postinst
   branches/samba/experimental/debian/samba-common.prerm
   branches/samba/experimental/debian/samba.logrotate
   branches/samba/experimental/debian/samba.postinst
   branches/samba/experimental/debian/samba.prerm
   branches/samba/experimental/debian/smb.conf
   branches/samba/experimental/debian/smb.conf.dapper
   branches/samba/experimental/debian/smb.conf.etch
   branches/samba/experimental/debian/smb.conf.gutsy
   branches/samba/experimental/debian/swat.postinst
   branches/samba/experimental/debian/winbind.logrotate
   branches/samba/experimental/debian/winbind.postinst
   branches/samba/experimental/source3/param/loadparm.c
Log:
Resync with unstable: merge changes between 3.5.4~dfsg-1 and 3.5.8~dfsg-1

Modified: branches/samba/experimental/debian/NEWS
===================================================================
--- branches/samba/experimental/debian/NEWS	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/NEWS	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,3 +1,26 @@
+samba (2:3.4.0-1) unstable; urgency=low
+
+  * Default passdb backend changed in samba 3.4.0 and above
+  
+    Beginning with samba 3.4.0, the default setting for "passdb
+    backend" changed from "smbpasswd" to "tdbsam".
+    
+    If your smb.conf file does not have an explicit mention of
+    "passdb backend" when upgrading from pre-3.4.0 versions of
+    samba, it is likely that users will no longer be able to
+    authenticate.
+    
+    As a consequence of all this, if you're upgrading from lenny
+    and have no setting of "passdb backend" in smb.conf, you MUST
+    add "passdb backend = smbpasswd" in order to keep your samba
+    server's behaviour.
+    
+    As Debian packages of samba explicitly set "passdb backend = tdbsam"
+    by default since etch, very few users should need to modify their
+    settings.
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 07 Jul 2009 20:42:19 +0200
+
 samba (3.0.27a-2) unstable; urgency=low
 
   * Weak authentication methods are disabled by default

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/changelog	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,3 +1,131 @@
+samba (2:3.6.0~pre2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * usershare.patch no longer needed as user shares are now enabled by
+    default
+
+ -- Christian Perrier <bubulle at debian.org>  Fri, 15 Apr 2011 14:12:54 +0200
+
+samba (2:3.5.8~dfsg-1) unstable; urgency=low
+
+  * New upstream release. This fixes the following bugs:
+    - Winbind leaks gids with idmap ldap backend (upstrem #7777)
+      Closes: #613624
+    - printing from Windows 7 fails with 0x000003e6
+      Closes: #617429
+  * smb.conf(5) restored from samba 3.5.6 as a workaround to upstream
+    #7997
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 08 Mar 2011 22:38:32 +0100
+
+samba (2:3.5.7~dfsg-1) unstable; urgency=low
+
+  [ Christian Perrier ]
+  * New upstream release
+  * Security update, fixing the following issue:
+    - CVE-2011-0719: denial of service by memory corruption
+  * Use architecture wildcard "linux-any" in build dependencies
+    Closes: #563372
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 01 Mar 2011 20:59:34 +0100
+
+samba (2:3.5.6~dfsg-5) unstable; urgency=low
+
+  * Fix FTBFS on Hurd. Closes: #610678
+  * Only try parsing dhcpd.conf is it's not empty,
+    in dhclient-enter-hooks.d/samba.  Closes: #594088.
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 05 Feb 2011 13:50:22 +0100
+
+samba (2:3.5.6~dfsg-4) unstable; urgency=low
+
+  * Fix pam_winbind file descriptor leak with a patch
+    proposed in https://bugzilla.samba.org/show_bug.cgi?id=7265.
+    Upstream claim is that #7265 is fixed in 3.5.6 but our bug submitter
+    confirmed it is not while the patch applied here fixes the file
+    descriptor leak.
+    Closes: #574468
+
+  [ Debconf translations ]  
+  * Brazilian Portuguese (Adriano Rafael Gomes).  Closes: #607402
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 15 Jan 2011 18:06:22 +0100
+
+samba (2:3.5.6~dfsg-3) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Bump libwbclient0 shlibs to match the newest version in the symbols file.
+  * Mark libwbclient0 as breaking other samba packages with versions older
+    than 2:3.4.1, as they were linked against libtalloc1 instead of
+    libtalloc2, and the combination causes crashes (closes: #593823).
+
+ -- Christian Perrier <bubulle at debian.org>  Mon, 06 Dec 2010 20:14:04 +0100
+
+samba (2:3.5.6~dfsg-2) unstable; urgency=low
+
+  [ Steve Langasek ]
+  * Fix debian/rules update-archs target to not add extra spaces on every
+    invocation...
+
+  [ Debconf translations ]  
+  * Catalan (Jordi Mallach).  Closes: #601101
+  * Japanese (Kenshi Muto).  Closes: #601364
+  * Bulgarian (Damyan Ivanov).  Closes: #601366
+  * Hebrew (Omer Zak).  Closes: #601633
+  * Kurdish (Erdal Ronahî).  Closes: #601719
+  * Dutch (Remco Rijnders).  Closes: #602220
+  * Greek (Konstantinos Margaritis).
+
+  [ Christian Perrier ]
+  * Include upstream's patch for "gvfsd-smb (Gnome vfs) fails to copy
+    files from a SMB share using SMB signing.". Backported from
+    to be released 3.5.7 version
+    Closes: #605729
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 04 Dec 2010 07:44:22 +0100
+
+samba (2:3.5.6~dfsg-1) unstable; urgency=low
+
+  * New upstream release. Fixes the following Debian bug:
+    - rpcclient readline segfault. Closes: #597203
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 10 Oct 2010 09:59:37 +0200
+
+samba (2:3.5.5~dfsg-1) unstable; urgency=high
+
+  [ Christian Perrier ]
+  * New upstream release. Security release fixing:
+    - CVE-2019-3069: Buffer overrun vulnerability in sid_parse.
+      Closes: #596891.
+  * Fix comment in swat's postinst. It is not turned off by default
+    Closes: #596040
+  * Drop transition code from (pre-etch) 3.0.20b-3 version in swat postinst
+
+  [ Steve Langasek ]
+  * debian/control: winbind needs libpam-runtime (>= 1.0.1-6) for
+    pam-auth-update.  Closes: #594325.
+
+  [ Debconf translations ]  
+  * Arabic (Ossama Khayat).  Closes: #596164
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 14 Sep 2010 23:03:35 +0200
+
+samba (2:3.5.4~dfsg-2) unstable; urgency=low
+
+  * Release to unstable
+
+  [ Debconf translations ]  
+  * Danish (Joe Dalton).  Closes: #592789.
+  * Galician (Jorge Barreiro).  Closes: #592809
+
+  [ Steve Langasek ]
+  * debian/patches/fhs-filespaths.patch, debian/samba.postinst,
+    debian/winbind.postinst: move some files from /etc/samba to
+    /var/lib/samba where they belong: MACHINE.SID, schannel_store.tdb,
+    and idmap2.tdb.
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 07 Sep 2010 17:47:32 +0200
+
 samba (2:3.6.0~pre1-1) experimental; urgency=low
 
   * New upstream release
@@ -26,6 +154,97 @@
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 04 May 2010 17:13:47 +0200
 
+samba (2:3.5.2~dfsg-1) experimental; urgency=low
+
+  * New upstream release
+  * Bugs fixed upstream:
+    - Fix parsing of the gecos field
+      Closes: #460494
+
+ -- Christian Perrier <bubulle at debian.org>  Thu, 08 Apr 2010 19:48:07 +0200
+
+samba (2:3.5.1~dfsg-1) experimental; urgency=low
+
+  * New upstream release. Security fix: all smbd processes inherited
+    CAP_DAC_OVERRIDE capabilities, allowing all file system access to be
+    allowed even when permissions should have denied access.
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 09 Mar 2010 10:54:01 +0100
+
+samba (2:3.5.0dfsg-1) experimental; urgency=low
+
+  * New upstream release. Not using "3.5.0~dfsg" as version number
+    because we used a "higher" version number in previous versions.
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 02 Mar 2010 22:03:15 +0100
+
+samba (2:3.5.0~rc3~dfsg-1) experimental; urgency=low
+
+  * New upstream release candidate
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 20 Feb 2010 08:36:57 +0100
+
+samba (2:3.5.0~rc2~dfsg-1) experimental; urgency=low
+
+  * New upstream pre-release
+  * Use new --with-codepagedir option. Consequently drop
+    codepages-location.patch
+  * Drop "Using Samba" from the samba-doc file list as it was
+    removed upstream.
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 31 Jan 2010 11:53:48 +0100
+
+samba (2:3.5.0~rc1~dfsg-1) experimental; urgency=low
+
+  [ Christian Perrier ]
+  * New upstream pre-release
+
+ -- Christian Perrier <bubulle at debian.org>  Fri, 15 Jan 2010 23:31:01 +0100
+
+samba (2:3.4.8~dfsg-2) unstable; urgency=low
+
+  [ Steve Langasek ]
+  * Drop the per-release smb.conf templates, only needed for upgrade paths
+    that are no longer supported.
+  * Call /etc/init.d/samba directly from the logrotate script instead of
+    using invoke-rc.d, to address the irony that the only package I work on
+    that *has* a logrotate script is inconsistent with my position in
+    bug #445203.
+  * Fix a bashism in the samba postinst that can cause the package
+    installation to fail under dash.  LP: #576307.
+  * Add symlink from /etc/dhcp/dhclient-enter-hooks.d to
+    /etc/dhcp3/dhclient-enter-hooks.d for the hook location of the new
+    isc-dhcp-client package.  Closes: #585056.
+
+  [ Christian Perrier ]
+  * Don't copy system accounts from /etc/passwd to
+    /var/lib/samba/passdb.tdb. Closes: #502801
+  * Update Standards to 3.9.0 (checked, no change)
+  * Backport patch for upstream bug #7139 to fix "owner of file not
+    available with kerberos"
+    Closes: #586337   
+
+ -- Steve Langasek <vorlon at debian.org>  Wed, 14 Jul 2010 11:59:28 -0700
+
+samba (2:3.4.8~dfsg-1) unstable; urgency=low
+
+  [ Christian Perrier ]
+  * New upstream release
+  * Bugs fixed upstream:
+    - Fix writing with vfs_full_audit. Closes: #574011
+  * Drop deprecated 'share modes' parameter from default smb.conf
+    Closes: #580561
+  * Enable PIE during configure. Closes: #509135
+  * Avoid winbind's logrotate script to fail when there is no
+    /var/run/samba directory. Closes: #569926
+  * Add explanations about "passdb backend" default setting change
+    Closes: #553904
+
+  [ Debconf translations ]  
+  * Spanish (Omar Campagne).  Closes: #579011
+
+ -- Christian Perrier <bubulle at debian.org>  Wed, 12 May 2010 05:45:52 +0200
+
 samba (2:3.4.7~dfsg-2) unstable; urgency=low
 
   [ Christian Perrier ]
@@ -101,53 +320,6 @@
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 23 Jan 2010 12:16:42 +0100
 
-samba (2:3.5.2~dfsg-1) experimental; urgency=low
-
-  * New upstream release
-  * Bugs fixed upstream:
-    - Fix parsing of the gecos field
-      Closes: #460494
-
- -- Christian Perrier <bubulle at debian.org>  Thu, 08 Apr 2010 19:48:07 +0200
-
-samba (2:3.5.1~dfsg-1) experimental; urgency=low
-
-  * New upstream release. Security fix: all smbd processes inherited
-    CAP_DAC_OVERRIDE capabilities, allowing all file system access to be
-    allowed even when permissions should have denied access.
-
- -- Christian Perrier <bubulle at debian.org>  Tue, 09 Mar 2010 10:54:01 +0100
-
-samba (2:3.5.0dfsg-1) experimental; urgency=low
-
-  * New upstream release. Not using "3.5.0~dfsg" as version number
-    because we used a "higher" version number in previous versions.
-
- -- Christian Perrier <bubulle at debian.org>  Tue, 02 Mar 2010 22:03:15 +0100
-
-samba (2:3.5.0~rc3~dfsg-1) experimental; urgency=low
-
-  * New upstream release candidate
-
- -- Christian Perrier <bubulle at debian.org>  Sat, 20 Feb 2010 08:36:57 +0100
-
-samba (2:3.5.0~rc2~dfsg-1) experimental; urgency=low
-
-  * New upstream pre-release
-  * Use new --with-codepagedir option. Consequently drop
-    codepages-location.patch
-  * Drop "Using Samba" from the samba-doc file list as it was
-    removed upstream.
-
- -- Christian Perrier <bubulle at debian.org>  Sun, 31 Jan 2010 11:53:48 +0100
-
-samba (2:3.5.0~rc1~dfsg-1) experimental; urgency=low
-
-  [ Christian Perrier ]
-  * New upstream pre-release
-
- -- Christian Perrier <bubulle at debian.org>  Fri, 15 Jan 2010 23:31:01 +0100
-
 samba (2:3.4.4~dfsg-1) unstable; urgency=low
 
   * New upstream version.

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/control	2011-04-15 16:57:51 UTC (rev 3735)
@@ -5,15 +5,15 @@
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>
 Build-Depends: debhelper (>= 6.0.7~), libpam0g-dev, libreadline-dev,
 	libcups2-dev | libcupsys2-dev,
-	libacl1-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+	libacl1-dev [linux-any],
 	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
 	libtalloc-dev (>= 2.0.1-1~bpo50+1),
-	libcap2-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	libkeyutils-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	ctdb (>= 1.0.103) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+	libcap-dev [linux-any],
+	libkeyutils-dev [linux-any],
+	ctdb (>= 1.0.103) [linux-any],
 	pkg-config
 Build-Conflicts: libfam-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://www.samba.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba
@@ -175,7 +175,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser, libpam-runtime (>= 1.0.1-6)
 Replaces: samba (<= 2.2.3-2)
 Description: Samba nameservice integration server
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -209,6 +209,16 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks:
+ libpam-smbpass (<< 2:3.4.1),
+ libsmbclient (<< 2:3.4.1),
+ samba-common (<< 2:3.4.1),
+ samba-tools (<< 2:3.4.1),
+ samba (<< 2:3.4.1),
+ smbclient (<< 2:3.4.1),
+ smbfs (<< 2:3.4.1),
+ swat (<< 2:3.4.1),
+ winbind (<< 2:3.4.1),
 Description: Samba winbind client library
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with

Modified: branches/samba/experimental/debian/mksmbpasswd.awk
===================================================================
--- branches/samba/experimental/debian/mksmbpasswd.awk	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/mksmbpasswd.awk	2011-04-15 16:57:51 UTC (rev 3735)
@@ -2,4 +2,5 @@
 BEGIN {FS=":"
 	printf("#\n# SMB password file.\n#\n")
 	}
-{ printf( "%s:%s:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:[U          ]:LCT-00000000:%s\n", $1, $3, $5) }
+{ if ($3 >= 1000) {  
+printf( "%s:%s:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:[U          ]:LCT-00000000:%s\n", $1, $3, $5) } }

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/patches/series	2011-04-15 16:57:51 UTC (rev 3735)
@@ -6,7 +6,6 @@
 smbclient-pager.patch
 undefined-symbols.patch
 VERSION.patch
-usershare.patch
 smbtar-bashism.patch
 no-unnecessary-cups.patch
 autoconf.patch

Deleted: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/patches/usershare.patch	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,38 +0,0 @@
-Description: Enable net usershares by default at build time
- Enable net usershares by default at build time, with a limit of
- 100, and update the corresponding documentation.
-Author: Mathias Gug <mathiaz at ubuntu.com>,
-Author: Steve Langasek <vorlon at debian.org>
-Bug-Debian: http://bugs.debian.org/443230
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
-Forwarded: not-needed
-
-Index: experimental/docs/manpages/net.8
-===================================================================
---- experimental.orig/docs/manpages/net.8
-+++ experimental/docs/manpages/net.8
-@@ -916,9 +916,9 @@
- Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\&. In this case the secret is used as the password for the user DN used to bind to the ldap server\&.
- .SS "USERSHARE"
- .PP
--Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user defined shares to be exported using the "net usershare" commands\&.
-+Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user-defined shares to be exported using the "net usershare" commands\&.
- .PP
--To set this up, first set up your smb\&.conf by adding to the [global] section: usershare path = /usr/local/samba/lib/usershares Next create the directory /usr/local/samba/lib/usershares, change the owner to root and set the group owner to the UNIX group who should have the ability to create usershares, for example a group called "serverops"\&. Set the permissions on /usr/local/samba/lib/usershares to 01770\&. (Owner and group all access, no access for others, plus the sticky bit, which means that a file in that directory can be renamed or deleted only by the owner of the file)\&. Finally, tell smbd how many usershares you will allow by adding to the [global] section of smb\&.conf a line such as : usershare max shares = 100\&. To allow 100 usershare definitions\&. Now, members of the UNIX group "serverops" can create user defined shares on demand using the commands below\&.
-+Members of the UNIX group "sambashare" can create user-defined shares on demand using the commands below\&.
- .PP
- The usershare commands are:
- .RS 4
-Index: experimental/source3/param/loadparm.c
-===================================================================
---- experimental.orig/source3/param/loadparm.c
-+++ experimental/source3/param/loadparm.c
-@@ -5189,7 +5189,7 @@
- 	string_set(&Globals.szUsersharePath, s);
- 	SAFE_FREE(s);
- 	string_set(&Globals.szUsershareTemplateShare, "");
--	Globals.iUsershareMaxShares = 0;
-+	Globals.iUsershareMaxShares = 100;
- 	/* By default disallow sharing of directories not owned by the sharer. */
- 	Globals.bUsershareOwnerOnly = True;
- 	/* By default disallow guest access to usershares. */

Modified: branches/samba/experimental/debian/po/ar.po
===================================================================
--- branches/samba/experimental/debian/po/ar.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ar.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -5,18 +5,22 @@
 #
 # younes <behloul.younes at gmail.com>, 2006.
 # Ossama M. Khayat <okhayat at yahoo.com>, 2006, 2007.
+# Ossama Khayat <okhayat at yahoo.com>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-14 11:37+0300\n"
-"Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
+"PO-Revision-Date: 2010-09-09 01:19+0300\n"
+"Last-Translator: Ossama Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: UTF-8\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: \n"
 
 #. Type: boolean
 #. Description
@@ -89,20 +93,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"من فضلك حدِّد مجموعة العمل التي تريد أن يظهر داخلها هذا الخادم عند استفساره من "
-"طرف الزبائن. لاحظ أن هذا المقياس يتحكم في إسم الحقل المستعمل مع الخيار "
-"security=domain setting."
+"رجاءً حدد مجموعة العمل لهذا النظام. يتحكم هذا الإعداد باسم مجموعة العمل التي "
+"سيظهر بها النظام عند استخدامه كخادم، وهي مجموعة العمل الافتراضية التي يجب "
+"استخدامها عند التصفح باستخدام الواجهات المختلفة، واسم النطاق المستخدم في "
+"الإعداد \"security=domain\"."
 
 #. Type: boolean
 #. Description
@@ -113,35 +113,28 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"زبائن Windows الجديدة كلّها تتصل مع خُدّام SMB مستعملة كلمات مرور مشفرة. إذا "
-"أردت استعمال كلمات مرور واضخة عليك بتغيير إعداد في قاعدة تسجيلات Windows."
+"تتصل جميع عملاء ويندوز الجديدة مع خوادم SMB/CIFS باستخدام كلمات مرور مشفرة. "
+"إذا أردت استخدام كلمات مرور غير مشفرة عليك بتغيير مُعطى في قاعدة تسجيلات "
+"ويندوز."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"يستحسن تمكين هذا الخيار. إذا فعلت ذلك، تأكد من وجود ملف /etc/samba/smbpasswd "
-"صالح و من وضعك كلمة مرور لكل مستخدم باستعمال اﻷمر smbpasswd."
+"يُستحسن بشدة تمكين هذا الخيار حيث أن دعم كلمات المرور الغير مشفرة لم يعد "
+"متوفراً في منتجات ميكروسوفت.\n"
+"إن فعلت ذلك، فتأكد من وجود ملف /etc/samba/smbpasswd صالح وأن تضع فيه كلمات "
+"المرور الخاصة بكل مستخدم باستخدام الأمر smbpasswd."
 
 #. Type: boolean
 #. Description
@@ -188,7 +181,7 @@
 #. Choices
 #: ../samba.templates:2001
 msgid "daemons"
-msgstr "رقباء"
+msgstr "daemons"
 
 #. Type: select
 #. Choices

Modified: branches/samba/experimental/debian/po/ast.po
===================================================================
--- branches/samba/experimental/debian/po/ast.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ast.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2009-01-15 09:17+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <softast-xeneral at lists.sourceforge.net>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/be.po
===================================================================
--- branches/samba/experimental/debian/po/be.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/be.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -12,6 +12,7 @@
 "PO-Revision-Date: 2009-02-19 04:33+0200\n"
 "Last-Translator: Pavel Piatruk <piatruk.p at gmail.com>\n"
 "Language-Team: Belarusian (Official spelling) <be at d-i.tanatos.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/bg.po
===================================================================
--- branches/samba/experimental/debian/po/bg.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/bg.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,18 +1,20 @@
 # translation of bg.po to Bulgarian
+# Damyan Ivanov <dmn at debian.org>, 2006, 2007, 2010.
 #
-# Damyan Ivanov <dam at modsoftsys.com>, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.23c-1_bg\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-12 22:58+0200\n"
-"Last-Translator: Damyan Ivanov <dam at modsoftsys.com>\n"
-"Language-Team: Bulgarian <dict at fsa-bg.org>\n"
+"PO-Revision-Date: 2010-10-25 10:44+0300\n"
+"Last-Translator: Damyan Ivanov <dmn at debian.org>\n"
+"Language-Team: Bulgarian <>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. Type: boolean
 #. Description
@@ -85,11 +87,6 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
@@ -97,8 +94,9 @@
 "name used with the \"security=domain\" setting."
 msgstr ""
 "Въведете името на работната група, от която ще бъде част компютъра. Този "
-"параметър контролира и името на домейна, което ще се използва при "
-"настройката „security=domain“."
+"параметър контролира името на компютъра, когато се използва като сървър, "
+"работната група по подразбиране при разглеждане на мрежата и името на "
+"домейна, което ще се използва при настройката „security=domain“."
 
 #. Type: boolean
 #. Description
@@ -109,34 +107,28 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
 "Всички съвременни версии на Windows използват шифрирани пароли за връзка със "
-"SMB-сървъри. Използването на пароли без шифриране е възможно само след "
-"промени в регистъра."
+"сървъри по протокол SMB/CIFS. Използването на пароли без шифриране е "
+"възможно само след промени в регистъра на Windows."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
-msgstr "Използването на шифрирани пароли е силно препоръчително."
+msgstr ""
+"Използването на шифрирани пароли е силно препоръчително, понеже продуктите "
+"Microsoft Windows вече не поддържат нешифрирани пароли. Проверете дали "
+"файлът /etc/samba/smbpasswd е правилен и използвайте програмата smbpasswd за "
+"задаване на паролите на потребителите."
 
 #. Type: boolean
 #. Description

Modified: branches/samba/experimental/debian/po/bn.po
===================================================================
--- branches/samba/experimental/debian/po/bn.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/bn.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2009-04-16 12:12+0600\n"
 "Last-Translator: Md. Rezwan Shahid <rezwan at ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n at googlegroups.com>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/bs.po
===================================================================
--- branches/samba/experimental/debian/po/bs.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/bs.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2006-11-01 22:14+0100\n"
 "Last-Translator: Safir Secerovic <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at linux.org.ba>\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/ca.po
===================================================================
--- branches/samba/experimental/debian/po/ca.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ca.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,15 +1,19 @@
-# samba (debconf) translation to Catalan.
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-# Aleix Badia i Bosch <abadia at ica.es> 2004
+# Samba (debconf) translation to Catalan.
+# Copyright © 2004, 2007. 2010 Software in the Public Interest, Inc.
+# This file is copyrighted under the same licence as the Samba debian packaging.
+# Aleix Badia i Bosch <abadia at ica.es> 2004.
+# Steve Langasek <vorlon at debian.org>, 2007.
+# Jordi Mallach <jordi at debian.org>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: samba_3.0.0beta2-1_templates\n"
+"Project-Id-Version: samba 2.3.5.6~dfsg1-1\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2006-08-13 15:16-0700\n"
+"PO-Revision-Date: 2010-10-23 13:13+0200\n"
 "Last-Translator: Jordi Mallach <jordi at debian.org>\n"
-"Language-Team: Debian L10n Catalan <debian-l10n-catalan at lists.debian.org>\n"
+"Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +23,7 @@
 #: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
-"Voleu modificar el smb.conf perquè utilitzi els paràmetres de configuració "
-"del WINS del DHCP?"
+"Voleu modificar el smb.conf perquè utilitzi els paràmetres del WINS del DHCP?"
 
 #. Type: boolean
 #. Description
@@ -34,7 +37,7 @@
 msgstr ""
 "Si el vostre ordinador obté la informació referent a la IP a través 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ó "
+"WINS («servidors de nom de NetBIOS») presents a la xarxa. Aquesta opció "
 "precisa d'una modificació del fitxer smb.conf per tal que els paràmetres de "
 "WINS obtinguts a través del DHCP s'obtinguin a través de la lectura de /etc/"
 "samba/dhcp.conf."
@@ -67,7 +70,7 @@
 msgstr ""
 "La resta de la configuració del Samba tracta amb qüestions que afecten els "
 "paràmetres del fitxer de configuració /etc/samba/smb.conf, que utilitzen els "
-"programes de Samba. La versió actual del smb.conf conté una línia 'include' "
+"programes de Samba. La versió actual del smb.conf conté una línia «include» "
 "o una opció que abarca múltiples línies que podria confondre a la "
 "configuració automàtica i precisar de la seva edició manual per poder-lo fer "
 "funcionar de nou."
@@ -92,20 +95,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Indiqueu en quin grup de treball voleu que aparegui el vostre servidor quan "
-"ho consultin els clients. Recordeu que aquest paràmetre també controla el "
-"nom de domini utilitzat pel paràmetre de configuració security=domain."
+"Indiqueu el grup de treball per a aquest sistema. Aquest paràmetre controla "
+"en quin grup de treball apareixerà el sistema quan s'empre com a servidor, "
+"el grup de treball per defecte quan es navega amb diferents interfícies, i "
+"el nom de domini emprat amb el paràmetre «security=domain»."
 
 #. Type: boolean
 #. Description
@@ -116,37 +115,29 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"Tots els clients de Windows recents es comuniquen amb els servidors de Samba "
-"utilitzant contrasenyes xifrades. Si voleu utilitzar contrasenyes amb text "
+"Tots els clients de Windows recents es comuniquen amb els servidors de SMB/"
+"CIFS emprant contrasenyes xifrades. Si voleu utilitzar contrasenyes amb text "
 "pla, haureu de modificar el vostre registre de Windows."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"És recomanable habilitar aquesta opció. Si ho feu, assegureu-vos de tenir un "
-"fitxer /etc/samba/smbpasswd vàlid i que hi especifiqueu la contrasenya de "
-"cada usuari utilitzant l'ordre smbpasswd."
+"És molt recomanable habilitar aquesta opció, perquè la implementació per a "
+"contrasenyes en text clar ja no és disponible als productes de Microsoft "
+"Windows. Si ho feu, assegureu-vos de tenir un fitxer /etc/samba/smbpasswd "
+"vàlid i que hi especifiqueu la contrasenya de cada usuari utilitzant l'ordre "
+"smbpasswd."
 
 #. Type: boolean
 #. Description
@@ -232,8 +223,8 @@
 #~ msgstr ""
 #~ "Des de la versió 3.0.23, Samba ja no permet l'encadenament de més d'un "
 #~ "passdb al paràmetre «passdb backend». Sembla que el vostre smb.conf conté "
-#~ "un paràmetre «passdb backend» que consta d'una llista de rerefons. La nova "
-#~ "versió de Samba no funcionarà fins que ho corregiu."
+#~ "un paràmetre «passdb backend» que consta d'una llista de rerefons. La "
+#~ "nova versió de Samba no funcionarà fins que ho corregiu."
 
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr "Voleu moure /etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"

Modified: branches/samba/experimental/debian/po/cs.po
===================================================================
--- branches/samba/experimental/debian/po/cs.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/cs.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2009-06-27 10:58+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/da.po
===================================================================
--- branches/samba/experimental/debian/po/da.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/da.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,26 +1,27 @@
-# translation of da.po to Danish
-# translation of samba Debian debconf template to Danish
+# Danish translation samba.
+# Copyright (C) 2010 samba & nedenstående oversættere.
+# This file is distributed under the same license as the samba package.
+# Claus Hindsgaul <claus.hindsgaul at gmail.com>, 2004, 2006, 2007.
+# Joe Hansen (joedalton2 at yahoo.dk), 2010.
 #
-# Claus Hindsgaul <claus_h at image.dk>, 2004.
-# Claus Hindsgaul <claus.hindsgaul at gmail.com>, 2006, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: da\n"
+"Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-05-30 22:20+0200\n"
-"Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
-"Language-Team: Danish\n"
+"PO-Revision-Date: 2010-08-12 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
-msgstr "Ret smb.conf, så den benytter WINS-indstillinger fra DHCP?"
+msgstr "Ret smb.conf, så den benytter WINS-indstillinger fra DHCP?"
 
 #. Type: boolean
 #. Description
@@ -32,10 +33,10 @@
 "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/"
+"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
@@ -44,14 +45,14 @@
 msgid ""
 "The dhcp3-client package must be installed to take advantage of this feature."
 msgstr ""
-"Pakken dhcp3-client skal være installeret, for at kunne udnytte denne "
+"Pakken dhcp3-client skal være installeret, for at kunne udnytte denne "
 "funktion."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
-msgstr "Sæt smb.conf op automatisk?"
+msgstr "Sæt smb.conf op automatisk?"
 
 #. Type: boolean
 #. Description
@@ -64,12 +65,12 @@
 "automated configuration process 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, der vedrører "
-"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 "
+"Resten af Samba-opsætningen drejer sig om spørgsmål, der vedrører "
+"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 den automatiske opsætning, og kræver at du redigerer din smb.conf "
-"selv for at få den til at fungere igen."
+"forvirre den automatiske opsætning, og kræver at du redigerer din smb.conf "
+"selv for at få den til at fungere igen."
 
 #. Type: boolean
 #. Description
@@ -79,74 +80,61 @@
 "changes yourself, and will not be able to take advantage of periodic "
 "configuration enhancements."
 msgstr ""
-"Hvis du ikke vælger denne indstilling, må du selv håndtere ændringer i "
-"opsætningen, og vil ikke kunne drage nytte af de løbende forbedringer i "
-"opsætningen."
+"Hvis du ikke vælger denne indstilling, må du selv håndtere ændringer i "
+"opsætningen, og vil ikke kunne drage nytte af de løbende forbedringer i "
+"opsætningen."
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
-msgstr "Arbejdsgruppe/domæne-navn:"
+msgstr "Arbejdsgruppe/domænenavn:"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Angiv den arbejdsgruppe, din server skal optræde i, når den bliver spurgt af "
-"klienter. Bemærk at dette også styrer det domænenavn, der bruges ved "
-"indstillingen \"security=domain\"."
+"Angiv venligst arbejdsgruppen for dette system. Denne indstilling kontroller "
+"hvilken arbejdsgruppe systemet vil fremgå i, når den bruges som en server, "
+"standardarbejdsgruppen der bruges når der browses med forskellige "
+"grænseflader, og domænenavnet brugt med indstillingen »security=domain«."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
 msgid "Use password encryption?"
-msgstr "Kryptér adgangskoder?"
+msgstr "Kryptér adgangskoder?"
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"Alle nyere Windows-klienter kommunikerer med SMB-servere ved hjælp af "
+"Alle nyere Windowsklienter kommunikerer med SMB/CIFS-servere ved hjælp af "
 "krypterede adgangskoder. Hvis du vil bruge adgangkoder i klar tekst, er du "
-"nødt til at ændre en indstilling i Windows's registreringsdatabase."
+"nødt til at ændre en indstilling i Windows' registreringsdatabase."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"Det anbefales at du vælger denne indstilling. Hvis du gør, så sørg for at du "
-"har en gyldig /etc/samba/smbpasswd-fil og at du her angiver adgangskoder for "
-"hver bruger med kommandoen smbpasswd."
+"Aktivering af denne indstilling anbefales, da understøttelse af klar tekst "
+"ikke længere vedligeholdes i Microsoft Windows' produkter. Hvis du "
+"aktiverer, så sørg for at du har en gyldig /etc/samba/smbpasswd-fil, og at "
+"du her angiver adgangskoder for hver bruger med kommandoen smbpasswd."
 
 #. Type: boolean
 #. Description
@@ -164,11 +152,11 @@
 "automatically, but the passwords must be added manually by running smbpasswd "
 "and be kept up-to-date in the future."
 msgstr ""
-"For at være kompatibel med standardindstillingerne i de fleste udgaver af "
-"Windows, skal Samba sættes op til at benytte krypterede adgangskoder. Dette "
-"kræver, at brugernes adgangskoder gemmes i en anden fil end /etc/passwd. "
-"Denne fil kan oprettes automatisk, men adgangskoderne skal tilføjes manuelt "
-"ved at køre smbpasswd, og skal fremover holdes opdateret."
+"For at være kompatibel med standardindstillingerne i de fleste udgaver af "
+"Windows, skal Samba sættes op til at benytte krypterede adgangskoder. Dette "
+"kræver, at brugernes adgangskoder gemmes i en anden fil end /etc/passwd. "
+"Denne fil kan oprettes automatisk, men adgangskoderne skal tilføjes manuelt "
+"ved at køre smbpasswd, og skal fremover holdes opdateret."
 
 #. Type: boolean
 #. Description
@@ -177,7 +165,7 @@
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"Hvis du ikke opretter den, er du nødt til at sætte samba (og sikkert også "
+"Hvis du ikke opretter den, er du nødt til at sætte samba (og sikkert også "
 "dine klientmaskiner) op til at benytte adgangskoder i klar tekst."
 
 #. Type: boolean
@@ -194,7 +182,7 @@
 #. Choices
 #: ../samba.templates:2001
 msgid "daemons"
-msgstr "dæmoner"
+msgstr "dæmoner"
 
 #. Type: select
 #. Choices
@@ -206,7 +194,7 @@
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
-msgstr "Hvordan skal Samba køres?"
+msgstr "Hvordan skal Samba køres?"
 
 #. Type: select
 #. Description
@@ -215,42 +203,5 @@
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
-"Samba-dæmonen smbd kan køre som en almindelig dæmon eller fra inetd. Det "
-"anbefales at køre den som dæmon."
-
-#~ msgid "Chaining passdb backends is not supported"
-#~ msgstr "Sammenkædning af passdb-bagender understøttes ikke"
-
-#~ msgid ""
-#~ "Beginning with version 3.0.23, samba no longer supports chaining multiple "
-#~ "backends in the \"passdb backend\" parameter.  It appears that your smb."
-#~ "conf file contains a passdb backend parameter consisting of a list of "
-#~ "backends.  The new version of samba will not work until you correct this."
-#~ msgstr ""
-#~ "Fra og med version 3.0.23 understøtter samba ikke længere sammenkædning "
-#~ "af flere bagender i parameteren \"passdb backend\". Det lader til, at din "
-#~ "smb.conf-fil indeholder en passdb-bagendeparemeter, der består af en "
-#~ "liste med bagender. Den nye version af samba vil ikke fungere, før du har "
-#~ "rettet dette."
-
-#~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
-#~ msgstr "Flyt /etc/samba/smbpasswd til /var/lib/samba/passdb.tdb?"
-
-#~ msgid ""
-#~ "Samba 3.0 introduced a more complete SAM database interface which "
-#~ "supersedes the /etc/samba/smbpasswd file."
-#~ msgstr ""
-#~ "Samba 3.0 introducerede en mere komplet SAM-databasegrænseflade, som "
-#~ "efterfølger til filen /etc/samba/smbpasswd."
-
-#~ msgid ""
-#~ "Please confirm whether you would like the existing smbpasswd file to be "
-#~ "automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
-#~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
-#~ msgstr ""
-#~ "Bekræft om du ønsker at migrere den eksisterende smbpasswd-fil til /var/"
-#~ "lib/samba/passdb.tdb automatisk. Vælg ikke denne indstilling, hvis du i "
-#~ "stedet planlægger at benytte en anden pdb-håndtering (f.eks. LDAP)."
-
-#~ msgid "daemons, inetd"
-#~ msgstr "dæmoner, inetd"
+"Samba-dæmonen smbd kan køre som en almindelig dæmon eller fra inetd. Det "
+"anbefales at køre den som dæmon."

Modified: branches/samba/experimental/debian/po/de.po
===================================================================
--- branches/samba/experimental/debian/po/de.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/de.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -12,6 +12,7 @@
 "PO-Revision-Date: 2009-07-09 22:59+0200\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/dz.po
===================================================================
--- branches/samba/experimental/debian/po/dz.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/dz.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2007-03-13 02:22+0530\n"
 "Last-Translator: translator <pemai_jurmey at hotmail.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/el.po
===================================================================
--- branches/samba/experimental/debian/po/el.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/el.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,18 +11,21 @@
 #    Developers do not need to manually edit POT or PO files.
 #
 # QUAD-nrg.net <yodesy at quad-nrg.net>, 2006.
+# Konstantinos Margaritis <markos at codex.gr>, 2010.
+# Konstantinos Margaritis <markos at debian.org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_el\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-16 11:29+0200\n"
-"Last-Translator: galaxico\n"
-"Language-Team:  <en at li.org>\n"
+"PO-Revision-Date: 2010-11-23 15:27+0200\n"
+"Last-Translator: Konstantinos Margaritis <markos at debian.org>\n"
+"Language-Team: American English <debian-l10n-greek at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: boolean
@@ -105,21 +108,17 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Παρακαλώ προσδιορίστε το όνομα της ομάδας εργασίας (workgroup) στην οποία "
-"θέλετε να εμφανίζει αυτός ο εξυπηρετητής ότι ανήκει όταν ερωτάται από τους "
-"πελάτες. Σημειώστε ότι αυτή η παράμετρος ελέγχει επίσης το όνομα του τομέα "
-"που χρησιμοποιείται στην ρύθμιση security=domain."
+"Παρακαλώ προσδιορίστε το όνομα της ομάδας εργασίας (workgroup) του "
+"συστήματος.  Η παράμετρος αυτή ελέγχει την ομάδα εργασίας με την οποία θα "
+"εμφανίζεται το σύστημα ως εξυπηρετητής, την προκαθορισμένη ομάδα εργασίας "
+"κατά την περιήγηση με διάφορα προγράμματα, και το όνομα του τομέα που "
+"χρησιμοποιείται στην ρύθμιση security=domain."
 
 #. Type: boolean
 #. Description
@@ -130,39 +129,30 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
 "Όλες οι πρόσφατες εκδόσεις των πελατών Windows επικοινωνούν με τους "
-"εξυπηρετητές SMB χρησιμοποιώντας κρυπτογραφημένους κωδικούς πρόσβασης. Αν "
-"θέλετε να χρησιμοποιήσετε μη κρυπτογραφημένους κωδικούς θα πρέπει να "
+"εξυπηρετητές SMB/CIFS χρησιμοποιώντας κρυπτογραφημένους κωδικούς πρόσβασης. "
+"Αν θέλετε να χρησιμοποιήσετε μη κρυπτογραφημένους κωδικούς θα πρέπει να "
 "αλλάξετε μια παράμετρο στο registry των Windows."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"Η ενεργοποίηση αυτής της επιλογής συνιστάται έντονα. Αν την κάνετε, "
-"βεβαιωθείτε ότι έχετε ένα έγκυρο αρχείο /etc/samba/smbpasswd και ότι ορίζετε "
-"κωδικούς πρόσβασης σ' αυτό για κάθε χρήστη που χρησιμοποιεί την εντολή "
-"smbpasswd."
+"Η ενεργοποίηση αυτής της επιλογής συνιστάται έντονα καθώς πλέον δεν υπάρχει "
+"υποστήριξη για μη κρυπτογραφημένους κωδικούς σε προϊόντα Microsoft Windows. "
+"Αν την επιλέξετε, βεβαιωθείτε ότι έχετε ένα έγκυρο αρχείο /etc/samba/"
+"smbpasswd και ότι ορίζετε κωδικούς πρόσβασης σ' αυτό για κάθε χρήστη με τη "
+"χρήση της εντολήςsmbpasswd."
 
 #. Type: boolean
 #. Description

Modified: branches/samba/experimental/debian/po/eo.po
===================================================================
--- branches/samba/experimental/debian/po/eo.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/eo.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2009-03-11 06:04-0300\n"
 "Last-Translator: Felipe Castro <fefcas at gmail.com>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto at lists.debian.org>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/es.po
===================================================================
--- branches/samba/experimental/debian/po/es.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/es.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,6 +1,6 @@
 # samba translation to spanish
 # Copyright (C) 2003-2007 Steve Langasek <vorlon at debian.org>
-# Copyright (C) 2006 Software in the Public Interest, SPI Inc.
+# Copyright (C) 2006,2010 Software in the Public Interest, SPI Inc.
 # This file is distributed under the same license as the samba package.
 #
 #  Changes:
@@ -12,6 +12,8 @@
 #
 #  - Translation of new templates
 #        Steve Langasek, 2007
+#  - Update
+# 	 Omar Campagne <ocampagne at gmail.com>, 2010
 #
 #   Traductores, si no conoce el formato PO, merece la pena leer la 
 #   documentación de gettext, especialmente las secciones dedicadas a este
@@ -36,12 +38,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Samba for Debian 3.0.23c-1\n"
+"Project-Id-Version: Samba for Debian 3.4.7\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2006-10-08 13:43+0200\n"
-"Last-Translator: Steve Langasek <vorlon at debian.org>\n"
+"PO-Revision-Date: 2010-04-24 12:27+0200\n"
+"Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,7 +54,8 @@
 #: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
-"¿Modificar smb.conf para usar la configuración WINS que proviene de DHCP?"
+"¿Desea modificar «smb.conf» para usar la configuración WINS que proviene de "
+"DHCP?"
 
 #. Type: boolean
 #. Description
@@ -64,10 +68,10 @@
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
 "Si su sistema recibe la dirección IP desde un servidor DHCP en la red, el "
-"servidor DHCP también puede proveerle informaciones sobre los servidores de "
-"WINS que haya en la red.  Esto requiere un cambio en el fichero smb.conf "
-"para que la configuración de WINS proveniente de DHCP se lea automaticamente "
-"de /etc/samba/dhcp.conf."
+"servidor DHCP también puede proveerle información sobre los servidores de "
+"WINS que haya en la red. Esto requiere un cambio en el fichero «smb.conf» "
+"para que la configuración de WINS proveniente de DHCP se lea automáticamente "
+"de «/etc/samba/dhcp.conf»."
 
 #. Type: boolean
 #. Description
@@ -81,7 +85,7 @@
 #. Description
 #: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
-msgstr "¿Configurar smb.conf automaticamente?"
+msgstr "¿Desea configurar «smb.conf» automáticamente?"
 
 #. Type: boolean
 #. Description
@@ -95,11 +99,11 @@
 "hand to get it working again."
 msgstr ""
 "El resto de la configuración de Samba trata sobre cuestiones que afectan al "
-"contenido de /etc/samba/smb.conf, que es el fichero utilizado para "
-"configurar los programas de Samba (nmbd y smbd). Su smb.conf actual contiene "
-"una línea «include» o una opción que atraviesa más de una línea, así que el "
-"proceso de configuración automática puede dejarlo con un smb.conf "
-"descompuesto, requiriendo que lo arregle a mano."
+"contenido de «/etc/samba/smb.conf», el fichero utilizado para configurar los "
+"programas de Samba (nmbd y smbd). Su «smb.conf» actual contiene una línea "
+"«include» o una opción que atraviesa más de una línea, así que el proceso de "
+"configuración automática puede dejarlo con un «smb.conf» no válido, "
+"requiriendo que lo arregle a mano."
 
 #. Type: boolean
 #. Description
@@ -109,8 +113,8 @@
 "changes yourself, and will not be able to take advantage of periodic "
 "configuration enhancements."
 msgstr ""
-"Si no escoge esta opción, tendrá que gestionar a mano cualquier cambio a la "
-"configuración de Samba y no disfrutará de las mejoras periódicos que se "
+"Si no escoge esta opción, tendrá que gestionar a mano cualquier cambio en la "
+"configuración de Samba, y no disfrutará de las mejoras periódicas que se "
 "realicen a la configuración."
 
 #. Type: string
@@ -122,68 +126,56 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Indique el grupo de trabajo en el cual quiere que su servidor aparezca "
-"cuando se lo pregunten los clientes de la red. Este parámetro también "
-"controla el nombre de dominio que se usa con la configuración "
-"«security=domain»."
+"Indique el grupo de trabajo de este equipo. Este parámetro controla el grupo "
+"de trabajo en el que aparecerá el equipo si se usa como un servidor, el "
+"grupo de trabajo a usar cuando explore la red con los distintos interfaces, "
+"y el nombre de dominio usado con el parámetro «security=domain»."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
 msgid "Use password encryption?"
-msgstr "¿Utilizar contraseñas cifradas?"
+msgstr "¿Desea utilizar contraseñas cifradas?"
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"Todos los clientes Windows actuales se comunican con los servidores SMB "
-"utilizando contraseñas cifradas. Si quiere usar contraseñas en claro, tendrá "
-"que cambiar un parámetro en el registro de sus sistemas Windows."
+"Todos los clientes Windows recientes se comunican con los servidores SMB/"
+"CIFS utilizando contraseñas cifradas. Si quiere usar contraseñas en texto "
+"claro, tendrá que cambiar un parámetro en el registro de sus sistemas "
+"Windows."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"Es muy recomendable habilitar esta opción. Compruebe que tiene un fichero /"
-"etc/samba/smbpasswd válido y que configura las contraseñas para cada usuario "
-"con el programa smbpasswd si elige hacerlo."
+"Se recomienda habilitar esta opción, ya que los productos de Microsoft yano "
+"son compatibles con las contraseñas en texto claro. Si la activa, asegúrese "
+"de que tiene un fichero «/etc/samba/smbpasswd» válido, donde defina las "
+"contraseñas para cada usuario usando la orden «smbpasswd»."
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "¿Crear la base de dados de contraseñas /var/lib/samba/passdb.tdb?"
+msgstr ""
+"¿Desea crear la base de datos de contraseñas «/var/lib/samba/passdb.tdb»?"
 
 #. Type: boolean
 #. Description
@@ -196,11 +188,11 @@
 "and be kept up-to-date in the future."
 msgstr ""
 "Hay que configurar Samba para que use contraseñas cifradas para mantener la "
-"compatibilidad con el comportamiento por omisión de la mayoria de los "
-"sistemas Windows. Para hacer esto es necesario crear un fichero, distinto "
-"del /etc/passwd, donde se guarden las contraseñas de los usuarios. El "
-"fichero se puede crear automaticamente, aunque es necesario añadir las "
-"contraseñas manualmente mediante el programa «smbpasswd» y mantenerlas al día."
+"compatibilidad con el comportamiento por omisión de la mayoría de los "
+"sistemas Windows. Para hacer esto es necesario crear un fichero, distinto de "
+"«/etc/passwd», donde se guarden las contraseñas de los usuarios. El fichero "
+"se puede crear automáticamente, aunque es necesario añadir las contraseñas "
+"manualmente mediante el programa «smbpasswd» y mantenerlas al día."
 
 #. Type: boolean
 #. Description
@@ -210,7 +202,7 @@
 "your client machines) to use plaintext passwords."
 msgstr ""
 "Es imprescindible que configure Samba (y probablemente también los sistemas "
-"cliente) para que use contraseñas en claro si no crea este fichero."
+"cliente) para que use contraseñas en texto claro si no crea este fichero."
 
 #. Type: boolean
 #. Description
@@ -219,8 +211,8 @@
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
 msgstr ""
-"Si desea más información consulte /usr/share/doc/samba-doc/htmldocs/"
-"ENCRYPTION.html, disponible en el paquete samba-doc."
+"Si desea más información consulte «/usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html», disponible en el paquete samba-doc."
 
 #. Type: select
 #. Choices
@@ -247,44 +239,6 @@
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
-"El servicio Samba smbd puede ejecutarse como un demonio normal independiente "
-"o lanzarse desde el demonio inetd. Se recomienda que se ejecute como demonio "
-"independiente."
-
-#~ msgid "Chaining passdb backends is not supported"
-#~ msgstr "El encadenamiento de motores «passdb» ya no está soportado"
-
-#~ msgid ""
-#~ "Beginning with version 3.0.23, samba no longer supports chaining multiple "
-#~ "backends in the \"passdb backend\" parameter.  It appears that your smb."
-#~ "conf file contains a passdb backend parameter consisting of a list of "
-#~ "backends.  The new version of samba will not work until you correct this."
-#~ msgstr ""
-#~ "A partir de la versión 3.0.23 de samba, ya no se soporta el "
-#~ "encadenamiento de más de un motor en el parámetro «passdb backend».  "
-#~ "Parece que en su smb.conf tiene un parámetro «passdb backend» que consta "
-#~ "de una lista de motores.  La nueva versión de samba no funcionará hasta "
-#~ "que lo corrija."
-
-#~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
-#~ msgstr ""
-#~ "¿Convertir el fichero /etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
-
-#~ msgid ""
-#~ "Samba 3.0 introduced a more complete SAM database interface which "
-#~ "supersedes the /etc/samba/smbpasswd file."
-#~ msgstr ""
-#~ "La versión 3.0 de Samba introduce un base de dados «SAM» más completa que "
-#~ "sustituye al fichero /etc/samba/smbpasswd."
-
-#~ msgid ""
-#~ "Please confirm whether you would like the existing smbpasswd file to be "
-#~ "automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
-#~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
-#~ msgstr ""
-#~ "Confirme si quiere que el fichero smbpasswd existente se migre de forma "
-#~ "automática a /var/lib/samba/passdb.tdb.  No escoja esta opción si "
-#~ "pretende usar otro motor para pdb (p.ej. LDAP)."
-
-#~ msgid "daemons, inetd"
-#~ msgstr "demonios, inetd"
+"El demonio de Samba «smbd» puede ejecutarse como un demonio normal "
+"independiente o iniciarse desde el demonio «inetd». Se recomienda que se "
+"ejecute como demonio independiente."

Modified: branches/samba/experimental/debian/po/et.po
===================================================================
--- branches/samba/experimental/debian/po/et.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/et.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2007-03-13 10:26+0300\n"
 "Last-Translator: Siim Põder <siim at p6drad-teel.net>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/eu.po
===================================================================
--- branches/samba/experimental/debian/po/eu.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/eu.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -21,6 +21,7 @@
 "PO-Revision-Date: 2007-04-07 23:18+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/fi.po
===================================================================
--- branches/samba/experimental/debian/po/fi.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/fi.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2007-03-13 18:35+0200\n"
 "Last-Translator: Tapio Lehtonen <tale at debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/fr.po
===================================================================
--- branches/samba/experimental/debian/po/fr.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/fr.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2008-12-29 12:32+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/gl.po
===================================================================
--- branches/samba/experimental/debian/po/gl.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/gl.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,3 +1,4 @@
+# translation of samba_2:3.4.8~dfsg-2_gl.po to Galician
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -11,17 +12,20 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
+# Jorge Barreiro <yortx.barry at gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: samba\n"
+"Project-Id-Version: samba_2:3.4.8~dfsg-2_gl\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-12 20:24+0100\n"
-"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
-"Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
+"PO-Revision-Date: 2010-08-13 02:10+0200\n"
+"Last-Translator: Jorge Barreiro <yortx.barry at gmail.com>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 #. Description
@@ -99,20 +103,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Indique o grupo de traballo no que quere que apareza este servidor cando lle "
-"pregunten os clientes. Teña en conta que este parámetro tamén controla o "
-"nome de dominio que se emprega coa configuración security=domain."
+"Indique o grupo de traballo para este sistema. Este parámetro controla o "
+"grupo de traballo no que este sistema aparecerá cando funcione como "
+"servidor, o grupo de traballo que se usará ó navegar usando varios clientes, "
+"e o nome de dominio que se emprega coa configuración security=domain."
 
 #. Type: boolean
 #. Description
@@ -123,37 +123,28 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"Todos os clientes Windows recentes comunícanse cos servidores SMB empregando "
-"contrasinais cifrados. Se quere empregar contrasinais de texto claro ha ter "
-"que cambiar un parámetro no rexistro de Windows."
+"Todos os clientes Windows recentes comunícanse cos servidores SMB/CIFS "
+"empregando contrasinais cifrados. Se quere empregar contrasinais de texto "
+"claro ha ter que cambiar un parámetro no rexistro de Windows."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"Recoméndase activar esta opción. Se o fai, asegúrese de ter un ficheiro /etc/"
-"samba/smbpasswd válido e de establecer nel os contrasinais de cada usuario "
-"coa orde smbpasswd."
+"Recoméndase activar esta opción xa que os contrasinais en texto claro xa non "
+"son mantidos nos productos Microsoft. Se o fai, asegúrese de ter un "
+"ficheiro  /etc/samba/smbpasswd válido e de establecer nel os contrasinais de "
+"cada usuario coa orde smbpasswd."
 
 #. Type: boolean
 #. Description

Modified: branches/samba/experimental/debian/po/gu.po
===================================================================
--- branches/samba/experimental/debian/po/gu.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/gu.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2007-06-08 20:22+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry at gmail.com>\n"
 "Language-Team: Gujarati <team at utkarsh.org>\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/he.po
===================================================================
--- branches/samba/experimental/debian/po/he.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/he.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,21 +1,24 @@
-# translation of samba.po to Hebrew
+# translation of samba_2_3_5_6_dfsg_2_debconf_he.po to Hebrew
 # translation of PACKAGE.
 # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Katriel Traum <katriel.traum at gmail.com>, 2007
+# Katriel Traum <katriel.traum at gmail.com>, 2007.
+# Omer Zak <w1 at zak.co.il>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: samba\n"
+"Project-Id-Version: samba_2_3_5_6_dfsg_2_debconf_he\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-09-25 21:03+0200\n"
-"Last-Translator: Katriel Traum <katriel.traum at gmail.com>\n"
+"PO-Revision-Date: 2010-10-26 18:04+0200\n"
+"Last-Translator: Omer Zak <w1 at zak.co.il>\n"
 "Language-Team: Hebrew <debian-hebrew-common at lists.alioth.debian.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: boolean
 #. Description
@@ -67,7 +70,7 @@
 "הרקע של Samba (שהם smbd ו-nmbd). הקובץ smb.conf הנוכחי שלך כולל שורת "
 "'include' או פרמטר אשר מתפרש על כמה שורות. פרמטרים אלו עשויים לבלבל את תהליך "
 "ההגדרה האוטומטי, ויצריכו עריכה ידנית של הקובץ smb.conf על מנת לתקן את הבעיות "
-"ולאפשר ל-Samba לעובד."
+"ולאפשר ל-Samba לעבוד."
 
 #. Type: boolean
 #. Description
@@ -84,25 +87,21 @@
 #. Description
 #: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
-msgstr "מהו שם קבוצת העבודה/מתחם (Workgroup/Domain)?"
+msgstr "שם קבוצת העבודה/מתחם (Workgroup/Domain):"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"אנא ציין את שם קבוצת העבודה (Workgroup) ששרת זה יציג ללקוחות אשר יתחברו "
-"אליו. שים לב כי שם קבוצת העבודה גם קובע את שם המתחם (Domain) בעת שימוש "
-"באפשרות security=domain."
+"אנא ציין את שם קבוצת העבודה (Workgroup) עבור מערכת זו. הגדרה זו קובעת באיזו "
+"קבוצת עבודה תימצא מערכת זו כשישתמשו בה בתור שרת, מה תהיה ברירת המחדל לקבוצת "
+"העבודה שישתמשו בה בזמן דפדוף באמצעות ממשקים שונים, ושם המתחם (Domain) בעת "
+"שימוש באפשרות security=domain."
 
 #. Type: boolean
 #. Description
@@ -113,37 +112,28 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"כל הלקוחות החדשים מסוג-Windows מתקשרים עם שרתי SMB בעזרת סיסמאות מוצפנות. אם "
-"תרצה להשתמש בסיסמאות שאינן מוצפנות, יהיה עליך לבצע שינויים ב-Registry של "
-"לקוח ה-Windows."
+"כל הלקוחות החדשים מסוג-Windows מתקשרים עם שרתי SMB/CIFS באמצעות סיסמאות "
+"מוצפנות. אם ברצונך להשתמש בסיסמאות שאינן מוצפנות, יהיה עליך לשנות פרמטר ב-"
+"Registry של מערכת ה-Windows שלך."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"הפעלת אופציה זו מומלצת מאוד. במידה ותופעל, וודא כי קיים הקובץ /etc/samba/"
-"smbpasswd, וכי הוא תקין. בנוסף, יש לדאוג שהקובץ יכיל סיסמה בעבור כל משתמש "
-"בעזרת שימוש בפקודה smbpasswd."
+"הפעלת אופציה זו מומלצת מאוד מכיוון שמיקרוסופט יותר אינה מתחזקת את התמיכה "
+"בסיסמאות לא מוצפנות במוצרי Windows שלה. אם הינך מפעיל אופציה זו, וודא כי "
+"קיים הקובץ /etc/samba/smbpasswd, וכי הוא תקין. בנוסף, יש לדאוג שהקובץ יכיל "
+"סיסמה בעבור כל משתמש בעזרת שימוש בפקודה smbpasswd."
 
 #. Type: boolean
 #. Description
@@ -175,8 +165,8 @@
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"אם לא תצור את זה, יהיה עליך לשנות את התצורה של שרת ה-Samba (וסביר להניח שגם "
-"של כל לקוחותיו) להשתמש בסיסמאות שאינן מוצפנות. "
+"אם לא תיצור קובץ זה, יהיה עליך לשנות את התצורה של שרת ה-Samba (וסביר להניח "
+"שגם של כל לקוחותיו) כדי להשתמש בסיסמאות שאינן מוצפנות."
 
 #. Type: boolean
 #. Description
@@ -185,8 +175,8 @@
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
 msgstr ""
-"ראה עוד מידע בקובץ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
-"pwencrypt.html מתוך החבילה samba-doc."
+"ראה מידע נוסף בקובץ /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-"
+"Guide/pwencrypt.html מתוך החבילה samba-doc."
 
 #. Type: select
 #. Choices
@@ -214,36 +204,4 @@
 "daemon is the recommended approach."
 msgstr ""
 "תהליך הרקע של Samba שנקרא smbd יכול לרוץ כתהליך רקע רגיל או דרך inetd. ריצה "
-"כתהליך רקע היא השיטה המומלצת."
-
-#~ msgid "Chaining passdb backends is not supported"
-#~ msgstr "שינוי סוג מסד הסיסמאות (passdb backends) אינו ניתמך"
-
-#~ msgid ""
-#~ "Beginning with version 3.0.23, samba no longer supports chaining multiple "
-#~ "backends in the \"passdb backend\" parameter.  It appears that your smb."
-#~ "conf file contains a passdb backend parameter consisting of a list of "
-#~ "backends.  The new version of samba will not work until you correct this."
-#~ msgstr ""
-#~ "החל מגרסה 3.0.23, שרת Samba אינו מאפשר שרשור של כמה מסדי סיסמאות בפרמטר "
-#~ "\"passdb-backend\". נראה כי הקובץ smb.conf שלך כולל פרמטר אשר מכיל רשימה "
-#~ "של כמה מסדי סיסמאות. הגירסה החדשה של samba לא תעבוד עד אשר בעיה זו תתוקן."
-
-#~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
-#~ msgstr "האם להזיז את /etc/samba/smbpasswd ל- /var/lib/samba/passdb.tdb?"
-
-#~ msgid ""
-#~ "Samba 3.0 introduced a more complete SAM database interface which "
-#~ "supersedes the /etc/samba/smbpasswd file."
-#~ msgstr ""
-#~ "פרויקט Samba הציג בגרסה 3.0 מנשק חדש למסד המשתמשים והסיסמאות (SAM) אשר בא "
-#~ "במקום הקובץ /etc/samba/smbpasswd."
-
-#~ msgid ""
-#~ "Please confirm whether you would like the existing smbpasswd file to be "
-#~ "automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
-#~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
-#~ msgstr ""
-#~ "אנא אשר כי ברצונך להמיר בצורה אוטומטית, את הקובץ smbpasswd הקיים לקובץ  /"
-#~ "var/lib/samba/passdb.tdb. אל תבחר באופציה זו אם בכוונתך להשתמש במסד "
-#~ "סיסמאות (pdb) אחר (למשל LDAP) במקום."
+"כתהליך רקע רגיל היא השיטה המומלצת."

Modified: branches/samba/experimental/debian/po/hu.po
===================================================================
--- branches/samba/experimental/debian/po/hu.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/hu.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2007-03-13 09:20+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <hu at li.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/id.po
===================================================================
--- branches/samba/experimental/debian/po/id.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/id.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-03-08 18:24+0700\n"
 "Last-Translator: Arief S Fitrianto <arief at gurame.fisika.ui.ac.id>\n"
 "Language-Team: Bahasa Indonesia <debian-l10n-id at gurame.fisika.ui.ac.id>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/it.po
===================================================================
--- branches/samba/experimental/debian/po/it.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/it.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2009-05-18 21:47+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/ja.po
===================================================================
--- branches/samba/experimental/debian/po/ja.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ja.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -16,9 +16,10 @@
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-13 16:39+0900\n"
+"PO-Revision-Date: 2010-10-25 22:28+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -97,20 +98,16 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"クライアントから照会された際にこのサーバが現れることになるワークグループを指"
-"定してください。このパラメータは security=domain 設定が使われたときのドメイン"
-"名も制御することに注意してください。"
+"このシステムのワークグループを指定してください。この設定は、システムがサーバ"
+"として使われるときにどのワークグループとして現れるか、いくつかのフロントエン"
+"ドでブラウジングされたときに使われるデフォルトのワークグループ、そして"
+"\"security=domain\" 設定が使われたときのドメイン名を制御します。"
 
 #. Type: boolean
 #. Description
@@ -121,37 +118,28 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"ほとんどの Windows クライアントは暗号化されたパスワードを使って SMB サーバと"
-"やり取りします。クリアテキストパスワードを使いたい場合は、あなたの Windows の"
-"レジストリにあるパラメータを変更する必要があります。"
+"ほとんどの Windows クライアントは暗号化されたパスワードを使って SMB/CIFS サー"
+"バとやり取りします。クリアテキストパスワードを使いたい場合は、あなたの "
+"Windows のレジストリにあるパラメータを変更する必要があります。"
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"ここで「はい」と答えることを強くお勧めします。この場合、有効な /etc/samba/"
-"smbpasswd ファイルがあることを確認し、各ユーザのパスワードは smbpasswd コマン"
-"ドを使って設定してください。"
+"プレインテキストパスワードのサポートはもう Microsoft Windows 製品では保守され"
+"ていないので、ここで「はい」と答えることを強くお勧めします。この場合、有効"
+"な /etc/samba/smbpasswd ファイルがあることを確認し、各ユーザのパスワードは "
+"smbpasswd コマンドを使って設定してください。"
 
 #. Type: boolean
 #. Description
@@ -222,36 +210,3 @@
 msgstr ""
 "Samba デーモン smbd は通常のデーモンとしての実行または inetd からの実行ができ"
 "ます。デーモンとして実行するのがお勧めの手段です。"
-
-#~ msgid "Chaining passdb backends is not supported"
-#~ msgstr "passdb バックエンドのチェーン化はサポートされません"
-
-#~ msgid ""
-#~ "Beginning with version 3.0.23, samba no longer supports chaining multiple "
-#~ "backends in the \"passdb backend\" parameter.  It appears that your smb."
-#~ "conf file contains a passdb backend parameter consisting of a list of "
-#~ "backends.  The new version of samba will not work until you correct this."
-#~ msgstr ""
-#~ "バージョン 3.0.23 から、samba は \"passdb backend\" パラメータでの複数の"
-#~ "バックエンドのチェーン化をサポートしません。あなたの smb.conf ファイルは、"
-#~ "バックエンドのリストを構成する passdb バックエンドパラメータを含んでいま"
-#~ "す。samba の新しいバージョンはあなたがこれを訂正するまで動作しません。"
-
-#~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
-#~ msgstr "/etc/samba/smbpasswd を /var/lib/samba/passdb.tdb に移動しますか?"
-
-#~ msgid ""
-#~ "Samba 3.0 introduced a more complete SAM database interface which "
-#~ "supersedes the /etc/samba/smbpasswd file."
-#~ msgstr ""
-#~ "Samba 3.0 では、/etc/samba/smbpasswd ファイルに代わる、より完全な SAM デー"
-#~ "タベースインターフェイスが導入されています。"
-
-#~ msgid ""
-#~ "Please confirm whether you would like the existing smbpasswd file to be "
-#~ "automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
-#~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
-#~ msgstr ""
-#~ "既存の smbpasswd ファイルを自動的に /var/lib/samba/passdb.tdb に移行してよ"
-#~ "いかどうか確認してください。別の pdb バックエンド (LDAP など) を代わりに計"
-#~ "画しているのであれば、ここでは「いいえ」と答えてください。"

Modified: branches/samba/experimental/debian/po/ka.po
===================================================================
--- branches/samba/experimental/debian/po/ka.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ka.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-09-10 01:45+0400\n"
 "Last-Translator: Aiet Kolkhi <aietkolkhi at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/km.po
===================================================================
--- branches/samba/experimental/debian/po/km.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/km.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -21,6 +21,7 @@
 "PO-Revision-Date: 2007-03-13 08:39+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/ko.po
===================================================================
--- branches/samba/experimental/debian/po/ko.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ko.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -8,6 +8,7 @@
 "PO-Revision-Date: 2007-03-14 09:28-0400\n"
 "Last-Translator: Sunjae Park <darehanl at gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/ku.po
===================================================================
--- branches/samba/experimental/debian/po/ku.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ku.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,21 +1,22 @@
-# translation of samba_ku.po to Kurdish
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
 # Erdal Ronahi <erdal dot ronahi at gmail dot com>, 2008.
+# Amed Çeko Jiyan <amedcj at gmail.com>, 2010.
+# Erdal Ronahî <erdal dot ronahi at gmail dot com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_ku\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2008-05-08 13:02+0200\n"
-"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
-"Language-Team: ku <ubuntu-l10n-kur at lists.ubuntu.com>\n"
+"PO-Revision-Date: 2010-10-30 01:33+0200\n"
+"Last-Translator: Erdal Ronahî <erdal dot ronahi at gmail dot com>\n"
+"Language-Team: Kurdish Team http://pckurd.net\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KAider 0.1\n"
-"Plural-Forms: nplurals=2; plural= n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
 
 #. Type: boolean
 #. Description
@@ -34,6 +35,11 @@
 "to your smb.conf file so that DHCP-provided WINS settings will automatically "
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
+"Eger kompîtera te ji ser pêşkêşkarê ji DHCPê navnîşaneke IPê bistîne, dibe "
+"ku pêşkêşkara DHCP jî derbarê pêşkêşkara WINSê de agahiyan peyda bike "
+"(\"NetBIOS navê pêşkêşkaran) ji ser torê pêşkêş bike. Ji bo vê divê pelê te "
+"yê smb.conf bê guherandin lewre mîhengên WINSê yên DHCP-pêşkêş dike ji /etc/"
+"samba/dhcp/confê xweber bên xwendin."
 
 #. Type: boolean
 #. Description
@@ -59,6 +65,11 @@
 "automated configuration process and require you to edit your smb.conf by "
 "hand to get it working again."
 msgstr ""
+"Tevahiya vesazkirina peymana Sambayê ya bi pirsan bandorê li parametreya /"
+"etc/samba/smb.confê dikin yên bernameyên Sambayê (nmbd û smbd) vesaz kirine. "
+"Di smb.confa te ya niha de rêzikeke \"include\" an jî zêdetir rêzik, yên ku "
+"dikarin pêvajoya vesazkirina xweber têk bibin û hewcetî derxin ku tu smb."
+"confê bi destan saz bikî da ku bixebite."
 
 #. Type: boolean
 #. Description
@@ -68,12 +79,14 @@
 "changes yourself, and will not be able to take advantage of periodic "
 "configuration enhancements."
 msgstr ""
+"Eger tu vê vebijêrkê hilnebijêrî, dê pêwîst bibe ku tu hemû veaszkirinan bi "
+"serê xwe pêk bînî, û dê avantaja pêşdeçûna vesazkirina periyodîk pêk neyê."
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
-msgstr "Navê Koma Xebate/Domain:"
+msgstr "Navê Koma Xebatê/Domain:"
 
 #. Type: string
 #. Description
@@ -84,12 +97,16 @@
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
+"Tika ye Koma Xebatê ya vê pergalê diyar bike. Ev mîheng kontrol dike ka dê "
+"di bikaranîna pêşkêşkarekê de kîjan Koma Xebatê bê nîşandan, Koma Xebatê ya "
+"heyî ya dem bi dem fronted tê gerîn û navê domaînê ya bi mîhenga  "
+"\"security=domain\"ê tê bikaranîn."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
 msgid "Use password encryption?"
-msgstr ""
+msgstr "Bila kilîla şîfreyê bê bikaranîn?"
 
 #. Type: boolean
 #. Description
@@ -99,6 +116,9 @@
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
+"Hemû navrûyên Windowsê dema şîfreyên kilîlkirî tên bikaranîn, bi pêşkêşkarên "
+"SMB/CIFS re dikevin têkiliyê. Eger dixwazî deqa şîfreya zelal bi kar bînî "
+"divê parametreya di tomarkirina Windowsa xwe de biguherînî."
 
 #. Type: boolean
 #. Description
@@ -109,6 +129,9 @@
 "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 ""
+"Çalakirina vê vebijêrkê wekî desteka ji bo şîfreyên deqa sade ya zêdetir "
+"nayên parastin ya di berhemên Microsoft Windowsê de, bi tundî tê "
+"pêşniyarkirin."
 
 #. Type: boolean
 #. Description
@@ -126,6 +149,11 @@
 "automatically, but the passwords must be added manually by running smbpasswd "
 "and be kept up-to-date in the future."
 msgstr ""
+"Ji bo hevgirtîkirina srandard a di piraniya guhertoyên Windowsê de, divê "
+"Samba ji bo bikaranîna şîfreya kilîlkirî bê vesazkirin. Ji bo vê divê "
+"şîfreyên bikarhêneran di /etc/passwdê de hatibin tomarkirin. Dibe ku ev pel "
+"xweber bê afirandin, lê divê şîfre bi destan bi meşandina smbpasswd hatibin "
+"lêzêdekirin û di siberojê de rojane bê girtin."
 
 #. Type: boolean
 #. Description
@@ -134,6 +162,8 @@
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
+"Eger tu vê neafirînî, divê Sambayê veasz bikî (û pêkan e ku makîneya navrûyê "
+"jî) ji bo şîfreya deqa sade."
 
 #. Type: boolean
 #. Description
@@ -142,18 +172,20 @@
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
 msgstr ""
+"Ji bo agahiyên zêdetir ji pakêta samba-docê /usr/share/doc/samba-doc/"
+"htmldocs/Samba3-Developers-Guide/pwencrypt.htmlê bibîne."
 
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
 msgid "daemons"
-msgstr ""
+msgstr "daemon"
 
 #. Type: select
 #. Choices
 #: ../samba.templates:2001
 msgid "inetd"
-msgstr ""
+msgstr "inetd"
 
 #. Type: select
 #. Description
@@ -168,3 +200,5 @@
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
+"Daemona Sambayê dikare wekî daemon'eke ji rêzê an jî inetd'ê bixebite. "
+"Xebitandina wekî daemonekê tê pêşniyarkirin."

Modified: branches/samba/experimental/debian/po/lt.po
===================================================================
--- branches/samba/experimental/debian/po/lt.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/lt.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,12 +19,13 @@
 "PO-Revision-Date: 2006-11-26 00:20+0200\n"
 "Last-Translator: Gintautas Miliauskas <gintas at akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: boolean
 #. Description

Modified: branches/samba/experimental/debian/po/ml.po
===================================================================
--- branches/samba/experimental/debian/po/ml.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ml.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -22,6 +22,7 @@
 "Last-Translator: Praveen A <pravi.a at gmail.com>\n"
 "Language-Team: Swathanthra Malayalam Computing <smc-discuss at googlegroups."
 "com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/mr.po
===================================================================
--- branches/samba/experimental/debian/po/mr.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/mr.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -20,6 +20,7 @@
 "Last-Translator: Priti Patil <prithisd at gmail.com>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "
 "<janabhaaratii at cdacmumbai.in>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -244,6 +245,6 @@
 #~ "automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
 #~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
 #~ msgstr ""
-#~ "कृपया तुम्हाला सध्याची एसएमबी पासवर्ड संचिका आपोआप/व्हीएआर/एलआयबी/सांबा/"
-#~ "पासडीबी।टीडीबी कडे स्थलांतरित झाल्यास चालेल का याची खात्री करा. तुम्हाला त्याऐवजी "
-#~ "दुसरी कोणती पीडीबी बॅकएंड(उदा.एलडीएपी)करावयाची असल्यास हा पर्याय स्वीकारु नका"
+#~ "कृपया तुम्हाला सध्याची एसएमबी पासवर्ड संचिका आपोआप/व्हीएआर/एलआयबी/सांबा/पासडीबी।"
+#~ "टीडीबी कडे स्थलांतरित झाल्यास चालेल का याची खात्री करा. तुम्हाला त्याऐवजी दुसरी "
+#~ "कोणती पीडीबी बॅकएंड(उदा.एलडीएपी)करावयाची असल्यास हा पर्याय स्वीकारु नका"

Modified: branches/samba/experimental/debian/po/nb.po
===================================================================
--- branches/samba/experimental/debian/po/nb.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/nb.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2007-03-12 21:44+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,9 +43,9 @@
 msgstr ""
 "Hvis din datamaskin får informasjon om IP-adressen fra en DHCP-tjener på "
 "nettet, så kan DHCP-tjeneren også skaffe informasjon om WINS-tjenere "
-"(«NetBIOS navnetjenere») på nettet. For å bruke dette må smb.conf-fila endres "
-"slik at WINS-innstillinger fra DHCP automatisk leses fra /etc/samba/dhcp."
-"conf."
+"(«NetBIOS navnetjenere») på nettet. For å bruke dette må smb.conf-fila "
+"endres slik at WINS-innstillinger fra DHCP automatisk leses fra /etc/samba/"
+"dhcp.conf."
 
 #. Type: boolean
 #. Description
@@ -72,8 +73,8 @@
 msgstr ""
 "Resten av Samba-oppsettet dreier seg om spørsmål som påvirker parametre i /"
 "etc/samba/smb.conf, som er oppsettsfila for Samba-programmene (nmbd og "
-"smbd). smb.conf-fila inneholder nå en  «include»-linje eller en parameter som "
-"går over flere linjer, som kanskje kan forvirre den automatiske "
+"smbd). smb.conf-fila inneholder nå en  «include»-linje eller en parameter "
+"som går over flere linjer, som kanskje kan forvirre den automatiske "
 "oppsettsprosessen slik at du må endre smb.conf for hånd for å få den til å "
 "virke igjen."
 

Modified: branches/samba/experimental/debian/po/ne.po
===================================================================
--- branches/samba/experimental/debian/po/ne.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ne.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -21,6 +21,7 @@
 "PO-Revision-Date: 2007-03-14 05:36+0545\n"
 "Last-Translator: Shiva Pokharel <shiva at mpp.org.np>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/nl.po
===================================================================
--- branches/samba/experimental/debian/po/nl.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/nl.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -16,9 +16,10 @@
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-12 21:30+0100\n"
-"Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
+"PO-Revision-Date: 2010-11-02 17:48+0100\n"
+"Last-Translator: Remco Rijnders <remco at webconquest.com>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@
 msgstr ""
 "Indien uw computer zijn ip-adresinformatie van een DHCP-server op het "
 "netwerk haalt, voorziet deze mogelijk ook informatie betreffende de op het "
-"netwerk aanwezige WINS-servers (\"NetBIOS naamservers\").\" Dit vereist een "
+"netwerk aanwezige WINS-servers (\"NetBIOS naamservers\"). Dit vereist een "
 "verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS "
 "instellingen automatisch gelezen worden van /etc/samba/dhcp.conf."
 
@@ -75,9 +76,9 @@
 "De resterende Samba-configuratievragen hebben betrekking op parameters in /"
 "etc/samba/smb.conf, het configuratiebestand dat gebruikt wordt voor de Samba "
 "programma's (nmbd en smbd). Uw huidige smb.conf bevat een 'include'-regel of "
-"een optie die meerdere regels beslaat, het kan zijn dat dit het automatische "
-"configuratieproces in verwarring brengt. In dat geval dient u uw smb.conf "
-"handmatig aan te passen om samba terug werkend te krijgen."
+"een optie die meerdere regels beslaat; Het kan zijn dat dit het automatische "
+"configuratieproces verstoort. In dat geval dient u uw smb.conf handmatig aan "
+"te passen om samba terug werkend te krijgen."
 
 #. Type: boolean
 #. Description
@@ -100,20 +101,17 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Van welke werkgroep moet deze server deel lijken uit te maken, wanneer "
-"clients hierom vragen? Merk op dat deze parameter ook de domeinnaam bepaald "
-"die wordt gebruikt voor de security=domain instelling."
+"Tot welke werkgroep behoort dit systeem? Deze instelling bepaalt ook de "
+"werkgroep waarin dit systeem zal verschijnen wanneer het als server wordt "
+"gebruikt, de standaard werkgroep die gebruikt wordt bij het verkennen met de "
+"diverse interfaces, en de domeinnaam die wordt gebruikt voor de "
+"\"security=domain\" instelling."
 
 #. Type: boolean
 #. Description
@@ -124,38 +122,30 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
 "Alle recente windows-clients maken gebruik van versleutelde wachtwoorden bij "
-"de communicatie met SMB-servers. Als u 'onversleutelde tekst'-wachtwoorden "
-"wilt gebruiken dient u een parameter te veranderen in het Windows register."
+"de communicatie met SMB/CIFS-servers. Als u 'onversleutelde tekst'-"
+"wachtwoorden wilt gebruiken dient u een parameter te veranderen in het "
+"Windows register."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"Het activeren van deze optie is ten sterkste aangeraden. Indien u hiervoor "
-"kiest dient u er wel voor te zorgen dat u een geldig '/etc/samba/smbpasswd'- "
-"bestand heeft en dat u de wachtwoorden daar voor elke gebruiker met behulp "
-"van het commando 'smbpasswd' instelt."
+"Het activeren van deze optie is ten sterkste aangeraden aangezien er geen "
+"ondersteuning meer is voor platte tekst wachtwoorden in Microsoft Windows "
+"producten. Indien u hiervoor kiest dient u er wel voor te zorgen dat u een "
+"geldig '/etc/samba/smbpasswd'- bestand heeft en dat u de wachtwoorden daar "
+"voor elke gebruiker met behulp van het commando 'smbpasswd' instelt."
 
 #. Type: boolean
 #. Description

Modified: branches/samba/experimental/debian/po/nn.po
===================================================================
--- branches/samba/experimental/debian/po/nn.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/nn.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2007-03-17 18:35+0100\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll at gmail.com>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn at lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,10 +66,10 @@
 msgstr ""
 "Resten av oppsettet av Samba er spørsmål som handlar om parametrar i /etc/"
 "samba/smb.conf, som er fila som blir brukt til å setje opp Sambaprogram "
-"(nmbd og smbd). Den noverande smb.conf-fila inneheld ei «include»-linje eller "
-"ein opsjon som går over fleire linjer, noko som kan forvirre den automatiske "
-"oppsettsprosessen og gjer at du må redigere smb.conf-fila manuelt for å få "
-"det til å fungere igjen."
+"(nmbd og smbd). Den noverande smb.conf-fila inneheld ei «include»-linje "
+"eller ein opsjon som går over fleire linjer, noko som kan forvirre den "
+"automatiske oppsettsprosessen og gjer at du må redigere smb.conf-fila "
+"manuelt for å få det til å fungere igjen."
 
 #. Type: boolean
 #. Description

Modified: branches/samba/experimental/debian/po/pl.po
===================================================================
--- branches/samba/experimental/debian/po/pl.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/pl.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-09-12 10:08+0200\n"
 "Last-Translator: Tomasz Majbaum <genobis at genobis.pl>\n"
 "Language-Team: polski <debian-l10n-pl at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/pt.po
===================================================================
--- branches/samba/experimental/debian/po/pt.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/pt.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2010-03-30 21:36+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debian.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/pt_BR.po
===================================================================
--- branches/samba/experimental/debian/po/pt_BR.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/pt_BR.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,33 +1,29 @@
+# Debconf translations for samba.
+# Copyright (C) 2010 THE samba'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the samba package.
+# André Luís Lopes <andrelop at debian.org>, 2007.
+# Adriano Rafael Gomes <adrianorg at gmail.com>, 2010.
 #
-#    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: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-12 16:16-0200\n"
-"Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
+"PO-Revision-Date: 2010-12-11 21:52-0200\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg at gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
+"org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:1001
 msgid "Modify smb.conf to use WINS settings from DHCP?"
-msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP ?"
+msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP?"
 
 #. Type: boolean
 #. Description
@@ -41,10 +37,9 @@
 msgstr ""
 "Caso seu computador obtenha as informações de endereçamento IP de um "
 "servidor DHCP na rede, o servidor DHCP poderá também fornecer informações "
-"sobre servidor WINS (\"Servidor de Nomes NetBIOS\") presentes na rede. Para "
-"que o Samba leia as configurações WINS fornecidas pelo servidor DHCP "
-"automaticamente do arquivo /etc/samba/dhcp.conf, é preciso modificar seu "
-"arquivo smb.conf."
+"sobre servidores WINS (\"servidores de nomes NetBIOS\") presentes na rede. "
+"Isso requer uma alteração no seu arquivo smb.conf para que as configurações "
+"WINS fornecidas via DHCP sejam automaticamente lidas de /etc/samba/dhcp.conf."
 
 #. Type: boolean
 #. Description
@@ -59,7 +54,7 @@
 #. Description
 #: ../samba-common.templates:2001
 msgid "Configure smb.conf automatically?"
-msgstr "Configurar smb.conf automaticamente ?"
+msgstr "Configurar smb.conf automaticamente?"
 
 #. Type: boolean
 #. Description
@@ -75,7 +70,7 @@
 "O restante da configuração do Samba lida com questões que afetam parâmetros "
 "no arquivo /etc/samba/smb.conf, que é o arquivo usado para configurar os "
 "programas Samba (nmbd e smbd). Seu arquivo smb.conf atual contém uma linha "
-"'include' ou uma opção que ocupa diversas linhas, o que pode confundir o "
+"\"include\" ou uma opção que ocupa diversas linhas, o que pode confundir o "
 "processo de configuração automatizado e requerer que você edite seu arquivo "
 "smb.conf manualmente para torná-lo funcional novamente."
 
@@ -87,80 +82,69 @@
 "changes yourself, and will not be able to take advantage of periodic "
 "configuration enhancements."
 msgstr ""
-"Caso você opte por essa opção, você precisará lidar com quaisquer mudanças "
-"de configuração manualmente e você não poderá aproveitar os melhoramentos "
-"periódicos de configuração."
+"Caso você não opte por essa opção, você precisará lidar com quaisquer "
+"mudanças de configuração manualmente e você não poderá aproveitar os "
+"melhoramentos periódicos de configuração."
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
-msgstr "Nome de Domínio/Grupo de Trabalho :"
+msgstr "Grupo de Trabalho/Nome de Domínio:"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Por favor, especifique o grupo de trabalho no qual quer que este servidor "
-"pareça estar quando questionado por clientes. Note que este parâmetro também "
-"controla o nome de Domínio usado com a configuração security=domain."
+"Por favor, especifique o grupo de trabalho para este sistema. Esta "
+"configuração controla em qual grupo de trabalho o sistema aparecerá quando "
+"usado como um servidor, qual o grupo de trabalho padrão a ser usado ao "
+"navegar usando vários frontends, e qual o nome de domínio usado com a "
+"configuração \"security=domain\"."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
 msgid "Use password encryption?"
-msgstr "Usar senhas criptografadas ?"
+msgstr "Usar senhas criptografadas?"
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"Todos os clientes Windows atuais comunicam-se com servidores SMB usando "
-"senhas encriptadas. Caso você queira usar senhas em texto puro você "
-"precisará modificar um parâmetro no registro de seu Windows."
+"Todos os clientes Windows atuais comunicam-se com servidores SMB/CIFS usando "
+"senhas criptografadas. Caso você queira usar senhas em texto puro, você "
+"precisará modificar um parâmetro no registro do seu Windows."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"Habilitar esta opção é altamente recomendado. Caso você o faça, certifique-"
-"se de possuir um arquivo /etc/samba/smbpasswd e que você tenha senhas "
-"definidas no mesmo para cada usuário usando o comando smbpasswd."
+"Habilitar esta opção é altamente recomendado pois o suporte a senhas em "
+"texto puro não é mais mantido nos produtos Microsoft Windows. Caso você o "
+"faça, certifique-se de possuir um arquivo /etc/samba/smbpasswd válido e que "
+"você tenha definido senhas no mesmo para cada usuário usando o comando "
+"smbpasswd."
 
 #. Type: boolean
 #. Description
 #: ../samba.templates:1001
 msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Gerar a base de dados para senhas /var/lib/samba/passdb.tdb ?"
+msgstr "Gerar a base de dados para senhas do samba, /var/lib/samba/passdb.tdb?"
 
 #. Type: boolean
 #. Description
@@ -173,11 +157,11 @@
 "and be kept up-to-date in the future."
 msgstr ""
 "Para ser compatível com os padrões na maioria das versões do Windows, o "
-"Samba deve ser configurado para utilizar senhas encriptadas. Isto requer que "
-"as senhas dos usuários sejam armazenadas em um arquivo diferente do arquivo /"
-"etc/passwd. Esse arquivo pode ser criado automaticamente, mas as senhas "
-"devem ser definidas manualmente através da execução do utilitário smbpasswd "
-"e devem ser mantidas atualizadas no futuro."
+"Samba deve ser configurado para utilizar senhas criptografadas. Isto requer "
+"que as senhas dos usuários sejam armazenadas em um arquivo diferente do "
+"arquivo /etc/passwd. Esse arquivo pode ser criado automaticamente, mas as "
+"senhas devem ser definidas manualmente através da execução do utilitário "
+"smbpasswd e devem ser mantidas atualizadas no futuro."
 
 #. Type: boolean
 #. Description
@@ -186,7 +170,7 @@
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-"Caso você não o crie, você terá que reconfigurar o samba (e provavelmente "
+"Caso você não o crie, você terá que reconfigurar o Samba (e provavelmente "
 "suas máquinas clientes) para utilização de senhas em texto puro."
 
 #. Type: boolean
@@ -196,8 +180,8 @@
 "See /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt.html "
 "from the samba-doc package for more details."
 msgstr ""
-"Consulte o arquivo /usr/share/doc/samba-doc/htmldos/ENCRYPTION.html, "
-"fornecido pelo pacote samba-doc, para conhecer maiores detalhes."
+"Veja /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/pwencrypt."
+"html, fornecido pelo pacote samba-doc, para mais detalhes."
 
 #. Type: select
 #. Choices
@@ -215,7 +199,7 @@
 #. Description
 #: ../samba.templates:2002
 msgid "How do you want to run Samba?"
-msgstr "Como você deseja que o Samba seja executado ?"
+msgstr "Como você deseja que o Samba seja executado?"
 
 #. Type: select
 #. Description
@@ -224,42 +208,5 @@
 "The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
 "daemon is the recommended approach."
 msgstr ""
-"O serviço Samba smbd pode ser executado como daemon normal ou a partir do "
+"O daemon Samba smbd pode ser executado como daemon normal ou a partir do "
 "inetd. Executá-lo como daemon é o método recomendado."
-
-#~ msgid "Chaining passdb backends is not supported"
-#~ msgstr "Múltiplos backends passdb não são suportados"
-
-#~ msgid ""
-#~ "Beginning with version 3.0.23, samba no longer supports chaining multiple "
-#~ "backends in the \"passdb backend\" parameter.  It appears that your smb."
-#~ "conf file contains a passdb backend parameter consisting of a list of "
-#~ "backends.  The new version of samba will not work until you correct this."
-#~ msgstr ""
-#~ "Desde a versão 3.0.23, o Samba não mais suporta múltiplos backends como "
-#~ "valor para o parâmetro \"passdb backend\". Parece que seu arquivo smb."
-#~ "conf possui um parâmetro passdb backend que consiste de uma lista de "
-#~ "backends. A nova versão do Samba não funcionará até que você corrija isso."
-
-#~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
-#~ msgstr "Mover /etc/samba/smbpasswd para /var/lib/samba/passdb.tdb ?"
-
-#~ msgid ""
-#~ "Samba 3.0 introduced a more complete SAM database interface which "
-#~ "supersedes the /etc/samba/smbpasswd file."
-#~ msgstr ""
-#~ "O Samba 3.0 introduziu uma interface mais completa com a base de dados "
-#~ "SAM, a qual substitui o arquivo /etc/samba/smbpasswd."
-
-#~ msgid ""
-#~ "Please confirm whether you would like the existing smbpasswd file to be "
-#~ "automatically migrated to /var/lib/samba/passdb.tdb.  Do not choose this "
-#~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
-#~ msgstr ""
-#~ "Por favor, confirme se você gostaria que o arquivo smbpasswd existente "
-#~ "fosse migrado automaticamente para /var/lib/samba/passdb.tdb. Não aceite "
-#~ "essa opção caso você planeje utilizar um outro backend pdb (como LDAP, "
-#~ "por exemplo)."
-
-#~ msgid "daemons, inetd"
-#~ msgstr "daemons, inetd"

Modified: branches/samba/experimental/debian/po/ro.po
===================================================================
--- branches/samba/experimental/debian/po/ro.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ro.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2008-06-29 19:42+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/ru.po
===================================================================
--- branches/samba/experimental/debian/po/ru.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ru.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,12 +11,13 @@
 "PO-Revision-Date: 2009-06-27 13:27+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: boolean
 #. Description

Modified: branches/samba/experimental/debian/po/sk.po
===================================================================
--- branches/samba/experimental/debian/po/sk.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/sk.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -23,6 +23,7 @@
 "PO-Revision-Date: 2009-02-15 08:16+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/sl.po
===================================================================
--- branches/samba/experimental/debian/po/sl.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/sl.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2007-03-13 08:06+0100\n"
 "Last-Translator: Matej Kovačič <matej.kovacic at owca.info>\n"
 "Language-Team: Sl <skrat at owca.info>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/sq.po
===================================================================
--- branches/samba/experimental/debian/po/sq.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/sq.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -18,6 +18,7 @@
 "PO-Revision-Date: 2007-03-13 21:25+0100\n"
 "Last-Translator: Elian Myftiu <elian.myftiu at gmail.com>\n"
 "Language-Team: Debian L10n Albanian <debian-l10n-albanian at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/sv.po
===================================================================
--- branches/samba/experimental/debian/po/sv.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/sv.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -12,6 +12,7 @@
 "PO-Revision-Date: 2009-02-23 01:51+0100\n"
 "Last-Translator: Martin Bagge <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -204,4 +205,3 @@
 msgstr ""
 "Samba-demonen smbd kan köras som en normal demon eller från inetd. Att köra "
 "som en demon är den rekommenderade metoden."
-

Modified: branches/samba/experimental/debian/po/ta.po
===================================================================
--- branches/samba/experimental/debian/po/ta.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/ta.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2006-12-16 20:10+0530\n"
 "Last-Translator: drtvasudevan <agnihot3 at gmail.com>\n"
 "Language-Team: TAMIL <Ubuntu-tam at lists.ubuntu.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/th.po
===================================================================
--- branches/samba/experimental/debian/po/th.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/th.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2007-03-13 10:05+0700\n"
 "Last-Translator:  Theppitak Karoonboonyanan <thep at linux.thai.net>\n"
 "Language-Team: Thai <l10n at opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/tl.po
===================================================================
--- branches/samba/experimental/debian/po/tl.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/tl.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2007-03-13 06:13+0800\n"
 "Last-Translator: eric pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
+"Language: tl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/tr.po
===================================================================
--- branches/samba/experimental/debian/po/tr.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/tr.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -7,9 +7,10 @@
 "Project-Id-Version: samba\n"
 "Report-Msgid-Bugs-To: samba at packages.debian.org\n"
 "POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2007-03-13 18:47+0200\n"
-"Last-Translator: Mehmet Türker <mturker at innova.com.tr>\n"
+"PO-Revision-Date: 2010-10-25 12:33+0200\n"
+"Last-Translator: Mehmet Turker <mturker at innova.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -93,21 +94,17 @@
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Lütfen sunucunuzun istemciler tarafından sorgulandığında içerisinde "
-"gözükmesini istediğiniz Çalışma Grubu'nu belirtiniz. Aklınızda bulunsun, bu "
-"parametre ayrıca security=domain ayarı ile beraber kullanılacak Etki Alanını "
-"da kontrol eder."
+"Lütfen bu sistem için çalışma grubu (Workgroup) belirtin. Bu ayar sistemin "
+"sunucu olarak kullanıldığı durumda hangi Çalışma Grubu'nda gözükeceğini "
+"kontrol eder, çeşitli noktalarda varsayılan çalışma grubu olarak ta "
+"kullanılacaktır. Etki alanı ismi \"security=domain\" ayarı ile beraber "
+"kullanılacaktır."
 
 #. Type: boolean
 #. Description
@@ -118,37 +115,28 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"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."
+"Yeni Windows istemcileri SBM/CIFS 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."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"Bu işlemi yapmanız şiddetle önerilir. Eğer yapacaksanız, geçerli bir /etc/"
-"samba/smbpasswd dosyanız olduğundan emin olun ve smbpasswd komutunu "
-"kullanarak bütün kullanıcılar için parola belirleyin."
+"Bu işlemi yapmanız şiddetle önerilir, düz metin parola desteği artık "
+"Microsoft Windows ürünlerinde bulunmamaktadır. Eğer işlem gerçekleştirilecek "
+"ise, geçerli bir /etc/samba/smbpasswd dosyanız olduğundan emin olun ve "
+"smbpasswd komutunu kullanarak bütün kullanıcılar için parola belirleyin."
 
 #. Type: boolean
 #. Description

Modified: branches/samba/experimental/debian/po/vi.po
===================================================================
--- branches/samba/experimental/debian/po/vi.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/vi.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2009-02-15 15:57+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,9 +35,10 @@
 msgstr ""
 "Nếu máy tính của bạn lấy thông tin địa chỉ IP từ một trình phục vụ DHCP nằm "
 "trên mạng, trình phục vụ DHCP có lẽ cũng có khả năng cung cấp thông tin về "
-"trình phục vụ WINS (« NetBIOS name servers ») cũng nằm trên mạng. Dịch vụ này "
-"cần thiết bạn sửa đổi tập tin « smb.conf » của mình để cho phép thiết lập "
-"WINS do DHCP cung cấp sẽ được đọc tự động từ tập tin « /etc/samba/dhcp.conf »."
+"trình phục vụ WINS (« NetBIOS name servers ») cũng nằm trên mạng. Dịch vụ "
+"này cần thiết bạn sửa đổi tập tin « smb.conf » của mình để cho phép thiết "
+"lập WINS do DHCP cung cấp sẽ được đọc tự động từ tập tin « /etc/samba/dhcp."
+"conf »."
 
 #. Type: boolean
 #. Description
@@ -63,11 +65,11 @@
 "hand to get it working again."
 msgstr ""
 "Phần còn lại của cấu hình Samba đề cập các câu hỏi về tham số trong tập tin "
-"« /etc/samba/smb.conf », tập tin được dùng để cấu hình các chương trình Samba "
-"(nmbd và smbd). Tập tin « smb.conf » hiện thời chứa một dòng « include » (gồm) "
-"hay một tùy chọn chiếm nhiều dòng, mà có thể gây ra lỗi trong tiến trình cấu "
-"hình tự động thì cần thiết bạn tự sửa đổi tập tin « smb.conf » mình để kích "
-"hoạt lại nó."
+"« /etc/samba/smb.conf », tập tin được dùng để cấu hình các chương trình "
+"Samba (nmbd và smbd). Tập tin « smb.conf » hiện thời chứa một dòng « include "
+"» (gồm) hay một tùy chọn chiếm nhiều dòng, mà có thể gây ra lỗi trong tiến "
+"trình cấu hình tự động thì cần thiết bạn tự sửa đổi tập tin « smb.conf » "
+"mình để kích hoạt lại nó."
 
 #. Type: boolean
 #. Description
@@ -115,8 +117,8 @@
 "parameter in your Windows registry."
 msgstr ""
 "Mọi ứng dụng khách Windows gần đây đều liên lạc với trình phục vụ SMB/CIFS "
-"dùng mật khẩu đã mật mã. Vẫn muốn sử dụng mật khẩu « nhập thô » (không có mật "
-"mã) thì bạn cần phải thay đổi một tham số trong sổ đăng ký (registry) "
+"dùng mật khẩu đã mật mã. Vẫn muốn sử dụng mật khẩu « nhập thô » (không có "
+"mật mã) thì bạn cần phải thay đổi một tham số trong sổ đăng ký (registry) "
 "Windows của mình."
 
 #. Type: boolean

Modified: branches/samba/experimental/debian/po/wo.po
===================================================================
--- branches/samba/experimental/debian/po/wo.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/wo.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2007-04-30 18:13+0000\n"
 "Last-Translator: Mouhamadou Mamoune Mbacke <mouhamadoumamoune at gmail.com>\n"
 "Language-Team: Wolof\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/zh_CN.po
===================================================================
--- branches/samba/experimental/debian/po/zh_CN.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/zh_CN.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -23,6 +23,7 @@
 "PO-Revision-Date: 2006-10-03 19:36-0500\n"
 "Last-Translator: Carlos Z.F. Liu <carlosliu at users.sourceforge.ent>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/po/zh_TW.po
===================================================================
--- branches/samba/experimental/debian/po/zh_TW.po	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/po/zh_TW.po	2011-04-15 16:57:51 UTC (rev 3735)
@@ -20,6 +20,7 @@
 "Last-Translator: Tetralet <tetralet at gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5 at lists."
 "debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/rules	2011-04-15 16:57:51 UTC (rev 3735)
@@ -28,7 +28,6 @@
 		--with-fhs \
 		--enable-shared \
 		--enable-static \
-		--disable-pie \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libdir=/usr/lib/samba \
@@ -239,7 +238,7 @@
 	chmod 1777 debian/samba/var/spool/samba/
 
 	DH_OPTIONS= dh_makeshlibs -plibsmbclient -V'libsmbclient (>= 2:3.2.0)'
-	DH_OPTIONS= dh_makeshlibs -plibwbclient0
+	DH_OPTIONS= dh_makeshlibs -plibwbclient0 -V'libwbclient0 (>= 2:3.5.0~pre2)'
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -248,10 +247,4 @@
 
 binary: binary-indep binary-arch
 
-update-archs:
-	sed -i -e "s/libacl1-dev\( ([^)]\+)\)* \[[^]]\+\]/libacl1-dev \1 [`type-handling any linux-gnu`]/g" \
-	       -e "s/libkeyutils-dev\( ([^)]\+)\)* \[[^]]\+\]/libkeyutils-dev \1 [`type-handling any linux-gnu`]/g" \
-	       -e "s/libcap2-dev\( ([^)]\+)\)* \[[^]]\+\]/libcap2-dev \1 [`type-handling any linux-gnu`]/g" \
-		debian/control
-
-.PHONY: build clean binary-indep binary-arch binary install configure update-archs
+.PHONY: build clean binary-indep binary-arch binary install configure

Modified: branches/samba/experimental/debian/samba-common-bin.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common-bin.postinst	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/samba-common-bin.postinst	2011-04-15 16:57:51 UTC (rev 3735)
@@ -4,14 +4,11 @@
 
 set -e
 
-if [ "$1" = "configure" ]
-then
-	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
-		--slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
-	update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
-		--slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
-	update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
-		--slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
-fi
+update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
+	--slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
+update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
+	--slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
+update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
+	--slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
 
 #DEBHELPER#

Modified: branches/samba/experimental/debian/samba-common.dhcp
===================================================================
--- branches/samba/experimental/debian/samba-common.dhcp	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/samba-common.dhcp	2011-04-15 16:57:51 UTC (rev 3735)
@@ -20,7 +20,7 @@
 
 	# the destination file won't exist yet on the first run after 
 	# installing samba
-	if [ -e $SAMBA_DHCP_CONF ]
+	if [ -e $SAMBA_DHCP_CONF ] && [ -s $SAMBA_DHCP_CONF ]
 	then
 		# don't continue if no settings have changed
 		if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \

Modified: branches/samba/experimental/debian/samba-common.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common.postinst	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/samba-common.postinst	2011-04-15 16:57:51 UTC (rev 3735)
@@ -88,31 +88,6 @@
 
 mkdir -p "$TEMPDIR"
 
-if [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.28-3; then
-	if dpkg --compare-versions "$2" lt 3.0.26a-1 && [ "$2" != "${2%ubuntu*}" ]
-	then
-		base=dapper
-	elif [ "$2" != "${2%ubuntu*}" ]
-	then
-		base=gutsy
-	else
-		base=etch
-	fi
-
-	TEMPLATE=/usr/share/samba/smb.conf.${base}
-
-	cp "$TEMPLATE" "$NEWFILE"
-	configure_smb_conf "$NEWFILE"
-
-	if [ -e "$CONFIG" ]; then
-		sed -e '1,/^[;#[:space:]]*\[cdrom\]/ { d }
-			1,/^[[:space:]]*\[/ { /^[^[]/d; /^$/d }
-		' "$CONFIG" >> "$NEWFILE"
-	fi
-
-	ucf --three-way --debconf-ok "$NEWFILE" "$CONFIG"
-fi
-
 cp /usr/share/samba/smb.conf "$NEWFILE"
 configure_smb_conf "$NEWFILE"
 

Modified: branches/samba/experimental/debian/samba-common.prerm
===================================================================
--- branches/samba/experimental/debian/samba-common.prerm	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/samba-common.prerm	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e 
-
-case "$1" in
-    remove|upgrade|deconfigure)
-	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
-	update-alternatives --remove net /usr/bin/net.samba3
-	update-alternatives --remove testparm /usr/bin/testparm.samba3
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0

Modified: branches/samba/experimental/debian/samba.logrotate
===================================================================
--- branches/samba/experimental/debian/samba.logrotate	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/samba.logrotate	2011-04-15 16:57:51 UTC (rev 3735)
@@ -3,7 +3,7 @@
 	missingok
 	rotate 7
 	postrotate
-		invoke-rc.d --quiet samba reload > /dev/null
+		/etc/init.d/samba reload > /dev/null
 	endscript
 	compress
 	notifempty

Modified: branches/samba/experimental/debian/samba.postinst
===================================================================
--- branches/samba/experimental/debian/samba.postinst	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/samba.postinst	2011-04-15 16:57:51 UTC (rev 3735)
@@ -4,23 +4,6 @@
 #
 #
 
-case "$1" in
-	configure)
-		update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3 10 \
-			--slave /usr/share/man/man1/smbstatus.1.gz smbstatus.1.gz /usr/share/man/man1/smbstatus.samba3.1.gz
-		# continue below
-	;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-		exit 0
-	;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 0
-	;;
-esac
-
 # Handle debconf
 . /usr/share/debconf/confmodule
 
@@ -93,8 +76,8 @@
 	mv /var/run/samba/share_info.tdb /var/lib/samba/share_info.tdb
 fi
 
-if dpkg --compare-versions "$2" lt-nl 2:3.2.0-3 \
-   && dpkg --compare-versions "$2" ge 3.0.24 \
+if dpkg --compare-versions "$2" lt-nl 2:3.5.4~dfsg-2 \
+   && dpkg --compare-versions "$2" ge 2:3.5.0~rc1~dfsg-1 \
    && [ -e /etc/samba/schannel_store.tdb ] \
    && ! [ -e /var/lib/samba/schannel_store.tdb ]
 then
@@ -128,7 +111,7 @@
 		IFS=","
 		for USER in `getent group admin | cut -f4 -d:`; do
 			adduser "$USER" sambashare \
-			|| !getent passwd "$USER" >/dev/null
+			|| ! getent passwd "$USER" >/dev/null
 		done
 		IFS="$OLDIFS"
 	fi
@@ -139,6 +122,9 @@
 	install -d -m 1770 -g sambashare /var/lib/samba/usershares
 fi
 
+update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3 10 \
+	--slave /usr/share/man/man1/smbstatus.1.gz smbstatus.1.gz /usr/share/man/man1/smbstatus.samba3.1.gz
+
 #DEBHELPER#
 
 exit 0

Modified: branches/samba/experimental/debian/samba.prerm
===================================================================
--- branches/samba/experimental/debian/samba.prerm	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/samba.prerm	2011-04-15 16:57:51 UTC (rev 3735)
@@ -2,11 +2,9 @@
 
 set -e 
 
-case "$1" in
-    remove|upgrade|deconfigure)
+if [ "x$1" != xupgrade ]; then
 	update-alternatives --remove smbstatus /usr/bin/smbstatus.samba3
-	;;
-esac
+fi
 
 #DEBHELPER#
 

Modified: branches/samba/experimental/debian/smb.conf
===================================================================
--- branches/samba/experimental/debian/smb.conf	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/smb.conf	2011-04-15 16:57:51 UTC (rev 3735)
@@ -263,7 +263,6 @@
 ;   path = /home/samba/netlogon
 ;   guest ok = yes
 ;   read only = yes
-;   share modes = no
 
 # Un-comment the following and create the profiles directory to store
 # users profiles (see the "logon path" option above)

Modified: branches/samba/experimental/debian/smb.conf.dapper
===================================================================
--- branches/samba/experimental/debian/smb.conf.dapper	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/smb.conf.dapper	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,299 +0,0 @@
-#
-# Sample configuration file for the Samba suite for Debian GNU/Linux.
-#
-#
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options most of which 
-# are not shown in this example
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentary and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command
-# "testparm" to check that you have not made any basic syntactic 
-# errors. 
-#
-
-#======================= Global Settings =======================
-
-[global]
-
-## Browsing/Identification ###
-
-# Change this to the workgroup/NT-domain name your Samba server will part of
-   workgroup = DEBIAN_FANS
-
-# server string is the equivalent of the NT Description field
-   server string = %h server (Samba, Ubuntu)
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
-;   wins support = no
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# This will prevent nmbd to search for NetBIOS names through DNS.
-   dns proxy = no
-
-# What naming service and in what order should we use to resolve host names
-# to IP addresses
-;   name resolve order = lmhosts host wins bcast
-
-#### Networking ####
-
-# The specific set of interfaces / networks to bind to
-# This can be either the interface name or an IP address/netmask;
-# interface names are normally preferred
-;   interfaces = 127.0.0.0/8 eth0
-
-# Only bind to the named interfaces and/or networks; you must use the
-# 'interfaces' option above to use this.
-# It is recommended that you enable this feature if your Samba machine is
-# not protected by a firewall or is a firewall itself.  However, this
-# option cannot handle dynamic or non-broadcast interfaces correctly.
-;   bind interfaces only = true
-
-
-
-#### Debugging/Accounting ####
-
-# This tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 1000
-
-# If you want Samba to only log through syslog then set the following
-# parameter to 'yes'.
-;   syslog only = no
-
-# We want Samba to log a minimum amount of information to syslog. Everything
-# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
-# through syslog you should set the following parameter to something higher.
-   syslog = 0
-
-# Do something sensible when Samba crashes: mail the admin a backtrace
-   panic action = /usr/share/samba/panic-action %d
-
-
-####### Authentication #######
-
-# "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/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
-# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
-   encrypt passwords = no
-
-# If you are using encrypted passwords, Samba will need to know what
-# password database type you are using.  
-   passdb backend = tdbsam
-
-   obey pam restrictions = yes
-
-;   guest account = nobody
-   invalid users = root
-
-# This boolean parameter controls whether Samba attempts to sync the Unix
-# password with the SMB password when the encrypted SMB password in the
-# passdb is changed.
-;   unix password sync = no
-
-# For Unix password sync to work on a Debian GNU/Linux system, the following
-# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
-# sending the correct chat script for the passwd program in Debian Sarge).
-   passwd program = /usr/bin/passwd %u
-   passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
-
-# This boolean controls whether PAM will be used for password changes
-# when requested by an SMB client instead of the program listed in
-# 'passwd program'. The default is 'no'.
-;   pam password change = no
-
-########## Domains ###########
-
-# Is this machine able to authenticate users. Both PDC and BDC
-# must have this setting enabled. If you are the BDC you must
-# change the 'domain master' setting to no
-#
-;   domain logons = yes
-#
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the location of the user's profile directory
-# from the client point of view)
-# The following required a [profiles] share to be setup on the
-# samba server (see below)
-;   logon path = \\%N\profiles\%U
-# Another common choice is storing the profile in the user's home directory
-;   logon path = \\%N\%U\profile
-
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the location of a user's home directory (from the client
-# point of view)
-;   logon drive = H:
-;   logon home = \\%N\%U
-
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the script to run during logon. The script must be stored
-# in the [netlogon] share
-# NOTE: Must be store in 'DOS' file format convention
-;   logon script = logon.cmd
-
-# This allows Unix users to be created on the domain controller via the SAMR
-# RPC pipe.  The example command creates a user account with a disabled Unix
-# password; please adapt to your needs
-; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
-
-########## Printing ##########
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-;   load printers = yes
-
-# lpr(ng) printing. You may wish to override the location of the
-# printcap file
-;   printing = bsd
-;   printcap name = /etc/printcap
-
-# CUPS printing.  See also the cupsaddsmb(8) manpage in the
-# cupsys-client package.
-;   printing = cups
-;   printcap name = cups
-
-# When using [print$], root is implicitly a 'printer admin', but you can
-# also give this right to other users to add drivers and set printer
-# properties
-;   printer admin = @lpadmin
-
-
-############ Misc ############
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-;   include = /home/samba/etc/smb.conf.%m
-
-# Most people will find that this option gives better performance.
-# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/speed.html
-# for details
-# You may want to add the following on a Linux system:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY
-
-# The following parameter is useful only if you have the linpopup package
-# installed. The samba maintainer and the linpopup maintainer are
-# working to ease installation and configuration of linpopup and samba.
-;   message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
-
-# Domain Master specifies Samba to be the Domain Master Browser. If this
-# machine will be configured as a BDC (a secondary logon server), you
-# must set this to 'no'; otherwise, the default behavior is recommended.
-;   domain master = auto
-
-# Some defaults for winbind (make sure you're not using the ranges
-# for something else.)
-;   idmap uid = 10000-20000
-;   idmap gid = 10000-20000
-;   template shell = /bin/bash
-
-#======================= Share Definitions =======================
-
-# Un-comment the following (and tweak the other settings below to suit)
-# to enable the default home directory shares.  This will share each
-# user's home directory as \\server\username
-;[homes]
-;   comment = Home Directories
-;   browseable = no
-
-# By default, \\server\username shares can be connected to by anyone
-# with access to the samba server.  Un-comment the following parameter
-# to make sure that only "username" can connect to \\server\username
-;   valid users = %S
-
-# By default, the home directories are exported read-only. Change next
-# parameter to 'yes' if you want to be able to write to them.
-;   writable = no
-
-# File creation mask is set to 0600 for security reasons. If you want to
-# create files with group=rw permissions, set next parameter to 0664.
-;   create mask = 0600
-
-# Directory creation mask is set to 0700 for security reasons. If you want to
-# create dirs. with group=rw permissions, set next parameter to 0775.
-;   directory mask = 0700
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-# (you need to configure Samba to act as a domain controller too.)
-;[netlogon]
-;   comment = Network Logon Service
-;   path = /home/samba/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-# Un-comment the following and create the profiles directory to store
-# users profiles (see the "logon path" option above)
-# (you need to configure Samba to act as a domain controller too.)
-# The path below should be writable by all users so that their
-# profile directory may be created the first time they log on
-;[profiles]
-;   comment = Users profiles
-;   path = /home/samba/profiles
-;   guest ok = no
-;   browseable = no
-;   create mask = 0600
-;   directory mask = 0700
-
-[printers]
-   comment = All Printers
-   browseable = no
-   path = /tmp
-   printable = yes
-   public = no
-   writable = no
-   create mode = 0700
-
-# Windows clients look for this share name as a source of downloadable
-# printer drivers
-[print$]
-   comment = Printer Drivers
-   path = /var/lib/samba/printers
-   browseable = yes
-   read only = yes
-   guest ok = no
-# Uncomment to allow remote administration of Windows print drivers.
-# Replace 'ntadmin' with the name of the group your admin users are
-# members of.
-;   write list = root, @ntadmin
-
-# A sample share for sharing your CD-ROM with others.
-;[cdrom]
-;   comment = Samba server's CD-ROM
-;   writable = no
-;   locking = no
-;   path = /cdrom
-;   public = yes
-
-# The next two parameters show how to auto-mount a CD-ROM when the
-#	cdrom share is accesed. For this to work /etc/fstab must contain
-#	an entry like this:
-#
-#       /dev/scd0   /cdrom  iso9660 defaults,noauto,ro,user   0 0
-#
-# The CD-ROM gets unmounted automatically after the connection to the
-#
-# If you don't want to use auto-mounting/unmounting make sure the CD
-#	is mounted on /cdrom
-#
-;   preexec = /bin/mount /cdrom
-;   postexec = /bin/umount /cdrom
-

Modified: branches/samba/experimental/debian/smb.conf.etch
===================================================================
--- branches/samba/experimental/debian/smb.conf.etch	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/smb.conf.etch	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,305 +0,0 @@
-#
-# Sample configuration file for the Samba suite for Debian GNU/Linux.
-#
-#
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options most of which 
-# are not shown in this example
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentary and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command
-# "testparm" to check that you have not made any basic syntactic 
-# errors. 
-#
-
-#======================= Global Settings =======================
-
-[global]
-
-## Browsing/Identification ###
-
-# Change this to the workgroup/NT-domain name your Samba server will part of
-   workgroup = WORKGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = %h server
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
-;   wins support = no
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# This will prevent nmbd to search for NetBIOS names through DNS.
-   dns proxy = no
-
-# What naming service and in what order should we use to resolve host names
-# to IP addresses
-;   name resolve order = lmhosts host wins bcast
-
-#### Networking ####
-
-# The specific set of interfaces / networks to bind to
-# This can be either the interface name or an IP address/netmask;
-# interface names are normally preferred
-;   interfaces = 127.0.0.0/8 eth0
-
-# Only bind to the named interfaces and/or networks; you must use the
-# 'interfaces' option above to use this.
-# It is recommended that you enable this feature if your Samba machine is
-# not protected by a firewall or is a firewall itself.  However, this
-# option cannot handle dynamic or non-broadcast interfaces correctly.
-;   bind interfaces only = true
-
-
-
-#### Debugging/Accounting ####
-
-# This tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 1000
-
-# If you want Samba to only log through syslog then set the following
-# parameter to 'yes'.
-;   syslog only = no
-
-# We want Samba to log a minimum amount of information to syslog. Everything
-# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
-# through syslog you should set the following parameter to something higher.
-   syslog = 0
-
-# Do something sensible when Samba crashes: mail the admin a backtrace
-   panic action = /usr/share/samba/panic-action %d
-
-
-####### Authentication #######
-
-# "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/Samba3-HOWTO/ServerType.html
-# in the samba-doc package for details.
-;   security = user
-
-# You may wish to use password encryption.  See the section on
-# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
-   encrypt passwords = no
-
-# If you are using encrypted passwords, Samba will need to know what
-# password database type you are using.  
-   passdb backend = tdbsam
-
-   obey pam restrictions = yes
-
-;   guest account = nobody
-   invalid users = root
-
-# This boolean parameter controls whether Samba attempts to sync the Unix
-# password with the SMB password when the encrypted SMB password in the
-# passdb is changed.
-;   unix password sync = no
-
-# For Unix password sync to work on a Debian GNU/Linux system, the following
-# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
-# sending the correct chat script for the passwd program in Debian Sarge).
-   passwd program = /usr/bin/passwd %u
-   passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
-
-# This boolean controls whether PAM will be used for password changes
-# when requested by an SMB client instead of the program listed in
-# 'passwd program'. The default is 'no'.
-;   pam password change = no
-
-########## Domains ###########
-
-# Is this machine able to authenticate users. Both PDC and BDC
-# must have this setting enabled. If you are the BDC you must
-# change the 'domain master' setting to no
-#
-;   domain logons = yes
-#
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the location of the user's profile directory
-# from the client point of view)
-# The following required a [profiles] share to be setup on the
-# samba server (see below)
-;   logon path = \\%N\profiles\%U
-# Another common choice is storing the profile in the user's home directory
-;   logon path = \\%N\%U\profile
-
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the location of a user's home directory (from the client
-# point of view)
-;   logon drive = H:
-;   logon home = \\%N\%U
-
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the script to run during logon. The script must be stored
-# in the [netlogon] share
-# NOTE: Must be store in 'DOS' file format convention
-;   logon script = logon.cmd
-
-# This allows Unix users to be created on the domain controller via the SAMR
-# RPC pipe.  The example command creates a user account with a disabled Unix
-# password; please adapt to your needs
-; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
-
-########## Printing ##########
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-;   load printers = yes
-
-# lpr(ng) printing. You may wish to override the location of the
-# printcap file
-;   printing = bsd
-;   printcap name = /etc/printcap
-
-# CUPS printing.  See also the cupsaddsmb(8) manpage in the
-# cupsys-client package.
-;   printing = cups
-;   printcap name = cups
-
-# When using [print$], root is implicitly a 'printer admin', but you can
-# also give this right to other users to add drivers and set printer
-# properties
-;   printer admin = @ntadmin
-
-
-############ Misc ############
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-;   include = /home/samba/etc/smb.conf.%m
-
-# Most people will find that this option gives better performance.
-# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/speed.html
-# for details
-# You may want to add the following on a Linux system:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY
-
-# The following parameter is useful only if you have the linpopup package
-# installed. The samba maintainer and the linpopup maintainer are
-# working to ease installation and configuration of linpopup and samba.
-;   message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
-
-# Domain Master specifies Samba to be the Domain Master Browser. If this
-# machine will be configured as a BDC (a secondary logon server), you
-# must set this to 'no'; otherwise, the default behavior is recommended.
-;   domain master = auto
-
-# Some defaults for winbind (make sure you're not using the ranges
-# for something else.)
-;   idmap uid = 10000-20000
-;   idmap gid = 10000-20000
-;   template shell = /bin/bash
-;
-; The following was the default behaviour in sarge
-; but samba upstream reverted the default because it might induce
-; performance issues in large organizations
-; See #368251 for some of the consequences of *not* having
-; this setting and smb.conf(5) for all details
-;
-;   winbind enum groups = yes
-;   winbind enum users = yes
-
-#======================= Share Definitions =======================
-
-[homes]
-   comment = Home Directories
-   browseable = no
-
-# By default, the home directories are exported read-only. Change next
-# parameter to 'yes' if you want to be able to write to them.
-   writable = no
-
-# File creation mask is set to 0700 for security reasons. If you want to
-# create files with group=rw permissions, set next parameter to 0775.
-   create mask = 0700
-
-# Directory creation mask is set to 0700 for security reasons. If you want to
-# create dirs. with group=rw permissions, set next parameter to 0775.
-   directory mask = 0700
-
-# Restrict access to home directories 
-# to the one of the authenticated user
-# This might need tweaking when using external authentication schemes
-   valid users = %S
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-# (you need to configure Samba to act as a domain controller too.)
-;[netlogon]
-;   comment = Network Logon Service
-;   path = /home/samba/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-# Un-comment the following and create the profiles directory to store
-# users profiles (see the "logon path" option above)
-# (you need to configure Samba to act as a domain controller too.)
-# The path below should be writable by all users so that their
-# profile directory may be created the first time they log on
-;[profiles]
-;   comment = Users profiles
-;   path = /home/samba/profiles
-;   guest ok = no
-;   browseable = no
-;   create mask = 0600
-;   directory mask = 0700
-
-[printers]
-   comment = All Printers
-   browseable = no
-   path = /var/spool/samba
-   printable = yes
-   public = no
-   writable = no
-   create mode = 0700
-
-# Windows clients look for this share name as a source of downloadable
-# printer drivers
-[print$]
-   comment = Printer Drivers
-   path = /var/lib/samba/printers
-   browseable = yes
-   read only = yes
-   guest ok = no
-# Uncomment to allow remote administration of Windows print drivers.
-# Replace 'ntadmin' with the name of the group your admin users are
-# members of.
-;   write list = root, @ntadmin
-
-# A sample share for sharing your CD-ROM with others.
-;[cdrom]
-;   comment = Samba server's CD-ROM
-;   writable = no
-;   locking = no
-;   path = /cdrom
-;   public = yes
-
-# The next two parameters show how to auto-mount a CD-ROM when the
-#	cdrom share is accesed. For this to work /etc/fstab must contain
-#	an entry like this:
-#
-#       /dev/scd0   /cdrom  iso9660 defaults,noauto,ro,user   0 0
-#
-# The CD-ROM gets unmounted automatically after the connection to the
-#
-# If you don't want to use auto-mounting/unmounting make sure the CD
-#	is mounted on /cdrom
-#
-;   preexec = /bin/mount /cdrom
-;   postexec = /bin/umount /cdrom
-

Modified: branches/samba/experimental/debian/smb.conf.gutsy
===================================================================
--- branches/samba/experimental/debian/smb.conf.gutsy	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/smb.conf.gutsy	2011-04-15 16:57:51 UTC (rev 3735)
@@ -1,309 +0,0 @@
-#
-# Sample configuration file for the Samba suite for Debian GNU/Linux.
-#
-#
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options most of which 
-# are not shown in this example
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentary and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command
-# "testparm" to check that you have not made any basic syntactic 
-# errors. 
-#
-
-#======================= Global Settings =======================
-
-[global]
-
-## Browsing/Identification ###
-
-# Change this to the workgroup/NT-domain name your Samba server will part of
-   workgroup = WORKGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = %h server (Samba, Ubuntu)
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
-;   wins support = no
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# This will prevent nmbd to search for NetBIOS names through DNS.
-   dns proxy = no
-
-# What naming service and in what order should we use to resolve host names
-# to IP addresses
-;   name resolve order = lmhosts host wins bcast
-
-#### Networking ####
-
-# The specific set of interfaces / networks to bind to
-# This can be either the interface name or an IP address/netmask;
-# interface names are normally preferred
-;   interfaces = 127.0.0.0/8 eth0
-
-# Only bind to the named interfaces and/or networks; you must use the
-# 'interfaces' option above to use this.
-# It is recommended that you enable this feature if your Samba machine is
-# not protected by a firewall or is a firewall itself.  However, this
-# option cannot handle dynamic or non-broadcast interfaces correctly.
-;   bind interfaces only = true
-
-
-
-#### Debugging/Accounting ####
-
-# This tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 1000
-
-# If you want Samba to only log through syslog then set the following
-# parameter to 'yes'.
-;   syslog only = no
-
-# We want Samba to log a minimum amount of information to syslog. Everything
-# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
-# through syslog you should set the following parameter to something higher.
-   syslog = 0
-
-# Do something sensible when Samba crashes: mail the admin a backtrace
-   panic action = /usr/share/samba/panic-action %d
-
-
-####### Authentication #######
-
-# "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/Samba3-HOWTO/ServerType.html
-# in the samba-doc package for details.
-;   security = user
-
-# You may wish to use password encryption.  See the section on
-# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
-   encrypt passwords = no
-
-# If you are using encrypted passwords, Samba will need to know what
-# password database type you are using.  
-   passdb backend = tdbsam
-
-   obey pam restrictions = yes
-
-;   guest account = nobody
-   invalid users = root
-
-# This boolean parameter controls whether Samba attempts to sync the Unix
-# password with the SMB password when the encrypted SMB password in the
-# passdb is changed.
-;   unix password sync = no
-
-# For Unix password sync to work on a Debian GNU/Linux system, the following
-# parameters must be set (thanks to Ian Kahan <<kahan at informatik.tu-muenchen.de> for
-# sending the correct chat script for the passwd program in Debian Sarge).
-   passwd program = /usr/bin/passwd %u
-   passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *passwd:*password\supdated\ssuccessfully* .
-
-# This boolean controls whether PAM will be used for password changes
-# when requested by an SMB client instead of the program listed in
-# 'passwd program'. The default is 'no'.
-;   pam password change = no
-
-########## Domains ###########
-
-# Is this machine able to authenticate users. Both PDC and BDC
-# must have this setting enabled. If you are the BDC you must
-# change the 'domain master' setting to no
-#
-;   domain logons = yes
-#
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the location of the user's profile directory
-# from the client point of view)
-# The following required a [profiles] share to be setup on the
-# samba server (see below)
-;   logon path = \\%N\profiles\%U
-# Another common choice is storing the profile in the user's home directory
-;   logon path = \\%N\%U\profile
-
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the location of a user's home directory (from the client
-# point of view)
-;   logon drive = H:
-;   logon home = \\%N\%U
-
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the script to run during logon. The script must be stored
-# in the [netlogon] share
-# NOTE: Must be store in 'DOS' file format convention
-;   logon script = logon.cmd
-
-# This allows Unix users to be created on the domain controller via the SAMR
-# RPC pipe.  The example command creates a user account with a disabled Unix
-# password; please adapt to your needs
-; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
-
-########## Printing ##########
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-;   load printers = yes
-
-# lpr(ng) printing. You may wish to override the location of the
-# printcap file
-;   printing = bsd
-;   printcap name = /etc/printcap
-
-# CUPS printing.  See also the cupsaddsmb(8) manpage in the
-# cupsys-client package.
-;   printing = cups
-;   printcap name = cups
-
-# When using [print$], root is implicitly a 'printer admin', but you can
-# also give this right to other users to add drivers and set printer
-# properties
-;   printer admin = @lpadmin
-
-
-############ Misc ############
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-;   include = /home/samba/etc/smb.conf.%m
-
-# Most people will find that this option gives better performance.
-# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/speed.html
-# for details
-# You may want to add the following on a Linux system:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY
-
-# The following parameter is useful only if you have the linpopup package
-# installed. The samba maintainer and the linpopup maintainer are
-# working to ease installation and configuration of linpopup and samba.
-;   message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
-
-# Domain Master specifies Samba to be the Domain Master Browser. If this
-# machine will be configured as a BDC (a secondary logon server), you
-# must set this to 'no'; otherwise, the default behavior is recommended.
-;   domain master = auto
-
-# Some defaults for winbind (make sure you're not using the ranges
-# for something else.)
-;   idmap uid = 10000-20000
-;   idmap gid = 10000-20000
-;   template shell = /bin/bash
-;
-; The following was the default behaviour in sarge
-; but samba upstream reverted the default because it might induce
-; performance issues in large organizations
-; See #368251 for some of the consequences of *not* having
-; this setting and smb.conf(5) for all details
-;
-;   winbind enum groups = yes
-;   winbind enum users = yes
-
-#======================= Share Definitions =======================
-
-# Un-comment the following (and tweak the other settings below to suit)
-# to enable the default home directory shares.  This will share each
-# user's home directory as \\server\username
-;[homes]
-;   comment = Home Directories
-;   browseable = no
-
-# By default, \\server\username shares can be connected to by anyone
-# with access to the samba server.  Un-comment the following parameter
-# to make sure that only "username" can connect to \\server\username
-# This might need tweaking when using external authentication schemes
-;   valid users = %S
-
-# By default, the home directories are exported read-only. Change next
-# parameter to 'yes' if you want to be able to write to them.
-;   writable = no
-
-# File creation mask is set to 0700 for security reasons. If you want to
-# create files with group=rw permissions, set next parameter to 0775.
-;   create mask = 0700
-
-# Directory creation mask is set to 0700 for security reasons. If you want to
-# create dirs. with group=rw permissions, set next parameter to 0775.
-;   directory mask = 0700
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-# (you need to configure Samba to act as a domain controller too.)
-;[netlogon]
-;   comment = Network Logon Service
-;   path = /home/samba/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-# Un-comment the following and create the profiles directory to store
-# users profiles (see the "logon path" option above)
-# (you need to configure Samba to act as a domain controller too.)
-# The path below should be writable by all users so that their
-# profile directory may be created the first time they log on
-;[profiles]
-;   comment = Users profiles
-;   path = /home/samba/profiles
-;   guest ok = no
-;   browseable = no
-;   create mask = 0600
-;   directory mask = 0700
-
-[printers]
-   comment = All Printers
-   browseable = no
-   path = /var/spool/samba
-   printable = yes
-   public = no
-   writable = no
-   create mode = 0700
-
-# Windows clients look for this share name as a source of downloadable
-# printer drivers
-[print$]
-   comment = Printer Drivers
-   path = /var/lib/samba/printers
-   browseable = yes
-   read only = yes
-   guest ok = no
-# Uncomment to allow remote administration of Windows print drivers.
-# Replace 'ntadmin' with the name of the group your admin users are
-# members of.
-;   write list = root, @ntadmin
-
-# A sample share for sharing your CD-ROM with others.
-;[cdrom]
-;   comment = Samba server's CD-ROM
-;   writable = no
-;   locking = no
-;   path = /cdrom
-;   public = yes
-
-# The next two parameters show how to auto-mount a CD-ROM when the
-#	cdrom share is accesed. For this to work /etc/fstab must contain
-#	an entry like this:
-#
-#       /dev/scd0   /cdrom  iso9660 defaults,noauto,ro,user   0 0
-#
-# The CD-ROM gets unmounted automatically after the connection to the
-#
-# If you don't want to use auto-mounting/unmounting make sure the CD
-#	is mounted on /cdrom
-#
-;   preexec = /bin/mount /cdrom
-;   postexec = /bin/umount /cdrom
-

Modified: branches/samba/experimental/debian/swat.postinst
===================================================================
--- branches/samba/experimental/debian/swat.postinst	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/swat.postinst	2011-04-15 16:57:51 UTC (rev 3735)
@@ -3,17 +3,8 @@
 action="$1"
 oldversion="$2"
 
-# Set up swat, turned off by default.
+# Set up swat
 update-inetd --group OTHER --add \
  'swat\t\tstream\ttcp\tnowait.400\troot\t/usr/sbin/tcpd\t/usr/sbin/swat'
 
-# Fix symlinks
-for dir in manpages Samba3-ByExample Samba3-Developers-Guide Samba3-HOWTO; do
-	if [ ! -L /usr/share/samba/swat/help/$dir ] && \
-	   dpkg --compare-versions "$oldversion" lt-nl 3.0.20b-3; then
-		rm -rf /usr/share/samba/swat/help/$dir
-		ln -s ../../../doc/samba-doc/htmldocs/$dir /usr/share/samba/swat/help/$dir
-	fi
-done
-
 #DEBHELPER#

Modified: branches/samba/experimental/debian/winbind.logrotate
===================================================================
--- branches/samba/experimental/debian/winbind.logrotate	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/winbind.logrotate	2011-04-15 16:57:51 UTC (rev 3735)
@@ -3,7 +3,7 @@
 	missingok
 	rotate 7
 	postrotate
-	[ -f /var/run/samba/winbindd.pid ] && kill -HUP `cat /var/run/samba/winbindd.pid`
+	[ ! -f /var/run/samba/winbindd.pid ] || kill -HUP `cat /var/run/samba/winbindd.pid`
 	endscript
 	compress
 	notifempty

Modified: branches/samba/experimental/debian/winbind.postinst
===================================================================
--- branches/samba/experimental/debian/winbind.postinst	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/debian/winbind.postinst	2011-04-15 16:57:51 UTC (rev 3735)
@@ -13,6 +13,13 @@
         mv /var/run/samba/idmap_cache.tdb /var/cache/samba/idmap_cache.tdb
 fi
 
+if dpkg --compare-versions "$2" lt-nl 2:3.5.4~dfsg-2 \
+   && [ -e /etc/samba/idmap2.tdb ] \
+   && ! [ -e /var/lib/samba/idmap2.tdb ]
+then
+	mv /etc/samba/idmap2.tdb /var/lib/samba/idmap2.tdb
+fi
+
 pam-auth-update --package
 
 #DEBHELPER#

Modified: branches/samba/experimental/source3/param/loadparm.c
===================================================================
--- branches/samba/experimental/source3/param/loadparm.c	2011-04-15 06:13:06 UTC (rev 3734)
+++ branches/samba/experimental/source3/param/loadparm.c	2011-04-15 16:57:51 UTC (rev 3735)
@@ -5461,7 +5461,7 @@
 	string_set(&Globals.szUsersharePath, s);
 	SAFE_FREE(s);
 	string_set(&Globals.szUsershareTemplateShare, "");
-	Globals.iUsershareMaxShares = 0;
+	Globals.iUsershareMaxShares = 100;
 	/* By default disallow sharing of directories not owned by the sharer. */
 	Globals.bUsershareOwnerOnly = True;
 	/* By default disallow guest access to usershares. */





More information about the Pkg-samba-maint mailing list