[Pkg-samba-maint] r3658 - in branches/samba/backports.org/lenny/debian: . patches po

bubulle at alioth.debian.org bubulle at alioth.debian.org
Sat Dec 18 17:28:01 UTC 2010


tags 593823 pending
tags 601101 pending
tags 601364 pending
tags 601366 pending
tags 601633 pending
tags 601719 pending
tags 602220 pending
tags 605729 pending
thanks

Author: bubulle
Date: 2010-12-18 17:27:57 +0000 (Sat, 18 Dec 2010)
New Revision: 3658

Added:
   branches/samba/backports.org/lenny/debian/patches/bug_605728_upstream_7791.patch
Modified:
   branches/samba/backports.org/lenny/debian/changelog
   branches/samba/backports.org/lenny/debian/control
   branches/samba/backports.org/lenny/debian/patches/series
   branches/samba/backports.org/lenny/debian/po/bg.po
   branches/samba/backports.org/lenny/debian/po/ca.po
   branches/samba/backports.org/lenny/debian/po/el.po
   branches/samba/backports.org/lenny/debian/po/he.po
   branches/samba/backports.org/lenny/debian/po/ja.po
   branches/samba/backports.org/lenny/debian/po/ku.po
   branches/samba/backports.org/lenny/debian/po/nl.po
   branches/samba/backports.org/lenny/debian/po/tr.po
   branches/samba/backports.org/lenny/debian/rules
Log:
Merge from trunk

Modified: branches/samba/backports.org/lenny/debian/changelog
===================================================================
--- branches/samba/backports.org/lenny/debian/changelog	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/changelog	2010-12-18 17:27:57 UTC (rev 3658)
@@ -1,3 +1,36 @@
+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+bpo50+2) lenny-backports; urgency=low
 
   * Drop 0-byte postinst and prerm files for libpam-smbpass and winbind.

Modified: branches/samba/backports.org/lenny/debian/control
===================================================================
--- branches/samba/backports.org/lenny/debian/control	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/control	2010-12-18 17:27:57 UTC (rev 3658)
@@ -5,11 +5,11 @@
 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 [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, 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],
+	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],
 	pkg-config, quilt (>=0.46-7~)
 Build-Conflicts: libfam-dev
@@ -208,6 +208,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

Copied: branches/samba/backports.org/lenny/debian/patches/bug_605728_upstream_7791.patch (from rev 3657, tags/samba/2:3.5.6~dfsg-3/debian/patches/bug_605728_upstream_7791.patch)
===================================================================
--- branches/samba/backports.org/lenny/debian/patches/bug_605728_upstream_7791.patch	                        (rev 0)
+++ branches/samba/backports.org/lenny/debian/patches/bug_605728_upstream_7791.patch	2010-12-18 17:27:57 UTC (rev 3658)
@@ -0,0 +1,50 @@
+From 2a9eaf741d8c169b8f06ee6498a6879acc654506 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra at samba.org>
+Date: Thu, 11 Nov 2010 09:44:21 -0800
+Subject: [PATCH] Fix bug #7791 - gvfsd-smb (Gnome vfs) fails to copy files from a SMB share using SMB signing.
+
+The underlying problem is that the old code invoked by cli_write() increments
+cli->mid directly when issuing outstanding writes. This should now be done only
+in libsmb/clientgen.c to make metze's new signing engine works correctly. Just
+deleting this code fixes the problem.
+
+Jeremy.
+---
+ source3/libsmb/clireadwrite.c |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
+index 6342de4..1f5f925 100644
+--- a/source3/libsmb/clireadwrite.c
++++ b/source3/libsmb/clireadwrite.c
+@@ -704,8 +704,7 @@ static bool cli_issue_write(struct cli_state *cli,
+ 				off_t offset,
+ 				uint16 mode,
+ 				const char *buf,
+-				size_t size,
+-				int i)
++				size_t size)
+ {
+ 	char *p;
+ 	bool large_writex = false;
+@@ -779,8 +778,6 @@ static bool cli_issue_write(struct cli_state *cli,
+ 		cli_setup_bcc(cli, p+size);
+ 	}
+ 
+-	SSVAL(cli->outbuf,smb_mid,cli->mid + i);
+-
+ 	show_msg(cli->outbuf);
+ 	if (direct_writes) {
+ 		/* For direct writes we now need to write the data
+@@ -829,7 +826,7 @@ ssize_t cli_write(struct cli_state *cli,
+ 			if (!cli_issue_write(cli, fnum, offset + bsent,
+ 			                write_mode,
+ 			                buf + bsent,
+-					size1, issued))
++					size1))
+ 				return -1;
+ 			issued++;
+ 		}
+-- 
+1.7.3.1
+

Modified: branches/samba/backports.org/lenny/debian/patches/series
===================================================================
--- branches/samba/backports.org/lenny/debian/patches/series	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/patches/series	2010-12-18 17:27:57 UTC (rev 3658)
@@ -11,3 +11,4 @@
 smbtar-bashism.patch
 no-unnecessary-cups.patch
 autoconf.patch
+bug_605728_upstream_7791.patch

Modified: branches/samba/backports.org/lenny/debian/po/bg.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/bg.po	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/po/bg.po	2010-12-18 17:27:57 UTC (rev 3658)
@@ -1,19 +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
@@ -86,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 "
@@ -98,8 +94,9 @@
 "name used with the \"security=domain\" setting."
 msgstr ""
 "Въведете името на работната група, от която ще бъде част компютъра. Този "
-"параметър контролира и името на домейна, което ще се използва при "
-"настройката „security=domain“."
+"параметър контролира името на компютъра, когато се използва като сървър, "
+"работната група по подразбиране при разглеждане на мрежата и името на "
+"домейна, което ще се използва при настройката „security=domain“."
 
 #. Type: boolean
 #. Description
@@ -110,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/backports.org/lenny/debian/po/ca.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/ca.po	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/po/ca.po	2010-12-18 17:27:57 UTC (rev 3658)
@@ -1,16 +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: \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"
@@ -20,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
@@ -35,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."
@@ -68,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."
@@ -93,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
@@ -117,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

Modified: branches/samba/backports.org/lenny/debian/po/el.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/el.po	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/po/el.po	2010-12-18 17:27:57 UTC (rev 3658)
@@ -11,19 +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
@@ -106,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
@@ -131,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/backports.org/lenny/debian/po/he.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/he.po	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/po/he.po	2010-12-18 17:27:57 UTC (rev 3658)
@@ -1,22 +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
@@ -68,7 +70,7 @@
 "הרקע של Samba (שהם smbd ו-nmbd). הקובץ smb.conf הנוכחי שלך כולל שורת "
 "'include' או פרמטר אשר מתפרש על כמה שורות. פרמטרים אלו עשויים לבלבל את תהליך "
 "ההגדרה האוטומטי, ויצריכו עריכה ידנית של הקובץ smb.conf על מנת לתקן את הבעיות "
-"ולאפשר ל-Samba לעובד."
+"ולאפשר ל-Samba לעבוד."
 
 #. Type: boolean
 #. Description
@@ -85,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
@@ -114,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
@@ -176,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
@@ -186,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
@@ -215,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/backports.org/lenny/debian/po/ja.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/ja.po	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/po/ja.po	2010-12-18 17:27:57 UTC (rev 3658)
@@ -16,7 +16,7 @@
 "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"
@@ -98,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
@@ -122,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
@@ -223,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/backports.org/lenny/debian/po/ku.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/ku.po	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/po/ku.po	2010-12-18 17:27:57 UTC (rev 3658)
@@ -1,22 +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"
-"Language: \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
@@ -35,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
@@ -60,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
@@ -69,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
@@ -85,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
@@ -100,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
@@ -110,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
@@ -127,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
@@ -135,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
@@ -143,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
@@ -169,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/backports.org/lenny/debian/po/nl.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/nl.po	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/po/nl.po	2010-12-18 17:27:57 UTC (rev 3658)
@@ -16,8 +16,8 @@
 "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"
@@ -43,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."
 
@@ -76,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
@@ -101,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
@@ -125,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/backports.org/lenny/debian/po/tr.po
===================================================================
--- branches/samba/backports.org/lenny/debian/po/tr.po	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/po/tr.po	2010-12-18 17:27:57 UTC (rev 3658)
@@ -7,8 +7,8 @@
 "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"
@@ -94,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
@@ -119,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/backports.org/lenny/debian/rules
===================================================================
--- branches/samba/backports.org/lenny/debian/rules	2010-12-18 07:26:15 UTC (rev 3657)
+++ branches/samba/backports.org/lenny/debian/rules	2010-12-18 17:27:57 UTC (rev 3658)
@@ -240,7 +240,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
@@ -250,9 +250,9 @@
 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" \
+	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 patch unpatch update-archs





More information about the Pkg-samba-maint mailing list