From: Michael Vogt Date: Tue, 5 Apr 2011 09:41:08 +0000 (+0200) Subject: merged from the debian-sid branch X-Git-Tag: 0.9.13.exp1ubuntu1~193 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a70b91850530b48f5a15bee95d80a3941cf6e85c merged from the debian-sid branch --- a70b91850530b48f5a15bee95d80a3941cf6e85c diff --cc apt-pkg/depcache.cc index a30bea3cc,07803d7bf..8cf322464 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@@ -933,19 -924,9 +924,10 @@@ void pkgDepCache::MarkDelete(PkgIterato bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge, unsigned long Depth, bool FromUser) { - if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold && _config->FindB("APT::Ignore-Hold",false) == false) - { - if (DebugMarker == true) - std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << " FU=" << FromUser << std::endl; - return false; - } - // if the removal is not explictely requested by the user, protect - // explicit new-install package from accidental removal by the - // problemresolver - else if (FromUser == false && Pkg->CurrentVer == 0) + if (FromUser == false && Pkg->CurrentVer == 0) { StateCache &P = PkgState[Pkg->ID]; + // Status == 2 means this applies for new installs only if (P.InstallVer != 0 && P.Status == 2 && (P.Flags & Flag::Auto) != Flag::Auto) { if (DebugMarker == true) diff --cc debian/changelog index 1cc7c5ee2,03bbe86d4..346702c21 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,39 +1,52 @@@ ++apt (0.8.13.2ubuntu1) UNRELEASED; urgency=low ++ ++ * merge fixes from debian-sid, most notable the handling of ++ arch=all architectures in python-apt (LP: #733741) ++ ++ -- Michael Vogt Tue, 05 Apr 2011 10:40:09 +0200 ++ + apt (0.8.13.2) unstable; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/dpkgpm.cc: + - skip --configure if all packages disappeared + * apt-pkg/vendor.cc, apt-pkg/vendorlist.cc: + - mark them as deprecated as they are unused + * apt-pkg/deb/deblistparser.h: + - enable StripMultiArch by default for ParseDepends + * debian/apt.conf.autoremove: + - adapt to new gnumach kernel package naming (Closes: #619337) + * doc/apt_preferences.5.xml: + - correct typo spotted by Charles Plessy (Closes: #619088) + - document ButAutomaticUpgrades together with NotAutomatic + as suggested by Charles Plessy (Closes: #619083) + * apt-pkg/depcache.cc: + - remove pseudo handling leftover from SetReInstall + - do not change protected packages in autoinstall (Closes: #618848) + * apt-pkg/pkgcachegen.cc: + - make "all"->"native" an implementation detail of NewPackage + rather than rewrite it in higher methods + * apt-pkg/cacheiterator.h: + - return "all" instead of native architecture without breaking the abi + (too much) by extending enum instead of using bitflags (LP: #733741) + * apt-pkg/aptconfiguration.cc: + - use dpkg --print-foreign-architectures to get multiarch configuration + if non is specified with APT::Architectures (Closes: #612958) + * cmdline/apt-get.cc: + - do not show simulation notice for non-root commands (Closes: #619072) + - be able to disable resolver with APT::Get::CallResolver and disable + auto installation with APT::Get::AutoSolving + * apt-pkg/deb/deblistparser.cc: + - create foo:any provides for all architectures for an allowed package + + -- Michael Vogt Tue, 05 Apr 2011 09:40:28 +0200 + +apt (0.8.13.1ubuntu1) natty; urgency=low + + * merged fixes from the debian-sid (LP: #744832) + + -- Michael Vogt Mon, 04 Apr 2011 14:40:51 +0200 + apt (0.8.13.1) unstable; urgency=low * apt-pkg/acquire-item.cc: Use stat buffer if stat was diff --cc doc/po/apt-doc.pot index 0720f4c1f,159f86e6a..1c40d9f7c --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@@ -7,7 -7,7 +7,7 @@@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -966,7 -967,7 +967,7 @@@ msgid " msgstr "" #. type: Content of: --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 msgid "" msgstr "" @@@ -986,12 -987,12 +987,12 @@@ msgid " msgstr "" #. type: Content of: --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "" msgstr "" #. type: Content of: --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "" msgstr "" @@@ -1090,7 -1091,7 +1091,7 @@@ msgid " msgstr "" #. type: Content of: --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "" msgstr "" @@@ -1186,12 -1187,12 +1187,12 @@@ msgid " msgstr "" #. type: Content of: --#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 apt-sortpkgs.1.xml:67 ++#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: --#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "" @@@ -1201,7 -1202,7 +1202,7 @@@ msgid "&file-sourceslist; &file-stateli msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 sources.list.5.xml:234 ++#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 sources.list.5.xml:234 msgid "See Also" msgstr "" @@@ -1211,7 -1212,7 +1212,7 @@@ msgid "&apt-conf;, &sources-list;, &apt msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 ++#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@@ -1315,7 -1316,7 +1316,7 @@@ msgid "Options msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "" @@@ -1518,7 -1519,7 +1519,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 apt-sortpkgs.1.xml:73 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@@ -2431,31 -2432,31 +2432,37 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" ++msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: " ++"<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and " ++"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> " ++"where <literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, " ++"<literal>SHA1</literal> or <literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -2464,12 -2465,12 +2471,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@@ -2478,12 -2479,12 +2485,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -2493,12 -2494,12 +2500,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@@ -2506,24 -2507,24 +2513,24 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@@ -2532,12 -2533,12 +2539,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -2551,12 -2552,12 +2558,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -2566,12 -2567,12 +2573,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 sources.list.5.xml:198 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 sources.list.5.xml:198 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@@ -2580,14 -2581,14 +2587,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -5873,39 -5874,39 +5880,44 @@@ msgstr " #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their " --"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" like " --"the debian experimental archive." ++"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but " ++"<emphasis>not</emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --msgid "to the version that is already installed (if any)." ++#: apt_preferences.5.xml:114 ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 msgid "to the versions that are not installed and belong to the target release." msgstr "" @@@ -5918,24 -5919,24 +5930,25 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -5945,19 -5946,19 +5958,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the " @@@ -5965,7 -5966,7 +5978,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@@ -5976,7 -5977,7 +5989,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@@ -5986,7 -5987,7 +5999,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@@ -5998,12 -5999,12 +6011,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -6012,7 -6013,7 +6025,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@@ -6022,7 -6023,7 +6035,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@@ -6031,7 -6032,7 +6044,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@@ -6041,7 -6042,7 +6054,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@@ -6049,7 -6050,7 +6062,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@@ -6058,7 -6059,7 +6071,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -6067,7 -6068,7 +6080,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@@ -6076,7 -6077,7 +6089,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@@ -6086,7 -6087,7 +6099,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is " @@@ -6094,7 -6095,7 +6107,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@@ -6103,7 -6104,7 +6116,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is " @@@ -6111,7 -6112,7 +6124,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@@ -6120,7 -6121,7 +6133,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -6128,7 -6129,7 +6141,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@@ -6137,82 -6138,82 +6150,82 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -6220,7 -6221,7 +6233,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -6229,14 -6230,14 +6242,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@@ -6253,12 -6254,12 +6266,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@@ -6268,7 -6269,7 +6281,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -6276,7 -6277,7 +6289,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an " @@@ -6285,12 -6286,12 +6298,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -6298,27 -6299,27 +6311,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " @@@ -6330,12 -6331,12 +6343,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -6346,18 -6347,18 +6359,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@@ -6368,13 -6369,13 +6381,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@@ -6385,7 -6386,7 +6398,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -6394,12 -6395,12 +6407,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -6411,18 -6412,18 +6424,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@@ -6431,18 -6432,18 +6444,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@@ -6451,13 -6452,13 +6464,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -6471,7 -6472,7 +6484,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -6486,12 -6487,12 +6499,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -6499,12 -6500,12 +6512,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -6519,7 -6520,7 +6532,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -6529,7 -6530,7 +6542,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -6538,7 -6539,7 +6551,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -6547,13 -6548,13 +6560,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -6562,12 -6563,12 +6575,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@@ -6584,7 -6585,7 +6597,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -6595,7 -6596,7 +6608,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -6604,13 -6605,13 +6617,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -6622,12 -6623,12 +6635,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package " @@@ -6649,7 -6650,7 +6662,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -6664,7 -6665,7 +6677,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@@ -6673,13 -6674,13 +6686,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -6691,12 -6692,12 +6704,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --cc doc/po/de.po index 75595df07,75595df07..c75a8dda5 --- a/doc/po/de.po +++ b/doc/po/de.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt-doc 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-09-16 19:04+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@@ -1310,7 -1310,7 +1310,7 @@@ msgstr " "pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@@ -1338,12 -1338,12 +1338,12 @@@ msgstr " "srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@@ -1458,7 -1458,7 +1458,7 @@@ msgstr " "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@@ -1575,14 -1575,14 +1575,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 --#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 ++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 #: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 --#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Dateien" @@@ -1593,9 -1593,9 +1593,9 @@@ msgstr "&file-sourceslist; &file-statel #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 --#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 ++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 --#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 ++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Siehe auch" @@@ -1607,7 -1607,7 +1607,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 --#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 ++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnose" @@@ -1742,7 -1742,7 +1742,7 @@@ msgid "Options msgstr "Optionen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@@ -1996,7 -1996,7 +1996,7 @@@ msgid "Just show the contents of the co msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@@ -3144,27 -3144,27 +3144,49 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" --msgstr "<option>--md5</option>" ++msgid "" ++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" ++msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 --msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++#, fuzzy ++#| msgid "" ++#| "Values for the additional metadata fields in the Release file are taken " ++#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" ++#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " ++#| "supported fields are: <literal>Origin</literal>, <literal>Label</" ++#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " ++#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" ++#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" ++#| "literal>, <literal>Description</literal>." ++msgid "" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" ++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" ++"replaceable>::<replaceable>Checksum</replaceable></literal> where " ++"<literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" ++"literal> or <literal>SHA256</literal>." msgstr "" --"Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet ist, " --"haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies möglich " --"ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>" ++"Werte für zusätzliche Metadatenfelder in der Release-Datei werden den " ++"entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> " ++"entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die " ++"unterstützten Felder sind: <literal>Origin</literal>, <literal>Label</" ++"literal>, <literal>Suite</literal>, <literal>Version</literal>, " ++"<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-Until</" ++"literal>, <literal>Architectures</literal>, <literal>Components</literal>, " ++"<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@@ -3174,7 -3174,7 +3196,7 @@@ msgstr " "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -3188,12 -3188,12 +3210,12 @@@ msgstr " "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@@ -3207,12 -3207,12 +3229,12 @@@ msgstr " "DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -3228,12 -3228,12 +3250,12 @@@ msgstr " "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@@ -3244,12 -3244,12 +3266,12 @@@ msgstr " "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@@ -3258,12 -3258,12 +3280,12 @@@ msgstr " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@@ -3277,12 -3277,12 +3299,12 @@@ msgstr " "Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -3306,12 -3306,12 +3328,12 @@@ msgstr " "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -3327,19 -3327,19 +3349,19 @@@ msgstr " "werden kann." #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@@ -3349,7 -3349,7 +3371,7 @@@ msgstr " ">" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -7895,32 -7895,32 +7917,50 @@@ msgstr "Priorität 1 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 ++#, fuzzy ++#| msgid "" ++#| "to the versions coming from archives which in their <filename>Release</" ++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " ++#| "experimental archive." msgid "" "to the versions coming from archives which in their <filename>Release</" --"filename> files are marked as \"NotAutomatic: yes\" like the debian " --"experimental archive." ++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" ++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" "zu den Versionen, die von Archiven kommen, deren <filename>Release</" "filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-" "Experimental-Archiv." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --msgid "to the version that is already installed (if any)." --msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." ++#: apt_preferences.5.xml:114 ++#, fuzzy ++#| msgid "" ++#| "to the versions coming from archives which in their <filename>Release</" ++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " ++#| "experimental archive." ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." ++msgstr "" ++"zu den Versionen, die von Archiven kommen, deren <filename>Release</" ++"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-" ++"Experimental-Archiv." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "Priorität 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@@ -7929,12 -7929,12 +7969,12 @@@ msgstr " "gehören." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "Priorität 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@@ -7952,13 -7952,13 +7992,21 @@@ msgstr " "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 ++#, fuzzy ++#| msgid "" ++#| "If the target release has not been specified then APT simply assigns " ++#| "priority 100 to all installed package versions and priority 500 to all " ++#| "uninstalled package versions, expect versions coming from archives which " ++#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " ++#| "yes\" - these versions get the priority 1." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen " "installierten Paketversionen eine Priorität von 100 und allen nicht " @@@ -7967,7 -7967,7 +8015,7 @@@ "ist – diese Versionen erhalten die Prirität 1." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@@ -7977,7 -7977,7 +8025,7 @@@ msgstr " "ist." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -7993,12 -7993,12 +8041,12 @@@ msgstr " "Downgrading eines Paketes riskant sein kann.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "Die Version mit der höchsten Priorität installieren." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@@ -8007,7 -8007,7 +8055,7 @@@ msgstr " "aktuellste installiert (das ist die mit der höheren Versionsnummer)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@@ -8019,7 -8019,7 +8067,7 @@@ msgstr " "installierte installiert." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@@ -8035,7 -8035,7 +8083,7 @@@ msgstr " "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@@ -8049,7 -8049,7 +8097,7 @@@ msgstr " "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@@ -8069,12 -8069,12 +8117,12 @@@ msgstr " "hat." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "Die Auswirkungen von APT-Einstellungen" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -8088,7 -8088,7 +8136,7 @@@ msgstr " "allgemeine Gestalt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@@ -8104,7 -8104,7 +8152,7 @@@ msgstr " "können durch Leerzeichen getrennt werden." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@@ -8116,7 -8116,7 +8164,7 @@@ msgstr " "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@@ -8131,7 -8131,7 +8179,7 @@@ msgstr " "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@@ -8142,7 -8142,7 +8190,7 @@@ msgstr " "Paketversionen eine hohe Priorität zu, die lokal liegen." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@@ -8154,7 -8154,7 +8202,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -8168,7 -8168,7 +8216,7 @@@ msgstr " "de.debian.org« identifiziert wird." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@@ -8180,7 -8180,7 +8228,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@@ -8195,7 -8195,7 +8243,7 @@@ msgstr " "oder »Ximian«." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@@ -8206,7 -8206,7 +8254,7 @@@ msgstr " "Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@@ -8218,7 -8218,7 +8266,7 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@@ -8229,7 -8229,7 +8277,7 @@@ msgstr " "hohe Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@@ -8241,7 -8241,7 +8289,7 @@@ msgstr " "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -8252,7 -8252,7 +8300,7 @@@ msgstr " "Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@@ -8264,17 -8264,17 +8312,17 @@@ msgstr " "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "Wie APT Prioritäten interpretiert" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@@ -8283,12 -8283,12 +8331,12 @@@ msgstr " "des Pakets durchführt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@@ -8297,12 -8297,12 +8345,12 @@@ msgstr " "Ziel-Release kommt, außer wenn die installierte Version aktueller ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@@ -8312,12 -8312,12 +8360,12 @@@ msgstr " "neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@@ -8327,12 -8327,12 +8375,12 @@@ msgstr " "installierte Version neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@@ -8341,17 -8341,17 +8389,17 @@@ msgstr " "installierte Version des Pakets gibt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "verhindert das Installieren der Version" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -8362,7 -8362,7 +8410,7 @@@ msgstr " "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -8376,7 -8376,7 +8424,7 @@@ msgstr " "erste dieser Datensätze die Priorität der Paketversion fest." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@@ -8385,7 -8385,7 +8433,7 @@@ msgstr " "bereits gezeigten Datensätze:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@@ -8413,12 -8413,12 +8461,12 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Dann:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@@ -8433,7 -8433,7 +8481,7 @@@ msgstr " "dann wird von <literal>perl</literal> ein Downgrade durchgeführt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -8444,7 -8444,7 +8492,7 @@@ msgstr " "sogar wenn diese Versionen zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@@ -8458,12 -8458,12 +8506,12 @@@ msgstr " "Pakets installiert ist." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "Festlegung von Paketversion und Distributions-Eigenschaften" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -8474,27 -8474,27 +8522,27 @@@ msgstr " "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "die <literal>Package:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "gibt den Paketnamen an" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "die <literal>Version:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "gibt die Versionsnummer für das genannte Paket an" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@@ -8515,12 -8515,12 +8563,12 @@@ msgstr " "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -8537,18 -8537,18 +8585,18 @@@ msgstr " "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "die <literal>Codename:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@@ -8565,13 -8565,13 +8613,13 @@@ msgstr " "anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@@ -8587,7 -8587,7 +8635,7 @@@ msgstr " "eine der folgenden Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -8599,12 -8599,12 +8647,12 @@@ msgstr " "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "die <literal>Component:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -8622,18 -8622,18 +8670,18 @@@ msgstr " "Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "die <literal>Origin:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8645,18 -8645,18 +8693,18 @@@ msgstr " "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "die <literal>Label:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8669,13 -8669,13 +8717,13 @@@ msgstr " "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -8698,7 -8698,7 +8746,7 @@@ msgstr " "APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -8724,12 -8724,12 +8772,12 @@@ msgstr " "Distribution heruntergeladen wurde." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -8740,12 -8740,12 +8788,12 @@@ msgstr " "anfangen. Dieses stellt einen Platz für Kommentare bereit." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "Stable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -8769,7 -8769,7 +8817,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8784,8 -8784,8 +8832,8 @@@ msgstr " "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 --#: apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -8797,7 -8797,7 +8845,7 @@@ msgstr " "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8810,13 -8810,13 +8858,13 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -8830,12 -8830,12 +8878,12 @@@ msgstr " "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "Testing oder Unstable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@@ -8863,7 -8863,7 +8911,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -8880,7 -8880,7 +8928,7 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8893,13 -8893,13 +8941,13 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -8919,12 -8919,12 +8967,12 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "Die Entwicklung eines Codename-Releases verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -8959,7 -8959,7 +9007,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8985,7 -8985,7 +9033,7 @@@ msgstr " "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@@ -8998,13 -8998,13 +9046,13 @@@ msgstr " "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -9024,12 -9024,12 +9072,12 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -11097,6 -11097,6 +11145,22 @@@ msgstr " # apt-get -o dir::cache::arch msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." ++#~ msgid "<option>--md5</option>" ++#~ msgstr "<option>--md5</option>" ++ ++#~ msgid "" ++#~ "Generate MD5 sums. This defaults to on, when turned off the generated " ++#~ "index files will not have MD5Sum fields where possible. Configuration " ++#~ "Item: <literal>APT::FTPArchive::MD5</literal>" ++#~ msgstr "" ++#~ "Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet " ++#~ "ist, haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies " ++#~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</" ++#~ "literal>" ++ ++#~ msgid "to the version that is already installed (if any)." ++#~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." ++ #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "" #~ "APT-Werkzeug zur Handhabung von Paketen -- Zwischenspeichermanipulierer" @@@ -11157,8 -11157,8 +11221,12 @@@ #~ "Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-" #~ "US-Verzeichnis zuzugreifen." --#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" --#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" ++#~ msgid "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" ++#~ msgstr "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" #~ msgid "OPTIONS" #~ msgstr "OPTIONEN" diff --cc doc/po/es.po index 63e0e8a6e,63e0e8a6e..a9317f4eb --- a/doc/po/es.po +++ b/doc/po/es.po @@@ -36,7 -36,7 +36,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-08-25 03:25+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@@ -1354,7 -1354,7 +1354,7 @@@ msgstr " "configuración: <literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@@ -1380,12 -1380,12 +1380,12 @@@ msgstr " "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@@ -1500,7 -1500,7 +1500,7 @@@ msgstr " "Opción de configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@@ -1617,14 -1617,14 +1617,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 --#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 ++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 #: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 --#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Ficheros" @@@ -1635,9 -1635,9 +1635,9 @@@ msgstr "&file-sourceslist; &file-statel #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 --#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 ++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 --#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 ++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Véase también" @@@ -1649,7 -1649,7 +1649,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 --#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 ++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnósticos" @@@ -1784,7 -1784,7 +1784,7 @@@ msgid "Options msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@@ -2041,7 -2041,7 +2041,7 @@@ msgid "Just show the contents of the co msgstr "Sólo muestra el contenido del espacio de configuración." #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@@ -3192,28 -3192,28 +3192,49 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" --msgstr "<option>--md5</option>" ++msgid "" ++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" ++msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 --msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++#, fuzzy ++#| msgid "" ++#| "Values for the additional metadata fields in the Release file are taken " ++#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" ++#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " ++#| "supported fields are: <literal>Origin</literal>, <literal>Label</" ++#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " ++#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" ++#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" ++#| "literal>, <literal>Description</literal>." ++msgid "" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" ++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" ++"replaceable>::<replaceable>Checksum</replaceable></literal> where " ++"<literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" ++"literal> or <literal>SHA256</literal>." msgstr "" --"Genera una suma de control MD5. Está activado de forma predeterminada, " --"cuando se desactiva los ficheros de índices generados no tendrán los campos " --"MD5Sum cuando sea posible. Opción de configuración: <literal>APT::" --"FTPArchive::MD5</literal>" ++"Los valores para los campos de metadatos adicionales en el fichero «Release» " ++"se toman de las variables correspondientes en <literal>APT::FTPArchive::" ++"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</" ++"literal>. Los campos permitidos son: <literal>Origin</literal>, " ++"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</" ++"literal>, <literal>Codename</literal>, <literal>Date</literal>, " ++"<literal>Valid-Until</literal>, <literal>Architectures</literal>, " ++"<literal>Components</literal> y <literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@@ -3222,7 -3222,7 +3243,7 @@@ msgstr " "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -3236,12 -3236,12 +3257,12 @@@ msgstr " "configuración. Opción de configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@@ -3254,12 -3254,12 +3275,12 @@@ msgstr " "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -3276,12 -3276,12 +3297,12 @@@ msgstr " "Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@@ -3292,12 -3292,12 +3313,12 @@@ msgstr " "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@@ -3306,12 -3306,12 +3327,12 @@@ msgstr " "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@@ -3325,12 -3325,12 +3346,12 @@@ msgstr " "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -3354,12 -3354,12 +3375,12 @@@ msgstr " "comprobaciones adicionales son innecesarias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -3375,19 -3375,19 +3396,19 @@@ msgstr " "con la orden «generate»." #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@@ -3396,7 -3396,7 +3417,7 @@@ msgstr " "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -7892,32 -7892,32 +7913,50 @@@ msgstr "priority 1 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 ++#, fuzzy ++#| msgid "" ++#| "to the versions coming from archives which in their <filename>Release</" ++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " ++#| "experimental archive." msgid "" "to the versions coming from archives which in their <filename>Release</" --"filename> files are marked as \"NotAutomatic: yes\" like the debian " --"experimental archive." ++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" ++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" "para las versiones procedentes de archivos que en sus ficheros " "<filename>Release</filename> están marcados como «NotAutomatic:yes», como en " "el archivo «experimental» de Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "prioridad 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --msgid "to the version that is already installed (if any)." --msgstr "a la versión instalada (de existir)." ++#: apt_preferences.5.xml:114 ++#, fuzzy ++#| msgid "" ++#| "to the versions coming from archives which in their <filename>Release</" ++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " ++#| "experimental archive." ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." ++msgstr "" ++"para las versiones procedentes de archivos que en sus ficheros " ++"<filename>Release</filename> están marcados como «NotAutomatic:yes», como en " ++"el archivo «experimental» de Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "prioridad 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@@ -7926,12 -7926,12 +7965,12 @@@ msgstr " "objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "prioridad 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@@ -7950,13 -7950,13 +7989,21 @@@ msgstr " "Asignar: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 ++#, fuzzy ++#| msgid "" ++#| "If the target release has not been specified then APT simply assigns " ++#| "priority 100 to all installed package versions and priority 500 to all " ++#| "uninstalled package versions, expect versions coming from archives which " ++#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " ++#| "yes\" - these versions get the priority 1." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Si no se especifica ninguna distribución objetivo APT asigna prioridad 100 a " "todas las versiones de los paquetes instalados y 500 a las versiones no " @@@ -7965,7 -7965,7 +8012,7 @@@ "- estas versiones reciben la prioridad 1." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@@ -7974,7 -7974,7 +8021,7 @@@ msgstr " "determinar qué versión del paquete debe instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -7991,12 -7991,12 +8038,12 @@@ msgstr " "ser peligroso)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "Instala la versión de mayor prioridad." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@@ -8005,7 -8005,7 +8052,7 @@@ msgstr " "(esto es, la que tiene un número de versión mayor)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@@ -8016,7 -8016,7 +8063,7 @@@ msgstr " "<literal>--reinstall</literal>, se instalará la que no está instalada." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@@ -8031,7 -8031,7 +8078,7 @@@ msgstr " "command> o <command>apt-get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@@ -8045,7 -8045,7 +8092,7 @@@ msgstr " "upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@@ -8064,12 -8064,12 +8111,12 @@@ msgstr " "versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "El efecto de las preferencias sobre APT" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -8082,7 -8082,7 +8129,7 @@@ msgstr " "registros pueden tener una de estos dos formatos: el específico o el general." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@@ -8098,7 -8098,7 +8145,7 @@@ msgstr " "separados por espacios." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@@ -8110,7 -8110,7 +8157,7 @@@ msgstr " "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@@ -8125,7 -8125,7 +8172,7 @@@ msgstr " "identificado por su nombre de dominio." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@@ -8136,7 -8136,7 +8183,7 @@@ msgstr " "prioridad alta a todas las versiones disponibles desde un sitio local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@@ -8148,7 -8148,7 +8195,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -8162,7 -8162,7 +8209,7 @@@ msgstr " "debian.org»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@@ -8174,7 -8174,7 +8221,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@@ -8189,7 -8189,7 +8236,7 @@@ msgstr " "sino el autor o el nombre del proveedor, tales como «Debian» o «Ximian»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@@ -8200,7 -8200,7 +8247,7 @@@ msgstr " "archivo de paquetes «<literal>unstable</literal>» (inestable)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@@ -8212,7 -8212,7 +8259,7 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@@ -8223,7 -8223,7 +8270,7 @@@ msgstr " "«<literal>&testing-codename;</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@@ -8235,7 -8235,7 +8282,7 @@@ msgstr " "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -8247,7 -8247,7 +8294,7 @@@ msgstr " "«<literal>3.0</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@@ -8259,17 -8259,17 +8306,17 @@@ msgstr " "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "¿Cómo interpreta APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@@ -8278,12 -8278,12 +8325,12 @@@ msgstr " "el sistema." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@@ -8292,12 -8292,12 +8339,12 @@@ msgstr " "que la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@@ -8307,12 -8307,12 +8354,12 @@@ msgstr " "más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@@ -8321,12 -8321,12 +8368,12 @@@ msgstr " "perteneciente a otra distribución, o si la versión instalada es más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@@ -8334,17 -8334,17 +8381,17 @@@ msgstr " "La versión sólo se instala si no hay ninguna versión del paquete instalada." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "Evita la instalación de la versión." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -8355,7 -8355,7 +8402,7 @@@ msgstr " "siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -8369,7 -8369,7 +8416,7 @@@ msgstr " "versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@@ -8378,7 -8378,7 +8425,7 @@@ msgstr " "registros antes mencionados:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@@ -8406,12 -8406,12 +8453,12 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Por ello:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@@ -8426,7 -8426,7 +8473,7 @@@ msgstr " "la versión 5.8*, desactualizando el paquete." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -8437,7 -8437,7 +8484,7 @@@ msgstr " "versiones, incluso sobre los pertenecientes a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@@ -8450,12 -8450,12 +8497,12 @@@ msgstr " "hay ninguna versión del paquete ya instalado." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "Determinar la versión del paquete y las propiedades de la distribución" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -8466,27 -8466,27 +8513,27 @@@ msgstr " "describen los paquetes disponibles en cada uno de los sitios." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "La línea <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "indica el nombre del paquete." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "La línea <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "indica el número de versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@@ -8507,12 -8507,12 +8554,12 @@@ msgstr " "de APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -8530,18 -8530,18 +8577,18 @@@ msgstr " "línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "La línea <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@@ -8560,13 -8560,13 +8607,13 @@@ msgstr " "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@@ -8582,7 -8582,7 +8629,7 @@@ msgstr " "siguientes línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -8594,12 -8594,12 +8641,12 @@@ msgstr " "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "La línea <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -8618,18 -8618,18 +8665,18 @@@ msgstr " "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "La línea <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8642,18 -8642,18 +8689,18 @@@ msgstr " "mediante la siguiente línea:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "La línea <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8666,13 -8666,13 +8713,13 @@@ msgstr " "siguiente línea:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -8695,7 -8695,7 +8742,7 @@@ msgstr " "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -8720,12 -8720,12 +8767,12 @@@ msgstr " "la distribución «<literal>unstable</literal>» (inestable)." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "Líneas opcionales en el registro de preferencias de APT" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -8736,12 -8736,12 +8783,12 @@@ msgstr " "Útil para comentarios." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "Seguir la distribución «stable» (estable)" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -8765,7 -8765,7 +8812,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8780,8 -8780,8 +8827,8 @@@ msgstr " "<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 --#: apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -8793,7 -8793,7 +8840,7 @@@ msgstr " "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8807,13 -8807,13 +8854,13 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -8826,12 -8826,12 +8873,12 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@@ -8859,7 -8859,7 +8906,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -8876,7 -8876,7 +8923,7 @@@ msgstr " ">" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8889,13 -8889,13 +8936,13 @@@ msgstr " "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -8914,12 -8914,12 +8961,12 @@@ msgstr " "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "Seguir la evolución de una publicación por el nombre" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -8953,7 -8953,7 +9000,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8980,7 -8980,7 +9027,7 @@@ msgstr " "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@@ -8994,13 -8994,13 +9041,13 @@@ msgstr " "id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -9019,12 -9019,12 +9066,12 @@@ msgstr " "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -11048,6 -11048,6 +11095,22 @@@ msgstr " # apt-get -o dir::cache::arch msgid "Which will use the already fetched archives on the disc." msgstr "Ésto usará los archivos del disco previamente obtenidos." ++#~ msgid "<option>--md5</option>" ++#~ msgstr "<option>--md5</option>" ++ ++#~ msgid "" ++#~ "Generate MD5 sums. This defaults to on, when turned off the generated " ++#~ "index files will not have MD5Sum fields where possible. Configuration " ++#~ "Item: <literal>APT::FTPArchive::MD5</literal>" ++#~ msgstr "" ++#~ "Genera una suma de control MD5. Está activado de forma predeterminada, " ++#~ "cuando se desactiva los ficheros de índices generados no tendrán los " ++#~ "campos MD5Sum cuando sea posible. Opción de configuración: <literal>APT::" ++#~ "FTPArchive::MD5</literal>" ++ ++#~ msgid "to the version that is already installed (if any)." ++#~ msgstr "a la versión instalada (de existir)." ++ #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "" #~ "Herramienta para la gestión de paquetes APT -- manipulador de la caché" @@@ -11107,8 -11107,8 +11170,12 @@@ #~ "Usa HTTP para acceder al archivo de Debian en «nonus.debian.org», bajo el " #~ "directorio debian-non-US." --#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" --#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" ++#~ msgid "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" ++#~ msgstr "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" #~ msgid "OPTIONS" #~ msgstr "OPCIONES" diff --cc doc/po/fr.po index 3c8f1a8ac,33a118036..988828235 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: \n" - "POT-Creation-Date: 2011-03-10 11:35+0100\n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2011-02-17 07:50+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@@ -1552,7 -1552,7 +1552,7 @@@ msgstr "&apt-commonoptions; #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 --#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Fichiers" @@@ -1563,9 -1563,9 +1563,9 @@@ msgstr "&file-sourceslist; &file-statel #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 --#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 ++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Voir aussi" @@@ -3325,7 -3304,7 +3325,7 @@@ msgstr " "generate." #. type: Content of: <refentry><refsect1><title> - #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:496 -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Exemples" @@@ -7839,32 -7818,32 +7839,50 @@@ msgstr "priorité 1 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 ++#, fuzzy ++#| msgid "" ++#| "to the versions coming from archives which in their <filename>Release</" ++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " ++#| "experimental archive." msgid "" "to the versions coming from archives which in their <filename>Release</" --"filename> files are marked as \"NotAutomatic: yes\" like the debian " --"experimental archive." ++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" ++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" "pour les versions issues d'archives dont le fichier <filename>Release</" "filename> comporte la mention « NotAutomatic: yes » comme, par exemple, " "l'archive « experimental » de Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "une priorité égale à 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --msgid "to the version that is already installed (if any)." --msgstr "est affectée à la version déjà installée (si elle existe)." ++#: apt_preferences.5.xml:114 ++#, fuzzy ++#| msgid "" ++#| "to the versions coming from archives which in their <filename>Release</" ++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " ++#| "experimental archive." ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." ++msgstr "" ++"pour les versions issues d'archives dont le fichier <filename>Release</" ++"filename> comporte la mention « NotAutomatic: yes » comme, par exemple, " ++"l'archive « experimental » de Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "une priorité égale à 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@@ -7873,12 -7852,12 +7891,12 @@@ msgstr " "pas à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@@ -7897,13 -7876,13 +7915,21 @@@ msgstr " "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 ++#, fuzzy ++#| msgid "" ++#| "If the target release has not been specified then APT simply assigns " ++#| "priority 100 to all installed package versions and priority 500 to all " ++#| "uninstalled package versions, expect versions coming from archives which " ++#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " ++#| "yes\" - these versions get the priority 1." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Quand aucune distribution par défaut n'a été indiquée, APT affecte " "simplement une priorité égale à 100 à toute version installée d'un paquet et " @@@ -7913,7 -7892,7 +7939,7 @@@ "priorité égale à 1." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@@ -7922,7 -7901,7 +7948,7 @@@ msgstr " "qu'il faut installer (par ordre de priorité) :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -7938,12 -7917,12 +7964,12 @@@ msgstr " "arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "Installer la version qui possède la priorité la plus haute." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@@ -7952,7 -7931,7 +7978,7 @@@ msgstr " "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@@ -7964,7 -7943,7 +7990,7 @@@ msgstr " "qui n'est pas installée." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@@ -7979,7 -7958,7 +8005,7 @@@ msgstr " "replaceable></command> ou <command>apt-get dist-upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@@ -7992,7 -7971,7 +8018,7 @@@ msgstr " "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@@ -8011,12 -7990,12 +8037,12 @@@ msgstr " "priorité que celle de la version installée." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "Conséquences des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -8029,7 -8008,7 +8055,7 @@@ msgstr " "formes, une forme particulière et une forme générale." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@@ -8044,7 -8023,7 +8070,7 @@@ msgstr " "dont le numéro de version commence par <literal>5.8</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@@ -8056,7 -8035,7 +8082,7 @@@ msgstr " "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@@ -8071,7 -8050,7 +8097,7 @@@ msgstr " "un nom complètement qualifié." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@@ -8082,7 -8061,7 +8108,7 @@@ msgstr " "priorité haute à toutes les versions disponibles dans le site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@@ -8094,7 -8073,7 +8120,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -8107,7 -8086,7 +8133,7 @@@ msgstr " "serveur identifié par l' nom d'hôte « ftp.de.debian.org »." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@@ -8119,7 -8098,7 +8145,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@@ -8134,7 -8113,7 +8160,7 @@@ msgstr " "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@@ -8145,7 -8124,7 +8171,7 @@@ msgstr " "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@@ -8157,7 -8136,7 +8183,7 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@@ -8168,7 -8147,7 +8194,7 @@@ msgstr " "<literal>&testing-codename;</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@@ -8180,7 -8159,7 +8206,7 @@@ msgstr " "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -8192,7 -8171,7 +8218,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@@ -8204,17 -8183,17 +8230,17 @@@ msgstr " "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "Méthode d'interprétation des priorités par APT" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@@ -8223,12 -8202,12 +8249,12 @@@ msgstr " "retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@@ -8238,12 -8217,12 +8264,12 @@@ msgstr " "plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@@ -8252,12 -8231,12 +8278,12 @@@ msgstr " "distribution par défaut ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@@ -8266,29 -8245,29 +8292,29 @@@ msgstr " "autre distribution ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "la version sera installée si aucune version du paquet n'est installée." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "cette priorité empêche l'installation de la version." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -8299,7 -8278,7 +8325,7 @@@ msgstr " "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -8313,7 -8292,7 +8339,7 @@@ msgstr " "trouvée détermine la priorité." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@@ -8322,7 -8301,7 +8348,7 @@@ msgstr " "entrées décrites ci-dessous :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@@ -8350,12 -8329,12 +8376,12 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Alors :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@@ -8369,7 -8348,7 +8395,7 @@@ msgstr " "installée est une version 5.9*, il y aura un retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -8380,7 -8359,7 +8406,7 @@@ msgstr " "appartenant à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@@ -8393,13 -8372,13 +8419,13 @@@ msgstr " "paquet n'est déjà installée." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "" "Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -8410,27 -8389,27 +8436,27 @@@ msgstr " "décrivent les paquets disponibles à cet endroit." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "la ligne <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "donne le nom du paquet" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "la ligne <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "donne le numéro de version du paquet" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@@ -8451,12 -8430,12 +8477,12 @@@ msgstr " "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -8473,18 -8452,18 +8499,18 @@@ msgstr " "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "la ligne <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@@ -8502,13 -8481,13 +8528,13 @@@ msgstr " "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@@ -8524,7 -8503,7 +8550,7 @@@ msgstr " "préférences demanderait ces lignes :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -8536,12 -8515,12 +8562,12 @@@ msgstr " "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "La ligne <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -8559,18 -8538,18 +8585,18 @@@ msgstr " "fichier des préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "La ligne <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8583,18 -8562,18 +8609,18 @@@ msgstr " "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "La ligne <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8607,13 -8586,13 +8633,13 @@@ msgstr " "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -8637,7 -8616,7 +8663,7 @@@ msgstr " "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -8662,12 -8641,12 +8688,12 @@@ msgstr " "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "Lignes facultatives dans le fichier des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -8678,12 -8657,12 +8704,12 @@@ msgstr " "commentaires." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "Méthode pour suivre Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -8707,7 -8686,7 +8733,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8722,8 -8701,8 +8748,8 @@@ msgstr " "literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 --#: apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -8735,7 -8714,7 +8761,7 @@@ msgstr " "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8748,13 -8727,13 +8774,13 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -8767,12 -8746,12 +8793,12 @@@ msgstr " "de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "Méthode pour suivre Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@@ -8800,7 -8779,7 +8826,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -8817,7 -8796,7 +8843,7 @@@ msgstr " "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8830,13 -8809,13 +8856,13 @@@ msgstr " "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -8855,12 -8834,12 +8881,12 @@@ msgstr " "installée. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "Suivre l'évolution d'une version par son nom de code" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -8894,7 -8873,7 +8920,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8918,7 -8897,7 +8944,7 @@@ msgstr " "exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@@ -8931,13 -8910,13 +8957,13 @@@ msgstr " "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -8956,12 -8935,12 +8982,12 @@@ msgstr " "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -11007,19 -10986,6 +11033,22 @@@ msgstr " # apt-get -o dir::cache::arch msgid "Which will use the already fetched archives on the disc." msgstr "Cette commande utilisera les fichiers récupérés sur le disque." ++#~ msgid "to the version that is already installed (if any)." ++#~ msgstr "est affectée à la version déjà installée (si elle existe)." ++ +#~ msgid "<option>--md5</option>" +#~ msgstr "<option>--md5</option>" + +#~ msgid "" +#~ "Generate MD5 sums. This defaults to on, when turned off the generated " +#~ "index files will not have MD5Sum fields where possible. Configuration " +#~ "Item: <literal>APT::FTPArchive::MD5</literal>" +#~ msgstr "" +#~ "Créer la somme de contrôle MD5. Cette option est activée par défaut. " +#~ "Quand elle est désactivée, les fichiers d'index n'ont pas les champs " +#~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::" +#~ "FTPArchive::MD5</literal>." + #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "Gestionnaire de paquets APT - manipulation du cache" diff --cc doc/po/it.po index 94cc9bb76,94cc9bb76..0735044dd --- a/doc/po/it.po +++ b/doc/po/it.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: \n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@@ -934,7 -934,7 +934,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@@ -955,12 -955,12 +955,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "" @@@ -1059,7 -1059,7 +1059,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "" @@@ -1155,14 -1155,14 +1155,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 --#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 ++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 #: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 --#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "" @@@ -1173,9 -1173,9 +1173,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 --#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 ++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 --#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 ++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "" @@@ -1187,7 -1187,7 +1187,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 --#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 ++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@@ -1292,7 -1292,7 +1292,7 @@@ msgid "Options msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "" @@@ -1496,7 -1496,7 +1496,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@@ -2407,31 -2407,31 +2407,38 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" ++msgid "" ++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" ++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" ++"replaceable>::<replaceable>Checksum</replaceable></literal> where " ++"<literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" ++"literal> or <literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -2440,12 -2440,12 +2447,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@@ -2454,12 -2454,12 +2461,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -2469,12 -2469,12 +2476,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@@ -2482,24 -2482,24 +2489,24 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@@ -2508,12 -2508,12 +2515,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -2527,12 -2527,12 +2534,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -2542,26 -2542,26 +2549,26 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -5833,39 -5833,39 +5840,44 @@@ msgstr " #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their <filename>Release</" --"filename> files are marked as \"NotAutomatic: yes\" like the debian " --"experimental archive." ++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" ++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --msgid "to the version that is already installed (if any)." ++#: apt_preferences.5.xml:114 ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@@ -5879,24 -5879,24 +5891,25 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -5906,19 -5906,19 +5919,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@@ -5926,7 -5926,7 +5939,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@@ -5936,7 -5936,7 +5949,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@@ -5945,7 -5945,7 +5958,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@@ -5957,12 -5957,12 +5970,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -5971,7 -5971,7 +5984,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@@ -5981,7 -5981,7 +5994,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@@ -5990,7 -5990,7 +6003,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@@ -6000,7 -6000,7 +6013,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@@ -6008,7 -6008,7 +6021,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@@ -6017,7 -6017,7 +6030,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -6026,7 -6026,7 +6039,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@@ -6035,7 -6035,7 +6048,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@@ -6045,7 -6045,7 +6058,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@@ -6053,7 -6053,7 +6066,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@@ -6062,7 -6062,7 +6075,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@@ -6070,7 -6070,7 +6083,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@@ -6079,7 -6079,7 +6092,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -6087,7 -6087,7 +6100,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@@ -6096,82 -6096,82 +6109,82 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -6179,7 -6179,7 +6192,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -6188,14 -6188,14 +6201,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@@ -6212,12 -6212,12 +6225,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@@ -6227,7 -6227,7 +6240,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -6235,7 -6235,7 +6248,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@@ -6244,12 -6244,12 +6257,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -6257,27 -6257,27 +6270,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@@ -6290,12 -6290,12 +6303,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -6306,18 -6306,18 +6319,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@@ -6328,13 -6328,13 +6341,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@@ -6344,7 -6344,7 +6357,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -6353,12 -6353,12 +6366,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -6369,18 -6369,18 +6382,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -6389,18 -6389,18 +6402,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -6409,13 -6409,13 +6422,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -6429,7 -6429,7 +6442,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -6444,12 -6444,12 +6457,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -6457,12 -6457,12 +6470,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -6477,7 -6477,7 +6490,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -6487,8 -6487,8 +6500,8 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 --#: apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -6497,7 -6497,7 +6510,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -6506,13 -6506,13 +6519,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -6521,12 -6521,12 +6534,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@@ -6543,7 -6543,7 +6556,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -6554,7 -6554,7 +6567,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -6563,13 -6563,13 +6576,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -6581,12 -6581,12 +6594,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -6606,7 -6606,7 +6619,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -6621,7 -6621,7 +6634,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@@ -6630,13 -6630,13 +6643,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -6648,12 -6648,12 +6661,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --cc doc/po/ja.po index 3a0db1bbf,3a0db1bbf..0f88e5e85 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@@ -7,7 -7,7 +7,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-09-07 07:38+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@@ -1357,7 -1357,7 +1357,7 @@@ msgstr " "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@@ -1384,12 -1384,12 +1384,12 @@@ msgstr " "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@@ -1505,7 -1505,7 +1505,7 @@@ msgstr " "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@@ -1627,7 -1627,7 +1627,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 --#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 ++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 #: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@@ -1635,7 -1635,7 +1635,7 @@@ # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 --#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "ファイル" @@@ -1647,9 -1647,9 +1647,9 @@@ msgstr "&file-sourceslist; &file-statel # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 --#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 ++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 --#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 ++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "関連項目" @@@ -1663,7 -1663,7 +1663,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 --#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 ++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "診断メッセージ" @@@ -1805,7 -1805,7 +1805,7 @@@ msgid "Options msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@@ -2075,7 -2075,7 +2075,7 @@@ msgstr "設定箇所の内容を表示ã # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@@ -3286,29 -3286,29 +3286,49 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" --msgstr "<option>--md5</option>" ++msgid "" ++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" ++msgstr "" --# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 --msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++#, fuzzy ++#| msgid "" ++#| "Values for the additional metadata fields in the Release file are taken " ++#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" ++#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " ++#| "supported fields are: <literal>Origin</literal>, <literal>Label</" ++#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " ++#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" ++#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" ++#| "literal>, <literal>Description</literal>." ++msgid "" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" ++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" ++"replaceable>::<replaceable>Checksum</replaceable></literal> where " ++"<literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" ++"literal> or <literal>SHA256</literal>." msgstr "" --"MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイン" --"デックスファイルに MD5Sum フィールドがありません。設定項目 - <literal>APT::" --"FTPArchive::MD5</literal>" ++"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::" ++"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::" ++"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</" ++"literal>, <literal>Label</literal>, <literal>Suite</literal>, " ++"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</" ++"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, " ++"<literal>Components</literal>, <literal>Description</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@@ -3318,7 -3318,7 +3338,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -3331,13 -3331,13 +3351,13 @@@ msgstr " "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@@ -3350,13 -3350,13 +3370,13 @@@ msgstr " "<literal>APT::FTPArchive::DeLinkAct</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -3371,13 -3371,13 +3391,13 @@@ msgstr " "<literal>APT::FTPArchive::Contents</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@@ -3387,13 -3387,13 +3407,13 @@@ msgstr " "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@@ -3402,13 -3402,13 +3422,13 @@@ msgstr " "FTPArchive::ReadOnlyDB</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 #, fuzzy msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " @@@ -3422,12 -3422,12 +3442,12 @@@ msgstr " "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -3441,12 -3441,12 +3461,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 #, fuzzy msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " @@@ -3462,14 -3462,14 +3482,14 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "サンプル" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" @@@ -3478,7 -3478,7 +3498,7 @@@ # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@@ -3488,7 -3488,7 +3508,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -7854,31 -7854,31 +7874,35 @@@ msgstr "priority 1 #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their <filename>Release</" --"filename> files are marked as \"NotAutomatic: yes\" like the debian " --"experimental archive." ++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" ++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "priority 100" --# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --msgid "to the version that is already installed (if any)." --msgstr "(あるならば) 既にインストールされているバージョン。" ++#: apt_preferences.5.xml:114 ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." ++msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "priority 500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@@ -7886,13 -7886,13 +7910,13 @@@ msgstr "インストールされておã # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "priority 990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。" @@@ -7911,14 -7911,14 +7935,15 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "ターゲットリリースが指定されていなければ、APT は単純にインストールしている" "パッケージのバージョンには 100 を、インストールしていないパッケージのバージョ" @@@ -7926,7 -7926,7 +7951,7 @@@ # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@@ -7936,7 -7936,7 +7961,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -7952,13 -7952,13 +7977,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "最も高い優先度のバージョンをインストールします。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@@ -7968,7 -7968,7 +7993,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@@ -7980,7 -7980,7 +8005,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@@ -7996,7 -7996,7 +8021,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@@ -8010,7 -8010,7 +8035,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@@ -8030,13 -8030,13 +8055,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "APT 設定の効果" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -8049,7 -8049,7 +8074,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@@ -8064,7 -8064,7 +8089,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@@ -8078,7 -8078,7 +8103,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@@ -8093,7 -8093,7 +8118,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@@ -8105,7 -8105,7 +8130,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@@ -8118,7 -8118,7 +8143,7 @@@ msgstr " "\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -8128,7 -8128,7 +8153,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@@ -8141,7 -8141,7 +8166,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 #, fuzzy msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " @@@ -8158,7 -8158,7 +8183,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@@ -8169,7 -8169,7 +8194,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@@ -8183,7 -8183,7 +8208,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@@ -8195,7 -8195,7 +8220,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@@ -8208,7 -8208,7 +8233,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -8220,7 -8220,7 +8245,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@@ -8234,18 -8234,18 +8259,18 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "APT が優先度に割り込む方法" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@@ -8253,13 -8253,13 +8278,13 @@@ msgstr " "パッケージがダウングレードしても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@@ -8268,13 -8268,13 +8293,13 @@@ msgstr " "含まれなくても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@@ -8283,13 -8283,13 +8308,13 @@@ msgstr " "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@@ -8299,13 -8299,13 +8324,13 @@@ msgstr " "ル" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@@ -8314,19 -8314,19 +8339,19 @@@ msgstr " "ンストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "このバージョンのインストール禁止" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -8338,7 -8338,7 +8363,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -8352,7 -8352,7 +8377,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@@ -8362,7 -8362,7 +8387,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><programlisting> #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@@ -8392,13 -8392,13 +8417,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "すると、以下のように動作します。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@@ -8413,7 -8413,7 +8438,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -8425,7 -8425,7 +8450,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@@ -8439,13 -8439,13 +8464,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "パッケージのバージョンとディストリビューションプロパティの決定" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -8456,30 -8456,30 +8481,30 @@@ msgstr " "filename> ファイルを提供します。" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "<literal>Package:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "パッケージ名" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "<literal>Version:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "その名前のパッケージのバージョン番号" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@@ -8499,13 -8499,13 +8524,13 @@@ msgstr " "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -8522,19 -8522,19 +8547,19 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "<literal>Codename:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@@ -8552,14 -8552,14 +8577,14 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@@ -8575,7 -8575,7 +8600,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -8588,13 -8588,13 +8613,13 @@@ msgstr " "\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "<literal>Component:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -8612,19 -8612,19 +8637,19 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "<literal>Origin:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8637,7 -8637,7 +8662,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@@ -8645,13 -8645,13 +8670,13 @@@ "\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "<literal>Label:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8664,7 -8664,7 +8689,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@@ -8673,7 -8673,7 +8698,7 @@@ # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@@ -8697,7 -8697,7 +8722,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -8723,13 -8723,13 +8748,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "APT 設定レコードのオプション行" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -8740,13 -8740,13 +8765,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -8772,7 -8772,7 +8797,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8788,8 -8788,8 +8813,8 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 --#: apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -8802,7 -8802,7 +8827,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8815,14 -8815,14 +8840,14 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>package</replaceable>/testing\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -8836,13 -8836,13 +8861,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "テスト版や不安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@@ -8871,7 -8871,7 +8896,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -8889,7 -8889,7 +8914,7 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8902,14 -8902,14 +8927,14 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>package</replaceable>/unstable\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -8928,13 -8928,13 +8953,13 @@@ msgstr " "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "コード名リリースの進化の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -8968,7 -8968,7 +8993,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8992,7 -8992,7 +9017,7 @@@ msgstr " "id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@@ -9005,14 -9005,14 +9030,14 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>package</replaceable>/sid\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@@ -9032,13 -9032,13 +9057,13 @@@ msgstr " # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -10742,6 -10742,6 +10767,23 @@@ msgstr " # apt-get -o dir::cache::arch msgid "Which will use the already fetched archives on the disc." msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。" ++#~ msgid "<option>--md5</option>" ++#~ msgstr "<option>--md5</option>" ++ ++# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#~ msgid "" ++#~ "Generate MD5 sums. This defaults to on, when turned off the generated " ++#~ "index files will not have MD5Sum fields where possible. Configuration " ++#~ "Item: <literal>APT::FTPArchive::MD5</literal>" ++#~ msgstr "" ++#~ "MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイ" ++#~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - " ++#~ "<literal>APT::FTPArchive::MD5</literal>" ++ ++# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> ++#~ msgid "to the version that is already installed (if any)." ++#~ msgstr "(あるならば) 既にインストールされているバージョン。" ++ # type: Content of: <refentry><refnamediv><refpurpose> #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作ツール" @@@ -10803,8 -10803,8 +10845,12 @@@ #~ "nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクト" #~ "リ以下を使用します。" --#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" --#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" ++#~ msgid "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" ++#~ msgstr "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" # type: SH #~ msgid "OPTIONS" diff --cc doc/po/pl.po index 7c98ac229,7c98ac229..83615be50 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@@ -10,7 -10,7 +10,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@@ -1363,7 -1363,7 +1363,7 @@@ msgstr " "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@@ -1391,12 -1391,12 +1391,12 @@@ msgstr " "Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@@ -1534,7 -1534,7 +1534,7 @@@ msgstr " "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@@ -1660,14 -1660,14 +1660,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 --#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 ++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 #: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 --#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Pliki" @@@ -1678,9 -1678,9 +1678,9 @@@ msgstr "&file-sourceslist; &file-statel #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 --#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 ++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 --#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 ++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Zobacz także" @@@ -1693,7 -1693,7 +1693,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 --#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 ++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostyka" @@@ -1842,7 -1842,7 +1842,7 @@@ msgid "Options msgstr "Opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@@ -2105,7 -2105,7 +2105,7 @@@ msgid "Just show the contents of the co msgstr "Wyświetla zawartość przestrzeni konfiguracji." #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@@ -3094,25 -3094,25 +3094,32 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" --msgstr "<option>--md5</option>" ++msgid "" ++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" ++msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" ++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" ++"replaceable>::<replaceable>Checksum</replaceable></literal> where " ++"<literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" ++"literal> or <literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 #, fuzzy msgid "" "Use a binary caching DB. This has no effect on the generate command. " @@@ -3123,7 -3123,7 +3130,7 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -3137,13 -3137,13 +3144,13 @@@ msgstr " "pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 #, fuzzy msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " @@@ -3157,12 -3157,12 +3164,12 @@@ msgstr " "<literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -3172,13 -3172,13 +3179,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 #, fuzzy msgid "" "Select the source override file to use with the <literal>sources</literal> " @@@ -3190,13 -3190,13 +3197,13 @@@ msgstr " "konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 #, fuzzy msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" @@@ -3206,14 -3206,14 +3213,14 @@@ msgstr " "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 #, fuzzy #| msgid "<option>-a</option>" msgid "<option>--arch</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 #, fuzzy #| msgid "" #| "If the command is either <literal>install</literal> or <literal>remove</" @@@ -3233,13 -3233,13 +3240,13 @@@ msgstr " "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 #, fuzzy msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -3253,13 -3253,13 +3260,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 #, fuzzy msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -3269,19 -3269,19 +3276,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Przykłady" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@@ -3289,7 -3289,7 +3296,7 @@@ msgstr " # #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -7100,39 -7100,39 +7107,44 @@@ msgstr "priorytet 100 #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their <filename>Release</" --"filename> files are marked as \"NotAutomatic: yes\" like the debian " --"experimental archive." ++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" ++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "priorytet 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --msgid "to the version that is already installed (if any)." ++#: apt_preferences.5.xml:114 ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "priorytet 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "priorytet 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@@ -7146,24 -7146,24 +7158,25 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -7173,19 -7173,19 +7186,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@@ -7193,7 -7193,7 +7206,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@@ -7203,7 -7203,7 +7216,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@@ -7212,7 -7212,7 +7225,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@@ -7224,12 -7224,12 +7237,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -7238,7 -7238,7 +7251,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@@ -7248,7 -7248,7 +7261,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@@ -7260,7 -7260,7 +7273,7 @@@ msgstr " "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@@ -7270,7 -7270,7 +7283,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@@ -7278,7 -7278,7 +7291,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@@ -7290,7 -7290,7 +7303,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -7299,7 -7299,7 +7312,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, fuzzy, no-wrap #| msgid "" #| "Package: *\n" @@@ -7315,7 -7315,7 +7328,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@@ -7325,7 -7325,7 +7338,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@@ -7333,7 -7333,7 +7346,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@@ -7345,7 -7345,7 +7358,7 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@@ -7353,7 -7353,7 +7366,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, fuzzy, no-wrap #| msgid "" #| "Package: *\n" @@@ -7369,7 -7369,7 +7382,7 @@@ msgstr " "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -7377,7 -7377,7 +7390,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@@ -7389,17 -7389,17 +7402,17 @@@ msgstr " "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@@ -7409,12 -7409,12 +7422,12 @@@ msgstr " "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@@ -7424,12 -7424,12 +7437,12 @@@ msgstr " "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@@ -7439,12 -7439,12 +7452,12 @@@ msgstr " "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@@ -7454,12 -7454,12 +7467,12 @@@ msgstr " "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@@ -7468,17 -7468,17 +7481,17 @@@ msgstr " "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -7486,7 -7486,7 +7499,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -7495,14 -7495,14 +7508,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@@ -7530,12 -7530,12 +7543,12 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Wtedy:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@@ -7545,7 -7545,7 +7558,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -7553,7 -7553,7 +7566,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@@ -7562,12 -7562,12 +7575,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -7575,27 -7575,27 +7588,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "linia <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "podaje nazwę pakietu" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "linia <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "podaje numer wersji danego pakietu" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@@ -7608,12 -7608,12 +7621,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -7624,18 -7624,18 +7637,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "linia <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@@ -7646,14 -7646,14 +7659,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, fuzzy, no-wrap #| msgid "Pin: release a=stable\n" msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@@ -7663,7 -7663,7 +7676,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -7675,12 -7675,12 +7688,12 @@@ msgstr " "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "linia <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -7691,18 -7691,18 +7704,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "linia <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -7711,18 -7711,18 +7724,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "linia <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -7731,13 -7731,13 +7744,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -7751,7 -7751,7 +7764,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -7766,12 -7766,12 +7779,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -7779,12 -7779,12 +7792,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -7808,7 -7808,7 +7821,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -7818,8 -7818,8 +7831,8 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 --#: apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -7831,7 -7831,7 +7844,7 @@@ msgstr " "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -7840,13 -7840,13 +7853,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -7855,12 -7855,12 +7868,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@@ -7888,7 -7888,7 +7901,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -7899,7 -7899,7 +7912,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -7908,13 -7908,13 +7921,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -7926,12 -7926,12 +7939,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -7965,7 -7965,7 +7978,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -7980,7 -7980,7 +7993,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@@ -7989,13 -7989,13 +8002,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -8007,12 -8007,12 +8020,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -10054,6 -10054,6 +10067,9 @@@ msgstr " # apt-get -o dir::cache::arch msgid "Which will use the already fetched archives on the disc." msgstr "Które użyje pobranych uprzednio archiwów z dysku." ++#~ msgid "<option>--md5</option>" ++#~ msgstr "<option>--md5</option>" ++ # #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora" @@@ -10085,8 -10085,8 +10101,12 @@@ #~ "Użycie HTTP do uzyskania dostępu do archiwum na komputerze nonus.debian." #~ "org, w katalogu debian-non-US." --#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" --#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" ++#~ msgid "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" ++#~ msgstr "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" #~ msgid "OPTIONS" #~ msgstr "OPCJE" diff --cc doc/po/pt.po index ca1252475,ca1252475..93d7ad3af --- a/doc/po/pt.po +++ b/doc/po/pt.po @@@ -6,7 -6,7 +6,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-08-25 23:07+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@@ -1306,7 -1306,7 +1306,7 @@@ msgstr " "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@@ -1332,12 -1332,12 +1332,12 @@@ msgstr " "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@@ -1451,7 -1451,7 +1451,7 @@@ msgstr " "<literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@@ -1568,14 -1568,14 +1568,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 --#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 ++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 #: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 --#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Ficheiros" @@@ -1586,9 -1586,9 +1586,9 @@@ msgstr "&file-sourceslist; &file-statel #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 --#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 ++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 --#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 ++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Veja também" @@@ -1600,7 -1600,7 +1600,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 --#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 ++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnóstico" @@@ -1735,7 -1735,7 +1735,7 @@@ msgid "Options msgstr "Opções" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@@ -1988,7 -1988,7 +1988,7 @@@ msgid "Just show the contents of the co msgstr "Apenas mostra o conteúdo do espaço de configuração." #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@@ -3131,27 -3131,27 +3131,49 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" --msgstr "<option>--md5</option>" ++msgid "" ++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" ++msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 --msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++#, fuzzy ++#| msgid "" ++#| "Values for the additional metadata fields in the Release file are taken " ++#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" ++#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " ++#| "supported fields are: <literal>Origin</literal>, <literal>Label</" ++#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " ++#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" ++#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" ++#| "literal>, <literal>Description</literal>." ++msgid "" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" ++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" ++"replaceable>::<replaceable>Checksum</replaceable></literal> where " ++"<literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" ++"literal> or <literal>SHA256</literal>." msgstr "" --"Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros " --"índice gerados não terão campos MD5Sum onde possíveis. Item de Configuração: " --"<literal>APT::FTPArchive::MD5</literal>" ++"Valores para os campos de metadados adicionais no ficheiro Release são " ++"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::" ++"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>. " ++"Os campos suportados são: <literal>Origin</literal>, <literal>Label</" ++"literal>, <literal>Suite</literal>, <literal>Version</literal>, " ++"<literal>Codename</literal>, <literal>Date</literal>, " ++"<literal>Architectures</literal>, <literal>Components</literal>, " ++"<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@@ -3160,7 -3160,7 +3182,7 @@@ msgstr " "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -3174,12 -3174,12 +3196,12 @@@ msgstr " "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@@ -3192,12 -3192,12 +3214,12 @@@ msgstr " "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -3213,12 -3213,12 +3235,12 @@@ msgstr " "de Configuração: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@@ -3229,12 -3229,12 +3251,12 @@@ msgstr " "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@@ -3243,12 -3243,12 +3265,12 @@@ msgstr " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@@ -3262,12 -3262,12 +3284,12 @@@ msgstr " "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -3291,12 -3291,12 +3313,12 @@@ msgstr " "as verificações extras serão desnecessárias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -3311,19 -3311,19 +3333,19 @@@ msgstr " "<filename>Translation-en</filename> só pode ser criado no comando generate." #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Examples" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@@ -3332,7 -3332,7 +3354,7 @@@ msgstr " "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -7787,32 -7787,32 +7809,50 @@@ msgstr "priority 1 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 ++#, fuzzy ++#| msgid "" ++#| "to the versions coming from archives which in their <filename>Release</" ++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " ++#| "experimental archive." msgid "" "to the versions coming from archives which in their <filename>Release</" --"filename> files are marked as \"NotAutomatic: yes\" like the debian " --"experimental archive." ++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" ++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" "para as versões vindas de arquivos cujos ficheiros <filename>Release</" "filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo " "experimental da debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "priority 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --msgid "to the version that is already installed (if any)." --msgstr "para a versão que já está instalada (se alguma)." ++#: apt_preferences.5.xml:114 ++#, fuzzy ++#| msgid "" ++#| "to the versions coming from archives which in their <filename>Release</" ++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " ++#| "experimental archive." ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." ++msgstr "" ++"para as versões vindas de arquivos cujos ficheiros <filename>Release</" ++"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo " ++"experimental da debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "priority 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@@ -7821,12 -7821,12 +7861,12 @@@ msgstr " "destinado." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "priority 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@@ -7844,13 -7844,13 +7884,21 @@@ msgstr " "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 ++#, fuzzy ++#| msgid "" ++#| "If the target release has not been specified then APT simply assigns " ++#| "priority 100 to all installed package versions and priority 500 to all " ++#| "uninstalled package versions, expect versions coming from archives which " ++#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " ++#| "yes\" - these versions get the priority 1." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Se o lançamento de destino não foi especificado, então o APT simplesmente " "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade " @@@ -7859,7 -7859,7 +7907,7 @@@ "marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@@ -7868,7 -7868,7 +7916,7 @@@ msgstr " "para determinar qual versão de um pacote deve instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -7884,12 -7884,12 +7932,12 @@@ msgstr " "arriscado.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "Instala a versão de prioridade mais alta." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@@ -7898,7 -7898,7 +7946,7 @@@ msgstr " "(isto é, aquela com o número de versão mais alto)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@@ -7909,7 -7909,7 +7957,7 @@@ msgstr " "reinstall</literal> é fornecida, instala a que foi desinstalada." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@@ -7924,7 -7924,7 +7972,7 @@@ msgstr " "replaceable></command> ou <command>apt-get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@@ -7938,7 -7938,7 +7986,7 @@@ msgstr " "get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@@ -7957,12 -7957,12 +8005,12 @@@ msgstr " "prioridade mais alta que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "O Efeito das Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -7975,7 -7975,7 +8023,7 @@@ msgstr " "um ou dois formatos, um formato específico e um formato geral." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@@ -7991,7 -7991,7 +8039,7 @@@ msgstr " "espaços." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@@ -8003,7 -8003,7 +8051,7 @@@ msgstr " "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@@ -8018,7 -8018,7 +8066,7 @@@ msgstr " "nome de domínio totalmente qualificado do site." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@@ -8030,7 -8030,7 +8078,7 @@@ msgstr " "local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@@ -8042,7 -8042,7 +8090,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -8055,7 -8055,7 +8103,7 @@@ msgstr " "servidor identificadas pelo nome de máquina \"ftp.de.debian.org\"" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@@ -8067,7 -8067,7 +8115,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@@ -8082,7 -8082,7 +8130,7 @@@ msgstr " "como \"Debian\" ou \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@@ -8093,7 -8093,7 +8141,7 @@@ msgstr " "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@@ -8105,7 -8105,7 +8153,7 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@@ -8116,7 -8116,7 +8164,7 @@@ msgstr " "\"<literal>&testing-codename;</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@@ -8128,7 -8128,7 +8176,7 @@@ msgstr " "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -8140,7 -8140,7 +8188,7 @@@ msgstr " "\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@@ -8152,17 -8152,17 +8200,17 @@@ msgstr " "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta as Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@@ -8171,12 -8171,12 +8219,12 @@@ msgstr " "na versão do pacote (downgrade)" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@@ -8185,12 -8185,12 +8233,12 @@@ msgstr " "destino, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@@ -8200,12 -8200,12 +8248,12 @@@ msgstr " "mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@@ -8215,12 -8215,12 +8263,12 @@@ msgstr " "recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@@ -8229,17 -8229,17 +8277,17 @@@ msgstr " "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "previne a instalação da versão" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -8250,7 -8250,7 +8298,7 @@@ msgstr " "(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -8264,7 -8264,7 +8312,7 @@@ msgstr " "determina a prioridade da versão de pacote." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@@ -8273,7 -8273,7 +8321,7 @@@ msgstr " "registos apresentados atrás:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@@ -8301,12 -8301,12 +8349,12 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Então:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@@ -8321,7 -8321,7 +8369,7 @@@ msgstr " "downgrade ao <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -8332,7 -8332,7 +8380,7 @@@ msgstr " "versões, mesmo versões que pertencem ao lançamento de destino." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@@ -8345,12 -8345,12 +8393,12 @@@ msgstr " "instalação e se nenhuma versão do pacote já estiver instalada." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -8361,27 -8361,27 +8409,27 @@@ msgstr " "descrever os pacotes disponíveis nessa localização." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "fornece o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "fornece o número de versão do pacote nomeado" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@@ -8402,12 -8402,12 +8450,12 @@@ msgstr " "definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -8424,18 -8424,18 +8472,18 @@@ msgstr " "requerer a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@@ -8452,13 -8452,13 +8500,13 @@@ msgstr " "preferências do APT requer a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@@ -8474,7 -8474,7 +8522,7 @@@ msgstr " "seguintes linhas:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -8486,12 -8486,12 +8534,12 @@@ msgstr " "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -8509,18 -8509,18 +8557,18 @@@ msgstr " "a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8533,18 -8533,18 +8581,18 @@@ msgstr " "linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8557,13 -8557,13 +8605,13 @@@ msgstr " "linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -8586,7 -8586,7 +8634,7 @@@ msgstr " "APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -8611,12 -8611,12 +8659,12 @@@ msgstr " "literal> da distribuição <literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais num Registo de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -8627,12 -8627,12 +8675,12 @@@ msgstr " "literal>. Isto disponibiliza um espaço para comentários." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "Acompanhando Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -8656,7 -8656,7 +8704,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8672,8 -8672,8 +8720,8 @@@ msgstr " "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 --#: apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -8685,7 -8685,7 +8733,7 @@@ msgstr " "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8698,13 -8698,13 +8746,13 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -8717,12 -8717,12 +8765,12 @@@ msgstr " "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "Acompanhando Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@@ -8750,7 -8750,7 +8798,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -8767,7 -8767,7 +8815,7 @@@ msgstr " "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@@ -8780,13 -8780,13 +8828,13 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -8805,12 -8805,12 +8853,12 @@@ msgstr " "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "Acompanhando a evolução de um nome de código de lançamento" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -8844,7 -8844,7 +8892,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -8870,7 -8870,7 +8918,7 @@@ msgstr " "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@@ -8883,13 -8883,13 +8931,13 @@@ msgstr " "codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -8908,12 -8908,12 +8956,12 @@@ msgstr " "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -10930,6 -10930,6 +10978,21 @@@ msgstr " # apt-get -o dir::cache::arch msgid "Which will use the already fetched archives on the disc." msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." ++#~ msgid "<option>--md5</option>" ++#~ msgstr "<option>--md5</option>" ++ ++#~ msgid "" ++#~ "Generate MD5 sums. This defaults to on, when turned off the generated " ++#~ "index files will not have MD5Sum fields where possible. Configuration " ++#~ "Item: <literal>APT::FTPArchive::MD5</literal>" ++#~ msgstr "" ++#~ "Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros " ++#~ "índice gerados não terão campos MD5Sum onde possíveis. Item de " ++#~ "Configuração: <literal>APT::FTPArchive::MD5</literal>" ++ ++#~ msgid "to the version that is already installed (if any)." ++#~ msgstr "para a versão que já está instalada (se alguma)." ++ #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "" #~ "Utilitário de manuseamento de pacotes do APT -- manipulador de cache" @@@ -10989,8 -10989,8 +11052,12 @@@ #~ "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório " #~ "debian-non-US." --#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" --#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" ++#~ msgid "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" ++#~ msgstr "" ++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" ++#~ "free" #~ msgid "OPTIONS" #~ msgstr "OPÇÕES" diff --cc doc/po/pt_BR.po index 0b98064b9,0b98064b9..ebf4bd68e --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@@ -984,7 -984,7 +984,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@@ -1005,12 -1005,12 +1005,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "" @@@ -1109,7 -1109,7 +1109,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "" @@@ -1205,14 -1205,14 +1205,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 --#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 ++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 #: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 --#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 ++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "" @@@ -1223,9 -1223,9 +1223,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 --#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 ++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 --#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 ++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 #: sources.list.5.xml:234 #, fuzzy msgid "See Also" @@@ -1238,7 -1238,7 +1238,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 --#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 ++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@@ -1343,7 -1343,7 +1343,7 @@@ msgid "Options msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "" @@@ -1548,7 -1548,7 +1548,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 #, fuzzy msgid "&apt-conf;" @@@ -2466,31 -2466,31 +2466,38 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" ++msgid "" ++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" ++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" ++"replaceable>::<replaceable>Checksum</replaceable></literal> where " ++"<literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" ++"literal> or <literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -2499,12 -2499,12 +2506,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@@ -2513,12 -2513,12 +2520,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -2528,12 -2528,12 +2535,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@@ -2541,24 -2541,24 +2548,24 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@@ -2567,12 -2567,12 +2574,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -2586,12 -2586,12 +2593,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -2601,27 -2601,27 +2608,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -5950,30 -5950,30 +5957,34 @@@ msgstr "prioridade 100 #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their <filename>Release</" --"filename> files are marked as \"NotAutomatic: yes\" like the debian " --"experimental archive." ++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" ++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " ++"<literal>experimental</literal> archive." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:112 ++#: apt_preferences.5.xml:113 #, fuzzy msgid "priority 100" msgstr "prioridade 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:113 --#, fuzzy --msgid "to the version that is already installed (if any)." --msgstr "para a instância que já esteja instalada (caso exista)." ++#: apt_preferences.5.xml:114 ++msgid "" ++"to the version that is already installed (if any) and to the versions coming " ++"from archives which in their <filename>Release</filename> files are marked " ++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " ++"backports archive since <literal>squeeze-backports</literal>." ++msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:117 ++#: apt_preferences.5.xml:121 #, fuzzy msgid "priority 500" msgstr "prioridade 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:122 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@@ -5982,13 -5982,13 +5993,13 @@@ msgstr " "para as instâncias que não estã instaladas e que não pertencem a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:122 ++#: apt_preferences.5.xml:126 #, fuzzy msgid "priority 990" msgstr "prioridade 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:123 ++#: apt_preferences.5.xml:127 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@@ -6008,21 -6008,21 +6019,22 @@@ msgstr " "Atribuirá :" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:132 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " --"uninstalled package versions, expect versions coming from archives which in " ++"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " --"- these versions get the priority 1." ++"- these versions get the priority 1 or priority 100 if it is additionally " ++"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Caso nenhuma versão alvo tenha sido especificada, o APT simplesmente irá " "atribuir a prioridade 100 para todas as instâncias de pacotes instaladas e a " "prioridade 500 para todas as instâncias de pacotes não instaladas." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:134 ++#: apt_preferences.5.xml:139 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@@ -6032,7 -6032,7 +6044,7 @@@ msgstr " "determinar qual instância de um pacote instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:142 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@@ -6049,13 -6049,13 +6061,13 @@@ msgstr " "\"downgrade\" pode ser arriscado.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:143 ++#: apt_preferences.5.xml:148 #, fuzzy msgid "Install the highest priority version." msgstr "Instala a instância de prioridade mais alta." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:149 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@@ -6065,7 -6065,7 +6077,7 @@@ msgstr " "mais recente (ou seja, aquela com o maior número de versão)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:147 ++#: apt_preferences.5.xml:152 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@@ -6077,7 -6077,7 +6089,7 @@@ msgstr " "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:153 ++#: apt_preferences.5.xml:158 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@@ -6094,7 -6094,7 +6106,7 @@@ msgstr " "forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:165 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@@ -6109,7 -6109,7 +6121,7 @@@ msgstr " "upgrade</command> forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:165 ++#: apt_preferences.5.xml:170 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@@ -6129,13 -6129,13 +6141,13 @@@ msgstr " "disponíveis possuir uma prioridade maior do que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:174 ++#: apt_preferences.5.xml:179 #, fuzzy msgid "The Effect of APT Preferences" msgstr "O Efeito das Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:176 ++#: apt_preferences.5.xml:181 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@@ -6149,7 -6149,7 +6161,7 @@@ msgstr " "das duas formas, uma forma específica e uma forma geral." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:182 ++#: apt_preferences.5.xml:187 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@@ -6165,7 -6165,7 +6177,7 @@@ msgstr " "com \"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:189 ++#: apt_preferences.5.xml:194 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@@ -6178,7 -6178,7 +6190,7 @@@ msgstr " "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:200 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@@ -6194,7 -6194,7 +6206,7 @@@ msgstr " "identificado pelo nome de domínio totalmente qualificado do site Internet." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:206 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@@ -6207,7 -6207,7 +6219,7 @@@ msgstr " "no site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:206 ++#: apt_preferences.5.xml:211 #, fuzzy, no-wrap msgid "" "Package: *\n" @@@ -6220,7 -6220,7 +6232,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:211 ++#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@@ -6229,7 -6229,7 +6241,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:215 ++#: apt_preferences.5.xml:220 #, fuzzy, no-wrap msgid "" "Package: *\n" @@@ -6242,7 -6242,7 +6254,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:224 #, fuzzy msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " @@@ -6259,7 -6259,7 +6271,7 @@@ msgstr " "como \"Debian\" ou \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:229 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@@ -6271,7 -6271,7 +6283,7 @@@ msgstr " "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:228 ++#: apt_preferences.5.xml:233 #, fuzzy, no-wrap msgid "" "Package: *\n" @@@ -6284,7 -6284,7 +6296,7 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:233 ++#: apt_preferences.5.xml:238 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@@ -6296,7 -6296,7 +6308,7 @@@ msgstr " "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:237 ++#: apt_preferences.5.xml:242 #, fuzzy, no-wrap msgid "" "Package: *\n" @@@ -6309,7 -6309,7 +6321,7 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:242 ++#: apt_preferences.5.xml:247 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@@ -6322,7 -6322,7 +6334,7 @@@ msgstr " "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:247 ++#: apt_preferences.5.xml:252 #, fuzzy, no-wrap msgid "" "Package: *\n" @@@ -6335,19 -6335,19 +6347,19 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:258 ++#: apt_preferences.5.xml:263 #, fuzzy msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:271 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:272 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@@ -6357,13 -6357,13 +6369,13 @@@ msgstr " "dowgrade do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:276 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:277 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@@ -6373,13 -6373,13 +6385,13 @@@ msgstr " "versão alvo, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:282 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:278 ++#: apt_preferences.5.xml:283 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@@ -6389,13 -6389,13 +6401,13 @@@ msgstr " "disponível pertencente a versão alvo ou a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:288 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:284 ++#: apt_preferences.5.xml:289 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@@ -6406,13 -6406,13 +6418,13 @@@ msgstr " "seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:289 ++#: apt_preferences.5.xml:294 #, fuzzy msgid "0 < P <=100" msgstr "0 <= P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:290 ++#: apt_preferences.5.xml:295 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@@ -6422,19 -6422,19 +6434,19 @@@ msgstr " "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:294 ++#: apt_preferences.5.xml:299 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:295 ++#: apt_preferences.5.xml:300 #, fuzzy msgid "prevents the version from being installed" msgstr "impede a versão de ser instalada" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:266 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@@ -6446,7 -6446,7 +6458,7 @@@ msgstr " "seguir (a grosso modo):" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:305 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@@ -6462,7 -6462,7 +6474,7 @@@ msgstr " "determinará a prioridade da versão do pacote." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:306 ++#: apt_preferences.5.xml:311 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@@ -6472,7 -6472,7 +6484,7 @@@ msgstr " "registros apresentados anteriormente :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:310 ++#: apt_preferences.5.xml:315 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@@ -6501,12 -6501,12 +6513,12 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:328 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:325 ++#: apt_preferences.5.xml:330 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@@ -6522,7 -6522,7 +6534,7 @@@ msgstr " "será feito um downgrade do <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:330 ++#: apt_preferences.5.xml:335 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@@ -6534,7 -6534,7 +6546,7 @@@ msgstr " "mesmo versões pertencentes a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:334 ++#: apt_preferences.5.xml:339 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@@ -6549,13 -6549,13 +6561,13 @@@ msgstr " "instalada." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:344 ++#: apt_preferences.5.xml:349 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:346 ++#: apt_preferences.5.xml:351 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@@ -6567,31 -6567,31 +6579,31 @@@ msgstr " "os pacotes disponíveis nessas localidades." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:358 ++#: apt_preferences.5.xml:363 #, fuzzy msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:359 ++#: apt_preferences.5.xml:364 #, fuzzy msgid "gives the package name" msgstr "informa o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 ++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 #, fuzzy msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:363 ++#: apt_preferences.5.xml:368 #, fuzzy msgid "gives the version number for the named package" msgstr "informa o número de versão do pacote" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:350 ++#: apt_preferences.5.xml:355 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@@ -6613,13 -6613,13 +6625,13 @@@ msgstr " "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:379 ++#: apt_preferences.5.xml:384 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:380 ++#: apt_preferences.5.xml:385 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@@ -6637,7 -6637,7 +6649,7 @@@ msgstr " "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:395 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@@ -6645,13 -6645,13 +6657,13 @@@ "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:396 ++#: apt_preferences.5.xml:401 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:397 ++#: apt_preferences.5.xml:402 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@@ -6669,7 -6669,7 +6681,7 @@@ msgstr " "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:406 ++#: apt_preferences.5.xml:411 #, fuzzy, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" @@@ -6677,7 -6677,7 +6689,7 @@@ "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:413 ++#: apt_preferences.5.xml:418 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@@ -6694,7 -6694,7 +6706,7 @@@ msgstr " "das linhas a seguir." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:422 ++#: apt_preferences.5.xml:427 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -6707,13 -6707,13 +6719,13 @@@ msgstr " "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:436 #, fuzzy msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:432 ++#: apt_preferences.5.xml:437 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@@ -6732,7 -6732,7 +6744,7 @@@ msgstr " "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:441 ++#: apt_preferences.5.xml:446 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@@ -6740,13 -6740,13 +6752,13 @@@ "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:447 ++#: apt_preferences.5.xml:452 #, fuzzy msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:448 ++#: apt_preferences.5.xml:453 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@@ -6760,7 -6760,7 +6772,7 @@@ msgstr " "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:454 ++#: apt_preferences.5.xml:459 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@@ -6768,13 -6768,13 +6780,13 @@@ "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:460 ++#: apt_preferences.5.xml:465 #, fuzzy msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:461 ++#: apt_preferences.5.xml:466 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@@ -6787,7 -6787,7 +6799,7 @@@ msgstr " "arquivo de preferências do APT iria requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:467 ++#: apt_preferences.5.xml:472 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@@ -6795,7 -6795,7 +6807,7 @@@ "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:368 ++#: apt_preferences.5.xml:373 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@@ -6819,7 -6819,7 +6831,7 @@@ msgstr " "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:474 ++#: apt_preferences.5.xml:479 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@@ -6845,13 -6845,13 +6857,13 @@@ msgstr " "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:492 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais em um Registro de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:489 ++#: apt_preferences.5.xml:494 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@@ -6863,13 -6863,13 +6875,13 @@@ msgstr " "</literal>. Isto oferece um local para inserir comentários." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:498 ++#: apt_preferences.5.xml:503 #, fuzzy msgid "Tracking Stable" msgstr "Acompanhando a Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:506 ++#: apt_preferences.5.xml:511 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -6894,7 -6894,7 +6906,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:500 ++#: apt_preferences.5.xml:505 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@@ -6910,8 -6910,8 +6922,8 @@@ msgstr " "outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 --#: apt_preferences.5.xml:627 ++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:632 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -6924,7 -6924,7 +6936,7 @@@ msgstr " "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:518 ++#: apt_preferences.5.xml:523 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@@ -6937,7 -6937,7 +6949,7 @@@ msgstr " "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:535 ++#: apt_preferences.5.xml:540 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" @@@ -6945,7 -6945,7 +6957,7 @@@ "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:529 ++#: apt_preferences.5.xml:534 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@@ -6958,13 -6958,13 +6970,13 @@@ msgstr " "atualizado novamente a menos que esse comando seja executado novamente." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:541 ++#: apt_preferences.5.xml:546 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Acompanhando a Testing" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:550 ++#: apt_preferences.5.xml:555 #, fuzzy, no-wrap msgid "" "Package: *\n" @@@ -6993,7 -6993,7 +7005,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:543 ++#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@@ -7010,7 -7010,7 +7022,7 @@@ msgstr " "versões de pacotes de outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:564 ++#: apt_preferences.5.xml:569 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@@ -7023,7 -7023,7 +7035,7 @@@ msgstr " "(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:584 ++#: apt_preferences.5.xml:589 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" @@@ -7031,7 -7031,7 +7043,7 @@@ "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:575 ++#: apt_preferences.5.xml:580 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@@ -7051,12 -7051,12 +7063,12 @@@ msgstr " "recente que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:591 ++#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:605 ++#: apt_preferences.5.xml:610 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -7086,7 -7086,7 +7098,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:593 ++#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@@ -7101,7 -7101,7 +7113,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:622 ++#: apt_preferences.5.xml:627 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@@ -7114,7 -7114,7 +7126,7 @@@ msgstr " "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:642 ++#: apt_preferences.5.xml:647 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" @@@ -7122,7 -7122,7 +7134,7 @@@ "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:633 ++#: apt_preferences.5.xml:638 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@@ -7142,13 -7142,13 +7154,13 @@@ msgstr " "recente que a versão instalada." #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:651 ++#: apt_preferences.5.xml:656 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:657 ++#: apt_preferences.5.xml:662 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -8562,6 -8562,6 +8574,10 @@@ msgstr " msgid "Which will use the already fetched archives on the disc." msgstr "" ++#, fuzzy ++#~ msgid "to the version that is already installed (if any)." ++#~ msgstr "para a instância que já esteja instalada (caso exista)." ++ #, fuzzy #~ msgid "" #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record " diff --cc po/apt-all.pot index 0479bf303,4634bf64c..ee139b2e7 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-10-29 10:12-0400\n" -"POT-Creation-Date: 2011-01-12 17:42+0100\n" ++"POT-Creation-Date: 2011-04-05 10:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@@ -90,82 -90,82 +90,80 @@@ msgstr " msgid "Total space accounted for: " msgstr "" --#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194 ++#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142 #, c-format msgid "Package file %s is out of sync." msgstr "" --#: cmdline/apt-cache.cc:1273 --msgid "You must give at least one search pattern" ++#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377 ++#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456 ++msgid "No packages found" msgstr "" --#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431 --#: cmdline/apt-cache.cc:1508 --msgid "No packages found" ++#: cmdline/apt-cache.cc:1221 ++msgid "You must give at least one search pattern" msgstr "" --#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440 ++#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440 #, c-format msgid "Unable to locate package %s" msgstr "" --#: cmdline/apt-cache.cc:1533 ++#: cmdline/apt-cache.cc:1481 msgid "Package files:" msgstr "" --#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638 ++#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1579 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins --#: cmdline/apt-cache.cc:1554 ++#: cmdline/apt-cache.cc:1502 msgid "Pinned packages:" msgstr "" --#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618 ++#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1559 msgid "(not found)" msgstr "" --#: cmdline/apt-cache.cc:1575 ++#: cmdline/apt-cache.cc:1522 msgid " Installed: " msgstr "" --#: cmdline/apt-cache.cc:1576 ++#: cmdline/apt-cache.cc:1523 msgid " Candidate: " msgstr "" --#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608 ++#: cmdline/apt-cache.cc:1541 cmdline/apt-cache.cc:1549 msgid "(none)" msgstr "" --#: cmdline/apt-cache.cc:1615 ++#: cmdline/apt-cache.cc:1556 msgid " Package pin: " msgstr "" #. Show the priority tables --#: cmdline/apt-cache.cc:1624 ++#: cmdline/apt-cache.cc:1565 msgid " Version table:" msgstr "" --#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 ++#: cmdline/apt-cache.cc:1678 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 - #: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:3106 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" --#: cmdline/apt-cache.cc:1745 ++#: cmdline/apt-cache.cc:1685 msgid "" "Usage: apt-cache [options] command\n" --" apt-cache [options] add file1 [file2 ...]\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" "\n" --"apt-cache is a low-level tool used to manipulate APT's binary\n" --"cache files, and query information from them\n" ++"apt-cache is a low-level tool used to query information\n" ++"from APT's binary cache files\n" "\n" "Commands:\n" --" add - Add a package file to the source cache\n" " gencaches - Build both the package and source cache\n" " showpkg - Show some general information for a single package\n" " showsrc - Show source records\n" @@@ -250,7 -250,7 +248,7 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1148 #, c-format msgid "Unable to write to %s" msgstr "" @@@ -369,97 -369,97 +367,92 @@@ msgstr " msgid "Unable to get a cursor" msgstr "" --#: ftparchive/writer.cc:73 ++#: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" --#: ftparchive/writer.cc:78 ++#: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "" --#: ftparchive/writer.cc:134 ++#: ftparchive/writer.cc:139 msgid "E: " msgstr "" --#: ftparchive/writer.cc:136 ++#: ftparchive/writer.cc:141 msgid "W: " msgstr "" --#: ftparchive/writer.cc:143 ++#: ftparchive/writer.cc:148 msgid "E: Errors apply to file " msgstr "" --#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 ++#: ftparchive/writer.cc:166 ftparchive/writer.cc:198 #, c-format msgid "Failed to resolve %s" msgstr "" --#: ftparchive/writer.cc:174 ++#: ftparchive/writer.cc:179 msgid "Tree walking failed" msgstr "" --#: ftparchive/writer.cc:201 ++#: ftparchive/writer.cc:206 #, c-format msgid "Failed to open %s" msgstr "" --#: ftparchive/writer.cc:260 ++#: ftparchive/writer.cc:265 #, c-format msgid " DeLink %s [%s]\n" msgstr "" --#: ftparchive/writer.cc:268 ++#: ftparchive/writer.cc:273 #, c-format msgid "Failed to readlink %s" msgstr "" --#: ftparchive/writer.cc:272 ++#: ftparchive/writer.cc:277 #, c-format msgid "Failed to unlink %s" msgstr "" --#: ftparchive/writer.cc:279 ++#: ftparchive/writer.cc:284 #, c-format msgid "*** Failed to link %s to %s" msgstr "" --#: ftparchive/writer.cc:289 ++#: ftparchive/writer.cc:294 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" --#: ftparchive/writer.cc:393 ++#: ftparchive/writer.cc:398 msgid "Archive had no package field" msgstr "" --#: ftparchive/writer.cc:401 ftparchive/writer.cc:688 ++#: ftparchive/writer.cc:406 ftparchive/writer.cc:703 #, c-format msgid " %s has no override entry\n" msgstr "" --#: ftparchive/writer.cc:464 ftparchive/writer.cc:793 ++#: ftparchive/writer.cc:472 ftparchive/writer.cc:811 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" --#: ftparchive/writer.cc:698 ++#: ftparchive/writer.cc:713 #, c-format msgid " %s has no source override entry\n" msgstr "" --#: ftparchive/writer.cc:702 ++#: ftparchive/writer.cc:717 #, c-format msgid " %s has no binary override entry either\n" msgstr "" --#: ftparchive/contents.cc:321 --#, c-format --msgid "Internal error, could not locate member %s" --msgstr "" -- --#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 ++#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 msgid "realloc - Failed to allocate memory" msgstr "" @@@ -488,63 -488,63 +481,63 @@@ msgstr " msgid "Failed to read the override file %s" msgstr "" --#: ftparchive/multicompress.cc:72 ++#: ftparchive/multicompress.cc:67 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" --#: ftparchive/multicompress.cc:102 ++#: ftparchive/multicompress.cc:97 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" --#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 ++#: ftparchive/multicompress.cc:165 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" --#: ftparchive/multicompress.cc:195 ++#: ftparchive/multicompress.cc:191 msgid "Failed to create FILE*" msgstr "" --#: ftparchive/multicompress.cc:198 ++#: ftparchive/multicompress.cc:194 msgid "Failed to fork" msgstr "" --#: ftparchive/multicompress.cc:212 ++#: ftparchive/multicompress.cc:208 msgid "Compress child" msgstr "" --#: ftparchive/multicompress.cc:235 ++#: ftparchive/multicompress.cc:231 #, c-format msgid "Internal error, failed to create %s" msgstr "" --#: ftparchive/multicompress.cc:286 ++#: ftparchive/multicompress.cc:282 msgid "Failed to create subprocess IPC" msgstr "" --#: ftparchive/multicompress.cc:321 ++#: ftparchive/multicompress.cc:319 msgid "Failed to exec compressor " msgstr "" --#: ftparchive/multicompress.cc:360 ++#: ftparchive/multicompress.cc:358 msgid "decompressor" msgstr "" --#: ftparchive/multicompress.cc:403 ++#: ftparchive/multicompress.cc:401 msgid "IO to subprocess/file failed" msgstr "" --#: ftparchive/multicompress.cc:455 ++#: ftparchive/multicompress.cc:453 msgid "Failed to read while computing MD5" msgstr "" --#: ftparchive/multicompress.cc:472 ++#: ftparchive/multicompress.cc:470 #, c-format msgid "Problem unlinking %s" msgstr "" --#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 ++#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@@ -592,99 -592,94 +585,94 @@@ msgstr " msgid " or" msgstr "" --#: cmdline/apt-get.cc:392 ++#: cmdline/apt-get.cc:390 msgid "The following NEW packages will be installed:" msgstr "" --#: cmdline/apt-get.cc:420 ++#: cmdline/apt-get.cc:416 msgid "The following packages will be REMOVED:" msgstr "" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:438 msgid "The following packages have been kept back:" msgstr "" --#: cmdline/apt-get.cc:465 ++#: cmdline/apt-get.cc:459 msgid "The following packages will be upgraded:" msgstr "" --#: cmdline/apt-get.cc:488 ++#: cmdline/apt-get.cc:480 msgid "The following packages will be DOWNGRADED:" msgstr "" --#: cmdline/apt-get.cc:508 ++#: cmdline/apt-get.cc:500 msgid "The following held packages will be changed:" msgstr "" - #: cmdline/apt-get.cc:561 -#: cmdline/apt-get.cc:563 ++#: cmdline/apt-get.cc:555 #, c-format msgid "%s (due to %s) " msgstr "" - #: cmdline/apt-get.cc:569 -#: cmdline/apt-get.cc:571 ++#: cmdline/apt-get.cc:563 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" - #: cmdline/apt-get.cc:603 -#: cmdline/apt-get.cc:605 ++#: cmdline/apt-get.cc:594 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" - #: cmdline/apt-get.cc:607 -#: cmdline/apt-get.cc:609 ++#: cmdline/apt-get.cc:598 #, c-format msgid "%lu reinstalled, " msgstr "" - #: cmdline/apt-get.cc:609 -#: cmdline/apt-get.cc:611 ++#: cmdline/apt-get.cc:600 #, c-format msgid "%lu downgraded, " msgstr "" - #: cmdline/apt-get.cc:611 -#: cmdline/apt-get.cc:613 ++#: cmdline/apt-get.cc:602 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" - #: cmdline/apt-get.cc:615 -#: cmdline/apt-get.cc:617 ++#: cmdline/apt-get.cc:606 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" - #: cmdline/apt-get.cc:635 -#: cmdline/apt-get.cc:639 ++#: cmdline/apt-get.cc:628 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" - #: cmdline/apt-get.cc:641 -#: cmdline/apt-get.cc:645 ++#: cmdline/apt-get.cc:634 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:648 - #, c-format - msgid "Selected version '%s' (%s) for '%s'\n" - msgstr "" - - #: cmdline/apt-get.cc:658 -#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:651 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" - #: cmdline/apt-get.cc:669 -#: cmdline/apt-get.cc:673 ++#: cmdline/apt-get.cc:662 msgid " [Installed]" msgstr "" - #: cmdline/apt-get.cc:678 -#: cmdline/apt-get.cc:682 ++#: cmdline/apt-get.cc:671 msgid " [Not candidate version]" msgstr "" - #: cmdline/apt-get.cc:680 -#: cmdline/apt-get.cc:684 ++#: cmdline/apt-get.cc:673 msgid "You should explicitly select one to install." msgstr "" - #: cmdline/apt-get.cc:683 -#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:676 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -692,167 -687,177 +680,177 @@@ "is only available from another source\n" msgstr "" - #: cmdline/apt-get.cc:701 -#: cmdline/apt-get.cc:705 ++#: cmdline/apt-get.cc:694 msgid "However the following packages replace it:" msgstr "" - #: cmdline/apt-get.cc:713 -#: cmdline/apt-get.cc:717 ++#: cmdline/apt-get.cc:706 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" - #: cmdline/apt-get.cc:724 -#: cmdline/apt-get.cc:728 ++#: cmdline/apt-get.cc:717 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" - #: cmdline/apt-get.cc:755 -#: cmdline/apt-get.cc:759 ++#: cmdline/apt-get.cc:748 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" - #: cmdline/apt-get.cc:785 -#: cmdline/apt-get.cc:789 ++#: cmdline/apt-get.cc:778 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" - #: cmdline/apt-get.cc:789 -#: cmdline/apt-get.cc:793 ++#: cmdline/apt-get.cc:782 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" - #: cmdline/apt-get.cc:799 -#: cmdline/apt-get.cc:803 ++#: cmdline/apt-get.cc:794 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" - #: cmdline/apt-get.cc:804 -#: cmdline/apt-get.cc:808 ++#: cmdline/apt-get.cc:799 #, c-format msgid "%s is already the newest version.\n" msgstr "" - #: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992 -#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027 ++#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2080 #, c-format msgid "%s set to manually installed.\n" msgstr "" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:853 ++#: cmdline/apt-get.cc:844 + #, c-format + msgid "Selected version '%s' (%s) for '%s'\n" + msgstr "" + -#: cmdline/apt-get.cc:858 ++#: cmdline/apt-get.cc:849 + #, c-format + msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" + msgstr "" + -#: cmdline/apt-get.cc:898 ++#: cmdline/apt-get.cc:893 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" - #: cmdline/apt-get.cc:938 -#: cmdline/apt-get.cc:973 ++#: cmdline/apt-get.cc:971 msgid "Correcting dependencies..." msgstr "" - #: cmdline/apt-get.cc:941 -#: cmdline/apt-get.cc:976 ++#: cmdline/apt-get.cc:974 msgid " failed." msgstr "" - #: cmdline/apt-get.cc:944 -#: cmdline/apt-get.cc:979 ++#: cmdline/apt-get.cc:977 msgid "Unable to correct dependencies" msgstr "" - #: cmdline/apt-get.cc:947 -#: cmdline/apt-get.cc:982 ++#: cmdline/apt-get.cc:980 msgid "Unable to minimize the upgrade set" msgstr "" - #: cmdline/apt-get.cc:949 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:982 msgid " Done" msgstr "" - #: cmdline/apt-get.cc:953 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:986 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" - #: cmdline/apt-get.cc:956 -#: cmdline/apt-get.cc:991 ++#: cmdline/apt-get.cc:989 msgid "Unmet dependencies. Try using -f." msgstr "" - #: cmdline/apt-get.cc:981 -#: cmdline/apt-get.cc:1016 ++#: cmdline/apt-get.cc:1014 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" - #: cmdline/apt-get.cc:985 -#: cmdline/apt-get.cc:1020 ++#: cmdline/apt-get.cc:1018 msgid "Authentication warning overridden.\n" msgstr "" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:1027 ++#: cmdline/apt-get.cc:1025 msgid "Install these packages without verification [y/N]? " msgstr "" - #: cmdline/apt-get.cc:994 -#: cmdline/apt-get.cc:1029 ++#: cmdline/apt-get.cc:1027 msgid "Some packages could not be authenticated" msgstr "" - #: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199 ++#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 msgid "There are problems and -y was used without --force-yes" msgstr "" - #: cmdline/apt-get.cc:1044 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1077 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" - #: cmdline/apt-get.cc:1053 -#: cmdline/apt-get.cc:1088 ++#: cmdline/apt-get.cc:1086 msgid "Packages need to be removed but remove is disabled." msgstr "" - #: cmdline/apt-get.cc:1064 -#: cmdline/apt-get.cc:1099 ++#: cmdline/apt-get.cc:1097 msgid "Internal error, Ordering didn't finish" msgstr "" - #: cmdline/apt-get.cc:1104 -#: cmdline/apt-get.cc:1137 ++#: cmdline/apt-get.cc:1135 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB - #: cmdline/apt-get.cc:1111 -#: cmdline/apt-get.cc:1144 ++#: cmdline/apt-get.cc:1142 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB - #: cmdline/apt-get.cc:1116 -#: cmdline/apt-get.cc:1149 ++#: cmdline/apt-get.cc:1147 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB - #: cmdline/apt-get.cc:1123 -#: cmdline/apt-get.cc:1156 ++#: cmdline/apt-get.cc:1154 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB - #: cmdline/apt-get.cc:1128 -#: cmdline/apt-get.cc:1161 ++#: cmdline/apt-get.cc:1159 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332 - #: cmdline/apt-get.cc:2335 -#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367 -#: cmdline/apt-get.cc:2370 ++#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2484 ++#: cmdline/apt-get.cc:2487 #, c-format msgid "Couldn't determine free space in %s" msgstr "" - #: cmdline/apt-get.cc:1156 -#: cmdline/apt-get.cc:1189 ++#: cmdline/apt-get.cc:1187 #, c-format msgid "You don't have enough free space in %s." msgstr "" - #: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192 -#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225 ++#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" - #: cmdline/apt-get.cc:1174 -#: cmdline/apt-get.cc:1207 ++#: cmdline/apt-get.cc:1205 msgid "Yes, do as I say!" msgstr "" - #: cmdline/apt-get.cc:1176 -#: cmdline/apt-get.cc:1209 ++#: cmdline/apt-get.cc:1207 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -860,46 -865,46 +858,46 @@@ " ?] " msgstr "" - #: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201 -#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234 ++#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 msgid "Abort." msgstr "" - #: cmdline/apt-get.cc:1197 -#: cmdline/apt-get.cc:1230 ++#: cmdline/apt-get.cc:1228 msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462 -#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470 ++#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2544 apt-pkg/algorithms.cc:1427 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" - #: cmdline/apt-get.cc:1287 -#: cmdline/apt-get.cc:1320 ++#: cmdline/apt-get.cc:1318 msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401 -#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436 ++#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2553 msgid "Download complete and in download only mode" msgstr "" - #: cmdline/apt-get.cc:1294 -#: cmdline/apt-get.cc:1327 ++#: cmdline/apt-get.cc:1325 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" - #: cmdline/apt-get.cc:1298 -#: cmdline/apt-get.cc:1331 ++#: cmdline/apt-get.cc:1329 msgid "--fix-missing and media swapping is not currently supported" msgstr "" - #: cmdline/apt-get.cc:1303 -#: cmdline/apt-get.cc:1336 ++#: cmdline/apt-get.cc:1334 msgid "Unable to correct missing packages." msgstr "" - #: cmdline/apt-get.cc:1304 -#: cmdline/apt-get.cc:1337 ++#: cmdline/apt-get.cc:1335 msgid "Aborting install." msgstr "" - #: cmdline/apt-get.cc:1332 -#: cmdline/apt-get.cc:1365 ++#: cmdline/apt-get.cc:1363 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@@ -909,56 -914,35 +907,35 @@@ msgid_plural " msgstr[0] "" msgstr[1] "" - #: cmdline/apt-get.cc:1336 -#: cmdline/apt-get.cc:1369 ++#: cmdline/apt-get.cc:1367 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "" - #: cmdline/apt-get.cc:1466 -#: cmdline/apt-get.cc:1499 ++#: cmdline/apt-get.cc:1497 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" - #: cmdline/apt-get.cc:1498 -#: cmdline/apt-get.cc:1531 ++#: cmdline/apt-get.cc:1529 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) - #: cmdline/apt-get.cc:1536 -#: cmdline/apt-get.cc:1569 ++#: cmdline/apt-get.cc:1567 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 ++#: cmdline/apt-get.cc:1583 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1618 -#: cmdline/apt-get.cc:1647 ++#: cmdline/apt-get.cc:1645 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" - #: cmdline/apt-get.cc:1666 - msgid "" - "The following package was automatically installed and is no longer required:" - msgid_plural "" - "The following packages were automatically installed and are no longer " - "required:" - msgstr[0] "" - msgstr[1] "" - - #: cmdline/apt-get.cc:1670 - #, c-format - msgid "%lu package was automatically installed and is no longer required.\n" - msgid_plural "" - "%lu packages were automatically installed and are no longer required.\n" - msgstr[0] "" - msgstr[1] "" - - #: cmdline/apt-get.cc:1672 - msgid "Use 'apt-get autoremove' to remove them." - msgstr "" - - #: cmdline/apt-get.cc:1677 -#: cmdline/apt-get.cc:1699 ++#: cmdline/apt-get.cc:1740 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@@ -974,29 -958,50 +951,50 @@@ msgstr " #. "that package should be filed.") << endl; #. } #. - #: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822 -#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858 ++#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1913 msgid "The following information may help to resolve the situation:" msgstr "" - #: cmdline/apt-get.cc:1684 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1747 msgid "Internal Error, AutoRemover broke stuff" msgstr "" - #: cmdline/apt-get.cc:1703 -#: cmdline/apt-get.cc:1713 ++#: cmdline/apt-get.cc:1754 + msgid "" + "The following package was automatically installed and is no longer required:" + msgid_plural "" + "The following packages were automatically installed and are no longer " + "required:" + msgstr[0] "" + msgstr[1] "" + -#: cmdline/apt-get.cc:1717 ++#: cmdline/apt-get.cc:1758 + #, c-format + msgid "%lu package was automatically installed and is no longer required.\n" + msgid_plural "" + "%lu packages were automatically installed and are no longer required.\n" + msgstr[0] "" + msgstr[1] "" + -#: cmdline/apt-get.cc:1719 ++#: cmdline/apt-get.cc:1760 + msgid "Use 'apt-get autoremove' to remove them." + msgstr "" + -#: cmdline/apt-get.cc:1738 ++#: cmdline/apt-get.cc:1779 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1792 -#: cmdline/apt-get.cc:1828 ++#: cmdline/apt-get.cc:1878 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1795 -#: cmdline/apt-get.cc:1831 ++#: cmdline/apt-get.cc:1882 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1807 -#: cmdline/apt-get.cc:1843 ++#: cmdline/apt-get.cc:1898 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1004,69 -1009,69 +1002,74 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1825 -#: cmdline/apt-get.cc:1861 ++#: cmdline/apt-get.cc:1916 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1889 ++#: cmdline/apt-get.cc:1942 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1944 -#: cmdline/apt-get.cc:1979 ++#: cmdline/apt-get.cc:2032 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1945 -#: cmdline/apt-get.cc:1980 ++#: cmdline/apt-get.cc:2033 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1987 -#: cmdline/apt-get.cc:2022 ++#: cmdline/apt-get.cc:2075 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1994 -#: cmdline/apt-get.cc:2029 ++#: cmdline/apt-get.cc:2082 #, c-format msgid "%s set to automatically installed.\n" msgstr "" - #: cmdline/apt-get.cc:2015 -#: cmdline/apt-get.cc:2050 ++#: cmdline/apt-get.cc:2103 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111 -#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111 ++#: cmdline/apt-get.cc:2106 methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:2023 -#: cmdline/apt-get.cc:2058 ++#: cmdline/apt-get.cc:2111 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098 -#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133 ++#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2186 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155 -#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190 ++#: cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2243 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:2198 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2294 ++#, c-format ++msgid "Downloading %s %s" ++msgstr "" ++ ++#: cmdline/apt-get.cc:2350 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519 -#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554 ++#: cmdline/apt-get.cc:2390 cmdline/apt-get.cc:2671 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:2254 -#: cmdline/apt-get.cc:2289 ++#: cmdline/apt-get.cc:2406 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" - #: cmdline/apt-get.cc:2259 -#: cmdline/apt-get.cc:2294 ++#: cmdline/apt-get.cc:2411 #, c-format msgid "" "Please use:\n" @@@ -1074,115 -1079,115 +1077,120 @@@ "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" - #: cmdline/apt-get.cc:2310 -#: cmdline/apt-get.cc:2345 ++#: cmdline/apt-get.cc:2462 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" - #: cmdline/apt-get.cc:2345 -#: cmdline/apt-get.cc:2380 ++#: cmdline/apt-get.cc:2497 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB - #: cmdline/apt-get.cc:2353 -#: cmdline/apt-get.cc:2388 ++#: cmdline/apt-get.cc:2505 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB - #: cmdline/apt-get.cc:2358 -#: cmdline/apt-get.cc:2393 ++#: cmdline/apt-get.cc:2510 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2364 -#: cmdline/apt-get.cc:2399 ++#: cmdline/apt-get.cc:2516 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2397 -#: cmdline/apt-get.cc:2432 ++#: cmdline/apt-get.cc:2549 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2427 -#: cmdline/apt-get.cc:2462 ++#: cmdline/apt-get.cc:2579 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2439 -#: cmdline/apt-get.cc:2474 ++#: cmdline/apt-get.cc:2591 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2440 -#: cmdline/apt-get.cc:2475 ++#: cmdline/apt-get.cc:2592 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2457 -#: cmdline/apt-get.cc:2492 ++#: cmdline/apt-get.cc:2609 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2477 -#: cmdline/apt-get.cc:2512 ++#: cmdline/apt-get.cc:2629 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2493 -#: cmdline/apt-get.cc:2528 ++#: cmdline/apt-get.cc:2645 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2524 -#: cmdline/apt-get.cc:2559 ++#: cmdline/apt-get.cc:2676 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2544 -#: cmdline/apt-get.cc:2579 ++#: cmdline/apt-get.cc:2696 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2595 -#: cmdline/apt-get.cc:2630 ++#: cmdline/apt-get.cc:2747 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2648 -#: cmdline/apt-get.cc:2683 ++#: cmdline/apt-get.cc:2800 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2684 -#: cmdline/apt-get.cc:2719 ++#: cmdline/apt-get.cc:2836 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2711 -#: cmdline/apt-get.cc:2746 ++#: cmdline/apt-get.cc:2863 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2727 -#: cmdline/apt-get.cc:2762 ++#: cmdline/apt-get.cc:2879 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2732 -#: cmdline/apt-get.cc:2767 ++#: cmdline/apt-get.cc:2884 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2763 -#: cmdline/apt-get.cc:2798 ++#: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989 ++#, c-format ++msgid "Changelog for %s (%s)" ++msgstr "" ++ ++#: cmdline/apt-get.cc:3111 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2804 -#: cmdline/apt-get.cc:2839 ++#: cmdline/apt-get.cc:3152 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1208,6 -1213,6 +1216,8 @@@ " check - Verify that there are no broken dependencies\n" " markauto - Mark the given packages as automatically installed\n" " unmarkauto - Mark the given packages as manually installed\n" ++" changelog - Download and display the changelog for the given package\n" ++" download - Download the binary package into the current directory\n" "\n" "Options:\n" " -h This help text.\n" @@@ -1228,7 -1233,7 +1238,7 @@@ " This APT has Super Cow Powers.\n" msgstr "" - #: cmdline/apt-get.cc:2960 -#: cmdline/apt-get.cc:2995 ++#: cmdline/apt-get.cc:3316 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@@ -1330,7 -1335,7 +1340,7 @@@ msgstr " msgid "Failed to exec gzip " msgstr "" --#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 ++#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 msgid "Corrupted archive" msgstr "" @@@ -1338,7 -1343,7 +1348,7 @@@ msgid "Tar checksum failed, archive corrupted" msgstr "" --#: apt-inst/contrib/extracttar.cc:296 ++#: apt-inst/contrib/extracttar.cc:300 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@@ -1446,28 -1451,28 +1456,28 @@@ msgstr " msgid "The path is too long" msgstr "" --#: apt-inst/extract.cc:414 ++#: apt-inst/extract.cc:412 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" --#: apt-inst/extract.cc:431 ++#: apt-inst/extract.cc:429 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. --#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179 - #: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204 - #: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103 - #: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307 -#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307 --#: methods/mirror.cc:87 ++#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:180 ++#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 ++#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:106 ++#: apt-pkg/init.cc:114 apt-pkg/clean.cc:33 apt-pkg/policy.cc:302 ++#: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" msgstr "" --#: apt-inst/extract.cc:491 ++#: apt-inst/extract.cc:489 #, c-format msgid "Unable to stat %s" msgstr "" @@@ -1491,9 -1496,9 +1501,9 @@@ msgstr " msgid "The info and temp directories need to be on the same filesystem" msgstr "" --#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070 --#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180 --#: apt-pkg/pkgcachegen.cc:1326 ++#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1047 ++#: apt-pkg/pkgcachegen.cc:1151 apt-pkg/pkgcachegen.cc:1157 ++#: apt-pkg/pkgcachegen.cc:1303 msgid "Reading package lists" msgstr "" @@@ -1566,51 -1571,51 +1576,57 @@@ msgstr " msgid "Error parsing MD5. Offset %lu" msgstr "" --#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 ++#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" --#: apt-inst/deb/debfile.cc:50 ++#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain ++#: apt-inst/deb/debfile.cc:53 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" --#: apt-inst/deb/debfile.cc:110 ++#: apt-inst/deb/debfile.cc:113 #, c-format msgid "Couldn't change to %s" msgstr "" --#: apt-inst/deb/debfile.cc:140 --msgid "Internal error, could not locate member" ++#: apt-inst/deb/debfile.cc:154 ++#, c-format ++msgid "Internal error, could not locate member %s" msgstr "" --#: apt-inst/deb/debfile.cc:173 ++#: apt-inst/deb/debfile.cc:189 msgid "Failed to locate a valid control file" msgstr "" --#: apt-inst/deb/debfile.cc:258 ++#: apt-inst/deb/debfile.cc:274 msgid "Unparsable control file" msgstr "" --#: methods/bzip2.cc:65 ++#: methods/bzip2.cc:60 methods/gzip.cc:52 ++msgid "Empty files can't be valid archives" ++msgstr "" ++ ++#: methods/bzip2.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" --#: methods/bzip2.cc:109 ++#: methods/bzip2.cc:108 #, c-format msgid "Read error from %s process" msgstr "" --#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43 --#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486 --#: methods/rred.cc:495 ++#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 ++#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 ++#: methods/rred.cc:533 msgid "Failed to stat" msgstr "" --#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99 --#: methods/rred.cc:492 ++#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 ++#: methods/rred.cc:530 msgid "Failed to set modification time" msgstr "" @@@ -1638,7 -1643,7 +1654,7 @@@ msgstr " msgid "Disk not found." msgstr "" --#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 ++#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "" @@@ -1690,7 -1695,7 +1706,7 @@@ msgstr " msgid "TYPE failed, server said: %s" msgstr "" --#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 ++#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "" @@@ -1698,11 -1703,11 +1714,11 @@@ msgid "Server closed the connection" msgstr "" - #: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190 -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190 ++#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 msgid "Read error" msgstr "" --#: methods/ftp.cc:351 methods/rsh.cc:197 ++#: methods/ftp.cc:351 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "" @@@ -1710,7 -1715,7 +1726,7 @@@ msgid "Protocol corruption" msgstr "" - #: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232 -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232 ++#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 msgid "Write error" msgstr "" @@@ -1764,7 -1769,7 +1780,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" --#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302 ++#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1773,7 -1778,7 +1789,7 @@@ msgid "Unable to fetch file, server said '%s'" msgstr "" --#: methods/ftp.cc:897 methods/rsh.cc:321 ++#: methods/ftp.cc:897 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" @@@ -1823,7 -1828,7 +1839,7 @@@ msgstr " #. We say this mainly because the pause here is for the #. ssh connection that is still going --#: methods/connect.cc:149 methods/rsh.cc:424 ++#: methods/connect.cc:149 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@@ -1942,7 -1947,7 +1958,7 @@@ msgstr " msgid "Error reading from server" msgstr "" --#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281 ++#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283 msgid "Failed to truncate file" msgstr "" @@@ -1980,21 -1985,21 +1996,21 @@@ msgstr " msgid "Unable to synchronize mmap" msgstr "" --#: apt-pkg/contrib/mmap.cc:300 ++#: apt-pkg/contrib/mmap.cc:302 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" --#: apt-pkg/contrib/mmap.cc:399 ++#: apt-pkg/contrib/mmap.cc:401 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" --#: apt-pkg/contrib/mmap.cc:402 ++#: apt-pkg/contrib/mmap.cc:404 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@@ -2023,7 -2028,7 +2039,7 @@@ msgstr " msgid "%lis" msgstr "" --#: apt-pkg/contrib/strutl.cc:1119 ++#: apt-pkg/contrib/strutl.cc:1138 #, c-format msgid "Selection %s not found" msgstr "" @@@ -2139,108 -2144,113 +2155,129 @@@ msgstr " msgid "Invalid operation %s" msgstr "" --#: apt-pkg/contrib/cdromutl.cc:52 ++#: apt-pkg/contrib/cdromutl.cc:53 #, c-format msgid "Unable to stat the mount point %s" msgstr "" --#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 ++#: apt-pkg/contrib/cdromutl.cc:176 apt-pkg/contrib/cdromutl.cc:210 #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 --#: methods/mirror.cc:93 ++#: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" msgstr "" --#: apt-pkg/contrib/cdromutl.cc:217 ++#: apt-pkg/contrib/cdromutl.cc:218 msgid "Failed to stat the cdrom" msgstr "" --#: apt-pkg/contrib/fileutl.cc:154 ++#: apt-pkg/contrib/fileutl.cc:168 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" --#: apt-pkg/contrib/fileutl.cc:159 ++#: apt-pkg/contrib/fileutl.cc:173 #, c-format msgid "Could not open lock file %s" msgstr "" --#: apt-pkg/contrib/fileutl.cc:177 ++#: apt-pkg/contrib/fileutl.cc:191 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" --#: apt-pkg/contrib/fileutl.cc:181 ++#: apt-pkg/contrib/fileutl.cc:195 #, c-format msgid "Could not get lock %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:643 -#: apt-pkg/contrib/fileutl.cc:321 ++#: apt-pkg/contrib/fileutl.cc:335 + #, c-format + msgid "List of files can't be created as '%s' is not a directory" + msgstr "" + -#: apt-pkg/contrib/fileutl.cc:661 ++#: apt-pkg/contrib/fileutl.cc:362 ++#, c-format ++msgid "Ignoring '%s' in directory '%s' as it is not a regular file" ++msgstr "" ++ ++#: apt-pkg/contrib/fileutl.cc:380 ++#, c-format ++msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" ++msgstr "" ++ ++#: apt-pkg/contrib/fileutl.cc:389 ++#, c-format ++msgid "" ++"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" ++msgstr "" ++ ++#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" - #: apt-pkg/contrib/fileutl.cc:655 -#: apt-pkg/contrib/fileutl.cc:673 ++#: apt-pkg/contrib/fileutl.cc:691 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" - #: apt-pkg/contrib/fileutl.cc:657 -#: apt-pkg/contrib/fileutl.cc:675 ++#: apt-pkg/contrib/fileutl.cc:693 #, c-format msgid "Sub-process %s received signal %u." msgstr "" - #: apt-pkg/contrib/fileutl.cc:661 -#: apt-pkg/contrib/fileutl.cc:679 ++#: apt-pkg/contrib/fileutl.cc:697 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" - #: apt-pkg/contrib/fileutl.cc:663 -#: apt-pkg/contrib/fileutl.cc:681 ++#: apt-pkg/contrib/fileutl.cc:699 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" - #: apt-pkg/contrib/fileutl.cc:728 -#: apt-pkg/contrib/fileutl.cc:746 ++#: apt-pkg/contrib/fileutl.cc:764 #, c-format msgid "Could not open file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:745 -#: apt-pkg/contrib/fileutl.cc:763 ++#: apt-pkg/contrib/fileutl.cc:781 #, c-format msgid "Could not open file descriptor %d" msgstr "" - #: apt-pkg/contrib/fileutl.cc:805 -#: apt-pkg/contrib/fileutl.cc:823 ++#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "read, still have %lu to read but none left" msgstr "" - #: apt-pkg/contrib/fileutl.cc:838 -#: apt-pkg/contrib/fileutl.cc:856 ++#: apt-pkg/contrib/fileutl.cc:874 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" - #: apt-pkg/contrib/fileutl.cc:967 -#: apt-pkg/contrib/fileutl.cc:985 ++#: apt-pkg/contrib/fileutl.cc:1010 #, c-format msgid "Problem closing the gzip file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:970 -#: apt-pkg/contrib/fileutl.cc:988 ++#: apt-pkg/contrib/fileutl.cc:1013 #, c-format msgid "Problem closing the file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:975 -#: apt-pkg/contrib/fileutl.cc:993 ++#: apt-pkg/contrib/fileutl.cc:1018 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:986 -#: apt-pkg/contrib/fileutl.cc:1004 ++#: apt-pkg/contrib/fileutl.cc:1029 #, c-format msgid "Problem unlinking the file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:999 -#: apt-pkg/contrib/fileutl.cc:1017 ++#: apt-pkg/contrib/fileutl.cc:1042 msgid "Problem syncing the file" msgstr "" @@@ -2347,11 -2357,11 +2384,6 @@@ msgstr " msgid "Failed to write temporary StateFile %s" msgstr "" - #: apt-pkg/depcache.cc:921 -#: apt-pkg/depcache.cc:922 --#, c-format --msgid "Internal error, group '%s' has no installable pseudo package" --msgstr "" -- #: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2432,14 -2442,14 +2464,14 @@@ msgstr " msgid "Type '%s' is not known on line %u in source list %s" msgstr "" --#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616 ++#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:593 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" --#: apt-pkg/packagemanager.cc:452 ++#: apt-pkg/packagemanager.cc:445 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@@ -2447,7 -2457,7 +2479,7 @@@ "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" --#: apt-pkg/packagemanager.cc:495 ++#: apt-pkg/packagemanager.cc:485 #, c-format msgid "" "Could not perform immediate configuration on already unpacked '%s'. Please " @@@ -2459,25 -2469,25 +2491,25 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "" --#: apt-pkg/algorithms.cc:292 ++#: apt-pkg/algorithms.cc:249 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" - #: apt-pkg/algorithms.cc:1210 -#: apt-pkg/algorithms.cc:1218 ++#: apt-pkg/algorithms.cc:1175 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" - #: apt-pkg/algorithms.cc:1212 -#: apt-pkg/algorithms.cc:1220 ++#: apt-pkg/algorithms.cc:1177 msgid "Unable to correct problems, you have held broken packages." msgstr "" - #: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490 -#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498 ++#: apt-pkg/algorithms.cc:1453 apt-pkg/algorithms.cc:1455 msgid "" --"Some index files failed to download, they have been ignored, or old ones " ++"Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" @@@ -2518,17 -2528,17 +2550,17 @@@ msgstr " msgid "Method %s did not start correctly" msgstr "" --#: apt-pkg/acquire-worker.cc:413 ++#: apt-pkg/acquire-worker.cc:424 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" - #: apt-pkg/init.cc:146 -#: apt-pkg/init.cc:143 ++#: apt-pkg/init.cc:149 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" - #: apt-pkg/init.cc:162 -#: apt-pkg/init.cc:159 ++#: apt-pkg/init.cc:165 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2553,17 -2563,17 +2585,17 @@@ msgstr " msgid "The list of sources could not be read." msgstr "" --#: apt-pkg/policy.cc:344 ++#: apt-pkg/policy.cc:339 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" --#: apt-pkg/policy.cc:366 ++#: apt-pkg/policy.cc:361 #, c-format msgid "Did not understand pin type %s" msgstr "" --#: apt-pkg/policy.cc:374 ++#: apt-pkg/policy.cc:369 msgid "No priority (or zero) specified for pin" msgstr "" @@@ -2571,155 -2581,155 +2603,167 @@@ msgid "Cache has an incompatible versioning system" msgstr "" --#: apt-pkg/pkgcachegen.cc:198 ++#: apt-pkg/pkgcachegen.cc:187 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" --#: apt-pkg/pkgcachegen.cc:215 ++#: apt-pkg/pkgcachegen.cc:204 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:253 ++#: apt-pkg/pkgcachegen.cc:242 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:285 ++#: apt-pkg/pkgcachegen.cc:274 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:289 ++#: apt-pkg/pkgcachegen.cc:278 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316 --#: apt-pkg/pkgcachegen.cc:324 ++#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 ++#: apt-pkg/pkgcachegen.cc:313 #, c-format msgid "Error occurred while processing %s (NewVersion%d)" msgstr "" --#: apt-pkg/pkgcachegen.cc:320 ++#: apt-pkg/pkgcachegen.cc:309 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" --#: apt-pkg/pkgcachegen.cc:353 ++#: apt-pkg/pkgcachegen.cc:342 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:360 ++#: apt-pkg/pkgcachegen.cc:348 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:363 ++#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:366 ++#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:369 ++#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:398 ++#: apt-pkg/pkgcachegen.cc:386 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" --#: apt-pkg/pkgcachegen.cc:412 ++#: apt-pkg/pkgcachegen.cc:400 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" --#: apt-pkg/pkgcachegen.cc:418 ++#: apt-pkg/pkgcachegen.cc:406 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" --#: apt-pkg/pkgcachegen.cc:982 ++#: apt-pkg/pkgcachegen.cc:959 #, c-format msgid "Couldn't stat source package list %s" msgstr "" --#: apt-pkg/pkgcachegen.cc:1087 ++#: apt-pkg/pkgcachegen.cc:1064 msgid "Collecting File Provides" msgstr "" --#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272 ++#: apt-pkg/pkgcachegen.cc:1242 apt-pkg/pkgcachegen.cc:1249 msgid "IO Error saving source cache" msgstr "" --#: apt-pkg/acquire-item.cc:136 ++#: apt-pkg/acquire-item.cc:135 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" --#: apt-pkg/acquire-item.cc:484 ++#: apt-pkg/acquire-item.cc:628 msgid "MD5Sum mismatch" msgstr "" --#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574 --#: apt-pkg/acquire-item.cc:1717 ++#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 ++#: apt-pkg/acquire-item.cc:1921 msgid "Hash Sum mismatch" msgstr "" --#: apt-pkg/acquire-item.cc:1244 ++#: apt-pkg/acquire-item.cc:1346 ++#, c-format ++msgid "" ++"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " ++"or malformed file)" ++msgstr "" ++ ++#: apt-pkg/acquire-item.cc:1361 ++#, c-format ++msgid "Unable to find hash sum for '%s' in Release file" ++msgstr "" ++ ++#: apt-pkg/acquire-item.cc:1397 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formated in the same way as in #. the download progress display (e.g. 7d 3h 42min 1s) --#: apt-pkg/acquire-item.cc:1281 ++#: apt-pkg/acquire-item.cc:1434 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" --#: apt-pkg/acquire-item.cc:1302 ++#: apt-pkg/acquire-item.cc:1455 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" --#: apt-pkg/acquire-item.cc:1328 ++#: apt-pkg/acquire-item.cc:1488 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" --#: apt-pkg/acquire-item.cc:1337 ++#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "GPG error: %s: %s" msgstr "" --#: apt-pkg/acquire-item.cc:1365 ++#: apt-pkg/acquire-item.cc:1569 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" --#: apt-pkg/acquire-item.cc:1424 ++#: apt-pkg/acquire-item.cc:1628 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" --#: apt-pkg/acquire-item.cc:1479 ++#: apt-pkg/acquire-item.cc:1683 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" --#: apt-pkg/acquire-item.cc:1566 ++#: apt-pkg/acquire-item.cc:1770 msgid "Size mismatch" msgstr "" @@@ -2728,27 -2738,27 +2772,27 @@@ msgid "Unable to parse Release file %s" msgstr "" --#: apt-pkg/indexrecords.cc:60 ++#: apt-pkg/indexrecords.cc:63 #, c-format msgid "No sections in Release file %s" msgstr "" --#: apt-pkg/indexrecords.cc:94 ++#: apt-pkg/indexrecords.cc:97 #, c-format msgid "No Hash entry in Release file %s" msgstr "" --#: apt-pkg/indexrecords.cc:107 ++#: apt-pkg/indexrecords.cc:110 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" --#: apt-pkg/indexrecords.cc:122 ++#: apt-pkg/indexrecords.cc:125 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" --#: apt-pkg/vendorlist.cc:66 ++#: apt-pkg/vendorlist.cc:71 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" @@@ -2836,22 -2846,22 +2880,22 @@@ msgstr " msgid "Source list entries for this disc are:\n" msgstr "" --#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908 ++#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 #, c-format msgid "Wrote %i records.\n" msgstr "" --#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910 ++#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" --#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913 ++#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" --#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916 ++#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@@ -2923,12 -2933,12 +2967,12 @@@ msgstr " msgid "Installing %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823 ++#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:828 #, c-format msgid "Configuring %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830 ++#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:835 #, c-format msgid "Removing %s" msgstr "" @@@ -2949,92 -2959,92 +2993,99 @@@ msgid "Running post-installation trigge msgstr "" #. FIXME: use a better string after freeze --#: apt-pkg/deb/dpkgpm.cc:646 ++#: apt-pkg/deb/dpkgpm.cc:651 #, c-format msgid "Directory '%s' missing" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675 ++#: apt-pkg/deb/dpkgpm.cc:666 apt-pkg/deb/dpkgpm.cc:680 #, c-format msgid "Could not open file '%s'" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:816 ++#: apt-pkg/deb/dpkgpm.cc:821 #, c-format msgid "Preparing %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:817 ++#: apt-pkg/deb/dpkgpm.cc:822 #, c-format msgid "Unpacking %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:822 ++#: apt-pkg/deb/dpkgpm.cc:827 #, c-format msgid "Preparing to configure %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:824 ++#: apt-pkg/deb/dpkgpm.cc:829 #, c-format msgid "Installed %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:829 ++#: apt-pkg/deb/dpkgpm.cc:834 #, c-format msgid "Preparing for removal of %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:831 ++#: apt-pkg/deb/dpkgpm.cc:836 #, c-format msgid "Removed %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:836 ++#: apt-pkg/deb/dpkgpm.cc:841 #, c-format msgid "Preparing to completely remove %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:837 ++#: apt-pkg/deb/dpkgpm.cc:842 #, c-format msgid "Completely removed %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1043 ++#: apt-pkg/deb/dpkgpm.cc:1062 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1074 ++#: apt-pkg/deb/dpkgpm.cc:1093 msgid "Running dpkg" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1277 ++#: apt-pkg/deb/dpkgpm.cc:1301 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error --#: apt-pkg/deb/dpkgpm.cc:1282 ++#: apt-pkg/deb/dpkgpm.cc:1306 msgid "dependency problems - leaving unconfigured" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1284 ++#: apt-pkg/deb/dpkgpm.cc:1308 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1290 ++#: apt-pkg/deb/dpkgpm.cc:1314 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1296 ++#: apt-pkg/deb/dpkgpm.cc:1321 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1303 ++#. do not report dpkg I/O errors, this is a format string, so we compare ++#. the prefix and the suffix of the error with the dpkg error message ++#: apt-pkg/deb/dpkgpm.cc:1327 ++#, c-format ++msgid "short read in buffer_copy %s" ++msgstr "" ++ ++#: apt-pkg/deb/dpkgpm.cc:1337 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@@ -3065,30 -3075,30 +3116,37 @@@ msgstr " #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default --#: methods/mirror.cc:200 ++#: methods/mirror.cc:256 #, c-format msgid "No mirror file '%s' found " msgstr "" --#: methods/mirror.cc:343 ++#. FIXME: fallback to a default mirror here instead ++#. and provide a config option to define that default ++#: methods/mirror.cc:263 ++#, c-format ++msgid "Can not read mirror file '%s'" ++msgstr "" ++ ++#: methods/mirror.cc:407 #, c-format msgid "[Mirror: %s]" msgstr "" --#: methods/rred.cc:465 ++#: methods/rred.cc:503 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" --#: methods/rred.cc:470 ++#: methods/rred.cc:508 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" --#: methods/rsh.cc:329 ++#: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr ""