APT

Merge lp:~mvo/apt/mvo into lp:~ubuntu-core-dev/apt/ubuntu

  1. mvo
  2. Merge into ubuntu
Proposed by Michael Vogt
Status: Merged
Merged at revision: 1810
Proposed branch: lp:~mvo/apt/mvo
Merge into: lp:~ubuntu-core-dev/apt/ubuntu
Diff against target: 73066 lines (+13639/-12297) (has conflicts)
76 files modified
apt-pkg/contrib/fileutl.cc (+26/-2)
apt-pkg/contrib/strutl.cc (+2/-2)
apt-pkg/deb/debindexfile.cc (+13/-9)
apt-pkg/deb/deblistparser.cc (+6/-0)
apt-pkg/deb/debsystem.cc (+2/-2)
apt-pkg/depcache.cc (+15/-1)
apt-pkg/packagemanager.cc (+3/-3)
apt-pkg/pkgcache.cc (+1/-0)
apt-pkg/pkgcache.h (+1/-1)
apt-pkg/policy.cc (+5/-4)
buildlib/debiandoc.mak (+2/-2)
buildlib/po4a_manpage.mak (+1/-1)
cmdline/apt-get.cc (+12/-0)
debian/apt.cron.daily (+15/-28)
debian/changelog (+158/-0)
debian/control (+1/-1)
doc/examples/configure-index (+1/-0)
doc/po/de.po (+292/-590)
doc/po/fr.po (+8/-4)
po/apt-all.pot (+278/-266)
po/ar.po (+278/-266)
po/ast.po (+299/-287)
po/bg.po (+278/-266)
po/bs.po (+278/-266)
po/ca.po (+375/-241)
po/cs.po (+278/-266)
po/cy.po (+278/-266)
po/da.po (+405/-226)
po/de.po (+350/-247)
po/dz.po (+278/-266)
po/el.po (+278/-266)
po/es.po (+278/-266)
po/eu.po (+278/-266)
po/fi.po (+278/-266)
po/fr.po (+278/-268)
po/gl.po (+278/-266)
po/he.po (+2/-2)
po/hu.po (+278/-266)
po/it.po (+284/-272)
po/ja.po (+278/-266)
po/km.po (+278/-266)
po/ko.po (+278/-266)
po/ku.po (+278/-266)
po/lt.po (+278/-266)
po/mr.po (+278/-266)
po/nb.po (+377/-236)
po/ne.po (+278/-266)
po/nl.po (+280/-268)
po/nn.po (+278/-266)
po/pl.po (+278/-266)
po/pt.po (+279/-267)
po/pt_BR.po (+278/-266)
po/ro.po (+278/-266)
po/ru.po (+279/-267)
po/sk.po (+278/-266)
po/sl.po (+278/-266)
po/sv.po (+278/-266)
po/th.po (+278/-266)
po/tl.po (+278/-266)
po/uk.po (+278/-266)
po/vi.po (+543/-535)
po/zh_CN.po (+278/-273)
po/zh_TW.po (+278/-266)
test/integration/Packages-policy-pinning (+12/-0)
test/integration/framework (+2/-1)
test/integration/run-tests (+1/-1)
test/integration/test-autoremove (+1/-1)
test/integration/test-bug-590438-broken-provides-thanks-to-remove-order (+1/-1)
test/integration/test-bug-591882-conkeror (+5/-5)
test/integration/test-bug-595691-empty-and-broken-archive-files (+91/-0)
test/integration/test-bug-598669-install-postfix-gets-exim-heavy (+22/-0)
test/integration/test-compressed-indexes (+1/-1)
test/integration/test-disappearing-packages (+1/-1)
test/integration/test-pdiff-usage (+1/-1)
test/integration/test-policy-pinning (+228/-0)
test/integration/test-ubuntu-bug-614993 (+62/-0)
Text conflict in apt-pkg/depcache.cc
Text conflict in debian/changelog
Text conflict in doc/po/fr.po
Text conflict in po/ca.po
Text conflict in po/da.po
Text conflict in po/de.po
Text conflict in po/nb.po
Text conflict in test/integration/test-bug-598669-install-postfix-gets-exim-heavy
Text conflict in test/integration/test-ubuntu-bug-614993
To merge this branch: bzr merge lp:~mvo/apt/mvo
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+38329@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt-pkg/contrib/fileutl.cc'
2--- apt-pkg/contrib/fileutl.cc 2010-09-06 12:10:26 +0000
3+++ apt-pkg/contrib/fileutl.cc 2010-10-13 18:37:00 +0000
4@@ -915,11 +915,35 @@
5 /* */
6 unsigned long FileFd::Size()
7 {
8- //TODO: For gz, do we need the actual file size here or the uncompressed length?
9 struct stat Buf;
10+ unsigned long size;
11+ off_t orig_pos;
12+
13 if (fstat(iFd,&Buf) != 0)
14 return _error->Errno("fstat","Unable to determine the file size");
15- return Buf.st_size;
16+ size = Buf.st_size;
17+
18+ // only check gzsize if we are actually a gzip file, just checking for
19+ // "gz" is not sufficient as uncompressed files will be opened with
20+ // gzopen in "direct" mode as well
21+ if (gz && !gzdirect(gz) && size > 0)
22+ {
23+ /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do
24+ * this ourselves; the original (uncompressed) file size is the last 32
25+ * bits of the file */
26+ orig_pos = lseek(iFd, 0, SEEK_CUR);
27+ if (lseek(iFd, -4, SEEK_END) < 0)
28+ return _error->Errno("lseek","Unable to seek to end of gzipped file");
29+ if (read(iFd, &size, 4) != 4)
30+ return _error->Errno("read","Unable to read original size of gzipped file");
31+ size &= 0xFFFFFFFF;
32+
33+ if (lseek(iFd, orig_pos, SEEK_SET) < 0)
34+ return _error->Errno("lseek","Unable to seek in gzipped file");
35+ return size;
36+ }
37+
38+ return size;
39 }
40 /*}}}*/
41 // FileFd::Close - Close the file if the close flag is set /*{{{*/
42
43=== modified file 'apt-pkg/contrib/strutl.cc'
44--- apt-pkg/contrib/strutl.cc 2010-08-16 09:38:20 +0000
45+++ apt-pkg/contrib/strutl.cc 2010-10-13 18:37:00 +0000
46@@ -340,13 +340,13 @@
47 {
48 if (ASize < 100 && I != 0)
49 {
50- sprintf(S,"%'.1f%c",ASize,Ext[I]);
51+ sprintf(S,"%'.1f %c",ASize,Ext[I]);
52 break;
53 }
54
55 if (ASize < 10000)
56 {
57- sprintf(S,"%'.0f%c",ASize,Ext[I]);
58+ sprintf(S,"%'.0f %c",ASize,Ext[I]);
59 break;
60 }
61 ASize /= 1000.0;
62
63=== modified file 'apt-pkg/deb/debindexfile.cc'
64--- apt-pkg/deb/debindexfile.cc 2010-07-11 16:50:41 +0000
65+++ apt-pkg/deb/debindexfile.cc 2010-10-13 18:37:00 +0000
66@@ -149,10 +149,11 @@
67 /* */
68 unsigned long debSourcesIndex::Size() const
69 {
70- struct stat S;
71- if (stat(IndexFile("Sources").c_str(),&S) != 0)
72+ FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnlyGzip);
73+
74+ if (f.Failed())
75 return 0;
76- return S.st_size;
77+ return f.Size();
78 }
79 /*}}}*/
80
81@@ -268,10 +269,11 @@
82 /* This is really only used for progress reporting. */
83 unsigned long debPackagesIndex::Size() const
84 {
85- struct stat S;
86- if (stat(IndexFile("Packages").c_str(),&S) != 0)
87+ FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnlyGzip);
88+
89+ if (f.Failed())
90 return 0;
91- return S.st_size;
92+ return f.Size();
93 }
94 /*}}}*/
95 // PackagesIndex::Merge - Load the index file into a cache /*{{{*/
96@@ -458,10 +460,12 @@
97 /* This is really only used for progress reporting. */
98 unsigned long debTranslationsIndex::Size() const
99 {
100- struct stat S;
101- if (stat(IndexFile(Language).c_str(),&S) != 0)
102+ FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnlyGzip);
103+
104+ if (f.Failed())
105 return 0;
106- return S.st_size;
107+
108+ return f.Size();
109 }
110 /*}}}*/
111 // TranslationsIndex::Merge - Load the index file into a cache /*{{{*/
112
113=== modified file 'apt-pkg/deb/deblistparser.cc'
114--- apt-pkg/deb/deblistparser.cc 2010-07-11 16:50:41 +0000
115+++ apt-pkg/deb/deblistparser.cc 2010-10-13 18:37:00 +0000
116@@ -815,6 +815,12 @@
117 if (Section.FindFlag("NotAutomatic",FileI->Flags,
118 pkgCache::Flag::NotAutomatic) == false)
119 _error->Warning("Bad NotAutomatic flag");
120+ if (Section.FindFlag("ButAutomaticUpgrades",FileI->Flags,
121+ pkgCache::Flag::ButAutomaticUpgrades) == false)
122+ _error->Warning("Bad ButAutomaticUpgrades flag");
123+ // overrule the NotAutomatic setting if needed as they are both present for compatibility
124+ else if ((FileI->Flags & pkgCache::Flag::ButAutomaticUpgrades) == pkgCache::Flag::ButAutomaticUpgrades)
125+ FileI->Flags &= ~pkgCache::Flag::NotAutomatic;
126
127 return !_error->PendingError();
128 }
129
130=== modified file 'apt-pkg/deb/debsystem.cc'
131--- apt-pkg/deb/debsystem.cc 2010-08-18 22:31:55 +0000
132+++ apt-pkg/deb/debsystem.cc 2010-10-13 18:37:00 +0000
133@@ -164,8 +164,8 @@
134 /* These really should be jammed into a generic 'Local Database' engine
135 which is yet to be determined. The functions in pkgcachegen should
136 be the only users of these */
137- Cnf.CndSet("Dir::State::extended_states", Cnf.FindDir("Dir::State").append("extended_states"));
138- Cnf.CndSet("Dir::State::status", Cnf.FindDir("Dir", "/").append("var/lib/dpkg/status"));
139+ Cnf.CndSet("Dir::State::extended_states", "extended_states");
140+ Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
141 Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
142
143 if (StatusFile) {
144
145=== modified file 'apt-pkg/deb/dpkgpm.cc'
146=== modified file 'apt-pkg/depcache.cc'
147--- apt-pkg/depcache.cc 2010-10-05 12:26:00 +0000
148+++ apt-pkg/depcache.cc 2010-10-13 18:37:00 +0000
149@@ -1192,6 +1192,7 @@
150 std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << " FU=" << FromUser << std::endl;
151 return false;
152 }
153+<<<<<<< TREE
154 // if the removal is not explictely requested by the user, protect
155 // explicit new-install package from accidental removal by the
156 // problemresolver
157@@ -1206,6 +1207,18 @@
158 return false;
159 }
160 }
161+=======
162+ else if (FromUser == false && Pkg->CurrentVer == 0)
163+ {
164+ StateCache &P = PkgState[Pkg->ID];
165+ if (P.InstallVer != 0 && P.Status == 2 && (P.Flags & Flag::Auto) != Flag::Auto)
166+ {
167+ if (DebugMarker == true)
168+ std::clog << OutputInDepth(Depth) << "Manual install request prevents MarkDelete of " << Pkg << std::endl;
169+ return false;
170+ }
171+ }
172+>>>>>>> MERGE-SOURCE
173 return true;
174 }
175 /*}}}*/
176@@ -1629,7 +1642,8 @@
177
178 /* Stash the highest version of a not-automatic source, we use it
179 if there is nothing better */
180- if ((J.File()->Flags & Flag::NotAutomatic) != 0)
181+ if ((J.File()->Flags & Flag::NotAutomatic) != 0 ||
182+ (J.File()->Flags & Flag::ButAutomaticUpgrades) != 0)
183 {
184 if (Last.end() == true)
185 Last = I;
186
187=== modified file 'apt-pkg/init.cc'
188=== modified file 'apt-pkg/init.h'
189=== modified file 'apt-pkg/packagemanager.cc'
190--- apt-pkg/packagemanager.cc 2010-06-10 13:10:38 +0000
191+++ apt-pkg/packagemanager.cc 2010-10-13 18:37:00 +0000
192@@ -328,7 +328,7 @@
193
194 // Sanity Check
195 if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
196- return _error->Error(_("Could not perform immediate configuration on '%s'."
197+ return _error->Error(_("Could not perform immediate configuration on '%s'. "
198 "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
199
200 return true;
201@@ -492,7 +492,7 @@
202 List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
203 if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
204 if (SmartConfigure(Pkg) == false)
205- return _error->Error(_("Could not perform immediate configuration on already unpacked '%s'."
206+ return _error->Error(_("Could not perform immediate configuration on already unpacked '%s'. "
207 "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());
208 return true;
209 }
210@@ -613,7 +613,7 @@
211 // Perform immedate configuration of the package.
212 if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
213 if (SmartConfigure(Pkg) == false)
214- return _error->Error(_("Could not perform immediate configuration on '%s'."
215+ return _error->Error(_("Could not perform immediate configuration on '%s'. "
216 "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
217
218 return true;
219
220=== modified file 'apt-pkg/pkgcache.cc'
221--- apt-pkg/pkgcache.cc 2010-08-13 14:42:38 +0000
222+++ apt-pkg/pkgcache.cc 2010-10-13 18:37:00 +0000
223@@ -731,6 +731,7 @@
224 {
225 VerFileIterator Files = FileList();
226 for (; Files.end() == false; Files++)
227+ // Do not check ButAutomaticUpgrades here as it is kind of automatic…
228 if ((Files.File()->Flags & pkgCache::Flag::NotAutomatic) != pkgCache::Flag::NotAutomatic)
229 return true;
230 return false;
231
232=== modified file 'apt-pkg/pkgcache.h'
233--- apt-pkg/pkgcache.h 2010-07-08 13:28:53 +0000
234+++ apt-pkg/pkgcache.h 2010-10-13 18:37:00 +0000
235@@ -146,7 +146,7 @@
236 struct Flag
237 {
238 enum PkgFlags {Auto=(1<<0),Essential=(1<<3),Important=(1<<4)};
239- enum PkgFFlags {NotSource=(1<<0),NotAutomatic=(1<<1)};
240+ enum PkgFFlags {NotSource=(1<<0),NotAutomatic=(1<<1),ButAutomaticUpgrades=(1<<2)};
241 };
242
243 protected:
244
245=== modified file 'apt-pkg/policy.cc'
246--- apt-pkg/policy.cc 2010-06-09 12:20:27 +0000
247+++ apt-pkg/policy.cc 2010-10-13 18:37:00 +0000
248@@ -16,7 +16,7 @@
249 990 = Config file override package files
250 989 = Start for preference auto-priorities
251 500 = Default package files
252- 100 = The status file
253+ 100 = The status file and ButAutomaticUpgrades sources
254 0 -> 100 = NotAutomatic sources like experimental
255 -inf -> 0 = Never selected
256
257@@ -70,9 +70,10 @@
258 PFPriority[I->ID] = 500;
259 if ((I->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
260 PFPriority[I->ID] = 100;
261- else
262- if ((I->Flags & pkgCache::Flag::NotAutomatic) == pkgCache::Flag::NotAutomatic)
263- PFPriority[I->ID] = 1;
264+ else if ((I->Flags & pkgCache::Flag::ButAutomaticUpgrades) == pkgCache::Flag::ButAutomaticUpgrades)
265+ PFPriority[I->ID] = 100;
266+ else if ((I->Flags & pkgCache::Flag::NotAutomatic) == pkgCache::Flag::NotAutomatic)
267+ PFPriority[I->ID] = 1;
268 }
269
270 // Apply the defaults..
271
272=== modified file 'buildlib/debiandoc.mak'
273--- buildlib/debiandoc.mak 2008-03-15 18:02:15 +0000
274+++ buildlib/debiandoc.mak 2010-10-13 18:37:00 +0000
275@@ -27,7 +27,7 @@
276 $(DOC)/%.html: %.sgml
277 echo Creating html for $< to $@
278 -rm -rf $@
279- (HERE=`pwd`; cd $(@D) && $(DEBIANDOC_HTML) $(DEBIANDOC_HTML_OPTIONS) $$HERE/$<)
280+ (HERE=`pwd`; cd $(@D) && $(DEBIANDOC_HTML) $(DEBIANDOC_HTML_OPTIONS) $$HERE/$<) || exit 199
281
282 # Clean rule
283 .PHONY: veryclean/html/$(LOCAL)
284@@ -48,7 +48,7 @@
285 vpath %.sgml $(SUBDIRS)
286 $(DOC)/%.text: %.sgml
287 echo Creating text for $< to $@
288- $(DEBIANDOC_TEXT) -O $< > $@
289+ $(DEBIANDOC_TEXT) -O $< > $@ || exit 198
290
291 # Clean rule
292 .PHONY: veryclean/text/$(LOCAL)
293
294=== modified file 'buildlib/po4a_manpage.mak'
295--- buildlib/po4a_manpage.mak 2010-01-13 13:51:28 +0000
296+++ buildlib/po4a_manpage.mak 2010-10-13 18:37:00 +0000
297@@ -27,7 +27,7 @@
298
299 $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
300 echo Creating man page $@
301- $(XSLTPROC) -o $@ $(STYLESHEET) $< # why xsltproc doesn't respect the -o flag here???
302+ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
303 test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed
304 mv -f $(subst .$(LC),,$@) $@
305
306
307=== modified file 'cmdline/apt-get.cc'
308--- cmdline/apt-get.cc 2010-08-28 15:52:55 +0000
309+++ cmdline/apt-get.cc 2010-10-13 18:37:00 +0000
310@@ -1106,17 +1106,25 @@
311
312 // Number of bytes
313 if (DebBytes != FetchBytes)
314+ //TRANSLATOR: The required space between number and unit is already included
315+ // in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
316 ioprintf(c1out,_("Need to get %sB/%sB of archives.\n"),
317 SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str());
318 else if (DebBytes != 0)
319+ //TRANSLATOR: The required space between number and unit is already included
320+ // in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
321 ioprintf(c1out,_("Need to get %sB of archives.\n"),
322 SizeToStr(DebBytes).c_str());
323
324 // Size delta
325 if (Cache->UsrSize() >= 0)
326+ //TRANSLATOR: The required space between number and unit is already included
327+ // in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
328 ioprintf(c1out,_("After this operation, %sB of additional disk space will be used.\n"),
329 SizeToStr(Cache->UsrSize()).c_str());
330 else
331+ //TRANSLATOR: The required space between number and unit is already included
332+ // in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
333 ioprintf(c1out,_("After this operation, %sB disk space will be freed.\n"),
334 SizeToStr(-1*Cache->UsrSize()).c_str());
335
336@@ -2340,9 +2348,13 @@
337
338 // Number of bytes
339 if (DebBytes != FetchBytes)
340+ //TRANSLATOR: The required space between number and unit is already included
341+ // in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
342 ioprintf(c1out,_("Need to get %sB/%sB of source archives.\n"),
343 SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str());
344 else
345+ //TRANSLATOR: The required space between number and unit is already included
346+ // in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
347 ioprintf(c1out,_("Need to get %sB of source archives.\n"),
348 SizeToStr(DebBytes).c_str());
349
350
351=== modified file 'cmdline/apt-key'
352=== modified file 'debian/apt.cron.daily'
353--- debian/apt.cron.daily 2010-10-01 13:25:24 +0000
354+++ debian/apt.cron.daily 2010-10-13 18:37:00 +0000
355@@ -11,7 +11,7 @@
356 # Dir::Cache "var/apt/cache/";
357 # - Set apt package cache directory
358 #
359-# Dir::Cache::Archive "archives/";
360+# Dir::Cache::Archives "archives/";
361 # - Set package archive directory
362 #
363 # APT::Periodic::Enable "1";
364@@ -147,21 +147,14 @@
365 eval $(apt-config shell MaxSize APT::Archives::MaxSize)
366 eval $(apt-config shell MaxSize APT::Periodic::MaxSize)
367
368- CacheDir="var/cache/apt/"
369- eval $(apt-config shell CacheDir Dir::Cache)
370- CacheDir=${CacheDir%/}
371-
372- CacheArchive="archives/"
373- eval $(apt-config shell CacheArchive Dir::Cache::archives)
374- CacheArchive=${CacheArchive%/}
375+ Cache="/var/cache/apt/archives/"
376+ eval $(apt-config shell Cache Dir::Cache::archives/d)
377
378 # sanity check
379- if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then
380- echo "empty Dir::Cache or Dir::Cache::archives, exiting"
381+ if [ -z "$Cache" ]; then
382+ echo "empty Dir::Cache::archives, exiting"
383 exit
384 fi
385-
386- Cache="${Dir%/}/${CacheDir%/}/${CacheArchive%/}/"
387
388 # check age
389 if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then
390@@ -225,22 +218,17 @@
391 fi
392
393 # Set default values and normalize
394- Dir="/"
395- eval $(apt-config shell Dir Dir)
396- Dir=${Dir%/}
397-
398- CacheDir="var/cache/apt/"
399- eval $(apt-config shell CacheDir Dir::Cache)
400+ CacheDir="/var/cache/apt"
401+ eval $(apt-config shell CacheDir Dir::Cache/d)
402 CacheDir=${CacheDir%/}
403 if [ -z "$CacheDir" ]; then
404 debug_echo "practically empty Dir::Cache, exiting"
405 return 0
406 fi
407
408- CacheArchive="archives/"
409- eval $(apt-config shell CacheArchive Dir::Cache::Archives)
410- CacheArchive=${CacheArchive%/}
411- if [ -z "$CacheArchive" ]; then
412+ Cache="${CacheDir}/archives/"
413+ eval $(apt-config shell Cache Dir::Cache::Archives/d)
414+ if [ -z "$Cache" ]; then
415 debug_echo "practically empty Dir::Cache::archives, exiting"
416 return 0
417 fi
418@@ -251,16 +239,15 @@
419 BackupLevel=2 ;
420 fi
421
422- CacheBackup="backup/"
423- eval $(apt-config shell CacheBackup Dir::Cache::Backup)
424- CacheBackup=${CacheBackup%/}
425- if [ -z "$CacheBackup" ]; then
426+ Back="${CacheDir}/backup/"
427+ eval $(apt-config shell Back Dir::Cache::Backup/d)
428+ if [ -z "$Back" ]; then
429 echo "practically empty Dir::Cache::Backup, exiting" 1>&2
430 return
431 fi
432
433- Cache="${Dir}/${CacheDir}/${CacheArchive}/"
434- Back="${Dir}/${CacheDir}/${CacheBackup}/"
435+ CacheArchive="$(basename "${Cache}")"
436+ test -n "${CacheArchive}" || CacheArchive="archives"
437 BackX="${Back}${CacheArchive}/"
438 for x in $(seq 0 1 $((${BackupLevel}-1))); do
439 eval "Back${x}=${Back}${x}/"
440
441=== modified file 'debian/changelog'
442--- debian/changelog 2010-10-05 12:26:00 +0000
443+++ debian/changelog 2010-10-13 18:37:00 +0000
444@@ -1,3 +1,4 @@
445+<<<<<<< TREE
446 apt (0.8.3ubuntu7) maverick; urgency=low
447
448 [ David Kalnischkies ]
449@@ -129,6 +130,159 @@
450 -- Michael Vogt <mvo@debian.org> Mon, 06 Sep 2010 18:10:06 +0200
451
452 apt (0.8.1) unstable; urgency=low
453+=======
454+apt (0.8.7) UNRELEASED; urgency=low
455+
456+ [ Manpages translations ]
457+ * Typo fixed in French (extra "Z"). Thanks to Florentin Duneau.
458+ * Another typo fixed in French ("Anfin"). Thanks to bubulle
459+ * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog
460+ Closes: #599265
461+
462+ [ Michael Vogt ]
463+ * debian/apt.cron.daily:
464+ - source /etc/default/locale (if available) so that the
465+ apt-get update cron job fetches the right translated package
466+ descriptions
467+ * fix test failure on amd64
468+ * apt-pkg/deb/debsystem.cc:
469+ - fix issues with dir::state::status and dir::state::extended_states
470+ when alternative rootdirs are used
471+
472+ [ Martin Pitt ]
473+ * apt-pkg/deb/debindexfile.cc:
474+ - Use FileFd::Size() instead of stat()ing the sources/binary/translations
475+ indexes directly, so that we have transparent handling of gzipped
476+ indexes.
477+ * apt-pkg/contrib/fileutl.cc:
478+ - Fix FileFd::Size() for gzipped files to give the size of the
479+ uncompressed data. This fixes cache building progress going way
480+ over 100%.
481+
482+ -- Christian Perrier <bubulle@debian.org> Tue, 05 Oct 2010 05:35:58 +0200
483+
484+apt (0.8.6) unstable; urgency=low
485+
486+ [ Programs translations ]
487+ * Vietnamese update by Clytie Siddall (Closes: #598489)
488+ * Asturian update by Maacub (Closes: #599057)
489+
490+ [ David Kalnischkies ]
491+ * cmdline/apt-cache.cc:
492+ - use the TranslatedDescription for searching and not the first
493+ available one as it is maybe not an expected language (Closes: #597925)
494+ * apt-pkg/contrib/strutl.cc:
495+ - add a space between number and unit as required by SI (Closes: #598352)
496+ * apt-pkg/depcache.cc:
497+ - do not check endpointer packages instead of only those which prevented
498+ NeverAutoRemove settings from having an effect (Closes: #598452)
499+ - do not remove packages which the user requested for installation
500+ explicitly while satisfying other install requests (Closes: #598669)
501+ * apt-pkg/packagemanager.cc:
502+ - Add a space between period and 'Please' and unfuzzy all translations
503+ * doc/po/de.po:
504+ - remove the duplicated "angefertigt" in translation-holder string
505+
506+ -- Michael Vogt <mvo@debian.org> Mon, 04 Oct 2010 11:52:19 +0200
507+
508+apt (0.8.5) unstable; urgency=low
509+
510+ [ Manpages translations ]
511+ * German (Chris Leick). Closes: #597163
512+
513+ [ Michael Vogt ]
514+ * merged lp:~mvo/apt/conflicts-on-virtuals to better deal with
515+ conflicts/breaks against virtual packages (LP: #614993)
516+
517+ [ David Kalnischkies ]
518+ * apt-pkg/policy.cc:
519+ - support 100-pinning in Release file with ButAutomaticUpgrades
520+ as requested by the backports crew (Closes: #596097)
521+ * apt-pkg/deb/deblistparser.cc:
522+ - overrule NotAutomatic in case of ButAutomaticUpgrades
523+ * debian/apt.cron.daily:
524+ - handle absolut directory paths correctly by loading directories
525+ directly instead of building the paths on our own (Closes: #596421)
526+ * debian/control:
527+ - build-depend on docbook-xml to ensure that the xml DTDs are always
528+ available on the buildds (Closes: #597145)
529+ * buildlib/debiandoc.mak, buildlib/po4a_manpage.mak:
530+ - ensure that the build fails if documentation building fails
531+ * doc/po/fr.po:
532+ - correct two syntax issues to ensure we can build fine
533+
534+ -- Michael Vogt <mvo@debian.org> Fri, 17 Sep 2010 22:05:06 +0200
535+
536+apt (0.8.4) unstable; urgency=low
537+
538+ [ Michael vogt ]
539+ * ftparchive/writer.cc:
540+ - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
541+ available LP: #633967. Thanks to Colin Watson
542+ * apt-pkg/contrib/cdromutl.cc:
543+ - if apt-cdrom is used on writable media (like usb-sticks), do
544+ not use the root directory to identify the medium (as all
545+ changes there change the ident id). Use the .disk directory
546+ instead
547+
548+ [ David Kalnischkies ]
549+ * ftparchive/writer.cc:
550+ - null the valid string instead of the date if Valid-Until is not set
551+ * apt-pkg/acquire-item.cc:
552+ - use also unsigned Release files again (Closes: #596189)
553+
554+ [ Christian Perrier ]
555+ * Fix missing space after dot in a message from apt-pkg
556+ Translations unfuzzied. Thanks to Holger Wansing.
557+
558+ -- Michael Vogt <mvo@debian.org> Fri, 10 Sep 2010 20:45:15 +0200
559+
560+apt (0.8.3) unstable; urgency=low
561+
562+ [ Programs translations ]
563+ * German (Holger Wansing). Closes: #596141
564+
565+ [ Manpages translations ]
566+ * Japanese (KURASAWA Nozomu). Closes: #595862
567+
568+ [ Michael Vogt ]
569+ * apt-pkg/indexcopy.cc:
570+ - only use trusted.gpg.d directory if it exists
571+ - do not replace /dev/null when running in APT::CDROM::NoAct
572+ mode (LP: #612666), thanks to Colin Watson
573+
574+ [ David Kalnischkies ]
575+ * ftparchive/apt-ftparchive.cc:
576+ - ensure that BinDirectory as well as Tree settings get
577+ the correct default FileMode setting (Closes: #595922)
578+
579+ -- Michael Vogt <mvo@debian.org> Tue, 07 Sep 2010 15:28:41 +0200
580+
581+apt (0.8.2) unstable; urgency=low
582+
583+ [ Manpages translations ]
584+ * Spanish (Omar Campagne). Closes: #595557
585+
586+ [ David Kalnischkies ]
587+ * apt-pkg/versionmatch.cc:
588+ - do not accept 'Pin: origin "' (missing closing ") as a valid
589+ way to pin a local archive: either "" or none…
590+ * apt-pkg/deb/dpkgpm.cc:
591+ - create Dir::Log if needed to support /var/log as tmpfs or similar,
592+ inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
593+ * apt-pkg/indexcopy.cc:
594+ - support really still the APT::GPGV::TrustedKeyring setting,
595+ as it breaks d-i badly otherwise (Closes: #595428)
596+ * cmdline/apt-key:
597+ - support also Dir::Etc::Trusted so that apt-key works in the same
598+ way as the library part which works with the trusted files
599+ * methods/{gzip,bzip2}.cc:
600+ - empty files can never be valid archives (Closes: #595691)
601+
602+ -- Michael Vogt <mvo@debian.org> Mon, 06 Sep 2010 18:10:06 +0200
603+
604+apt (0.8.1) unstable; urgency=low
605+>>>>>>> MERGE-SOURCE
606
607 [ Programs translations ]
608 * Thai (Theppitak Karoonboonyanan). Closes: #592695
609@@ -174,6 +328,7 @@
610 which means "" are optional and pinning a local archive does
611 work - even if it is a non-flat archive (Closes: #594435)
612
613+<<<<<<< TREE
614 -- Michael Vogt <mvo@debian.org> Fri, 03 Sep 2010 18:36:11 +0200
615
616 apt (0.8.0ubuntu3) maverick; urgency=low
617@@ -238,6 +393,9 @@
618 * merged from debian/unstable
619
620 -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 24 Aug 2010 21:39:06 +0200
621+=======
622+ -- Michael Vogt <mvo@debian.org> Fri, 03 Sep 2010 18:36:11 +0200
623+>>>>>>> MERGE-SOURCE
624
625 apt (0.8.0) unstable; urgency=low
626
627
628=== modified file 'debian/control'
629--- debian/control 2010-08-11 07:14:02 +0000
630+++ debian/control 2010-10-13 18:37:00 +0000
631@@ -7,7 +7,7 @@
632 Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
633 Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
634 Standards-Version: 3.9.0
635-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
636+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
637 Build-Conflicts: autoconf2.13, automake1.4
638 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
639
640
641=== modified file 'doc/examples/configure-index'
642--- doc/examples/configure-index 2010-07-09 15:00:28 +0000
643+++ doc/examples/configure-index 2010-10-13 18:37:00 +0000
644@@ -433,6 +433,7 @@
645 Acquire::Http "false"; // Show http command traffic
646 Acquire::Https "false"; // Show https debug
647 Acquire::gpgv "false"; // Show the gpgv traffic
648+ Acquire::cdrom "false"; // Show cdrom debug output
649 aptcdrom "false"; // Show found package files
650 IdentCdrom "false";
651 acquire::netrc "false"; // netrc parser
652
653=== modified file 'doc/po/de.po'
654--- doc/po/de.po 2010-07-30 10:48:15 +0000
655+++ doc/po/de.po 2010-10-13 18:37:00 +0000
656@@ -1,14 +1,14 @@
657 # Translation of apt-doc to German
658 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
659 # This file is distributed under the same license as the apt-doc package.
660-# Chris Leick <c.leick@vollbio.de>, 2009.
661+# Chris Leick <c.leick@vollbio.de>, 2009, 2010.
662 #
663 msgid ""
664 msgstr ""
665-"Project-Id-Version: apt-doc 0.7.24\n"
666+"Project-Id-Version: apt-doc 0.7.25.3\n"
667 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
668 "POT-Creation-Date: 2010-07-30 12:46+0300\n"
669-"PO-Revision-Date: 2010-04-21 14:04+0200\n"
670+"PO-Revision-Date: 2010-09-16 19:04+0100\n"
671 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
672 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
673 "Language: de\n"
674@@ -791,17 +791,7 @@
675
676 #. type: Plain text
677 #: apt.ent:264
678-#, fuzzy, no-wrap
679-#| msgid ""
680-#| " <varlistentry>\n"
681-#| " <term><option>-c</option></term>\n"
682-#| " <term><option>--config-file</option></term>\n"
683-#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
684-#| " The program will read the default configuration file and then this \n"
685-#| " configuration file. See &apt-conf; for syntax information. \n"
686-#| " </para>\n"
687-#| " </listitem>\n"
688-#| " </varlistentry>\n"
689+#, no-wrap
690 msgid ""
691 " <varlistentry>\n"
692 " <term><option>-c</option></term>\n"
693@@ -820,7 +810,10 @@
694 " <term><option>--config-file</option></term>\n"
695 " <listitem><para>Konfigurationsdatei; Gibt eine Konfigurationssdatei zum Benutzen an.\n"
696 " Das Programm wird die Vorgabe-Konfigurationsdatei und dann diese\n"
697-" Konfigurationsdatei lesen. Lesen Sie &apt-conf;, um Syntax-Informationen zu erhalten \n"
698+" Konfigurationsdatei lesen. Falls Konfigurationseinstellungen vor der\n"
699+" Vorgabe-Konfiguration ausgewertet werden müssen, geben Sie eine Datei\n"
700+" der Umgebungsvariable <envar>APT_CONFIG</envar> an\n"
701+" Lesen Sie &apt-conf;, um Syntax-Informationen zu erhalten \n"
702 " </para>\n"
703 " </listitem>\n"
704 " </varlistentry>\n"
705@@ -1050,13 +1043,7 @@
706
707 #. type: Plain text
708 #: apt.ent:358
709-#, fuzzy, no-wrap
710-#| msgid ""
711-#| "<!ENTITY file-sourceslist \"\n"
712-#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
713-#| " <listitem><para>Locations to fetch packages from.\n"
714-#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
715-#| " </varlistentry>\n"
716+#, no-wrap
717 msgid ""
718 "<!ENTITY file-trustedgpg \"\n"
719 " <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
720@@ -1064,21 +1051,16 @@
721 " Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
722 " </varlistentry>\n"
723 msgstr ""
724-"<!ENTITY file-sourceslist \"\n"
725-" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
726-" <listitem><para>Orte, von denen Pakete geladen werden.\n"
727-" Konfigurationselement: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
728+"<!ENTITY file-trustedgpg \"\n"
729+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
730+" <listitem><para>Schlüsselbund lokaler vertrauenswürdiger Schlüssel,\n"
731+" neue Schlüssel werden hier hinzugefügt.\n"
732+" Konfigurationselement: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
733 " </varlistentry>\n"
734
735 #. type: Plain text
736 #: apt.ent:365
737-#, fuzzy, no-wrap
738-#| msgid ""
739-#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
740-#| " <listitem><para>File fragments for locations to fetch packages from.\n"
741-#| " Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
742-#| " </varlistentry>\n"
743-#| "\">\n"
744+#, no-wrap
745 msgid ""
746 " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
747 " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
748@@ -1087,21 +1069,17 @@
749 " </varlistentry>\n"
750 "\">\n"
751 msgstr ""
752-" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
753-" <listitem><para>Dateifragmente für Orte, von denen Pakete geladen werden.\n"
754-" Konfigurationselement: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
755+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
756+" <listitem><para>Dateifragmente für vertrauenswürdige Schlüssel, zusätzliche\n"
757+" Schlüsselbunde können hier (von anderen Paketen oder dem Administrator)\n"
758+" gespeichert werden.\n"
759+" Konfigurationselement: <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
760 " </varlistentry>\n"
761 "\">\n"
762
763 #. type: Plain text
764 #: apt.ent:373
765-#, fuzzy, no-wrap
766-#| msgid ""
767-#| "<!ENTITY file-sourceslist \"\n"
768-#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
769-#| " <listitem><para>Locations to fetch packages from.\n"
770-#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
771-#| " </varlistentry>\n"
772+#, no-wrap
773 msgid ""
774 "<!ENTITY file-extended_states \"\n"
775 " <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
776@@ -1111,11 +1089,13 @@
777 " </varlistentry>\n"
778 "\">\n"
779 msgstr ""
780-"<!ENTITY file-sourceslist \"\n"
781-" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
782-" <listitem><para>Orte, von denen Pakete geladen werden.\n"
783-" Konfigurationselement: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
784-" </varlistentry>\n"
785+"<!ENTITY file-extended_states \"\n"
786+" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
787+" <listitem><para>Statusliste automatisch installierter Pakete.\n"
788+" Konfigurationselement: <literal>Dir::State::extended_states</literal>.\n"
789+" </para></listitem>\n"
790+" </varlistentry>\n"
791+"\">\n"
792
793 #. type: Plain text
794 #: apt.ent:377
795@@ -1140,8 +1120,10 @@
796 "\">\n"
797 msgstr ""
798 "<!ENTITY translation-holder \"\n"
799-" Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt\n"
800-" in Zusammenarbeit mit dem Deutschen l10n-Team von Debian <email>debian-l10n-german@lists.debian.org</email>.\n"
801+" Die deutsche Übersetzung wurde 2009 von Chris Leick\n"
802+" <email>c.leick@vollbio.de</email> in Zusammenarbeit mit dem\n"
803+" deutschen l10n-Team von Debian\n"
804+" <email>debian-l10n-german@lists.debian.org</email> angefertigt.\n"
805 "\">\n"
806
807 #. type: Plain text
808@@ -1159,6 +1141,11 @@
809 " translation is lagging behind the original content.\n"
810 "\">\n"
811 msgstr ""
812+"<!ENTITY translation-english \"\n"
813+" Beachten Sie, dass diese Übersetzung Teile enthalten kann, die nicht\n"
814+" übersetzt wurden. Dies ist so, damit kein Inhalt verloren geht, wenn\n"
815+" die Übersetzung hinter dem Originalinhalt hinterherhängt.\n"
816+"\">\n"
817
818 #. type: Plain text
819 #: apt.ent:400
820@@ -1166,6 +1153,8 @@
821 "<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
822 "ENTITY testing-codename \"squeeze\">"
823 msgstr ""
824+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
825+"ENTITY testing-codename \"squeeze\">"
826
827 #. The last update date
828 #. type: Content of: <refentry><refentryinfo>
829@@ -1888,67 +1877,47 @@
830
831 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
832 #: apt-cache.8.xml:312
833-#, fuzzy
834-#| msgid "<option>--no-upgrade</option>"
835 msgid "<option>--no-pre-depends</option>"
836-msgstr "<option>--no-upgrade</option>"
837+msgstr "<option>--no-pre-depends</option>"
838
839 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
840 #: apt-cache.8.xml:313
841-#, fuzzy
842-#| msgid "<option>--no-download</option>"
843 msgid "<option>--no-depends</option>"
844-msgstr "<option>--no-download</option>"
845+msgstr "<option>--no-depends</option>"
846
847 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
848 #: apt-cache.8.xml:314
849-#, fuzzy
850-#| msgid "<option>--install-recommends</option>"
851 msgid "<option>--no-recommends</option>"
852-msgstr "<option>--install-recommends</option>"
853+msgstr "<option>--no-recommends</option>"
854
855 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
856 #: apt-cache.8.xml:315
857-#, fuzzy
858-#| msgid "<option>--no-upgrade</option>"
859 msgid "<option>--no-suggests</option>"
860-msgstr "<option>--no-upgrade</option>"
861+msgstr "<option>--no-suggests</option>"
862
863 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
864 #: apt-cache.8.xml:316
865-#, fuzzy
866-#| msgid "<option>--no-mount</option>"
867 msgid "<option>--no-conflicts</option>"
868-msgstr "<option>--no-mount</option>"
869+msgstr "<option>--no-conflicts</option>"
870
871 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
872 #: apt-cache.8.xml:317
873-#, fuzzy
874-#| msgid "<option>--no-act</option>"
875 msgid "<option>--no-breaks</option>"
876-msgstr "<option>--no-act</option>"
877+msgstr "<option>--no-breaks</option>"
878
879 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
880 #: apt-cache.8.xml:318
881-#, fuzzy
882-#| msgid "<option>--no-act</option>"
883 msgid "<option>--no-replaces</option>"
884-msgstr "<option>--no-act</option>"
885+msgstr "<option>--no-replaces</option>"
886
887 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
888 #: apt-cache.8.xml:319
889-#, fuzzy
890-#| msgid "<option>--no-act</option>"
891 msgid "<option>--no-enhances</option>"
892-msgstr "<option>--no-act</option>"
893+msgstr "<option>--no-enhances</option>"
894
895 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
896 #: apt-cache.8.xml:320
897-#, fuzzy
898-#| msgid ""
899-#| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
900-#| "so that all packages mentioned are printed once. Configuration Item: "
901-#| "<literal>APT::Cache::RecurseDepends</literal>."
902+# FIXME s/twicked/tricked/
903 msgid ""
904 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
905 "print all dependencies. This can be twicked with these flags which will omit "
906@@ -1956,9 +1925,11 @@
907 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
908 "Cache::ShowRecommends</literal>."
909 msgstr ""
910-"Macht <literal>depends</literal> und <literal>rdepends</literal> rekursiv, "
911-"so dass alle erwähnten Pakete einmal ausgegeben werden. "
912-"Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
913+"Standardmäßig geben <literal>depends</literal> und <literal>rdepends</literal> "
914+"alle Abhängigkeiten aus. Dies kann mit diesen Schaltern überlistet werden, "
915+"die den angegebenen Abhängigkeitstyp weglassen. Konfigurationselement: "
916+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
917+"z.B. <literal>APT::Cache::ShowRecommends</literal>."
918
919 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
920 #: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
921@@ -2209,13 +2180,6 @@
922
923 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
924 #: apt-cdrom.8.xml:66
925-#, fuzzy
926-#| msgid ""
927-#| "<literal>add</literal> is used to add a new disc to the source list. It "
928-#| "will unmount the CDROM device, prompt for a disk to be inserted and then "
929-#| "procceed to scan it and copy the index files. If the disc does not have a "
930-#| "proper <filename>disk</filename> directory you will be prompted for a "
931-#| "descriptive title."
932 msgid ""
933 "<literal>add</literal> is used to add a new disc to the source list. It will "
934 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
935@@ -2645,27 +2609,6 @@
936
937 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
938 #: apt-ftparchive.1.xml:36
939-#, fuzzy
940-#| msgid ""
941-#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
942-#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
943-#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
944-#| "arg> <arg><option>-o <replaceable>config</"
945-#| "replaceable>=<replaceable>string</replaceable></option></arg> "
946-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
947-#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
948-#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
949-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
950-#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
951-#| "replaceable></arg><arg><replaceable>override</"
952-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
953-#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
954-#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
955-#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
956-#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
957-#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
958-#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
959-#| "group>"
960 msgid ""
961 "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
962 "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
963@@ -2689,22 +2632,22 @@
964 "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
965 "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
966 "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
967-"arg> <arg><option>-o=<replaceable>Konfiguration</"
968-"replaceable>=<replaceable>Zeichenkette</replaceable></option></arg> "
969-"<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
970-"choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
971-"\"><replaceable>Pfad</replaceable></arg><arg><replaceable>überschreiben</"
972-"replaceable><arg><replaceable>Pfadvorsilbe</replaceable></arg></arg></arg> "
973-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</"
974-"replaceable></arg><arg><replaceable>überschreiben</"
975-"replaceable><arg><replaceable>Pfadvorsilbe</replaceable></arg></arg></arg> "
976-"<arg>contents <arg choice=\"plain\"><replaceable>Pfad</replaceable></arg></"
977-"arg><arg>release <arg choice=\"plain\"><replaceable>Pfad</replaceable></"
978-"arg></arg> <arg>generate <arg choice=\"plain"
979-"\"><replaceable>Konfigurationsdatei</replaceable></arg><arg choice=\"plain\" "
980+"arg> <arg><option>--arch <replaceable>Architektur</replaceable></option></"
981+"arg> <arg><option>-o <replaceable>Konfiguration</replaceable>=<replaceable>"
982+"Zeichenkette</replaceable></option></arg> <arg><option>-c=<replaceable>Datei"
983+"</replaceable></option></arg> <group choice=\"req\"> <arg>packages<arg "
984+"choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</replaceable></arg><arg>"
985+"<replaceable>überschreiben</replaceable><arg><replaceable>Pfad-Präfix"
986+"</replaceable></arg></arg></arg> <arg>sources<arg choice=\"plain\" "
987+"rep=\"repeat\"><replaceable>Pfad</replaceable></arg><arg><replaceable>"
988+"überschreiben</replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg>"
989+"</arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>Pfad"
990+"</replaceable></arg></arg> <arg>release <arg choice=\"plain\"><replaceable>"
991+"Pfad</replaceable></arg></arg> <arg>generate <arg choice=\"plain\">"
992+"<replaceable>Konfigurationsdatei</replaceable></arg> <arg choice=\"plain\" "
993 "rep=\"repeat\"><replaceable>Abschnitt</replaceable></arg></arg> <arg>clean "
994-"<arg choice=\"plain\"><replaceable>Konfigurationsdatei</replaceable></arg></"
995-"arg></group>"
996+"<arg choice=\"plain\"><replaceable>Konfigurationsdatei</replaceable></arg>"
997+"</arg> </group>"
998
999 #. type: Content of: <refentry><refsect1><para>
1000 #: apt-ftparchive.1.xml:57
1001@@ -2845,21 +2788,11 @@
1002 "Der <literal>release</literal>-Befehl generiert eine Release-Datei aus einem "
1003 "Verzeichnisbaum. Er durchsucht das vorgegebene Verzeichnis rekursiv nach "
1004 "Packages-, Packages.gz-, Packages.bz2-, Sources-, Sources.gz-, Sources.bz2-, "
1005-"Release- und md5sum.txt-Dateien. Dann schreibt es eine Releasedatei nach "
1006+"Release- und md5sum.txt-Dateien. Dann schreibt es eine Release-Datei nach "
1007 "stdout, die einen MD5- und SHA1-Hash für jede Datei enthält."
1008
1009 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1010 #: apt-ftparchive.1.xml:119
1011-#, fuzzy
1012-#| msgid ""
1013-#| "Values for the additional metadata fields in the Release file are taken "
1014-#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
1015-#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
1016-#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
1017-#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
1018-#| "<literal>Codename</literal>, <literal>Date</literal>, "
1019-#| "<literal>Architectures</literal>, <literal>Components</literal>, "
1020-#| "<literal>Description</literal>."
1021 msgid ""
1022 "Values for the additional metadata fields in the Release file are taken from "
1023 "the corresponding variables under <literal>APT::FTPArchive::Release</"
1024@@ -2875,8 +2808,8 @@
1025 "entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die "
1026 "unterstützten Felder sind: <literal>Origin</literal>, <literal>Label</"
1027 "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
1028-"<literal>Codename</literal>, <literal>Date</literal>, "
1029-"<literal>Architectures</literal>, <literal>Components</literal>, "
1030+"<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-Until"
1031+"</literal>, <literal>Architectures</literal>, <literal>Components</literal>, "
1032 "<literal>Description</literal>."
1033
1034 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1035@@ -3044,10 +2977,11 @@
1036 "compression), 'gzip' and 'bzip2'. The default for all compression schemes is "
1037 "'. gzip'."
1038 msgstr ""
1039-"Setzt das Vorgabe-Kompressionsschema, das für die Paketindexdateien benutzt "
1040-"wird. Es ist eine Zeichenkette, die eine durch Leerzeichen getrennte Liste "
1041-"mit mindestens einem der folgenden Dinge enthält: ».« (keine Kompression), "
1042-"»gzip« und »bzip2«. Die Vorgabe für alle Kompressionsschemata ist ». gzip«."
1043+"Setzt das Vorgabe-Kompressionsschema, das für die Package-Indexdateien "
1044+"benutzt wird. Es ist eine Zeichenkette, die eine durch Leerzeichen getrennte "
1045+"Liste mit mindestens einem der folgenden Dinge enthält: ».« (keine "
1046+"Kompression), »gzip« und »bzip2«. Die Vorgabe für alle Kompressionsschemata "
1047+"ist ». gzip«."
1048
1049 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1050 #: apt-ftparchive.1.xml:205
1051@@ -3107,23 +3041,17 @@
1052
1053 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1054 #: apt-ftparchive.1.xml:229
1055-#, fuzzy
1056-#| msgid "Contents::Compress"
1057 msgid "Translation::Compress"
1058-msgstr "Contents::Compress"
1059+msgstr "Translation::Compress"
1060
1061 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1062 #: apt-ftparchive.1.xml:231
1063-#, fuzzy
1064-#| msgid ""
1065-#| "This is similar to <literal>Packages::Compress</literal> except that it "
1066-#| "controls the compression for the Contents files."
1067 msgid ""
1068 "This is similar to <literal>Packages::Compress</literal> except that it "
1069 "controls the compression for the Translation-en master file."
1070 msgstr ""
1071 "Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
1072-"Kompression der Inhaltsdateien steuert."
1073+"Kompression der Translation-en-Hauptdatei steuert."
1074
1075 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1076 #: apt-ftparchive.1.xml:235
1077@@ -3157,10 +3085,8 @@
1078
1079 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1080 #: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
1081-#, fuzzy
1082-#| msgid "Description"
1083 msgid "LongDescription"
1084-msgstr "Beschreibung"
1085+msgstr "LongDescription"
1086
1087 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1088 #: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
1089@@ -3168,6 +3094,8 @@
1090 "Sets if long descriptions should be included in the Packages file or split "
1091 "out into a master Translation-en file."
1092 msgstr ""
1093+"Gesetzt, falls lange Beschreibungen in die Package-Datei eingeschlossen werden "
1094+"oder in eine Translation-en-Hauptdatei unterteilt werden sollen."
1095
1096 #. type: Content of: <refentry><refsect1><refsect2><title>
1097 #: apt-ftparchive.1.xml:257
1098@@ -3273,23 +3201,17 @@
1099
1100 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1101 #: apt-ftparchive.1.xml:302
1102-#, fuzzy
1103-#| msgid ""
1104-#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
1105-#| "source/Sources</filename>"
1106 msgid ""
1107 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
1108 "source/Sources</filename>"
1109 msgstr ""
1110-"Setzt die Ausgabe-Packages-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
1111+"Setzt die Ausgabe-Quelldatei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
1112 "source/Sources</filename>"
1113
1114 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1115 #: apt-ftparchive.1.xml:306
1116-#, fuzzy
1117-#| msgid "Operation"
1118 msgid "Translation"
1119-msgstr "Betrieb"
1120+msgstr "Übersetzung"
1121
1122 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
1123 #: apt-ftparchive.1.xml:308
1124@@ -3298,6 +3220,9 @@
1125 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
1126 "$(SECTION)/i18n/Translation-en</filename>"
1127 msgstr ""
1128+"Setzt die Ausgabe der Translation-en-Hauptdatei mit den langen Beschreibungen "
1129+"falls Sie nicht in der Packages-Datei enthalten sind. Vorgabe ist "
1130+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
1131
1132 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1133 #: apt-ftparchive.1.xml:313
1134@@ -3330,7 +3255,7 @@
1135 msgstr ""
1136 "Setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/Contents-"
1137 "$(ARCH)</filename>. Wenn diese Einstellung bewirkt, dass mehrere "
1138-"Paketdateien auf einer einzelnen Inhaltsdatei abgebildet werden (so wie es "
1139+"Packages-Dateien auf einer einzelnen Inhaltsdatei abgebildet werden (so wie es "
1140 "Vorgabe ist), dann wird <command>apt-ftparchive</command> diese Dateien "
1141 "automatisch integrieren."
1142
1143@@ -3414,12 +3339,6 @@
1144
1145 #. type: Content of: <refentry><refsect1><refsect2><para>
1146 #: apt-ftparchive.1.xml:364
1147-#, fuzzy
1148-#| msgid ""
1149-#| "The <literal>Tree</literal> section takes a scope tag which sets the "
1150-#| "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
1151-#| "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a "
1152-#| "setting such as <filename>dists/woody</filename>."
1153 msgid ""
1154 "The <literal>Tree</literal> section takes a scope tag which sets the "
1155 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
1156@@ -3429,8 +3348,8 @@
1157 "Der <literal>Tree</literal>-Abschnitt nimmt eine scope-Markierung, die die "
1158 "<literal>$(DIST)</literal>-Variable setzt und die Wurzel des Baumes "
1159 "definiert (der Pfad hat den Präfix von <literal>ArchiveDir</literal>). "
1160-"Typischerweise ist dies eine Einstellung wie <filename>dists/woody</"
1161-"filename>."
1162+"Typischerweise ist dies eine Einstellung wie <filename>dists/&stable-codename;"
1163+"</filename>."
1164
1165 #. type: Content of: <refentry><refsect1><refsect2><para>
1166 #: apt-ftparchive.1.xml:369
1167@@ -3445,27 +3364,20 @@
1168
1169 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
1170 #: apt-ftparchive.1.xml:375
1171-#, fuzzy, no-wrap
1172-#| msgid ""
1173-#| "for i in Sections do \n"
1174-#| " for j in Architectures do\n"
1175-#| " Generate for DIST=scope SECTION=i ARCH=j\n"
1176+#, no-wrap
1177 msgid ""
1178 "for i in Sections do \n"
1179 " for j in Architectures do\n"
1180 " Generate for DIST=scope SECTION=i ARCH=j\n"
1181 " "
1182 msgstr ""
1183-"for i in Abschnitte do \n"
1184+"for i in Abschnitte do\n"
1185 " for j in Architekturen do\n"
1186 " Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n"
1187+" "
1188
1189 #. type: Content of: <refentry><refsect1><refsect2><para>
1190 #: apt-ftparchive.1.xml:372
1191-#, fuzzy
1192-#| msgid ""
1193-#| "When processing a <literal>Tree</literal> section <command>apt-"
1194-#| "ftparchive</command> performs an operation similar to:"
1195 msgid ""
1196 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
1197 "command> performs an operation similar to: <placeholder type=\"programlisting"
1198@@ -3473,6 +3385,7 @@
1199 msgstr ""
1200 "Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, führt "
1201 "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
1202+"<placeholder type=\"programlisting\" id=\"0\"/>"
1203
1204 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
1205 #: apt-ftparchive.1.xml:381
1206@@ -3827,37 +3740,27 @@
1207
1208 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1209 #: apt-ftparchive.1.xml:574
1210-#, fuzzy
1211-#| msgid "<option>-a</option>"
1212 msgid "<option>--arch</option>"
1213-msgstr "<option>-a</option>"
1214+msgstr "<option>--arch</option>"
1215
1216 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1217 #: apt-ftparchive.1.xml:575
1218-#, fuzzy
1219-#| msgid ""
1220-#| "If the command is either <literal>install</literal> or <literal>remove</"
1221-#| "literal>, then this option acts like running <literal>autoremove</"
1222-#| "literal> command, removing the unused dependency packages. Configuration "
1223-#| "Item: <literal>APT::Get::AutomaticRemove</literal>."
1224 msgid ""
1225 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
1226 "commands only package files matching <literal>*_arch.deb</literal> or "
1227 "<literal>*_all.deb</literal> instead of all package files in the given "
1228 "path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
1229 msgstr ""
1230-"Wenn der Befehl entweder <literal>install</literal> oder <literal>remove</"
1231-"literal> lautet, dann bewirkt diese Option wie das Ausführen des "
1232-"<literal>autoremove</literal>-Befehls das Entfernen der nicht benutzten "
1233-"Abhhängigkeitspakete. Konfigurationselement: <literal>APT::Get::"
1234-"AutomaticRemove</literal>."
1235+"In den Befehlen <literal>packages</literal> und <literal>contents</literal> "
1236+"nur Paketdateien akzeptieren, die auf <literal>*_arch.deb</literal> oder "
1237+"<literal>*_all.deb</literal> passen, anstatt aller Paketdateien im "
1238+"angegebenen Pfad. Konfigurationselement: "
1239+"<literal>APT::FTPArchive::Architecture</literal>."
1240
1241 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1242 #: apt-ftparchive.1.xml:581
1243-#, fuzzy
1244-#| msgid "<option>APT::FTPArchive::LongDescription</option>"
1245 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
1246-msgstr "<option>APT::FTPArchive::LongDescription</option>"
1247+msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
1248
1249 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1250 #: apt-ftparchive.1.xml:583
1251@@ -3872,6 +3775,16 @@
1252 "theory nobody will have these problems and therefore all these extra checks "
1253 "are useless."
1254 msgstr ""
1255+"&apt-ftparchive; speichert so viele Metadaten wie möglich in einer "
1256+"Zwischenspeicherdatenbank. Falls Pakete neu kompiliert und/oder neu mit der "
1257+"gleichen Version veröffentlicht werden, führt dies zu Problemen, da die nun "
1258+"veralteten zwischengespeicherten Metadaten, wie Größe und Prüfsumme benutzt "
1259+"werden. Mit dieser eingeschalteten Option wird dies nicht weiter vorkommen, "
1260+"da geprüft wird, ob die Datei geändert wurde. Beachten Sie, dass diese Option "
1261+"standardmäßig auf »<literal>false</literal>« gesetzt ist, da es nicht "
1262+"empfohlen wird, mehrere Versionen/Builds eines Pakets mit der gleichen "
1263+"Versionsnummer hochzuladen, so dass theoretisch niemand dieses Probleme haben "
1264+"sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
1265
1266 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1267 #: apt-ftparchive.1.xml:593
1268@@ -3880,13 +3793,6 @@
1269
1270 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1271 #: apt-ftparchive.1.xml:595
1272-#, fuzzy
1273-#| msgid ""
1274-#| "This configuration option defaults to \"<literal>true</literal>\" and "
1275-#| "should only be set to <literal>\"false\"</literal> if the Archive "
1276-#| "generated with &apt-ftparchive; also provides <filename>Translation</"
1277-#| "filename> files. Note that it is currently not possible to create these "
1278-#| "files with <command>apt-ftparchive</command>."
1279 msgid ""
1280 "This configuration option defaults to \"<literal>true</literal>\" and should "
1281 "only be set to <literal>\"false\"</literal> if the Archive generated with "
1282@@ -3897,8 +3803,9 @@
1283 "Diese Konfigurationsoption ist standardmäßig »<literal>true</literal>« und "
1284 "sollte nur auf »<literal>false</literal>« gesetzt werden, wenn das mit &apt-"
1285 "ftparchive; generierte Archiv außerdem <filename>Translation</filename>-"
1286-"Dateien bereitstellt. Beachten Sie, dass es derzeit nicht möglich ist, diese "
1287-"Dateien mit <command>apt-ftparchive</command> zu erstellen."
1288+"Dateien bereitstellt. Beachten Sie, dass die Hauptdatei "
1289+"<filename>Translation-en</filename> nur durch den Befehl »generate« erstellt "
1290+"werden kann."
1291
1292 #. type: Content of: <refentry><refsect1><title>
1293 #: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
1294@@ -3953,41 +3860,6 @@
1295
1296 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
1297 #: apt-get.8.xml:36
1298-#, fuzzy
1299-#| msgid ""
1300-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
1301-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
1302-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
1303-#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
1304-#| "<replaceable>target_release_name</replaceable> </arg> <arg "
1305-#| "choice='plain'> <replaceable>target_release_number_expression</"
1306-#| "replaceable> </arg> <arg choice='plain'> "
1307-#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
1308-#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
1309-#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
1310-#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
1311-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
1312-#| "<group choice='req'> <arg choice='plain'> "
1313-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
1314-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
1315-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
1316-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
1317-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
1318-#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
1319-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
1320-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
1321-#| "<group choice='req'> <arg choice='plain'> "
1322-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
1323-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
1324-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
1325-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
1326-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
1327-#| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
1328-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
1329-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
1330-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
1331-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
1332-#| "help</arg> </group> </arg> </group>"
1333 msgid ""
1334 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
1335 "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
1336@@ -4017,28 +3889,23 @@
1337 "</group> </arg> </group>"
1338 msgstr ""
1339 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
1340-"<option>-o= <replaceable>Konfigurationszeichenkette</replaceable> </option></"
1341-"arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</replaceable> </"
1342-"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
1343-"choice='plain'> <replaceable>Ziel-Release-Name</replaceable> </arg> <arg "
1344-"choice='plain'> <replaceable>numerischer Ziel-Release-Ausdruck</replaceable> "
1345-"</arg> <arg choice='plain'> <replaceable>Ziel-Release-Codename</replaceable> "
1346-"</arg> </group> </arg> <group choice=\"req\"> <arg choice='plain'>update</"
1347-"arg> <arg choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</"
1348-"arg> <arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
1349-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
1350-"choice='req'> <arg choice='plain'> =<replaceable>Paketversionsnummer</"
1351-"replaceable> </arg> <arg choice='plain'> /<replaceable>Ziel-Release-Name</"
1352-"replaceable> </arg> <arg choice='plain'> /<replaceable>Ziel-Release-"
1353-"Codename</replaceable> </arg> </group> </arg> </arg> </arg> <arg "
1354-"choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
1355-"\"><replaceable>Paket</replaceable></arg></arg> <arg choice='plain'>purge "
1356-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></"
1357-"arg> <arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
1358+"<option>-o= <replaceable>Konfigurationszeichenkette</replaceable> </option> "
1359+"</arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</replaceable> "
1360+"</option> </arg> <arg> <option>-t=</option> <arg choice='plain'> <replaceable>"
1361+"Ziel-Release</replaceable> </arg> </arg> <group choice=\"req\"> <arg "
1362+"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
1363+"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
1364+"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
1365 "\"><replaceable>Paket</replaceable> <arg> <group choice='req'> <arg "
1366-"choice='plain'> =<replaceable>Paketversionsnummer</replaceable> </arg> <arg "
1367-"choice='plain'> /<replaceable>Ziel-Release-Name</replaceable> </arg> <arg "
1368-"choice='plain'> /<replaceable>Ziel-Release-Codename</replaceable> </arg> </"
1369+"choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> <arg "
1370+"choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </group> </"
1371+"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
1372+"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg "
1373+"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
1374+"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
1375+"rep=\"repeat\"><replaceable>Paket</replaceable> <arg> <group choice='req'> "
1376+"<arg choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> "
1377+"<arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </"
1378 "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
1379 "\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg "
1380 "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
1381@@ -4050,12 +3917,6 @@
1382
1383 #. type: Content of: <refentry><refsect1><para>
1384 #: apt-get.8.xml:112
1385-#, fuzzy
1386-#| msgid ""
1387-#| "<command>apt-get</command> is the command-line tool for handling "
1388-#| "packages, and may be considered the user's \"back-end\" to other tools "
1389-#| "using the APT library. Several \"front-end\" interfaces exist, such as "
1390-#| "&dselect;, &aptitude;, &synaptic;, &gnome-apt; and &wajig;."
1391 msgid ""
1392 "<command>apt-get</command> is the command-line tool for handling packages, "
1393 "and may be considered the user's \"back-end\" to other tools using the APT "
1394@@ -4065,8 +3926,7 @@
1395 "<command>apt-get</command> ist ein Befehlszeilenwerkzeug zur Handhabung von "
1396 "Paketen und könnte als »Backend« anderer Werkzeugen betrachtet werden, die "
1397 "die APT-Bibliothek benutzen. Es existieren mehrere "
1398-"Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic;, &gnome-"
1399-"apt; und &wajig;."
1400+"Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic; und &wajig;."
1401
1402 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1403 #: apt-get.8.xml:121 apt-key.8.xml:124
1404@@ -4532,19 +4392,6 @@
1405
1406 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1407 #: apt-get.8.xml:320
1408-#, fuzzy
1409-#| msgid ""
1410-#| "Fix; attempt to correct a system with broken dependencies in place. This "
1411-#| "option, when used with install/remove, can omit any packages to permit "
1412-#| "APT to deduce a likely solution. Any Package that are specified must "
1413-#| "completely correct the problem. The option is sometimes necessary when "
1414-#| "running APT for the first time; APT itself does not allow broken package "
1415-#| "dependencies to exist on a system. It is possible that a system's "
1416-#| "dependency structure can be so corrupt as to require manual intervention "
1417-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
1418-#| "to eliminate some of the offending packages). Use of this option together "
1419-#| "with <option>-m</option> may produce an error in some situations. "
1420-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
1421 msgid ""
1422 "Fix; attempt to correct a system with broken dependencies in place. This "
1423 "option, when used with install/remove, can omit any packages to permit APT "
1424@@ -4561,7 +4408,7 @@
1425 "Beheben; Versucht ein System von vorhandenen beschädigten Abhängigkeiten zu "
1426 "korrigieren. Diese Option kann, wenn sie mit »install«/»remove« benutzt "
1427 "wird, einige Pakete weglassen, um es APT zu erlauben, eine wahrscheinliche "
1428-"Lösung herzuleiten. Jedes Paket, das angegeben ist, muss das Problem "
1429+"Lösung herzuleiten. Falls Pakete angegeben wurden, müssen diese das Problem "
1430 "vollständig korrigieren. Die Option ist manchmal nötig, wenn APT zum ersten "
1431 "Mal ausgeführt wird. APT selbst erlaubt es nicht, dass auf einen System "
1432 "beschädigte Paketabhängigkeiten existieren. Es ist möglich, dass eine "
1433@@ -4842,19 +4689,11 @@
1434
1435 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1436 #: apt-get.8.xml:433
1437-#, fuzzy
1438-#| msgid "<option>--no-upgrade</option>"
1439 msgid "<option>--only-upgrade</option>"
1440-msgstr "<option>--no-upgrade</option>"
1441+msgstr "<option>--only-upgrade</option>"
1442
1443 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1444 #: apt-get.8.xml:434
1445-#, fuzzy
1446-#| msgid ""
1447-#| "Do not upgrade packages; When used in conjunction with <literal>install</"
1448-#| "literal>, <literal>no-upgrade</literal> will prevent packages on the "
1449-#| "command line from being upgraded if they are already installed. "
1450-#| "Configuration Item: <literal>APT::Get::Upgrade</literal>."
1451 msgid ""
1452 "Do not install new packages; When used in conjunction with <literal>install</"
1453 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
1454@@ -4862,9 +4701,9 @@
1455 "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
1456 msgstr ""
1457 "Kein Upgrade von Paketen durchführen; Wenn es zusammen mit <literal>install</"
1458-"literal> benutzt wird, wird <literal>no-upgrade</literal> auf der "
1459+"literal> benutzt wird, wird <literal>only-upgrade</literal> auf der "
1460 "Befehlszeile ein Upgrade von Paketen verhindern, wenn sie bereits "
1461-"installiert sind. Konfigurationselement: <literal>APT::Get::Upgrade</"
1462+"installiert sind. Konfigurationselement: <literal>APT::Get::Only-Upgrade</"
1463 "literal>."
1464
1465 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1466@@ -4921,13 +4760,6 @@
1467
1468 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1469 #: apt-get.8.xml:460
1470-#, fuzzy
1471-#| msgid ""
1472-#| "Use purge instead of remove for anything that would be removed. An "
1473-#| "asterisk (\"*\") will be displayed next to packages which are scheduled "
1474-#| "to be purged. <option>remove --purge</option> is equivalent for "
1475-#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::"
1476-#| "Purge</literal>."
1477 msgid ""
1478 "Use purge instead of remove for anything that would be removed. An asterisk "
1479 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
1480@@ -5205,18 +5037,14 @@
1481
1482 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
1483 #: apt-key.8.xml:28
1484-#, fuzzy
1485-#| msgid ""
1486-#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
1487-#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
1488-#| "option></arg>"
1489 msgid ""
1490 "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
1491 "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
1492 "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
1493 "arg>"
1494 msgstr ""
1495-"<command>apt-key</command> <arg><replaceable>Befehl</replaceable>/</arg> "
1496+"<command>apt-key</command> <arg><option>--keyring <replaceable>Dateiname</"
1497+"replaceable></option></arg> <arg><replaceable>Befehl</replaceable></arg> "
1498 "<arg rep=\"repeat\"><option><replaceable>Argumente</replaceable></option></"
1499 "arg>"
1500
1501@@ -5327,8 +5155,8 @@
1502 "Update the local keyring with the keyring of Debian archive keys and removes "
1503 "from the keyring the archive keys which are no longer valid."
1504 msgstr ""
1505-"Den lokalen Schlüsselring mit dem Schlüsselring der Debian-Archivschlüssel "
1506-"aktualisieren und aus dem Schlüsselring die Archivschlüssel entfernen, die "
1507+"Den lokalen Schlüsselbund mit dem Schlüsselbund der Debian-Archivschlüssel "
1508+"aktualisieren und aus dem Schlüsselbund die Archivschlüssel entfernen, die "
1509 "nicht länger gültig sind."
1510
1511 #. type: Content of: <refentry><refsect1><para>
1512@@ -5337,13 +5165,13 @@
1513 "Note that options need to be defined before the commands described in the "
1514 "previous section."
1515 msgstr ""
1516+"Beachten Sie, dass Optionen vor den im vorherigen Abschnitt beschriebenen "
1517+"Befehlen definiert sein müssen."
1518
1519 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1520 #: apt-key.8.xml:142
1521-#, fuzzy
1522-#| msgid "add <replaceable>filename</replaceable>"
1523 msgid "--keyring <replaceable>filename</replaceable>"
1524-msgstr "add <replaceable>Dateiname</replaceable>"
1525+msgstr "--keyring <replaceable>Dateiname</replaceable>"
1526
1527 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1528 #: apt-key.8.xml:143
1529@@ -5355,11 +5183,17 @@
1530 "filename> is the primary keyring which means that e.g. new keys are added to "
1531 "this one."
1532 msgstr ""
1533+"Mit dieser Option ist es möglich, eine spezielle Schlüsselbunddatei "
1534+"anzugeben, mit der der Befehl arbeitet. Vorgabe ist, dass ein Befehl mit der "
1535+"Datei <filename>trusted.gpg</filename> ausgeführt wird, ebenso wie alle Teile "
1536+"im Verzeichnis <filename>trusted.gpg.d</filename>, wodurch "
1537+"<filename>trusted.gpg</filename> der primäre Schlüsselbund wird, d.h. neue "
1538+"Schlüssel werden zu diesem hinzugefügt."
1539
1540 #. type: Content of: <refentry><refsect1><variablelist>
1541 #: apt-key.8.xml:156
1542 msgid "&file-trustedgpg;"
1543-msgstr ""
1544+msgstr "&file-trustedgpg;"
1545
1546 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1547 #: apt-key.8.xml:158
1548@@ -5379,7 +5213,7 @@
1549 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1550 #: apt-key.8.xml:163
1551 msgid "Keyring of Debian archive trusted keys."
1552-msgstr "Schlüsselring vertrauenswürdiger Schlüssel des Debian-Archivs."
1553+msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs."
1554
1555 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1556 #: apt-key.8.xml:166
1557@@ -5392,7 +5226,7 @@
1558 #: apt-key.8.xml:167
1559 msgid "Keyring of Debian archive removed trusted keys."
1560 msgstr ""
1561-"Schlüsselring entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
1562+"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
1563
1564 #. type: Content of: <refentry><refsect1><para>
1565 #: apt-key.8.xml:176
1566@@ -5571,7 +5405,7 @@
1567 #. type: Content of: <refentry><refsect1><variablelist>
1568 #: apt-mark.8.xml:124
1569 msgid " &file-extended_states;"
1570-msgstr ""
1571+msgstr " &file-extended_states;"
1572
1573 #. type: Content of: <refentry><refsect1><para>
1574 #: apt-mark.8.xml:129
1575@@ -5684,7 +5518,7 @@
1576 "Die Kette des Vertrauens in Debian beginnt, wenn eine Betreuer ein neues "
1577 "Paket oder eine neue Version eines Pakets in das Debian-Archiv hochlädt. "
1578 "Dieser Upload muss mit einem Schlüssel des Betreuers, der sich im "
1579-"Schlüsselring der Debian-Betreuer befindet (verfügbar im Paket debian-"
1580+"Schlüsselbund der Debian-Betreuer befindet (verfügbar im Paket debian-"
1581 "keyring) signiert werden. Betreuerschlüssel werden von anderen Betreuern "
1582 "gemäß vorbestimmter Regeln signiert, um die Identität des Schlüsselinhabers "
1583 "sicherzustellen."
1584@@ -5705,7 +5539,7 @@
1585 "Paketdateien berechnet und in die Release-Datei getan. Dann wird die Release-"
1586 "Datei durch den Archivschlüssel signiert (der einmal jährlich erzeugt und "
1587 "per FTP-Server verteilt wird). Dieser Schlüssel ist außerdem der Debian-"
1588-"Schlüsselring."
1589+"Schlüsselbund."
1590
1591 #. type: Content of: <refentry><refsect1><para>
1592 #: apt-secure.8.xml:102
1593@@ -5861,7 +5695,7 @@
1594 "outlined."
1595 msgstr ""
1596 "Immer wenn sich die Inhalte des Archivs ändern (neue Pakete hinzugefügt oder "
1597-"entfernt werden), muss der Archivbetreuen den beiden zuerst skizzierten "
1598+"entfernt werden), muss der Archivbetreuer den beiden zuerst skizzierten "
1599 "Schritten folgen."
1600
1601 #. type: Content of: <refentry><refsect1><para>
1602@@ -5973,12 +5807,6 @@
1603 #. The last update date
1604 #. type: Content of: <refentry><refentryinfo>
1605 #: apt.conf.5.xml:13
1606-#, fuzzy
1607-#| msgid ""
1608-#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
1609-#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
1610-#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
1611-#| "email; &apt-product; <date>18 September 2009</date>"
1612 msgid ""
1613 "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
1614 "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
1615@@ -5988,7 +5816,7 @@
1616 "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
1617 "firstname> <surname>Burrows</surname> <contrib>Erste Dokumentation von "
1618 "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
1619-"&apt-product; <date>18. September 2009</date>"
1620+"&apt-product; <date>16. Januar 2010</date>"
1621
1622 #. type: Content of: <refentry><refnamediv><refname>
1623 #: apt.conf.5.xml:28 apt.conf.5.xml:35
1624@@ -6013,6 +5841,11 @@
1625 "made. All tools therefore share the configuration files and also use a "
1626 "common command line parser to provide a uniform environment."
1627 msgstr ""
1628+"<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die "
1629+"APT-Werkzeugsammlung, aber bei weitem nicht der einzige Ort, an dem "
1630+"Änderungen vorgenommen werden können. Alle Werkzeuge nutzen die "
1631+"Konfigurationsdateien daher gemeinsam und außerdem wird ein einheitlicher "
1632+"Befehlszeilenauswerter benutzt, um eine einheitliche Umgebung bereitzustellen."
1633
1634 #. type: Content of: <refentry><refsect1><orderedlist><para>
1635 #: apt.conf.5.xml:45
1636@@ -6020,6 +5853,8 @@
1637 "When an APT tool starts up it will read the configuration files in the "
1638 "following order:"
1639 msgstr ""
1640+"Wenn ein APT-Werkzeug startet, wird es die Konfigurationsdateien in der "
1641+"folgenden Reihenfolge lesen:"
1642
1643 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
1644 #: apt.conf.5.xml:47
1645@@ -6027,6 +5862,8 @@
1646 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
1647 "any)"
1648 msgstr ""
1649+"die Datei, die durch die Umgebungsvariable <envar>APT_CONFIG</envar> "
1650+"angegeben wird (falls gesetzt)"
1651
1652 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
1653 #: apt.conf.5.xml:49
1654@@ -6036,12 +5873,19 @@
1655 "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
1656 "characters - otherwise they will be silently ignored."
1657 msgstr ""
1658+"alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
1659+"alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als "
1660+"Dateinamenserweiterung haben und die alphanumerische Zeichen, Bindestriche "
1661+"(-), Unterstriche (_) und Punkte (.) enthalten – andernfalls werden sie "
1662+"stillschweigend ignoriert."
1663
1664 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
1665 #: apt.conf.5.xml:54
1666 msgid ""
1667 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
1668 msgstr ""
1669+"die Hauptkonfigurationsdatei, die durch <literal>Dir::Etc::main</literal> "
1670+"angegeben wird"
1671
1672 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
1673 #: apt.conf.5.xml:56
1674@@ -6049,11 +5893,13 @@
1675 "the command line options are applied to override the configuration "
1676 "directives or to load even more configuration files."
1677 msgstr ""
1678+"die Befehlszeilenoptionen werden angewandt, um die Konfigurationsdirektiven "
1679+"zu überschreiben oder um sogar mehrere Konfigurationsdateien zu laden."
1680
1681 #. type: Content of: <refentry><refsect1><title>
1682 #: apt.conf.5.xml:60
1683 msgid "Syntax"
1684-msgstr ""
1685+msgstr "Syntax"
1686
1687 #. type: Content of: <refentry><refsect1><para>
1688 #: apt.conf.5.xml:61
1689@@ -6295,12 +6141,6 @@
1690
1691 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1692 #: apt.conf.5.xml:153
1693-#, fuzzy
1694-#| msgid ""
1695-#| "Default release to install packages from if more than one version "
1696-#| "available. Contains release name, codename or release version. Examples: "
1697-#| "'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See "
1698-#| "also &apt-preferences;."
1699 msgid ""
1700 "Default release to install packages from if more than one version available. "
1701 "Contains release name, codename or release version. Examples: 'stable', "
1702@@ -6309,8 +6149,8 @@
1703 msgstr ""
1704 "Standard-Release von dem Pakete installiert werden, wenn mehr als eine "
1705 "Version verfügbar ist. Enthält Release-Name, Codename oder Release-Version. "
1706-"Beispiele: »stable«, »testing, »unstable«, »lenny«, »squeeze«, »4.0«, »5.0«. "
1707-"Siehe auch &apt-preferences;."
1708+"Beispiele: »stable«, »testing, »unstable«, »&stable-codename;«, "
1709+"»&testing-codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
1710
1711 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1712 #: apt.conf.5.xml:158
1713@@ -6353,37 +6193,6 @@
1714
1715 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1716 #: apt.conf.5.xml:171
1717-#, fuzzy
1718-#| msgid ""
1719-#| "Defaults to on which will cause APT to install essential and important "
1720-#| "packages as fast as possible in the install/upgrade operation. This is "
1721-#| "done to limit the effect of a failing &dpkg; call: If this option is "
1722-#| "disabled APT does treat an important package in the same way as an extra "
1723-#| "package: Between the unpacking of the important package A and his "
1724-#| "configuration can then be many other unpack or configuration calls, e.g. "
1725-#| "for package B which has no relation to A, but causes the dpkg call to "
1726-#| "fail (e.g. because maintainer script of package B generates an error) "
1727-#| "which results in a system state in which package A is unpacked but "
1728-#| "unconfigured - each package depending on A is now no longer guaranteed to "
1729-#| "work as their dependency on A is not longer satisfied. The immediate "
1730-#| "configuration marker is also applied to all dependencies which can "
1731-#| "generate a problem if the dependencies e.g. form a circle as a dependency "
1732-#| "with the immediate flag is comparable with a Pre-Dependency. So in theory "
1733-#| "it is possible that APT encounters a situation in which it is unable to "
1734-#| "perform immediate configuration, error out and refers to this option so "
1735-#| "the user can deactivate the immediate configuration temporary to be able "
1736-#| "to perform an install/upgrade again. Note the use of the word \"theory\" "
1737-#| "here as this problem was only encountered by now in real world a few "
1738-#| "times in non-stable distribution versions and caused by wrong "
1739-#| "dependencies of the package in question or by a system in an already "
1740-#| "broken state, so you should not blindly disable this option as the "
1741-#| "mentioned scenario above is not the only problem immediate configuration "
1742-#| "can help to prevent in the first place. Before a big operation like "
1743-#| "<literal>dist-upgrade</literal> is run with this option disabled it "
1744-#| "should be tried to explicitly <literal>install</literal> the package APT "
1745-#| "is unable to configure immediately, but please make sure to report your "
1746-#| "problem also to your distribution and to the APT team with the buglink "
1747-#| "below so they can work on improving or correcting the upgrade process."
1748 msgid ""
1749 "Defaults to on which will cause APT to install essential and important "
1750 "packages as fast as possible in the install/upgrade operation. This is done "
1751@@ -6476,7 +6285,7 @@
1752 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1753 #: apt.conf.5.xml:202
1754 msgid "Cache-Start, Cache-Grow and Cache-Limit"
1755-msgstr ""
1756+msgstr "Cache-Start, Cache-Grow und Cache-Limit"
1757
1758 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
1759 #: apt.conf.5.xml:203
1760@@ -6497,6 +6306,24 @@
1761 "literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> "
1762 "is set to 0 the automatic grow of the cache is disabled."
1763 msgstr ""
1764+"APT benutzt seit Version 0.7.26 eine Zwischenspeicherdatei für "
1765+"Speicherabbilder mit veränderlicher Größe um »verfügbare« Informationen zu "
1766+"speichern. <literal>Cache-Start</literal> dient als Hinweis, auf welche "
1767+"Größe der Zwischenspeicher wachsen wird und enthält daher den Betrag, welchen "
1768+"Speicher APT beim Start abruft. Die Vorgabe ist 20971520 Byte (~20 MB). "
1769+"Beachten Sie, dass diese Speichermenge für APT verfügbar sein muss, da es "
1770+"sonst unschön scheitert. Für Geräte mit eingeschränktem Speicher sollten "
1771+"diese Werte vermindert werden, während sie für Systeme mit vielen "
1772+"konfigurierten Quellen erhöht werden könnten. <literal>Cache-Grow</literal> "
1773+"definiert in Byte mit einer Vorgabe von 1048576 (~1 MB) um wieviel die Größe "
1774+"des Zwischenspeichers vergößert werden soll, falls der durch "
1775+"<literal>Cache-Start</literal> vorreservierte nicht ausreicht. Dieser Wert "
1776+"wird wieder und wieder verwandt bis entweder der Zwischenspeicher groß genug "
1777+"ist, um alle Informationen zu speichern oder die Zwischenspeichergröße das "
1778+"<literal>Cache-Limit</literal> erreicht. Vorgabe für "
1779+"<literal>Cache-Limit</literal> ist 0, was bedeutet, dass es kein Limit gibt. "
1780+"Falls <literal>Cache-Grow</literal> auf 0 gesetzt ist, kann der "
1781+"Zwischenspeicher nicht automatisch wachsen."
1782
1783 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
1784 #: apt.conf.5.xml:218
1785@@ -6563,7 +6390,7 @@
1786 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
1787 #: apt.conf.5.xml:244
1788 msgid "Check-Valid-Until"
1789-msgstr ""
1790+msgstr "Check-Valid-Until"
1791
1792 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
1793 #: apt.conf.5.xml:245
1794@@ -6576,11 +6403,20 @@
1795 "header, but if they don't or a stricter value is volitional the following "
1796 "<literal>Max-ValidTime</literal> option can be used."
1797 msgstr ""
1798+"Sicherheitsbezogene Option wird als »true« vorgegeben, da eine verfallende "
1799+"Überprüfung für eine Release-Datei langzeitige Wiederholungsangriffe "
1800+"verhindert und zum Beispiel Anwendern auch helfen kann, länger nicht "
1801+"aktualisierte Spiegel zu erkennen – diese Funktion hängt jedoch von der "
1802+"Richtigkeit der Zeiteinstellung auf dem Anwendersystem ab. Archivbetreuer "
1803+"sind aufgefordert Release-Dateien mit der Kopfzeile "
1804+"<literal>Valid-Until</literal> zu erstellen. Falls sie das nicht tun oder ein "
1805+"strengerer Wert gewollt ist, kann die Option <literal>Max-ValidTime</literal> "
1806+"benutzt werden."
1807
1808 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
1809 #: apt.conf.5.xml:255
1810 msgid "Max-ValidTime"
1811-msgstr ""
1812+msgstr "Max-ValidTime"
1813
1814 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
1815 #: apt.conf.5.xml:256
1816@@ -6595,6 +6431,16 @@
1817 "settings can be made by appending the label of the archive to the option "
1818 "name."
1819 msgstr ""
1820+"Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem "
1821+"sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-Datei des "
1822+"Archivs keine <literal>Valid-Until</literal>-Kopfzeile enthält. Falls dies "
1823+"so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-Datei oder das "
1824+"Datum, das durch die Erstellungszeit der Release-Datei angegeben wurde "
1825+"(<literal>Date</literal>-Kopfzeile) plus die mit diesen Optionen angegebenen "
1826+"Sekunden werden benutzt, um zu prüfen, ob die Bestätigung einer Datei "
1827+"abgelaufen ist indem das neuere Datum der beiden benutzt wird. "
1828+"Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an "
1829+"die Option »name« vorgenommen werden."
1830
1831 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
1832 #: apt.conf.5.xml:268
1833@@ -6621,6 +6467,13 @@
1834 "the size of the targeted file. If one of these limits is exceeded the "
1835 "complete file is downloaded instead of the patches."
1836 msgstr ""
1837+"Es sind außerdem zwei Unteroptionen verfügbar, um die Benutzung von PDiffs zu "
1838+"begrenzen: Mit <literal>FileLimit</literal> kann angegeben werden, wie viele "
1839+"PDiff-Dateien höchstens heruntergeladen werden, um eine Datei zu reparieren. "
1840+"Andererseits gibt <literal>SizeLimit</literal> die maximale Prozentzahl der "
1841+"Größe aller Patches im Vergleich zur Zieldatei an. Wenn eine dieser "
1842+"Begrenzungen überschritten wird, wird die komplette Datei anstelle der Patche "
1843+"heruntergeladen."
1844
1845 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
1846 #: apt.conf.5.xml:281
1847@@ -7124,16 +6977,6 @@
1848
1849 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
1850 #: apt.conf.5.xml:460
1851-#, fuzzy
1852-#| msgid ""
1853-#| "The Languages subsection controls which <filename>Translation</filename> "
1854-#| "files are downloaded and in which order APT tries to display the "
1855-#| "Description-Translations. APT will try to display the first available "
1856-#| "Description for the Language which is listed at first. Languages can be "
1857-#| "defined with their short or long Languagecodes. Note that not all "
1858-#| "archives provide <filename>Translation</filename> files for every "
1859-#| "Language - especially the long Languagecodes are rare, so please inform "
1860-#| "you which ones are available before you set here impossible values."
1861 msgid ""
1862 "The Languages subsection controls which <filename>Translation</filename> "
1863 "files are downloaded and in which order APT tries to display the Description-"
1864@@ -7162,26 +7005,6 @@
1865
1866 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
1867 #: apt.conf.5.xml:466
1868-#, fuzzy
1869-#| msgid ""
1870-#| "The default list includes \"environment\" and \"en\". "
1871-#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
1872-#| "replaced at runtime with the languagecodes extracted from the "
1873-#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
1874-#| "that these codes are not included twice in the list. If "
1875-#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
1876-#| "<filename>Translation-en</filename> file (if available) will be used. To "
1877-#| "force apt to use no Translation file use the setting <literal>Acquire::"
1878-#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
1879-#| "meaning code which will stop the search for a fitting "
1880-#| "<filename>Translation</filename> file. This can be used by the system "
1881-#| "administrator to let APT know that it should download also this files "
1882-#| "without actually use them if not the environment specifies this "
1883-#| "languages. So the following example configuration will result in the "
1884-#| "order \"en, de\" in an english and in \"de, en\" in a german "
1885-#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
1886-#| "used in a french localization, in such an environment the order would be "
1887-#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>"
1888 msgid ""
1889 "The default list includes \"environment\" and \"en\". "
1890 "\"<literal>environment</literal>\" has a special meaning here: It will be "
1891@@ -7355,6 +7178,13 @@
1892 "z]+</literal> is silently ignored. As seen in the last default value these "
1893 "patterns can use regular expression syntax."
1894 msgstr ""
1895+"Die Liste <literal>Ignore-Files-Silently</literal> kann benutzt werden, um "
1896+"anzugeben welche Dateien APT beim Auswerten der Dateien im Verzeichnisteil "
1897+"stillschweigend ignorieren sollte. Standardmäßig werden Dateien, die auf "
1898+"<literal>.disabled</literal>, <literal>~</literal>, <literal>.bak</literal> "
1899+"oder <literal>.dpkg-[a-z]+</literal> endenn stillschweigend ignoriert. Wie "
1900+"bei den letzten Vorgabwerten gesehen, kann die Syntax für reguläre Ausdrücke "
1901+"verwandt werden."
1902
1903 #. type: Content of: <refentry><refsect1><title>
1904 #: apt.conf.5.xml:541
1905@@ -8305,11 +8135,10 @@
1906 #. The last update date
1907 #. type: Content of: <refentry><refentryinfo>
1908 #: apt_preferences.5.xml:13
1909-#, fuzzy
1910-#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
1911 msgid ""
1912 "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
1913-msgstr "&apt-author.team; &apt-email; &apt-product; <date>04. Mai 2009</date>"
1914+msgstr ""
1915+"&apt-author.team; &apt-email; &apt-product; <date>16. Februar 2010</date>"
1916
1917 #. type: Content of: <refentry><refnamediv><refname>
1918 #: apt_preferences.5.xml:21 apt_preferences.5.xml:28
1919@@ -8385,6 +8214,16 @@
1920 "expected in older or newer releases or together with other packages from "
1921 "different releases. You have been warned."
1922 msgstr ""
1923+"Eigenschaften sind in der Hand eines Systemadministrator ein große Stärke, "
1924+"können aber auch sein größter Albtraum werden, wenn sie unvorsichtig benutzt "
1925+"werden. APT wird die Eigenschaften nicht abfragen, so dass deshalb falsche "
1926+"Einstellungen zu nicht installierbaren Paketen oder falschen Entscheidungen "
1927+"während des Upgrades führen. Sogar noch mehr Probleme treten auf, wenn "
1928+"mehrere Distributions-Release ohne gutes Verständnis der folgenden Absätze "
1929+"gemischt werden. Pakete, die in einem speziellen Release enthalten sind, sind "
1930+"nicht in älteren und neueren Releases oder zusammen mit Paketen "
1931+"unterschiedlicher Releases getestet und funktionieren daher erwartungsgemäß "
1932+"nicht. Sind wurden gewarnt."
1933
1934 #. type: Content of: <refentry><refsect1><para>
1935 #: apt_preferences.5.xml:67
1936@@ -8450,10 +8289,8 @@
1937
1938 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
1939 #: apt_preferences.5.xml:101
1940-#, fuzzy
1941-#| msgid "priority 100"
1942 msgid "priority 1"
1943-msgstr "Priorität 100"
1944+msgstr "Priorität 1"
1945
1946 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
1947 #: apt_preferences.5.xml:102
1948@@ -8462,6 +8299,9 @@
1949 "filename> files are marked as \"NotAutomatic: yes\" like the debian "
1950 "experimental archive."
1951 msgstr ""
1952+"zu den Versionen, die von Archiven kommen, deren "
1953+"<filename>Release</filename>-Dateien als »NotAutomatic: yes« markiert sind, "
1954+"wie das Debian-Experimental-Archiv."
1955
1956 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
1957 #: apt_preferences.5.xml:107
1958@@ -8512,11 +8352,6 @@
1959
1960 #. type: Content of: <refentry><refsect1><refsect2><para>
1961 #: apt_preferences.5.xml:123
1962-#, fuzzy
1963-#| msgid ""
1964-#| "If the target release has not been specified then APT simply assigns "
1965-#| "priority 100 to all installed package versions and priority 500 to all "
1966-#| "uninstalled package versions."
1967 msgid ""
1968 "If the target release has not been specified then APT simply assigns "
1969 "priority 100 to all installed package versions and priority 500 to all "
1970@@ -8526,7 +8361,9 @@
1971 msgstr ""
1972 "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen "
1973 "installierten Paketversionen eine Priorität von 100 und allen nicht "
1974-"installierten Paketversionen eine Priorität von 500 zu."
1975+"installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen "
1976+"aus Archiven kommen, in deren Release-Dateien »NotAutomatic: yes« markiert "
1977+"ist – diese Versionen erhalten die Prirität 1."
1978
1979 #. type: Content of: <refentry><refsect1><refsect2><para>
1980 #: apt_preferences.5.xml:129
1981@@ -8723,32 +8560,26 @@
1982 "high priority to all versions available from the server identified by the "
1983 "hostname \"ftp.de.debian.org\""
1984 msgstr ""
1985+"Eine Mahnung zur Vorsicht: Das hier benutzte Schlüsselwort ist "
1986+"»<literal>origin</literal>«, was zum Finden des Rechnernamens benutzt werden "
1987+"kann. Der folgende Eintrag wird allen Versionen eine hohe Priorität "
1988+"zuweisen, die auf dem Server verfügbar sind, der durch den Rechnernamen "
1989+"»ftp.de.debian.org« identifiziert wird."
1990
1991 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
1992 #: apt_preferences.5.xml:210
1993-#, fuzzy, no-wrap
1994-#| msgid ""
1995-#| "Package: *\n"
1996-#| "Pin: origin \"\"\n"
1997-#| "Pin-Priority: 999\n"
1998+#, no-wrap
1999 msgid ""
2000 "Package: *\n"
2001 "Pin: origin \"ftp.de.debian.org\"\n"
2002 "Pin-Priority: 999\n"
2003 msgstr ""
2004 "Package: *\n"
2005-"Pin: origin \"\"\n"
2006+"Pin: origin \"ftp.de.debian.org\"\n"
2007 "Pin-Priority: 999\n"
2008
2009 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
2010 #: apt_preferences.5.xml:214
2011-#, fuzzy
2012-#| msgid ""
2013-#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
2014-#| "\". This should not be confused with the Origin of a distribution as "
2015-#| "specified in a <filename>Release</filename> file. What follows the "
2016-#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
2017-#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
2018 msgid ""
2019 "This should <emphasis>not</emphasis> be confused with the Origin of a "
2020 "distribution as specified in a <filename>Release</filename> file. What "
2021@@ -8756,12 +8587,11 @@
2022 "Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
2023 "\"."
2024 msgstr ""
2025-"Ein Wort der Warnung: Das hier benutzte Schlüsselwort ist »<literal>origin</"
2026-"literal>«. Dies sollte nicht mit der Herkunft einer Distribution verwechselt "
2027-"werden, wie sie in einer <filename>Release</filename>-Datei angegeben wurde. "
2028-"Was dem »Origin:«-Kennzeichen in einer <filename>Release</filename>-Datei "
2029-"folgt, ist keine Internet-Adresse, sondern ein Autoren- oder Anbietername, "
2030-"wie »Debian« oder »Ximian«."
2031+"Dies sollte nicht mit der Herkunft einer Distribution verwechselt werden, wie "
2032+"sie in einer <filename>Release</filename>-Datei angegeben wurde. Was dem "
2033+"»Origin:«-Kennzeichen in einer <filename>Release</filename>-Datei folgt, ist "
2034+"keine Internet-Adresse, sondern ein Autoren- oder Anbietername, wie »Debian« "
2035+"oder »Ximian«."
2036
2037 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
2038 #: apt_preferences.5.xml:219
2039@@ -8788,34 +8618,25 @@
2040
2041 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
2042 #: apt_preferences.5.xml:228
2043-#, fuzzy
2044-#| msgid ""
2045-#| "The following record assigns a high priority to all package versions "
2046-#| "belonging to any distribution whose Codename is \"<literal>squeeze</"
2047-#| "literal>\"."
2048 msgid ""
2049 "The following record assigns a high priority to all package versions "
2050 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
2051 "</literal>\"."
2052 msgstr ""
2053 "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution "
2054-"gehören, deren Codename »<literal>squeeze</literal>« ist, eine hohe "
2055-"Priorität zu."
2056+"gehören, deren Codename »<literal>&testing-codename;</literal>« ist, eine "
2057+"hohe Priorität zu."
2058
2059 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
2060 #: apt_preferences.5.xml:232
2061-#, fuzzy, no-wrap
2062-#| msgid ""
2063-#| "Package: *\n"
2064-#| "Pin: release n=squeeze\n"
2065-#| "Pin-Priority: 900\n"
2066+#, no-wrap
2067 msgid ""
2068 "Package: *\n"
2069 "Pin: release n=&testing-codename;\n"
2070 "Pin-Priority: 900\n"
2071 msgstr ""
2072 "Package: *\n"
2073-"Pin: release n=squeeze\n"
2074+"Pin: release n=&testing-codename;\n"
2075 "Pin-Priority: 900\n"
2076
2077 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
2078@@ -9127,14 +8948,6 @@
2079
2080 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
2081 #: apt_preferences.5.xml:392
2082-#, fuzzy
2083-#| msgid ""
2084-#| "names the codename to which all the packages in the directory tree "
2085-#| "belong. For example, the line \"Codename: squeeze\" specifies that all "
2086-#| "of the packages in the directory tree below the parent of the "
2087-#| "<filename>Release</filename> file belong to a version named "
2088-#| "<literal>squeeze</literal>. Specifying this value in the APT preferences "
2089-#| "file would require the line:"
2090 msgid ""
2091 "names the codename to which all the packages in the directory tree belong. "
2092 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
2093@@ -9144,18 +8957,17 @@
2094 "preferences file would require the line:"
2095 msgstr ""
2096 "benennt den Codenamen, zu dem alle Pakete im Verzeichnisbaum gehören. Die "
2097-"Zeile »Codename: squeeze« gibt zum Beispiel an, dass alle Pakete im "
2098+"Zeile »Codename: &testing-codename;« gibt zum Beispiel an, dass alle Pakete im "
2099 "Verzeichnisbaum unterhalb des der <filename>Release</filename>-Datei "
2100-"übergeordneten Verzeichnisses zu einer Version mit Namen <literal>squeeze</"
2101-"literal> gehören. Diesen Wert in der APT-Einstellungsdatei anzugeben würde "
2102-"die folgende Zeile benötigen:"
2103+"übergeordneten Verzeichnisses zu einer Version mit Namen "
2104+"<literal>&testing-codename;</literal> gehören. Diesen Wert in der "
2105+"APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
2106
2107 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
2108 #: apt_preferences.5.xml:401
2109-#, fuzzy, no-wrap
2110-#| msgid "Pin: release a=stable\n"
2111+#, no-wrap
2112 msgid "Pin: release n=&testing-codename;\n"
2113-msgstr "Pin: release a=stable\n"
2114+msgstr "Pin: release n=&testing-codename;\n"
2115
2116 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
2117 #: apt_preferences.5.xml:408
2118@@ -9263,17 +9075,6 @@
2119
2120 #. type: Content of: <refentry><refsect1><refsect2><para>
2121 #: apt_preferences.5.xml:363
2122-#, fuzzy
2123-#| msgid ""
2124-#| "The <filename>Release</filename> file is normally found in the directory "
2125-#| "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
2126-#| "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
2127-#| "dists/woody/Release</filename>. It consists of a single multi-line "
2128-#| "record which applies to <emphasis>all</emphasis> of the packages in the "
2129-#| "directory tree below its parent. Unlike the <filename>Packages</"
2130-#| "filename> file, nearly all of the lines in a <filename>Release</filename> "
2131-#| "file are relevant for setting APT priorities: <placeholder type="
2132-#| "\"variablelist\" id=\"0\"/>"
2133 msgid ""
2134 "The <filename>Release</filename> file is normally found in the directory "
2135 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
2136@@ -9288,12 +9089,12 @@
2137 "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
2138 "<filename>.../dists/<replaceable>Distributionsname</replaceable></filename> "
2139 "zu finden, zum Beispiel <filename>.../dists/stable/Release</filename> oder "
2140-"<filename>.../dists/woody/Release</filename>. Sie besteht aus einem "
2141-"einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> Pakete "
2142-"im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses zutrifft. "
2143-"Anders als die <filename>Packages</filename>-Datei sind nahezu alle Zeilen "
2144-"in einer <filename>Release</filename>-Datei für das Setzen von APT-"
2145-"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
2146+"<filename>.../dists/&stable-codename;/Release</filename>. Sie besteht aus "
2147+"einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> "
2148+"Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses "
2149+"zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu alle "
2150+"Zeilen in einer <filename>Release</filename>-Datei für das Setzen von "
2151+"APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
2152
2153 #. type: Content of: <refentry><refsect1><refsect2><para>
2154 #: apt_preferences.5.xml:469
2155@@ -9523,22 +9324,7 @@
2156
2157 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
2158 #: apt_preferences.5.xml:600
2159-#, fuzzy, no-wrap
2160-#| msgid ""
2161-#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
2162-#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
2163-#| "Package: *\n"
2164-#| "Pin: release n=squeeze\n"
2165-#| "Pin-Priority: 900\n"
2166-#| "\n"
2167-#| "Explanation: Debian unstable is always codenamed with sid\n"
2168-#| "Package: *\n"
2169-#| "Pin: release a=sid\n"
2170-#| "Pin-Priority: 800\n"
2171-#| "\n"
2172-#| "Package: *\n"
2173-#| "Pin: release o=Debian\n"
2174-#| "Pin-Priority: -10\n"
2175+#, no-wrap
2176 msgid ""
2177 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
2178 "Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
2179@@ -9556,9 +9342,10 @@
2180 "Pin-Priority: -10\n"
2181 msgstr ""
2182 "Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n"
2183-"Explanation: stammenden Paketversionen als denen der Squeeze- oder Sid-Distribution\n"
2184+"Explanation: stammenden Paketversionen als denen der &testing-codename;-\n"
2185+"Explanation: oder Sid-Distribution\n"
2186 "Package: *\n"
2187-"Pin: release n=squeeze\n"
2188+"Pin: release n=&testing-codename;\n"
2189 "Pin-Priority: 900\n"
2190 "\n"
2191 "Explanation: Debian-Unstable hat immer den Codenamen sid\n"
2192@@ -9598,12 +9385,6 @@
2193
2194 #. type: Content of: <refentry><refsect1><refsect2><para>
2195 #: apt_preferences.5.xml:617
2196-#, fuzzy
2197-#| msgid ""
2198-#| "With a suitable &sources-list; file and the above preferences file, any "
2199-#| "of the following commands will cause APT to upgrade to the latest version"
2200-#| "(s) in the release codenamed with <literal>squeeze</literal>. "
2201-#| "<placeholder type=\"programlisting\" id=\"0\"/>"
2202 msgid ""
2203 "With a suitable &sources-list; file and the above preferences file, any of "
2204 "the following commands will cause APT to upgrade to the latest version(s) in "
2205@@ -9612,8 +9393,8 @@
2206 msgstr ""
2207 "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
2208 "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte"
2209-"(n) Version(en) im Release mit Codenamen <literal>squeeze</literal> "
2210-"durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
2211+"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;"
2212+"</literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
2213
2214 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
2215 #: apt_preferences.5.xml:637
2216@@ -9623,15 +9404,6 @@
2217
2218 #. type: Content of: <refentry><refsect1><refsect2><para>
2219 #: apt_preferences.5.xml:628
2220-#, fuzzy
2221-#| msgid ""
2222-#| "The following command will cause APT to upgrade the specified package to "
2223-#| "the latest version from the <literal>sid</literal> distribution. "
2224-#| "Thereafter, <command>apt-get upgrade</command> will upgrade the package "
2225-#| "to the most recent <literal>squeeze</literal> version if that is more "
2226-#| "recent than the installed version, otherwise, to the most recent "
2227-#| "<literal>sid</literal> version if that is more recent than the installed "
2228-#| "version. <placeholder type=\"programlisting\" id=\"0\"/>"
2229 msgid ""
2230 "The following command will cause APT to upgrade the specified package to the "
2231 "latest version from the <literal>sid</literal> distribution. Thereafter, "
2232@@ -9644,7 +9416,7 @@
2233 "Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets "
2234 "auf die letzte Version der <literal>sid</literal>-Distribution "
2235 "durchzuführen. Danach wird <command>apt-get upgrade</command> ein Upgrade "
2236-"des Pakets auf die aktuellste <literal>squeeze</literal>-Version "
2237+"des Pakets auf die aktuellste <literal>&testing-codename;</literal>-Version "
2238 "durchführen, wenn diese aktueller als die installierte Version ist, "
2239 "andernfalls auf die aktuellste <literal>sid</literal>-Version, wenn diese "
2240 "aktueller als die installierte Version ist. <placeholder type="
2241@@ -9861,18 +9633,14 @@
2242
2243 #. type: Content of: <refentry><refsect1><literallayout>
2244 #: sources.list.5.xml:114
2245-#, fuzzy, no-wrap
2246-#| msgid ""
2247-#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
2248-#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
2249-#| " "
2250+#, no-wrap
2251 msgid ""
2252 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
2253 "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
2254 " "
2255 msgstr ""
2256-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
2257-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
2258+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
2259+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
2260 " "
2261
2262 #. type: Content of: <refentry><refsect1><title>
2263@@ -9988,23 +9756,11 @@
2264
2265 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
2266 #: sources.list.5.xml:178
2267-#, fuzzy
2268-#| msgid "more recongnizable URI types"
2269 msgid "more recognizable URI types"
2270 msgstr "weitere erkennbare URI-Typen"
2271
2272 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
2273 #: sources.list.5.xml:180
2274-#, fuzzy
2275-#| msgid ""
2276-#| "APT can be extended with more methods shipped in other optional packages "
2277-#| "which should follow the nameing scheme <literal>apt-transport-"
2278-#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
2279-#| "also the <literal>apt-transport-https</literal> package which provides "
2280-#| "access methods for https-URIs with features similiar to the http method, "
2281-#| "but other methods for using e.g. debtorrent are also available, see "
2282-#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
2283-#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
2284 msgid ""
2285 "APT can be extended with more methods shipped in other optional packages "
2286 "which should follow the nameing scheme <literal>apt-transport-"
2287@@ -10090,23 +9846,19 @@
2288
2289 #. type: Content of: <refentry><refsect1><para>
2290 #: sources.list.5.xml:208
2291-#, fuzzy
2292-#| msgid ""
2293-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
2294-#| "directory, and uses only the stable/contrib area."
2295 msgid ""
2296 "Uses FTP to access the archive at ftp.debian.org, under the debian "
2297 "directory, and uses only the &stable-codename;/contrib area."
2298 msgstr ""
2299 "Benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-"
2300-"Verzeichnis zuzugreifen und nur den stable/contrib-Bereich zu benutzen."
2301+"Verzeichnis zuzugreifen und nur den &stable-codename;/contrib-Bereich zu "
2302+"benutzen."
2303
2304 #. type: Content of: <refentry><refsect1><literallayout>
2305 #: sources.list.5.xml:210
2306-#, fuzzy, no-wrap
2307-#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
2308+#, no-wrap
2309 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
2310-msgstr "deb ftp://ftp.debian.org/debian stable contrib"
2311+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
2312
2313 #. type: Content of: <refentry><refsect1><para>
2314 #: sources.list.5.xml:212
2315@@ -10290,13 +10042,6 @@
2316
2317 #. type: <p></p>
2318 #: guide.sgml:63
2319-#, fuzzy
2320-#| msgid ""
2321-#| "For instance, mailcrypt is an emacs extension that aids in encrypting "
2322-#| "email with GPG. Without GPGP installed mail-crypt is useless, so "
2323-#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs "
2324-#| "extension it has a simple dependency on emacs, without emacs it is "
2325-#| "completely useless."
2326 msgid ""
2327 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
2328 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
2329@@ -10533,17 +10278,6 @@
2330
2331 #. type: <p></p>
2332 #: guide.sgml:184
2333-#, fuzzy
2334-#| msgid ""
2335-#| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
2336-#| "prgn> and then choose the APT method. You will be prompted for a set of "
2337-#| "<em>Sources</em> which are places to fetch archives from. These can be "
2338-#| "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
2339-#| "provide a fragment of the total Debian archive, APT will automatically "
2340-#| "combine them to form a complete set of packages. If you have a CDROM then "
2341-#| "it is a good idea to specify it first and then specify a mirror so that "
2342-#| "you have access to the latest bug fixes. APT will automatically use "
2343-#| "packages on your CDROM before downloading from the Internet."
2344 msgid ""
2345 "To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
2346 "and then choose the APT method. You will be prompted for a set of "
2347@@ -10680,13 +10414,6 @@
2348
2349 #. type: <p></p>
2350 #: guide.sgml:247
2351-#, fuzzy
2352-#| msgid ""
2353-#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
2354-#| "available list by selecting [U]pdate from the menu. This is a super-set "
2355-#| "of <tt>apt-get update</tt> that makes the fetched information available "
2356-#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
2357-#| "update</tt> has been run before."
2358 msgid ""
2359 "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
2360 "available list by selecting [U]pdate from the menu. This is a superset of "
2361@@ -11388,12 +11115,6 @@
2362
2363 #. type: <p></p>
2364 #: offline.sgml:57
2365-#, fuzzy
2366-#| msgid ""
2367-#| "This is achieved by creatively manipulating the APT configuration file. "
2368-#| "The essential premis to tell APT to look on a disc for it's archive "
2369-#| "files. Note that the disc should be formated with a filesystem that can "
2370-#| "handle long file names such as ext2, fat32 or vfat."
2371 msgid ""
2372 "This is achieved by creatively manipulating the APT configuration file. The "
2373 "essential premise to tell APT to look on a disc for it's archive files. Note "
2374@@ -11542,13 +11263,6 @@
2375
2376 #. type: <p><example>
2377 #: offline.sgml:136
2378-#, fuzzy
2379-#| msgid ""
2380-#| "On the target machine the first thing to do is mount the disc and copy "
2381-#| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
2382-#| "directories outlined in the Overview, <em>archives/partial/</em> and "
2383-#| "<em>lists/partial/</em> Then take the disc to the remote machine and "
2384-#| "configure the sources.list. On the remote machine execute the following:"
2385 msgid ""
2386 "On the target machine the first thing to do is mount the disc and copy <em>/"
2387 "var/lib/dpkg/status</em> to it. You will also need to create the directories "
2388@@ -11565,13 +11279,7 @@
2389
2390 #. type: <example></example>
2391 #: offline.sgml:142
2392-#, fuzzy, no-wrap
2393-#| msgid ""
2394-#| " # export APT_CONFIG=\"/disc/apt.conf\"\n"
2395-#| " # apt-get update\n"
2396-#| " [ APT fetches the package files ]\n"
2397-#| " apt-get dist-upgrade\n"
2398-#| " [ APT fetches all the packages needed to upgrade the target machine ]"
2399+#, no-wrap
2400 msgid ""
2401 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
2402 " # apt-get update\n"
2403@@ -11588,12 +11296,6 @@
2404
2405 #. type: </example></p>
2406 #: offline.sgml:149
2407-#, fuzzy
2408-#| msgid ""
2409-#| "The dist-upgrade command can be replaced with any-other standard APT "
2410-#| "commands, particularly dselect-upgrade. You can even use an APT front end "
2411-#| "such as <em>dselect</em> However this presents a problem in communicating "
2412-#| "your selections back to the local computer."
2413 msgid ""
2414 "The dist-upgrade command can be replaced with any other standard APT "
2415 "commands, particularly dselect-upgrade. You can even use an APT front end "
2416
2417=== modified file 'doc/po/fr.po'
2418--- doc/po/fr.po 2010-09-07 14:24:35 +0000
2419+++ doc/po/fr.po 2010-10-13 18:37:00 +0000
2420@@ -10,7 +10,11 @@
2421 msgstr ""
2422 "Project-Id-Version: \n"
2423 "POT-Creation-Date: 2010-08-23 18:46-0300\n"
2424+<<<<<<< TREE
2425 "PO-Revision-Date: 2010-08-31 07:24+0200\n"
2426+=======
2427+"PO-Revision-Date: 2010-10-06 22:33+0200\n"
2428+>>>>>>> MERGE-SOURCE
2429 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
2430 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
2431 "Language: \n"
2432@@ -936,7 +940,7 @@
2433 " </varlistentry>\n"
2434 "\">\n"
2435 msgstr ""
2436-"Z <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
2437+" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
2438 " <listitem><para>Zone de stockage pour les paquets en transit.\n"
2439 " Élément de configuration : <literal>Dir::Cache::Archives</literal> (implicitement, partial). </para></listitem>\n"
2440 " </varlistentry>\n"
2441@@ -5323,8 +5327,8 @@
2442 "<literal>showauto</literal> is used to print a list of automatically "
2443 "installed packages with each package on a new line."
2444 msgstr ""
2445-"<literal>showauto</literal>, affiche les paquets installés manuellement, un "
2446-"paquet par ligne."
2447+"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
2448+"un paquet par ligne."
2449
2450 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
2451 #: apt-mark.8.xml:93
2452@@ -10803,7 +10807,7 @@
2453 msgid ""
2454 "Finally, APT will print out a summary of all the changes that will occur."
2455 msgstr ""
2456-"Anfin, APT affichera un résumé de toutes les opérations qui prendront place."
2457+"Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
2458
2459 #. type: <example></example>
2460 #: guide.sgml:452
2461
2462=== modified file 'po/apt-all.pot'
2463--- po/apt-all.pot 2010-09-09 20:23:31 +0000
2464+++ po/apt-all.pot 2010-10-13 18:37:00 +0000
2465@@ -7,7 +7,7 @@
2466 msgstr ""
2467 "Project-Id-Version: PACKAGE VERSION\n"
2468 "Report-Msgid-Bugs-To: \n"
2469-"POT-Creation-Date: 2010-08-23 18:41-0400\n"
2470+"POT-Creation-Date: 2010-09-28 17:23+0200\n"
2471 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
2472 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2473 "Language-Team: LANGUAGE <LL@li.org>\n"
2474@@ -147,14 +147,14 @@
2475 msgid " Version table:"
2476 msgstr ""
2477
2478-#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
2479-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
2480-#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
2481+#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
2482+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
2483+#: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144
2484 #, c-format
2485 msgid "%s %s for %s compiled on %s %s\n"
2486 msgstr ""
2487
2488-#: cmdline/apt-cache.cc:1739
2489+#: cmdline/apt-cache.cc:1745
2490 msgid ""
2491 "Usage: apt-cache [options] command\n"
2492 " apt-cache [options] add file1 [file2 ...]\n"
2493@@ -259,31 +259,31 @@
2494 msgid "Cannot get debconf version. Is debconf installed?"
2495 msgstr ""
2496
2497-#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
2498+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
2499 msgid "Package extension list is too long"
2500 msgstr ""
2501
2502-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
2503-#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
2504-#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
2505+#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
2506+#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
2507+#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
2508 #, c-format
2509 msgid "Error processing directory %s"
2510 msgstr ""
2511
2512-#: ftparchive/apt-ftparchive.cc:258
2513+#: ftparchive/apt-ftparchive.cc:260
2514 msgid "Source extension list is too long"
2515 msgstr ""
2516
2517-#: ftparchive/apt-ftparchive.cc:375
2518+#: ftparchive/apt-ftparchive.cc:377
2519 msgid "Error writing header to contents file"
2520 msgstr ""
2521
2522-#: ftparchive/apt-ftparchive.cc:405
2523+#: ftparchive/apt-ftparchive.cc:407
2524 #, c-format
2525 msgid "Error processing contents %s"
2526 msgstr ""
2527
2528-#: ftparchive/apt-ftparchive.cc:590
2529+#: ftparchive/apt-ftparchive.cc:595
2530 msgid ""
2531 "Usage: apt-ftparchive [options] command\n"
2532 "Commands: packages binarypath [overridefile [pathprefix]]\n"
2533@@ -325,11 +325,11 @@
2534 " -o=? Set an arbitrary configuration option"
2535 msgstr ""
2536
2537-#: ftparchive/apt-ftparchive.cc:796
2538+#: ftparchive/apt-ftparchive.cc:801
2539 msgid "No selections matched"
2540 msgstr ""
2541
2542-#: ftparchive/apt-ftparchive.cc:874
2543+#: ftparchive/apt-ftparchive.cc:879
2544 #, c-format
2545 msgid "Some files are missing in the package file group `%s'"
2546 msgstr ""
2547@@ -439,7 +439,7 @@
2548 msgid " %s has no override entry\n"
2549 msgstr ""
2550
2551-#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
2552+#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
2553 #, c-format
2554 msgid " %s maintainer is %s not %s\n"
2555 msgstr ""
2556@@ -549,142 +549,142 @@
2557 msgid "Failed to rename %s to %s"
2558 msgstr ""
2559
2560-#: cmdline/apt-get.cc:134
2561+#: cmdline/apt-get.cc:135
2562 msgid "Y"
2563 msgstr ""
2564
2565-#: cmdline/apt-get.cc:156 apt-pkg/cachefilter.cc:29
2566+#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
2567 #, c-format
2568 msgid "Regex compilation error - %s"
2569 msgstr ""
2570
2571-#: cmdline/apt-get.cc:251
2572+#: cmdline/apt-get.cc:252
2573 msgid "The following packages have unmet dependencies:"
2574 msgstr ""
2575
2576-#: cmdline/apt-get.cc:341
2577+#: cmdline/apt-get.cc:342
2578 #, c-format
2579 msgid "but %s is installed"
2580 msgstr ""
2581
2582-#: cmdline/apt-get.cc:343
2583+#: cmdline/apt-get.cc:344
2584 #, c-format
2585 msgid "but %s is to be installed"
2586 msgstr ""
2587
2588-#: cmdline/apt-get.cc:350
2589+#: cmdline/apt-get.cc:351
2590 msgid "but it is not installable"
2591 msgstr ""
2592
2593-#: cmdline/apt-get.cc:352
2594+#: cmdline/apt-get.cc:353
2595 msgid "but it is a virtual package"
2596 msgstr ""
2597
2598-#: cmdline/apt-get.cc:355
2599+#: cmdline/apt-get.cc:356
2600 msgid "but it is not installed"
2601 msgstr ""
2602
2603-#: cmdline/apt-get.cc:355
2604+#: cmdline/apt-get.cc:356
2605 msgid "but it is not going to be installed"
2606 msgstr ""
2607
2608-#: cmdline/apt-get.cc:360
2609+#: cmdline/apt-get.cc:361
2610 msgid " or"
2611 msgstr ""
2612
2613-#: cmdline/apt-get.cc:391
2614+#: cmdline/apt-get.cc:392
2615 msgid "The following NEW packages will be installed:"
2616 msgstr ""
2617
2618-#: cmdline/apt-get.cc:419
2619+#: cmdline/apt-get.cc:420
2620 msgid "The following packages will be REMOVED:"
2621 msgstr ""
2622
2623-#: cmdline/apt-get.cc:441
2624+#: cmdline/apt-get.cc:442
2625 msgid "The following packages have been kept back:"
2626 msgstr ""
2627
2628-#: cmdline/apt-get.cc:464
2629+#: cmdline/apt-get.cc:465
2630 msgid "The following packages will be upgraded:"
2631 msgstr ""
2632
2633-#: cmdline/apt-get.cc:487
2634+#: cmdline/apt-get.cc:488
2635 msgid "The following packages will be DOWNGRADED:"
2636 msgstr ""
2637
2638-#: cmdline/apt-get.cc:507
2639+#: cmdline/apt-get.cc:508
2640 msgid "The following held packages will be changed:"
2641 msgstr ""
2642
2643-#: cmdline/apt-get.cc:560
2644+#: cmdline/apt-get.cc:561
2645 #, c-format
2646 msgid "%s (due to %s) "
2647 msgstr ""
2648
2649-#: cmdline/apt-get.cc:568
2650+#: cmdline/apt-get.cc:569
2651 msgid ""
2652 "WARNING: The following essential packages will be removed.\n"
2653 "This should NOT be done unless you know exactly what you are doing!"
2654 msgstr ""
2655
2656-#: cmdline/apt-get.cc:602
2657+#: cmdline/apt-get.cc:603
2658 #, c-format
2659 msgid "%lu upgraded, %lu newly installed, "
2660 msgstr ""
2661
2662-#: cmdline/apt-get.cc:606
2663+#: cmdline/apt-get.cc:607
2664 #, c-format
2665 msgid "%lu reinstalled, "
2666 msgstr ""
2667
2668-#: cmdline/apt-get.cc:608
2669+#: cmdline/apt-get.cc:609
2670 #, c-format
2671 msgid "%lu downgraded, "
2672 msgstr ""
2673
2674-#: cmdline/apt-get.cc:610
2675+#: cmdline/apt-get.cc:611
2676 #, c-format
2677 msgid "%lu to remove and %lu not upgraded.\n"
2678 msgstr ""
2679
2680-#: cmdline/apt-get.cc:614
2681+#: cmdline/apt-get.cc:615
2682 #, c-format
2683 msgid "%lu not fully installed or removed.\n"
2684 msgstr ""
2685
2686-#: cmdline/apt-get.cc:634
2687+#: cmdline/apt-get.cc:635
2688 #, c-format
2689 msgid "Note, selecting '%s' for task '%s'\n"
2690 msgstr ""
2691
2692-#: cmdline/apt-get.cc:640
2693+#: cmdline/apt-get.cc:641
2694 #, c-format
2695 msgid "Note, selecting '%s' for regex '%s'\n"
2696 msgstr ""
2697
2698-#: cmdline/apt-get.cc:647
2699+#: cmdline/apt-get.cc:648
2700 #, c-format
2701 msgid "Selected version '%s' (%s) for '%s'\n"
2702 msgstr ""
2703
2704-#: cmdline/apt-get.cc:657
2705+#: cmdline/apt-get.cc:658
2706 #, c-format
2707 msgid "Package %s is a virtual package provided by:\n"
2708 msgstr ""
2709
2710-#: cmdline/apt-get.cc:668
2711+#: cmdline/apt-get.cc:669
2712 msgid " [Installed]"
2713 msgstr ""
2714
2715-#: cmdline/apt-get.cc:677
2716+#: cmdline/apt-get.cc:678
2717 msgid " [Not candidate version]"
2718 msgstr ""
2719
2720-#: cmdline/apt-get.cc:679
2721+#: cmdline/apt-get.cc:680
2722 msgid "You should explicitly select one to install."
2723 msgstr ""
2724
2725-#: cmdline/apt-get.cc:682
2726+#: cmdline/apt-get.cc:683
2727 #, c-format
2728 msgid ""
2729 "Package %s is not available, but is referred to by another package.\n"
2730@@ -692,164 +692,167 @@
2731 "is only available from another source\n"
2732 msgstr ""
2733
2734-#: cmdline/apt-get.cc:700
2735+#: cmdline/apt-get.cc:701
2736 msgid "However the following packages replace it:"
2737 msgstr ""
2738
2739-#: cmdline/apt-get.cc:712
2740+#: cmdline/apt-get.cc:713
2741 #, c-format
2742 msgid "Package '%s' has no installation candidate"
2743 msgstr ""
2744
2745-#: cmdline/apt-get.cc:723
2746+#: cmdline/apt-get.cc:724
2747 #, c-format
2748 msgid "Virtual packages like '%s' can't be removed\n"
2749 msgstr ""
2750
2751-#: cmdline/apt-get.cc:754
2752+#: cmdline/apt-get.cc:755
2753 #, c-format
2754 msgid "Note, selecting '%s' instead of '%s'\n"
2755 msgstr ""
2756
2757-#: cmdline/apt-get.cc:784
2758+#: cmdline/apt-get.cc:785
2759 #, c-format
2760 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
2761 msgstr ""
2762
2763-#: cmdline/apt-get.cc:788
2764+#: cmdline/apt-get.cc:789
2765 #, c-format
2766 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
2767 msgstr ""
2768
2769-#: cmdline/apt-get.cc:798
2770+#: cmdline/apt-get.cc:799
2771 #, c-format
2772 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
2773 msgstr ""
2774
2775-#: cmdline/apt-get.cc:803
2776+#: cmdline/apt-get.cc:804
2777 #, c-format
2778 msgid "%s is already the newest version.\n"
2779 msgstr ""
2780
2781-#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
2782+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
2783 #, c-format
2784 msgid "%s set to manually installed.\n"
2785 msgstr ""
2786
2787-#: cmdline/apt-get.cc:859
2788+#: cmdline/apt-get.cc:863
2789 #, c-format
2790 msgid "Package %s is not installed, so not removed\n"
2791 msgstr ""
2792
2793-#: cmdline/apt-get.cc:934
2794+#: cmdline/apt-get.cc:938
2795 msgid "Correcting dependencies..."
2796 msgstr ""
2797
2798-#: cmdline/apt-get.cc:937
2799+#: cmdline/apt-get.cc:941
2800 msgid " failed."
2801 msgstr ""
2802
2803-#: cmdline/apt-get.cc:940
2804+#: cmdline/apt-get.cc:944
2805 msgid "Unable to correct dependencies"
2806 msgstr ""
2807
2808-#: cmdline/apt-get.cc:943
2809+#: cmdline/apt-get.cc:947
2810 msgid "Unable to minimize the upgrade set"
2811 msgstr ""
2812
2813-#: cmdline/apt-get.cc:945
2814+#: cmdline/apt-get.cc:949
2815 msgid " Done"
2816 msgstr ""
2817
2818-#: cmdline/apt-get.cc:949
2819+#: cmdline/apt-get.cc:953
2820 msgid "You might want to run 'apt-get -f install' to correct these."
2821 msgstr ""
2822
2823-#: cmdline/apt-get.cc:952
2824+#: cmdline/apt-get.cc:956
2825 msgid "Unmet dependencies. Try using -f."
2826 msgstr ""
2827
2828-#: cmdline/apt-get.cc:977
2829+#: cmdline/apt-get.cc:981
2830 msgid "WARNING: The following packages cannot be authenticated!"
2831 msgstr ""
2832
2833-#: cmdline/apt-get.cc:981
2834+#: cmdline/apt-get.cc:985
2835 msgid "Authentication warning overridden.\n"
2836 msgstr ""
2837
2838-#: cmdline/apt-get.cc:988
2839+#: cmdline/apt-get.cc:992
2840 msgid "Install these packages without verification [y/N]? "
2841 msgstr ""
2842
2843-#: cmdline/apt-get.cc:990
2844+#: cmdline/apt-get.cc:994
2845 msgid "Some packages could not be authenticated"
2846 msgstr ""
2847
2848-#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
2849+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
2850 msgid "There are problems and -y was used without --force-yes"
2851 msgstr ""
2852
2853-#: cmdline/apt-get.cc:1040
2854+#: cmdline/apt-get.cc:1044
2855 msgid "Internal error, InstallPackages was called with broken packages!"
2856 msgstr ""
2857
2858-#: cmdline/apt-get.cc:1049
2859+#: cmdline/apt-get.cc:1053
2860 msgid "Packages need to be removed but remove is disabled."
2861 msgstr ""
2862
2863-#: cmdline/apt-get.cc:1060
2864+#: cmdline/apt-get.cc:1064
2865 msgid "Internal error, Ordering didn't finish"
2866 msgstr ""
2867
2868-#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
2869-#: apt-pkg/cachefile.cc:106
2870-msgid "The list of sources could not be read."
2871-msgstr ""
2872-
2873-#: cmdline/apt-get.cc:1100
2874+#: cmdline/apt-get.cc:1104
2875 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
2876 msgstr ""
2877
2878-#: cmdline/apt-get.cc:1105
2879+#. TRANSLATOR: The required space between number and unit is already included
2880+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
2881+#: cmdline/apt-get.cc:1111
2882 #, c-format
2883 msgid "Need to get %sB/%sB of archives.\n"
2884 msgstr ""
2885
2886-#: cmdline/apt-get.cc:1108
2887+#. TRANSLATOR: The required space between number and unit is already included
2888+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
2889+#: cmdline/apt-get.cc:1116
2890 #, c-format
2891 msgid "Need to get %sB of archives.\n"
2892 msgstr ""
2893
2894-#: cmdline/apt-get.cc:1113
2895+#. TRANSLATOR: The required space between number and unit is already included
2896+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
2897+#: cmdline/apt-get.cc:1123
2898 #, c-format
2899 msgid "After this operation, %sB of additional disk space will be used.\n"
2900 msgstr ""
2901
2902-#: cmdline/apt-get.cc:1116
2903+#. TRANSLATOR: The required space between number and unit is already included
2904+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
2905+#: cmdline/apt-get.cc:1128
2906 #, c-format
2907 msgid "After this operation, %sB disk space will be freed.\n"
2908 msgstr ""
2909
2910-#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
2911-#: cmdline/apt-get.cc:2322
2912+#: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
2913+#: cmdline/apt-get.cc:2335
2914 #, c-format
2915 msgid "Couldn't determine free space in %s"
2916 msgstr ""
2917
2918-#: cmdline/apt-get.cc:1144
2919+#: cmdline/apt-get.cc:1156
2920 #, c-format
2921 msgid "You don't have enough free space in %s."
2922 msgstr ""
2923
2924-#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
2925+#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
2926 msgid "Trivial Only specified but this is not a trivial operation."
2927 msgstr ""
2928
2929-#: cmdline/apt-get.cc:1162
2930+#: cmdline/apt-get.cc:1174
2931 msgid "Yes, do as I say!"
2932 msgstr ""
2933
2934-#: cmdline/apt-get.cc:1164
2935+#: cmdline/apt-get.cc:1176
2936 #, c-format
2937 msgid ""
2938 "You are about to do something potentially harmful.\n"
2939@@ -857,46 +860,46 @@
2940 " ?] "
2941 msgstr ""
2942
2943-#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
2944+#: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
2945 msgid "Abort."
2946 msgstr ""
2947
2948-#: cmdline/apt-get.cc:1185
2949+#: cmdline/apt-get.cc:1197
2950 msgid "Do you want to continue [Y/n]? "
2951 msgstr ""
2952
2953-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
2954+#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
2955 #, c-format
2956 msgid "Failed to fetch %s %s\n"
2957 msgstr ""
2958
2959-#: cmdline/apt-get.cc:1275
2960+#: cmdline/apt-get.cc:1287
2961 msgid "Some files failed to download"
2962 msgstr ""
2963
2964-#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
2965+#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
2966 msgid "Download complete and in download only mode"
2967 msgstr ""
2968
2969-#: cmdline/apt-get.cc:1282
2970+#: cmdline/apt-get.cc:1294
2971 msgid ""
2972 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
2973 "missing?"
2974 msgstr ""
2975
2976-#: cmdline/apt-get.cc:1286
2977+#: cmdline/apt-get.cc:1298
2978 msgid "--fix-missing and media swapping is not currently supported"
2979 msgstr ""
2980
2981-#: cmdline/apt-get.cc:1291
2982+#: cmdline/apt-get.cc:1303
2983 msgid "Unable to correct missing packages."
2984 msgstr ""
2985
2986-#: cmdline/apt-get.cc:1292
2987+#: cmdline/apt-get.cc:1304
2988 msgid "Aborting install."
2989 msgstr ""
2990
2991-#: cmdline/apt-get.cc:1320
2992+#: cmdline/apt-get.cc:1332
2993 msgid ""
2994 "The following package disappeared from your system as\n"
2995 "all files have been overwritten by other packages:"
2996@@ -906,35 +909,35 @@
2997 msgstr[0] ""
2998 msgstr[1] ""
2999
3000-#: cmdline/apt-get.cc:1324
3001+#: cmdline/apt-get.cc:1336
3002 msgid "Note: This is done automatic and on purpose by dpkg."
3003 msgstr ""
3004
3005-#: cmdline/apt-get.cc:1454
3006+#: cmdline/apt-get.cc:1466
3007 #, c-format
3008 msgid "Ignore unavailable target release '%s' of package '%s'"
3009 msgstr ""
3010
3011-#: cmdline/apt-get.cc:1486
3012+#: cmdline/apt-get.cc:1498
3013 #, c-format
3014 msgid "Picking '%s' as source package instead of '%s'\n"
3015 msgstr ""
3016
3017 #. if (VerTag.empty() == false && Last == 0)
3018-#: cmdline/apt-get.cc:1524
3019+#: cmdline/apt-get.cc:1536
3020 #, c-format
3021 msgid "Ignore unavailable version '%s' of package '%s'"
3022 msgstr ""
3023
3024-#: cmdline/apt-get.cc:1540
3025+#: cmdline/apt-get.cc:1552
3026 msgid "The update command takes no arguments"
3027 msgstr ""
3028
3029-#: cmdline/apt-get.cc:1605
3030+#: cmdline/apt-get.cc:1618
3031 msgid "We are not supposed to delete stuff, can't start AutoRemover"
3032 msgstr ""
3033
3034-#: cmdline/apt-get.cc:1653
3035+#: cmdline/apt-get.cc:1666
3036 msgid ""
3037 "The following package was automatically installed and is no longer required:"
3038 msgid_plural ""
3039@@ -943,7 +946,7 @@
3040 msgstr[0] ""
3041 msgstr[1] ""
3042
3043-#: cmdline/apt-get.cc:1657
3044+#: cmdline/apt-get.cc:1670
3045 #, c-format
3046 msgid "%lu package was automatically installed and is no longer required.\n"
3047 msgid_plural ""
3048@@ -951,11 +954,11 @@
3049 msgstr[0] ""
3050 msgstr[1] ""
3051
3052-#: cmdline/apt-get.cc:1659
3053+#: cmdline/apt-get.cc:1672
3054 msgid "Use 'apt-get autoremove' to remove them."
3055 msgstr ""
3056
3057-#: cmdline/apt-get.cc:1664
3058+#: cmdline/apt-get.cc:1677
3059 msgid ""
3060 "Hmm, seems like the AutoRemover destroyed something which really\n"
3061 "shouldn't happen. Please file a bug report against apt."
3062@@ -971,29 +974,29 @@
3063 #. "that package should be filed.") << endl;
3064 #. }
3065 #.
3066-#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
3067+#: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
3068 msgid "The following information may help to resolve the situation:"
3069 msgstr ""
3070
3071-#: cmdline/apt-get.cc:1671
3072+#: cmdline/apt-get.cc:1684
3073 msgid "Internal Error, AutoRemover broke stuff"
3074 msgstr ""
3075
3076-#: cmdline/apt-get.cc:1690
3077+#: cmdline/apt-get.cc:1703
3078 msgid "Internal error, AllUpgrade broke stuff"
3079 msgstr ""
3080
3081-#: cmdline/apt-get.cc:1779
3082+#: cmdline/apt-get.cc:1792
3083 msgid "You might want to run 'apt-get -f install' to correct these:"
3084 msgstr ""
3085
3086-#: cmdline/apt-get.cc:1782
3087+#: cmdline/apt-get.cc:1795
3088 msgid ""
3089 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
3090 "solution)."
3091 msgstr ""
3092
3093-#: cmdline/apt-get.cc:1794
3094+#: cmdline/apt-get.cc:1807
3095 msgid ""
3096 "Some packages could not be installed. This may mean that you have\n"
3097 "requested an impossible situation or if you are using the unstable\n"
3098@@ -1001,69 +1004,69 @@
3099 "or been moved out of Incoming."
3100 msgstr ""
3101
3102-#: cmdline/apt-get.cc:1812
3103+#: cmdline/apt-get.cc:1825
3104 msgid "Broken packages"
3105 msgstr ""
3106
3107-#: cmdline/apt-get.cc:1841
3108+#: cmdline/apt-get.cc:1854
3109 msgid "The following extra packages will be installed:"
3110 msgstr ""
3111
3112-#: cmdline/apt-get.cc:1931
3113+#: cmdline/apt-get.cc:1944
3114 msgid "Suggested packages:"
3115 msgstr ""
3116
3117-#: cmdline/apt-get.cc:1932
3118+#: cmdline/apt-get.cc:1945
3119 msgid "Recommended packages:"
3120 msgstr ""
3121
3122-#: cmdline/apt-get.cc:1974
3123+#: cmdline/apt-get.cc:1987
3124 #, c-format
3125 msgid "Couldn't find package %s"
3126 msgstr ""
3127
3128-#: cmdline/apt-get.cc:1981
3129+#: cmdline/apt-get.cc:1994
3130 #, c-format
3131 msgid "%s set to automatically installed.\n"
3132 msgstr ""
3133
3134-#: cmdline/apt-get.cc:2002
3135+#: cmdline/apt-get.cc:2015
3136 msgid "Calculating upgrade... "
3137 msgstr ""
3138
3139-#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
3140+#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
3141 msgid "Failed"
3142 msgstr ""
3143
3144-#: cmdline/apt-get.cc:2010
3145+#: cmdline/apt-get.cc:2023
3146 msgid "Done"
3147 msgstr ""
3148
3149-#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
3150+#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
3151 msgid "Internal error, problem resolver broke stuff"
3152 msgstr ""
3153
3154-#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
3155+#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
3156 msgid "Unable to lock the download directory"
3157 msgstr ""
3158
3159-#: cmdline/apt-get.cc:2185
3160+#: cmdline/apt-get.cc:2198
3161 msgid "Must specify at least one package to fetch source for"
3162 msgstr ""
3163
3164-#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
3165+#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
3166 #, c-format
3167 msgid "Unable to find a source package for %s"
3168 msgstr ""
3169
3170-#: cmdline/apt-get.cc:2241
3171+#: cmdline/apt-get.cc:2254
3172 #, c-format
3173 msgid ""
3174 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
3175 "%s\n"
3176 msgstr ""
3177
3178-#: cmdline/apt-get.cc:2246
3179+#: cmdline/apt-get.cc:2259
3180 #, c-format
3181 msgid ""
3182 "Please use:\n"
3183@@ -1071,111 +1074,115 @@
3184 "to retrieve the latest (possibly unreleased) updates to the package.\n"
3185 msgstr ""
3186
3187-#: cmdline/apt-get.cc:2297
3188+#: cmdline/apt-get.cc:2310
3189 #, c-format
3190 msgid "Skipping already downloaded file '%s'\n"
3191 msgstr ""
3192
3193-#: cmdline/apt-get.cc:2332
3194+#: cmdline/apt-get.cc:2345
3195 #, c-format
3196 msgid "You don't have enough free space in %s"
3197 msgstr ""
3198
3199-#: cmdline/apt-get.cc:2338
3200+#. TRANSLATOR: The required space between number and unit is already included
3201+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
3202+#: cmdline/apt-get.cc:2353
3203 #, c-format
3204 msgid "Need to get %sB/%sB of source archives.\n"
3205 msgstr ""
3206
3207-#: cmdline/apt-get.cc:2341
3208+#. TRANSLATOR: The required space between number and unit is already included
3209+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
3210+#: cmdline/apt-get.cc:2358
3211 #, c-format
3212 msgid "Need to get %sB of source archives.\n"
3213 msgstr ""
3214
3215-#: cmdline/apt-get.cc:2347
3216+#: cmdline/apt-get.cc:2364
3217 #, c-format
3218 msgid "Fetch source %s\n"
3219 msgstr ""
3220
3221-#: cmdline/apt-get.cc:2380
3222+#: cmdline/apt-get.cc:2397
3223 msgid "Failed to fetch some archives."
3224 msgstr ""
3225
3226-#: cmdline/apt-get.cc:2410
3227+#: cmdline/apt-get.cc:2427
3228 #, c-format
3229 msgid "Skipping unpack of already unpacked source in %s\n"
3230 msgstr ""
3231
3232-#: cmdline/apt-get.cc:2422
3233+#: cmdline/apt-get.cc:2439
3234 #, c-format
3235 msgid "Unpack command '%s' failed.\n"
3236 msgstr ""
3237
3238-#: cmdline/apt-get.cc:2423
3239+#: cmdline/apt-get.cc:2440
3240 #, c-format
3241 msgid "Check if the 'dpkg-dev' package is installed.\n"
3242 msgstr ""
3243
3244-#: cmdline/apt-get.cc:2440
3245+#: cmdline/apt-get.cc:2457
3246 #, c-format
3247 msgid "Build command '%s' failed.\n"
3248 msgstr ""
3249
3250-#: cmdline/apt-get.cc:2460
3251+#: cmdline/apt-get.cc:2477
3252 msgid "Child process failed"
3253 msgstr ""
3254
3255-#: cmdline/apt-get.cc:2476
3256+#: cmdline/apt-get.cc:2493
3257 msgid "Must specify at least one package to check builddeps for"
3258 msgstr ""
3259
3260-#: cmdline/apt-get.cc:2506
3261+#: cmdline/apt-get.cc:2524
3262 #, c-format
3263 msgid "Unable to get build-dependency information for %s"
3264 msgstr ""
3265
3266-#: cmdline/apt-get.cc:2526
3267+#: cmdline/apt-get.cc:2544
3268 #, c-format
3269 msgid "%s has no build depends.\n"
3270 msgstr ""
3271
3272-#: cmdline/apt-get.cc:2577
3273+#: cmdline/apt-get.cc:2595
3274 #, c-format
3275 msgid ""
3276 "%s dependency for %s cannot be satisfied because the package %s cannot be "
3277 "found"
3278 msgstr ""
3279
3280-#: cmdline/apt-get.cc:2630
3281+#: cmdline/apt-get.cc:2648
3282 #, c-format
3283 msgid ""
3284 "%s dependency for %s cannot be satisfied because no available versions of "
3285 "package %s can satisfy version requirements"
3286 msgstr ""
3287
3288-#: cmdline/apt-get.cc:2666
3289+#: cmdline/apt-get.cc:2684
3290 #, c-format
3291 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
3292 msgstr ""
3293
3294-#: cmdline/apt-get.cc:2693
3295+#: cmdline/apt-get.cc:2711
3296 #, c-format
3297 msgid "Failed to satisfy %s dependency for %s: %s"
3298 msgstr ""
3299
3300-#: cmdline/apt-get.cc:2709
3301+#: cmdline/apt-get.cc:2727
3302 #, c-format
3303 msgid "Build-dependencies for %s could not be satisfied."
3304 msgstr ""
3305
3306-#: cmdline/apt-get.cc:2714
3307+#: cmdline/apt-get.cc:2732
3308 msgid "Failed to process build dependencies"
3309 msgstr ""
3310
3311-#: cmdline/apt-get.cc:2745
3312+#: cmdline/apt-get.cc:2763
3313 msgid "Supported modules:"
3314 msgstr ""
3315
3316-#: cmdline/apt-get.cc:2786
3317+#: cmdline/apt-get.cc:2804
3318 msgid ""
3319 "Usage: apt-get [options] command\n"
3320 " apt-get [options] install|remove pkg1 [pkg2 ...]\n"
3321@@ -1221,7 +1228,7 @@
3322 " This APT has Super Cow Powers.\n"
3323 msgstr ""
3324
3325-#: cmdline/apt-get.cc:2958
3326+#: cmdline/apt-get.cc:2960
3327 msgid ""
3328 "NOTE: This is only a simulation!\n"
3329 " apt-get needs root privileges for real execution.\n"
3330@@ -1451,10 +1458,10 @@
3331
3332 #. Only warn if there are no sources.list.d.
3333 #. Only warn if there is no sources.list file.
3334-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
3335-#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
3336-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
3337-#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
3338+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
3339+#: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204
3340+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
3341+#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
3342 #: methods/mirror.cc:87
3343 #, c-format
3344 msgid "Unable to read %s"
3345@@ -1586,23 +1593,23 @@
3346 msgid "Unparsable control file"
3347 msgstr ""
3348
3349-#: methods/bzip2.cc:68
3350+#: methods/bzip2.cc:65
3351 #, c-format
3352 msgid "Couldn't open pipe for %s"
3353 msgstr ""
3354
3355-#: methods/bzip2.cc:113
3356+#: methods/bzip2.cc:109
3357 #, c-format
3358 msgid "Read error from %s process"
3359 msgstr ""
3360
3361-#: methods/bzip2.cc:145 methods/bzip2.cc:154 methods/copy.cc:43
3362-#: methods/gzip.cc:96 methods/gzip.cc:105 methods/rred.cc:486
3363+#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
3364+#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
3365 #: methods/rred.cc:495
3366 msgid "Failed to stat"
3367 msgstr ""
3368
3369-#: methods/bzip2.cc:151 methods/copy.cc:80 methods/gzip.cc:102
3370+#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
3371 #: methods/rred.cc:492
3372 msgid "Failed to set modification time"
3373 msgstr ""
3374@@ -1691,7 +1698,7 @@
3375 msgid "Server closed the connection"
3376 msgstr ""
3377
3378-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
3379+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
3380 msgid "Read error"
3381 msgstr ""
3382
3383@@ -1703,7 +1710,7 @@
3384 msgid "Protocol corruption"
3385 msgstr ""
3386
3387-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
3388+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
3389 msgid "Write error"
3390 msgstr ""
3391
3392@@ -1757,7 +1764,7 @@
3393 msgid "Unable to accept connection"
3394 msgstr ""
3395
3396-#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
3397+#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
3398 msgid "Problem hashing file"
3399 msgstr ""
3400
3401@@ -1887,67 +1894,67 @@
3402 msgid "Bad header line"
3403 msgstr ""
3404
3405-#: methods/http.cc:558 methods/http.cc:565
3406+#: methods/http.cc:564 methods/http.cc:571
3407 msgid "The HTTP server sent an invalid reply header"
3408 msgstr ""
3409
3410-#: methods/http.cc:594
3411+#: methods/http.cc:600
3412 msgid "The HTTP server sent an invalid Content-Length header"
3413 msgstr ""
3414
3415-#: methods/http.cc:609
3416+#: methods/http.cc:615
3417 msgid "The HTTP server sent an invalid Content-Range header"
3418 msgstr ""
3419
3420-#: methods/http.cc:611
3421+#: methods/http.cc:617
3422 msgid "This HTTP server has broken range support"
3423 msgstr ""
3424
3425-#: methods/http.cc:635
3426+#: methods/http.cc:641
3427 msgid "Unknown date format"
3428 msgstr ""
3429
3430-#: methods/http.cc:793
3431+#: methods/http.cc:799
3432 msgid "Select failed"
3433 msgstr ""
3434
3435-#: methods/http.cc:798
3436+#: methods/http.cc:804
3437 msgid "Connection timed out"
3438 msgstr ""
3439
3440-#: methods/http.cc:821
3441+#: methods/http.cc:827
3442 msgid "Error writing to output file"
3443 msgstr ""
3444
3445-#: methods/http.cc:852
3446+#: methods/http.cc:858
3447 msgid "Error writing to file"
3448 msgstr ""
3449
3450-#: methods/http.cc:880
3451+#: methods/http.cc:886
3452 msgid "Error writing to the file"
3453 msgstr ""
3454
3455-#: methods/http.cc:894
3456+#: methods/http.cc:900
3457 msgid "Error reading from server. Remote end closed connection"
3458 msgstr ""
3459
3460-#: methods/http.cc:896
3461+#: methods/http.cc:902
3462 msgid "Error reading from server"
3463 msgstr ""
3464
3465-#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
3466+#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
3467 msgid "Failed to truncate file"
3468 msgstr ""
3469
3470-#: methods/http.cc:1154
3471+#: methods/http.cc:1160
3472 msgid "Bad header data"
3473 msgstr ""
3474
3475-#: methods/http.cc:1171 methods/http.cc:1226
3476+#: methods/http.cc:1177 methods/http.cc:1232
3477 msgid "Connection failed"
3478 msgstr ""
3479
3480-#: methods/http.cc:1318
3481+#: methods/http.cc:1324
3482 msgid "Internal error"
3483 msgstr ""
3484
3485@@ -2137,14 +2144,14 @@
3486 msgid "Unable to stat the mount point %s"
3487 msgstr ""
3488
3489-#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
3490-#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
3491+#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
3492+#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
3493 #: methods/mirror.cc:93
3494 #, c-format
3495 msgid "Unable to change to %s"
3496 msgstr ""
3497
3498-#: apt-pkg/contrib/cdromutl.cc:204
3499+#: apt-pkg/contrib/cdromutl.cc:217
3500 msgid "Failed to stat the cdrom"
3501 msgstr ""
3502
3503@@ -2168,149 +2175,149 @@
3504 msgid "Could not get lock %s"
3505 msgstr ""
3506
3507-#: apt-pkg/contrib/fileutl.cc:621
3508+#: apt-pkg/contrib/fileutl.cc:643
3509 #, c-format
3510 msgid "Waited for %s but it wasn't there"
3511 msgstr ""
3512
3513-#: apt-pkg/contrib/fileutl.cc:633
3514+#: apt-pkg/contrib/fileutl.cc:655
3515 #, c-format
3516 msgid "Sub-process %s received a segmentation fault."
3517 msgstr ""
3518
3519-#: apt-pkg/contrib/fileutl.cc:635
3520+#: apt-pkg/contrib/fileutl.cc:657
3521 #, c-format
3522 msgid "Sub-process %s received signal %u."
3523 msgstr ""
3524
3525-#: apt-pkg/contrib/fileutl.cc:639
3526+#: apt-pkg/contrib/fileutl.cc:661
3527 #, c-format
3528 msgid "Sub-process %s returned an error code (%u)"
3529 msgstr ""
3530
3531-#: apt-pkg/contrib/fileutl.cc:641
3532+#: apt-pkg/contrib/fileutl.cc:663
3533 #, c-format
3534 msgid "Sub-process %s exited unexpectedly"
3535 msgstr ""
3536
3537-#: apt-pkg/contrib/fileutl.cc:697
3538+#: apt-pkg/contrib/fileutl.cc:728
3539 #, c-format
3540 msgid "Could not open file %s"
3541 msgstr ""
3542
3543-#: apt-pkg/contrib/fileutl.cc:714
3544+#: apt-pkg/contrib/fileutl.cc:745
3545 #, c-format
3546 msgid "Could not open file descriptor %d"
3547 msgstr ""
3548
3549-#: apt-pkg/contrib/fileutl.cc:774
3550+#: apt-pkg/contrib/fileutl.cc:805
3551 #, c-format
3552 msgid "read, still have %lu to read but none left"
3553 msgstr ""
3554
3555-#: apt-pkg/contrib/fileutl.cc:807
3556+#: apt-pkg/contrib/fileutl.cc:838
3557 #, c-format
3558 msgid "write, still have %lu to write but couldn't"
3559 msgstr ""
3560
3561-#: apt-pkg/contrib/fileutl.cc:906
3562+#: apt-pkg/contrib/fileutl.cc:937
3563 #, c-format
3564 msgid "Problem closing the gzip file %s"
3565 msgstr ""
3566
3567-#: apt-pkg/contrib/fileutl.cc:909
3568+#: apt-pkg/contrib/fileutl.cc:940
3569 #, c-format
3570 msgid "Problem closing the file %s"
3571 msgstr ""
3572
3573-#: apt-pkg/contrib/fileutl.cc:914
3574+#: apt-pkg/contrib/fileutl.cc:945
3575 #, c-format
3576 msgid "Problem renaming the file %s to %s"
3577 msgstr ""
3578
3579-#: apt-pkg/contrib/fileutl.cc:925
3580+#: apt-pkg/contrib/fileutl.cc:956
3581 #, c-format
3582 msgid "Problem unlinking the file %s"
3583 msgstr ""
3584
3585-#: apt-pkg/contrib/fileutl.cc:938
3586+#: apt-pkg/contrib/fileutl.cc:969
3587 msgid "Problem syncing the file"
3588 msgstr ""
3589
3590-#: apt-pkg/pkgcache.cc:142
3591+#: apt-pkg/pkgcache.cc:145
3592 msgid "Empty package cache"
3593 msgstr ""
3594
3595-#: apt-pkg/pkgcache.cc:148
3596+#: apt-pkg/pkgcache.cc:151
3597 msgid "The package cache file is corrupted"
3598 msgstr ""
3599
3600-#: apt-pkg/pkgcache.cc:153
3601+#: apt-pkg/pkgcache.cc:156
3602 msgid "The package cache file is an incompatible version"
3603 msgstr ""
3604
3605-#: apt-pkg/pkgcache.cc:158
3606+#: apt-pkg/pkgcache.cc:161
3607 #, c-format
3608 msgid "This APT does not support the versioning system '%s'"
3609 msgstr ""
3610
3611-#: apt-pkg/pkgcache.cc:163
3612+#: apt-pkg/pkgcache.cc:166
3613 msgid "The package cache was built for a different architecture"
3614 msgstr ""
3615
3616-#: apt-pkg/pkgcache.cc:290
3617+#: apt-pkg/pkgcache.cc:293
3618 msgid "Depends"
3619 msgstr ""
3620
3621-#: apt-pkg/pkgcache.cc:290
3622+#: apt-pkg/pkgcache.cc:293
3623 msgid "PreDepends"
3624 msgstr ""
3625
3626-#: apt-pkg/pkgcache.cc:290
3627+#: apt-pkg/pkgcache.cc:293
3628 msgid "Suggests"
3629 msgstr ""
3630
3631-#: apt-pkg/pkgcache.cc:291
3632+#: apt-pkg/pkgcache.cc:294
3633 msgid "Recommends"
3634 msgstr ""
3635
3636-#: apt-pkg/pkgcache.cc:291
3637+#: apt-pkg/pkgcache.cc:294
3638 msgid "Conflicts"
3639 msgstr ""
3640
3641-#: apt-pkg/pkgcache.cc:291
3642+#: apt-pkg/pkgcache.cc:294
3643 msgid "Replaces"
3644 msgstr ""
3645
3646-#: apt-pkg/pkgcache.cc:292
3647+#: apt-pkg/pkgcache.cc:295
3648 msgid "Obsoletes"
3649 msgstr ""
3650
3651-#: apt-pkg/pkgcache.cc:292
3652+#: apt-pkg/pkgcache.cc:295
3653 msgid "Breaks"
3654 msgstr ""
3655
3656-#: apt-pkg/pkgcache.cc:292
3657+#: apt-pkg/pkgcache.cc:295
3658 msgid "Enhances"
3659 msgstr ""
3660
3661-#: apt-pkg/pkgcache.cc:303
3662+#: apt-pkg/pkgcache.cc:306
3663 msgid "important"
3664 msgstr ""
3665
3666-#: apt-pkg/pkgcache.cc:303
3667+#: apt-pkg/pkgcache.cc:306
3668 msgid "required"
3669 msgstr ""
3670
3671-#: apt-pkg/pkgcache.cc:303
3672+#: apt-pkg/pkgcache.cc:306
3673 msgid "standard"
3674 msgstr ""
3675
3676-#: apt-pkg/pkgcache.cc:304
3677+#: apt-pkg/pkgcache.cc:307
3678 msgid "optional"
3679 msgstr ""
3680
3681-#: apt-pkg/pkgcache.cc:304
3682+#: apt-pkg/pkgcache.cc:307
3683 msgid "extra"
3684 msgstr ""
3685
3686@@ -2428,7 +2435,7 @@
3687 #: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
3688 #, c-format
3689 msgid ""
3690-"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
3691+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
3692 "under APT::Immediate-Configure for details. (%d)"
3693 msgstr ""
3694
3695@@ -2443,7 +2450,7 @@
3696 #: apt-pkg/packagemanager.cc:495
3697 #, c-format
3698 msgid ""
3699-"Could not perform immediate configuration on already unpacked '%s'.Please "
3700+"Could not perform immediate configuration on already unpacked '%s'. Please "
3701 "see man 5 apt.conf under APT::Immediate-Configure for details."
3702 msgstr ""
3703
3704@@ -2458,17 +2465,17 @@
3705 "The package %s needs to be reinstalled, but I can't find an archive for it."
3706 msgstr ""
3707
3708-#: apt-pkg/algorithms.cc:1182
3709+#: apt-pkg/algorithms.cc:1210
3710 msgid ""
3711 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
3712 "held packages."
3713 msgstr ""
3714
3715-#: apt-pkg/algorithms.cc:1184
3716+#: apt-pkg/algorithms.cc:1212
3717 msgid "Unable to correct problems, you have held broken packages."
3718 msgstr ""
3719
3720-#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
3721+#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
3722 msgid ""
3723 "Some index files failed to download, they have been ignored, or old ones "
3724 "used instead."
3725@@ -2491,12 +2498,12 @@
3726
3727 #. only show the ETA if it makes sense
3728 #. two days
3729-#: apt-pkg/acquire.cc:878
3730+#: apt-pkg/acquire.cc:857
3731 #, c-format
3732 msgid "Retrieving file %li of %li (%s remaining)"
3733 msgstr ""
3734
3735-#: apt-pkg/acquire.cc:880
3736+#: apt-pkg/acquire.cc:859
3737 #, c-format
3738 msgid "Retrieving file %li of %li"
3739 msgstr ""
3740@@ -2516,12 +2523,12 @@
3741 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
3742 msgstr ""
3743
3744-#: apt-pkg/init.cc:141
3745+#: apt-pkg/init.cc:143
3746 #, c-format
3747 msgid "Packaging system '%s' is not supported"
3748 msgstr ""
3749
3750-#: apt-pkg/init.cc:157
3751+#: apt-pkg/init.cc:159
3752 msgid "Unable to determine a suitable packaging system type"
3753 msgstr ""
3754
3755@@ -2542,17 +2549,21 @@
3756 msgid "You may want to run apt-get update to correct these problems"
3757 msgstr ""
3758
3759-#: apt-pkg/policy.cc:343
3760+#: apt-pkg/cachefile.cc:106
3761+msgid "The list of sources could not be read."
3762+msgstr ""
3763+
3764+#: apt-pkg/policy.cc:344
3765 #, c-format
3766 msgid "Invalid record in the preferences file %s, no Package header"
3767 msgstr ""
3768
3769-#: apt-pkg/policy.cc:365
3770+#: apt-pkg/policy.cc:366
3771 #, c-format
3772 msgid "Did not understand pin type %s"
3773 msgstr ""
3774
3775-#: apt-pkg/policy.cc:373
3776+#: apt-pkg/policy.cc:374
3777 msgid "No priority (or zero) specified for pin"
3778 msgstr ""
3779
3780@@ -2654,61 +2665,61 @@
3781 msgid "MD5Sum mismatch"
3782 msgstr ""
3783
3784-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
3785-#: apt-pkg/acquire-item.cc:1713
3786+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
3787+#: apt-pkg/acquire-item.cc:1717
3788 msgid "Hash Sum mismatch"
3789 msgstr ""
3790
3791-#: apt-pkg/acquire-item.cc:1240
3792+#: apt-pkg/acquire-item.cc:1244
3793 msgid "There is no public key available for the following key IDs:\n"
3794 msgstr ""
3795
3796 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
3797 #. the time since then the file is invalid - formated in the same way as in
3798 #. the download progress display (e.g. 7d 3h 42min 1s)
3799-#: apt-pkg/acquire-item.cc:1277
3800+#: apt-pkg/acquire-item.cc:1281
3801 #, c-format
3802 msgid "Release file expired, ignoring %s (invalid since %s)"
3803 msgstr ""
3804
3805-#: apt-pkg/acquire-item.cc:1298
3806+#: apt-pkg/acquire-item.cc:1302
3807 #, c-format
3808 msgid "Conflicting distribution: %s (expected %s but got %s)"
3809 msgstr ""
3810
3811-#: apt-pkg/acquire-item.cc:1324
3812+#: apt-pkg/acquire-item.cc:1328
3813 #, c-format
3814 msgid ""
3815 "A error occurred during the signature verification. The repository is not "
3816 "updated and the previous index files will be used. GPG error: %s: %s\n"
3817 msgstr ""
3818
3819-#: apt-pkg/acquire-item.cc:1333
3820+#: apt-pkg/acquire-item.cc:1337
3821 #, c-format
3822 msgid "GPG error: %s: %s"
3823 msgstr ""
3824
3825-#: apt-pkg/acquire-item.cc:1361
3826+#: apt-pkg/acquire-item.cc:1365
3827 #, c-format
3828 msgid ""
3829 "I wasn't able to locate a file for the %s package. This might mean you need "
3830 "to manually fix this package. (due to missing arch)"
3831 msgstr ""
3832
3833-#: apt-pkg/acquire-item.cc:1420
3834+#: apt-pkg/acquire-item.cc:1424
3835 #, c-format
3836 msgid ""
3837 "I wasn't able to locate file for the %s package. This might mean you need to "
3838 "manually fix this package."
3839 msgstr ""
3840
3841-#: apt-pkg/acquire-item.cc:1475
3842+#: apt-pkg/acquire-item.cc:1479
3843 #, c-format
3844 msgid ""
3845 "The package index files are corrupted. No Filename: field for package %s."
3846 msgstr ""
3847
3848-#: apt-pkg/acquire-item.cc:1562
3849+#: apt-pkg/acquire-item.cc:1566
3850 msgid "Size mismatch"
3851 msgstr ""
3852
3853@@ -2825,37 +2836,37 @@
3854 msgid "Source list entries for this disc are:\n"
3855 msgstr ""
3856
3857-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
3858+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
3859 #, c-format
3860 msgid "Wrote %i records.\n"
3861 msgstr ""
3862
3863-#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
3864+#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
3865 #, c-format
3866 msgid "Wrote %i records with %i missing files.\n"
3867 msgstr ""
3868
3869-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
3870+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
3871 #, c-format
3872 msgid "Wrote %i records with %i mismatched files\n"
3873 msgstr ""
3874
3875-#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
3876+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
3877 #, c-format
3878 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
3879 msgstr ""
3880
3881-#: apt-pkg/indexcopy.cc:532
3882+#: apt-pkg/indexcopy.cc:537
3883 #, c-format
3884 msgid "Skipping nonexistent file %s"
3885 msgstr ""
3886
3887-#: apt-pkg/indexcopy.cc:538
3888+#: apt-pkg/indexcopy.cc:543
3889 #, c-format
3890 msgid "Can't find authentication record for: %s"
3891 msgstr ""
3892
3893-#: apt-pkg/indexcopy.cc:544
3894+#: apt-pkg/indexcopy.cc:549
3895 #, c-format
3896 msgid "Hash mismatch for: %s"
3897 msgstr ""
3898@@ -2912,12 +2923,12 @@
3899 msgid "Installing %s"
3900 msgstr ""
3901
3902-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
3903+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822
3904 #, c-format
3905 msgid "Configuring %s"
3906 msgstr ""
3907
3908-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
3909+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829
3910 #, c-format
3911 msgid "Removing %s"
3912 msgstr ""
3913@@ -2937,92 +2948,93 @@
3914 msgid "Running post-installation trigger %s"
3915 msgstr ""
3916
3917-#: apt-pkg/deb/dpkgpm.cc:643
3918+#. FIXME: use a better string after freeze
3919+#: apt-pkg/deb/dpkgpm.cc:646
3920 #, c-format
3921 msgid "Directory '%s' missing"
3922 msgstr ""
3923
3924-#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
3925+#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674
3926 #, c-format
3927 msgid "Could not open file '%s'"
3928 msgstr ""
3929
3930-#: apt-pkg/deb/dpkgpm.cc:812
3931+#: apt-pkg/deb/dpkgpm.cc:815
3932 #, c-format
3933 msgid "Preparing %s"
3934 msgstr ""
3935
3936-#: apt-pkg/deb/dpkgpm.cc:813
3937+#: apt-pkg/deb/dpkgpm.cc:816
3938 #, c-format
3939 msgid "Unpacking %s"
3940 msgstr ""
3941
3942-#: apt-pkg/deb/dpkgpm.cc:818
3943+#: apt-pkg/deb/dpkgpm.cc:821
3944 #, c-format
3945 msgid "Preparing to configure %s"
3946 msgstr ""
3947
3948-#: apt-pkg/deb/dpkgpm.cc:820
3949+#: apt-pkg/deb/dpkgpm.cc:823
3950 #, c-format
3951 msgid "Installed %s"
3952 msgstr ""
3953
3954-#: apt-pkg/deb/dpkgpm.cc:825
3955+#: apt-pkg/deb/dpkgpm.cc:828
3956 #, c-format
3957 msgid "Preparing for removal of %s"
3958 msgstr ""
3959
3960-#: apt-pkg/deb/dpkgpm.cc:827
3961+#: apt-pkg/deb/dpkgpm.cc:830
3962 #, c-format
3963 msgid "Removed %s"
3964 msgstr ""
3965
3966-#: apt-pkg/deb/dpkgpm.cc:832
3967+#: apt-pkg/deb/dpkgpm.cc:835
3968 #, c-format
3969 msgid "Preparing to completely remove %s"
3970 msgstr ""
3971
3972-#: apt-pkg/deb/dpkgpm.cc:833
3973+#: apt-pkg/deb/dpkgpm.cc:836
3974 #, c-format
3975 msgid "Completely removed %s"
3976 msgstr ""
3977
3978-#: apt-pkg/deb/dpkgpm.cc:1039
3979+#: apt-pkg/deb/dpkgpm.cc:1042
3980 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
3981 msgstr ""
3982
3983-#: apt-pkg/deb/dpkgpm.cc:1070
3984+#: apt-pkg/deb/dpkgpm.cc:1073
3985 msgid "Running dpkg"
3986 msgstr ""
3987
3988-#: apt-pkg/deb/dpkgpm.cc:1273
3989+#: apt-pkg/deb/dpkgpm.cc:1276
3990 msgid "No apport report written because MaxReports is reached already"
3991 msgstr ""
3992
3993 #. check if its not a follow up error
3994-#: apt-pkg/deb/dpkgpm.cc:1278
3995+#: apt-pkg/deb/dpkgpm.cc:1281
3996 msgid "dependency problems - leaving unconfigured"
3997 msgstr ""
3998
3999-#: apt-pkg/deb/dpkgpm.cc:1280
4000+#: apt-pkg/deb/dpkgpm.cc:1283
4001 msgid ""
4002 "No apport report written because the error message indicates its a followup "
4003 "error from a previous failure."
4004 msgstr ""
4005
4006-#: apt-pkg/deb/dpkgpm.cc:1286
4007+#: apt-pkg/deb/dpkgpm.cc:1289
4008 msgid ""
4009 "No apport report written because the error message indicates a disk full "
4010 "error"
4011 msgstr ""
4012
4013-#: apt-pkg/deb/dpkgpm.cc:1292
4014+#: apt-pkg/deb/dpkgpm.cc:1295
4015 msgid ""
4016 "No apport report written because the error message indicates a out of memory "
4017 "error"
4018 msgstr ""
4019
4020-#: apt-pkg/deb/dpkgpm.cc:1299
4021+#: apt-pkg/deb/dpkgpm.cc:1302
4022 msgid ""
4023 "No apport report written because the error message indicates a dpkg I/O error"
4024 msgstr ""
4025
4026=== modified file 'po/ar.po'
4027--- po/ar.po 2010-09-09 20:23:31 +0000
4028+++ po/ar.po 2010-10-13 18:37:00 +0000
4029@@ -6,7 +6,7 @@
4030 msgstr ""
4031 "Project-Id-Version: apt_po\n"
4032 "Report-Msgid-Bugs-To: \n"
4033-"POT-Creation-Date: 2010-08-23 18:41-0400\n"
4034+"POT-Creation-Date: 2010-09-28 17:23+0200\n"
4035 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
4036 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
4037 "Language-Team: Arabic <support@arabeyes.org>\n"
4038@@ -153,14 +153,14 @@
4039 msgid " Version table:"
4040 msgstr " جدول النسخ:"
4041
4042-#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
4043-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
4044-#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
4045+#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
4046+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
4047+#: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144
4048 #, fuzzy, c-format
4049 msgid "%s %s for %s compiled on %s %s\n"
4050 msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
4051
4052-#: cmdline/apt-cache.cc:1739
4053+#: cmdline/apt-cache.cc:1745
4054 msgid ""
4055 "Usage: apt-cache [options] command\n"
4056 " apt-cache [options] add file1 [file2 ...]\n"
4057@@ -266,31 +266,31 @@
4058 msgid "Cannot get debconf version. Is debconf installed?"
4059 msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
4060
4061-#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
4062+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
4063 msgid "Package extension list is too long"
4064 msgstr "قائمة توسيعات الحزمة طويلة جداً"
4065
4066-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
4067-#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
4068-#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
4069+#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
4070+#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
4071+#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
4072 #, c-format
4073 msgid "Error processing directory %s"
4074 msgstr "خطأ في معالجة الدليل %s"
4075
4076-#: ftparchive/apt-ftparchive.cc:258
4077+#: ftparchive/apt-ftparchive.cc:260
4078 msgid "Source extension list is too long"
4079 msgstr "قائمة توسيعات المصدر طويلة جداً"
4080
4081-#: ftparchive/apt-ftparchive.cc:375
4082+#: ftparchive/apt-ftparchive.cc:377
4083 msgid "Error writing header to contents file"
4084 msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
4085
4086-#: ftparchive/apt-ftparchive.cc:405
4087+#: ftparchive/apt-ftparchive.cc:407
4088 #, c-format
4089 msgid "Error processing contents %s"
4090 msgstr "خطأ في معالجة المحتويات %s"
4091
4092-#: ftparchive/apt-ftparchive.cc:590
4093+#: ftparchive/apt-ftparchive.cc:595
4094 msgid ""
4095 "Usage: apt-ftparchive [options] command\n"
4096 "Commands: packages binarypath [overridefile [pathprefix]]\n"
4097@@ -332,11 +332,11 @@
4098 " -o=? Set an arbitrary configuration option"
4099 msgstr ""
4100
4101-#: ftparchive/apt-ftparchive.cc:796
4102+#: ftparchive/apt-ftparchive.cc:801
4103 msgid "No selections matched"
4104 msgstr "لم تُطابق أية تحديدات"
4105
4106-#: ftparchive/apt-ftparchive.cc:874
4107+#: ftparchive/apt-ftparchive.cc:879
4108 #, c-format
4109 msgid "Some files are missing in the package file group `%s'"
4110 msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
4111@@ -446,7 +446,7 @@
4112 msgid " %s has no override entry\n"
4113 msgstr ""
4114
4115-#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
4116+#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
4117 #, c-format
4118 msgid " %s maintainer is %s not %s\n"
4119 msgstr ""
4120@@ -556,79 +556,79 @@
4121 msgid "Failed to rename %s to %s"
4122 msgstr "فشل تغيير اسم %s إلى %s"
4123
4124-#: cmdline/apt-get.cc:134
4125+#: cmdline/apt-get.cc:135
4126 msgid "Y"
4127 msgstr "Y"
4128
4129-#: cmdline/apt-get.cc:156 apt-pkg/cachefilter.cc:29
4130+#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
4131 #, c-format
4132 msgid "Regex compilation error - %s"
4133 msgstr ""
4134
4135-#: cmdline/apt-get.cc:251
4136+#: cmdline/apt-get.cc:252
4137 msgid "The following packages have unmet dependencies:"
4138 msgstr ""
4139
4140-#: cmdline/apt-get.cc:341
4141+#: cmdline/apt-get.cc:342
4142 #, c-format
4143 msgid "but %s is installed"
4144 msgstr "إلا أن %s مثبت"
4145
4146-#: cmdline/apt-get.cc:343
4147+#: cmdline/apt-get.cc:344
4148 #, c-format
4149 msgid "but %s is to be installed"
4150 msgstr "إلا أنه سيتم تثبيت %s"
4151
4152-#: cmdline/apt-get.cc:350
4153+#: cmdline/apt-get.cc:351
4154 msgid "but it is not installable"
4155 msgstr "إلا أنه غير قابل للتثبيت"
4156
4157-#: cmdline/apt-get.cc:352
4158+#: cmdline/apt-get.cc:353
4159 msgid "but it is a virtual package"
4160 msgstr "إلا أنها حزمة وهمية"
4161
4162-#: cmdline/apt-get.cc:355
4163+#: cmdline/apt-get.cc:356
4164 msgid "but it is not installed"
4165 msgstr "إلا أنها غير مثبتة"
4166
4167-#: cmdline/apt-get.cc:355
4168+#: cmdline/apt-get.cc:356
4169 msgid "but it is not going to be installed"
4170 msgstr "إلا أنه لن يتم تثبيتها"
4171
4172-#: cmdline/apt-get.cc:360
4173+#: cmdline/apt-get.cc:361
4174 msgid " or"
4175 msgstr " أو"
4176
4177-#: cmdline/apt-get.cc:391
4178+#: cmdline/apt-get.cc:392
4179 msgid "The following NEW packages will be installed:"
4180 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
4181
4182-#: cmdline/apt-get.cc:419
4183+#: cmdline/apt-get.cc:420
4184 msgid "The following packages will be REMOVED:"
4185 msgstr "سيتم إزالة الحزم التالية:"
4186
4187-#: cmdline/apt-get.cc:441
4188+#: cmdline/apt-get.cc:442
4189 msgid "The following packages have been kept back:"
4190 msgstr "سيتم الإبقاء على الحزم التالية:"
4191
4192-#: cmdline/apt-get.cc:464
4193+#: cmdline/apt-get.cc:465
4194 msgid "The following packages will be upgraded:"
4195 msgstr "ستتم ترقية الحزم التالية:"
4196
4197-#: cmdline/apt-get.cc:487
4198+#: cmdline/apt-get.cc:488
4199 msgid "The following packages will be DOWNGRADED:"
4200 msgstr "سيتم تثبيط الحزم التالية:"
4201
4202-#: cmdline/apt-get.cc:507
4203+#: cmdline/apt-get.cc:508
4204 msgid "The following held packages will be changed:"
4205 msgstr "سيتم تغيير الحزم المبقاة التالية:"
4206
4207-#: cmdline/apt-get.cc:560
4208+#: cmdline/apt-get.cc:561
4209 #, c-format
4210 msgid "%s (due to %s) "
4211 msgstr "%s (بسبب %s) "
4212
4213-#: cmdline/apt-get.cc:568
4214+#: cmdline/apt-get.cc:569
4215 msgid ""
4216 "WARNING: The following essential packages will be removed.\n"
4217 "This should NOT be done unless you know exactly what you are doing!"
4218@@ -636,64 +636,64 @@
4219 "تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
4220 "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
4221
4222-#: cmdline/apt-get.cc:602
4223+#: cmdline/apt-get.cc:603
4224 #, c-format
4225 msgid "%lu upgraded, %lu newly installed, "
4226 msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
4227
4228-#: cmdline/apt-get.cc:606
4229+#: cmdline/apt-get.cc:607
4230 #, c-format
4231 msgid "%lu reinstalled, "
4232 msgstr "%lu أعيد تثبيتها، "
4233
4234-#: cmdline/apt-get.cc:608
4235+#: cmdline/apt-get.cc:609
4236 #, c-format
4237 msgid "%lu downgraded, "
4238 msgstr "%lu مثبطة، "
4239
4240-#: cmdline/apt-get.cc:610
4241+#: cmdline/apt-get.cc:611
4242 #, c-format
4243 msgid "%lu to remove and %lu not upgraded.\n"
4244 msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
4245
4246-#: cmdline/apt-get.cc:614
4247+#: cmdline/apt-get.cc:615
4248 #, c-format
4249 msgid "%lu not fully installed or removed.\n"
4250 msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
4251
4252-#: cmdline/apt-get.cc:634
4253+#: cmdline/apt-get.cc:635
4254 #, fuzzy, c-format
4255 msgid "Note, selecting '%s' for task '%s'\n"
4256 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
4257
4258-#: cmdline/apt-get.cc:640
4259+#: cmdline/apt-get.cc:641
4260 #, fuzzy, c-format
4261 msgid "Note, selecting '%s' for regex '%s'\n"
4262 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
4263
4264-#: cmdline/apt-get.cc:647
4265+#: cmdline/apt-get.cc:648
4266 #, fuzzy, c-format
4267 msgid "Selected version '%s' (%s) for '%s'\n"
4268 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
4269
4270-#: cmdline/apt-get.cc:657
4271+#: cmdline/apt-get.cc:658
4272 #, c-format
4273 msgid "Package %s is a virtual package provided by:\n"
4274 msgstr "الحزمة %s وهميّة وتوفّرها:\n"
4275
4276-#: cmdline/apt-get.cc:668
4277+#: cmdline/apt-get.cc:669
4278 msgid " [Installed]"
4279 msgstr " [مُثبّتة]"
4280
4281-#: cmdline/apt-get.cc:677
4282+#: cmdline/apt-get.cc:678
4283 msgid " [Not candidate version]"
4284 msgstr ""
4285
4286-#: cmdline/apt-get.cc:679
4287+#: cmdline/apt-get.cc:680
4288 msgid "You should explicitly select one to install."
4289 msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
4290
4291-#: cmdline/apt-get.cc:682
4292+#: cmdline/apt-get.cc:683
4293 #, c-format
4294 msgid ""
4295 "Package %s is not available, but is referred to by another package.\n"
4296@@ -701,164 +701,167 @@
4297 "is only available from another source\n"
4298 msgstr ""
4299
4300-#: cmdline/apt-get.cc:700
4301+#: cmdline/apt-get.cc:701
4302 msgid "However the following packages replace it:"
4303 msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
4304
4305-#: cmdline/apt-get.cc:712
4306+#: cmdline/apt-get.cc:713
4307 #, fuzzy, c-format
4308 msgid "Package '%s' has no installation candidate"
4309 msgstr "الحزمة %s ليس لها مرشح تثبيت"
4310
4311-#: cmdline/apt-get.cc:723
4312+#: cmdline/apt-get.cc:724
4313 #, c-format
4314 msgid "Virtual packages like '%s' can't be removed\n"
4315 msgstr ""
4316
4317-#: cmdline/apt-get.cc:754
4318+#: cmdline/apt-get.cc:755
4319 #, fuzzy, c-format
4320 msgid "Note, selecting '%s' instead of '%s'\n"
4321 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
4322
4323-#: cmdline/apt-get.cc:784
4324+#: cmdline/apt-get.cc:785
4325 #, c-format
4326 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
4327 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
4328
4329-#: cmdline/apt-get.cc:788
4330+#: cmdline/apt-get.cc:789
4331 #, fuzzy, c-format
4332 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
4333 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
4334
4335-#: cmdline/apt-get.cc:798
4336+#: cmdline/apt-get.cc:799
4337 #, c-format
4338 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
4339 msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
4340
4341-#: cmdline/apt-get.cc:803
4342+#: cmdline/apt-get.cc:804
4343 #, c-format
4344 msgid "%s is already the newest version.\n"
4345 msgstr "%s هي النسخة الأحدث.\n"
4346
4347-#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
4348+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
4349 #, fuzzy, c-format
4350 msgid "%s set to manually installed.\n"
4351 msgstr "إلا أنه سيتم تثبيت %s"
4352
4353-#: cmdline/apt-get.cc:859
4354+#: cmdline/apt-get.cc:863
4355 #, c-format
4356 msgid "Package %s is not installed, so not removed\n"
4357 msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
4358
4359-#: cmdline/apt-get.cc:934
4360+#: cmdline/apt-get.cc:938
4361 msgid "Correcting dependencies..."
4362 msgstr "تصحيح المعتمدات..."
4363
4364-#: cmdline/apt-get.cc:937
4365+#: cmdline/apt-get.cc:941
4366 msgid " failed."
4367 msgstr " فشل."
4368
4369-#: cmdline/apt-get.cc:940
4370+#: cmdline/apt-get.cc:944
4371 msgid "Unable to correct dependencies"
4372 msgstr "لم يمكن تصحيح المعتمدات"
4373
4374-#: cmdline/apt-get.cc:943
4375+#: cmdline/apt-get.cc:947
4376 msgid "Unable to minimize the upgrade set"
4377 msgstr "لم يمكن تقليص مجموعة الترقية"
4378
4379-#: cmdline/apt-get.cc:945
4380+#: cmdline/apt-get.cc:949
4381 msgid " Done"
4382 msgstr " تم"
4383
4384-#: cmdline/apt-get.cc:949
4385+#: cmdline/apt-get.cc:953
4386 msgid "You might want to run 'apt-get -f install' to correct these."
4387 msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
4388
4389-#: cmdline/apt-get.cc:952
4390+#: cmdline/apt-get.cc:956
4391 msgid "Unmet dependencies. Try using -f."
4392 msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
4393
4394-#: cmdline/apt-get.cc:977
4395+#: cmdline/apt-get.cc:981
4396 msgid "WARNING: The following packages cannot be authenticated!"
4397 msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
4398
4399-#: cmdline/apt-get.cc:981
4400+#: cmdline/apt-get.cc:985
4401 msgid "Authentication warning overridden.\n"
4402 msgstr "تم غض النظر عن تحذير المصادقة.\n"
4403
4404-#: cmdline/apt-get.cc:988
4405+#: cmdline/apt-get.cc:992
4406 msgid "Install these packages without verification [y/N]? "
4407 msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ "
4408
4409-#: cmdline/apt-get.cc:990
4410+#: cmdline/apt-get.cc:994
4411 msgid "Some packages could not be authenticated"
4412 msgstr "تعذرت المصادقة على بعض الحزم"
4413
4414-#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
4415+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
4416 msgid "There are problems and -y was used without --force-yes"
4417 msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
4418
4419-#: cmdline/apt-get.cc:1040
4420+#: cmdline/apt-get.cc:1044
4421 msgid "Internal error, InstallPackages was called with broken packages!"
4422 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
4423
4424-#: cmdline/apt-get.cc:1049
4425+#: cmdline/apt-get.cc:1053
4426 msgid "Packages need to be removed but remove is disabled."
4427 msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
4428
4429-#: cmdline/apt-get.cc:1060
4430+#: cmdline/apt-get.cc:1064
4431 msgid "Internal error, Ordering didn't finish"
4432 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
4433
4434-#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
4435-#: apt-pkg/cachefile.cc:106
4436-msgid "The list of sources could not be read."
4437-msgstr "تعذرت قراءة قائمة المصادر."
4438-
4439-#: cmdline/apt-get.cc:1100
4440+#: cmdline/apt-get.cc:1104
4441 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
4442 msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
4443
4444-#: cmdline/apt-get.cc:1105
4445+#. TRANSLATOR: The required space between number and unit is already included
4446+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
4447+#: cmdline/apt-get.cc:1111
4448 #, c-format
4449 msgid "Need to get %sB/%sB of archives.\n"
4450 msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n"
4451
4452-#: cmdline/apt-get.cc:1108
4453+#. TRANSLATOR: The required space between number and unit is already included
4454+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
4455+#: cmdline/apt-get.cc:1116
4456 #, c-format
4457 msgid "Need to get %sB of archives.\n"
4458 msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
4459
4460-#: cmdline/apt-get.cc:1113
4461+#. TRANSLATOR: The required space between number and unit is already included
4462+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
4463+#: cmdline/apt-get.cc:1123
4464 #, fuzzy, c-format
4465 msgid "After this operation, %sB of additional disk space will be used.\n"
4466 msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
4467
4468-#: cmdline/apt-get.cc:1116
4469+#. TRANSLATOR: The required space between number and unit is already included
4470+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
4471+#: cmdline/apt-get.cc:1128
4472 #, fuzzy, c-format
4473 msgid "After this operation, %sB disk space will be freed.\n"
4474 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
4475
4476-#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
4477-#: cmdline/apt-get.cc:2322
4478+#: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
4479+#: cmdline/apt-get.cc:2335
4480 #, c-format
4481 msgid "Couldn't determine free space in %s"
4482 msgstr "تعذر حساب المساحة الحرة في %s"
4483
4484-#: cmdline/apt-get.cc:1144
4485+#: cmdline/apt-get.cc:1156
4486 #, c-format
4487 msgid "You don't have enough free space in %s."
4488 msgstr "ليس هناك مساحة كافية في %s."
4489
4490-#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
4491+#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
4492 msgid "Trivial Only specified but this is not a trivial operation."
4493 msgstr ""
4494
4495-#: cmdline/apt-get.cc:1162
4496+#: cmdline/apt-get.cc:1174
4497 msgid "Yes, do as I say!"
4498 msgstr "نعم، افعل ما أقوله!"
4499
4500-#: cmdline/apt-get.cc:1164
4501+#: cmdline/apt-get.cc:1176
4502 #, c-format
4503 msgid ""
4504 "You are about to do something potentially harmful.\n"
4505@@ -869,28 +872,28 @@
4506 "كي تستمر اكتب العبارة '%s'\n"
4507 " ؟] "
4508
4509-#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
4510+#: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
4511 msgid "Abort."
4512 msgstr "إجهاض."
4513
4514-#: cmdline/apt-get.cc:1185
4515+#: cmdline/apt-get.cc:1197
4516 msgid "Do you want to continue [Y/n]? "
4517 msgstr "هل تريد الاستمرار [Y/n]؟"
4518
4519-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
4520+#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
4521 #, c-format
4522 msgid "Failed to fetch %s %s\n"
4523 msgstr "فشل إحضار %s %s\n"
4524
4525-#: cmdline/apt-get.cc:1275
4526+#: cmdline/apt-get.cc:1287
4527 msgid "Some files failed to download"
4528 msgstr "فشل تنزيل بعض الملفات"
4529
4530-#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
4531+#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
4532 msgid "Download complete and in download only mode"
4533 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
4534
4535-#: cmdline/apt-get.cc:1282
4536+#: cmdline/apt-get.cc:1294
4537 msgid ""
4538 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
4539 "missing?"
4540@@ -898,19 +901,19 @@
4541 "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
4542 "fix-missing؟"
4543
4544-#: cmdline/apt-get.cc:1286
4545+#: cmdline/apt-get.cc:1298
4546 msgid "--fix-missing and media swapping is not currently supported"
4547 msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
4548
4549-#: cmdline/apt-get.cc:1291
4550+#: cmdline/apt-get.cc:1303
4551 msgid "Unable to correct missing packages."
4552 msgstr "تعذر تصحيح الحزم المفقودة."
4553
4554-#: cmdline/apt-get.cc:1292
4555+#: cmdline/apt-get.cc:1304
4556 msgid "Aborting install."
4557 msgstr "إجهاض التثبيت."
4558
4559-#: cmdline/apt-get.cc:1320
4560+#: cmdline/apt-get.cc:1332
4561 msgid ""
4562 "The following package disappeared from your system as\n"
4563 "all files have been overwritten by other packages:"
4564@@ -920,35 +923,35 @@
4565 msgstr[0] ""
4566 msgstr[1] ""
4567
4568-#: cmdline/apt-get.cc:1324
4569+#: cmdline/apt-get.cc:1336
4570 msgid "Note: This is done automatic and on purpose by dpkg."
4571 msgstr ""
4572
4573-#: cmdline/apt-get.cc:1454
4574+#: cmdline/apt-get.cc:1466
4575 #, c-format
4576 msgid "Ignore unavailable target release '%s' of package '%s'"
4577 msgstr ""
4578
4579-#: cmdline/apt-get.cc:1486
4580+#: cmdline/apt-get.cc:1498
4581 #, c-format
4582 msgid "Picking '%s' as source package instead of '%s'\n"
4583 msgstr ""
4584
4585 #. if (VerTag.empty() == false && Last == 0)
4586-#: cmdline/apt-get.cc:1524
4587+#: cmdline/apt-get.cc:1536
4588 #, c-format
4589 msgid "Ignore unavailable version '%s' of package '%s'"
4590 msgstr ""
4591
4592-#: cmdline/apt-get.cc:1540
4593+#: cmdline/apt-get.cc:1552
4594 msgid "The update command takes no arguments"
4595 msgstr "لا يقبل الأمر update أية مُعطيات"
4596
4597-#: cmdline/apt-get.cc:1605
4598+#: cmdline/apt-get.cc:1618
4599 msgid "We are not supposed to delete stuff, can't start AutoRemover"
4600 msgstr ""
4601
4602-#: cmdline/apt-get.cc:1653
4603+#: cmdline/apt-get.cc:1666
4604 #, fuzzy
4605 msgid ""
4606 "The following package was automatically installed and is no longer required:"
4607@@ -958,7 +961,7 @@
4608 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
4609 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
4610
4611-#: cmdline/apt-get.cc:1657
4612+#: cmdline/apt-get.cc:1670
4613 #, fuzzy, c-format
4614 msgid "%lu package was automatically installed and is no longer required.\n"
4615 msgid_plural ""
4616@@ -966,11 +969,11 @@
4617 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
4618 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
4619
4620-#: cmdline/apt-get.cc:1659
4621+#: cmdline/apt-get.cc:1672
4622 msgid "Use 'apt-get autoremove' to remove them."
4623 msgstr ""
4624
4625-#: cmdline/apt-get.cc:1664
4626+#: cmdline/apt-get.cc:1677
4627 msgid ""
4628 "Hmm, seems like the AutoRemover destroyed something which really\n"
4629 "shouldn't happen. Please file a bug report against apt."
4630@@ -986,31 +989,31 @@
4631 #. "that package should be filed.") << endl;
4632 #. }
4633 #.
4634-#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
4635+#: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
4636 msgid "The following information may help to resolve the situation:"
4637 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
4638
4639-#: cmdline/apt-get.cc:1671
4640+#: cmdline/apt-get.cc:1684
4641 #, fuzzy
4642 msgid "Internal Error, AutoRemover broke stuff"
4643 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
4644
4645-#: cmdline/apt-get.cc:1690
4646+#: cmdline/apt-get.cc:1703
4647 msgid "Internal error, AllUpgrade broke stuff"
4648 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
4649
4650-#: cmdline/apt-get.cc:1779
4651+#: cmdline/apt-get.cc:1792
4652 msgid "You might want to run 'apt-get -f install' to correct these:"
4653 msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:"
4654
4655-#: cmdline/apt-get.cc:1782
4656+#: cmdline/apt-get.cc:1795
4657 msgid ""
4658 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
4659 "solution)."
4660 msgstr ""
4661 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
4662
4663-#: cmdline/apt-get.cc:1794
4664+#: cmdline/apt-get.cc:1807
4665 msgid ""
4666 "Some packages could not be installed. This may mean that you have\n"
4667 "requested an impossible situation or if you are using the unstable\n"
4668@@ -1018,69 +1021,69 @@
4669 "or been moved out of Incoming."
4670 msgstr ""
4671
4672-#: cmdline/apt-get.cc:1812
4673+#: cmdline/apt-get.cc:1825
4674 msgid "Broken packages"
4675 msgstr "حزم معطوبة"
4676
4677-#: cmdline/apt-get.cc:1841
4678+#: cmdline/apt-get.cc:1854
4679 msgid "The following extra packages will be installed:"
4680 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
4681
4682-#: cmdline/apt-get.cc:1931
4683+#: cmdline/apt-get.cc:1944
4684 msgid "Suggested packages:"
4685 msgstr "الحزم المقترحة:"
4686
4687-#: cmdline/apt-get.cc:1932
4688+#: cmdline/apt-get.cc:1945
4689 msgid "Recommended packages:"
4690 msgstr "الحزم المستحسنة:"
4691
4692-#: cmdline/apt-get.cc:1974
4693+#: cmdline/apt-get.cc:1987
4694 #, c-format
4695 msgid "Couldn't find package %s"
4696 msgstr "تعذر العثور على الحزمة %s"
4697
4698-#: cmdline/apt-get.cc:1981
4699+#: cmdline/apt-get.cc:1994
4700 #, fuzzy, c-format
4701 msgid "%s set to automatically installed.\n"
4702 msgstr "إلا أنه سيتم تثبيت %s"
4703
4704-#: cmdline/apt-get.cc:2002
4705+#: cmdline/apt-get.cc:2015
4706 msgid "Calculating upgrade... "
4707 msgstr "حساب الترقية..."
4708
4709-#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
4710+#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
4711 msgid "Failed"
4712 msgstr "فشل"
4713
4714-#: cmdline/apt-get.cc:2010
4715+#: cmdline/apt-get.cc:2023
4716 msgid "Done"
4717 msgstr "تمّ"
4718
4719-#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
4720+#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
4721 msgid "Internal error, problem resolver broke stuff"
4722 msgstr ""
4723
4724-#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
4725+#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
4726 msgid "Unable to lock the download directory"
4727 msgstr "تعذر قَفْل دليل التنزيل"
4728
4729-#: cmdline/apt-get.cc:2185
4730+#: cmdline/apt-get.cc:2198
4731 msgid "Must specify at least one package to fetch source for"
4732 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
4733
4734-#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
4735+#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
4736 #, c-format
4737 msgid "Unable to find a source package for %s"
4738 msgstr "تعذر العثور على مصدر الحزمة %s"
4739
4740-#: cmdline/apt-get.cc:2241
4741+#: cmdline/apt-get.cc:2254
4742 #, c-format
4743 msgid ""
4744 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
4745 "%s\n"
4746 msgstr ""
4747
4748-#: cmdline/apt-get.cc:2246
4749+#: cmdline/apt-get.cc:2259
4750 #, c-format
4751 msgid ""
4752 "Please use:\n"
4753@@ -1088,111 +1091,115 @@
4754 "to retrieve the latest (possibly unreleased) updates to the package.\n"
4755 msgstr ""
4756
4757-#: cmdline/apt-get.cc:2297
4758+#: cmdline/apt-get.cc:2310
4759 #, c-format
4760 msgid "Skipping already downloaded file '%s'\n"
4761 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
4762
4763-#: cmdline/apt-get.cc:2332
4764+#: cmdline/apt-get.cc:2345
4765 #, c-format
4766 msgid "You don't have enough free space in %s"
4767 msgstr "ليس هناك مساحة كافية في %s"
4768
4769-#: cmdline/apt-get.cc:2338
4770+#. TRANSLATOR: The required space between number and unit is already included
4771+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
4772+#: cmdline/apt-get.cc:2353
4773 #, c-format
4774 msgid "Need to get %sB/%sB of source archives.\n"
4775 msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
4776
4777-#: cmdline/apt-get.cc:2341
4778+#. TRANSLATOR: The required space between number and unit is already included
4779+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
4780+#: cmdline/apt-get.cc:2358
4781 #, c-format
4782 msgid "Need to get %sB of source archives.\n"
4783 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
4784
4785-#: cmdline/apt-get.cc:2347
4786+#: cmdline/apt-get.cc:2364
4787 #, c-format
4788 msgid "Fetch source %s\n"
4789 msgstr "إحضار المصدر %s\n"
4790
4791-#: cmdline/apt-get.cc:2380
4792+#: cmdline/apt-get.cc:2397
4793 msgid "Failed to fetch some archives."
4794 msgstr "فشل إحضار بعض الأرشيفات."
4795
4796-#: cmdline/apt-get.cc:2410
4797+#: cmdline/apt-get.cc:2427
4798 #, c-format
4799 msgid "Skipping unpack of already unpacked source in %s\n"
4800 msgstr ""
4801
4802-#: cmdline/apt-get.cc:2422
4803+#: cmdline/apt-get.cc:2439
4804 #, c-format
4805 msgid "Unpack command '%s' failed.\n"
4806 msgstr "أمر فك الحزمة '%s' فشل.\n"
4807
4808-#: cmdline/apt-get.cc:2423
4809+#: cmdline/apt-get.cc:2440
4810 #, c-format
4811 msgid "Check if the 'dpkg-dev' package is installed.\n"
4812 msgstr ""
4813
4814-#: cmdline/apt-get.cc:2440
4815+#: cmdline/apt-get.cc:2457
4816 #, c-format
4817 msgid "Build command '%s' failed.\n"
4818 msgstr "أمر البناء '%s' فشل.\n"
4819
4820-#: cmdline/apt-get.cc:2460
4821+#: cmdline/apt-get.cc:2477
4822 msgid "Child process failed"
4823 msgstr ""
4824
4825-#: cmdline/apt-get.cc:2476
4826+#: cmdline/apt-get.cc:2493
4827 msgid "Must specify at least one package to check builddeps for"
4828 msgstr ""
4829
4830-#: cmdline/apt-get.cc:2506
4831+#: cmdline/apt-get.cc:2524
4832 #, c-format
4833 msgid "Unable to get build-dependency information for %s"
4834 msgstr ""
4835
4836-#: cmdline/apt-get.cc:2526
4837+#: cmdline/apt-get.cc:2544
4838 #, c-format
4839 msgid "%s has no build depends.\n"
4840 msgstr ""
4841
4842-#: cmdline/apt-get.cc:2577
4843+#: cmdline/apt-get.cc:2595
4844 #, c-format
4845 msgid ""
4846 "%s dependency for %s cannot be satisfied because the package %s cannot be "
4847 "found"
4848 msgstr ""
4849
4850-#: cmdline/apt-get.cc:2630
4851+#: cmdline/apt-get.cc:2648
4852 #, c-format
4853 msgid ""
4854 "%s dependency for %s cannot be satisfied because no available versions of "
4855 "package %s can satisfy version requirements"
4856 msgstr ""
4857
4858-#: cmdline/apt-get.cc:2666
4859+#: cmdline/apt-get.cc:2684
4860 #, c-format
4861 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
4862 msgstr ""
4863
4864-#: cmdline/apt-get.cc:2693
4865+#: cmdline/apt-get.cc:2711
4866 #, c-format
4867 msgid "Failed to satisfy %s dependency for %s: %s"
4868 msgstr ""
4869
4870-#: cmdline/apt-get.cc:2709
4871+#: cmdline/apt-get.cc:2727
4872 #, c-format
4873 msgid "Build-dependencies for %s could not be satisfied."
4874 msgstr ""
4875
4876-#: cmdline/apt-get.cc:2714
4877+#: cmdline/apt-get.cc:2732
4878 msgid "Failed to process build dependencies"
4879 msgstr ""
4880
4881-#: cmdline/apt-get.cc:2745
4882+#: cmdline/apt-get.cc:2763
4883 msgid "Supported modules:"
4884 msgstr "الوحدات المدعومة:"
4885
4886-#: cmdline/apt-get.cc:2786
4887+#: cmdline/apt-get.cc:2804
4888 msgid ""
4889 "Usage: apt-get [options] command\n"
4890 " apt-get [options] install|remove pkg1 [pkg2 ...]\n"
4891@@ -1238,7 +1245,7 @@
4892 " This APT has Super Cow Powers.\n"
4893 msgstr ""
4894
4895-#: cmdline/apt-get.cc:2958
4896+#: cmdline/apt-get.cc:2960
4897 msgid ""
4898 "NOTE: This is only a simulation!\n"
4899 " apt-get needs root privileges for real execution.\n"
4900@@ -1473,10 +1480,10 @@
4901
4902 #. Only warn if there are no sources.list.d.
4903 #. Only warn if there is no sources.list file.
4904-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
4905-#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
4906-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
4907-#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
4908+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
4909+#: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204
4910+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
4911+#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
4912 #: methods/mirror.cc:87
4913 #, c-format
4914 msgid "Unable to read %s"
4915@@ -1608,23 +1615,23 @@
4916 msgid "Unparsable control file"
4917 msgstr ""
4918
4919-#: methods/bzip2.cc:68
4920+#: methods/bzip2.cc:65
4921 #, fuzzy, c-format
4922 msgid "Couldn't open pipe for %s"
4923 msgstr "فشل إغلاق الملف %s"
4924
4925-#: methods/bzip2.cc:113
4926+#: methods/bzip2.cc:109
4927 #, c-format
4928 msgid "Read error from %s process"
4929 msgstr ""
4930
4931-#: methods/bzip2.cc:145 methods/bzip2.cc:154 methods/copy.cc:43
4932-#: methods/gzip.cc:96 methods/gzip.cc:105 methods/rred.cc:486
4933+#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
4934+#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
4935 #: methods/rred.cc:495
4936 msgid "Failed to stat"
4937 msgstr "فشيل تنفيذ stat"
4938
4939-#: methods/bzip2.cc:151 methods/copy.cc:80 methods/gzip.cc:102
4940+#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
4941 #: methods/rred.cc:492
4942 msgid "Failed to set modification time"
4943 msgstr "فشل تعيين وقت التعديل"
4944@@ -1717,7 +1724,7 @@
4945 msgid "Server closed the connection"
4946 msgstr "أغلق الخادم الاتصال"
4947
4948-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
4949+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
4950 msgid "Read error"
4951 msgstr "خطأ في القراءة"
4952
4953@@ -1729,7 +1736,7 @@
4954 msgid "Protocol corruption"
4955 msgstr ""
4956
4957-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
4958+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
4959 msgid "Write error"
4960 msgstr "خطأ في الكتابة"
4961
4962@@ -1783,7 +1790,7 @@
4963 msgid "Unable to accept connection"
4964 msgstr "تعذر قبول الاتصال"
4965
4966-#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
4967+#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
4968 msgid "Problem hashing file"
4969 msgstr ""
4970
4971@@ -1913,68 +1920,68 @@
4972 msgid "Bad header line"
4973 msgstr "سطر ترويسة سيء"
4974
4975-#: methods/http.cc:558 methods/http.cc:565
4976+#: methods/http.cc:564 methods/http.cc:571
4977 msgid "The HTTP server sent an invalid reply header"
4978 msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
4979
4980-#: methods/http.cc:594
4981+#: methods/http.cc:600
4982 msgid "The HTTP server sent an invalid Content-Length header"
4983 msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
4984
4985-#: methods/http.cc:609
4986+#: methods/http.cc:615
4987 msgid "The HTTP server sent an invalid Content-Range header"
4988 msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
4989
4990-#: methods/http.cc:611
4991+#: methods/http.cc:617
4992 msgid "This HTTP server has broken range support"
4993 msgstr "خادم http له دعم مدى معطوب"
4994
4995-#: methods/http.cc:635
4996+#: methods/http.cc:641
4997 msgid "Unknown date format"
4998 msgstr "نسق تاريخ مجهول"
4999
5000-#: methods/http.cc:793
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: