From: Michael Vogt Date: Wed, 28 Sep 2005 08:47:47 +0000 (+0000) Subject: * prepare a new ubuntu upload X-Git-Tag: 0.7.24ubuntu1~292 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/dd9ebe3bbbe3ab48d73d03da498bfa74cc78b415?hp=-c * prepare a new ubuntu upload Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62 * leak fix for debian #250583 --- dd9ebe3bbbe3ab48d73d03da498bfa74cc78b415 diff --combined configure.in index 458e0730b,87dac8e47..445f837f0 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.6.40.1ubuntu7") -AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.40.1ubuntu8") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@@ -181,9 -181,6 +181,9 @@@ AC_PATH_PROG(DOCBOOK2MAN,docbook2man dnl Check for the XML tools needed to build man pages AC_PATH_PROG(XMLTO,xmlto) +dnl Check for the XML tools needed to build man pages +AC_PATH_PROG(XMLTO,xmlto) + dnl Check for YODL dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") diff --combined debian/changelog index 75aaaa6d6,ac1e0e663..852029360 --- a/debian/changelog +++ b/debian/changelog @@@ -1,65 -1,48 +1,74 @@@ -apt (0.6.41.1) unstable; urgency=low ++apt (0.6.40.1ubuntu8) breezy; urgency=low + - * apt-pkg/cdrom.cc: ++ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: ++ - fix for a bad memory/file leak in the mmap code (ubuntu #15603) ++ * po/de.po: ++ - updated the translation ++ ++ -- Michael Vogt Wed, 28 Sep 2005 10:16:06 +0200 ++ +apt (0.6.40.1ubuntu7) breezy; urgency=low + + * updated the pot/po files , no code changes + + -- Michael Vogt Tue, 27 Sep 2005 18:38:16 +0200 + +apt (0.6.40.1ubuntu6) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: + - make it possible for apt to handle a failed MediaChange event and + fall back to other sources (ubuntu #13713) + + -- Michael Vogt Tue, 13 Sep 2005 22:09:50 +0200 + +apt (0.6.40.1ubuntu5) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. + This adds media-change reporting to the apt status-fd (ubuntu #15213) + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: + apt-pkg/cdrom.cc: - unmount the cdrom when apt failed to locate any package files - * allow cdrom failures and fallback to other sources in that case - (closes: #44135) - * better error text when dpkg-source fails - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104: - - patch-99: Added Galician translation - - patch-100: Completed Danish translation (Closes: #325686) - - patch-104: French translation completed - * applied frensh man-page update (thanks to Philippe Batailler) + + -- Michael Vogt Mon, 12 Sep 2005 15:44:26 +0200 + +apt (0.6.40.1ubuntu4) breezy; urgency=low + + * debian/apt.cron.daily: + - fix a embarrassing typo - -- + -- Michael Vogt Wed, 7 Sep 2005 10:10:37 +0200 + +apt (0.6.40.1ubuntu3) breezy; urgency=low + + * debian/apt.cron.daily: + - use the ctime as well when figuring what packages need to + be removed. This fixes the problem that packages copied with + "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) + + -- Michael Vogt Tue, 6 Sep 2005 18:30:46 +0200 -apt (0.6.41) unstable; urgency=low +apt (0.6.40.1ubuntu2) breezy; urgency=low * improved the support for "error" and "conffile" reporting from dpkg, added the format to README.progress-reporting * added README.progress-reporting to the apt-doc package - * improved the network timeout handling, if a index file from a - sources.list times out or EAI_AGAIN is returned from getaddrinfo, - don't try to get the other files from that entry - * Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - the patch, thanks to Colin Watson for testing it. - * Javier Fernandez-Sanguino Pen~a: - - Added a first version of an apt-secure.8 manpage, and modified - apt-key and apt.end accordingly. Also added the 'update' - argument to apt-key which was previously not documented - (Closes: #322120) - * Andreas Pakulat: - - added example apt-ftparchive.conf file to doc/examples - (closes: #322483) - * Fix a incorrect example in the man-page (closes: #282918) - * Fix a bug for very long lines in the apt-cdrom code (closes: #280356) - * Fix a manual page bug (closes: #316314) * Do md5sum checking for file and cdrom method (closes: #319142) * Change pkgPolicy::Pin from private to protected to let subclasses access it too (closes: #321799) - * add default constructor for PrvIterator (closes: #322267) - * Reread status configuration on debSystem::Initialize() - (needed for apt-proxy, thanks to Otavio for this patch) - - -- Michael Vogt Mon, 5 Sep 2005 22:59:03 +0200 + * methods/connect.cc: + - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item + * apt-pkg/acquire-item.cc: + - fail early if a FailReason is TmpResolveFailure (avoids hangs during + the install when no network is available) + * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 + + -- Michael Vogt Tue, 23 Aug 2005 19:44:55 +0200 + +apt (0.6.40.1ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 apt (0.6.40.1) unstable; urgency=low @@@ -70,12 -53,6 +79,12 @@@ -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 +apt (0.6.40ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 + apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@@ -91,39 -68,6 +100,39 @@@ -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 +apt (0.6.39ubuntu4) breezy; urgency=low + + * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this + before...) + + -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 + +apt (0.6.39ubuntu3) breezy; urgency=low + + * Fix keyring locations for Ubuntu in apt-key too. + + -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 + +apt (0.6.39ubuntu2) breezy; urgency=low + + * Install ubuntu-archive.gpg rather than debian-archive.gpg as + /etc/apt/trusted.gpg. + + -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 + +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@@ -134,14 -78,7 +143,14 @@@ * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 + -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 + +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 apt (0.6.38) unstable; urgency=low diff --combined po/de.po index ae494a2da,2327f8a44..ed2aec09c --- a/po/de.po +++ b/po/de.po @@@ -1,19 -1,19 +1,15 @@@ --# German messages for the apt suite. --# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. --# Michael Piefel , 2001, 2002, 2003, 2004. --# Rüdiger Kuhlmann , 2002. --# ++# German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # Michael Piefel , 2001, 2002, 2003, 2004. # Rüdiger Kuhlmann , 2002. # msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-06-15 18:22+0200\n" -"Last-Translator: Michael Piefel \n" +"POT-Creation-Date: 2005-09-13 15:16+0200\n" - "PO-Revision-Date: 2005-06-15 18:22+0200\n" - "Last-Translator: Michael Piefel \n" ++"PO-Revision-Date: 2005-09-28 10:46+0200\n" ++"Last-Translator: Michael Vogt \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --"Content-Transfer-Encoding: 8bit\n" ++"Content-Transfer-Encoding: 8bit" #: cmdline/apt-cache.cc:135 #, c-format @@@ -148,7 -148,7 +144,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2324 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" @@@ -700,13 -700,13 +696,12 @@@ msgid "%s (due to %s) msgstr "%s (wegen %s) " #: cmdline/apt-get.cc:544 --#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" --"Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!" ++"Dies sollten Sie NICHT tun, wenn Sie nicht genau wissen, was Sie tun!" #: cmdline/apt-get.cc:575 #, c-format @@@ -769,7 -769,7 +764,7 @@@ msgstr "WARNUNG: Die folgenden Pakete k #: cmdline/apt-get.cc:691 msgid "Authentication warning overridden.\n" --msgstr "" ++msgstr "Authentifizierungswarung wurde überschrieben \n" #: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " @@@ -799,7 -799,7 +794,7 @@@ msgstr "Interner Fehler, Anordnung been msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2072 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@@ -849,7 -849,7 +844,7 @@@ msgid "Yes, do as I say! msgstr "Ja, tu was ich sage!" #: cmdline/apt-get.cc:866 --#, fuzzy, c-format ++#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -1086,7 -1086,7 +1081,7 @@@ msgstr " "Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2090 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" @@@ -1125,32 -1125,37 +1120,32 @@@ msgstr "Überspringe Entpacken der scho msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2016 -#, c-format -msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" - -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2032 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2051 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2067 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2115 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2167 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1159,7 -1164,7 +1154,7 @@@ msgstr " "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2219 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1168,32 -1173,32 +1163,32 @@@ msgstr " "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2254 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2293 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2297 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2329 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2370 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1554,8 -1559,8 +1549,7 @@@ msgstr "Kann nicht ins Administrationsv msgid "Internal error getting a package name" msgstr "Interner Fehler beim Holen des Paket-Namens" --# --#: apt-inst/deb/dpkgdb.cc:205 ++# #: apt-inst/deb/dpkgdb.cc:205 msgid "Reading file listing" msgstr "Paketlisten werden gelesen" @@@ -1673,16 -1678,16 +1667,14 @@@ msgstr " "verwendet." #: methods/cdrom.cc:169 --#, fuzzy msgid "Disk not found." --msgstr "Datei nicht gefunden" ++msgstr "Datenträger nicht gefunden" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datei nicht gefunden" --# looks like someone hardcoded English grammar --#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 ++# looks like someone hardcoded English grammar #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kann nicht zugreifen." @@@ -1912,13 -1917,13 +1904,12 @@@ msgstr " #: methods/gpgv.cc:196 msgid "At least one invalid signature was encountered." --msgstr "" ++msgstr "Mindestens eine ungültige Signatur wurde entdeckt." #. FIXME String concatenation considered harmful. #: methods/gpgv.cc:201 --#, fuzzy msgid "Could not execute " --msgstr "Konnte Lock %s nicht bekommen" ++msgstr "Konnte nicht ausführen" #: methods/gpgv.cc:202 msgid " to verify signature (is gnupg installed?)" @@@ -1926,18 -1931,18 +1917,17 @@@ msgstr " #: methods/gpgv.cc:206 msgid "Unknown error executing gpgv" --msgstr "" ++msgstr "Unbekannter Fehler beim ausführen von gpgv" #: methods/gpgv.cc:237 --#, fuzzy msgid "The following signatures were invalid:\n" --msgstr "Die folgenden zusätzlichen Pakete werden installiert:" ++msgstr "Die folgenden Signaturen sind ungültig:\n" #: methods/gpgv.cc:244 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" --msgstr "" ++msgstr "Die folgenden Signaturen konnten nicht überprüft werden weil ihre öffentlichen Schlüssel nicht verfügbar sind:\n" #: methods/gzip.cc:57 #, c-format @@@ -2352,7 -2357,7 +2342,7 @@@ msgstr "Missgestaltete Zeile %lu in Que msgid "Opening %s" msgstr "%s wird geöffnet" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." @@@ -2422,7 -2427,7 +2412,7 @@@ msgstr "Archivverzeichnis %spartial feh #: apt-pkg/acquire.cc:817 #, c-format msgid "Downloading file %li of %li (%s remaining)" --msgstr "" ++msgstr "Lade Datei %li von %li herunter (%s verbleibend)" #: apt-pkg/acquire-worker.cc:113 #, c-format @@@ -2435,12 -2440,12 +2425,10 @@@ msgid "Method %s did not start correctl msgstr "Methode %s hat nicht korrekt gestartet" #: apt-pkg/acquire-worker.cc:377 --#, fuzzy, c-format ++#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" --"Medienwechsel: Bitte legen Sie Medium mit den Name\n" --" »%s«\n" --"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" ++"Bitte legen Sie Medium mit den Name »%s« in Laufwerk »%s« und drücken Sie die Eingabetaste." #: apt-pkg/init.cc:119 #, c-format @@@ -2576,11 -2581,11 +2564,11 @@@ msgstr "E/A-Fehler beim Sichern des Que msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:907 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:721 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2589,7 -2594,7 +2577,7 @@@ msgstr " "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:774 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2598,14 -2603,14 +2586,14 @@@ msgstr " "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:810 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:897 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@@ -2614,7 -2619,7 +2602,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:504 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2623,47 -2628,47 +2611,47 @@@ msgstr " "Benutze CD-ROM-Einhängpunkt %s\n" "Hänge CD ein\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 msgid "Identifying.. " msgstr "Identifiziere... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:538 #, c-format msgid "Stored label: %s \n" msgstr "Gespeicherte Kennzeichnung: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:558 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Benutze CD-ROM-Einhängpunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:576 msgid "Unmounting CD-ROM\n" msgstr "Hänge CD-ROM aus\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:580 msgid "Waiting for disc...\n" msgstr "Warte auf CD...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:588 msgid "Mounting CD-ROM...\n" msgstr "Hänge CD-ROM ein...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:606 msgid "Scanning disc for index files..\n" msgstr "Suche auf CD nach Index-Dateien...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:644 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:707 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:723 #, c-format msgid "" "This disc is called: \n" @@@ -2672,19 -2677,19 +2660,19 @@@ msgstr " "Diese CD heißt jetzt: \n" "»%s«\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:727 msgid "Copying package lists..." msgstr "Kopiere Paketlisten..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:751 msgid "Writing new source list\n" msgstr "Schreibe neue Quellliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:760 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für diese CD sind:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:800 msgid "Unmounting CD-ROM..." msgstr "Hänge CD-ROM aus..." @@@ -2711,54 -2716,54 +2699,54 @@@ msgstr " "geschrieben.\n" #: apt-pkg/deb/dpkgpm.cc:358 --#, fuzzy, c-format ++#, c-format msgid "Preparing %s" --msgstr "%s wird geöffnet" ++msgstr "Bereite %s vor" #: apt-pkg/deb/dpkgpm.cc:359 --#, fuzzy, c-format ++#, c-format msgid "Unpacking %s" --msgstr "%s wird geöffnet" ++msgstr "%s wird ausgepackt" #: apt-pkg/deb/dpkgpm.cc:364 --#, fuzzy, c-format ++#, c-format msgid "Preparing to configure %s" --msgstr "Öffne Konfigurationsdatei %s" ++msgstr "Bereite %s auf das Konfigurieren vor" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" - msgstr "" -msgstr "Verbinde mit %s" ++msgstr "Konfiguriere %s" #: apt-pkg/deb/dpkgpm.cc:366 --#, fuzzy, c-format ++#, c-format msgid "Installed %s" --msgstr " Installiert:" ++msgstr "Installiert %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" --msgstr "" ++msgstr "Bereits %s auf das Entfernen vor" #: apt-pkg/deb/dpkgpm.cc:372 --#, fuzzy, c-format ++#, c-format msgid "Removing %s" --msgstr "%s wird geöffnet" ++msgstr "Entferne %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" - msgstr "" -msgstr "Empfiehlt" ++msgstr "%s wurde entfernt" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Preparing for remove with config %s" --msgstr "" ++msgstr "Bereite %s auf das Entfernen mit Konfiguration vor" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format msgid "Removed with config %s" --msgstr "" ++msgstr "Habe %s mit Konfiguration entfernt" #: methods/rsh.cc:330 msgid "Connection closed prematurely" @@@ -2798,8 -2803,8 +2786,7 @@@ msgstr "Verbindung zu früh beendet #~ msgid " to " #~ msgstr " nach " --# --#~ msgid "Extract " ++# #~ msgid "Extract " #~ msgstr "Extrahiert " #~ msgid "Aborted, backing out"