Merge lp:~ubuntu-branches/ubuntu/maverick/samba/maverick-201008202322 into lp:ubuntu/maverick/samba

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/samba now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/samba/maverick-201008202322. A merge should be performed if necessary.

Unmerged revisions

121. By Steve Langasek on 2010-08-20

merge fix from Surbhi

120. By Steve Langasek on 2010-08-20

revert spurious change to debian/smb.conf

119. By Steve Langasek on 2010-08-20

revert spurious changes to debian/po

=== added file 'debian/patches/error-trans.fix-276472'
--- debian/patches/error-trans.fix-276472	1970-01-01 00:00:00 +0000
+++ debian/patches/error-trans.fix-276472	2010-08-20 23:31:00 +0000
@@ -0,0 +1,15 @@
+Index: b/source3/lib/errmap_unix.c
+===================================================================
+--- a/source3/lib/errmap_unix.c
++++ b/source3/lib/errmap_unix.c
+@@ -105,7 +105,9 @@
+ #ifdef ECANCELED
+ 	{ ECANCELED, ERRDOS, ERRbadfid, NT_STATUS_CANCELLED},
+ #endif
+-
++#ifdef ENOTSUP
++        { ENOTSUP, ERRSRV, ERRnosupport, NT_STATUS_NOT_SUPPORTED},
++#endif
+ 	{ 0, 0, 0, NT_STATUS_OK }
+ };
+ 
 
=== renamed file 'debian/patches/error-trans.fix-276472' => 'debian/patches/error-trans.fix-276472.moved'
=== modified file 'debian/po/ar.po'
--- debian/po/ar.po	2010-07-15 13:26:21 +0000
+++ debian/po/ar.po	2010-08-20 23:31:00 +0000
@@ -13,10 +13,10 @@
 "PO-Revision-Date: 2007-03-14 11:37+0300\n"
 "Last-Translator: Ossama M. Khayat <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2010-07-15 13:26:21 +0000
+++ debian/po/ast.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2009-01-15 09:17+0100\n"
 "Last-Translator: astur <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Asturian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
=== modified file 'debian/po/be.po'
--- debian/po/be.po	2010-07-15 13:26:21 +0000
+++ debian/po/be.po	2010-08-20 23:31:00 +0000
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2009-02-19 04:33+0200\n"
 "Last-Translator: Pavel Piatruk <[e-mail]>\n"
 "Language-Team: Belarusian (Official spelling) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/bg.po'
--- debian/po/bg.po	2010-07-15 13:26:21 +0000
+++ debian/po/bg.po	2010-08-20 23:31:00 +0000
@@ -9,10 +9,10 @@
 "PO-Revision-Date: 2007-03-12 22:58+0200\n"
 "Last-Translator: Damyan Ivanov <[e-mail]>\n"
 "Language-Team: Bulgarian <[e-mail]>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/bn.po'
--- debian/po/bn.po	2010-07-15 13:26:21 +0000
+++ debian/po/bn.po	2010-08-20 23:31:00 +0000
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2009-04-16 12:12+0600\n"
 "Last-Translator: Md. Rezwan Shahid <[e-mail]>\n"
 "Language-Team: Bengali <[e-mail]>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: WordForge 0.5-beta1\n"
 
 
=== modified file 'debian/po/bs.po'
--- debian/po/bs.po	2010-07-15 13:26:21 +0000
+++ debian/po/bs.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2006-11-01 22:14+0100\n"
 "Last-Translator: Safir Secerovic <[e-mail]>\n"
 "Language-Team: Bosnian <[e-mail]>\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bs\n"
 "Plural-Forms: 3\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/ca.po'
--- debian/po/ca.po	2010-07-15 13:26:21 +0000
+++ debian/po/ca.po	2010-08-20 23:31:00 +0000
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2006-08-13 15:16-0700\n"
 "Last-Translator: Jordi Mallach <[e-mail]>\n"
 "Language-Team: Debian L10n Catalan <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
@@ -233,8 +233,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 file 'debian/po/cs.po'
--- debian/po/cs.po	2010-07-15 13:26:21 +0000
+++ debian/po/cs.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2009-06-27 10:58+0200\n"
 "Last-Translator: Miroslav Kure <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/da.po'
--- debian/po/da.po	2010-07-15 13:26:21 +0000
+++ debian/po/da.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2007-05-30 22:20+0200\n"
 "Last-Translator: Claus Hindsgaul <[e-mail]>\n"
 "Language-Team: Danish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/de.po'
--- debian/po/de.po	2010-07-15 13:26:21 +0000
+++ debian/po/de.po	2010-08-20 23:31:00 +0000
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2009-07-09 22:59+0200\n"
 "Last-Translator: Holger Wansing <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/dz.po'
--- debian/po/dz.po	2010-07-15 13:26:21 +0000
+++ debian/po/dz.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-13 02:22+0530\n"
 "Last-Translator: translator <[e-mail]>\n"
 "Language-Team: dzongkha <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2;plural=(n!=1);\n"
 "X-Poedit-Language: dzongkha\n"
 "X-Poedit-Country: bhutan\n"
 
=== modified file 'debian/po/el.po'
--- debian/po/el.po	2010-07-15 13:26:21 +0000
+++ debian/po/el.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-16 11:29+0200\n"
 "Last-Translator: galaxico\n"
 "Language-Team:  <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 
=== modified file 'debian/po/eo.po'
--- debian/po/eo.po	2010-07-15 13:26:21 +0000
+++ debian/po/eo.po	2010-08-20 23:31:00 +0000
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2009-03-11 06:04-0300\n"
 "Last-Translator: Felipe Castro <[e-mail]>\n"
 "Language-Team: Esperanto <[e-mail]>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/es.po'
--- debian/po/es.po	2010-07-15 13:26:21 +0000
+++ debian/po/es.po	2010-08-20 23:31:00 +0000
@@ -42,10 +42,10 @@
 "PO-Revision-Date: 2006-10-08 13:43+0200\n"
 "Last-Translator: Steve Langasek <[e-mail]>\n"
 "Language-Team: Debian Spanish <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
@@ -201,7 +201,8 @@
 "sistemas Windows. Para hacer esto es necesario crear un fichero, distinto "
 "del /etc/passwd, donde se guarden las contraseñas de los usuarios. El "
 "fichero se puede crear automaticamente, aunque es necesario añadir las "
-"contraseñas manualmente mediante el programa «smbpasswd» y mantenerlas al día."
+"contraseñas manualmente mediante el programa «smbpasswd» y mantenerlas al "
+"día."
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/et.po'
--- debian/po/et.po	2010-07-15 13:26:21 +0000
+++ debian/po/et.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-13 10:26+0300\n"
 "Last-Translator: Siim Põder <[e-mail]>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Country: ESTONIA\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/eu.po'
--- debian/po/eu.po	2010-07-15 13:26:21 +0000
+++ debian/po/eu.po	2010-08-20 23:31:00 +0000
@@ -21,10 +21,10 @@
 "PO-Revision-Date: 2007-04-07 23:18+0200\n"
 "Last-Translator: Piarres Beobide <[e-mail]>\n"
 "Language-Team: librezale <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 
=== modified file 'debian/po/fi.po'
--- debian/po/fi.po	2010-07-15 13:26:21 +0000
+++ debian/po/fi.po	2010-08-20 23:31:00 +0000
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2007-03-13 18:35+0200\n"
 "Last-Translator: Tapio Lehtonen <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2010-07-15 13:26:21 +0000
+++ debian/po/fr.po	2010-08-20 23:31:00 +0000
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2008-12-29 12:32+0100\n"
 "Last-Translator: Christian Perrier <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2010-07-15 13:26:21 +0000
+++ debian/po/gl.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-12 20:24+0100\n"
 "Last-Translator: Jacobo Tarrio <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/gu.po'
--- debian/po/gu.po	2010-07-15 13:26:21 +0000
+++ debian/po/gu.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-06-08 20:22+0530\n"
 "Last-Translator: Kartik Mistry <[e-mail]>\n"
 "Language-Team: Gujarati <[e-mail]>\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gu\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/he.po'
--- debian/po/he.po	2010-07-15 13:26:21 +0000
+++ debian/po/he.po	2010-08-20 23:31:00 +0000
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2007-09-25 21:03+0200\n"
 "Last-Translator: Katriel Traum <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2010-07-15 13:26:21 +0000
+++ debian/po/hu.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2007-03-13 09:20+0100\n"
 "Last-Translator: SZERVÁC Attila <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
 
=== modified file 'debian/po/id.po'
--- debian/po/id.po	2010-07-15 13:26:21 +0000
+++ debian/po/id.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2008-03-08 18:24+0700\n"
 "Last-Translator: Arief S Fitrianto <[e-mail]>\n"
 "Language-Team: Bahasa Indonesia <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplural=1, plural>1\n"
 
 
=== modified file 'debian/po/it.po'
--- debian/po/it.po	2010-07-15 13:26:21 +0000
+++ debian/po/it.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2009-05-18 21:47+0200\n"
 "Last-Translator: Luca Monducci <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2010-07-15 13:26:21 +0000
+++ debian/po/ja.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-13 16:39+0900\n"
 "Last-Translator: Kenshi Muto <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/ka.po'
--- debian/po/ka.po	2010-07-15 13:26:21 +0000
+++ debian/po/ka.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2008-09-10 01:45+0400\n"
 "Last-Translator: Aiet Kolkhi <[e-mail]>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/km.po'
--- debian/po/km.po	2010-07-15 13:26:21 +0000
+++ debian/po/km.po	2010-08-20 23:31:00 +0000
@@ -21,10 +21,10 @@
 "PO-Revision-Date: 2007-03-13 08:39+0700\n"
 "Last-Translator: Khoem Sokhem <[e-mail]>\n"
 "Language-Team: Khmer <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #  Type: boolean
 
=== modified file 'debian/po/ko.po'
--- debian/po/ko.po	2010-07-15 13:26:21 +0000
+++ debian/po/ko.po	2010-08-20 23:31:00 +0000
@@ -8,10 +8,10 @@
 "PO-Revision-Date: 2007-03-14 09:28-0400\n"
 "Last-Translator: Sunjae Park <[e-mail]>\n"
 "Language-Team: Korean <[e-mail]>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/ku.po'
--- debian/po/ku.po	2010-07-15 13:26:21 +0000
+++ debian/po/ku.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "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 <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KAider 0.1\n"
 "Plural-Forms: nplurals=2; plural= n != 1;\n"
 
 
=== modified file 'debian/po/lt.po'
--- debian/po/lt.po	2010-07-15 13:26:21 +0000
+++ debian/po/lt.po	2010-08-20 23:31:00 +0000
@@ -19,13 +19,13 @@
 "PO-Revision-Date: 2006-11-26 00:20+0200\n"
 "Last-Translator: Gintautas Miliauskas <[e-mail]>\n"
 "Language-Team: Lithuanian <[e-mail]>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\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 file 'debian/po/ml.po'
--- debian/po/ml.po	2010-07-15 13:26:21 +0000
+++ debian/po/ml.po	2010-08-20 23:31:00 +0000
@@ -22,10 +22,10 @@
 "Last-Translator: Praveen A <[e-mail]>\n"
 "Language-Team: Swathanthra Malayalam Computing <smc-discuss@googlegroups."
 "com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/mr.po'
--- debian/po/mr.po	2010-07-15 13:26:21 +0000
+++ debian/po/mr.po	2010-08-20 23:31:00 +0000
@@ -20,10 +20,10 @@
 "Last-Translator: Priti Patil <[e-mail]>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "
 "<[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
@@ -245,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 file 'debian/po/nb.po'
--- debian/po/nb.po	2010-07-15 13:26:21 +0000
+++ debian/po/nb.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-12 21:44+0100\n"
 "Last-Translator: Bjørn Steensrud <[e-mail]>\n"
 "Language-Team: Norwegian Bokmål <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
@@ -43,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
@@ -73,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 file 'debian/po/ne.po'
--- debian/po/ne.po	2010-07-15 13:26:21 +0000
+++ debian/po/ne.po	2010-08-20 23:31:00 +0000
@@ -21,10 +21,10 @@
 "PO-Revision-Date: 2007-03-14 05:36+0545\n"
 "Last-Translator: Shiva Pokharel <[e-mail]>\n"
 "Language-Team: Nepali <[e-mail]>\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ne\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; nplural(n!=1)\n"
 
 
=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2010-07-15 13:26:21 +0000
+++ debian/po/nl.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-12 21:30+0100\n"
 "Last-Translator: Bart Cornelis <[e-mail]>\n"
 "Language-Team: debian-l10n-dutch <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Dutch\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/nn.po'
--- debian/po/nn.po	2010-07-15 13:26:21 +0000
+++ debian/po/nn.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2007-03-17 18:35+0100\n"
 "Last-Translator: Håvard Korsvoll <[e-mail]>\n"
 "Language-Team: Norwegian nynorsk <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
@@ -66,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 file 'debian/po/pl.po'
--- debian/po/pl.po	2010-07-15 13:26:21 +0000
+++ debian/po/pl.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2008-09-12 10:08+0200\n"
 "Last-Translator: Tomasz Majbaum <[e-mail]>\n"
 "Language-Team: polski <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/pt.po'
--- debian/po/pt.po	2010-07-15 13:26:21 +0000
+++ debian/po/pt.po	2010-08-20 23:31:00 +0000
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2010-03-30 21:36+0100\n"
 "Last-Translator: Miguel Figueiredo <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2010-07-15 13:26:21 +0000
+++ debian/po/pt_BR.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-12 16:16-0200\n"
 "Last-Translator: André Luís Lopes <[e-mail]>\n"
 "Language-Team: Debian-BR Project <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2010-07-15 13:26:21 +0000
+++ debian/po/ro.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2008-06-29 19:42+0300\n"
 "Last-Translator: Eddy Petrișor <[e-mail]>\n"
 "Language-Team: Romanian <[e-mail]>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2010-07-15 13:26:21 +0000
+++ debian/po/ru.po	2010-08-20 23:31:00 +0000
@@ -11,13 +11,13 @@
 "PO-Revision-Date: 2009-06-27 13:27+0400\n"
 "Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\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 file 'debian/po/sk.po'
--- debian/po/sk.po	2010-07-15 13:26:21 +0000
+++ debian/po/sk.po	2010-08-20 23:31:00 +0000
@@ -23,10 +23,10 @@
 "PO-Revision-Date: 2009-02-15 08:16+0100\n"
 "Last-Translator: Ivan Masár <[e-mail]>\n"
 "Language-Team: Slovak <[e-mail]>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/sl.po'
--- debian/po/sl.po	2010-07-15 13:26:21 +0000
+++ debian/po/sl.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-13 08:06+0100\n"
 "Last-Translator: Matej Kovačič <[e-mail]>\n"
 "Language-Team: Sl <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
=== modified file 'debian/po/sq.po'
--- debian/po/sq.po	2010-07-15 13:26:21 +0000
+++ debian/po/sq.po	2010-08-20 23:31:00 +0000
@@ -18,10 +18,10 @@
 "PO-Revision-Date: 2007-03-13 21:25+0100\n"
 "Last-Translator: Elian Myftiu <[e-mail]>\n"
 "Language-Team: Debian L10n Albanian <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/sv.po'
--- debian/po/sv.po	2010-07-15 13:26:21 +0000
+++ debian/po/sv.po	2010-08-20 23:31:00 +0000
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2009-02-23 01:51+0100\n"
 "Last-Translator: Martin Bagge <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "X-Poedit-Language: Swedish\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/ta.po'
--- debian/po/ta.po	2010-07-15 13:26:21 +0000
+++ debian/po/ta.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2006-12-16 20:10+0530\n"
 "Last-Translator: drtvasudevan <[e-mail]>\n"
 "Language-Team: TAMIL <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/th.po'
--- debian/po/th.po	2010-07-15 13:26:21 +0000
+++ debian/po/th.po	2010-08-20 23:31:00 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2007-03-13 10:05+0700\n"
 "Last-Translator:  Theppitak Karoonboonyanan <[e-mail]>\n"
 "Language-Team: Thai <[e-mail]>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/tl.po'
--- debian/po/tl.po	2010-07-15 13:26:21 +0000
+++ debian/po/tl.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-03-13 06:13+0800\n"
 "Last-Translator: eric pareja <[e-mail]>\n"
 "Language-Team: Tagalog <[e-mail]>\n"
+"Language: tl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tl\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/tr.po'
--- debian/po/tr.po	2010-07-15 13:26:21 +0000
+++ debian/po/tr.po	2010-08-20 23:31:00 +0000
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2007-03-13 18:47+0200\n"
 "Last-Translator: Mehmet Türker <[e-mail]>\n"
 "Language-Team: Turkish <[e-mail]>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/vi.po'
--- debian/po/vi.po	2010-07-15 13:26:21 +0000
+++ debian/po/vi.po	2010-08-20 23:31:00 +0000
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2009-02-15 15:57+1030\n"
 "Last-Translator: Clytie Siddall <[e-mail]>\n"
 "Language-Team: Vietnamese <[e-mail]>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
@@ -35,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
@@ -64,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
@@ -116,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 file 'debian/po/wo.po'
--- debian/po/wo.po	2010-07-15 13:26:21 +0000
+++ debian/po/wo.po	2010-08-20 23:31:00 +0000
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2007-04-30 18:13+0000\n"
 "Last-Translator: Mouhamadou Mamoune Mbacke <[e-mail]>\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"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
 
=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2010-07-15 13:26:21 +0000
+++ debian/po/zh_CN.po	2010-08-20 23:31:00 +0000
@@ -23,10 +23,10 @@
 "PO-Revision-Date: 2006-10-03 19:36-0500\n"
 "Last-Translator: Carlos Z.F. Liu <[e-mail]>\n"
 "Language-Team: Debian Chinese [GB] <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2010-07-15 13:26:21 +0000
+++ debian/po/zh_TW.po	2010-08-20 23:31:00 +0000
@@ -20,10 +20,10 @@
 "Last-Translator: Tetralet <[e-mail]>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description