Merge lp:~l3on/ubuntu/lucid/apt/fix-917845 into lp:ubuntu/lucid/apt

Proposed by Leo Iannacone
Status: Merged
Merge reported by: Evan Broder
Merged at revision: not available
Proposed branch: lp:~l3on/ubuntu/lucid/apt/fix-917845
Merge into: lp:ubuntu/lucid/apt
Diff against target: 30173 lines (+5376/-4517)
76 files modified
apt-inst/deb/debfile.cc (+7/-1)
apt-pkg/acquire-item.cc (+10/-6)
apt-pkg/deb/deblistparser.cc (+23/-1)
apt-pkg/deb/debrecords.cc (+2/-1)
apt-pkg/deb/debsrcrecords.cc (+2/-1)
apt-pkg/deb/dpkgpm.cc (+6/-0)
apt-pkg/indexfile.cc (+2/-0)
cmdline/apt-key (+22/-5)
configure (+1/-1)
configure.in (+1/-1)
debian/apt.cron.daily (+7/-0)
debian/apt.postinst (+13/-2)
debian/changelog (+120/-0)
debian/control (+2/-2)
debian/patches/ftparchive-fix-filemode-settings.patch (+49/-0)
debian/patches/series (+1/-0)
doc/apt-ftparchive.1.xml (+30/-5)
doc/de/apt-ftparchive.de.1 (+24/-5)
doc/po/apt-doc.pot (+136/-99)
doc/po/de.po (+160/-101)
doc/po/es.po (+139/-99)
doc/po/fr.po (+160/-101)
doc/po/it.po (+137/-99)
doc/po/ja.po (+152/-100)
doc/po/pl.po (+139/-99)
doc/po/pt_BR.po (+139/-99)
ftparchive/apt-ftparchive.cc (+56/-14)
ftparchive/contents.cc (+5/-1)
ftparchive/multicompress.cc (+1/-0)
ftparchive/writer.cc (+87/-37)
ftparchive/writer.h (+24/-3)
methods/https.cc (+2/-4)
po/apt-all.pot (+83/-82)
po/ar.po (+84/-82)
po/ast.po (+84/-82)
po/bg.po (+84/-82)
po/bs.po (+84/-82)
po/ca.po (+84/-82)
po/cs.po (+84/-82)
po/cy.po (+84/-82)
po/da.po (+84/-82)
po/de.po (+84/-82)
po/dz.po (+84/-82)
po/el.po (+84/-82)
po/en_GB.po (+106/-104)
po/es.po (+84/-82)
po/eu.po (+84/-82)
po/fi.po (+84/-82)
po/fr.po (+84/-82)
po/gl.po (+84/-82)
po/hu.po (+84/-82)
po/it.po (+84/-82)
po/ja.po (+84/-82)
po/km.po (+84/-82)
po/ko.po (+84/-82)
po/ku.po (+84/-82)
po/lt.po (+84/-82)
po/mr.po (+84/-82)
po/nb.po (+84/-82)
po/ne.po (+84/-82)
po/nl.po (+84/-82)
po/nn.po (+84/-82)
po/pl.po (+84/-82)
po/pt.po (+84/-82)
po/pt_BR.po (+84/-82)
po/ro.po (+84/-82)
po/ru.po (+84/-82)
po/sk.po (+84/-82)
po/sl.po (+84/-82)
po/sv.po (+84/-82)
po/th.po (+84/-82)
po/tl.po (+84/-82)
po/uk.po (+84/-82)
po/vi.po (+84/-82)
po/zh_CN.po (+84/-82)
po/zh_TW.po (+84/-82)
To merge this branch: bzr merge lp:~l3on/ubuntu/lucid/apt/fix-917845
Reviewer Review Type Date Requested Status
Evan Broder Approve
Review via email: mp+90890@code.launchpad.net

Description of the change

Added a patch from Upstream fixing linked bug.

Although it builds fine, I haven't tested it.

To post a comment you must log in.
Revision history for this message
Evan Broder (broder) wrote :

I've just uploaded this fix to lucid-proposed, so I'll go ahead and mark it as merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt-inst/deb/debfile.cc'
2--- apt-inst/deb/debfile.cc 2008-11-24 10:52:20 +0000
3+++ apt-inst/deb/debfile.cc 2012-01-31 15:47:23 +0000
4@@ -46,7 +46,9 @@
5
6 if (!CheckMember("data.tar.gz") &&
7 !CheckMember("data.tar.bz2") &&
8- !CheckMember("data.tar.lzma")) {
9+ !CheckMember("data.tar.lzma") &&
10+ !CheckMember("data.tar.xz")) {
11+ // FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
12 _error->Error(_("This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2", "data.tar.lzma");
13 return;
14 }
15@@ -136,6 +138,10 @@
16 Member = AR.FindMember("data.tar.lzma");
17 Compressor = "lzma";
18 }
19+ if (Member == 0) {
20+ Member = AR.FindMember("data.tar.xz");
21+ Compressor = "xz";
22+ }
23 if (Member == 0)
24 return _error->Error(_("Internal error, could not locate member"));
25 if (File.Seek(Member->Start) == false)
26
27=== modified file 'apt-pkg/acquire-item.cc'
28--- apt-pkg/acquire-item.cc 2010-02-17 23:33:32 +0000
29+++ apt-pkg/acquire-item.cc 2012-01-31 15:47:23 +0000
30@@ -1017,12 +1017,6 @@
31
32 // all cool, move Release file into place
33 Complete = true;
34-
35- string FinalFile = _config->FindDir("Dir::State::lists");
36- FinalFile += URItoFileName(RealURI);
37- Rename(DestFile,FinalFile);
38- chmod(FinalFile.c_str(),0644);
39- DestFile = FinalFile;
40 }
41 else
42 {
43@@ -1049,8 +1043,18 @@
44 Desc.URI = "gpgv:" + SigFile;
45 QueueURI(Desc);
46 Mode = "gpgv";
47+ return;
48 }
49 }
50+
51+ if (Complete == true)
52+ {
53+ string FinalFile = _config->FindDir("Dir::State::lists");
54+ FinalFile += URItoFileName(RealURI);
55+ Rename(DestFile,FinalFile);
56+ chmod(FinalFile.c_str(),0644);
57+ DestFile = FinalFile;
58+ }
59 }
60 /*}}}*/
61 void pkgAcqMetaIndex::RetrievalDone(string Message) /*{{{*/
62
63=== modified file 'apt-pkg/deb/deblistparser.cc'
64--- apt-pkg/deb/deblistparser.cc 2010-02-17 23:33:32 +0000
65+++ apt-pkg/deb/deblistparser.cc 2012-01-31 15:47:23 +0000
66@@ -18,6 +18,7 @@
67 #include <apt-pkg/md5.h>
68 #include <apt-pkg/macros.h>
69
70+#include <fnmatch.h>
71 #include <ctype.h>
72 /*}}}*/
73
74@@ -376,6 +377,21 @@
75 return I;
76 }
77
78+/*
79+ * CompleteArch:
80+ *
81+ * The complete architecture, consisting of <kernel>-<cpu>.
82+ */
83+static string CompleteArch(std::string& arch) {
84+ if (arch == "armel") return "linux-arm";
85+ if (arch == "armhf") return "linux-arm";
86+ if (arch == "lpia") return "linux-i386";
87+ if (arch == "powerpcspe") return "linux-powerpc";
88+ if (arch == "uclibc-linux-armel") return "linux-arm";
89+ if (arch == "uclinux-armel") return "uclinux-arm";
90+
91+ return (arch.find("-") != string::npos) ? arch : "linux-" + arch;
92+}
93 /*}}}*/
94 // ListParser::ParseDepends - Parse a dependency element /*{{{*/
95 // ---------------------------------------------------------------------
96@@ -441,6 +457,7 @@
97 if (ParseArchFlags == true)
98 {
99 string arch = _config->Find("APT::Architecture");
100+ string completeArch = CompleteArch(arch);
101
102 // Parse an architecture
103 if (I != Stop && *I == '[')
104@@ -468,8 +485,13 @@
105 I++;
106 }
107
108- if (stringcmp(arch,I,End) == 0)
109+ if (stringcmp(arch,I,End) == 0) {
110 Found = true;
111+ } else {
112+ std::string wildcard = SubstVar(string(I, End), "any", "*");
113+ if (fnmatch(wildcard.c_str(), completeArch.c_str(), 0) == 0)
114+ Found = true;
115+ }
116
117 if (*End++ == ']') {
118 I = End;
119
120=== modified file 'apt-pkg/deb/debrecords.cc'
121--- apt-pkg/deb/debrecords.cc 2008-11-24 10:52:20 +0000
122+++ apt-pkg/deb/debrecords.cc 2012-01-31 15:47:23 +0000
123@@ -19,7 +19,8 @@
124 /* */
125 debRecordParser::debRecordParser(string FileName,pkgCache &Cache) :
126 File(FileName,FileFd::ReadOnly),
127- Tags(&File,Cache.Head().MaxVerFileSize + 200)
128+ Tags(&File, std::max(Cache.Head().MaxVerFileSize,
129+ Cache.Head().MaxDescFileSize) + 200)
130 {
131 }
132 /*}}}*/
133
134=== modified file 'apt-pkg/deb/debsrcrecords.cc'
135--- apt-pkg/deb/debsrcrecords.cc 2009-12-22 09:44:08 +0000
136+++ apt-pkg/deb/debsrcrecords.cc 2012-01-31 15:47:23 +0000
137@@ -143,7 +143,8 @@
138 }
139 F.Type = string(F.Path,Tmp+1,Pos-Tmp);
140
141- if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma" || F.Type == "tar")
142+ if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma" ||
143+ F.Type == "xz" || F.Type == "tar")
144 {
145 Pos = Tmp-1;
146 continue;
147
148=== modified file 'apt-pkg/deb/dpkgpm.cc'
149--- apt-pkg/deb/dpkgpm.cc 2010-03-26 16:57:49 +0000
150+++ apt-pkg/deb/dpkgpm.cc 2012-01-31 15:47:23 +0000
151@@ -28,6 +28,7 @@
152 #include <string.h>
153 #include <stdio.h>
154 #include <string.h>
155+#include <sys/stat.h>
156 #include <algorithm>
157 #include <sstream>
158 #include <map>
159@@ -653,6 +654,11 @@
160 }
161 term_out = NULL;
162
163+ // check if the directory exists in which we want to write the file
164+ string const logdir = _config->FindDir("Dir::Log");
165+ if(not FileExists(logdir))
166+ return _error->Error(_("Directory '%s' missing"), logdir.c_str());
167+
168 string history_name = flCombine(_config->FindDir("Dir::Log"),
169 _config->Find("Dir::Log::History"));
170 if (!history_name.empty())
171
172=== modified file 'apt-pkg/indexfile.cc'
173--- apt-pkg/indexfile.cc 2010-03-15 09:42:39 +0000
174+++ apt-pkg/indexfile.cc 2012-01-31 15:47:23 +0000
175@@ -126,6 +126,8 @@
176
177 if(lang.find("_") != lang.npos)
178 return lang.substr(0, lang.find("_"));
179+ else if(lang.find(".") != lang.npos)
180+ return lang.substr(0, lang.find("."));
181 else
182 return lang;
183 }
184
185=== modified file 'cmdline/apt-key'
186--- cmdline/apt-key 2010-02-17 23:33:32 +0000
187+++ cmdline/apt-key 2012-01-31 15:47:23 +0000
188@@ -12,11 +12,12 @@
189 ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
190 REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
191 ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg
192+TMP_KEYRING=/var/lib/apt/keyrings/maybe-import-keyring.gpg
193
194 add_keys_with_verify_against_master_keyring() {
195 ADD_KEYRING=$1
196 MASTER=$2
197-
198+
199 if [ ! -f "$ADD_KEYRING" ]; then
200 echo "ERROR: '$ADD_KEYRING' not found"
201 return
202@@ -32,11 +33,25 @@
203 # from a key in the $distro-master-keyring
204 add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
205 master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5`
206+
207 for add_key in $add_keys; do
208- ADDED=0
209- for master_key in $master_keys; do
210- if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
211- $GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import
212+
213+ # ensure there are no colisions LP: #857472
214+ for master_key in $master_keys; do
215+ if [ "$add_key" = "$master_key" ]; then
216+ echo >&2 "Keyid collision for '$add_key' detected, operation aborted"
217+ return 1
218+ fi
219+ done
220+
221+ # export the add keyring one-by-one
222+ rm -f $TMP_KEYRING
223+ $GPG_CMD --keyring $ADD_KEYRING --output $TMP_KEYRING --export $add_key
224+ # check if signed with the master key and only add in this case
225+ ADDED=0
226+ for master_key in $master_keys; do
227+ if $GPG_CMD --keyring $MASTER --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep '^sig:!:' | cut -d: -f5 | grep -q $master_key; then
228+ $GPG --import $TMP_KEYRING
229 ADDED=1
230 fi
231 done
232@@ -44,12 +59,14 @@
233 echo >&2 "Key '$add_key' not added. It is not signed with a master key"
234 fi
235 done
236+ rm -f $TMP_KEYRING
237 }
238
239 # update the current archive signing keyring from a network URI
240 # the archive-keyring keys needs to be signed with the master key
241 # (otherwise it does not make sense from a security POV)
242 net_update() {
243+
244 if [ -z "$ARCHIVE_KEYRING_URI" ]; then
245 echo "ERROR: no location for the archive-keyring given"
246 exit 1
247
248=== modified file 'configure'
249--- configure 2010-04-14 20:30:03 +0000
250+++ configure 2012-01-31 15:47:23 +0000
251@@ -2449,7 +2449,7 @@
252
253
254 cat >>confdefs.h <<_ACEOF
255-#define VERSION "0.7.25.3ubuntu7"
256+#define VERSION "0.7.25.3ubuntu9.9"
257 _ACEOF
258
259 PACKAGE="apt"
260
261=== modified file 'configure.in'
262--- configure.in 2010-04-14 20:30:03 +0000
263+++ configure.in 2012-01-31 15:47:23 +0000
264@@ -18,7 +18,7 @@
265 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
266
267 dnl -- SET THIS TO THE RELEASE VERSION --
268-AC_DEFINE_UNQUOTED(VERSION,"0.7.25.3ubuntu7")
269+AC_DEFINE_UNQUOTED(VERSION,"0.7.25.3ubuntu9.9")
270 PACKAGE="apt"
271 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
272 AC_SUBST(PACKAGE)
273
274=== modified file 'debian/apt.cron.daily'
275--- debian/apt.cron.daily 2010-03-12 23:10:52 +0000
276+++ debian/apt.cron.daily 2012-01-31 15:47:23 +0000
277@@ -436,6 +436,13 @@
278 # mirrors at the same time
279 random_sleep
280
281+# include default system language so that "apt-get update" will
282+# fetch the right translated package descriptions
283+if [ -r /etc/default/locale ]; then
284+ . /etc/default/locale
285+ export LANG LANGUAGE LC_MESSAGES LC_ALL
286+fi
287+
288 # update package lists
289 UPDATED=0
290 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
291
292=== modified file 'debian/apt.postinst'
293--- debian/apt.postinst 2010-03-12 23:10:52 +0000
294+++ debian/apt.postinst 2012-01-31 15:47:23 +0000
295@@ -5,7 +5,18 @@
296 # set the proxy based on the admin users gconf settings
297 #
298 set_apt_proxy_from_gconf() {
299- admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1)
300+ # try SUDO_USER first
301+ if [ -n "$SUDO_USER" ]; then
302+ admin_user="$SUDO_USER"
303+ else
304+ admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1)
305+ fi
306+ # test if the user actually exists, getent returns "+" for e.g.
307+ # LDAP
308+ if ! id -u "$admin_user" > /dev/null 2>&1; then
309+ return
310+ fi
311+ # get the settings from gconf
312 if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x /usr/bin/gconftool ]; then
313 use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy 2>/dev/null)
314 host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null)
315@@ -41,7 +52,7 @@
316 # that sudo no longer honors http_proxy
317 # this can be removed after lucid is released
318 if dpkg --compare-versions "$2" lt-nl "0.7.25.3ubuntu2"; then
319- set_apt_proxy_from_gconf
320+ set_apt_proxy_from_gconf || true
321 fi
322 ;;
323
324
325=== modified file 'debian/changelog'
326--- debian/changelog 2010-04-14 20:30:03 +0000
327+++ debian/changelog 2012-01-31 15:47:23 +0000
328@@ -1,3 +1,123 @@
329+apt (0.7.25.3ubuntu9.10) lucid-proposed; urgency=low
330+
331+ * New patch from upstream ftparchive-fix-filemode-settings.patch:
332+ - Ensure that BinDirectory as well as Tree settings get the correct
333+ default FileMode setting (LP: #917845, Closes: #595922)
334+
335+ -- Leo Iannacone <l3on@ubuntu.com> Tue, 31 Jan 2012 15:38:41 +0100
336+
337+apt (0.7.25.3ubuntu9.9) lucid-security; urgency=low
338+
339+ * SECURITY UPDATE: sensitive information disclosure via incorrect
340+ hostname validation (LP: #868353)
341+ - methods/https.cc: properly set CURLOPT_SSL_VERIFYHOST.
342+ - CVE-2011-3634
343+ * SECURITY UPDATE: Restore apt-ket net-update functionality (LP: #857472)
344+ - cmdline/apt-key: improve key validation.
345+
346+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 22 Nov 2011 13:56:02 -0500
347+
348+apt (0.7.25.3ubuntu9.8) lucid-proposed; urgency=low
349+
350+ * Backports of various archive-support features (LP: #865828):
351+ - update xz support to also support xz Packages and Sources
352+ - backport apt-ftparchive support for splitting out long
353+ descriptions from the Packages file into Translations-en
354+ - backport fix for apt-ftparchive hang from debian-sid branch
355+ * The above backports were all heavily tested on the Ubuntu
356+ ftpmaster machines in a previously-released internal version
357+
358+ -- Adam Conrad <adconrad@ubuntu.com> Mon, 03 Oct 2011 19:16:24 -0600
359+
360+apt (0.7.25.3ubuntu9.7) lucid-security; urgency=low
361+
362+ * SECURITY UPDATE: Disable apt-key net-update for now, as validation
363+ code is insecure. (LP: #856489)
364+ - cmdline/apt-key: exit immediately out of net_update().
365+ - CVE number pending
366+
367+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 22 Sep 2011 11:24:50 -0400
368+
369+apt (0.7.25.3ubuntu9.6) lucid-proposed; urgency=low
370+
371+ * backport support for xz compression (LP: #805389)
372+
373+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Jul 2011 11:57:22 +0200
374+
375+apt (0.7.25.3ubuntu9.5) lucid-proposed; urgency=low
376+
377+ [ Michael Vogt ]
378+ * debian/apt.cron.daily:
379+ - source /etc/default/locale (if available) so that the
380+ apt-get update cron job fetches the right translated package
381+ descriptions (LP: #652951)
382+
383+ [ Loïc Minier ]
384+ * Backport r2014.1.2 (see below); fixes bug in APT when running the
385+ linaro-image-tools testsuite; LP: #709895.
386+
387+ [ David Kalnischkies ]
388+ * apt-pkg/acquire-item.cc:
389+ - use also unsigned Release files again (Closes: #596189)
390+
391+ [ Colin Watson ]
392+ * Backport r1327.24.434, 1327.24.437, 1327.76.1 (LP: #787500)
393+
394+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 24 May 2011 18:23:29 +0200
395+
396+apt (0.7.25.3ubuntu9.4) lucid-proposed; urgency=low
397+
398+ * backported the apt-ftparchive --arch support (LP: #714970)
399+
400+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Feb 2011 20:56:11 +0100
401+
402+apt (0.7.25.3ubuntu9.3) lucid-proposed; urgency=low
403+
404+ * ftparchive/writer.cc:
405+ - port changes from maverick to remove size limit for
406+ Files,Checksum-Sha1,Checksum-Sha256
407+
408+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Sep 2010 18:49:09 +0200
409+
410+apt (0.7.25.3ubuntu9.2) lucid-proposed; urgency=low
411+
412+ * ftparchive/writer.cc:
413+ - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
414+ available LP: #633967. Thanks to Colin Watson
415+
416+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Sep 2010 14:43:41 +0200
417+
418+apt (0.7.25.3ubuntu9.1) lucid-proposed; urgency=low
419+
420+ * apt-pkg/deb/dpkgpm.cc:
421+ - Fix segmentation fault when /var/log/apt ist missing. LP: #535509
422+
423+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Jul 2010 14:35:30 +0200
424+
425+apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
426+
427+ * debian/apt.postinst:
428+ - do not fail if getent returns nothing useful (LP: #579647)
429+ thanks to Jean-Baptiste Lallement
430+
431+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 14 May 2010 09:40:50 +0200
432+
433+apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low
434+
435+ [ Loïc Minier ]
436+ * Use https:// in Vcs-Bzr URL.
437+
438+ [ Michael Vogt ]
439+ * apt-pkg/deb/debrecords.cc:
440+ - fix max tag buffer size (LP: #545336, closes: #578959)
441+ * apt-pkg/indexfile.cc:
442+ - If no "_" is found in the language code, try to find a "."
443+ This is required for languages like Esperanto that have no
444+ county associated with them (LP: #560956)
445+ Thanks to "Aisano" for the fix
446+
447+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 May 2010 10:33:46 +0200
448+
449 apt (0.7.25.3ubuntu7) lucid; urgency=low
450
451 Cherry pick fixes from the lp:~mvo/apt/mvo branch:
452
453=== modified file 'debian/control'
454--- debian/control 2010-02-17 23:33:32 +0000
455+++ debian/control 2012-01-31 15:47:23 +0000
456@@ -1,14 +1,14 @@
457 Source: apt
458 Section: admin
459 Priority: important
460-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
461+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
462 XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
463 Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
464 Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
465 Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
466 Standards-Version: 3.8.3
467 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, intltool
468-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu
469+Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu
470
471 Package: apt
472 Architecture: any
473
474=== added file 'debian/patches/ftparchive-fix-filemode-settings.patch'
475--- debian/patches/ftparchive-fix-filemode-settings.patch 1970-01-01 00:00:00 +0000
476+++ debian/patches/ftparchive-fix-filemode-settings.patch 2012-01-31 15:47:23 +0000
477@@ -0,0 +1,49 @@
478+Description: Ensure that BinDirectory as well as Tree settings get
479+ the correct default FileMode setting
480+Origin: http://anonscm.debian.org/loggerhead/apt/debian-sid/revision/2013
481+Bug-Ubuntu: http://launchpad.net/bugs/917845
482+Bug-Debian: http://bugs.debian.org/595922
483+
484+---
485+ ftparchive/apt-ftparchive.cc | 9 +++++++--
486+ 1 file changed, 7 insertions(+), 2 deletions(-)
487+
488+--- apt-lucid-updates.orig/ftparchive/apt-ftparchive.cc
489++++ apt-lucid-updates/ftparchive/apt-ftparchive.cc
490+@@ -133,7 +133,9 @@ void PackageMap::GetGeneral(Configuratio
491+ Setup.Find("Default::Sources::Extensions",".dsc").c_str());
492+ PkgExt = Block.Find("Packages::Extensions",
493+ Setup.Find("Default::Packages::Extensions",".deb").c_str());
494+-
495++
496++ Permissions = Setup.FindI("Default::FileMode",0644);
497++
498+ if (FLFile.empty() == false)
499+ FLFile = flCombine(Setup.Find("Dir::FileListDir"),FLFile);
500+
501+@@ -456,7 +458,7 @@ void LoadTree(vector<PackageMap> &PkgLis
502+ string DFLFile = Setup.Find("TreeDefault::FileList", "");
503+ string DSFLFile = Setup.Find("TreeDefault::SourceFileList", "");
504+
505+- int const Permissions = Setup.FindI("Default::FileMode",0644);
506++ mode_t const Permissions = Setup.FindI("Default::FileMode",0644);
507+
508+ bool const LongDescription = Setup.FindB("Default::LongDescription",
509+ _config->FindB("APT::FTPArchive::LongDescription", true));
510+@@ -547,6 +549,8 @@ void LoadTree(vector<PackageMap> &PkgLis
511+ /* */
512+ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
513+ {
514++ mode_t const Permissions = Setup.FindI("Default::FileMode",0644);
515++
516+ // Process 'bindirectory' type sections
517+ const Configuration::Item *Top = Setup.Tree("bindirectory");
518+ for (Top = (Top == 0?0:Top->Child); Top != 0;)
519+@@ -566,6 +570,7 @@ void LoadBinDir(vector<PackageMap> &PkgL
520+ Itm.InternalPrefix = Block.Find("InternalPrefix",Top->Tag.c_str());
521+ Itm.Contents = Block.Find("Contents");
522+ Itm.ContentsHead = Block.Find("Contents::Header");
523++ Itm.Permissions = Block.FindI("FileMode", Permissions);
524+
525+ Itm.GetGeneral(Setup,Block);
526+ PkgList.push_back(Itm);
527
528=== added file 'debian/patches/series'
529--- debian/patches/series 1970-01-01 00:00:00 +0000
530+++ debian/patches/series 2012-01-31 15:47:23 +0000
531@@ -0,0 +1,1 @@
532+ftparchive-fix-filemode-settings.patch
533
534=== modified file 'doc/apt-ftparchive.1.xml'
535--- doc/apt-ftparchive.1.xml 2009-12-22 09:44:08 +0000
536+++ doc/apt-ftparchive.1.xml 2012-01-31 15:47:23 +0000
537@@ -223,7 +223,13 @@
538 This is similar to <literal>Packages::Compress</literal>
539 except that it controls the compression for the Contents files.</para></listitem>
540 </varlistentry>
541-
542+
543+ <varlistentry><term>Translation::Compress</term>
544+ <listitem><para>
545+ This is similar to <literal>Packages::Compress</literal>
546+ except that it controls the compression for the Translation-en master file.</para></listitem>
547+ </varlistentry>
548+
549 <varlistentry><term>DeLinkLimit</term>
550 <listitem><para>
551 Specifies the number of kilobytes to delink (and
552@@ -237,6 +243,12 @@
553 defaults to 0644. All index files are set to this mode with no regard
554 to the umask.</para></listitem>
555 </varlistentry>
556+
557+ <varlistentry><term>LongDescription</term>
558+ <listitem><para>
559+ Sets if long descriptions should be included in the Packages file or split
560+ out into a master Translation-en file.</para></listitem>
561+ </varlistentry>
562 </variablelist>
563 </refsect2>
564
565@@ -288,7 +300,14 @@
566 Sets the output Sources file. Defaults to
567 <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
568 </varlistentry>
569-
570+
571+ <varlistentry><term>Translation</term>
572+ <listitem><para>
573+ Set the output Translation-en master file with the long descriptions if they
574+ should be not included in the Packages file. Defaults to
575+ <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename></para></listitem>
576+ </varlistentry>
577+
578 <varlistentry><term>InternalPrefix</term>
579 <listitem><para>
580 Sets the path prefix that causes a symlink to be
581@@ -370,7 +389,13 @@
582 architectures that appear under search section. The special architecture
583 'source' is used to indicate that this tree has a source archive.</para></listitem>
584 </varlistentry>
585-
586+
587+ <varlistentry><term>LongDescription</term>
588+ <listitem><para>
589+ Sets if long descriptions should be included in the Packages file or split
590+ out into a master Translation-en file.</para></listitem>
591+ </varlistentry>
592+
593 <varlistentry><term>BinOverride</term>
594 <listitem><para>
595 Sets the binary override file. The override file
596@@ -548,8 +573,8 @@
597 <listitem><para>
598 This configuration option defaults to "<literal>true</literal>" and should only be set to
599 <literal>"false"</literal> if the Archive generated with &apt-ftparchive; also provides
600- <filename>Translation</filename> files. Note that it is currently not possible to create these
601- files with <command>apt-ftparchive</command>.
602+ <filename>Translation</filename> files. Note that the <filename>Translation-en</filename>
603+ master file can only be created in the generate command.
604 </para></listitem>
605 </varlistentry>
606
607
608=== modified file 'doc/de/apt-ftparchive.de.1'
609--- doc/de/apt-ftparchive.de.1 2010-02-17 23:33:32 +0000
610+++ doc/de/apt-ftparchive.de.1 2012-01-31 15:47:23 +0000
611@@ -231,6 +231,17 @@
612 $(DIST)/$(SECTION)/source/Sources
613 .RE
614 .PP
615+Translation
616+.RS 4
617+Set the output Translation\-en master file with the long descriptions if they should be not included in the Packages file\&. Defaults to
618+$(DIST)/$(SECTION)/i18n/Translation\-en
619+.RE
620+.PP
621+LongDescription
622+.RS 4
623+Sets if long descriptions should be included in the Packages file or split out into a master Translation\-en file\&.
624+.RE
625+.PP
626 InternalPrefix
627 .RS 4
628 Setzt die Pfad\-Präfix, die bewirkt, dass ein symbolischer Verweis wie ein interner anstatt wie ein externer Verweis behandelt wird\&. Vorgabe ist
629@@ -314,6 +325,11 @@
630 Dies ist eine durch Leerzeichen getrennte Liste aller Architekturen, die unter dem Suchabschnitt erscheinen\&. Die spezielle Architektur \(Fcsource\(Fo wird benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt\&.
631 .RE
632 .PP
633+LongDescription
634+.RS 4
635+Sets if long descriptions should be included in the Packages file or split out into a master Translation\-en file\&.
636+.RE
637+.PP
638 BinOverride
639 .RS 4
640 Setzt die Programm\-Override\-Datei\&. Die Override\-Datei enthält Abschnitt, Priorität und Adressinformationen des Betreuers\&.
641@@ -490,12 +506,15 @@
642 .PP
643 \fBAPT::FTPArchive::LongDescription\fR
644 .RS 4
645-Diese Konfigurationsoption ist standardmäßig \(Fctrue\(Fo und sollte nur auf \(Fcfalse\(Fo gesetzt werden, wenn das mit
646+This configuration option defaults to "true" and should only be set to
647+"false"
648+if the Archive generated with
649 \fBapt-ftparchive\fR(1)
650-generierte Archiv außerdem
651-Translation\-Dateien bereitstellt\&. Beachten Sie, dass es derzeit nicht möglich ist, diese Dateien mit
652-\fBapt\-ftparchive\fR
653-zu erstellen\&.
654+also provides
655+Translation
656+files\&. Note that the
657+Translation\-en
658+master file can only be created in the generate command\&.
659 .RE
660 .PP
661 \fB\-h\fR, \fB\-\-help\fR
662
663=== modified file 'doc/po/apt-doc.pot'
664--- doc/po/apt-doc.pot 2010-04-14 20:30:03 +0000
665+++ doc/po/apt-doc.pot 2012-01-31 15:47:23 +0000
666@@ -7,7 +7,7 @@
667 msgid ""
668 msgstr ""
669 "Project-Id-Version: PACKAGE VERSION\n"
670-"POT-Creation-Date: 2010-04-14 20:30+0300\n"
671+"POT-Creation-Date: 2011-10-04 01:17+0000\n"
672 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
673 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
674 "Language-Team: LANGUAGE <LL@li.org>\n"
675@@ -1284,7 +1284,7 @@
676 msgstr ""
677
678 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
679-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:481 apt.conf.5.xml:503
680+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:517 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:481 apt.conf.5.xml:503
681 msgid "options"
682 msgstr ""
683
684@@ -1307,7 +1307,7 @@
685 msgstr ""
686
687 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
688-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
689+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:560 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
690 msgid "<option>-s</option>"
691 msgstr ""
692
693@@ -1327,12 +1327,12 @@
694 msgstr ""
695
696 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
697-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
698+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
699 msgid "<option>-q</option>"
700 msgstr ""
701
702 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
703-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
704+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
705 msgid "<option>--quiet</option>"
706 msgstr ""
707
708@@ -1477,7 +1477,7 @@
709 msgstr ""
710
711 #. type: Content of: <refentry><refsect1><variablelist>
712-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
713+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:581 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
714 msgid "&apt-commonoptions;"
715 msgstr ""
716
717@@ -1492,7 +1492,7 @@
718 msgstr ""
719
720 #. type: Content of: <refentry><refsect1><title>
721-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1019 apt_preferences.5.xml:629 sources.list.5.xml:233
722+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:597 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1019 apt_preferences.5.xml:629 sources.list.5.xml:233
723 msgid "See Also"
724 msgstr ""
725
726@@ -1502,7 +1502,7 @@
727 msgstr ""
728
729 #. type: Content of: <refentry><refsect1><title>
730-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
731+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:601 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
732 msgid "Diagnostics"
733 msgstr ""
734
735@@ -1606,7 +1606,7 @@
736 msgstr ""
737
738 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
739-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
740+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:528 apt-get.8.xml:328
741 msgid "<option>-d</option>"
742 msgstr ""
743
744@@ -1801,7 +1801,7 @@
745 msgstr ""
746
747 #. type: Content of: <refentry><refsect1><para>
748-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 apt-sortpkgs.1.xml:70
749+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:598 apt-sortpkgs.1.xml:70
750 msgid "&apt-conf;"
751 msgstr ""
752
753@@ -2227,11 +2227,23 @@
754
755 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
756 #: apt-ftparchive.1.xml:227
757+msgid "Translation::Compress"
758+msgstr ""
759+
760+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
761+#: apt-ftparchive.1.xml:229
762+msgid ""
763+"This is similar to <literal>Packages::Compress</literal> except that it "
764+"controls the compression for the Translation-en master file."
765+msgstr ""
766+
767+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
768+#: apt-ftparchive.1.xml:233
769 msgid "DeLinkLimit"
770 msgstr ""
771
772 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
773-#: apt-ftparchive.1.xml:229
774+#: apt-ftparchive.1.xml:235
775 msgid ""
776 "Specifies the number of kilobytes to delink (and replace with hard links) "
777 "per run. This is used in conjunction with the per-section "
778@@ -2239,24 +2251,36 @@
779 msgstr ""
780
781 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
782-#: apt-ftparchive.1.xml:234
783+#: apt-ftparchive.1.xml:240
784 msgid "FileMode"
785 msgstr ""
786
787 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
788-#: apt-ftparchive.1.xml:236
789+#: apt-ftparchive.1.xml:242
790 msgid ""
791 "Specifies the mode of all created index files. It defaults to 0644. All "
792 "index files are set to this mode with no regard to the umask."
793 msgstr ""
794
795+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
796+#: apt-ftparchive.1.xml:247 apt-ftparchive.1.xml:393
797+msgid "LongDescription"
798+msgstr ""
799+
800+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
801+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
802+msgid ""
803+"Sets if long descriptions should be included in the Packages file or split "
804+"out into a master Translation-en file."
805+msgstr ""
806+
807 #. type: Content of: <refentry><refsect1><refsect2><title>
808-#: apt-ftparchive.1.xml:243
809+#: apt-ftparchive.1.xml:255
810 msgid "TreeDefault Section"
811 msgstr ""
812
813 #. type: Content of: <refentry><refsect1><refsect2><para>
814-#: apt-ftparchive.1.xml:245
815+#: apt-ftparchive.1.xml:257
816 msgid ""
817 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
818 "variables are substitution variables and have the strings $(DIST), "
819@@ -2264,12 +2288,12 @@
820 msgstr ""
821
822 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
823-#: apt-ftparchive.1.xml:250
824+#: apt-ftparchive.1.xml:262
825 msgid "MaxContentsChange"
826 msgstr ""
827
828 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
829-#: apt-ftparchive.1.xml:252
830+#: apt-ftparchive.1.xml:264
831 msgid ""
832 "Sets the number of kilobytes of contents files that are generated each "
833 "day. The contents files are round-robined so that over several days they "
834@@ -2277,12 +2301,12 @@
835 msgstr ""
836
837 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
838-#: apt-ftparchive.1.xml:257
839+#: apt-ftparchive.1.xml:269
840 msgid "ContentsAge"
841 msgstr ""
842
843 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
844-#: apt-ftparchive.1.xml:259
845+#: apt-ftparchive.1.xml:271
846 msgid ""
847 "Controls the number of days a contents file is allowed to be checked without "
848 "changing. If this limit is passed the mtime of the contents file is "
849@@ -2293,60 +2317,73 @@
850 msgstr ""
851
852 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
853-#: apt-ftparchive.1.xml:268
854+#: apt-ftparchive.1.xml:280
855 msgid "Directory"
856 msgstr ""
857
858 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
859-#: apt-ftparchive.1.xml:270
860+#: apt-ftparchive.1.xml:282
861 msgid ""
862 "Sets the top of the .deb directory tree. Defaults to "
863 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
864 msgstr ""
865
866 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
867-#: apt-ftparchive.1.xml:274
868+#: apt-ftparchive.1.xml:286
869 msgid "SrcDirectory"
870 msgstr ""
871
872 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
873-#: apt-ftparchive.1.xml:276
874+#: apt-ftparchive.1.xml:288
875 msgid ""
876 "Sets the top of the source package directory tree. Defaults to "
877 "<filename>$(DIST)/$(SECTION)/source/</filename>"
878 msgstr ""
879
880 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
881-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
882+#: apt-ftparchive.1.xml:292 apt-ftparchive.1.xml:431
883 msgid "Packages"
884 msgstr ""
885
886 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
887-#: apt-ftparchive.1.xml:282
888+#: apt-ftparchive.1.xml:294
889 msgid ""
890 "Sets the output Packages file. Defaults to "
891 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
892 msgstr ""
893
894 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
895-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
896+#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:436
897 msgid "Sources"
898 msgstr ""
899
900 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
901-#: apt-ftparchive.1.xml:288
902+#: apt-ftparchive.1.xml:300
903 msgid ""
904 "Sets the output Sources file. Defaults to "
905 "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
906 msgstr ""
907
908 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
909-#: apt-ftparchive.1.xml:292
910+#: apt-ftparchive.1.xml:304
911+msgid "Translation"
912+msgstr ""
913+
914+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
915+#: apt-ftparchive.1.xml:306
916+msgid ""
917+"Set the output Translation-en master file with the long descriptions if they "
918+"should be not included in the Packages file. Defaults to "
919+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
920+msgstr ""
921+
922+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
923+#: apt-ftparchive.1.xml:311
924 msgid "InternalPrefix"
925 msgstr ""
926
927 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
928-#: apt-ftparchive.1.xml:294
929+#: apt-ftparchive.1.xml:313
930 msgid ""
931 "Sets the path prefix that causes a symlink to be considered an internal link "
932 "instead of an external link. Defaults to "
933@@ -2354,12 +2391,12 @@
934 msgstr ""
935
936 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
937-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
938+#: apt-ftparchive.1.xml:318 apt-ftparchive.1.xml:442
939 msgid "Contents"
940 msgstr ""
941
942 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
943-#: apt-ftparchive.1.xml:301
944+#: apt-ftparchive.1.xml:320
945 msgid ""
946 "Sets the output Contents file. Defaults to "
947 "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
948@@ -2369,34 +2406,34 @@
949 msgstr ""
950
951 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
952-#: apt-ftparchive.1.xml:308
953+#: apt-ftparchive.1.xml:327
954 msgid "Contents::Header"
955 msgstr ""
956
957 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
958-#: apt-ftparchive.1.xml:310
959+#: apt-ftparchive.1.xml:329
960 msgid "Sets header file to prepend to the contents output."
961 msgstr ""
962
963 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
964-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
965+#: apt-ftparchive.1.xml:332 apt-ftparchive.1.xml:467
966 msgid "BinCacheDB"
967 msgstr ""
968
969 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
970-#: apt-ftparchive.1.xml:315
971+#: apt-ftparchive.1.xml:334
972 msgid ""
973 "Sets the binary cache database to use for this section. Multiple sections "
974 "can share the same database."
975 msgstr ""
976
977 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
978-#: apt-ftparchive.1.xml:319
979+#: apt-ftparchive.1.xml:338
980 msgid "FileList"
981 msgstr ""
982
983 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
984-#: apt-ftparchive.1.xml:321
985+#: apt-ftparchive.1.xml:340
986 msgid ""
987 "Specifies that instead of walking the directory tree, "
988 "<command>apt-ftparchive</command> should read the list of files from the "
989@@ -2404,12 +2441,12 @@
990 msgstr ""
991
992 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
993-#: apt-ftparchive.1.xml:326
994+#: apt-ftparchive.1.xml:345
995 msgid "SourceFileList"
996 msgstr ""
997
998 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
999-#: apt-ftparchive.1.xml:328
1000+#: apt-ftparchive.1.xml:347
1001 msgid ""
1002 "Specifies that instead of walking the directory tree, "
1003 "<command>apt-ftparchive</command> should read the list of files from the "
1004@@ -2418,12 +2455,12 @@
1005 msgstr ""
1006
1007 #. type: Content of: <refentry><refsect1><refsect2><title>
1008-#: apt-ftparchive.1.xml:336
1009+#: apt-ftparchive.1.xml:355
1010 msgid "Tree Section"
1011 msgstr ""
1012
1013 #. type: Content of: <refentry><refsect1><refsect2><para>
1014-#: apt-ftparchive.1.xml:338
1015+#: apt-ftparchive.1.xml:357
1016 msgid ""
1017 "The <literal>Tree</literal> section defines a standard Debian file tree "
1018 "which consists of a base directory, then multiple sections in that base "
1019@@ -2433,7 +2470,7 @@
1020 msgstr ""
1021
1022 #. type: Content of: <refentry><refsect1><refsect2><para>
1023-#: apt-ftparchive.1.xml:343
1024+#: apt-ftparchive.1.xml:362
1025 msgid ""
1026 "The <literal>Tree</literal> section takes a scope tag which sets the "
1027 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
1028@@ -2442,7 +2479,7 @@
1029 msgstr ""
1030
1031 #. type: Content of: <refentry><refsect1><refsect2><para>
1032-#: apt-ftparchive.1.xml:348
1033+#: apt-ftparchive.1.xml:367
1034 msgid ""
1035 "All of the settings defined in the <literal>TreeDefault</literal> section "
1036 "can be use in a <literal>Tree</literal> section as well as three new "
1037@@ -2450,7 +2487,7 @@
1038 msgstr ""
1039
1040 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
1041-#: apt-ftparchive.1.xml:354
1042+#: apt-ftparchive.1.xml:373
1043 #, no-wrap
1044 msgid ""
1045 "for i in Sections do \n"
1046@@ -2460,7 +2497,7 @@
1047 msgstr ""
1048
1049 #. type: Content of: <refentry><refsect1><refsect2><para>
1050-#: apt-ftparchive.1.xml:351
1051+#: apt-ftparchive.1.xml:370
1052 msgid ""
1053 "When processing a <literal>Tree</literal> section "
1054 "<command>apt-ftparchive</command> performs an operation similar to: "
1055@@ -2468,12 +2505,12 @@
1056 msgstr ""
1057
1058 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1059-#: apt-ftparchive.1.xml:360
1060+#: apt-ftparchive.1.xml:379
1061 msgid "Sections"
1062 msgstr ""
1063
1064 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1065-#: apt-ftparchive.1.xml:362
1066+#: apt-ftparchive.1.xml:381
1067 msgid ""
1068 "This is a space separated list of sections which appear under the "
1069 "distribution, typically this is something like <literal>main contrib "
1070@@ -2481,12 +2518,12 @@
1071 msgstr ""
1072
1073 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1074-#: apt-ftparchive.1.xml:367
1075+#: apt-ftparchive.1.xml:386
1076 msgid "Architectures"
1077 msgstr ""
1078
1079 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1080-#: apt-ftparchive.1.xml:369
1081+#: apt-ftparchive.1.xml:388
1082 msgid ""
1083 "This is a space separated list of all the architectures that appear under "
1084 "search section. The special architecture 'source' is used to indicate that "
1085@@ -2494,56 +2531,56 @@
1086 msgstr ""
1087
1088 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1089-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
1090+#: apt-ftparchive.1.xml:399 apt-ftparchive.1.xml:447
1091 msgid "BinOverride"
1092 msgstr ""
1093
1094 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1095-#: apt-ftparchive.1.xml:376
1096+#: apt-ftparchive.1.xml:401
1097 msgid ""
1098 "Sets the binary override file. The override file contains section, priority "
1099 "and maintainer address information."
1100 msgstr ""
1101
1102 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1103-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
1104+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:452
1105 msgid "SrcOverride"
1106 msgstr ""
1107
1108 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1109-#: apt-ftparchive.1.xml:382
1110+#: apt-ftparchive.1.xml:407
1111 msgid ""
1112 "Sets the source override file. The override file contains section "
1113 "information."
1114 msgstr ""
1115
1116 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1117-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
1118+#: apt-ftparchive.1.xml:411 apt-ftparchive.1.xml:457
1119 msgid "ExtraOverride"
1120 msgstr ""
1121
1122 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1123-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
1124+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
1125 msgid "Sets the binary extra override file."
1126 msgstr ""
1127
1128 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1129-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
1130+#: apt-ftparchive.1.xml:416 apt-ftparchive.1.xml:462
1131 msgid "SrcExtraOverride"
1132 msgstr ""
1133
1134 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1135-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
1136+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
1137 msgid "Sets the source extra override file."
1138 msgstr ""
1139
1140 #. type: Content of: <refentry><refsect1><refsect2><title>
1141-#: apt-ftparchive.1.xml:398
1142+#: apt-ftparchive.1.xml:423
1143 msgid "BinDirectory Section"
1144 msgstr ""
1145
1146 #. type: Content of: <refentry><refsect1><refsect2><para>
1147-#: apt-ftparchive.1.xml:400
1148+#: apt-ftparchive.1.xml:425
1149 msgid ""
1150 "The <literal>bindirectory</literal> section defines a binary directory tree "
1151 "with no special structure. The scope tag specifies the location of the "
1152@@ -2553,64 +2590,64 @@
1153 msgstr ""
1154
1155 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1156-#: apt-ftparchive.1.xml:408
1157+#: apt-ftparchive.1.xml:433
1158 msgid "Sets the Packages file output."
1159 msgstr ""
1160
1161 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1162-#: apt-ftparchive.1.xml:413
1163+#: apt-ftparchive.1.xml:438
1164 msgid ""
1165 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
1166 "<literal>Sources</literal> is required."
1167 msgstr ""
1168
1169 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1170-#: apt-ftparchive.1.xml:419
1171+#: apt-ftparchive.1.xml:444
1172 msgid "Sets the Contents file output. (optional)"
1173 msgstr ""
1174
1175 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1176-#: apt-ftparchive.1.xml:424
1177+#: apt-ftparchive.1.xml:449
1178 msgid "Sets the binary override file."
1179 msgstr ""
1180
1181 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1182-#: apt-ftparchive.1.xml:429
1183+#: apt-ftparchive.1.xml:454
1184 msgid "Sets the source override file."
1185 msgstr ""
1186
1187 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1188-#: apt-ftparchive.1.xml:444
1189+#: apt-ftparchive.1.xml:469
1190 msgid "Sets the cache DB."
1191 msgstr ""
1192
1193 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1194-#: apt-ftparchive.1.xml:447
1195+#: apt-ftparchive.1.xml:472
1196 msgid "PathPrefix"
1197 msgstr ""
1198
1199 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1200-#: apt-ftparchive.1.xml:449
1201+#: apt-ftparchive.1.xml:474
1202 msgid "Appends a path to all the output paths."
1203 msgstr ""
1204
1205 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1206-#: apt-ftparchive.1.xml:452
1207+#: apt-ftparchive.1.xml:477
1208 msgid "FileList, SourceFileList"
1209 msgstr ""
1210
1211 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1212-#: apt-ftparchive.1.xml:454
1213+#: apt-ftparchive.1.xml:479
1214 msgid "Specifies the file list file."
1215 msgstr ""
1216
1217 #. type: Content of: <refentry><refsect1><title>
1218-#: apt-ftparchive.1.xml:461
1219+#: apt-ftparchive.1.xml:486
1220 msgid "The Binary Override File"
1221 msgstr ""
1222
1223 #. type: Content of: <refentry><refsect1><para>
1224-#: apt-ftparchive.1.xml:462
1225+#: apt-ftparchive.1.xml:487
1226 msgid ""
1227 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
1228 "contains 4 fields separated by spaces. The first field is the package name, "
1229@@ -2620,19 +2657,19 @@
1230 msgstr ""
1231
1232 #. type: Content of: <refentry><refsect1><para><literallayout>
1233-#: apt-ftparchive.1.xml:468
1234+#: apt-ftparchive.1.xml:493
1235 #, no-wrap
1236 msgid "old [// oldn]* => new"
1237 msgstr ""
1238
1239 #. type: Content of: <refentry><refsect1><para><literallayout>
1240-#: apt-ftparchive.1.xml:470
1241+#: apt-ftparchive.1.xml:495
1242 #, no-wrap
1243 msgid "new"
1244 msgstr ""
1245
1246 #. type: Content of: <refentry><refsect1><para>
1247-#: apt-ftparchive.1.xml:467
1248+#: apt-ftparchive.1.xml:492
1249 msgid ""
1250 "The general form of the maintainer field is: <placeholder "
1251 "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
1252@@ -2643,12 +2680,12 @@
1253 msgstr ""
1254
1255 #. type: Content of: <refentry><refsect1><title>
1256-#: apt-ftparchive.1.xml:478
1257+#: apt-ftparchive.1.xml:503
1258 msgid "The Source Override File"
1259 msgstr ""
1260
1261 #. type: Content of: <refentry><refsect1><para>
1262-#: apt-ftparchive.1.xml:480
1263+#: apt-ftparchive.1.xml:505
1264 msgid ""
1265 "The source override file is fully compatible with &dpkg-scansources;. It "
1266 "contains 2 fields separated by spaces. The first fields is the source "
1267@@ -2656,12 +2693,12 @@
1268 msgstr ""
1269
1270 #. type: Content of: <refentry><refsect1><title>
1271-#: apt-ftparchive.1.xml:485
1272+#: apt-ftparchive.1.xml:510
1273 msgid "The Extra Override File"
1274 msgstr ""
1275
1276 #. type: Content of: <refentry><refsect1><para>
1277-#: apt-ftparchive.1.xml:487
1278+#: apt-ftparchive.1.xml:512
1279 msgid ""
1280 "The extra override file allows any arbitrary tag to be added or replaced in "
1281 "the output. It has 3 columns, the first is the package, the second is the "
1282@@ -2669,12 +2706,12 @@
1283 msgstr ""
1284
1285 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1286-#: apt-ftparchive.1.xml:496
1287+#: apt-ftparchive.1.xml:521
1288 msgid "<option>--md5</option>"
1289 msgstr ""
1290
1291 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1292-#: apt-ftparchive.1.xml:498
1293+#: apt-ftparchive.1.xml:523
1294 msgid ""
1295 "Generate MD5 sums. This defaults to on, when turned off the generated index "
1296 "files will not have MD5Sum fields where possible. Configuration Item: "
1297@@ -2682,19 +2719,19 @@
1298 msgstr ""
1299
1300 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1301-#: apt-ftparchive.1.xml:503
1302+#: apt-ftparchive.1.xml:528
1303 msgid "<option>--db</option>"
1304 msgstr ""
1305
1306 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1307-#: apt-ftparchive.1.xml:505
1308+#: apt-ftparchive.1.xml:530
1309 msgid ""
1310 "Use a binary caching DB. This has no effect on the generate command. "
1311 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
1312 msgstr ""
1313
1314 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1315-#: apt-ftparchive.1.xml:511
1316+#: apt-ftparchive.1.xml:536
1317 msgid ""
1318 "Quiet; produces output suitable for logging, omitting progress indicators. "
1319 "More q's will produce more quiet up to a maximum of 2. You can also use "
1320@@ -2703,12 +2740,12 @@
1321 msgstr ""
1322
1323 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1324-#: apt-ftparchive.1.xml:517
1325+#: apt-ftparchive.1.xml:542
1326 msgid "<option>--delink</option>"
1327 msgstr ""
1328
1329 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1330-#: apt-ftparchive.1.xml:519
1331+#: apt-ftparchive.1.xml:544
1332 msgid ""
1333 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
1334 "then this option actually enables delinking of the files. It defaults to on "
1335@@ -2717,12 +2754,12 @@
1336 msgstr ""
1337
1338 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1339-#: apt-ftparchive.1.xml:525
1340+#: apt-ftparchive.1.xml:550
1341 msgid "<option>--contents</option>"
1342 msgstr ""
1343
1344 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1345-#: apt-ftparchive.1.xml:527
1346+#: apt-ftparchive.1.xml:552
1347 msgid ""
1348 "Perform contents generation. When this option is set and package indexes are "
1349 "being generated with a cache DB then the file listing will also be extracted "
1350@@ -2732,12 +2769,12 @@
1351 msgstr ""
1352
1353 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1354-#: apt-ftparchive.1.xml:535
1355+#: apt-ftparchive.1.xml:560
1356 msgid "<option>--source-override</option>"
1357 msgstr ""
1358
1359 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1360-#: apt-ftparchive.1.xml:537
1361+#: apt-ftparchive.1.xml:562
1362 msgid ""
1363 "Select the source override file to use with the <literal>sources</literal> "
1364 "command. Configuration Item: "
1365@@ -2745,39 +2782,39 @@
1366 msgstr ""
1367
1368 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1369-#: apt-ftparchive.1.xml:541
1370+#: apt-ftparchive.1.xml:566
1371 msgid "<option>--readonly</option>"
1372 msgstr ""
1373
1374 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1375-#: apt-ftparchive.1.xml:543
1376+#: apt-ftparchive.1.xml:568
1377 msgid ""
1378 "Make the caching databases read only. Configuration Item: "
1379 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
1380 msgstr ""
1381
1382 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1383-#: apt-ftparchive.1.xml:547
1384+#: apt-ftparchive.1.xml:572
1385 msgid "<option>APT::FTPArchive::LongDescription</option>"
1386 msgstr ""
1387
1388 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1389-#: apt-ftparchive.1.xml:549
1390+#: apt-ftparchive.1.xml:574
1391 msgid ""
1392 "This configuration option defaults to \"<literal>true</literal>\" and should "
1393 "only be set to <literal>\"false\"</literal> if the Archive generated with "
1394 "&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
1395-"that it is currently not possible to create these files with "
1396-"<command>apt-ftparchive</command>."
1397+"that the <filename>Translation-en</filename> master file can only be created "
1398+"in the generate command."
1399 msgstr ""
1400
1401 #. type: Content of: <refentry><refsect1><title>
1402-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1007 apt_preferences.5.xml:469 sources.list.5.xml:193
1403+#: apt-ftparchive.1.xml:586 apt.conf.5.xml:1007 apt_preferences.5.xml:469 sources.list.5.xml:193
1404 msgid "Examples"
1405 msgstr ""
1406
1407 #. type: Content of: <refentry><refsect1><para><programlisting>
1408-#: apt-ftparchive.1.xml:567
1409+#: apt-ftparchive.1.xml:592
1410 #, no-wrap
1411 msgid ""
1412 "<command>apt-ftparchive</command> packages "
1413@@ -2786,14 +2823,14 @@
1414 msgstr ""
1415
1416 #. type: Content of: <refentry><refsect1><para>
1417-#: apt-ftparchive.1.xml:563
1418+#: apt-ftparchive.1.xml:588
1419 msgid ""
1420 "To create a compressed Packages file for a directory containing binary "
1421 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
1422 msgstr ""
1423
1424 #. type: Content of: <refentry><refsect1><para>
1425-#: apt-ftparchive.1.xml:577
1426+#: apt-ftparchive.1.xml:602
1427 msgid ""
1428 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
1429 "100 on error."
1430
1431=== modified file 'doc/po/de.po'
1432--- doc/po/de.po 2010-04-14 20:30:03 +0000
1433+++ doc/po/de.po 2012-01-31 15:47:23 +0000
1434@@ -7,13 +7,14 @@
1435 msgstr ""
1436 "Project-Id-Version: apt-doc 0.7.24\n"
1437 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
1438-"POT-Creation-Date: 2010-04-14 20:30+0300\n"
1439+"POT-Creation-Date: 2011-10-04 01:17+0000\n"
1440 "PO-Revision-Date: 2009-12-31 17:41+GMT\n"
1441 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
1442 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
1443 "MIME-Version: 1.0\n"
1444 "Content-Type: text/plain; charset=UTF-8\n"
1445 "Content-Transfer-Encoding: 8bit\n"
1446+"Language: de\n"
1447
1448 #. type: TH
1449 #: apt.8:17
1450@@ -1750,7 +1751,7 @@
1451
1452 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1453 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
1454-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
1455+#: apt-ftparchive.1.xml:517 apt-get.8.xml:319 apt-mark.8.xml:89
1456 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:481 apt.conf.5.xml:503
1457 msgid "options"
1458 msgstr "Optionen"
1459@@ -1778,7 +1779,7 @@
1460 "pkgcache</literal>."
1461
1462 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1463-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
1464+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:560 apt-get.8.xml:376
1465 #: apt-sortpkgs.1.xml:58
1466 msgid "<option>-s</option>"
1467 msgstr "<option>-s</option>"
1468@@ -1806,12 +1807,12 @@
1469 "srcpkgcache</literal>."
1470
1471 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1472-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
1473+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
1474 msgid "<option>-q</option>"
1475 msgstr "<option>-q</option>"
1476
1477 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1478-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
1479+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
1480 msgid "<option>--quiet</option>"
1481 msgstr "<option>--quiet</option>"
1482
1483@@ -1987,7 +1988,7 @@
1484
1485 #. type: Content of: <refentry><refsect1><variablelist>
1486 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
1487-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
1488+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:581 apt-get.8.xml:554
1489 #: apt-sortpkgs.1.xml:64
1490 msgid "&apt-commonoptions;"
1491 msgstr "&apt-commonoptions;"
1492@@ -2005,7 +2006,7 @@
1493
1494 #. type: Content of: <refentry><refsect1><title>
1495 #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
1496-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
1497+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:597 apt-get.8.xml:569
1498 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
1499 #: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1019 apt_preferences.5.xml:629
1500 #: sources.list.5.xml:233
1501@@ -2019,7 +2020,7 @@
1502
1503 #. type: Content of: <refentry><refsect1><title>
1504 #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
1505-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
1506+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:601 apt-get.8.xml:575
1507 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
1508 msgid "Diagnostics"
1509 msgstr "Diagnose"
1510@@ -2154,7 +2155,7 @@
1511 msgstr "Optionen"
1512
1513 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1514-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
1515+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:528 apt-get.8.xml:328
1516 msgid "<option>-d</option>"
1517 msgstr "<option>-d</option>"
1518
1519@@ -2397,7 +2398,7 @@
1520 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
1521
1522 #. type: Content of: <refentry><refsect1><para>
1523-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
1524+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:598
1525 #: apt-sortpkgs.1.xml:70
1526 msgid "&apt-conf;"
1527 msgstr "&apt-conf;"
1528@@ -2956,11 +2957,31 @@
1529
1530 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1531 #: apt-ftparchive.1.xml:227
1532+#, fuzzy
1533+#| msgid "Contents::Compress"
1534+msgid "Translation::Compress"
1535+msgstr "Contents::Compress"
1536+
1537+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1538+#: apt-ftparchive.1.xml:229
1539+#, fuzzy
1540+#| msgid ""
1541+#| "This is similar to <literal>Packages::Compress</literal> except that it "
1542+#| "controls the compression for the Contents files."
1543+msgid ""
1544+"This is similar to <literal>Packages::Compress</literal> except that it "
1545+"controls the compression for the Translation-en master file."
1546+msgstr ""
1547+"Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
1548+"Kompression der Inhaltsdateien steuert."
1549+
1550+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1551+#: apt-ftparchive.1.xml:233
1552 msgid "DeLinkLimit"
1553 msgstr "DeLinkLimit"
1554
1555 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1556-#: apt-ftparchive.1.xml:229
1557+#: apt-ftparchive.1.xml:235
1558 msgid ""
1559 "Specifies the number of kilobytes to delink (and replace with hard links) "
1560 "per run. This is used in conjunction with the per-section <literal>External-"
1561@@ -2971,12 +2992,12 @@
1562 "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
1563
1564 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1565-#: apt-ftparchive.1.xml:234
1566+#: apt-ftparchive.1.xml:240
1567 msgid "FileMode"
1568 msgstr "FileMode"
1569
1570 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1571-#: apt-ftparchive.1.xml:236
1572+#: apt-ftparchive.1.xml:242
1573 msgid ""
1574 "Specifies the mode of all created index files. It defaults to 0644. All "
1575 "index files are set to this mode with no regard to the umask."
1576@@ -2984,13 +3005,27 @@
1577 "Gibt die Rechte für alle erstellten Indexdateien an. Vorgabe ist 0644. Alle "
1578 "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
1579
1580+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1581+#: apt-ftparchive.1.xml:247 apt-ftparchive.1.xml:393
1582+#, fuzzy
1583+#| msgid "Description"
1584+msgid "LongDescription"
1585+msgstr "Beschreibung"
1586+
1587+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1588+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
1589+msgid ""
1590+"Sets if long descriptions should be included in the Packages file or split "
1591+"out into a master Translation-en file."
1592+msgstr ""
1593+
1594 #. type: Content of: <refentry><refsect1><refsect2><title>
1595-#: apt-ftparchive.1.xml:243
1596+#: apt-ftparchive.1.xml:255
1597 msgid "TreeDefault Section"
1598 msgstr "TreeDefault-Abschnitt"
1599
1600 #. type: Content of: <refentry><refsect1><refsect2><para>
1601-#: apt-ftparchive.1.xml:245
1602+#: apt-ftparchive.1.xml:257
1603 msgid ""
1604 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
1605 "variables are substitution variables and have the strings $(DIST), "
1606@@ -3001,12 +3036,12 @@
1607 "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
1608
1609 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1610-#: apt-ftparchive.1.xml:250
1611+#: apt-ftparchive.1.xml:262
1612 msgid "MaxContentsChange"
1613 msgstr "MaxContentsChange"
1614
1615 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1616-#: apt-ftparchive.1.xml:252
1617+#: apt-ftparchive.1.xml:264
1618 msgid ""
1619 "Sets the number of kilobytes of contents files that are generated each day. "
1620 "The contents files are round-robined so that over several days they will all "
1621@@ -3017,12 +3052,12 @@
1622 "Tage alle neu gebildet werden."
1623
1624 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1625-#: apt-ftparchive.1.xml:257
1626+#: apt-ftparchive.1.xml:269
1627 msgid "ContentsAge"
1628 msgstr "ContentsAge"
1629
1630 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1631-#: apt-ftparchive.1.xml:259
1632+#: apt-ftparchive.1.xml:271
1633 msgid ""
1634 "Controls the number of days a contents file is allowed to be checked without "
1635 "changing. If this limit is passed the mtime of the contents file is updated. "
1636@@ -3040,12 +3075,12 @@
1637 "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
1638
1639 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1640-#: apt-ftparchive.1.xml:268
1641+#: apt-ftparchive.1.xml:280
1642 msgid "Directory"
1643 msgstr "Directory"
1644
1645 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1646-#: apt-ftparchive.1.xml:270
1647+#: apt-ftparchive.1.xml:282
1648 msgid ""
1649 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
1650 "$(SECTION)/binary-$(ARCH)/</filename>"
1651@@ -3054,12 +3089,12 @@
1652 "$(SECTION)/binary-$(ARCH)/</filename>"
1653
1654 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1655-#: apt-ftparchive.1.xml:274
1656+#: apt-ftparchive.1.xml:286
1657 msgid "SrcDirectory"
1658 msgstr "SrcDirectory"
1659
1660 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1661-#: apt-ftparchive.1.xml:276
1662+#: apt-ftparchive.1.xml:288
1663 msgid ""
1664 "Sets the top of the source package directory tree. Defaults to <filename>"
1665 "$(DIST)/$(SECTION)/source/</filename>"
1666@@ -3068,12 +3103,12 @@
1667 "$(DIST)/$(SECTION)/source/</filename>"
1668
1669 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1670-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
1671+#: apt-ftparchive.1.xml:292 apt-ftparchive.1.xml:431
1672 msgid "Packages"
1673 msgstr "Packages"
1674
1675 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1676-#: apt-ftparchive.1.xml:282
1677+#: apt-ftparchive.1.xml:294
1678 msgid ""
1679 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
1680 "binary-$(ARCH)/Packages</filename>"
1681@@ -3082,12 +3117,12 @@
1682 "binary-$(ARCH)/Packages</filename>"
1683
1684 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1685-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
1686+#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:436
1687 msgid "Sources"
1688 msgstr "Sources"
1689
1690 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1691-#: apt-ftparchive.1.xml:288
1692+#: apt-ftparchive.1.xml:300
1693 #, fuzzy
1694 #| msgid ""
1695 #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
1696@@ -3100,12 +3135,27 @@
1697 "source/Sources</filename>"
1698
1699 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1700-#: apt-ftparchive.1.xml:292
1701+#: apt-ftparchive.1.xml:304
1702+#, fuzzy
1703+#| msgid "Operation"
1704+msgid "Translation"
1705+msgstr "Betrieb"
1706+
1707+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1708+#: apt-ftparchive.1.xml:306
1709+msgid ""
1710+"Set the output Translation-en master file with the long descriptions if they "
1711+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
1712+"$(SECTION)/i18n/Translation-en</filename>"
1713+msgstr ""
1714+
1715+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1716+#: apt-ftparchive.1.xml:311
1717 msgid "InternalPrefix"
1718 msgstr "InternalPrefix"
1719
1720 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1721-#: apt-ftparchive.1.xml:294
1722+#: apt-ftparchive.1.xml:313
1723 msgid ""
1724 "Sets the path prefix that causes a symlink to be considered an internal link "
1725 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
1726@@ -3116,12 +3166,12 @@
1727 "<filename>$(DIST)/$(SECTION)/</filename>"
1728
1729 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1730-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
1731+#: apt-ftparchive.1.xml:318 apt-ftparchive.1.xml:442
1732 msgid "Contents"
1733 msgstr "Contents"
1734
1735 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1736-#: apt-ftparchive.1.xml:301
1737+#: apt-ftparchive.1.xml:320
1738 msgid ""
1739 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
1740 "</filename>. If this setting causes multiple Packages files to map onto a "
1741@@ -3135,22 +3185,22 @@
1742 "automatisch integrieren."
1743
1744 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1745-#: apt-ftparchive.1.xml:308
1746+#: apt-ftparchive.1.xml:327
1747 msgid "Contents::Header"
1748 msgstr "Contents::Header"
1749
1750 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1751-#: apt-ftparchive.1.xml:310
1752+#: apt-ftparchive.1.xml:329
1753 msgid "Sets header file to prepend to the contents output."
1754 msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
1755
1756 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1757-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
1758+#: apt-ftparchive.1.xml:332 apt-ftparchive.1.xml:467
1759 msgid "BinCacheDB"
1760 msgstr "BinCacheDB"
1761
1762 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1763-#: apt-ftparchive.1.xml:315
1764+#: apt-ftparchive.1.xml:334
1765 msgid ""
1766 "Sets the binary cache database to use for this section. Multiple sections "
1767 "can share the same database."
1768@@ -3159,12 +3209,12 @@
1769 "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
1770
1771 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1772-#: apt-ftparchive.1.xml:319
1773+#: apt-ftparchive.1.xml:338
1774 msgid "FileList"
1775 msgstr "FileList"
1776
1777 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1778-#: apt-ftparchive.1.xml:321
1779+#: apt-ftparchive.1.xml:340
1780 msgid ""
1781 "Specifies that instead of walking the directory tree, <command>apt-"
1782 "ftparchive</command> should read the list of files from the given file. "
1783@@ -3175,12 +3225,12 @@
1784 "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
1785
1786 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1787-#: apt-ftparchive.1.xml:326
1788+#: apt-ftparchive.1.xml:345
1789 msgid "SourceFileList"
1790 msgstr "SourceFileList"
1791
1792 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1793-#: apt-ftparchive.1.xml:328
1794+#: apt-ftparchive.1.xml:347
1795 msgid ""
1796 "Specifies that instead of walking the directory tree, <command>apt-"
1797 "ftparchive</command> should read the list of files from the given file. "
1798@@ -3193,12 +3243,12 @@
1799 "benutzt, wenn Quellindizes verarbeitet werden."
1800
1801 #. type: Content of: <refentry><refsect1><refsect2><title>
1802-#: apt-ftparchive.1.xml:336
1803+#: apt-ftparchive.1.xml:355
1804 msgid "Tree Section"
1805 msgstr "Tree-Abschnitt"
1806
1807 #. type: Content of: <refentry><refsect1><refsect2><para>
1808-#: apt-ftparchive.1.xml:338
1809+#: apt-ftparchive.1.xml:357
1810 msgid ""
1811 "The <literal>Tree</literal> section defines a standard Debian file tree "
1812 "which consists of a base directory, then multiple sections in that base "
1813@@ -3213,7 +3263,7 @@
1814 "<literal>Directory</literal>-Ersetzungsvariable definiert."
1815
1816 #. type: Content of: <refentry><refsect1><refsect2><para>
1817-#: apt-ftparchive.1.xml:343
1818+#: apt-ftparchive.1.xml:362
1819 msgid ""
1820 "The <literal>Tree</literal> section takes a scope tag which sets the "
1821 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
1822@@ -3227,7 +3277,7 @@
1823 "filename>."
1824
1825 #. type: Content of: <refentry><refsect1><refsect2><para>
1826-#: apt-ftparchive.1.xml:348
1827+#: apt-ftparchive.1.xml:367
1828 msgid ""
1829 "All of the settings defined in the <literal>TreeDefault</literal> section "
1830 "can be use in a <literal>Tree</literal> section as well as three new "
1831@@ -3238,7 +3288,7 @@
1832 "Variablen benutzt werden."
1833
1834 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
1835-#: apt-ftparchive.1.xml:354
1836+#: apt-ftparchive.1.xml:373
1837 #, fuzzy, no-wrap
1838 #| msgid ""
1839 #| "for i in Sections do \n"
1840@@ -3255,7 +3305,7 @@
1841 " Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n"
1842
1843 #. type: Content of: <refentry><refsect1><refsect2><para>
1844-#: apt-ftparchive.1.xml:351
1845+#: apt-ftparchive.1.xml:370
1846 #, fuzzy
1847 #| msgid ""
1848 #| "When processing a <literal>Tree</literal> section <command>apt-"
1849@@ -3269,12 +3319,12 @@
1850 "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
1851
1852 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1853-#: apt-ftparchive.1.xml:360
1854+#: apt-ftparchive.1.xml:379
1855 msgid "Sections"
1856 msgstr "Abschnitte"
1857
1858 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1859-#: apt-ftparchive.1.xml:362
1860+#: apt-ftparchive.1.xml:381
1861 msgid ""
1862 "This is a space separated list of sections which appear under the "
1863 "distribution, typically this is something like <literal>main contrib non-"
1864@@ -3285,12 +3335,12 @@
1865 "non-free</literal>"
1866
1867 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1868-#: apt-ftparchive.1.xml:367
1869+#: apt-ftparchive.1.xml:386
1870 msgid "Architectures"
1871 msgstr "Architekturen"
1872
1873 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1874-#: apt-ftparchive.1.xml:369
1875+#: apt-ftparchive.1.xml:388
1876 msgid ""
1877 "This is a space separated list of all the architectures that appear under "
1878 "search section. The special architecture 'source' is used to indicate that "
1879@@ -3301,12 +3351,12 @@
1880 "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
1881
1882 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1883-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
1884+#: apt-ftparchive.1.xml:399 apt-ftparchive.1.xml:447
1885 msgid "BinOverride"
1886 msgstr "BinOverride"
1887
1888 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1889-#: apt-ftparchive.1.xml:376
1890+#: apt-ftparchive.1.xml:401
1891 msgid ""
1892 "Sets the binary override file. The override file contains section, priority "
1893 "and maintainer address information."
1894@@ -3315,12 +3365,12 @@
1895 "Priorität und Adressinformationen des Betreuers."
1896
1897 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1898-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
1899+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:452
1900 msgid "SrcOverride"
1901 msgstr "SrcOverride"
1902
1903 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1904-#: apt-ftparchive.1.xml:382
1905+#: apt-ftparchive.1.xml:407
1906 msgid ""
1907 "Sets the source override file. The override file contains section "
1908 "information."
1909@@ -3329,32 +3379,32 @@
1910 "Abschnittsinformationen."
1911
1912 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1913-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
1914+#: apt-ftparchive.1.xml:411 apt-ftparchive.1.xml:457
1915 msgid "ExtraOverride"
1916 msgstr "ExtraOverride"
1917
1918 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1919-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
1920+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
1921 msgid "Sets the binary extra override file."
1922 msgstr "Setzt die zusätzliche Programm-Override-Datei."
1923
1924 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1925-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
1926+#: apt-ftparchive.1.xml:416 apt-ftparchive.1.xml:462
1927 msgid "SrcExtraOverride"
1928 msgstr "SrcExtraOverride"
1929
1930 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1931-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
1932+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
1933 msgid "Sets the source extra override file."
1934 msgstr "Setzt die zusätzliche Quell-Override-Datei."
1935
1936 #. type: Content of: <refentry><refsect1><refsect2><title>
1937-#: apt-ftparchive.1.xml:398
1938+#: apt-ftparchive.1.xml:423
1939 msgid "BinDirectory Section"
1940 msgstr "BinDirectory-Abschnitt"
1941
1942 #. type: Content of: <refentry><refsect1><refsect2><para>
1943-#: apt-ftparchive.1.xml:400
1944+#: apt-ftparchive.1.xml:425
1945 msgid ""
1946 "The <literal>bindirectory</literal> section defines a binary directory tree "
1947 "with no special structure. The scope tag specifies the location of the "
1948@@ -3369,12 +3419,12 @@
1949 "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
1950
1951 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1952-#: apt-ftparchive.1.xml:408
1953+#: apt-ftparchive.1.xml:433
1954 msgid "Sets the Packages file output."
1955 msgstr "Setzt die Packages-Dateiausgabe."
1956
1957 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1958-#: apt-ftparchive.1.xml:413
1959+#: apt-ftparchive.1.xml:438
1960 msgid ""
1961 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
1962 "<literal>Sources</literal> is required."
1963@@ -3383,52 +3433,52 @@
1964 "<literal>Sources</literal> ist erforderlich."
1965
1966 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1967-#: apt-ftparchive.1.xml:419
1968+#: apt-ftparchive.1.xml:444
1969 msgid "Sets the Contents file output. (optional)"
1970 msgstr "Setzt die Contents-Dateiausgabe. (optional)"
1971
1972 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1973-#: apt-ftparchive.1.xml:424
1974+#: apt-ftparchive.1.xml:449
1975 msgid "Sets the binary override file."
1976 msgstr "Setzt die Programm-Override-Datei."
1977
1978 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1979-#: apt-ftparchive.1.xml:429
1980+#: apt-ftparchive.1.xml:454
1981 msgid "Sets the source override file."
1982 msgstr "Setzt die Quell-Override-Datei."
1983
1984 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1985-#: apt-ftparchive.1.xml:444
1986+#: apt-ftparchive.1.xml:469
1987 msgid "Sets the cache DB."
1988 msgstr "Setzt die Zwischenspeicherdatenbank."
1989
1990 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1991-#: apt-ftparchive.1.xml:447
1992+#: apt-ftparchive.1.xml:472
1993 msgid "PathPrefix"
1994 msgstr "PathPrefix"
1995
1996 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1997-#: apt-ftparchive.1.xml:449
1998+#: apt-ftparchive.1.xml:474
1999 msgid "Appends a path to all the output paths."
2000 msgstr "Hängt einen Pfad an alle Ausgabepfade an."
2001
2002 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2003-#: apt-ftparchive.1.xml:452
2004+#: apt-ftparchive.1.xml:477
2005 msgid "FileList, SourceFileList"
2006 msgstr "FileList, SourceFileList"
2007
2008 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2009-#: apt-ftparchive.1.xml:454
2010+#: apt-ftparchive.1.xml:479
2011 msgid "Specifies the file list file."
2012 msgstr "Gibt die Dateilistendatei an."
2013
2014 #. type: Content of: <refentry><refsect1><title>
2015-#: apt-ftparchive.1.xml:461
2016+#: apt-ftparchive.1.xml:486
2017 msgid "The Binary Override File"
2018 msgstr "Die Programm-Override-Datei "
2019
2020 #. type: Content of: <refentry><refsect1><para>
2021-#: apt-ftparchive.1.xml:462
2022+#: apt-ftparchive.1.xml:487
2023 msgid ""
2024 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
2025 "contains 4 fields separated by spaces. The first field is the package name, "
2026@@ -3443,19 +3493,19 @@
2027 "und das letzte Feld ist das Betreuerumsetzungsfeld."
2028
2029 #. type: Content of: <refentry><refsect1><para><literallayout>
2030-#: apt-ftparchive.1.xml:468
2031+#: apt-ftparchive.1.xml:493
2032 #, no-wrap
2033 msgid "old [// oldn]* => new"
2034 msgstr "alt [// oldn]* => neu"
2035
2036 #. type: Content of: <refentry><refsect1><para><literallayout>
2037-#: apt-ftparchive.1.xml:470
2038+#: apt-ftparchive.1.xml:495
2039 #, no-wrap
2040 msgid "new"
2041 msgstr "neu"
2042
2043 #. type: Content of: <refentry><refsect1><para>
2044-#: apt-ftparchive.1.xml:467
2045+#: apt-ftparchive.1.xml:492
2046 msgid ""
2047 "The general form of the maintainer field is: <placeholder type="
2048 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
2049@@ -3472,12 +3522,12 @@
2050 "bedingungslos."
2051
2052 #. type: Content of: <refentry><refsect1><title>
2053-#: apt-ftparchive.1.xml:478
2054+#: apt-ftparchive.1.xml:503
2055 msgid "The Source Override File"
2056 msgstr "Die Quell-Override-Datei"
2057
2058 #. type: Content of: <refentry><refsect1><para>
2059-#: apt-ftparchive.1.xml:480
2060+#: apt-ftparchive.1.xml:505
2061 msgid ""
2062 "The source override file is fully compatible with &dpkg-scansources;. It "
2063 "contains 2 fields separated by spaces. The first fields is the source "
2064@@ -3488,12 +3538,12 @@
2065 "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
2066
2067 #. type: Content of: <refentry><refsect1><title>
2068-#: apt-ftparchive.1.xml:485
2069+#: apt-ftparchive.1.xml:510
2070 msgid "The Extra Override File"
2071 msgstr "Die zusätzlich Override-Datei"
2072
2073 #. type: Content of: <refentry><refsect1><para>
2074-#: apt-ftparchive.1.xml:487
2075+#: apt-ftparchive.1.xml:512
2076 msgid ""
2077 "The extra override file allows any arbitrary tag to be added or replaced in "
2078 "the output. It has 3 columns, the first is the package, the second is the "
2079@@ -3505,12 +3555,12 @@
2080 "ist der neue Wert."
2081
2082 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2083-#: apt-ftparchive.1.xml:496
2084+#: apt-ftparchive.1.xml:521
2085 msgid "<option>--md5</option>"
2086 msgstr "<option>--md5</option>"
2087
2088 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2089-#: apt-ftparchive.1.xml:498
2090+#: apt-ftparchive.1.xml:523
2091 msgid ""
2092 "Generate MD5 sums. This defaults to on, when turned off the generated index "
2093 "files will not have MD5Sum fields where possible. Configuration Item: "
2094@@ -3521,12 +3571,12 @@
2095 "ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>"
2096
2097 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2098-#: apt-ftparchive.1.xml:503
2099+#: apt-ftparchive.1.xml:528
2100 msgid "<option>--db</option>"
2101 msgstr "<option>--db</option>"
2102
2103 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2104-#: apt-ftparchive.1.xml:505
2105+#: apt-ftparchive.1.xml:530
2106 msgid ""
2107 "Use a binary caching DB. This has no effect on the generate command. "
2108 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
2109@@ -3536,7 +3586,7 @@
2110 "DB</literal>."
2111
2112 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2113-#: apt-ftparchive.1.xml:511
2114+#: apt-ftparchive.1.xml:536
2115 msgid ""
2116 "Quiet; produces output suitable for logging, omitting progress indicators. "
2117 "More q's will produce more quiet up to a maximum of 2. You can also use "
2118@@ -3550,12 +3600,12 @@
2119 "Konfigurationselement: <literal>quiet</literal>."
2120
2121 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2122-#: apt-ftparchive.1.xml:517
2123+#: apt-ftparchive.1.xml:542
2124 msgid "<option>--delink</option>"
2125 msgstr "<option>--delink</option>"
2126
2127 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2128-#: apt-ftparchive.1.xml:519
2129+#: apt-ftparchive.1.xml:544
2130 msgid ""
2131 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
2132 "then this option actually enables delinking of the files. It defaults to on "
2133@@ -3569,12 +3619,12 @@
2134 "DeLinkAct</literal>."
2135
2136 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2137-#: apt-ftparchive.1.xml:525
2138+#: apt-ftparchive.1.xml:550
2139 msgid "<option>--contents</option>"
2140 msgstr "<option>--contents</option>"
2141
2142 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2143-#: apt-ftparchive.1.xml:527
2144+#: apt-ftparchive.1.xml:552
2145 msgid ""
2146 "Perform contents generation. When this option is set and package indexes are "
2147 "being generated with a cache DB then the file listing will also be extracted "
2148@@ -3590,12 +3640,12 @@
2149 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
2150
2151 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2152-#: apt-ftparchive.1.xml:535
2153+#: apt-ftparchive.1.xml:560
2154 msgid "<option>--source-override</option>"
2155 msgstr "<option>--source-override</option>"
2156
2157 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2158-#: apt-ftparchive.1.xml:537
2159+#: apt-ftparchive.1.xml:562
2160 msgid ""
2161 "Select the source override file to use with the <literal>sources</literal> "
2162 "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
2163@@ -3606,12 +3656,12 @@
2164 "SourceOverride</literal>."
2165
2166 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2167-#: apt-ftparchive.1.xml:541
2168+#: apt-ftparchive.1.xml:566
2169 msgid "<option>--readonly</option>"
2170 msgstr "<option>--readonly</option>"
2171
2172 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2173-#: apt-ftparchive.1.xml:543
2174+#: apt-ftparchive.1.xml:568
2175 msgid ""
2176 "Make the caching databases read only. Configuration Item: <literal>APT::"
2177 "FTPArchive::ReadOnlyDB</literal>."
2178@@ -3620,18 +3670,25 @@
2179 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
2180
2181 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2182-#: apt-ftparchive.1.xml:547
2183+#: apt-ftparchive.1.xml:572
2184 msgid "<option>APT::FTPArchive::LongDescription</option>"
2185 msgstr "<option>APT::FTPArchive::LongDescription</option>"
2186
2187 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2188-#: apt-ftparchive.1.xml:549
2189+#: apt-ftparchive.1.xml:574
2190+#, fuzzy
2191+#| msgid ""
2192+#| "This configuration option defaults to \"<literal>true</literal>\" and "
2193+#| "should only be set to <literal>\"false\"</literal> if the Archive "
2194+#| "generated with &apt-ftparchive; also provides <filename>Translation</"
2195+#| "filename> files. Note that it is currently not possible to create these "
2196+#| "files with <command>apt-ftparchive</command>."
2197 msgid ""
2198 "This configuration option defaults to \"<literal>true</literal>\" and should "
2199 "only be set to <literal>\"false\"</literal> if the Archive generated with "
2200 "&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
2201-"that it is currently not possible to create these files with <command>apt-"
2202-"ftparchive</command>."
2203+"that the <filename>Translation-en</filename> master file can only be created "
2204+"in the generate command."
2205 msgstr ""
2206 "Diese Konfigurationsoption ist standardmäßig »<literal>true</literal>« und "
2207 "sollte nur auf »<literal>false</literal>« gesetzt werden, wenn das mit &apt-"
2208@@ -3640,19 +3697,19 @@
2209 "Dateien mit <command>apt-ftparchive</command> zu erstellen."
2210
2211 #. type: Content of: <refentry><refsect1><title>
2212-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1007 apt_preferences.5.xml:469
2213+#: apt-ftparchive.1.xml:586 apt.conf.5.xml:1007 apt_preferences.5.xml:469
2214 #: sources.list.5.xml:193
2215 msgid "Examples"
2216 msgstr "Beispiele"
2217
2218 #. type: Content of: <refentry><refsect1><para><programlisting>
2219-#: apt-ftparchive.1.xml:567
2220+#: apt-ftparchive.1.xml:592
2221 #, no-wrap
2222 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
2223 msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
2224
2225 #. type: Content of: <refentry><refsect1><para>
2226-#: apt-ftparchive.1.xml:563
2227+#: apt-ftparchive.1.xml:588
2228 msgid ""
2229 "To create a compressed Packages file for a directory containing binary "
2230 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
2231@@ -3662,7 +3719,7 @@
2232 ">"
2233
2234 #. type: Content of: <refentry><refsect1><para>
2235-#: apt-ftparchive.1.xml:577
2236+#: apt-ftparchive.1.xml:602
2237 msgid ""
2238 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
2239 "100 on error."
2240@@ -11178,8 +11235,10 @@
2241 #~ "besonders lange Sprachcodes sind selten. Informieren Sie sich deshalb "
2242 #~ "bitte welche verfügbar sind, bevor Sie hier unmögliche Werte einsetzen."
2243
2244-#~ msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
2245-#~ msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
2246+#~ msgid ""
2247+#~ "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
2248+#~ msgstr ""
2249+#~ "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
2250
2251 #, fuzzy
2252 #~| msgid ""
2253
2254=== modified file 'doc/po/es.po'
2255--- doc/po/es.po 2010-04-14 20:30:03 +0000
2256+++ doc/po/es.po 2012-01-31 15:47:23 +0000
2257@@ -14,13 +14,14 @@
2258 msgid ""
2259 msgstr ""
2260 "Project-Id-Version: apt\n"
2261-"POT-Creation-Date: 2010-04-14 20:30+0300\n"
2262+"POT-Creation-Date: 2011-10-04 01:17+0000\n"
2263 "PO-Revision-Date: 2004-09-20 17:05+0000\n"
2264 "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
2265 "Language-Team: <debian-l10n-spanish@lists.debian.org>\n"
2266 "MIME-Version: 1.0\n"
2267 "Content-Type: text/plain; charset=UTF-8\n"
2268 "Content-Transfer-Encoding: 8bit\n"
2269+"Language: \n"
2270
2271 #. type: TH
2272 #: apt.8:17
2273@@ -1580,7 +1581,7 @@
2274
2275 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2276 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
2277-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
2278+#: apt-ftparchive.1.xml:517 apt-get.8.xml:319 apt-mark.8.xml:89
2279 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:481 apt.conf.5.xml:503
2280 #, fuzzy
2281 msgid "options"
2282@@ -1611,7 +1612,7 @@
2283 "configuración: <literal>Dir::Cache::pkgcache</literal>."
2284
2285 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2286-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
2287+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:560 apt-get.8.xml:376
2288 #: apt-sortpkgs.1.xml:58
2289 #, fuzzy
2290 msgid "<option>-s</option>"
2291@@ -1641,13 +1642,13 @@
2292 "configuración: <literal>Dir::Cache::srcpkgcache</literal>."
2293
2294 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2295-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
2296+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
2297 #, fuzzy
2298 msgid "<option>-q</option>"
2299 msgstr "<option>-q</option>"
2300
2301 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2302-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
2303+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
2304 #, fuzzy
2305 msgid "<option>--quiet</option>"
2306 msgstr "<option>--quiet</option>"
2307@@ -1846,7 +1847,7 @@
2308
2309 #. type: Content of: <refentry><refsect1><variablelist>
2310 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
2311-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
2312+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:581 apt-get.8.xml:554
2313 #: apt-sortpkgs.1.xml:64
2314 #, fuzzy
2315 msgid "&apt-commonoptions;"
2316@@ -1869,7 +1870,7 @@
2317
2318 #. type: Content of: <refentry><refsect1><title>
2319 #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
2320-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
2321+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:597 apt-get.8.xml:569
2322 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
2323 #: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1019 apt_preferences.5.xml:629
2324 #: sources.list.5.xml:233
2325@@ -1918,7 +1919,7 @@
2326
2327 #. type: Content of: <refentry><refsect1><title>
2328 #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
2329-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
2330+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:601 apt-get.8.xml:575
2331 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
2332 #, fuzzy
2333 msgid "Diagnostics"
2334@@ -2068,7 +2069,7 @@
2335 msgstr "Opciones"
2336
2337 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2338-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
2339+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:528 apt-get.8.xml:328
2340 #, fuzzy
2341 msgid "<option>-d</option>"
2342 msgstr "<option>-d</option>"
2343@@ -2344,7 +2345,7 @@
2344 msgstr "Sólo muestra el contenido del espacio de configuración."
2345
2346 #. type: Content of: <refentry><refsect1><para>
2347-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
2348+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:598
2349 #: apt-sortpkgs.1.xml:70
2350 #, fuzzy
2351 msgid "&apt-conf;"
2352@@ -2795,11 +2796,23 @@
2353
2354 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2355 #: apt-ftparchive.1.xml:227
2356+msgid "Translation::Compress"
2357+msgstr ""
2358+
2359+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2360+#: apt-ftparchive.1.xml:229
2361+msgid ""
2362+"This is similar to <literal>Packages::Compress</literal> except that it "
2363+"controls the compression for the Translation-en master file."
2364+msgstr ""
2365+
2366+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2367+#: apt-ftparchive.1.xml:233
2368 msgid "DeLinkLimit"
2369 msgstr ""
2370
2371 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2372-#: apt-ftparchive.1.xml:229
2373+#: apt-ftparchive.1.xml:235
2374 msgid ""
2375 "Specifies the number of kilobytes to delink (and replace with hard links) "
2376 "per run. This is used in conjunction with the per-section <literal>External-"
2377@@ -2807,25 +2820,38 @@
2378 msgstr ""
2379
2380 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2381-#: apt-ftparchive.1.xml:234
2382+#: apt-ftparchive.1.xml:240
2383 #, fuzzy
2384 msgid "FileMode"
2385 msgstr "Ficheros"
2386
2387 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2388-#: apt-ftparchive.1.xml:236
2389+#: apt-ftparchive.1.xml:242
2390 msgid ""
2391 "Specifies the mode of all created index files. It defaults to 0644. All "
2392 "index files are set to this mode with no regard to the umask."
2393 msgstr ""
2394
2395+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2396+#: apt-ftparchive.1.xml:247 apt-ftparchive.1.xml:393
2397+#, fuzzy
2398+msgid "LongDescription"
2399+msgstr "Descripción"
2400+
2401+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2402+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
2403+msgid ""
2404+"Sets if long descriptions should be included in the Packages file or split "
2405+"out into a master Translation-en file."
2406+msgstr ""
2407+
2408 #. type: Content of: <refentry><refsect1><refsect2><title>
2409-#: apt-ftparchive.1.xml:243
2410+#: apt-ftparchive.1.xml:255
2411 msgid "TreeDefault Section"
2412 msgstr ""
2413
2414 #. type: Content of: <refentry><refsect1><refsect2><para>
2415-#: apt-ftparchive.1.xml:245
2416+#: apt-ftparchive.1.xml:257
2417 msgid ""
2418 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
2419 "variables are substitution variables and have the strings $(DIST), "
2420@@ -2833,12 +2859,12 @@
2421 msgstr ""
2422
2423 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2424-#: apt-ftparchive.1.xml:250
2425+#: apt-ftparchive.1.xml:262
2426 msgid "MaxContentsChange"
2427 msgstr ""
2428
2429 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2430-#: apt-ftparchive.1.xml:252
2431+#: apt-ftparchive.1.xml:264
2432 msgid ""
2433 "Sets the number of kilobytes of contents files that are generated each day. "
2434 "The contents files are round-robined so that over several days they will all "
2435@@ -2846,12 +2872,12 @@
2436 msgstr ""
2437
2438 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2439-#: apt-ftparchive.1.xml:257
2440+#: apt-ftparchive.1.xml:269
2441 msgid "ContentsAge"
2442 msgstr ""
2443
2444 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2445-#: apt-ftparchive.1.xml:259
2446+#: apt-ftparchive.1.xml:271
2447 msgid ""
2448 "Controls the number of days a contents file is allowed to be checked without "
2449 "changing. If this limit is passed the mtime of the contents file is updated. "
2450@@ -2862,63 +2888,77 @@
2451 msgstr ""
2452
2453 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2454-#: apt-ftparchive.1.xml:268
2455+#: apt-ftparchive.1.xml:280
2456 #, fuzzy
2457 msgid "Directory"
2458 msgstr "Run-Directory"
2459
2460 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2461-#: apt-ftparchive.1.xml:270
2462+#: apt-ftparchive.1.xml:282
2463 msgid ""
2464 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
2465 "$(SECTION)/binary-$(ARCH)/</filename>"
2466 msgstr ""
2467
2468 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2469-#: apt-ftparchive.1.xml:274
2470+#: apt-ftparchive.1.xml:286
2471 #, fuzzy
2472 msgid "SrcDirectory"
2473 msgstr "Run-Directory"
2474
2475 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2476-#: apt-ftparchive.1.xml:276
2477+#: apt-ftparchive.1.xml:288
2478 msgid ""
2479 "Sets the top of the source package directory tree. Defaults to <filename>"
2480 "$(DIST)/$(SECTION)/source/</filename>"
2481 msgstr ""
2482
2483 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2484-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
2485+#: apt-ftparchive.1.xml:292 apt-ftparchive.1.xml:431
2486 msgid "Packages"
2487 msgstr ""
2488
2489 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2490-#: apt-ftparchive.1.xml:282
2491+#: apt-ftparchive.1.xml:294
2492 msgid ""
2493 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
2494 "binary-$(ARCH)/Packages</filename>"
2495 msgstr ""
2496
2497 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2498-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
2499+#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:436
2500 #, fuzzy
2501 msgid "Sources"
2502 msgstr "Source-Symlinks"
2503
2504 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2505-#: apt-ftparchive.1.xml:288
2506+#: apt-ftparchive.1.xml:300
2507 msgid ""
2508 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
2509 "source/Sources</filename>"
2510 msgstr ""
2511
2512 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2513-#: apt-ftparchive.1.xml:292
2514+#: apt-ftparchive.1.xml:304
2515+#, fuzzy
2516+msgid "Translation"
2517+msgstr "Opciones"
2518+
2519+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2520+#: apt-ftparchive.1.xml:306
2521+msgid ""
2522+"Set the output Translation-en master file with the long descriptions if they "
2523+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
2524+"$(SECTION)/i18n/Translation-en</filename>"
2525+msgstr ""
2526+
2527+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2528+#: apt-ftparchive.1.xml:311
2529 msgid "InternalPrefix"
2530 msgstr ""
2531
2532 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2533-#: apt-ftparchive.1.xml:294
2534+#: apt-ftparchive.1.xml:313
2535 msgid ""
2536 "Sets the path prefix that causes a symlink to be considered an internal link "
2537 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
2538@@ -2926,12 +2966,12 @@
2539 msgstr ""
2540
2541 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2542-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
2543+#: apt-ftparchive.1.xml:318 apt-ftparchive.1.xml:442
2544 msgid "Contents"
2545 msgstr ""
2546
2547 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2548-#: apt-ftparchive.1.xml:301
2549+#: apt-ftparchive.1.xml:320
2550 msgid ""
2551 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
2552 "</filename>. If this setting causes multiple Packages files to map onto a "
2553@@ -2940,36 +2980,36 @@
2554 msgstr ""
2555
2556 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2557-#: apt-ftparchive.1.xml:308
2558+#: apt-ftparchive.1.xml:327
2559 msgid "Contents::Header"
2560 msgstr ""
2561
2562 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2563-#: apt-ftparchive.1.xml:310
2564+#: apt-ftparchive.1.xml:329
2565 msgid "Sets header file to prepend to the contents output."
2566 msgstr ""
2567
2568 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2569-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
2570+#: apt-ftparchive.1.xml:332 apt-ftparchive.1.xml:467
2571 #, fuzzy
2572 msgid "BinCacheDB"
2573 msgstr "check"
2574
2575 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2576-#: apt-ftparchive.1.xml:315
2577+#: apt-ftparchive.1.xml:334
2578 msgid ""
2579 "Sets the binary cache database to use for this section. Multiple sections "
2580 "can share the same database."
2581 msgstr ""
2582
2583 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2584-#: apt-ftparchive.1.xml:319
2585+#: apt-ftparchive.1.xml:338
2586 #, fuzzy
2587 msgid "FileList"
2588 msgstr "Ficheros"
2589
2590 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2591-#: apt-ftparchive.1.xml:321
2592+#: apt-ftparchive.1.xml:340
2593 msgid ""
2594 "Specifies that instead of walking the directory tree, <command>apt-"
2595 "ftparchive</command> should read the list of files from the given file. "
2596@@ -2977,13 +3017,13 @@
2597 msgstr ""
2598
2599 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2600-#: apt-ftparchive.1.xml:326
2601+#: apt-ftparchive.1.xml:345
2602 #, fuzzy
2603 msgid "SourceFileList"
2604 msgstr "source"
2605
2606 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2607-#: apt-ftparchive.1.xml:328
2608+#: apt-ftparchive.1.xml:347
2609 msgid ""
2610 "Specifies that instead of walking the directory tree, <command>apt-"
2611 "ftparchive</command> should read the list of files from the given file. "
2612@@ -2992,12 +3032,12 @@
2613 msgstr ""
2614
2615 #. type: Content of: <refentry><refsect1><refsect2><title>
2616-#: apt-ftparchive.1.xml:336
2617+#: apt-ftparchive.1.xml:355
2618 msgid "Tree Section"
2619 msgstr ""
2620
2621 #. type: Content of: <refentry><refsect1><refsect2><para>
2622-#: apt-ftparchive.1.xml:338
2623+#: apt-ftparchive.1.xml:357
2624 msgid ""
2625 "The <literal>Tree</literal> section defines a standard Debian file tree "
2626 "which consists of a base directory, then multiple sections in that base "
2627@@ -3007,7 +3047,7 @@
2628 msgstr ""
2629
2630 #. type: Content of: <refentry><refsect1><refsect2><para>
2631-#: apt-ftparchive.1.xml:343
2632+#: apt-ftparchive.1.xml:362
2633 msgid ""
2634 "The <literal>Tree</literal> section takes a scope tag which sets the "
2635 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
2636@@ -3016,7 +3056,7 @@
2637 msgstr ""
2638
2639 #. type: Content of: <refentry><refsect1><refsect2><para>
2640-#: apt-ftparchive.1.xml:348
2641+#: apt-ftparchive.1.xml:367
2642 msgid ""
2643 "All of the settings defined in the <literal>TreeDefault</literal> section "
2644 "can be use in a <literal>Tree</literal> section as well as three new "
2645@@ -3024,7 +3064,7 @@
2646 msgstr ""
2647
2648 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
2649-#: apt-ftparchive.1.xml:354
2650+#: apt-ftparchive.1.xml:373
2651 #, no-wrap
2652 msgid ""
2653 "for i in Sections do \n"
2654@@ -3034,7 +3074,7 @@
2655 msgstr ""
2656
2657 #. type: Content of: <refentry><refsect1><refsect2><para>
2658-#: apt-ftparchive.1.xml:351
2659+#: apt-ftparchive.1.xml:370
2660 msgid ""
2661 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
2662 "command> performs an operation similar to: <placeholder type=\"programlisting"
2663@@ -3042,13 +3082,13 @@
2664 msgstr ""
2665
2666 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2667-#: apt-ftparchive.1.xml:360
2668+#: apt-ftparchive.1.xml:379
2669 #, fuzzy
2670 msgid "Sections"
2671 msgstr "Opciones"
2672
2673 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2674-#: apt-ftparchive.1.xml:362
2675+#: apt-ftparchive.1.xml:381
2676 msgid ""
2677 "This is a space separated list of sections which appear under the "
2678 "distribution, typically this is something like <literal>main contrib non-"
2679@@ -3056,13 +3096,13 @@
2680 msgstr ""
2681
2682 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2683-#: apt-ftparchive.1.xml:367
2684+#: apt-ftparchive.1.xml:386
2685 #, fuzzy
2686 msgid "Architectures"
2687 msgstr "Arquitectura"
2688
2689 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2690-#: apt-ftparchive.1.xml:369
2691+#: apt-ftparchive.1.xml:388
2692 msgid ""
2693 "This is a space separated list of all the architectures that appear under "
2694 "search section. The special architecture 'source' is used to indicate that "
2695@@ -3070,57 +3110,57 @@
2696 msgstr ""
2697
2698 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2699-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
2700+#: apt-ftparchive.1.xml:399 apt-ftparchive.1.xml:447
2701 msgid "BinOverride"
2702 msgstr ""
2703
2704 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2705-#: apt-ftparchive.1.xml:376
2706+#: apt-ftparchive.1.xml:401
2707 msgid ""
2708 "Sets the binary override file. The override file contains section, priority "
2709 "and maintainer address information."
2710 msgstr ""
2711
2712 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2713-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
2714+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:452
2715 msgid "SrcOverride"
2716 msgstr ""
2717
2718 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2719-#: apt-ftparchive.1.xml:382
2720+#: apt-ftparchive.1.xml:407
2721 msgid ""
2722 "Sets the source override file. The override file contains section "
2723 "information."
2724 msgstr ""
2725
2726 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2727-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
2728+#: apt-ftparchive.1.xml:411 apt-ftparchive.1.xml:457
2729 msgid "ExtraOverride"
2730 msgstr ""
2731
2732 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2733-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
2734+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
2735 msgid "Sets the binary extra override file."
2736 msgstr ""
2737
2738 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2739-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
2740+#: apt-ftparchive.1.xml:416 apt-ftparchive.1.xml:462
2741 msgid "SrcExtraOverride"
2742 msgstr ""
2743
2744 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2745-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
2746+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
2747 msgid "Sets the source extra override file."
2748 msgstr ""
2749
2750 #. type: Content of: <refentry><refsect1><refsect2><title>
2751-#: apt-ftparchive.1.xml:398
2752+#: apt-ftparchive.1.xml:423
2753 #, fuzzy
2754 msgid "BinDirectory Section"
2755 msgstr "Run-Directory"
2756
2757 #. type: Content of: <refentry><refsect1><refsect2><para>
2758-#: apt-ftparchive.1.xml:400
2759+#: apt-ftparchive.1.xml:425
2760 msgid ""
2761 "The <literal>bindirectory</literal> section defines a binary directory tree "
2762 "with no special structure. The scope tag specifies the location of the "
2763@@ -3130,64 +3170,64 @@
2764 msgstr ""
2765
2766 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2767-#: apt-ftparchive.1.xml:408
2768+#: apt-ftparchive.1.xml:433
2769 msgid "Sets the Packages file output."
2770 msgstr ""
2771
2772 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2773-#: apt-ftparchive.1.xml:413
2774+#: apt-ftparchive.1.xml:438
2775 msgid ""
2776 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
2777 "<literal>Sources</literal> is required."
2778 msgstr ""
2779
2780 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2781-#: apt-ftparchive.1.xml:419
2782+#: apt-ftparchive.1.xml:444
2783 msgid "Sets the Contents file output. (optional)"
2784 msgstr ""
2785
2786 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2787-#: apt-ftparchive.1.xml:424
2788+#: apt-ftparchive.1.xml:449
2789 msgid "Sets the binary override file."
2790 msgstr ""
2791
2792 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2793-#: apt-ftparchive.1.xml:429
2794+#: apt-ftparchive.1.xml:454
2795 msgid "Sets the source override file."
2796 msgstr ""
2797
2798 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2799-#: apt-ftparchive.1.xml:444
2800+#: apt-ftparchive.1.xml:469
2801 msgid "Sets the cache DB."
2802 msgstr ""
2803
2804 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2805-#: apt-ftparchive.1.xml:447
2806+#: apt-ftparchive.1.xml:472
2807 msgid "PathPrefix"
2808 msgstr ""
2809
2810 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2811-#: apt-ftparchive.1.xml:449
2812+#: apt-ftparchive.1.xml:474
2813 msgid "Appends a path to all the output paths."
2814 msgstr ""
2815
2816 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
2817-#: apt-ftparchive.1.xml:452
2818+#: apt-ftparchive.1.xml:477
2819 msgid "FileList, SourceFileList"
2820 msgstr ""
2821
2822 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
2823-#: apt-ftparchive.1.xml:454
2824+#: apt-ftparchive.1.xml:479
2825 msgid "Specifies the file list file."
2826 msgstr ""
2827
2828 #. type: Content of: <refentry><refsect1><title>
2829-#: apt-ftparchive.1.xml:461
2830+#: apt-ftparchive.1.xml:486
2831 msgid "The Binary Override File"
2832 msgstr ""
2833
2834 #. type: Content of: <refentry><refsect1><para>
2835-#: apt-ftparchive.1.xml:462
2836+#: apt-ftparchive.1.xml:487
2837 msgid ""
2838 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
2839 "contains 4 fields separated by spaces. The first field is the package name, "
2840@@ -3197,19 +3237,19 @@
2841 msgstr ""
2842
2843 #. type: Content of: <refentry><refsect1><para><literallayout>
2844-#: apt-ftparchive.1.xml:468
2845+#: apt-ftparchive.1.xml:493
2846 #, no-wrap
2847 msgid "old [// oldn]* => new"
2848 msgstr ""
2849
2850 #. type: Content of: <refentry><refsect1><para><literallayout>
2851-#: apt-ftparchive.1.xml:470
2852+#: apt-ftparchive.1.xml:495
2853 #, no-wrap
2854 msgid "new"
2855 msgstr ""
2856
2857 #. type: Content of: <refentry><refsect1><para>
2858-#: apt-ftparchive.1.xml:467
2859+#: apt-ftparchive.1.xml:492
2860 msgid ""
2861 "The general form of the maintainer field is: <placeholder type="
2862 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
2863@@ -3220,12 +3260,12 @@
2864 msgstr ""
2865
2866 #. type: Content of: <refentry><refsect1><title>
2867-#: apt-ftparchive.1.xml:478
2868+#: apt-ftparchive.1.xml:503
2869 msgid "The Source Override File"
2870 msgstr ""
2871
2872 #. type: Content of: <refentry><refsect1><para>
2873-#: apt-ftparchive.1.xml:480
2874+#: apt-ftparchive.1.xml:505
2875 msgid ""
2876 "The source override file is fully compatible with &dpkg-scansources;. It "
2877 "contains 2 fields separated by spaces. The first fields is the source "
2878@@ -3233,12 +3273,12 @@
2879 msgstr ""
2880
2881 #. type: Content of: <refentry><refsect1><title>
2882-#: apt-ftparchive.1.xml:485
2883+#: apt-ftparchive.1.xml:510
2884 msgid "The Extra Override File"
2885 msgstr ""
2886
2887 #. type: Content of: <refentry><refsect1><para>
2888-#: apt-ftparchive.1.xml:487
2889+#: apt-ftparchive.1.xml:512
2890 msgid ""
2891 "The extra override file allows any arbitrary tag to be added or replaced in "
2892 "the output. It has 3 columns, the first is the package, the second is the "
2893@@ -3246,13 +3286,13 @@
2894 msgstr ""
2895
2896 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2897-#: apt-ftparchive.1.xml:496
2898+#: apt-ftparchive.1.xml:521
2899 #, fuzzy
2900 msgid "<option>--md5</option>"
2901 msgstr "<option>-d</option>"
2902
2903 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2904-#: apt-ftparchive.1.xml:498
2905+#: apt-ftparchive.1.xml:523
2906 msgid ""
2907 "Generate MD5 sums. This defaults to on, when turned off the generated index "
2908 "files will not have MD5Sum fields where possible. Configuration Item: "
2909@@ -3260,13 +3300,13 @@
2910 msgstr ""
2911
2912 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2913-#: apt-ftparchive.1.xml:503
2914+#: apt-ftparchive.1.xml:528
2915 #, fuzzy
2916 msgid "<option>--db</option>"
2917 msgstr "<option>-d</option>"
2918
2919 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2920-#: apt-ftparchive.1.xml:505
2921+#: apt-ftparchive.1.xml:530
2922 #, fuzzy
2923 msgid ""
2924 "Use a binary caching DB. This has no effect on the generate command. "
2925@@ -3276,7 +3316,7 @@
2926 "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
2927
2928 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2929-#: apt-ftparchive.1.xml:511
2930+#: apt-ftparchive.1.xml:536
2931 #, fuzzy
2932 msgid ""
2933 "Quiet; produces output suitable for logging, omitting progress indicators. "
2934@@ -3291,13 +3331,13 @@
2935 "Opción de configuración: <literal>quiet</literal>."
2936
2937 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2938-#: apt-ftparchive.1.xml:517
2939+#: apt-ftparchive.1.xml:542
2940 #, fuzzy
2941 msgid "<option>--delink</option>"
2942 msgstr "<option>-d</option>"
2943
2944 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2945-#: apt-ftparchive.1.xml:519
2946+#: apt-ftparchive.1.xml:544
2947 #, fuzzy
2948 msgid ""
2949 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
2950@@ -3311,13 +3351,13 @@
2951 "Cache::Generate</literal>."
2952
2953 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2954-#: apt-ftparchive.1.xml:525
2955+#: apt-ftparchive.1.xml:550
2956 #, fuzzy
2957 msgid "<option>--contents</option>"
2958 msgstr "<option>--recon</option>"
2959
2960 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2961-#: apt-ftparchive.1.xml:527
2962+#: apt-ftparchive.1.xml:552
2963 msgid ""
2964 "Perform contents generation. When this option is set and package indexes are "
2965 "being generated with a cache DB then the file listing will also be extracted "
2966@@ -3327,13 +3367,13 @@
2967 msgstr ""
2968
2969 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2970-#: apt-ftparchive.1.xml:535
2971+#: apt-ftparchive.1.xml:560
2972 #, fuzzy
2973 msgid "<option>--source-override</option>"
2974 msgstr "<option>--force-yes</option>"
2975
2976 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2977-#: apt-ftparchive.1.xml:537
2978+#: apt-ftparchive.1.xml:562
2979 msgid ""
2980 "Select the source override file to use with the <literal>sources</literal> "
2981 "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
2982@@ -3341,13 +3381,13 @@
2983 msgstr ""
2984
2985 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2986-#: apt-ftparchive.1.xml:541
2987+#: apt-ftparchive.1.xml:566
2988 #, fuzzy
2989 msgid "<option>--readonly</option>"
2990 msgstr "<option>--recon</option>"
2991
2992 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
2993-#: apt-ftparchive.1.xml:543
2994+#: apt-ftparchive.1.xml:568
2995 #, fuzzy
2996 msgid ""
2997 "Make the caching databases read only. Configuration Item: <literal>APT::"
2998@@ -3357,43 +3397,43 @@
2999 "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
3000
3001 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3002-#: apt-ftparchive.1.xml:547
3003+#: apt-ftparchive.1.xml:572
3004 #, fuzzy
3005 msgid "<option>APT::FTPArchive::LongDescription</option>"
3006 msgstr "<option>--all-versions</option>"
3007
3008 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3009-#: apt-ftparchive.1.xml:549
3010+#: apt-ftparchive.1.xml:574
3011 msgid ""
3012 "This configuration option defaults to \"<literal>true</literal>\" and should "
3013 "only be set to <literal>\"false\"</literal> if the Archive generated with "
3014 "&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
3015-"that it is currently not possible to create these files with <command>apt-"
3016-"ftparchive</command>."
3017+"that the <filename>Translation-en</filename> master file can only be created "
3018+"in the generate command."
3019 msgstr ""
3020
3021 #. type: Content of: <refentry><refsect1><title>
3022-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1007 apt_preferences.5.xml:469
3023+#: apt-ftparchive.1.xml:586 apt.conf.5.xml:1007 apt_preferences.5.xml:469
3024 #: sources.list.5.xml:193
3025 #, fuzzy
3026 msgid "Examples"
3027 msgstr "Ejemplos"
3028
3029 #. type: Content of: <refentry><refsect1><para><programlisting>
3030-#: apt-ftparchive.1.xml:567
3031+#: apt-ftparchive.1.xml:592
3032 #, no-wrap
3033 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
3034 msgstr ""
3035
3036 #. type: Content of: <refentry><refsect1><para>
3037-#: apt-ftparchive.1.xml:563
3038+#: apt-ftparchive.1.xml:588
3039 msgid ""
3040 "To create a compressed Packages file for a directory containing binary "
3041 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
3042 msgstr ""
3043
3044 #. type: Content of: <refentry><refsect1><para>
3045-#: apt-ftparchive.1.xml:577
3046+#: apt-ftparchive.1.xml:602
3047 #, fuzzy
3048 msgid ""
3049 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
3050
3051=== modified file 'doc/po/fr.po'
3052--- doc/po/fr.po 2010-04-14 20:30:03 +0000
3053+++ doc/po/fr.po 2012-01-31 15:47:23 +0000
3054@@ -9,13 +9,14 @@
3055 msgid ""
3056 msgstr ""
3057 "Project-Id-Version: \n"
3058-"POT-Creation-Date: 2010-04-14 20:30+0300\n"
3059+"POT-Creation-Date: 2011-10-04 01:17+0000\n"
3060 "PO-Revision-Date: 2010-01-29 19:58+0100\n"
3061 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
3062 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
3063 "MIME-Version: 1.0\n"
3064 "Content-Type: text/plain; charset=UTF-8\n"
3065 "Content-Transfer-Encoding: 8bit\n"
3066+"Language: fr\n"
3067 "X-Generator: Lokalize 1.0\n"
3068 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
3069
3070@@ -1752,7 +1753,7 @@
3071
3072 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3073 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
3074-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
3075+#: apt-ftparchive.1.xml:517 apt-get.8.xml:319 apt-mark.8.xml:89
3076 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:481 apt.conf.5.xml:503
3077 msgid "options"
3078 msgstr "options"
3079@@ -1779,7 +1780,7 @@
3080 "<literal>Dir::Cache::pkgcache</literal>."
3081
3082 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3083-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
3084+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:560 apt-get.8.xml:376
3085 #: apt-sortpkgs.1.xml:58
3086 msgid "<option>-s</option>"
3087 msgstr "<option>-s</option>"
3088@@ -1806,12 +1807,12 @@
3089 "<literal>Dir::Cache::srcpkgcache</literal>."
3090
3091 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3092-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
3093+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
3094 msgid "<option>-q</option>"
3095 msgstr "<option>-q</option>"
3096
3097 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3098-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
3099+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
3100 msgid "<option>--quiet</option>"
3101 msgstr "<option>--quiet</option>"
3102
3103@@ -1992,7 +1993,7 @@
3104
3105 #. type: Content of: <refentry><refsect1><variablelist>
3106 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
3107-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
3108+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:581 apt-get.8.xml:554
3109 #: apt-sortpkgs.1.xml:64
3110 msgid "&apt-commonoptions;"
3111 msgstr "&apt-commonoptions;"
3112@@ -2010,7 +2011,7 @@
3113
3114 #. type: Content of: <refentry><refsect1><title>
3115 #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
3116-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
3117+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:597 apt-get.8.xml:569
3118 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
3119 #: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1019 apt_preferences.5.xml:629
3120 #: sources.list.5.xml:233
3121@@ -2024,7 +2025,7 @@
3122
3123 #. type: Content of: <refentry><refsect1><title>
3124 #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
3125-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
3126+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:601 apt-get.8.xml:575
3127 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
3128 msgid "Diagnostics"
3129 msgstr "Diagnostics"
3130@@ -2159,7 +2160,7 @@
3131 msgstr "Options"
3132
3133 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3134-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
3135+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:528 apt-get.8.xml:328
3136 msgid "<option>-d</option>"
3137 msgstr "<option>-d</option>"
3138
3139@@ -2404,7 +2405,7 @@
3140 msgstr "Affiche seulement le contenu de l'espace de configuration."
3141
3142 #. type: Content of: <refentry><refsect1><para>
3143-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
3144+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:598
3145 #: apt-sortpkgs.1.xml:70
3146 msgid "&apt-conf;"
3147 msgstr "&apt-conf;"
3148@@ -2957,11 +2958,31 @@
3149
3150 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3151 #: apt-ftparchive.1.xml:227
3152+#, fuzzy
3153+#| msgid "Contents::Compress"
3154+msgid "Translation::Compress"
3155+msgstr "Contents::Compress"
3156+
3157+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3158+#: apt-ftparchive.1.xml:229
3159+#, fuzzy
3160+#| msgid ""
3161+#| "This is similar to <literal>Packages::Compress</literal> except that it "
3162+#| "controls the compression for the Contents files."
3163+msgid ""
3164+"This is similar to <literal>Packages::Compress</literal> except that it "
3165+"controls the compression for the Translation-en master file."
3166+msgstr ""
3167+"Identique à <literal>Packages::Compress</literal> mais précise comment sont "
3168+"compressés les fichiers « Contents »."
3169+
3170+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3171+#: apt-ftparchive.1.xml:233
3172 msgid "DeLinkLimit"
3173 msgstr "DeLinkLimit"
3174
3175 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3176-#: apt-ftparchive.1.xml:229
3177+#: apt-ftparchive.1.xml:235
3178 msgid ""
3179 "Specifies the number of kilobytes to delink (and replace with hard links) "
3180 "per run. This is used in conjunction with the per-section <literal>External-"
3181@@ -2972,12 +2993,12 @@
3182 "paramètre <literal>External-Links</literal>."
3183
3184 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3185-#: apt-ftparchive.1.xml:234
3186+#: apt-ftparchive.1.xml:240
3187 msgid "FileMode"
3188 msgstr "FileMode"
3189
3190 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3191-#: apt-ftparchive.1.xml:236
3192+#: apt-ftparchive.1.xml:242
3193 msgid ""
3194 "Specifies the mode of all created index files. It defaults to 0644. All "
3195 "index files are set to this mode with no regard to the umask."
3196@@ -2986,13 +3007,27 @@
3197 "c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque "
3198 "utilisateur (umasq) est ignoré."
3199
3200+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3201+#: apt-ftparchive.1.xml:247 apt-ftparchive.1.xml:393
3202+#, fuzzy
3203+#| msgid "Description"
3204+msgid "LongDescription"
3205+msgstr "Description"
3206+
3207+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3208+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
3209+msgid ""
3210+"Sets if long descriptions should be included in the Packages file or split "
3211+"out into a master Translation-en file."
3212+msgstr ""
3213+
3214 #. type: Content of: <refentry><refsect1><refsect2><title>
3215-#: apt-ftparchive.1.xml:243
3216+#: apt-ftparchive.1.xml:255
3217 msgid "TreeDefault Section"
3218 msgstr "La section TreeDefault"
3219
3220 #. type: Content of: <refentry><refsect1><refsect2><para>
3221-#: apt-ftparchive.1.xml:245
3222+#: apt-ftparchive.1.xml:257
3223 msgid ""
3224 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
3225 "variables are substitution variables and have the strings $(DIST), "
3226@@ -3004,12 +3039,12 @@
3227 "respective."
3228
3229 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3230-#: apt-ftparchive.1.xml:250
3231+#: apt-ftparchive.1.xml:262
3232 msgid "MaxContentsChange"
3233 msgstr "MaxContentsChange"
3234
3235 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3236-#: apt-ftparchive.1.xml:252
3237+#: apt-ftparchive.1.xml:264
3238 msgid ""
3239 "Sets the number of kilobytes of contents files that are generated each day. "
3240 "The contents files are round-robined so that over several days they will all "
3241@@ -3021,12 +3056,12 @@
3242 "soient reconstruits."
3243
3244 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3245-#: apt-ftparchive.1.xml:257
3246+#: apt-ftparchive.1.xml:269
3247 msgid "ContentsAge"
3248 msgstr "ContentsAge"
3249
3250 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3251-#: apt-ftparchive.1.xml:259
3252+#: apt-ftparchive.1.xml:271
3253 msgid ""
3254 "Controls the number of days a contents file is allowed to be checked without "
3255 "changing. If this limit is passed the mtime of the contents file is updated. "
3256@@ -3044,12 +3079,12 @@
3257 "nombre vaut 10, l'unité étant le jour."
3258
3259 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3260-#: apt-ftparchive.1.xml:268
3261+#: apt-ftparchive.1.xml:280
3262 msgid "Directory"
3263 msgstr "Directory"
3264
3265 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3266-#: apt-ftparchive.1.xml:270
3267+#: apt-ftparchive.1.xml:282
3268 msgid ""
3269 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
3270 "$(SECTION)/binary-$(ARCH)/</filename>"
3271@@ -3058,12 +3093,12 @@
3272 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
3273
3274 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3275-#: apt-ftparchive.1.xml:274
3276+#: apt-ftparchive.1.xml:286
3277 msgid "SrcDirectory"
3278 msgstr "SrcDirectory"
3279
3280 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3281-#: apt-ftparchive.1.xml:276
3282+#: apt-ftparchive.1.xml:288
3283 msgid ""
3284 "Sets the top of the source package directory tree. Defaults to <filename>"
3285 "$(DIST)/$(SECTION)/source/</filename>"
3286@@ -3072,12 +3107,12 @@
3287 "<filename>$(DIST)/$(SECTION)/source/</filename>."
3288
3289 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3290-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
3291+#: apt-ftparchive.1.xml:292 apt-ftparchive.1.xml:431
3292 msgid "Packages"
3293 msgstr "Packages"
3294
3295 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3296-#: apt-ftparchive.1.xml:282
3297+#: apt-ftparchive.1.xml:294
3298 msgid ""
3299 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
3300 "binary-$(ARCH)/Packages</filename>"
3301@@ -3086,12 +3121,12 @@
3302 "$(SECTION)/binary-$(ARCH)/Packages</filename>."
3303
3304 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3305-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
3306+#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:436
3307 msgid "Sources"
3308 msgstr "Sources"
3309
3310 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3311-#: apt-ftparchive.1.xml:288
3312+#: apt-ftparchive.1.xml:300
3313 msgid ""
3314 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
3315 "source/Sources</filename>"
3316@@ -3100,12 +3135,27 @@
3317 "$(SECTION)/source/Sources</filename>."
3318
3319 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3320-#: apt-ftparchive.1.xml:292
3321+#: apt-ftparchive.1.xml:304
3322+#, fuzzy
3323+#| msgid "Operation"
3324+msgid "Translation"
3325+msgstr "Fonctionnement"
3326+
3327+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3328+#: apt-ftparchive.1.xml:306
3329+msgid ""
3330+"Set the output Translation-en master file with the long descriptions if they "
3331+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
3332+"$(SECTION)/i18n/Translation-en</filename>"
3333+msgstr ""
3334+
3335+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3336+#: apt-ftparchive.1.xml:311
3337 msgid "InternalPrefix"
3338 msgstr "InternalPrefix"
3339
3340 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3341-#: apt-ftparchive.1.xml:294
3342+#: apt-ftparchive.1.xml:313
3343 msgid ""
3344 "Sets the path prefix that causes a symlink to be considered an internal link "
3345 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
3346@@ -3116,12 +3166,12 @@
3347 "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
3348
3349 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3350-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
3351+#: apt-ftparchive.1.xml:318 apt-ftparchive.1.xml:442
3352 msgid "Contents"
3353 msgstr "Contents"
3354
3355 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3356-#: apt-ftparchive.1.xml:301
3357+#: apt-ftparchive.1.xml:320
3358 msgid ""
3359 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
3360 "</filename>. If this setting causes multiple Packages files to map onto a "
3361@@ -3134,22 +3184,22 @@
3362 "ftparchive</command> les intègre automatiquement."
3363
3364 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3365-#: apt-ftparchive.1.xml:308
3366+#: apt-ftparchive.1.xml:327
3367 msgid "Contents::Header"
3368 msgstr "Contents::Header"
3369
3370 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3371-#: apt-ftparchive.1.xml:310
3372+#: apt-ftparchive.1.xml:329
3373 msgid "Sets header file to prepend to the contents output."
3374 msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
3375
3376 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3377-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
3378+#: apt-ftparchive.1.xml:332 apt-ftparchive.1.xml:467
3379 msgid "BinCacheDB"
3380 msgstr "BinCacheDB"
3381
3382 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3383-#: apt-ftparchive.1.xml:315
3384+#: apt-ftparchive.1.xml:334
3385 msgid ""
3386 "Sets the binary cache database to use for this section. Multiple sections "
3387 "can share the same database."
3388@@ -3158,12 +3208,12 @@
3389 "Différentes sections peuvent partager cette base de données."
3390
3391 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3392-#: apt-ftparchive.1.xml:319
3393+#: apt-ftparchive.1.xml:338
3394 msgid "FileList"
3395 msgstr "FileList"
3396
3397 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3398-#: apt-ftparchive.1.xml:321
3399+#: apt-ftparchive.1.xml:340
3400 msgid ""
3401 "Specifies that instead of walking the directory tree, <command>apt-"
3402 "ftparchive</command> should read the list of files from the given file. "
3403@@ -3174,12 +3224,12 @@
3404 "relatifs sont préfixés par le répertoire de l'archive."
3405
3406 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3407-#: apt-ftparchive.1.xml:326
3408+#: apt-ftparchive.1.xml:345
3409 msgid "SourceFileList"
3410 msgstr "SourceFileList"
3411
3412 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3413-#: apt-ftparchive.1.xml:328
3414+#: apt-ftparchive.1.xml:347
3415 msgid ""
3416 "Specifies that instead of walking the directory tree, <command>apt-"
3417 "ftparchive</command> should read the list of files from the given file. "
3418@@ -3192,12 +3242,12 @@
3419 "traiter les index de sources."
3420
3421 #. type: Content of: <refentry><refsect1><refsect2><title>
3422-#: apt-ftparchive.1.xml:336
3423+#: apt-ftparchive.1.xml:355
3424 msgid "Tree Section"
3425 msgstr "La section Tree"
3426
3427 #. type: Content of: <refentry><refsect1><refsect2><para>
3428-#: apt-ftparchive.1.xml:338
3429+#: apt-ftparchive.1.xml:357
3430 msgid ""
3431 "The <literal>Tree</literal> section defines a standard Debian file tree "
3432 "which consists of a base directory, then multiple sections in that base "
3433@@ -3211,7 +3261,7 @@
3434 "par la variable de substitution <literal>Directory</literal>."
3435
3436 #. type: Content of: <refentry><refsect1><refsect2><para>
3437-#: apt-ftparchive.1.xml:343
3438+#: apt-ftparchive.1.xml:362
3439 msgid ""
3440 "The <literal>Tree</literal> section takes a scope tag which sets the "
3441 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
3442@@ -3224,7 +3274,7 @@
3443 "C'est par exemple : <filename>dists/woody</filename>."
3444
3445 #. type: Content of: <refentry><refsect1><refsect2><para>
3446-#: apt-ftparchive.1.xml:348
3447+#: apt-ftparchive.1.xml:367
3448 msgid ""
3449 "All of the settings defined in the <literal>TreeDefault</literal> section "
3450 "can be use in a <literal>Tree</literal> section as well as three new "
3451@@ -3235,7 +3285,7 @@
3452 "trois nouvelles variables suivantes."
3453
3454 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
3455-#: apt-ftparchive.1.xml:354
3456+#: apt-ftparchive.1.xml:373
3457 #, no-wrap
3458 msgid ""
3459 "for i in Sections do \n"
3460@@ -3249,7 +3299,7 @@
3461 " "
3462
3463 #. type: Content of: <refentry><refsect1><refsect2><para>
3464-#: apt-ftparchive.1.xml:351
3465+#: apt-ftparchive.1.xml:370
3466 msgid ""
3467 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
3468 "command> performs an operation similar to: <placeholder type=\"programlisting"
3469@@ -3260,12 +3310,12 @@
3470 "\"programlisting\" id=\"0\"/>"
3471
3472 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3473-#: apt-ftparchive.1.xml:360
3474+#: apt-ftparchive.1.xml:379
3475 msgid "Sections"
3476 msgstr "Sections"
3477
3478 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3479-#: apt-ftparchive.1.xml:362
3480+#: apt-ftparchive.1.xml:381
3481 msgid ""
3482 "This is a space separated list of sections which appear under the "
3483 "distribution, typically this is something like <literal>main contrib non-"
3484@@ -3276,12 +3326,12 @@
3485 "literal>."
3486
3487 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3488-#: apt-ftparchive.1.xml:367
3489+#: apt-ftparchive.1.xml:386
3490 msgid "Architectures"
3491 msgstr "Architectures"
3492
3493 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3494-#: apt-ftparchive.1.xml:369
3495+#: apt-ftparchive.1.xml:388
3496 msgid ""
3497 "This is a space separated list of all the architectures that appear under "
3498 "search section. The special architecture 'source' is used to indicate that "
3499@@ -3292,12 +3342,12 @@
3500 "que l'arborescence est une arborescence de sources."
3501
3502 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3503-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
3504+#: apt-ftparchive.1.xml:399 apt-ftparchive.1.xml:447
3505 msgid "BinOverride"
3506 msgstr "BinOverride"
3507
3508 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3509-#: apt-ftparchive.1.xml:376
3510+#: apt-ftparchive.1.xml:401
3511 msgid ""
3512 "Sets the binary override file. The override file contains section, priority "
3513 "and maintainer address information."
3514@@ -3306,12 +3356,12 @@
3515 "informations sur la section, la priorité et le responsable du paquet."
3516
3517 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3518-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
3519+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:452
3520 msgid "SrcOverride"
3521 msgstr "SrcOverride"
3522
3523 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3524-#: apt-ftparchive.1.xml:382
3525+#: apt-ftparchive.1.xml:407
3526 msgid ""
3527 "Sets the source override file. The override file contains section "
3528 "information."
3529@@ -3320,32 +3370,32 @@
3530 "informations sur la section."
3531
3532 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3533-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
3534+#: apt-ftparchive.1.xml:411 apt-ftparchive.1.xml:457
3535 msgid "ExtraOverride"
3536 msgstr "ExtraOverride"
3537
3538 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3539-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
3540+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
3541 msgid "Sets the binary extra override file."
3542 msgstr "Indique un autre fichier d'« override » pour les binaires."
3543
3544 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3545-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
3546+#: apt-ftparchive.1.xml:416 apt-ftparchive.1.xml:462
3547 msgid "SrcExtraOverride"
3548 msgstr "SrcExtraOverride"
3549
3550 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3551-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
3552+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
3553 msgid "Sets the source extra override file."
3554 msgstr "Indique un autre fichier d'« override » pour les sources."
3555
3556 #. type: Content of: <refentry><refsect1><refsect2><title>
3557-#: apt-ftparchive.1.xml:398
3558+#: apt-ftparchive.1.xml:423
3559 msgid "BinDirectory Section"
3560 msgstr "La section BinDirectory"
3561
3562 #. type: Content of: <refentry><refsect1><refsect2><para>
3563-#: apt-ftparchive.1.xml:400
3564+#: apt-ftparchive.1.xml:425
3565 msgid ""
3566 "The <literal>bindirectory</literal> section defines a binary directory tree "
3567 "with no special structure. The scope tag specifies the location of the "
3568@@ -3360,12 +3410,12 @@
3569 "paramètrage de <literal>Section</literal><literal>Architecture</literal>."
3570
3571 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3572-#: apt-ftparchive.1.xml:408
3573+#: apt-ftparchive.1.xml:433
3574 msgid "Sets the Packages file output."
3575 msgstr "Définit le fichier « Packages » créé."
3576
3577 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3578-#: apt-ftparchive.1.xml:413
3579+#: apt-ftparchive.1.xml:438
3580 msgid ""
3581 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
3582 "<literal>Sources</literal> is required."
3583@@ -3374,52 +3424,52 @@
3584 "<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
3585
3586 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3587-#: apt-ftparchive.1.xml:419
3588+#: apt-ftparchive.1.xml:444
3589 msgid "Sets the Contents file output. (optional)"
3590 msgstr "Définit le fichier « Contents » créé."
3591
3592 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3593-#: apt-ftparchive.1.xml:424
3594+#: apt-ftparchive.1.xml:449
3595 msgid "Sets the binary override file."
3596 msgstr "Définit le fichier d'« override » pour les binaires."
3597
3598 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3599-#: apt-ftparchive.1.xml:429
3600+#: apt-ftparchive.1.xml:454
3601 msgid "Sets the source override file."
3602 msgstr "Définit le fichier d'« override » pour les sources."
3603
3604 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3605-#: apt-ftparchive.1.xml:444
3606+#: apt-ftparchive.1.xml:469
3607 msgid "Sets the cache DB."
3608 msgstr "Définit la base de données cache."
3609
3610 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3611-#: apt-ftparchive.1.xml:447
3612+#: apt-ftparchive.1.xml:472
3613 msgid "PathPrefix"
3614 msgstr "PathPrefix"
3615
3616 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3617-#: apt-ftparchive.1.xml:449
3618+#: apt-ftparchive.1.xml:474
3619 msgid "Appends a path to all the output paths."
3620 msgstr "Ajoute un chemin à tous les chemins créés."
3621
3622 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3623-#: apt-ftparchive.1.xml:452
3624+#: apt-ftparchive.1.xml:477
3625 msgid "FileList, SourceFileList"
3626 msgstr "FileList, SourceFileList"
3627
3628 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3629-#: apt-ftparchive.1.xml:454
3630+#: apt-ftparchive.1.xml:479
3631 msgid "Specifies the file list file."
3632 msgstr "Définit le fichier contenant la liste des fichiers."
3633
3634 #. type: Content of: <refentry><refsect1><title>
3635-#: apt-ftparchive.1.xml:461
3636+#: apt-ftparchive.1.xml:486
3637 msgid "The Binary Override File"
3638 msgstr "Le fichier d'« Override » pour les binaires."
3639
3640 #. type: Content of: <refentry><refsect1><para>
3641-#: apt-ftparchive.1.xml:462
3642+#: apt-ftparchive.1.xml:487
3643 msgid ""
3644 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
3645 "contains 4 fields separated by spaces. The first field is the package name, "
3646@@ -3434,19 +3484,19 @@
3647 "responsable de paquet."
3648
3649 #. type: Content of: <refentry><refsect1><para><literallayout>
3650-#: apt-ftparchive.1.xml:468
3651+#: apt-ftparchive.1.xml:493
3652 #, no-wrap
3653 msgid "old [// oldn]* => new"
3654 msgstr "old [// oldn]* =&gt; new"
3655
3656 #. type: Content of: <refentry><refsect1><para><literallayout>
3657-#: apt-ftparchive.1.xml:470
3658+#: apt-ftparchive.1.xml:495
3659 #, no-wrap
3660 msgid "new"
3661 msgstr "new"
3662
3663 #. type: Content of: <refentry><refsect1><para>
3664-#: apt-ftparchive.1.xml:467
3665+#: apt-ftparchive.1.xml:492
3666 msgid ""
3667 "The general form of the maintainer field is: <placeholder type="
3668 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
3669@@ -3463,12 +3513,12 @@
3670 "deuxième forme remplace inconditionnellement le champ."
3671
3672 #. type: Content of: <refentry><refsect1><title>
3673-#: apt-ftparchive.1.xml:478
3674+#: apt-ftparchive.1.xml:503
3675 msgid "The Source Override File"
3676 msgstr "Le fichier d'« Override » pour les sources"
3677
3678 #. type: Content of: <refentry><refsect1><para>
3679-#: apt-ftparchive.1.xml:480
3680+#: apt-ftparchive.1.xml:505
3681 msgid ""
3682 "The source override file is fully compatible with &dpkg-scansources;. It "
3683 "contains 2 fields separated by spaces. The first fields is the source "
3684@@ -3479,12 +3529,12 @@
3685 "sa section."
3686
3687 #. type: Content of: <refentry><refsect1><title>
3688-#: apt-ftparchive.1.xml:485
3689+#: apt-ftparchive.1.xml:510
3690 msgid "The Extra Override File"
3691 msgstr "Le fichier supplémentaire d'« Override »"
3692
3693 #. type: Content of: <refentry><refsect1><para>
3694-#: apt-ftparchive.1.xml:487
3695+#: apt-ftparchive.1.xml:512
3696 msgid ""
3697 "The extra override file allows any arbitrary tag to be added or replaced in "
3698 "the output. It has 3 columns, the first is the package, the second is the "
3699@@ -3496,12 +3546,12 @@
3700 "la nouvelle valeur."
3701
3702 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3703-#: apt-ftparchive.1.xml:496
3704+#: apt-ftparchive.1.xml:521
3705 msgid "<option>--md5</option>"
3706 msgstr "<option>--md5</option>"
3707
3708 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3709-#: apt-ftparchive.1.xml:498
3710+#: apt-ftparchive.1.xml:523
3711 msgid ""
3712 "Generate MD5 sums. This defaults to on, when turned off the generated index "
3713 "files will not have MD5Sum fields where possible. Configuration Item: "
3714@@ -3513,12 +3563,12 @@
3715 "literal>."
3716
3717 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3718-#: apt-ftparchive.1.xml:503
3719+#: apt-ftparchive.1.xml:528
3720 msgid "<option>--db</option>"
3721 msgstr "<option>--db</option>"
3722
3723 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3724-#: apt-ftparchive.1.xml:505
3725+#: apt-ftparchive.1.xml:530
3726 msgid ""
3727 "Use a binary caching DB. This has no effect on the generate command. "
3728 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
3729@@ -3528,7 +3578,7 @@
3730 "literal>."
3731
3732 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3733-#: apt-ftparchive.1.xml:511
3734+#: apt-ftparchive.1.xml:536
3735 msgid ""
3736 "Quiet; produces output suitable for logging, omitting progress indicators. "
3737 "More q's will produce more quiet up to a maximum of 2. You can also use "
3738@@ -3543,12 +3593,12 @@
3739 "configuration : <literal>quiet</literal>."
3740
3741 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3742-#: apt-ftparchive.1.xml:517
3743+#: apt-ftparchive.1.xml:542
3744 msgid "<option>--delink</option>"
3745 msgstr "<option>--delink</option>"
3746
3747 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3748-#: apt-ftparchive.1.xml:519
3749+#: apt-ftparchive.1.xml:544
3750 msgid ""
3751 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
3752 "then this option actually enables delinking of the files. It defaults to on "
3753@@ -3562,12 +3612,12 @@
3754 "literal>."
3755
3756 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3757-#: apt-ftparchive.1.xml:525
3758+#: apt-ftparchive.1.xml:550
3759 msgid "<option>--contents</option>"
3760 msgstr "<option>--contents</option>"
3761
3762 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3763-#: apt-ftparchive.1.xml:527
3764+#: apt-ftparchive.1.xml:552
3765 msgid ""
3766 "Perform contents generation. When this option is set and package indexes are "
3767 "being generated with a cache DB then the file listing will also be extracted "
3768@@ -3583,12 +3633,12 @@
3769 "de configuration : <literal>APT::FTPArchive::Contents</literal>."
3770
3771 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3772-#: apt-ftparchive.1.xml:535
3773+#: apt-ftparchive.1.xml:560
3774 msgid "<option>--source-override</option>"
3775 msgstr "<option>--source-override</option>"
3776
3777 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3778-#: apt-ftparchive.1.xml:537
3779+#: apt-ftparchive.1.xml:562
3780 msgid ""
3781 "Select the source override file to use with the <literal>sources</literal> "
3782 "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
3783@@ -3599,12 +3649,12 @@
3784 "FTPArchive::SourceOverride</literal>."
3785
3786 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3787-#: apt-ftparchive.1.xml:541
3788+#: apt-ftparchive.1.xml:566
3789 msgid "<option>--readonly</option>"
3790 msgstr "<option>--readonly</option>"
3791
3792 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3793-#: apt-ftparchive.1.xml:543
3794+#: apt-ftparchive.1.xml:568
3795 msgid ""
3796 "Make the caching databases read only. Configuration Item: <literal>APT::"
3797 "FTPArchive::ReadOnlyDB</literal>."
3798@@ -3613,18 +3663,25 @@
3799 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
3800
3801 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3802-#: apt-ftparchive.1.xml:547
3803+#: apt-ftparchive.1.xml:572
3804 msgid "<option>APT::FTPArchive::LongDescription</option>"
3805 msgstr "<option>APT::FTPArchive::LongDescription</option>"
3806
3807 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
3808-#: apt-ftparchive.1.xml:549
3809+#: apt-ftparchive.1.xml:574
3810+#, fuzzy
3811+#| msgid ""
3812+#| "This configuration option defaults to \"<literal>true</literal>\" and "
3813+#| "should only be set to <literal>\"false\"</literal> if the Archive "
3814+#| "generated with &apt-ftparchive; also provides <filename>Translation</"
3815+#| "filename> files. Note that it is currently not possible to create these "
3816+#| "files with <command>apt-ftparchive</command>."
3817 msgid ""
3818 "This configuration option defaults to \"<literal>true</literal>\" and should "
3819 "only be set to <literal>\"false\"</literal> if the Archive generated with "
3820 "&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
3821-"that it is currently not possible to create these files with <command>apt-"
3822-"ftparchive</command>."
3823+"that the <filename>Translation-en</filename> master file can only be created "
3824+"in the generate command."
3825 msgstr ""
3826 "Cette option de configuration a « <literal>true</literal> » comme valeur par "
3827 "défaut et ne devrait être placée sur « <literal>false</literal> » que si "
3828@@ -3633,19 +3690,19 @@
3829 "pas possible de créer ces fichiers avec <command>apt-ftparchive</command>."
3830
3831 #. type: Content of: <refentry><refsect1><title>
3832-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1007 apt_preferences.5.xml:469
3833+#: apt-ftparchive.1.xml:586 apt.conf.5.xml:1007 apt_preferences.5.xml:469
3834 #: sources.list.5.xml:193
3835 msgid "Examples"
3836 msgstr "Exemples"
3837
3838 #. type: Content of: <refentry><refsect1><para><programlisting>
3839-#: apt-ftparchive.1.xml:567
3840+#: apt-ftparchive.1.xml:592
3841 #, no-wrap
3842 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
3843 msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
3844
3845 #. type: Content of: <refentry><refsect1><para>
3846-#: apt-ftparchive.1.xml:563
3847+#: apt-ftparchive.1.xml:588
3848 msgid ""
3849 "To create a compressed Packages file for a directory containing binary "
3850 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
3851@@ -3654,7 +3711,7 @@
3852 "paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
3853
3854 #. type: Content of: <refentry><refsect1><para>
3855-#: apt-ftparchive.1.xml:577
3856+#: apt-ftparchive.1.xml:602
3857 msgid ""
3858 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
3859 "100 on error."
3860@@ -11131,8 +11188,10 @@
3861 #~ "rares. Il est donc conseillé de vous renseigner sur ce qui est disponible "
3862 #~ "avant d'établir des réglages impossibles."
3863
3864-#~ msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
3865-#~ msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
3866+#~ msgid ""
3867+#~ "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
3868+#~ msgstr ""
3869+#~ "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
3870
3871 #, fuzzy
3872 #~| msgid ""
3873
3874=== modified file 'doc/po/it.po'
3875--- doc/po/it.po 2010-04-14 20:30:03 +0000
3876+++ doc/po/it.po 2012-01-31 15:47:23 +0000
3877@@ -9,13 +9,14 @@
3878 msgid ""
3879 msgstr ""
3880 "Project-Id-Version: \n"
3881-"POT-Creation-Date: 2010-04-14 20:30+0300\n"
3882+"POT-Creation-Date: 2011-10-04 01:17+0000\n"
3883 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
3884 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
3885 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
3886 "MIME-Version: 1.0\n"
3887 "Content-Type: text/plain; charset=UTF-8\n"
3888 "Content-Transfer-Encoding: 8bit\n"
3889+"Language: \n"
3890
3891 #. type: TH
3892 #: apt.8:17
3893@@ -1257,7 +1258,7 @@
3894
3895 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3896 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
3897-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
3898+#: apt-ftparchive.1.xml:517 apt-get.8.xml:319 apt-mark.8.xml:89
3899 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:481 apt.conf.5.xml:503
3900 msgid "options"
3901 msgstr ""
3902@@ -1281,7 +1282,7 @@
3903 msgstr ""
3904
3905 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3906-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
3907+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:560 apt-get.8.xml:376
3908 #: apt-sortpkgs.1.xml:58
3909 msgid "<option>-s</option>"
3910 msgstr ""
3911@@ -1302,12 +1303,12 @@
3912 msgstr ""
3913
3914 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3915-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
3916+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
3917 msgid "<option>-q</option>"
3918 msgstr ""
3919
3920 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3921-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
3922+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
3923 msgid "<option>--quiet</option>"
3924 msgstr ""
3925
3926@@ -1452,7 +1453,7 @@
3927
3928 #. type: Content of: <refentry><refsect1><variablelist>
3929 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
3930-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
3931+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:581 apt-get.8.xml:554
3932 #: apt-sortpkgs.1.xml:64
3933 msgid "&apt-commonoptions;"
3934 msgstr ""
3935@@ -1470,7 +1471,7 @@
3936
3937 #. type: Content of: <refentry><refsect1><title>
3938 #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
3939-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
3940+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:597 apt-get.8.xml:569
3941 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
3942 #: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1019 apt_preferences.5.xml:629
3943 #: sources.list.5.xml:233
3944@@ -1484,7 +1485,7 @@
3945
3946 #. type: Content of: <refentry><refsect1><title>
3947 #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
3948-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
3949+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:601 apt-get.8.xml:575
3950 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
3951 msgid "Diagnostics"
3952 msgstr ""
3953@@ -1589,7 +1590,7 @@
3954 msgstr ""
3955
3956 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
3957-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
3958+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:528 apt-get.8.xml:328
3959 msgid "<option>-d</option>"
3960 msgstr ""
3961
3962@@ -1784,7 +1785,7 @@
3963 msgstr ""
3964
3965 #. type: Content of: <refentry><refsect1><para>
3966-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
3967+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:598
3968 #: apt-sortpkgs.1.xml:70
3969 msgid "&apt-conf;"
3970 msgstr ""
3971@@ -2209,11 +2210,23 @@
3972
3973 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3974 #: apt-ftparchive.1.xml:227
3975+msgid "Translation::Compress"
3976+msgstr ""
3977+
3978+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3979+#: apt-ftparchive.1.xml:229
3980+msgid ""
3981+"This is similar to <literal>Packages::Compress</literal> except that it "
3982+"controls the compression for the Translation-en master file."
3983+msgstr ""
3984+
3985+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
3986+#: apt-ftparchive.1.xml:233
3987 msgid "DeLinkLimit"
3988 msgstr ""
3989
3990 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
3991-#: apt-ftparchive.1.xml:229
3992+#: apt-ftparchive.1.xml:235
3993 msgid ""
3994 "Specifies the number of kilobytes to delink (and replace with hard links) "
3995 "per run. This is used in conjunction with the per-section <literal>External-"
3996@@ -2221,24 +2234,36 @@
3997 msgstr ""
3998
3999 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4000-#: apt-ftparchive.1.xml:234
4001+#: apt-ftparchive.1.xml:240
4002 msgid "FileMode"
4003 msgstr ""
4004
4005 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4006-#: apt-ftparchive.1.xml:236
4007+#: apt-ftparchive.1.xml:242
4008 msgid ""
4009 "Specifies the mode of all created index files. It defaults to 0644. All "
4010 "index files are set to this mode with no regard to the umask."
4011 msgstr ""
4012
4013+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4014+#: apt-ftparchive.1.xml:247 apt-ftparchive.1.xml:393
4015+msgid "LongDescription"
4016+msgstr ""
4017+
4018+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4019+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
4020+msgid ""
4021+"Sets if long descriptions should be included in the Packages file or split "
4022+"out into a master Translation-en file."
4023+msgstr ""
4024+
4025 #. type: Content of: <refentry><refsect1><refsect2><title>
4026-#: apt-ftparchive.1.xml:243
4027+#: apt-ftparchive.1.xml:255
4028 msgid "TreeDefault Section"
4029 msgstr ""
4030
4031 #. type: Content of: <refentry><refsect1><refsect2><para>
4032-#: apt-ftparchive.1.xml:245
4033+#: apt-ftparchive.1.xml:257
4034 msgid ""
4035 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
4036 "variables are substitution variables and have the strings $(DIST), "
4037@@ -2246,12 +2271,12 @@
4038 msgstr ""
4039
4040 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4041-#: apt-ftparchive.1.xml:250
4042+#: apt-ftparchive.1.xml:262
4043 msgid "MaxContentsChange"
4044 msgstr ""
4045
4046 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4047-#: apt-ftparchive.1.xml:252
4048+#: apt-ftparchive.1.xml:264
4049 msgid ""
4050 "Sets the number of kilobytes of contents files that are generated each day. "
4051 "The contents files are round-robined so that over several days they will all "
4052@@ -2259,12 +2284,12 @@
4053 msgstr ""
4054
4055 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4056-#: apt-ftparchive.1.xml:257
4057+#: apt-ftparchive.1.xml:269
4058 msgid "ContentsAge"
4059 msgstr ""
4060
4061 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4062-#: apt-ftparchive.1.xml:259
4063+#: apt-ftparchive.1.xml:271
4064 msgid ""
4065 "Controls the number of days a contents file is allowed to be checked without "
4066 "changing. If this limit is passed the mtime of the contents file is updated. "
4067@@ -2275,60 +2300,73 @@
4068 msgstr ""
4069
4070 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4071-#: apt-ftparchive.1.xml:268
4072+#: apt-ftparchive.1.xml:280
4073 msgid "Directory"
4074 msgstr ""
4075
4076 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4077-#: apt-ftparchive.1.xml:270
4078+#: apt-ftparchive.1.xml:282
4079 msgid ""
4080 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
4081 "$(SECTION)/binary-$(ARCH)/</filename>"
4082 msgstr ""
4083
4084 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4085-#: apt-ftparchive.1.xml:274
4086+#: apt-ftparchive.1.xml:286
4087 msgid "SrcDirectory"
4088 msgstr ""
4089
4090 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4091-#: apt-ftparchive.1.xml:276
4092+#: apt-ftparchive.1.xml:288
4093 msgid ""
4094 "Sets the top of the source package directory tree. Defaults to <filename>"
4095 "$(DIST)/$(SECTION)/source/</filename>"
4096 msgstr ""
4097
4098 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4099-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
4100+#: apt-ftparchive.1.xml:292 apt-ftparchive.1.xml:431
4101 msgid "Packages"
4102 msgstr ""
4103
4104 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4105-#: apt-ftparchive.1.xml:282
4106+#: apt-ftparchive.1.xml:294
4107 msgid ""
4108 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
4109 "binary-$(ARCH)/Packages</filename>"
4110 msgstr ""
4111
4112 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4113-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
4114+#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:436
4115 msgid "Sources"
4116 msgstr ""
4117
4118 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4119-#: apt-ftparchive.1.xml:288
4120+#: apt-ftparchive.1.xml:300
4121 msgid ""
4122 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
4123 "source/Sources</filename>"
4124 msgstr ""
4125
4126 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4127-#: apt-ftparchive.1.xml:292
4128+#: apt-ftparchive.1.xml:304
4129+msgid "Translation"
4130+msgstr ""
4131+
4132+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4133+#: apt-ftparchive.1.xml:306
4134+msgid ""
4135+"Set the output Translation-en master file with the long descriptions if they "
4136+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
4137+"$(SECTION)/i18n/Translation-en</filename>"
4138+msgstr ""
4139+
4140+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4141+#: apt-ftparchive.1.xml:311
4142 msgid "InternalPrefix"
4143 msgstr ""
4144
4145 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4146-#: apt-ftparchive.1.xml:294
4147+#: apt-ftparchive.1.xml:313
4148 msgid ""
4149 "Sets the path prefix that causes a symlink to be considered an internal link "
4150 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
4151@@ -2336,12 +2374,12 @@
4152 msgstr ""
4153
4154 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4155-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
4156+#: apt-ftparchive.1.xml:318 apt-ftparchive.1.xml:442
4157 msgid "Contents"
4158 msgstr ""
4159
4160 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4161-#: apt-ftparchive.1.xml:301
4162+#: apt-ftparchive.1.xml:320
4163 msgid ""
4164 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
4165 "</filename>. If this setting causes multiple Packages files to map onto a "
4166@@ -2350,34 +2388,34 @@
4167 msgstr ""
4168
4169 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4170-#: apt-ftparchive.1.xml:308
4171+#: apt-ftparchive.1.xml:327
4172 msgid "Contents::Header"
4173 msgstr ""
4174
4175 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4176-#: apt-ftparchive.1.xml:310
4177+#: apt-ftparchive.1.xml:329
4178 msgid "Sets header file to prepend to the contents output."
4179 msgstr ""
4180
4181 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4182-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
4183+#: apt-ftparchive.1.xml:332 apt-ftparchive.1.xml:467
4184 msgid "BinCacheDB"
4185 msgstr ""
4186
4187 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4188-#: apt-ftparchive.1.xml:315
4189+#: apt-ftparchive.1.xml:334
4190 msgid ""
4191 "Sets the binary cache database to use for this section. Multiple sections "
4192 "can share the same database."
4193 msgstr ""
4194
4195 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4196-#: apt-ftparchive.1.xml:319
4197+#: apt-ftparchive.1.xml:338
4198 msgid "FileList"
4199 msgstr ""
4200
4201 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4202-#: apt-ftparchive.1.xml:321
4203+#: apt-ftparchive.1.xml:340
4204 msgid ""
4205 "Specifies that instead of walking the directory tree, <command>apt-"
4206 "ftparchive</command> should read the list of files from the given file. "
4207@@ -2385,12 +2423,12 @@
4208 msgstr ""
4209
4210 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4211-#: apt-ftparchive.1.xml:326
4212+#: apt-ftparchive.1.xml:345
4213 msgid "SourceFileList"
4214 msgstr ""
4215
4216 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4217-#: apt-ftparchive.1.xml:328
4218+#: apt-ftparchive.1.xml:347
4219 msgid ""
4220 "Specifies that instead of walking the directory tree, <command>apt-"
4221 "ftparchive</command> should read the list of files from the given file. "
4222@@ -2399,12 +2437,12 @@
4223 msgstr ""
4224
4225 #. type: Content of: <refentry><refsect1><refsect2><title>
4226-#: apt-ftparchive.1.xml:336
4227+#: apt-ftparchive.1.xml:355
4228 msgid "Tree Section"
4229 msgstr ""
4230
4231 #. type: Content of: <refentry><refsect1><refsect2><para>
4232-#: apt-ftparchive.1.xml:338
4233+#: apt-ftparchive.1.xml:357
4234 msgid ""
4235 "The <literal>Tree</literal> section defines a standard Debian file tree "
4236 "which consists of a base directory, then multiple sections in that base "
4237@@ -2414,7 +2452,7 @@
4238 msgstr ""
4239
4240 #. type: Content of: <refentry><refsect1><refsect2><para>
4241-#: apt-ftparchive.1.xml:343
4242+#: apt-ftparchive.1.xml:362
4243 msgid ""
4244 "The <literal>Tree</literal> section takes a scope tag which sets the "
4245 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
4246@@ -2423,7 +2461,7 @@
4247 msgstr ""
4248
4249 #. type: Content of: <refentry><refsect1><refsect2><para>
4250-#: apt-ftparchive.1.xml:348
4251+#: apt-ftparchive.1.xml:367
4252 msgid ""
4253 "All of the settings defined in the <literal>TreeDefault</literal> section "
4254 "can be use in a <literal>Tree</literal> section as well as three new "
4255@@ -2431,7 +2469,7 @@
4256 msgstr ""
4257
4258 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
4259-#: apt-ftparchive.1.xml:354
4260+#: apt-ftparchive.1.xml:373
4261 #, no-wrap
4262 msgid ""
4263 "for i in Sections do \n"
4264@@ -2441,7 +2479,7 @@
4265 msgstr ""
4266
4267 #. type: Content of: <refentry><refsect1><refsect2><para>
4268-#: apt-ftparchive.1.xml:351
4269+#: apt-ftparchive.1.xml:370
4270 msgid ""
4271 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
4272 "command> performs an operation similar to: <placeholder type=\"programlisting"
4273@@ -2449,12 +2487,12 @@
4274 msgstr ""
4275
4276 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4277-#: apt-ftparchive.1.xml:360
4278+#: apt-ftparchive.1.xml:379
4279 msgid "Sections"
4280 msgstr ""
4281
4282 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4283-#: apt-ftparchive.1.xml:362
4284+#: apt-ftparchive.1.xml:381
4285 msgid ""
4286 "This is a space separated list of sections which appear under the "
4287 "distribution, typically this is something like <literal>main contrib non-"
4288@@ -2462,12 +2500,12 @@
4289 msgstr ""
4290
4291 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4292-#: apt-ftparchive.1.xml:367
4293+#: apt-ftparchive.1.xml:386
4294 msgid "Architectures"
4295 msgstr ""
4296
4297 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4298-#: apt-ftparchive.1.xml:369
4299+#: apt-ftparchive.1.xml:388
4300 msgid ""
4301 "This is a space separated list of all the architectures that appear under "
4302 "search section. The special architecture 'source' is used to indicate that "
4303@@ -2475,56 +2513,56 @@
4304 msgstr ""
4305
4306 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4307-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
4308+#: apt-ftparchive.1.xml:399 apt-ftparchive.1.xml:447
4309 msgid "BinOverride"
4310 msgstr ""
4311
4312 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4313-#: apt-ftparchive.1.xml:376
4314+#: apt-ftparchive.1.xml:401
4315 msgid ""
4316 "Sets the binary override file. The override file contains section, priority "
4317 "and maintainer address information."
4318 msgstr ""
4319
4320 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4321-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
4322+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:452
4323 msgid "SrcOverride"
4324 msgstr ""
4325
4326 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4327-#: apt-ftparchive.1.xml:382
4328+#: apt-ftparchive.1.xml:407
4329 msgid ""
4330 "Sets the source override file. The override file contains section "
4331 "information."
4332 msgstr ""
4333
4334 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4335-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
4336+#: apt-ftparchive.1.xml:411 apt-ftparchive.1.xml:457
4337 msgid "ExtraOverride"
4338 msgstr ""
4339
4340 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4341-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
4342+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
4343 msgid "Sets the binary extra override file."
4344 msgstr ""
4345
4346 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4347-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
4348+#: apt-ftparchive.1.xml:416 apt-ftparchive.1.xml:462
4349 msgid "SrcExtraOverride"
4350 msgstr ""
4351
4352 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4353-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
4354+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
4355 msgid "Sets the source extra override file."
4356 msgstr ""
4357
4358 #. type: Content of: <refentry><refsect1><refsect2><title>
4359-#: apt-ftparchive.1.xml:398
4360+#: apt-ftparchive.1.xml:423
4361 msgid "BinDirectory Section"
4362 msgstr ""
4363
4364 #. type: Content of: <refentry><refsect1><refsect2><para>
4365-#: apt-ftparchive.1.xml:400
4366+#: apt-ftparchive.1.xml:425
4367 msgid ""
4368 "The <literal>bindirectory</literal> section defines a binary directory tree "
4369 "with no special structure. The scope tag specifies the location of the "
4370@@ -2534,64 +2572,64 @@
4371 msgstr ""
4372
4373 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4374-#: apt-ftparchive.1.xml:408
4375+#: apt-ftparchive.1.xml:433
4376 msgid "Sets the Packages file output."
4377 msgstr ""
4378
4379 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4380-#: apt-ftparchive.1.xml:413
4381+#: apt-ftparchive.1.xml:438
4382 msgid ""
4383 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
4384 "<literal>Sources</literal> is required."
4385 msgstr ""
4386
4387 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4388-#: apt-ftparchive.1.xml:419
4389+#: apt-ftparchive.1.xml:444
4390 msgid "Sets the Contents file output. (optional)"
4391 msgstr ""
4392
4393 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4394-#: apt-ftparchive.1.xml:424
4395+#: apt-ftparchive.1.xml:449
4396 msgid "Sets the binary override file."
4397 msgstr ""
4398
4399 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4400-#: apt-ftparchive.1.xml:429
4401+#: apt-ftparchive.1.xml:454
4402 msgid "Sets the source override file."
4403 msgstr ""
4404
4405 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4406-#: apt-ftparchive.1.xml:444
4407+#: apt-ftparchive.1.xml:469
4408 msgid "Sets the cache DB."
4409 msgstr ""
4410
4411 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4412-#: apt-ftparchive.1.xml:447
4413+#: apt-ftparchive.1.xml:472
4414 msgid "PathPrefix"
4415 msgstr ""
4416
4417 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4418-#: apt-ftparchive.1.xml:449
4419+#: apt-ftparchive.1.xml:474
4420 msgid "Appends a path to all the output paths."
4421 msgstr ""
4422
4423 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4424-#: apt-ftparchive.1.xml:452
4425+#: apt-ftparchive.1.xml:477
4426 msgid "FileList, SourceFileList"
4427 msgstr ""
4428
4429 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4430-#: apt-ftparchive.1.xml:454
4431+#: apt-ftparchive.1.xml:479
4432 msgid "Specifies the file list file."
4433 msgstr ""
4434
4435 #. type: Content of: <refentry><refsect1><title>
4436-#: apt-ftparchive.1.xml:461
4437+#: apt-ftparchive.1.xml:486
4438 msgid "The Binary Override File"
4439 msgstr ""
4440
4441 #. type: Content of: <refentry><refsect1><para>
4442-#: apt-ftparchive.1.xml:462
4443+#: apt-ftparchive.1.xml:487
4444 msgid ""
4445 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
4446 "contains 4 fields separated by spaces. The first field is the package name, "
4447@@ -2601,19 +2639,19 @@
4448 msgstr ""
4449
4450 #. type: Content of: <refentry><refsect1><para><literallayout>
4451-#: apt-ftparchive.1.xml:468
4452+#: apt-ftparchive.1.xml:493
4453 #, no-wrap
4454 msgid "old [// oldn]* => new"
4455 msgstr ""
4456
4457 #. type: Content of: <refentry><refsect1><para><literallayout>
4458-#: apt-ftparchive.1.xml:470
4459+#: apt-ftparchive.1.xml:495
4460 #, no-wrap
4461 msgid "new"
4462 msgstr ""
4463
4464 #. type: Content of: <refentry><refsect1><para>
4465-#: apt-ftparchive.1.xml:467
4466+#: apt-ftparchive.1.xml:492
4467 msgid ""
4468 "The general form of the maintainer field is: <placeholder type="
4469 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
4470@@ -2624,12 +2662,12 @@
4471 msgstr ""
4472
4473 #. type: Content of: <refentry><refsect1><title>
4474-#: apt-ftparchive.1.xml:478
4475+#: apt-ftparchive.1.xml:503
4476 msgid "The Source Override File"
4477 msgstr ""
4478
4479 #. type: Content of: <refentry><refsect1><para>
4480-#: apt-ftparchive.1.xml:480
4481+#: apt-ftparchive.1.xml:505
4482 msgid ""
4483 "The source override file is fully compatible with &dpkg-scansources;. It "
4484 "contains 2 fields separated by spaces. The first fields is the source "
4485@@ -2637,12 +2675,12 @@
4486 msgstr ""
4487
4488 #. type: Content of: <refentry><refsect1><title>
4489-#: apt-ftparchive.1.xml:485
4490+#: apt-ftparchive.1.xml:510
4491 msgid "The Extra Override File"
4492 msgstr ""
4493
4494 #. type: Content of: <refentry><refsect1><para>
4495-#: apt-ftparchive.1.xml:487
4496+#: apt-ftparchive.1.xml:512
4497 msgid ""
4498 "The extra override file allows any arbitrary tag to be added or replaced in "
4499 "the output. It has 3 columns, the first is the package, the second is the "
4500@@ -2650,12 +2688,12 @@
4501 msgstr ""
4502
4503 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4504-#: apt-ftparchive.1.xml:496
4505+#: apt-ftparchive.1.xml:521
4506 msgid "<option>--md5</option>"
4507 msgstr ""
4508
4509 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
4510-#: apt-ftparchive.1.xml:498
4511+#: apt-ftparchive.1.xml:523
4512 msgid ""
4513 "Generate MD5 sums. This defaults to on, when turned off the generated index "
4514 "files will not have MD5Sum fields where possible. Configuration Item: "
4515@@ -2663,19 +2701,19 @@
4516 msgstr ""
4517
4518 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4519-#: apt-ftparchive.1.xml:503
4520+#: apt-ftparchive.1.xml:528
4521 msgid "<option>--db</option>"
4522 msgstr ""
4523
4524 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
4525-#: apt-ftparchive.1.xml:505
4526+#: apt-ftparchive.1.xml:530
4527 msgid ""
4528 "Use a binary caching DB. This has no effect on the generate command. "
4529 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
4530 msgstr ""
4531
4532 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
4533-#: apt-ftparchive.1.xml:511
4534+#: apt-ftparchive.1.xml:536
4535 msgid ""
4536 "Quiet; produces output suitable for logging, omitting progress indicators. "
4537 "More q's will produce more quiet up to a maximum of 2. You can also use "
4538@@ -2684,12 +2722,12 @@
4539 msgstr ""
4540
4541 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4542-#: apt-ftparchive.1.xml:517
4543+#: apt-ftparchive.1.xml:542
4544 msgid "<option>--delink</option>"
4545 msgstr ""
4546
4547 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
4548-#: apt-ftparchive.1.xml:519
4549+#: apt-ftparchive.1.xml:544
4550 msgid ""
4551 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
4552 "then this option actually enables delinking of the files. It defaults to on "
4553@@ -2698,12 +2736,12 @@
4554 msgstr ""
4555
4556 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4557-#: apt-ftparchive.1.xml:525
4558+#: apt-ftparchive.1.xml:550
4559 msgid "<option>--contents</option>"
4560 msgstr ""
4561
4562 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
4563-#: apt-ftparchive.1.xml:527
4564+#: apt-ftparchive.1.xml:552
4565 msgid ""
4566 "Perform contents generation. When this option is set and package indexes are "
4567 "being generated with a cache DB then the file listing will also be extracted "
4568@@ -2713,12 +2751,12 @@
4569 msgstr ""
4570
4571 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4572-#: apt-ftparchive.1.xml:535
4573+#: apt-ftparchive.1.xml:560
4574 msgid "<option>--source-override</option>"
4575 msgstr ""
4576
4577 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
4578-#: apt-ftparchive.1.xml:537
4579+#: apt-ftparchive.1.xml:562
4580 msgid ""
4581 "Select the source override file to use with the <literal>sources</literal> "
4582 "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
4583@@ -2726,53 +2764,53 @@
4584 msgstr ""
4585
4586 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4587-#: apt-ftparchive.1.xml:541
4588+#: apt-ftparchive.1.xml:566
4589 msgid "<option>--readonly</option>"
4590 msgstr ""
4591
4592 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
4593-#: apt-ftparchive.1.xml:543
4594+#: apt-ftparchive.1.xml:568
4595 msgid ""
4596 "Make the caching databases read only. Configuration Item: <literal>APT::"
4597 "FTPArchive::ReadOnlyDB</literal>."
4598 msgstr ""
4599
4600 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4601-#: apt-ftparchive.1.xml:547
4602+#: apt-ftparchive.1.xml:572
4603 msgid "<option>APT::FTPArchive::LongDescription</option>"
4604 msgstr ""
4605
4606 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
4607-#: apt-ftparchive.1.xml:549
4608+#: apt-ftparchive.1.xml:574
4609 msgid ""
4610 "This configuration option defaults to \"<literal>true</literal>\" and should "
4611 "only be set to <literal>\"false\"</literal> if the Archive generated with "
4612 "&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
4613-"that it is currently not possible to create these files with <command>apt-"
4614-"ftparchive</command>."
4615+"that the <filename>Translation-en</filename> master file can only be created "
4616+"in the generate command."
4617 msgstr ""
4618
4619 #. type: Content of: <refentry><refsect1><title>
4620-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1007 apt_preferences.5.xml:469
4621+#: apt-ftparchive.1.xml:586 apt.conf.5.xml:1007 apt_preferences.5.xml:469
4622 #: sources.list.5.xml:193
4623 msgid "Examples"
4624 msgstr ""
4625
4626 #. type: Content of: <refentry><refsect1><para><programlisting>
4627-#: apt-ftparchive.1.xml:567
4628+#: apt-ftparchive.1.xml:592
4629 #, no-wrap
4630 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
4631 msgstr ""
4632
4633 #. type: Content of: <refentry><refsect1><para>
4634-#: apt-ftparchive.1.xml:563
4635+#: apt-ftparchive.1.xml:588
4636 msgid ""
4637 "To create a compressed Packages file for a directory containing binary "
4638 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
4639 msgstr ""
4640
4641 #. type: Content of: <refentry><refsect1><para>
4642-#: apt-ftparchive.1.xml:577
4643+#: apt-ftparchive.1.xml:602
4644 msgid ""
4645 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
4646 "100 on error."
4647
4648=== modified file 'doc/po/ja.po'
4649--- doc/po/ja.po 2010-04-14 20:30:03 +0000
4650+++ doc/po/ja.po 2012-01-31 15:47:23 +0000
4651@@ -6,13 +6,14 @@
4652 msgid ""
4653 msgstr ""
4654 "Project-Id-Version: PACKAGE VERSION\n"
4655-"POT-Creation-Date: 2010-04-14 20:30+0300\n"
4656+"POT-Creation-Date: 2011-10-04 01:17+0000\n"
4657 "PO-Revision-Date: 2009-07-30 22:55+0900\n"
4658 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
4659 "Language-Team: LANGUAGE <LL@li.org>\n"
4660 "MIME-Version: 1.0\n"
4661 "Content-Type: text/plain; charset=UTF-8\n"
4662 "Content-Transfer-Encoding: 8bit\n"
4663+"Language: \n"
4664
4665 # type: TH
4666 #. type: TH
4667@@ -1786,7 +1787,7 @@
4668 # type: Content of: <refentry><refsect1><title>
4669 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4670 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
4671-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
4672+#: apt-ftparchive.1.xml:517 apt-get.8.xml:319 apt-mark.8.xml:89
4673 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:481 apt.conf.5.xml:503
4674 msgid "options"
4675 msgstr "オプション"
4676@@ -1814,7 +1815,7 @@
4677 "pkgcache</literal>"
4678
4679 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4680-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
4681+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:560 apt-get.8.xml:376
4682 #: apt-sortpkgs.1.xml:58
4683 msgid "<option>-s</option>"
4684 msgstr "<option>-s</option>"
4685@@ -1841,12 +1842,12 @@
4686 "<literal>Dir::Cache::srcpkgcache</literal>"
4687
4688 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4689-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
4690+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
4691 msgid "<option>-q</option>"
4692 msgstr "<option>-q</option>"
4693
4694 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4695-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
4696+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:534 apt-get.8.xml:366
4697 msgid "<option>--quiet</option>"
4698 msgstr "<option>--quiet</option>"
4699
4700@@ -2029,7 +2030,7 @@
4701 # type: Content of: <refentry><refsect1><para>
4702 #. type: Content of: <refentry><refsect1><variablelist>
4703 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
4704-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
4705+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:581 apt-get.8.xml:554
4706 #: apt-sortpkgs.1.xml:64
4707 msgid "&apt-commonoptions;"
4708 msgstr "&apt-commonoptions;"
4709@@ -2049,7 +2050,7 @@
4710 # type: Content of: <refentry><refsect1><title>
4711 #. type: Content of: <refentry><refsect1><title>
4712 #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
4713-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
4714+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:597 apt-get.8.xml:569
4715 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
4716 #: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1019 apt_preferences.5.xml:629
4717 #: sources.list.5.xml:233
4718@@ -2065,7 +2066,7 @@
4719 # type: Content of: <refentry><refsect1><title>
4720 #. type: Content of: <refentry><refsect1><title>
4721 #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
4722-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
4723+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:601 apt-get.8.xml:575
4724 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
4725 msgid "Diagnostics"
4726 msgstr "診断メッセージ"
4727@@ -2208,7 +2209,7 @@
4728 msgstr "オプション"
4729
4730 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
4731-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
4732+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:528 apt-get.8.xml:328
4733 msgid "<option>-d</option>"
4734 msgstr "<option>-d</option>"
4735
4736@@ -2466,7 +2467,7 @@
4737
4738 # type: Content of: <refentry><refsect1><para>
4739 #. type: Content of: <refentry><refsect1><para>
4740-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
4741+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:598
4742 #: apt-sortpkgs.1.xml:70
4743 msgid "&apt-conf;"
4744 msgstr "&apt-conf;"
4745@@ -3084,12 +3085,33 @@
4746
4747 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4748 #: apt-ftparchive.1.xml:227
4749+#, fuzzy
4750+#| msgid "Contents::Compress"
4751+msgid "Translation::Compress"
4752+msgstr "Contents::Compress"
4753+
4754+# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4755+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4756+#: apt-ftparchive.1.xml:229
4757+#, fuzzy
4758+#| msgid ""
4759+#| "This is similar to <literal>Packages::Compress</literal> except that it "
4760+#| "controls the compression for the Contents files."
4761+msgid ""
4762+"This is similar to <literal>Packages::Compress</literal> except that it "
4763+"controls the compression for the Translation-en master file."
4764+msgstr ""
4765+"<literal>Packages::Compress</literal> ��様��Contents ファイル�圧縮方法を"
4766+"指定���。"
4767+
4768+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4769+#: apt-ftparchive.1.xml:233
4770 msgid "DeLinkLimit"
4771 msgstr "DeLinkLimit"
4772
4773 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4774 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4775-#: apt-ftparchive.1.xml:229
4776+#: apt-ftparchive.1.xml:235
4777 msgid ""
4778 "Specifies the number of kilobytes to delink (and replace with hard links) "
4779 "per run. This is used in conjunction with the per-section <literal>External-"
4780@@ -3101,13 +3123,13 @@
4781
4782 # type: Content of: <refentry><refsect1><title>
4783 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4784-#: apt-ftparchive.1.xml:234
4785+#: apt-ftparchive.1.xml:240
4786 msgid "FileMode"
4787 msgstr "FileMode"
4788
4789 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4790 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4791-#: apt-ftparchive.1.xml:236
4792+#: apt-ftparchive.1.xml:242
4793 msgid ""
4794 "Specifies the mode of all created index files. It defaults to 0644. All "
4795 "index files are set to this mode with no regard to the umask."
4796@@ -3115,15 +3137,30 @@
4797 "作���インデックスファイル�モードを指定���。デフォルト� 0644 ��。全"
4798 "インデックスファイル��umask を無視����モードを使用���。"
4799
4800+# type: Content of: <refentry><refsect1><title>
4801+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4802+#: apt-ftparchive.1.xml:247 apt-ftparchive.1.xml:393
4803+#, fuzzy
4804+#| msgid "Description"
4805+msgid "LongDescription"
4806+msgstr "説明"
4807+
4808+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4809+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
4810+msgid ""
4811+"Sets if long descriptions should be included in the Packages file or split "
4812+"out into a master Translation-en file."
4813+msgstr ""
4814+
4815 # type: Content of: <refentry><refsect1><refsect2><title>
4816 #. type: Content of: <refentry><refsect1><refsect2><title>
4817-#: apt-ftparchive.1.xml:243
4818+#: apt-ftparchive.1.xml:255
4819 msgid "TreeDefault Section"
4820 msgstr "TreeDefault セクション"
4821
4822 # type: Content of: <refentry><refsect1><refsect2><para>
4823 #. type: Content of: <refentry><refsect1><refsect2><para>
4824-#: apt-ftparchive.1.xml:245
4825+#: apt-ftparchive.1.xml:257
4826 msgid ""
4827 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
4828 "variables are substitution variables and have the strings $(DIST), "
4829@@ -3134,13 +3171,13 @@
4830 "�展開���。"
4831
4832 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4833-#: apt-ftparchive.1.xml:250
4834+#: apt-ftparchive.1.xml:262
4835 msgid "MaxContentsChange"
4836 msgstr "MaxContentsChange"
4837
4838 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4839 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4840-#: apt-ftparchive.1.xml:252
4841+#: apt-ftparchive.1.xml:264
4842 msgid ""
4843 "Sets the number of kilobytes of contents files that are generated each day. "
4844 "The contents files are round-robined so that over several days they will all "
4845@@ -3151,13 +3188,13 @@
4846
4847 # type: Content of: <refentry><refsect1><title>
4848 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4849-#: apt-ftparchive.1.xml:257
4850+#: apt-ftparchive.1.xml:269
4851 msgid "ContentsAge"
4852 msgstr "ContentsAge"
4853
4854 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4855 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4856-#: apt-ftparchive.1.xml:259
4857+#: apt-ftparchive.1.xml:271
4858 msgid ""
4859 "Controls the number of days a contents file is allowed to be checked without "
4860 "changing. If this limit is passed the mtime of the contents file is updated. "
4861@@ -3174,13 +3211,13 @@
4862
4863 # type: Content of: <refentry><refsect1><refsect2><title>
4864 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4865-#: apt-ftparchive.1.xml:268
4866+#: apt-ftparchive.1.xml:280
4867 msgid "Directory"
4868 msgstr "Directory"
4869
4870 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4871 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4872-#: apt-ftparchive.1.xml:270
4873+#: apt-ftparchive.1.xml:282
4874 msgid ""
4875 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
4876 "$(SECTION)/binary-$(ARCH)/</filename>"
4877@@ -3190,13 +3227,13 @@
4878
4879 # type: Content of: <refentry><refsect1><refsect2><title>
4880 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4881-#: apt-ftparchive.1.xml:274
4882+#: apt-ftparchive.1.xml:286
4883 msgid "SrcDirectory"
4884 msgstr "SrcDirectory"
4885
4886 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4887 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4888-#: apt-ftparchive.1.xml:276
4889+#: apt-ftparchive.1.xml:288
4890 msgid ""
4891 "Sets the top of the source package directory tree. Defaults to <filename>"
4892 "$(DIST)/$(SECTION)/source/</filename>"
4893@@ -3206,13 +3243,13 @@
4894
4895 # type: <tag></tag>
4896 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4897-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
4898+#: apt-ftparchive.1.xml:292 apt-ftparchive.1.xml:431
4899 msgid "Packages"
4900 msgstr "Packages"
4901
4902 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4903 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4904-#: apt-ftparchive.1.xml:282
4905+#: apt-ftparchive.1.xml:294
4906 msgid ""
4907 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
4908 "binary-$(ARCH)/Packages</filename>"
4909@@ -3222,13 +3259,13 @@
4910
4911 # type: Content of: <refentry><refnamediv><refname>
4912 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4913-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
4914+#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:436
4915 msgid "Sources"
4916 msgstr "Sources"
4917
4918 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4919 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4920-#: apt-ftparchive.1.xml:288
4921+#: apt-ftparchive.1.xml:300
4922 #, fuzzy
4923 #| msgid ""
4924 #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
4925@@ -3240,14 +3277,29 @@
4926 "Packages ファイル�出力先を設定���。デフォルト� <filename>$(DIST)/"
4927 "$(SECTION)/source/Sources</filename> ��。"
4928
4929-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4930-#: apt-ftparchive.1.xml:292
4931+# type: Content of: <refentry><refsect1><title>
4932+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4933+#: apt-ftparchive.1.xml:304
4934+#, fuzzy
4935+msgid "Translation"
4936+msgstr "オプション"
4937+
4938+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4939+#: apt-ftparchive.1.xml:306
4940+msgid ""
4941+"Set the output Translation-en master file with the long descriptions if they "
4942+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
4943+"$(SECTION)/i18n/Translation-en</filename>"
4944+msgstr ""
4945+
4946+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4947+#: apt-ftparchive.1.xml:311
4948 msgid "InternalPrefix"
4949 msgstr "InternalPrefix"
4950
4951 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4952 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4953-#: apt-ftparchive.1.xml:294
4954+#: apt-ftparchive.1.xml:313
4955 msgid ""
4956 "Sets the path prefix that causes a symlink to be considered an internal link "
4957 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
4958@@ -3258,13 +3310,13 @@
4959
4960 # type: Content of: <refentry><refsect1><title>
4961 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4962-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
4963+#: apt-ftparchive.1.xml:318 apt-ftparchive.1.xml:442
4964 msgid "Contents"
4965 msgstr "Contents"
4966
4967 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4968 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4969-#: apt-ftparchive.1.xml:301
4970+#: apt-ftparchive.1.xml:320
4971 msgid ""
4972 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
4973 "</filename>. If this setting causes multiple Packages files to map onto a "
4974@@ -3277,24 +3329,24 @@
4975 "ftparchive</command> �自動�パッケージファイルを�����。"
4976
4977 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4978-#: apt-ftparchive.1.xml:308
4979+#: apt-ftparchive.1.xml:327
4980 msgid "Contents::Header"
4981 msgstr "Contents::Header"
4982
4983 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4984 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4985-#: apt-ftparchive.1.xml:310
4986+#: apt-ftparchive.1.xml:329
4987 msgid "Sets header file to prepend to the contents output."
4988 msgstr "contents �出力�付�るヘッダファイルを設定���。"
4989
4990 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
4991-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
4992+#: apt-ftparchive.1.xml:332 apt-ftparchive.1.xml:467
4993 msgid "BinCacheDB"
4994 msgstr "BinCacheDB"
4995
4996 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4997 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
4998-#: apt-ftparchive.1.xml:315
4999+#: apt-ftparchive.1.xml:334
5000 msgid ""
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: