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

Proposed by James Westby on 2010-08-20
Status: Work in progress
Proposed branch: lp:~ubuntu-branches/ubuntu/maverick/samba/maverick-201008202322
Merge into: lp:ubuntu/maverick/samba
Diff against target: 990 lines (+99/-82) (has conflicts)
54 files modified
debian/patches/error-trans.fix-276472 (+15/-0)
debian/po/ar.po (+1/-1)
debian/po/ast.po (+1/-1)
debian/po/be.po (+1/-1)
debian/po/bg.po (+1/-1)
debian/po/bn.po (+1/-1)
debian/po/bs.po (+1/-1)
debian/po/ca.po (+3/-3)
debian/po/cs.po (+1/-1)
debian/po/da.po (+1/-1)
debian/po/de.po (+1/-1)
debian/po/dz.po (+1/-1)
debian/po/el.po (+1/-1)
debian/po/eo.po (+1/-1)
debian/po/es.po (+3/-2)
debian/po/et.po (+1/-1)
debian/po/eu.po (+1/-1)
debian/po/fi.po (+1/-1)
debian/po/fr.po (+1/-1)
debian/po/gl.po (+1/-1)
debian/po/gu.po (+1/-1)
debian/po/he.po (+1/-1)
debian/po/hu.po (+1/-1)
debian/po/id.po (+1/-1)
debian/po/it.po (+1/-1)
debian/po/ja.po (+1/-1)
debian/po/ka.po (+1/-1)
debian/po/km.po (+1/-1)
debian/po/ko.po (+1/-1)
debian/po/ku.po (+1/-1)
debian/po/lt.po (+3/-3)
debian/po/ml.po (+1/-1)
debian/po/mr.po (+4/-4)
debian/po/nb.po (+6/-6)
debian/po/ne.po (+1/-1)
debian/po/nl.po (+1/-1)
debian/po/nn.po (+5/-5)
debian/po/pl.po (+1/-1)
debian/po/pt.po (+1/-1)
debian/po/pt_BR.po (+1/-1)
debian/po/ro.po (+1/-1)
debian/po/ru.po (+3/-3)
debian/po/sk.po (+1/-1)
debian/po/sl.po (+1/-1)
debian/po/sq.po (+1/-1)
debian/po/sv.po (+1/-1)
debian/po/ta.po (+1/-1)
debian/po/th.po (+1/-1)
debian/po/tl.po (+1/-1)
debian/po/tr.po (+1/-1)
debian/po/vi.po (+12/-11)
debian/po/wo.po (+1/-1)
debian/po/zh_CN.po (+1/-1)
debian/po/zh_TW.po (+1/-1)
Conflict adding file debian/patches/error-trans.fix-276472.  Moved existing file to debian/patches/error-trans.fix-276472.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/maverick/samba/maverick-201008202322

Description of the change

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.

To post a comment you must log in.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/error-trans.fix-276472'
2--- debian/patches/error-trans.fix-276472 1970-01-01 00:00:00 +0000
3+++ debian/patches/error-trans.fix-276472 2010-08-20 23:31:00 +0000
4@@ -0,0 +1,15 @@
5+Index: b/source3/lib/errmap_unix.c
6+===================================================================
7+--- a/source3/lib/errmap_unix.c
8++++ b/source3/lib/errmap_unix.c
9+@@ -105,7 +105,9 @@
10+ #ifdef ECANCELED
11+ { ECANCELED, ERRDOS, ERRbadfid, NT_STATUS_CANCELLED},
12+ #endif
13+-
14++#ifdef ENOTSUP
15++ { ENOTSUP, ERRSRV, ERRnosupport, NT_STATUS_NOT_SUPPORTED},
16++#endif
17+ { 0, 0, 0, NT_STATUS_OK }
18+ };
19+
20
21=== renamed file 'debian/patches/error-trans.fix-276472' => 'debian/patches/error-trans.fix-276472.moved'
22=== modified file 'debian/po/ar.po'
23--- debian/po/ar.po 2010-07-15 13:26:21 +0000
24+++ debian/po/ar.po 2010-08-20 23:31:00 +0000
25@@ -13,10 +13,10 @@
26 "PO-Revision-Date: 2007-03-14 11:37+0300\n"
27 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
28 "Language-Team: Arabic <support@arabeyes.org>\n"
29+"Language: ar\n"
30 "MIME-Version: 1.0\n"
31 "Content-Type: text/plain; charset=UTF-8\n"
32 "Content-Transfer-Encoding: 8bit\n"
33-"Language: ar\n"
34 "X-Generator: KBabel 1.11.4\n"
35
36 #. Type: boolean
37
38=== modified file 'debian/po/ast.po'
39--- debian/po/ast.po 2010-07-15 13:26:21 +0000
40+++ debian/po/ast.po 2010-08-20 23:31:00 +0000
41@@ -11,10 +11,10 @@
42 "PO-Revision-Date: 2009-01-15 09:17+0100\n"
43 "Last-Translator: astur <malditoastur@gmail.com>\n"
44 "Language-Team: Asturian <softast-xeneral@lists.sourceforge.net>\n"
45+"Language: ast\n"
46 "MIME-Version: 1.0\n"
47 "Content-Type: text/plain; charset=UTF-8\n"
48 "Content-Transfer-Encoding: 8bit\n"
49-"Language: ast\n"
50 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
51 "X-Poedit-Language: Asturian\n"
52 "X-Poedit-SourceCharset: utf-8\n"
53
54=== modified file 'debian/po/be.po'
55--- debian/po/be.po 2010-07-15 13:26:21 +0000
56+++ debian/po/be.po 2010-08-20 23:31:00 +0000
57@@ -12,10 +12,10 @@
58 "PO-Revision-Date: 2009-02-19 04:33+0200\n"
59 "Last-Translator: Pavel Piatruk <piatruk.p@gmail.com>\n"
60 "Language-Team: Belarusian (Official spelling) <be@d-i.tanatos.org>\n"
61+"Language: \n"
62 "MIME-Version: 1.0\n"
63 "Content-Type: text/plain; charset=UTF-8\n"
64 "Content-Transfer-Encoding: 8bit\n"
65-"Language: \n"
66 "X-Generator: KBabel 1.11.4\n"
67
68 #. Type: boolean
69
70=== modified file 'debian/po/bg.po'
71--- debian/po/bg.po 2010-07-15 13:26:21 +0000
72+++ debian/po/bg.po 2010-08-20 23:31:00 +0000
73@@ -9,10 +9,10 @@
74 "PO-Revision-Date: 2007-03-12 22:58+0200\n"
75 "Last-Translator: Damyan Ivanov <dam@modsoftsys.com>\n"
76 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
77+"Language: bg\n"
78 "MIME-Version: 1.0\n"
79 "Content-Type: text/plain; charset=UTF-8\n"
80 "Content-Transfer-Encoding: 8bit\n"
81-"Language: bg\n"
82 "X-Generator: KBabel 1.11.4\n"
83
84 #. Type: boolean
85
86=== modified file 'debian/po/bn.po'
87--- debian/po/bn.po 2010-07-15 13:26:21 +0000
88+++ debian/po/bn.po 2010-08-20 23:31:00 +0000
89@@ -10,10 +10,10 @@
90 "PO-Revision-Date: 2009-04-16 12:12+0600\n"
91 "Last-Translator: Md. Rezwan Shahid <rezwan@ankur.org.bd>\n"
92 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
93+"Language: bn\n"
94 "MIME-Version: 1.0\n"
95 "Content-Type: text/plain; charset=UTf-8\n"
96 "Content-Transfer-Encoding: 8bit\n"
97-"Language: bn\n"
98 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
99 "X-Generator: WordForge 0.5-beta1\n"
100
101
102=== modified file 'debian/po/bs.po'
103--- debian/po/bs.po 2010-07-15 13:26:21 +0000
104+++ debian/po/bs.po 2010-08-20 23:31:00 +0000
105@@ -19,10 +19,10 @@
106 "PO-Revision-Date: 2006-11-01 22:14+0100\n"
107 "Last-Translator: Safir Secerovic <sapphire@linux.org.ba>\n"
108 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
109+"Language: bs\n"
110 "MIME-Version: 1.0\n"
111 "Content-Type: text/plain; charset=utf-8\n"
112 "Content-Transfer-Encoding: 8bit\n"
113-"Language: bs\n"
114 "Plural-Forms: 3\n"
115
116 #. Type: boolean
117
118=== modified file 'debian/po/ca.po'
119--- debian/po/ca.po 2010-07-15 13:26:21 +0000
120+++ debian/po/ca.po 2010-08-20 23:31:00 +0000
121@@ -10,10 +10,10 @@
122 "PO-Revision-Date: 2006-08-13 15:16-0700\n"
123 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
124 "Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n"
125+"Language: \n"
126 "MIME-Version: 1.0\n"
127 "Content-Type: text/plain; charset=UTF-8\n"
128 "Content-Transfer-Encoding: 8bit\n"
129-"Language: \n"
130
131 #. Type: boolean
132 #. Description
133@@ -233,8 +233,8 @@
134 #~ msgstr ""
135 #~ "Des de la versió 3.0.23, Samba ja no permet l'encadenament de més d'un "
136 #~ "passdb al paràmetre «passdb backend». Sembla que el vostre smb.conf conté "
137-#~ "un paràmetre «passdb backend» que consta d'una llista de rerefons. La nova "
138-#~ "versió de Samba no funcionarà fins que ho corregiu."
139+#~ "un paràmetre «passdb backend» que consta d'una llista de rerefons. La "
140+#~ "nova versió de Samba no funcionarà fins que ho corregiu."
141
142 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
143 #~ msgstr "Voleu moure /etc/samba/smbpasswd a /var/lib/samba/passdb.tdb?"
144
145=== modified file 'debian/po/cs.po'
146--- debian/po/cs.po 2010-07-15 13:26:21 +0000
147+++ debian/po/cs.po 2010-08-20 23:31:00 +0000
148@@ -19,10 +19,10 @@
149 "PO-Revision-Date: 2009-06-27 10:58+0200\n"
150 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
151 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
152+"Language: cs\n"
153 "MIME-Version: 1.0\n"
154 "Content-Type: text/plain; charset=UTF-8\n"
155 "Content-Transfer-Encoding: 8bit\n"
156-"Language: cs\n"
157
158 #. Type: boolean
159 #. Description
160
161=== modified file 'debian/po/da.po'
162--- debian/po/da.po 2010-07-15 13:26:21 +0000
163+++ debian/po/da.po 2010-08-20 23:31:00 +0000
164@@ -11,10 +11,10 @@
165 "PO-Revision-Date: 2007-05-30 22:20+0200\n"
166 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
167 "Language-Team: Danish\n"
168+"Language: \n"
169 "MIME-Version: 1.0\n"
170 "Content-Type: text/plain; charset=ISO-8859-1\n"
171 "Content-Transfer-Encoding: 8bit\n"
172-"Language: \n"
173 "X-Generator: KBabel 1.11.4\n"
174
175 #. Type: boolean
176
177=== modified file 'debian/po/de.po'
178--- debian/po/de.po 2010-07-15 13:26:21 +0000
179+++ debian/po/de.po 2010-08-20 23:31:00 +0000
180@@ -12,10 +12,10 @@
181 "PO-Revision-Date: 2009-07-09 22:59+0200\n"
182 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
183 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
184+"Language: de\n"
185 "MIME-Version: 1.0\n"
186 "Content-Type: text/plain; charset=UTF-8\n"
187 "Content-Transfer-Encoding: 8bit\n"
188-"Language: de\n"
189
190 #. Type: boolean
191 #. Description
192
193=== modified file 'debian/po/dz.po'
194--- debian/po/dz.po 2010-07-15 13:26:21 +0000
195+++ debian/po/dz.po 2010-08-20 23:31:00 +0000
196@@ -19,10 +19,10 @@
197 "PO-Revision-Date: 2007-03-13 02:22+0530\n"
198 "Last-Translator: translator <pemai_jurmey@hotmail.com>\n"
199 "Language-Team: dzongkha <pgeyleg@dit.gov.bt>\n"
200+"Language: \n"
201 "MIME-Version: 1.0\n"
202 "Content-Type: text/plain; charset=utf-8\n"
203 "Content-Transfer-Encoding: 8bit\n"
204-"Language: \n"
205 "Plural-Forms: nplurals=2;plural=(n!=1);\n"
206 "X-Poedit-Language: dzongkha\n"
207 "X-Poedit-Country: bhutan\n"
208
209=== modified file 'debian/po/el.po'
210--- debian/po/el.po 2010-07-15 13:26:21 +0000
211+++ debian/po/el.po 2010-08-20 23:31:00 +0000
212@@ -19,10 +19,10 @@
213 "PO-Revision-Date: 2007-03-16 11:29+0200\n"
214 "Last-Translator: galaxico\n"
215 "Language-Team: <en@li.org>\n"
216+"Language: \n"
217 "MIME-Version: 1.0\n"
218 "Content-Type: text/plain; charset=UTF-8\n"
219 "Content-Transfer-Encoding: 8bit\n"
220-"Language: \n"
221 "X-Generator: KBabel 1.11.4\n"
222 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
223
224
225=== modified file 'debian/po/eo.po'
226--- debian/po/eo.po 2010-07-15 13:26:21 +0000
227+++ debian/po/eo.po 2010-08-20 23:31:00 +0000
228@@ -10,10 +10,10 @@
229 "PO-Revision-Date: 2009-03-11 06:04-0300\n"
230 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
231 "Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
232+"Language: eo\n"
233 "MIME-Version: 1.0\n"
234 "Content-Type: text/plain; charset=UTF-8\n"
235 "Content-Transfer-Encoding: 8bit\n"
236-"Language: eo\n"
237
238 #. Type: boolean
239 #. Description
240
241=== modified file 'debian/po/es.po'
242--- debian/po/es.po 2010-07-15 13:26:21 +0000
243+++ debian/po/es.po 2010-08-20 23:31:00 +0000
244@@ -42,10 +42,10 @@
245 "PO-Revision-Date: 2006-10-08 13:43+0200\n"
246 "Last-Translator: Steve Langasek <vorlon@debian.org>\n"
247 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
248+"Language: \n"
249 "MIME-Version: 1.0\n"
250 "Content-Type: text/plain; charset=UTF-8\n"
251 "Content-Transfer-Encoding: 8bit\n"
252-"Language: \n"
253
254 #. Type: boolean
255 #. Description
256@@ -201,7 +201,8 @@
257 "sistemas Windows. Para hacer esto es necesario crear un fichero, distinto "
258 "del /etc/passwd, donde se guarden las contraseñas de los usuarios. El "
259 "fichero se puede crear automaticamente, aunque es necesario añadir las "
260-"contraseñas manualmente mediante el programa «smbpasswd» y mantenerlas al día."
261+"contraseñas manualmente mediante el programa «smbpasswd» y mantenerlas al "
262+"día."
263
264 #. Type: boolean
265 #. Description
266
267=== modified file 'debian/po/et.po'
268--- debian/po/et.po 2010-07-15 13:26:21 +0000
269+++ debian/po/et.po 2010-08-20 23:31:00 +0000
270@@ -19,10 +19,10 @@
271 "PO-Revision-Date: 2007-03-13 10:26+0300\n"
272 "Last-Translator: Siim Põder <siim@p6drad-teel.net>\n"
273 "Language-Team: \n"
274+"Language: \n"
275 "MIME-Version: 1.0\n"
276 "Content-Type: text/plain; charset=utf-8\n"
277 "Content-Transfer-Encoding: 8bit\n"
278-"Language: \n"
279 "X-Poedit-Country: ESTONIA\n"
280
281 #. Type: boolean
282
283=== modified file 'debian/po/eu.po'
284--- debian/po/eu.po 2010-07-15 13:26:21 +0000
285+++ debian/po/eu.po 2010-08-20 23:31:00 +0000
286@@ -21,10 +21,10 @@
287 "PO-Revision-Date: 2007-04-07 23:18+0200\n"
288 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
289 "Language-Team: librezale <librezale@librezale.org>\n"
290+"Language: \n"
291 "MIME-Version: 1.0\n"
292 "Content-Type: text/plain; charset=UTF-8\n"
293 "Content-Transfer-Encoding: 8bit\n"
294-"Language: \n"
295 "X-Generator: KBabel 1.11.4\n"
296 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
297
298
299=== modified file 'debian/po/fi.po'
300--- debian/po/fi.po 2010-07-15 13:26:21 +0000
301+++ debian/po/fi.po 2010-08-20 23:31:00 +0000
302@@ -10,10 +10,10 @@
303 "PO-Revision-Date: 2007-03-13 18:35+0200\n"
304 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
305 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
306+"Language: fi\n"
307 "MIME-Version: 1.0\n"
308 "Content-Type: text/plain; charset=ISO-8859-15\n"
309 "Content-Transfer-Encoding: 8bit\n"
310-"Language: fi\n"
311
312 #. Type: boolean
313 #. Description
314
315=== modified file 'debian/po/fr.po'
316--- debian/po/fr.po 2010-07-15 13:26:21 +0000
317+++ debian/po/fr.po 2010-08-20 23:31:00 +0000
318@@ -10,10 +10,10 @@
319 "PO-Revision-Date: 2008-12-29 12:32+0100\n"
320 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
321 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
322+"Language: fr\n"
323 "MIME-Version: 1.0\n"
324 "Content-Type: text/plain; charset=UTF-8\n"
325 "Content-Transfer-Encoding: 8bit\n"
326-"Language: fr\n"
327 "X-Generator: KBabel 1.11.4\n"
328
329 #. Type: boolean
330
331=== modified file 'debian/po/gl.po'
332--- debian/po/gl.po 2010-07-15 13:26:21 +0000
333+++ debian/po/gl.po 2010-08-20 23:31:00 +0000
334@@ -19,10 +19,10 @@
335 "PO-Revision-Date: 2007-03-12 20:24+0100\n"
336 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
337 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
338+"Language: gl\n"
339 "MIME-Version: 1.0\n"
340 "Content-Type: text/plain; charset=UTF-8\n"
341 "Content-Transfer-Encoding: 8bit\n"
342-"Language: gl\n"
343
344 #. Type: boolean
345 #. Description
346
347=== modified file 'debian/po/gu.po'
348--- debian/po/gu.po 2010-07-15 13:26:21 +0000
349+++ debian/po/gu.po 2010-08-20 23:31:00 +0000
350@@ -19,10 +19,10 @@
351 "PO-Revision-Date: 2007-06-08 20:22+0530\n"
352 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
353 "Language-Team: Gujarati <team@utkarsh.org>\n"
354+"Language: gu\n"
355 "MIME-Version: 1.0\n"
356 "Content-Type: text/plain; charset=UTF-8\n"
357 "Content-Transfer-Encoding: 8bit\n"
358-"Language: gu\n"
359
360 #. Type: boolean
361 #. Description
362
363=== modified file 'debian/po/he.po'
364--- debian/po/he.po 2010-07-15 13:26:21 +0000
365+++ debian/po/he.po 2010-08-20 23:31:00 +0000
366@@ -12,10 +12,10 @@
367 "PO-Revision-Date: 2007-09-25 21:03+0200\n"
368 "Last-Translator: Katriel Traum <katriel.traum@gmail.com>\n"
369 "Language-Team: Hebrew <debian-hebrew-common@lists.alioth.debian.org>\n"
370+"Language: he\n"
371 "MIME-Version: 1.0\n"
372 "Content-Type: text/plain; charset=UTF-8\n"
373 "Content-Transfer-Encoding: 8bit\n"
374-"Language: he\n"
375 "X-Generator: KBabel 1.11.4\n"
376
377 #. Type: boolean
378
379=== modified file 'debian/po/hu.po'
380--- debian/po/hu.po 2010-07-15 13:26:21 +0000
381+++ debian/po/hu.po 2010-08-20 23:31:00 +0000
382@@ -11,10 +11,10 @@
383 "PO-Revision-Date: 2007-03-13 09:20+0100\n"
384 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
385 "Language-Team: Hungarian <hu@li.org>\n"
386+"Language: hu\n"
387 "MIME-Version: 1.0\n"
388 "Content-Type: text/plain; charset=UTF-8\n"
389 "Content-Transfer-Encoding: 8bit\n"
390-"Language: hu\n"
391 "X-Poedit-Language: Hungarian\n"
392 "X-Poedit-Country: HUNGARY\n"
393
394
395=== modified file 'debian/po/id.po'
396--- debian/po/id.po 2010-07-15 13:26:21 +0000
397+++ debian/po/id.po 2010-08-20 23:31:00 +0000
398@@ -11,10 +11,10 @@
399 "PO-Revision-Date: 2008-03-08 18:24+0700\n"
400 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
401 "Language-Team: Bahasa Indonesia <debian-l10n-id@gurame.fisika.ui.ac.id>\n"
402+"Language: \n"
403 "MIME-Version: 1.0\n"
404 "Content-Type: text/plain; charset=UTF-8\n"
405 "Content-Transfer-Encoding: 8bit\n"
406-"Language: \n"
407 "X-Generator: KBabel 1.11.4\n"
408 "Plural-Forms: nplural=1, plural>1\n"
409
410
411=== modified file 'debian/po/it.po'
412--- debian/po/it.po 2010-07-15 13:26:21 +0000
413+++ debian/po/it.po 2010-08-20 23:31:00 +0000
414@@ -11,10 +11,10 @@
415 "PO-Revision-Date: 2009-05-18 21:47+0200\n"
416 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
417 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
418+"Language: it\n"
419 "MIME-Version: 1.0\n"
420 "Content-Type: text/plain; charset=UTF-8\n"
421 "Content-Transfer-Encoding: 8bit\n"
422-"Language: it\n"
423
424 #. Type: boolean
425 #. Description
426
427=== modified file 'debian/po/ja.po'
428--- debian/po/ja.po 2010-07-15 13:26:21 +0000
429+++ debian/po/ja.po 2010-08-20 23:31:00 +0000
430@@ -19,10 +19,10 @@
431 "PO-Revision-Date: 2007-03-13 16:39+0900\n"
432 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
433 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
434+"Language: ja\n"
435 "MIME-Version: 1.0\n"
436 "Content-Type: text/plain; charset=UTF-8\n"
437 "Content-Transfer-Encoding: 8bit\n"
438-"Language: ja\n"
439
440 #. Type: boolean
441 #. Description
442
443=== modified file 'debian/po/ka.po'
444--- debian/po/ka.po 2010-07-15 13:26:21 +0000
445+++ debian/po/ka.po 2010-08-20 23:31:00 +0000
446@@ -11,10 +11,10 @@
447 "PO-Revision-Date: 2008-09-10 01:45+0400\n"
448 "Last-Translator: Aiet Kolkhi <aietkolkhi@gmail.com>\n"
449 "Language-Team: LANGUAGE <LL@li.org>\n"
450+"Language: \n"
451 "MIME-Version: 1.0\n"
452 "Content-Type: text/plain; charset=utf-8\n"
453 "Content-Transfer-Encoding: 8bit\n"
454-"Language: \n"
455
456 #. Type: boolean
457 #. Description
458
459=== modified file 'debian/po/km.po'
460--- debian/po/km.po 2010-07-15 13:26:21 +0000
461+++ debian/po/km.po 2010-08-20 23:31:00 +0000
462@@ -21,10 +21,10 @@
463 "PO-Revision-Date: 2007-03-13 08:39+0700\n"
464 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
465 "Language-Team: Khmer <support@khmeros.info>\n"
466+"Language: \n"
467 "MIME-Version: 1.0\n"
468 "Content-Type: text/plain; charset=UTF-8\n"
469 "Content-Transfer-Encoding: 8bit\n"
470-"Language: \n"
471 "X-Generator: KBabel 1.11.4\n"
472
473 # Type: boolean
474
475=== modified file 'debian/po/ko.po'
476--- debian/po/ko.po 2010-07-15 13:26:21 +0000
477+++ debian/po/ko.po 2010-08-20 23:31:00 +0000
478@@ -8,10 +8,10 @@
479 "PO-Revision-Date: 2007-03-14 09:28-0400\n"
480 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
481 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
482+"Language: ko\n"
483 "MIME-Version: 1.0\n"
484 "Content-Type: text/plain; charset=UTF-8\n"
485 "Content-Transfer-Encoding: 8bit\n"
486-"Language: ko\n"
487 "Plural-Forms: nplurals=1; plural=0;\n"
488
489 #. Type: boolean
490
491=== modified file 'debian/po/ku.po'
492--- debian/po/ku.po 2010-07-15 13:26:21 +0000
493+++ debian/po/ku.po 2010-08-20 23:31:00 +0000
494@@ -11,10 +11,10 @@
495 "PO-Revision-Date: 2008-05-08 13:02+0200\n"
496 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
497 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
498+"Language: \n"
499 "MIME-Version: 1.0\n"
500 "Content-Type: text/plain; charset=UTF-8\n"
501 "Content-Transfer-Encoding: 8bit\n"
502-"Language: \n"
503 "X-Generator: KAider 0.1\n"
504 "Plural-Forms: nplurals=2; plural= n != 1;\n"
505
506
507=== modified file 'debian/po/lt.po'
508--- debian/po/lt.po 2010-07-15 13:26:21 +0000
509+++ debian/po/lt.po 2010-08-20 23:31:00 +0000
510@@ -19,13 +19,13 @@
511 "PO-Revision-Date: 2006-11-26 00:20+0200\n"
512 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
513 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
514+"Language: lt\n"
515 "MIME-Version: 1.0\n"
516 "Content-Type: text/plain; charset=UTF-8\n"
517 "Content-Transfer-Encoding: 8bit\n"
518-"Language: lt\n"
519 "X-Generator: KBabel 1.11.2\n"
520-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
521-"100<10 || n%100>=20) ? 1 : 2);\n"
522+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
523+"%100<10 || n%100>=20) ? 1 : 2);\n"
524
525 #. Type: boolean
526 #. Description
527
528=== modified file 'debian/po/ml.po'
529--- debian/po/ml.po 2010-07-15 13:26:21 +0000
530+++ debian/po/ml.po 2010-08-20 23:31:00 +0000
531@@ -22,10 +22,10 @@
532 "Last-Translator: Praveen A <pravi.a@gmail.com>\n"
533 "Language-Team: Swathanthra Malayalam Computing <smc-discuss@googlegroups."
534 "com>\n"
535+"Language: \n"
536 "MIME-Version: 1.0\n"
537 "Content-Type: text/plain; charset=UTF-8\n"
538 "Content-Transfer-Encoding: 8bit\n"
539-"Language: \n"
540
541 #. Type: boolean
542 #. Description
543
544=== modified file 'debian/po/mr.po'
545--- debian/po/mr.po 2010-07-15 13:26:21 +0000
546+++ debian/po/mr.po 2010-08-20 23:31:00 +0000
547@@ -20,10 +20,10 @@
548 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
549 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
550 "<janabhaaratii@cdacmumbai.in>\n"
551+"Language: \n"
552 "MIME-Version: 1.0\n"
553 "Content-Type: text/plain; charset=UTF-8\n"
554 "Content-Transfer-Encoding: 8bit\n"
555-"Language: \n"
556
557 #. Type: boolean
558 #. Description
559@@ -245,6 +245,6 @@
560 #~ "automatically migrated to /var/lib/samba/passdb.tdb. Do not choose this "
561 #~ "option if you plan to use another pdb backend (e.g., LDAP) instead."
562 #~ msgstr ""
563-#~ "कृपया तुम्हाला सध्याची एसएमबी पासवर्ड संचिका आपोआप/व्हीएआर/एलआयबी/सांबा/"
564-#~ "पासडीबी।टीडीबी कडे स्थलांतरित झाल्यास चालेल का याची खात्री करा. तुम्हाला त्याऐवजी "
565-#~ "दुसरी कोणती पीडीबी बॅकएंड(उदा.एलडीएपी)करावयाची असल्यास हा पर्याय स्वीकारु नका"
566+#~ "कृपया तुम्हाला सध्याची एसएमबी पासवर्ड संचिका आपोआप/व्हीएआर/एलआयबी/सांबा/पासडीबी।"
567+#~ "टीडीबी कडे स्थलांतरित झाल्यास चालेल का याची खात्री करा. तुम्हाला त्याऐवजी दुसरी "
568+#~ "कोणती पीडीबी बॅकएंड(उदा.एलडीएपी)करावयाची असल्यास हा पर्याय स्वीकारु नका"
569
570=== modified file 'debian/po/nb.po'
571--- debian/po/nb.po 2010-07-15 13:26:21 +0000
572+++ debian/po/nb.po 2010-08-20 23:31:00 +0000
573@@ -19,10 +19,10 @@
574 "PO-Revision-Date: 2007-03-12 21:44+0100\n"
575 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
576 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
577+"Language: \n"
578 "MIME-Version: 1.0\n"
579 "Content-Type: text/plain; charset=UTF-8\n"
580 "Content-Transfer-Encoding: 8bit\n"
581-"Language: \n"
582 "X-Generator: KBabel 1.11.4\n"
583
584 #. Type: boolean
585@@ -43,9 +43,9 @@
586 msgstr ""
587 "Hvis din datamaskin får informasjon om IP-adressen fra en DHCP-tjener på "
588 "nettet, så kan DHCP-tjeneren også skaffe informasjon om WINS-tjenere "
589-"(«NetBIOS navnetjenere») på nettet. For å bruke dette må smb.conf-fila endres "
590-"slik at WINS-innstillinger fra DHCP automatisk leses fra /etc/samba/dhcp."
591-"conf."
592+"(«NetBIOS navnetjenere») på nettet. For å bruke dette må smb.conf-fila "
593+"endres slik at WINS-innstillinger fra DHCP automatisk leses fra /etc/samba/"
594+"dhcp.conf."
595
596 #. Type: boolean
597 #. Description
598@@ -73,8 +73,8 @@
599 msgstr ""
600 "Resten av Samba-oppsettet dreier seg om spørsmål som påvirker parametre i /"
601 "etc/samba/smb.conf, som er oppsettsfila for Samba-programmene (nmbd og "
602-"smbd). smb.conf-fila inneholder nå en «include»-linje eller en parameter som "
603-"går over flere linjer, som kanskje kan forvirre den automatiske "
604+"smbd). smb.conf-fila inneholder nå en «include»-linje eller en parameter "
605+"som går over flere linjer, som kanskje kan forvirre den automatiske "
606 "oppsettsprosessen slik at du må endre smb.conf for hånd for å få den til å "
607 "virke igjen."
608
609
610=== modified file 'debian/po/ne.po'
611--- debian/po/ne.po 2010-07-15 13:26:21 +0000
612+++ debian/po/ne.po 2010-08-20 23:31:00 +0000
613@@ -21,10 +21,10 @@
614 "PO-Revision-Date: 2007-03-14 05:36+0545\n"
615 "Last-Translator: Shiva Pokharel <shiva@mpp.org.np>\n"
616 "Language-Team: Nepali <info@mpp.org.np>\n"
617+"Language: ne\n"
618 "MIME-Version: 1.0\n"
619 "Content-Type: text/plain; charset=UTF-8\n"
620 "Content-Transfer-Encoding: 8bit\n"
621-"Language: ne\n"
622 "X-Generator: KBabel 1.11.4\n"
623 "Plural-Forms: nplurals=2; nplural(n!=1)\n"
624
625
626=== modified file 'debian/po/nl.po'
627--- debian/po/nl.po 2010-07-15 13:26:21 +0000
628+++ debian/po/nl.po 2010-08-20 23:31:00 +0000
629@@ -19,10 +19,10 @@
630 "PO-Revision-Date: 2007-03-12 21:30+0100\n"
631 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
632 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
633+"Language: \n"
634 "MIME-Version: 1.0\n"
635 "Content-Type: text/plain; charset=utf-8\n"
636 "Content-Transfer-Encoding: 8bit\n"
637-"Language: \n"
638 "X-Poedit-Language: Dutch\n"
639
640 #. Type: boolean
641
642=== modified file 'debian/po/nn.po'
643--- debian/po/nn.po 2010-07-15 13:26:21 +0000
644+++ debian/po/nn.po 2010-08-20 23:31:00 +0000
645@@ -11,10 +11,10 @@
646 "PO-Revision-Date: 2007-03-17 18:35+0100\n"
647 "Last-Translator: Håvard Korsvoll <korsvoll@gmail.com>\n"
648 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
649+"Language: \n"
650 "MIME-Version: 1.0\n"
651 "Content-Type: text/plain; charset=UTF-8\n"
652 "Content-Transfer-Encoding: 8bit\n"
653-"Language: \n"
654 "X-Generator: KBabel 1.11.4\n"
655 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
656
657@@ -66,10 +66,10 @@
658 msgstr ""
659 "Resten av oppsettet av Samba er spørsmål som handlar om parametrar i /etc/"
660 "samba/smb.conf, som er fila som blir brukt til å setje opp Sambaprogram "
661-"(nmbd og smbd). Den noverande smb.conf-fila inneheld ei «include»-linje eller "
662-"ein opsjon som går over fleire linjer, noko som kan forvirre den automatiske "
663-"oppsettsprosessen og gjer at du må redigere smb.conf-fila manuelt for å få "
664-"det til å fungere igjen."
665+"(nmbd og smbd). Den noverande smb.conf-fila inneheld ei «include»-linje "
666+"eller ein opsjon som går over fleire linjer, noko som kan forvirre den "
667+"automatiske oppsettsprosessen og gjer at du må redigere smb.conf-fila "
668+"manuelt for å få det til å fungere igjen."
669
670 #. Type: boolean
671 #. Description
672
673=== modified file 'debian/po/pl.po'
674--- debian/po/pl.po 2010-07-15 13:26:21 +0000
675+++ debian/po/pl.po 2010-08-20 23:31:00 +0000
676@@ -11,10 +11,10 @@
677 "PO-Revision-Date: 2008-09-12 10:08+0200\n"
678 "Last-Translator: Tomasz Majbaum <genobis@genobis.pl>\n"
679 "Language-Team: polski <debian-l10n-pl@lists.debian.org>\n"
680+"Language: \n"
681 "MIME-Version: 1.0\n"
682 "Content-Type: text/plain; charset=UTF-8\n"
683 "Content-Transfer-Encoding: 8bit\n"
684-"Language: \n"
685 "X-Generator: KBabel 1.11.4\n"
686
687 #. Type: boolean
688
689=== modified file 'debian/po/pt.po'
690--- debian/po/pt.po 2010-07-15 13:26:21 +0000
691+++ debian/po/pt.po 2010-08-20 23:31:00 +0000
692@@ -10,10 +10,10 @@
693 "PO-Revision-Date: 2010-03-30 21:36+0100\n"
694 "Last-Translator: Miguel Figueiredo <elmig@debian.org>\n"
695 "Language-Team: Portuguese <traduz@debianpt.org>\n"
696+"Language: pt\n"
697 "MIME-Version: 1.0\n"
698 "Content-Type: text/plain; charset=UTF-8\n"
699 "Content-Transfer-Encoding: 8bit\n"
700-"Language: pt\n"
701
702 #. Type: boolean
703 #. Description
704
705=== modified file 'debian/po/pt_BR.po'
706--- debian/po/pt_BR.po 2010-07-15 13:26:21 +0000
707+++ debian/po/pt_BR.po 2010-08-20 23:31:00 +0000
708@@ -19,10 +19,10 @@
709 "PO-Revision-Date: 2007-03-12 16:16-0200\n"
710 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
711 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
712+"Language: \n"
713 "MIME-Version: 1.0\n"
714 "Content-Type: text/plain; charset=UTF-8\n"
715 "Content-Transfer-Encoding: 8bit\n"
716-"Language: \n"
717
718 #. Type: boolean
719 #. Description
720
721=== modified file 'debian/po/ro.po'
722--- debian/po/ro.po 2010-07-15 13:26:21 +0000
723+++ debian/po/ro.po 2010-08-20 23:31:00 +0000
724@@ -19,10 +19,10 @@
725 "PO-Revision-Date: 2008-06-29 19:42+0300\n"
726 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
727 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
728+"Language: ro\n"
729 "MIME-Version: 1.0\n"
730 "Content-Type: text/plain; charset=UTF-8\n"
731 "Content-Transfer-Encoding: 8bit\n"
732-"Language: ro\n"
733 "X-Generator: KBabel 1.11.4\n"
734 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
735 "20)) ? 1 : 2;\n"
736
737=== modified file 'debian/po/ru.po'
738--- debian/po/ru.po 2010-07-15 13:26:21 +0000
739+++ debian/po/ru.po 2010-08-20 23:31:00 +0000
740@@ -11,13 +11,13 @@
741 "PO-Revision-Date: 2009-06-27 13:27+0400\n"
742 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
743 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
744+"Language: ru\n"
745 "MIME-Version: 1.0\n"
746 "Content-Type: text/plain; charset=UTF-8\n"
747 "Content-Transfer-Encoding: 8bit\n"
748-"Language: ru\n"
749 "X-Generator: KBabel 1.11.4\n"
750-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
751-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
752+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
753+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
754
755 #. Type: boolean
756 #. Description
757
758=== modified file 'debian/po/sk.po'
759--- debian/po/sk.po 2010-07-15 13:26:21 +0000
760+++ debian/po/sk.po 2010-08-20 23:31:00 +0000
761@@ -23,10 +23,10 @@
762 "PO-Revision-Date: 2009-02-15 08:16+0100\n"
763 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
764 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
765+"Language: sk\n"
766 "MIME-Version: 1.0\n"
767 "Content-Type: text/plain; charset=UTF-8\n"
768 "Content-Transfer-Encoding: 8bit\n"
769-"Language: sk\n"
770
771 #. Type: boolean
772 #. Description
773
774=== modified file 'debian/po/sl.po'
775--- debian/po/sl.po 2010-07-15 13:26:21 +0000
776+++ debian/po/sl.po 2010-08-20 23:31:00 +0000
777@@ -19,10 +19,10 @@
778 "PO-Revision-Date: 2007-03-13 08:06+0100\n"
779 "Last-Translator: Matej Kovačič <matej.kovacic@owca.info>\n"
780 "Language-Team: Sl <skrat@owca.info>\n"
781+"Language: \n"
782 "MIME-Version: 1.0\n"
783 "Content-Type: text/plain; charset=utf-8\n"
784 "Content-Transfer-Encoding: 8bit\n"
785-"Language: \n"
786 "X-Poedit-Language: Slovenian\n"
787 "X-Poedit-Country: SLOVENIA\n"
788 "X-Poedit-SourceCharset: utf-8\n"
789
790=== modified file 'debian/po/sq.po'
791--- debian/po/sq.po 2010-07-15 13:26:21 +0000
792+++ debian/po/sq.po 2010-08-20 23:31:00 +0000
793@@ -18,10 +18,10 @@
794 "PO-Revision-Date: 2007-03-13 21:25+0100\n"
795 "Last-Translator: Elian Myftiu <elian.myftiu@gmail.com>\n"
796 "Language-Team: Debian L10n Albanian <debian-l10n-albanian@lists.debian.org>\n"
797+"Language: \n"
798 "MIME-Version: 1.0\n"
799 "Content-Type: text/plain; charset=UTF-8\n"
800 "Content-Transfer-Encoding: 8bit\n"
801-"Language: \n"
802
803 #. Type: boolean
804 #. Description
805
806=== modified file 'debian/po/sv.po'
807--- debian/po/sv.po 2010-07-15 13:26:21 +0000
808+++ debian/po/sv.po 2010-08-20 23:31:00 +0000
809@@ -12,10 +12,10 @@
810 "PO-Revision-Date: 2009-02-23 01:51+0100\n"
811 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
812 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
813+"Language: sv\n"
814 "MIME-Version: 1.0\n"
815 "Content-Type: text/plain; charset=utf-8\n"
816 "Content-Transfer-Encoding: 8bit\n"
817-"Language: sv\n"
818 "X-Poedit-Language: Swedish\n"
819
820 #. Type: boolean
821
822=== modified file 'debian/po/ta.po'
823--- debian/po/ta.po 2010-07-15 13:26:21 +0000
824+++ debian/po/ta.po 2010-08-20 23:31:00 +0000
825@@ -19,10 +19,10 @@
826 "PO-Revision-Date: 2006-12-16 20:10+0530\n"
827 "Last-Translator: drtvasudevan <agnihot3@gmail.com>\n"
828 "Language-Team: TAMIL <Ubuntu-tam@lists.ubuntu.com>\n"
829+"Language: \n"
830 "MIME-Version: 1.0\n"
831 "Content-Type: text/plain; charset=UTF-8\n"
832 "Content-Transfer-Encoding: 8bit\n"
833-"Language: \n"
834 "X-Generator: KBabel 1.11.4\n"
835
836 #. Type: boolean
837
838=== modified file 'debian/po/th.po'
839--- debian/po/th.po 2010-07-15 13:26:21 +0000
840+++ debian/po/th.po 2010-08-20 23:31:00 +0000
841@@ -11,10 +11,10 @@
842 "PO-Revision-Date: 2007-03-13 10:05+0700\n"
843 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
844 "Language-Team: Thai <l10n@opentle.org>\n"
845+"Language: th\n"
846 "MIME-Version: 1.0\n"
847 "Content-Type: text/plain; charset=UTF-8\n"
848 "Content-Transfer-Encoding: 8bit\n"
849-"Language: th\n"
850
851 #. Type: boolean
852 #. Description
853
854=== modified file 'debian/po/tl.po'
855--- debian/po/tl.po 2010-07-15 13:26:21 +0000
856+++ debian/po/tl.po 2010-08-20 23:31:00 +0000
857@@ -19,10 +19,10 @@
858 "PO-Revision-Date: 2007-03-13 06:13+0800\n"
859 "Last-Translator: eric pareja <xenos@upm.edu.ph>\n"
860 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
861+"Language: tl\n"
862 "MIME-Version: 1.0\n"
863 "Content-Type: text/plain; charset=UTF-8\n"
864 "Content-Transfer-Encoding: 8bit\n"
865-"Language: tl\n"
866
867 #. Type: boolean
868 #. Description
869
870=== modified file 'debian/po/tr.po'
871--- debian/po/tr.po 2010-07-15 13:26:21 +0000
872+++ debian/po/tr.po 2010-08-20 23:31:00 +0000
873@@ -10,10 +10,10 @@
874 "PO-Revision-Date: 2007-03-13 18:47+0200\n"
875 "Last-Translator: Mehmet Türker <mturker@innova.com.tr>\n"
876 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
877+"Language: tr\n"
878 "MIME-Version: 1.0\n"
879 "Content-Type: text/plain; charset=UTF-8\n"
880 "Content-Transfer-Encoding: 8bit\n"
881-"Language: tr\n"
882
883 #. Type: boolean
884 #. Description
885
886=== modified file 'debian/po/vi.po'
887--- debian/po/vi.po 2010-07-15 13:26:21 +0000
888+++ debian/po/vi.po 2010-08-20 23:31:00 +0000
889@@ -10,10 +10,10 @@
890 "PO-Revision-Date: 2009-02-15 15:57+1030\n"
891 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
892 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
893+"Language: vi\n"
894 "MIME-Version: 1.0\n"
895 "Content-Type: text/plain; charset=UTF-8\n"
896 "Content-Transfer-Encoding: 8bit\n"
897-"Language: vi\n"
898 "Plural-Forms: nplurals=1; plural=0;\n"
899 "X-Generator: LocFactoryEditor 1.8\n"
900
901@@ -35,9 +35,10 @@
902 msgstr ""
903 "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 "
904 "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ề "
905-"trình phục vụ WINS (« NetBIOS name servers ») cũng nằm trên mạng. Dịch vụ này "
906-"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 "
907-"WINS do DHCP cung cấp sẽ được đọc tự động từ tập tin « /etc/samba/dhcp.conf »."
908+"trình phục vụ WINS (« NetBIOS name servers ») cũng nằm trên mạng. Dịch vụ "
909+"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 "
910+"lập WINS do DHCP cung cấp sẽ được đọc tự động từ tập tin « /etc/samba/dhcp."
911+"conf »."
912
913 #. Type: boolean
914 #. Description
915@@ -64,11 +65,11 @@
916 "hand to get it working again."
917 msgstr ""
918 "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 "
919-"« /etc/samba/smb.conf », tập tin được dùng để cấu hình các chương trình Samba "
920-"(nmbd và smbd). Tập tin « smb.conf » hiện thời chứa một dòng « include » (gồm) "
921-"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 "
922-"hình tự động thì cần thiết bạn tự sửa đổi tập tin « smb.conf » mình để kích "
923-"hoạt lại nó."
924+"« /etc/samba/smb.conf », tập tin được dùng để cấu hình các chương trình "
925+"Samba (nmbd và smbd). Tập tin « smb.conf » hiện thời chứa một dòng « include "
926+"» (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 "
927+"trình cấu hình tự động thì cần thiết bạn tự sửa đổi tập tin « smb.conf » "
928+"mình để kích hoạt lại nó."
929
930 #. Type: boolean
931 #. Description
932@@ -116,8 +117,8 @@
933 "parameter in your Windows registry."
934 msgstr ""
935 "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 "
936-"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 "
937-"mã) thì bạn cần phải thay đổi một tham số trong sổ đăng ký (registry) "
938+"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ó "
939+"mật mã) thì bạn cần phải thay đổi một tham số trong sổ đăng ký (registry) "
940 "Windows của mình."
941
942 #. Type: boolean
943
944=== modified file 'debian/po/wo.po'
945--- debian/po/wo.po 2010-07-15 13:26:21 +0000
946+++ debian/po/wo.po 2010-08-20 23:31:00 +0000
947@@ -19,10 +19,10 @@
948 "PO-Revision-Date: 2007-04-30 18:13+0000\n"
949 "Last-Translator: Mouhamadou Mamoune Mbacke <mouhamadoumamoune@gmail.com>\n"
950 "Language-Team: Wolof\n"
951+"Language: \n"
952 "MIME-Version: 1.0\n"
953 "Content-Type: text/plain; charset=UTF-8\n"
954 "Content-Transfer-Encoding: 8bit\n"
955-"Language: \n"
956 "X-Generator: KBabel 1.11.4\n"
957
958 #. Type: boolean
959
960=== modified file 'debian/po/zh_CN.po'
961--- debian/po/zh_CN.po 2010-07-15 13:26:21 +0000
962+++ debian/po/zh_CN.po 2010-08-20 23:31:00 +0000
963@@ -23,10 +23,10 @@
964 "PO-Revision-Date: 2006-10-03 19:36-0500\n"
965 "Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.ent>\n"
966 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
967+"Language: \n"
968 "MIME-Version: 1.0\n"
969 "Content-Type: text/plain; charset=UTF-8\n"
970 "Content-Transfer-Encoding: 8bit\n"
971-"Language: \n"
972
973 #. Type: boolean
974 #. Description
975
976=== modified file 'debian/po/zh_TW.po'
977--- debian/po/zh_TW.po 2010-07-15 13:26:21 +0000
978+++ debian/po/zh_TW.po 2010-08-20 23:31:00 +0000
979@@ -20,10 +20,10 @@
980 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
981 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
982 "debian.org>\n"
983+"Language: \n"
984 "MIME-Version: 1.0\n"
985 "Content-Type: text/plain; charset=utf-8\n"
986 "Content-Transfer-Encoding: 8bit\n"
987-"Language: \n"
988
989 #. Type: boolean
990 #. Description

Subscribers

People subscribed via source and target branches

to all changes: