From: David Kalnischkies Date: Sun, 14 Mar 2010 15:47:48 +0000 (+0100) Subject: merge with debian-sid, update-po for manpages and fix a few more X-Git-Tag: 0.8.0~9^2~64^2~27 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a7307a8727c85b0166339a54fb14ba3812f7a608?hp=-c merge with debian-sid, update-po for manpages and fix a few more typos in doc/po/es.po to generate the manpages properly. [ Christian Perrier ] * German translation update. Closes: #571037 * Spanish manpages translation update. Closes: #573293 [ Julian Andres Klode ] * cmdline/apt-mark: - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). * apt-inst/contrib/arfile.h: - Add public ARArchive::Members() which returns the list of members. * debian/rules: - Fix the libraries name to be e.g. libapt-pkg4.9 instead of libapt-pkg-4.9. --- a7307a8727c85b0166339a54fb14ba3812f7a608 diff --combined cmdline/apt-mark index f4f6aa576,0e73dda78..18552177c --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@@ -19,10 -19,10 +19,10 @@@ def show_automatic(filename) if not os.path.exists(STATE_FILE): return auto = set() - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) - while tagfile.Step(): - pkgname = tagfile.Section.get("Package") - autoInst = tagfile.Section.get("Auto-Installed") + tagfile = apt_pkg.TagFile(open(STATE_FILE)) + for section in tagfile: + pkgname = section.get("Package") + autoInst = section.get("Auto-Installed") if int(autoInst): auto.add(pkgname) print "\n".join(sorted(auto)) @@@ -33,24 -33,24 +33,24 @@@ def mark_unmark_automatic(filename, act # open the statefile if os.path.exists(STATE_FILE): try: - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + tagfile = apt_pkg.TagFile(open(STATE_FILE)) outfile = open(STATE_FILE+".tmp","w") except IOError, msg: print "%s, are you root?" % (msg) sys.exit(1) - while tagfile.Step(): - pkgname = tagfile.Section.get("Package") - autoInst = tagfile.Section.get("Auto-Installed") + for section in tagfile: + pkgname = section.get("Package") + autoInst = section.get("Auto-Installed") if pkgname in pkgs: if options.verbose: print "changing %s to %s" % (pkgname,action) - newsec = apt_pkg.RewriteSection(tagfile.Section, + newsec = apt_pkg.rewrite_section(section, [], [ ("Auto-Installed",str(action)) ]) pkgs.remove(pkgname) outfile.write(newsec+"\n") else: - outfile.write(str(tagfile.Section)+"\n") + outfile.write(str(section)+"\n") if action == 1: for pkgname in pkgs: if options.verbose: @@@ -76,13 -76,9 +76,13 @@@ if __name__ == "__main__" help="print verbose status messages to stdout") (options, args) = parser.parse_args() + if not args: + parser.print_help() + sys.exit(1) + # get the state-file if not options.filename: - STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + STATE_FILE = apt_pkg.config.find_dir("Dir::State") + "extended_states" else: STATE_FILE=options.filename diff --combined debian/changelog index b0d7cb536,8411d3541..3b564b3a1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,29 -1,19 +1,43 @@@ -apt (0.7.26~exp3) UNRELEASED; urgency=low +apt (0.7.26) UNRELEASED; urgency=low + [ Christian Perrier ] + * German translation update. Closes: #571037 + * Spanish manpages translation update. Closes: #573293 + ++ [ David Kalnischkies ] + * Switch to dpkg-source 3.0 (native) format + * cmdline/apt-mark: + - don't crash if no arguments are given (Closes: #570962) + * debian/control: + - remove some years old and obsolete Replaces + * apt-pkg/contrib/mmap.{h,cc}: + - add char[] fallback for filesystems without shared writable + mmap() like JFFS2. Thanks to Marius Vollmer for writing + and to Loïc Minier for pointing to the patch! (Closes: #314334) + * doc/apt_preferences.5.xml: + - fix two typos and be more verbose in the novice warning. + Thanks to Osamu Aoki for pointing it out! (Closes: #567669) + * apt-pkg/deb/dpkgpm.cc: + - fix error message construction in OpenLog() + - if available store the Commandline in the history + * cmdline/apt-get.cc: + - add a --only-upgrade flag to install command (Closes: #572259) + - fix memory leaks in error conditions in DoSource() + * apt-pkg/contrib/cmndline.cc: + - save Commandline in Commandline::AsString for logging + * apt-pkg/deb/debversion.cc: + - consider absent of debian revision equivalent to 0 (Closes: #573592) + - -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 + [ Julian Andres Klode ] + * cmdline/apt-mark: + - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). + * apt-inst/contrib/arfile.h: + - Add public ARArchive::Members() which returns the list of members. + * debian/rules: + - Fix the libraries name to be e.g. libapt-pkg4.9 instead of + libapt-pkg-4.9. + - -- Christian Perrier Wed, 24 Feb 2010 22:13:50 +0100 ++ -- David Kalnischkies Sun, 14 Mar 2010 16:47:07 +0100 apt (0.7.26~exp2) experimental; urgency=low diff --combined debian/control index daff242f0,c2b6c17a5..0cf092c25 --- a/debian/control +++ b/debian/control @@@ -12,7 -12,9 +12,8 @@@ Vcs-Bzr: http://bzr.debian.org/apt/debi Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} -Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} + Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. @@@ -26,6 -28,7 +27,6 @@@ Package: apt-do Architecture: all Priority: optional Depends: ${misc:Depends} -Replaces: apt (<< 0.5.4.9) Section: doc Description: Documentation for APT This package contains the user guide and offline guide, for APT, an @@@ -54,6 -57,7 +55,6 @@@ Package: apt-util Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${libapt-inst:provides} -Replaces: apt (<< 0.5.9) Description: APT utility programs This package contains some APT utility programs such as apt-ftparchive, apt-sortpkgs and apt-extracttemplates. diff --combined doc/po/apt-doc.pot index f3b50640c,f3b50640c..ea6f2c6fb --- 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: 2010-02-18 20:53+0100\n" ++"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -1477,12 -1477,12 +1477,12 @@@ msgid " msgstr "" #. type: Content of: --#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 ++#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:630 ++#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "" @@@ -1492,7 -1492,7 +1492,7 @@@ msgid "&file-sourceslist; &file-stateli msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 sources.list.5.xml:233 ++#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -1502,7 -1502,7 +1502,7 @@@ msgid "&apt-conf;, &sources-list;, &apt msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 ++#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1862,7 -1862,7 +1862,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 ++#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "" @@@ -2806,7 -2806,7 +2806,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 sources.list.5.xml:193 ++#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 sources.list.5.xml:193 msgid "Examples" msgstr "" @@@ -3450,12 -3450,12 +3450,26 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 --msgid "<option>--force-yes</option>" ++msgid "<option>--only-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:448 msgid "" ++"Do not install new packages; When used in conjunction with " ++"<literal>install</literal>, <literal>only-upgrade</literal> will prevent " ++"packages on the command line from being upgraded if they are not already " ++"installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-get.8.xml:454 ++msgid "<option>--force-yes</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-get.8.xml:455 ++msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " "not be used except in very special situations. Using " @@@ -3464,12 -3464,12 +3478,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:455 ++#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:456 ++#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@@ -3482,12 -3482,12 +3496,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:466 ++#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:467 ++#: apt-get.8.xml:474 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be " @@@ -3497,24 -3497,24 +3511,24 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:474 ++#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:475 ++#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:479 ++#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:480 ++#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@@ -3525,17 -3525,17 +3539,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:489 ++#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:490 ++#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:491 ++#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@@ -3550,12 -3550,12 +3564,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:504 ++#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:506 ++#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where " @@@ -3565,24 -3565,24 +3579,24 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:512 ++#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:513 ++#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:518 ++#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:519 ++#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or " "<literal>remove</literal>, then this option acts like running " @@@ -3591,12 -3591,12 +3605,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:525 ++#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:526 ++#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and " "<literal>build-dep</literal> commands. Indicates that the given source " @@@ -3608,22 -3608,22 +3622,22 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:536 ++#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:536 ++#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:536 ++#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:537 ++#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, " @@@ -3632,24 -3632,24 +3646,24 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:542 ++#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:543 ++#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:547 ++#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:548 ++#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: " @@@ -3657,14 -3657,14 +3671,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt-get.8.xml:561 ++#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-get.8.xml:570 ++#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, " @@@ -3672,29 -3672,29 +3686,29 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-get.8.xml:576 ++#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-get.8.xml:579 ++#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-get.8.xml:580 ++#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-get.8.xml:583 ++#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-get.8.xml:585 ++#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "" @@@ -5943,11 -5943,11 +5957,14 @@@ msgid " "not questioning the preferences so wrong settings will therefore lead to " "uninstallable packages or wrong decisions while upgrading packages. Even " "more problems will arise if multiply distribution releases are mixed without " --"a good understanding of the following paragraphs. You have been warned." ++"a good understanding of the following paragraphs. Packages included in a " ++"specific release aren't tested in and therefore doesn't always work as " ++"expected in older or newer releases or together with other packages from " ++"different releases. You have been warned." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:64 ++#: apt_preferences.5.xml:67 msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " @@@ -5958,12 -5958,12 +5975,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:71 ++#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:86 ++#: apt_preferences.5.xml:89 #, no-wrap msgid "" "<command>apt-get install -t testing " @@@ -5971,13 -5971,13 +5988,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:89 ++#: apt_preferences.5.xml:92 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:73 ++#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@@ -5994,39 -5994,39 +6011,39 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:98 ++#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:99 ++#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:103 ++#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:104 ++#: apt_preferences.5.xml:107 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:108 ++#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:109 ++#: apt_preferences.5.xml:112 msgid "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:93 ++#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@@ -6034,7 -6034,7 +6051,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:114 ++#: apt_preferences.5.xml:117 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 " @@@ -6042,14 -6042,14 +6059,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:121 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:121 ++#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -6059,19 -6059,19 +6076,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:127 ++#: apt_preferences.5.xml:130 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:128 ++#: apt_preferences.5.xml:131 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:131 ++#: apt_preferences.5.xml:134 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 " @@@ -6079,7 -6079,7 +6096,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:140 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 " @@@ -6090,7 -6090,7 +6107,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:147 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 " @@@ -6100,7 -6100,7 +6117,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:149 ++#: apt_preferences.5.xml:152 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 " @@@ -6112,12 -6112,12 +6129,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:158 ++#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -6126,7 -6126,7 +6143,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:166 ++#: apt_preferences.5.xml:169 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 " @@@ -6136,7 -6136,7 +6153,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:173 ++#: apt_preferences.5.xml:176 #, no-wrap msgid "" "Package: perl\n" @@@ -6145,7 -6145,7 +6162,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:179 ++#: apt_preferences.5.xml:182 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 " @@@ -6155,7 -6155,7 +6172,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:185 ++#: apt_preferences.5.xml:188 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 " @@@ -6163,7 -6163,7 +6180,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:190 ++#: apt_preferences.5.xml:193 #, no-wrap msgid "" "Package: *\n" @@@ -6172,7 -6172,7 +6189,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@@ -6182,7 -6182,7 +6199,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is " @@@ -6190,7 -6190,7 +6207,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:205 ++#: apt_preferences.5.xml:208 #, no-wrap msgid "" "Package: *\n" @@@ -6199,7 -6199,7 +6216,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:210 ++#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is " @@@ -6207,7 -6207,7 +6224,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:214 ++#: apt_preferences.5.xml:217 #, no-wrap msgid "" "Package: *\n" @@@ -6216,7 -6216,7 +6233,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -6224,7 -6224,7 +6241,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:224 ++#: apt_preferences.5.xml:227 #, no-wrap msgid "" "Package: *\n" @@@ -6233,82 -6233,82 +6250,82 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:235 ++#: apt_preferences.5.xml:238 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:243 ++#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:244 ++#: apt_preferences.5.xml:247 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:248 ++#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:249 ++#: apt_preferences.5.xml:252 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:254 ++#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:255 ++#: apt_preferences.5.xml:258 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:260 ++#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:264 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:266 ++#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:270 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:271 ++#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:238 ++#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -6316,7 -6316,7 +6333,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -6325,14 -6325,14 +6342,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:286 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:287 ++#: apt_preferences.5.xml:290 #, no-wrap msgid "" "Package: perl\n" @@@ -6349,12 -6349,12 +6366,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:303 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:302 ++#: apt_preferences.5.xml:305 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 " @@@ -6364,7 -6364,7 +6381,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:307 ++#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -6372,7 -6372,7 +6389,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:311 ++#: apt_preferences.5.xml:314 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 " @@@ -6381,12 -6381,12 +6398,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:321 ++#: apt_preferences.5.xml:324 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:323 ++#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -6394,27 -6394,27 +6411,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:335 ++#: apt_preferences.5.xml:338 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:336 ++#: apt_preferences.5.xml:339 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 ++#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:340 ++#: apt_preferences.5.xml:343 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:327 ++#: apt_preferences.5.xml:330 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>: " @@@ -6426,12 -6426,12 +6443,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:356 ++#: apt_preferences.5.xml:359 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:357 ++#: apt_preferences.5.xml:360 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -6442,18 -6442,18 +6459,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:367 ++#: apt_preferences.5.xml:370 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:373 ++#: apt_preferences.5.xml:376 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:374 ++#: apt_preferences.5.xml:377 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@@ -6464,13 -6464,13 +6481,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:383 ++#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:393 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 " @@@ -6481,7 -6481,7 +6498,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:399 ++#: apt_preferences.5.xml:402 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -6490,12 -6490,12 +6507,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:408 ++#: apt_preferences.5.xml:411 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:409 ++#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -6507,18 -6507,18 +6524,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:418 ++#: apt_preferences.5.xml:421 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:424 ++#: apt_preferences.5.xml:427 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:425 ++#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@@ -6527,18 -6527,18 +6544,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:431 ++#: apt_preferences.5.xml:434 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:437 ++#: apt_preferences.5.xml:440 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:438 ++#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@@ -6547,13 -6547,13 +6564,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:444 ++#: apt_preferences.5.xml:447 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:345 ++#: apt_preferences.5.xml:348 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -6567,7 -6567,7 +6584,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:451 ++#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -6582,12 -6582,12 +6599,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:464 ++#: apt_preferences.5.xml:467 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:466 ++#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -6595,7 -6595,7 +6612,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:470 ++#: apt_preferences.5.xml:473 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@@ -6604,12 -6604,12 +6621,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:479 ++#: apt_preferences.5.xml:482 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:490 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -6624,7 -6624,7 +6641,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:481 ++#: apt_preferences.5.xml:484 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 " @@@ -6634,7 -6634,7 +6651,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 apt_preferences.5.xml:608 ++#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 apt_preferences.5.xml:611 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -6643,7 -6643,7 +6660,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:499 ++#: apt_preferences.5.xml:502 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 " @@@ -6652,13 -6652,13 +6669,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:516 ++#: apt_preferences.5.xml:519 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:510 ++#: apt_preferences.5.xml:513 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -6667,12 -6667,12 +6684,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:522 ++#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:531 ++#: apt_preferences.5.xml:534 #, no-wrap msgid "" "Package: *\n" @@@ -6689,7 -6689,7 +6706,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:524 ++#: apt_preferences.5.xml:527 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -6700,7 -6700,7 +6717,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:545 ++#: apt_preferences.5.xml:548 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 " @@@ -6709,13 -6709,13 +6726,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:565 ++#: apt_preferences.5.xml:568 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:556 ++#: apt_preferences.5.xml:559 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -6727,12 -6727,12 +6744,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:572 ++#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:586 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package " @@@ -6754,7 -6754,7 +6771,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:577 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 " @@@ -6769,7 -6769,7 +6786,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:603 ++#: apt_preferences.5.xml:606 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 " @@@ -6778,13 -6778,13 +6795,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:623 ++#: apt_preferences.5.xml:626 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:614 ++#: apt_preferences.5.xml:617 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -6796,12 -6796,12 +6813,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:632 ++#: apt_preferences.5.xml:635 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:638 ++#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --combined doc/po/de.po index 99d56bed3,99d56bed3..19026bf3e --- 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.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" --"POT-Creation-Date: 2010-02-18 20:53+0100\n" ++"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@@ -1987,14 -1987,14 +1987,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 --#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 ++#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "Dateien" @@@ -2005,9 -2005,9 +2005,9 @@@ msgstr "&file-sourceslist; &file-statel #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@@ -2019,7 -2019,7 +2019,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "Diagnose" @@@ -2484,7 -2484,7 +2484,7 @@@ msgstr " "angegeben wurde" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 ++#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@@ -3717,7 -3717,7 +3717,7 @@@ msgstr " "Dateien mit <command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 ++#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" @@@ -4622,11 -4622,11 +4622,38 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 ++#, fuzzy ++#| msgid "<option>--no-upgrade</option>" ++msgid "<option>--only-upgrade</option>" ++msgstr "<option>--no-upgrade</option>" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-get.8.xml:448 ++#, fuzzy ++#| msgid "" ++#| "Do not upgrade packages; When used in conjunction with <literal>install</" ++#| "literal>, <literal>no-upgrade</literal> will prevent packages on the " ++#| "command line from being upgraded if they are already installed. " ++#| "Configuration Item: <literal>APT::Get::Upgrade</literal>." ++msgid "" ++"Do not install new packages; When used in conjunction with <literal>install</" ++"literal>, <literal>only-upgrade</literal> will prevent packages on the " ++"command line from being upgraded if they are not already installed. " ++"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." ++msgstr "" ++"Kein Upgrade von Paketen durchführen; Wenn es zusammen mit <literal>install</" ++"literal> benutzt wird, wird <literal>no-upgrade</literal> auf der " ++"Befehlszeile ein Upgrade von Paketen verhindern, wenn sie bereits " ++"installiert sind. Konfigurationselement: <literal>APT::Get::Upgrade</" ++"literal>." ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-get.8.xml:454 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:448 ++#: apt-get.8.xml:455 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@@ -4641,12 -4641,12 +4668,12 @@@ msgstr " "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:455 ++#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:456 ++#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@@ -4668,12 -4668,12 +4695,12 @@@ msgstr " "Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:466 ++#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:467 ++#: apt-get.8.xml:474 #, fuzzy #| msgid "" #| "Use purge instead of remove for anything that would be removed. An " @@@ -4693,12 -4693,12 +4720,12 @@@ msgstr " "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:474 ++#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:475 ++#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@@ -4707,12 -4707,12 +4734,12 @@@ msgstr " "Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:479 ++#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:480 ++#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@@ -4730,17 -4730,17 +4757,17 @@@ msgstr " "Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:489 ++#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:490 ++#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:491 ++#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@@ -4765,12 -4765,12 +4792,12 @@@ msgstr " "auch die &apt-preferences;-Handbuchseite." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:504 ++#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:506 ++#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@@ -4784,12 -4784,12 +4811,12 @@@ msgstr " "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:512 ++#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:513 ++#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@@ -4798,12 -4798,12 +4825,12 @@@ msgstr " "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:518 ++#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:519 ++#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@@ -4817,12 -4817,12 +4844,12 @@@ msgstr " "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:525 ++#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:526 ++#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@@ -4841,22 -4841,22 +4868,22 @@@ msgstr " "Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:536 ++#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:536 ++#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:536 ++#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:537 ++#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@@ -4868,12 -4868,12 +4895,12 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:542 ++#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:543 ++#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@@ -4882,12 -4882,12 +4909,12 @@@ msgstr " "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:547 ++#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-get.8.xml:548 ++#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@@ -4898,7 -4898,7 +4925,7 @@@ msgstr " "<literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> --#: apt-get.8.xml:561 ++#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@@ -4907,7 -4907,7 +4934,7 @@@ msgstr " "&file-statelists;" #. type: Content of: <refentry><refsect1><para> --#: apt-get.8.xml:570 ++#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@@ -4918,7 -4918,7 +4945,7 @@@ msgstr " "preferences;, das APT-Howto." #. type: Content of: <refentry><refsect1><para> --#: apt-get.8.xml:576 ++#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@@ -4927,22 -4927,22 +4954,22 @@@ msgstr " "100 bei Fehlern." #. type: Content of: <refentry><refsect1><title> --#: apt-get.8.xml:579 ++#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "ORIGINALAUTOREN" #. type: Content of: <refentry><refsect1><para> --#: apt-get.8.xml:580 ++#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> --#: apt-get.8.xml:583 ++#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "AKTUELLE AUTOREN" #. type: Content of: <refentry><refsect1><para> --#: apt-get.8.xml:585 ++#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@@ -8061,11 -8061,11 +8088,14 @@@ msgid " "not questioning the preferences so wrong settings will therefore lead to " "uninstallable packages or wrong decisions while upgrading packages. Even " "more problems will arise if multiply distribution releases are mixed without " --"a good understanding of the following paragraphs. You have been warned." ++"a good understanding of the following paragraphs. Packages included in a " ++"specific release aren't tested in and therefore doesn't always work as " ++"expected in older or newer releases or together with other packages from " ++"different releases. You have been warned." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:64 ++#: apt_preferences.5.xml:67 msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " @@@ -8076,24 -8076,24 +8106,24 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:71 ++#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "APTs Standardprioritätszuweisungen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:86 ++#: apt_preferences.5.xml:89 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:89 ++#: apt_preferences.5.xml:92 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:73 ++#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@@ -8121,22 -8121,22 +8151,22 @@@ msgstr " "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:98 ++#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:99 ++#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:103 ++#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "Priorität 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:104 ++#: apt_preferences.5.xml:107 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@@ -8145,19 -8145,19 +8175,19 @@@ msgstr " "gehören." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:108 ++#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "Priorität 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:109 ++#: apt_preferences.5.xml:112 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:93 ++#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@@ -8168,7 -8168,7 +8198,7 @@@ msgstr " "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:114 ++#: apt_preferences.5.xml:117 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 " @@@ -8179,7 -8179,7 +8209,7 @@@ msgstr " "installierten Paketversionen eine Priorität von 500 zu." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:118 ++#: apt_preferences.5.xml:121 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@@ -8189,7 -8189,7 +8219,7 @@@ msgstr " "ist." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:121 ++#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@@ -8205,12 -8205,12 +8235,12 @@@ msgstr " "Downgrading eines Paketes riskant sein kann.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:127 ++#: apt_preferences.5.xml:130 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:128 ++#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@@ -8219,7 -8219,7 +8249,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:131 ++#: apt_preferences.5.xml:134 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</" @@@ -8231,7 -8231,7 +8261,7 @@@ msgstr " "installierte installiert." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:137 ++#: apt_preferences.5.xml:140 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 " @@@ -8247,7 -8247,7 +8277,7 @@@ msgstr " "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:144 ++#: apt_preferences.5.xml:147 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 " @@@ -8261,7 -8261,7 +8291,7 @@@ msgstr " "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:149 ++#: apt_preferences.5.xml:152 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 " @@@ -8281,12 -8281,12 +8311,12 @@@ msgstr " "hat." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:158 ++#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "Die Auswirkungen von APT-Einstellungen" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:160 ++#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@@ -8300,7 -8300,7 +8330,7 @@@ msgstr " "allgemeine Gestalt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:166 ++#: apt_preferences.5.xml:169 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 " @@@ -8316,7 -8316,7 +8346,7 @@@ msgstr " "können durch Leerzeichen getrennt werden." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:173 ++#: apt_preferences.5.xml:176 #, no-wrap msgid "" "Package: perl\n" @@@ -8328,7 -8328,7 +8358,7 @@@ msgstr " "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:179 ++#: apt_preferences.5.xml:182 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 " @@@ -8343,7 -8343,7 +8373,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:185 ++#: apt_preferences.5.xml:188 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 " @@@ -8354,7 -8354,7 +8384,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:190 ++#: apt_preferences.5.xml:193 #, no-wrap msgid "" "Package: *\n" @@@ -8366,7 -8366,7 +8396,7 @@@ msgstr " "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:195 ++#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@@ -8382,7 -8382,7 +8412,7 @@@ msgstr " "wie »Debian« oder »Ximian«." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:201 ++#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@@ -8393,7 -8393,7 +8423,7 @@@ msgstr " "Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:205 ++#: apt_preferences.5.xml:208 #, no-wrap msgid "" "Package: *\n" @@@ -8405,7 -8405,7 +8435,7 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:210 ++#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@@ -8416,7 -8416,7 +8446,7 @@@ msgstr " "zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> --#: apt_preferences.5.xml:214 ++#: apt_preferences.5.xml:217 #, no-wrap msgid "" "Package: *\n" @@@ -8428,7 -8428,7 +8458,7 @@@ msgstr " "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:219 ++#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@@ -8439,7 -8439,7 +8469,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:224 ++#: apt_preferences.5.xml:227 #, no-wrap msgid "" "Package: *\n" @@@ -8451,17 -8451,17 +8481,17 @@@ msgstr " "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:235 ++#: apt_preferences.5.xml:238 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:243 ++#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:244 ++#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@@ -8470,12 -8470,12 +8500,12 @@@ msgstr " "des Pakets durchführt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:248 ++#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:249 ++#: apt_preferences.5.xml:252 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@@ -8484,12 -8484,12 +8514,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:254 ++#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:255 ++#: apt_preferences.5.xml:258 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" @@@ -8499,12 -8499,12 +8529,12 @@@ msgstr " "neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:260 ++#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:261 ++#: apt_preferences.5.xml:264 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" @@@ -8514,12 -8514,12 +8544,12 @@@ msgstr " "installierte Version neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:266 ++#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:267 ++#: apt_preferences.5.xml:270 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@@ -8528,17 -8528,17 +8558,17 @@@ msgstr " "installierte Version des Pakets gibt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:271 ++#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:272 ++#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" msgstr "verhindert das Installieren der Version" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:238 ++#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@@ -8549,7 -8549,7 +8579,7 @@@ msgstr " "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:277 ++#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@@ -8563,7 -8563,7 +8593,7 @@@ msgstr " "erste dieser Datensätze die Priorität der Paketversion fest." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:283 ++#: apt_preferences.5.xml:286 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@@ -8572,7 -8572,7 +8602,7 @@@ msgstr " "bereits gezeigten Datensätze:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> --#: apt_preferences.5.xml:287 ++#: apt_preferences.5.xml:290 #, no-wrap msgid "" "Package: perl\n" @@@ -8600,12 -8600,12 +8630,12 @@@ msgstr " "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:300 ++#: apt_preferences.5.xml:303 msgid "Then:" msgstr "Dann:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> --#: apt_preferences.5.xml:302 ++#: apt_preferences.5.xml:305 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 " @@@ -8620,7 -8620,7 +8650,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:307 ++#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@@ -8631,7 -8631,7 +8661,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:311 ++#: apt_preferences.5.xml:314 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</" @@@ -8645,12 -8645,12 +8675,12 @@@ msgstr " "Pakets installiert ist." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:321 ++#: apt_preferences.5.xml:324 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:323 ++#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@@ -8661,27 -8661,27 +8691,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:335 ++#: apt_preferences.5.xml:338 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:336 ++#: apt_preferences.5.xml:339 msgid "gives the package name" msgstr "gibt den Paketnamen an" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 ++#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 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:340 ++#: apt_preferences.5.xml:343 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:327 ++#: apt_preferences.5.xml:330 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@@ -8702,12 -8702,12 +8732,12 @@@ msgstr " "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:356 ++#: apt_preferences.5.xml:359 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:357 ++#: apt_preferences.5.xml:360 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@@ -8724,18 -8724,18 +8754,18 @@@ msgstr " "folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:367 ++#: apt_preferences.5.xml:370 #, 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:373 ++#: apt_preferences.5.xml:376 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:374 ++#: apt_preferences.5.xml:377 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@@ -8751,13 -8751,13 +8781,13 @@@ msgstr " "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:383 ++#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> --#: apt_preferences.5.xml:390 ++#: apt_preferences.5.xml:393 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 " @@@ -8773,7 -8773,7 +8803,7 @@@ msgstr " "eine der folgenden Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:399 ++#: apt_preferences.5.xml:402 #, no-wrap msgid "" "Pin: release v=3.0\n" @@@ -8785,12 -8785,12 +8815,12 @@@ msgstr " "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> --#: apt_preferences.5.xml:408 ++#: apt_preferences.5.xml:411 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:409 ++#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@@ -8808,18 -8808,18 +8838,18 @@@ msgstr " "Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:418 ++#: apt_preferences.5.xml:421 #, 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:424 ++#: apt_preferences.5.xml:427 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:425 ++#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8831,18 -8831,18 +8861,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:431 ++#: apt_preferences.5.xml:434 #, 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:437 ++#: apt_preferences.5.xml:440 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:438 ++#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@@ -8855,13 -8855,13 +8885,13 @@@ msgstr " "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> --#: apt_preferences.5.xml:444 ++#: apt_preferences.5.xml:447 #, 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:345 ++#: apt_preferences.5.xml:348 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@@ -8883,7 -8883,7 +8913,7 @@@ msgstr " "relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:451 ++#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@@ -8909,12 -8909,12 +8939,12 @@@ msgstr " "Distribution heruntergeladen wurde." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:464 ++#: apt_preferences.5.xml:467 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:466 ++#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@@ -8925,7 -8925,7 +8955,7 @@@ msgstr " "anfangen. Dieses stellt einen Platz für Kommentare bereit." #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:470 ++#: apt_preferences.5.xml:473 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@@ -8939,12 -8939,12 +8969,12 @@@ msgstr " "anfängt." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:479 ++#: apt_preferences.5.xml:482 msgid "Tracking Stable" msgstr "Stable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:487 ++#: apt_preferences.5.xml:490 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@@ -8968,7 -8968,7 +8998,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:481 ++#: apt_preferences.5.xml:484 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 " @@@ -8983,8 -8983,8 +9013,8 @@@ msgstr " "Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 --#: apt_preferences.5.xml:608 ++#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 ++#: apt_preferences.5.xml:611 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@@ -8996,7 -8996,7 +9026,7 @@@ msgstr " "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:499 ++#: apt_preferences.5.xml:502 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 " @@@ -9009,13 -9009,13 +9039,13 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:516 ++#: apt_preferences.5.xml:519 #, 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:510 ++#: apt_preferences.5.xml:513 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@@ -9029,12 -9029,12 +9059,12 @@@ msgstr " "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:522 ++#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" msgstr "Testing oder Unstable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:531 ++#: apt_preferences.5.xml:534 #, no-wrap msgid "" "Package: *\n" @@@ -9062,7 -9062,7 +9092,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:524 ++#: apt_preferences.5.xml:527 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@@ -9079,7 -9079,7 +9109,7 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:545 ++#: apt_preferences.5.xml:548 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 " @@@ -9092,13 -9092,13 +9122,13 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:565 ++#: apt_preferences.5.xml:568 #, 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:556 ++#: apt_preferences.5.xml:559 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@@ -9118,12 -9118,12 +9148,12 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt_preferences.5.xml:572 ++#: apt_preferences.5.xml:575 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:586 ++#: apt_preferences.5.xml:589 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@@ -9157,7 -9157,7 +9187,7 @@@ msgstr " "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:574 ++#: apt_preferences.5.xml:577 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 " @@@ -9183,7 -9183,7 +9213,7 @@@ msgstr " "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt_preferences.5.xml:603 ++#: apt_preferences.5.xml:606 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 " @@@ -9196,13 -9196,13 +9226,13 @@@ msgstr " "durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> --#: apt_preferences.5.xml:623 ++#: apt_preferences.5.xml:626 #, 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:614 ++#: apt_preferences.5.xml:617 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@@ -9222,12 -9222,12 +9252,12 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> --#: apt_preferences.5.xml:632 ++#: apt_preferences.5.xml:635 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> --#: apt_preferences.5.xml:638 ++#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --combined doc/po/es.po index c162dca97,837b60f2c..fe7a1c9be --- a/doc/po/es.po +++ b/doc/po/es.po @@@ -1,72 -1,95 +1,95 @@@ - # Translation of apt package man pages - # Copyright (C) 2003, 2004 Debian Italian l10n team <debian-l10n-spanish@lists.debian.org> + # apt man pages translation to Spanish + # Copyright (C) 2003, 2004, 2009, 2010 Software in the Public Interest # This file is distributed under the same license as the apt package. # - # Translators: - # Ismael Fanlo, 2003 - # Carlos Mestre, 2003 - # Rudy Godoy <rudy@kernel-panik.org>, 2003 - # Gustavo Saldumbide <gsal@adinet.com.uy>, 2003 - # Javier Fernández-Sanguino <jfs@computer.org>, 2003 - # Rubén Porras Campo <nahoo@inicia.es>, 2003, 2004 + # Changes: + # - Initial translation + # Ismael Fanlo, 2003 + # Carlos Mestre, 2003 + # Rudy Godoy <rudy@kernel-panik.org>, 2003 + # Gustavo Saldumbide <gsal@adinet.com.uy>, 2003 + # Javier Fernández-Sanguino <jfs@computer.org>, 2003 + # Rubén Porras Campo <nahoo@inicia.es>, 2003, 2004 + # + # - Updates + # Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009, 2010 + # Omar Campagne <ocampagne@gmail.com>, 2009, 2010 + # + # Traductores, si no conocen el formato PO, merece la pena leer la + # documentación de gettext, especialmente las secciones dedicadas a este + # formato, por ejemplo ejecutando: + # info -n '(gettext)PO Files' + # info -n '(gettext)Header Entry' + # + # Equipo de traducción al español, por favor lean antes de traducir + # los siguientes documentos: + # + # - El proyecto de traducción de Debian al español + # http://www.debian.org/intl/spanish/ + # especialmente las notas y normas de traducción en + # http://www.debian.org/intl/spanish/notas + # + # - La guía de traducción de po's de debconf: + # /usr/share/doc/po-debconf/README-trans + # o http://www.debian.org/intl/l10n/po-debconf/README-trans # - #, fuzzy msgid "" msgstr "" - "Project-Id-Version: apt\n" - "POT-Creation-Date: 2010-02-18 20:53+0100\n" - "PO-Revision-Date: 2004-09-20 17:05+0000\n" - "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" - "Language-Team: <debian-l10n-spanish@lists.debian.org>\n" + "Project-Id-Version: apt 0.7.25\n" -"POT-Creation-Date: 2010-02-18 20:53+0100\n" ++"POT-Creation-Date: 2010-03-14 16:41+0100\n" + "PO-Revision-Date: 2010-03-02 18:43+0200\n" + "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" + "Language-Team: Debian Spanish l10n <debian-l10n-spanish@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + "Language: es\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + "X-Generator: Virtaal 0.5.2\n" #. type: TH #: apt.8:17 - #, fuzzy, no-wrap + #, no-wrap msgid "apt" - msgstr "B<apt>" + msgstr "apt" #. type: TH #: apt.8:17 - #, fuzzy, no-wrap + #, no-wrap msgid "16 June 1998" - msgstr "16 Junio 1998" + msgstr "16 de Junio de 1998" #. type: TH #: apt.8:17 - #, fuzzy, no-wrap + #, no-wrap msgid "Debian GNU/Linux" msgstr "Debian GNU/Linux" #. type: SH #: apt.8:18 - #, fuzzy, no-wrap + #, no-wrap msgid "NAME" msgstr "NOMBRE" #. type: Plain text #: apt.8:20 - #, fuzzy msgid "apt - Advanced Package Tool" - msgstr "apt - Herramienta Avanzada de Paquetes" + msgstr "apt - Herramienta avanzada de paquetes" #. type: SH #: apt.8:20 - #, fuzzy, no-wrap + #, no-wrap msgid "SYNOPSIS" msgstr "SINOPSIS" #. type: Plain text #: apt.8:22 - #, fuzzy msgid "B<apt>" msgstr "B<apt>" #. type: SH #: apt.8:22 - #, fuzzy, no-wrap + #, no-wrap msgid "DESCRIPTION" msgstr "DESCRIPCIÓN" @@@ -78,97 -101,92 +101,92 @@@ msgid " "(8) for the command line or B<synaptic>(8) for the X Window System. Some " "options are only implemented in B<apt-get>(8) though." msgstr "" + "APT es un sistema de gestión de paquetes de software. Dispone de varias " + "interfaces para la gestión de paquetes normal del día a día, tales como " + "B<aptitude>(8) para la línea de órdenes o B<synaptic>(8) para el sistema de " + "ventanas de X. Algunas opciones sólo están implementadas en B<apt-get>(8)." #. type: SH #: apt.8:31 - #, fuzzy, no-wrap + #, no-wrap msgid "OPTIONS" msgstr "OPCIONES" #. type: Plain text #: apt.8:33 apt.8:35 - #, fuzzy msgid "None." - msgstr "" - "#-#-#-#-# apt.es.8:31 #-#-#-#-#\n" - "Ninguna.\n" - "#-#-#-#-# apt.es.8:33 #-#-#-#-#\n" - "Ninguno." + msgstr "Ninguna." #. type: SH #: apt.8:33 - #, fuzzy, no-wrap + #, no-wrap msgid "FILES" msgstr "FICHEROS" #. type: SH #: apt.8:35 - #, fuzzy, no-wrap + #, no-wrap msgid "SEE ALSO" - msgstr "LEA TAMBIEN" + msgstr "VÉASE TAMBIÉN" #. type: Plain text #: apt.8:42 - #, fuzzy msgid "" "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), " "B<apt_preferences>(5), B<apt-secure>(8)" - msgstr "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5)" + msgstr "" + "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), " + "B<apt_preferences>(5), B<apt-secure>(8)" #. type: SH #: apt.8:42 - #, fuzzy, no-wrap + #, no-wrap msgid "DIAGNOSTICS" - msgstr "DIAGNÓSTICO" + msgstr "DIAGNÓSTICOS" #. type: Plain text #: apt.8:44 - #, fuzzy msgid "apt returns zero on normal operation, decimal 100 on error." msgstr "" - "apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " - "el valor 100." + "apt devuelve cero si no hay ningún error, y el valor 100 en caso de error." #. type: SH #: apt.8:44 - #, fuzzy, no-wrap + #, no-wrap msgid "BUGS" - msgstr "ERRATAS" + msgstr "FALLOS" #. type: Plain text #: apt.8:46 - #, fuzzy msgid "This manpage isn't even started." - msgstr "Esta página de manual no está siquiera iniciada." + msgstr "Esta página de manual ni siquiera está iniciada." #. type: Plain text #: apt.8:55 - #, fuzzy msgid "" "See E<lt>http://bugs.debian.org/aptE<gt>. If you wish to report a bug in " "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the " "B<reportbug>(1) command." msgstr "" "Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe de " - "error en B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> o " - "el programa B<reportbug>(1)" + "error sobre B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> " + "o use la orden B<reportbug>(1)." #. type: SH #: apt.8:55 - #, fuzzy, no-wrap + #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text #: apt.8:56 - #, fuzzy msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>." msgstr "El equipo APT E<lt>apt@packages.debian.orgE<gt> escribió apt." #. type: Plain text #: apt.ent:2 msgid "<!-- -*- mode: sgml; mode: fold -*- -->" - msgstr "" + msgstr "<!-- -*- mode: sgml; mode: fold -*- -->" #. type: Plain text #: apt.ent:10 @@@ -179,6 -197,11 +197,11 @@@ msgid " "aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/" "lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">" msgstr "" + "<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!" + "ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex " + "\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY " + "aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/" + "lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">" #. type: Plain text #: apt.ent:17 @@@ -191,6 -214,12 +214,12 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!-- Cross references to other man pages -->\n" + "<!ENTITY apt-conf \"<citerefentry>\n" + " <refentrytitle><filename>apt.conf</filename></refentrytitle>\n" + " <manvolnum>5</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:23 @@@ -202,6 -231,11 +231,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY apt-get \"<citerefentry>\n" + " <refentrytitle><command>apt-get</command></refentrytitle>\n" + " <manvolnum>8</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:29 @@@ -213,6 -247,11 +247,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY apt-config \"<citerefentry>\n" + " <refentrytitle><command>apt-config</command></refentrytitle>\n" + " <manvolnum>8</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:35 @@@ -224,6 -263,11 +263,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY apt-cdrom \"<citerefentry>\n" + " <refentrytitle><command>apt-cdrom</command></refentrytitle>\n" + " <manvolnum>8</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:41 @@@ -235,6 -279,11 +279,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY apt-cache \"<citerefentry>\n" + " <refentrytitle><command>apt-cache</command></refentrytitle>\n" + " <manvolnum>8</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:47 @@@ -246,6 -295,11 +295,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY apt-preferences \"<citerefentry>\n" + " <refentrytitle><command>apt_preferences</command></refentrytitle>\n" + " <manvolnum>5</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:53 @@@ -257,6 -311,11 +311,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY apt-key \"<citerefentry>\n" + " <refentrytitle><command>apt-key</command></refentrytitle>\n" + " <manvolnum>8</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:59 @@@ -268,6 -327,11 +327,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY apt-secure \"<citerefentry>\n" + " <refentrytitle>apt-secure</refentrytitle>\n" + " <manvolnum>8</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:65 @@@ -279,6 -343,11 +343,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY apt-ftparchive \"<citerefentry>\n" + " <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:72 @@@ -290,6 -359,11 +359,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY sources-list \"<citerefentry>\n" + " <refentrytitle><filename>sources.list</filename></refentrytitle>\n" + " <manvolnum>5</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:78 @@@ -301,6 -375,11 +375,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY reportbug \"<citerefentry>\n" + " <refentrytitle><command>reportbug</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:84 @@@ -312,6 -391,11 +391,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY dpkg \"<citerefentry>\n" + " <refentrytitle><command>dpkg</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:90 @@@ -323,6 -407,11 +407,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY dpkg-buildpackage \"<citerefentry>\n" + " <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:96 @@@ -334,6 -423,11 +423,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY gzip \"<citerefentry>\n" + " <refentrytitle><command>gzip</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:102 @@@ -345,6 -439,11 +439,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" + " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:108 @@@ -356,6 -455,11 +455,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY dpkg-scansources \"<citerefentry>\n" + " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:114 @@@ -367,6 -471,11 +471,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY dselect \"<citerefentry>\n" + " <refentrytitle><command>dselect</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:120 @@@ -378,6 -487,11 +487,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY aptitude \"<citerefentry>\n" + " <refentrytitle><command>aptitude</command></refentrytitle>\n" + " <manvolnum>8</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:126 @@@ -389,6 -503,11 +503,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY synaptic \"<citerefentry>\n" + " <refentrytitle><command>synaptic</command></refentrytitle>\n" + " <manvolnum>8</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:132 @@@ -400,6 -519,11 +519,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY debsign \"<citerefentry>\n" + " <refentrytitle><command>debsign</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:138 @@@ -411,6 -535,11 +535,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY debsig-verify \"<citerefentry>\n" + " <refentrytitle><command>debsig-verify</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:144 @@@ -422,6 -551,11 +551,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY gpg \"<citerefentry>\n" + " <refentrytitle><command>gpg</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:150 @@@ -433,6 -567,11 +567,11 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY gnome-apt \"<citerefentry>\n" + " <refentrytitle><command>gnome-apt</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:156 @@@ -444,10 -583,15 +583,15 @@@ msgid " " </citerefentry>\"\n" ">\n" msgstr "" + "<!ENTITY wajig \"<citerefentry>\n" + " <refentrytitle><command>wajig</command></refentrytitle>\n" + " <manvolnum>1</manvolnum>\n" + " </citerefentry>\"\n" + ">\n" #. type: Plain text #: apt.ent:168 - #, fuzzy, no-wrap + #, no-wrap msgid "" "<!-- Boiler plate docinfo section -->\n" "<!ENTITY apt-docinfo \"\n" @@@ -461,13 -605,17 +605,17 @@@ " <date>28 October 2008</date>\n" " <productname>Linux</productname>\n" msgstr "" - "\n" - " <docinfo>\n" - " <address><email>apt@packages.debian.org</></address>\n" - " <author><firstname>Jason</> <surname>Gunthorpe</></>\n" - " <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>\n" - " <date>12 March 2001</>\n" - " </docinfo>\n" + "<!-- Boiler plate docinfo section -->\n" + "<!ENTITY apt-docinfo \"\n" + " <refentryinfo>\n" + " <address><email>apt@packages.debian.org</email></address>\n" + " <author>\n" + " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n" + " <contrib></contrib>\n" + " </author>\n" + " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n" + " <date>28 de Octubre de 2008</date>\n" -" <productname>Linux</poductname>\n" ++" <productname>Linux</productname>\n" #. type: Plain text #: apt.ent:171 @@@ -476,6 -624,8 +624,8 @@@ msgid " " </refentryinfo>\n" "\"> \n" msgstr "" + " </refentryinfo>\n" + "\"> \n" #. type: Plain text #: apt.ent:177 @@@ -487,6 -637,11 +637,11 @@@ msgid " " </address>\n" "\">\n" msgstr "" + "<!ENTITY apt-email \"\n" + " <address>\n" + " <email>apt@packages.debian.org</email>\n" + " </address>\n" + "\">\n" #. type: Plain text #: apt.ent:185 @@@ -500,6 -655,13 +655,13 @@@ msgid " " </author>\n" "\">\n" msgstr "" + "<!ENTITY apt-author.jgunthorpe \"\n" + " <author>\n" + " <firstname>Jason</firstname>\n" + " <surname>Gunthorpe</surname>\n" + " <contrib></contrib>\n" + " </author>\n" + "\">\n" #. type: Plain text #: apt.ent:193 @@@ -513,6 -675,13 +675,13 @@@ msgid " " </author>\n" "\">\n" msgstr "" + "<!ENTITY apt-author.moconnor \"\n" + " <author>\n" + " <firstname>Mike</firstname>\n" + " <surname>O'Connor</surname>\n" + " <contrib></contrib>\n" + " </author>\n" + "\">\n" #. type: Plain text #: apt.ent:200 @@@ -525,6 -694,12 +694,12 @@@ msgid " " </author>\n" "\">\n" msgstr "" + "<!ENTITY apt-author.team \"\n" + " <author>\n" + " <othername>Equipo de APT</othername>\n" + " <contrib></contrib>\n" + " </author>\n" + "\">\n" #. type: Plain text #: apt.ent:204 apt.ent:215 @@@ -534,6 -709,9 +709,9 @@@ msgid " " <productname>Linux</productname>\n" "\">\n" msgstr "" + "<!ENTITY apt-product \"\n" + " <productname>Linux</productname>\n" + "\">\n" #. type: Plain text #: apt.ent:211 @@@ -546,6 -724,12 +724,12 @@@ msgid " " </copyright>\n" "\">\n" msgstr "" + "<!ENTITY apt-copyright \"\n" + " <copyright>\n" + " <holder>Jason Gunthorpe</holder>\n" + " <year>1998-2001</year>\n" + " </copyright>\n" + "\">\n" #. type: Plain text #: apt.ent:221 @@@ -557,10 -741,15 +741,15 @@@ msgid " "\t</para>\n" "\">\n" msgstr "" + "<!ENTITY apt-qapage \"\n" + "\t<para>\n" + "\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Página de QA</ulink>\n" + "\t</para>\n" + "\">\n" #. type: Plain text #: apt.ent:232 - #, fuzzy, no-wrap + #, no-wrap msgid "" "<!-- Boiler plate Bug reporting section -->\n" "<!ENTITY manbugs \"\n" @@@ -572,11 -761,21 +761,21 @@@ " </para>\n" " </refsect1>\n" "\">\n" - msgstr "Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe de error en B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> o el programa B<reportbug>(1)" + msgstr "" + "<!-- Boiler plate Bug reporting section -->\n" + "<!ENTITY manbugs \"\n" + " <refsect1><title>Bugs\n" + " Página de errores de APT. \n" + " Si quiere informar de un error en APT, consulte\n" + " /usr/share/doc/debian/bug-reporting.txt o use la orden\n" + " &reportbug;.\n" + " \n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:240 - #, fuzzy, no-wrap + #, no-wrap msgid "" "\n" "\n" " \n" "\">\n" - msgstr "El equipo APT Eapt@packages.debian.orgE escribió apt." + msgstr "" + "\n" + "Autor\n" + " El equipo APT apt@packages.debian.org escribió apt.\n" + " \n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:250 @@@ -601,6 -807,15 +807,15 @@@ msgid " " \n" " \n" msgstr "" + "\n" + "\n" + " \n" + " Muestra un mensaje corto sobre el uso.\n" + " \n" + " \n" + " \n" #. type: Plain text #: apt.ent:258 @@@ -614,6 -829,13 +829,13 @@@ msgid " " \n" " \n" msgstr "" + " \n" + " \n" + " \n" + " Muestra la versión del programa.\n" + " \n" + " \n" + " \n" #. type: Plain text #: apt.ent:268 @@@ -629,6 -851,15 +851,15 @@@ msgid " " \n" " \n" msgstr "" + " \n" + " \n" + " \n" + " Fichero de configuración: Especifica el fichero de configuración a usar. \n" + " El programa leerá el fichero de configuración predeterminado y, después, este \n" + " fichero de configuración. Consulte &apt-conf; para información sobre la sintaxis. \n" + " \n" + " \n" + " \n" #. type: Plain text #: apt.ent:280 @@@ -646,10 -877,21 +877,21 @@@ msgid " " \n" "\">\n" msgstr "" + " \n" + " \n" + " \n" + " Define una opción de configuración: Esto definirá una opción\n" + " arbitraria de configuración. La sintaxis es .\n" + " y se pueden usar varias\n" + " veces para definir diferentes opciones.\n" + " \n" + " \n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:291 - #, fuzzy, no-wrap + #, no-wrap msgid "" "\n" @@@ -662,15 -904,17 +904,17 @@@ " \n" "\">\n" msgstr "" - "\n" - " \n" - " Todas las opciones de línea de órdenes pueden ser especificadas\n" - " mediante el fichero de configuración, en la descripción de cada opción\n" - " se indica la opción de configuración que hay que modificar. Para\n" - " opciones booleanas puedes modificar el fichero de configuración usando\n" - " cosas parecidas a ,, \n" + " u otras muchas variaciones.\n" " \n" + "\">\n" #. type: Plain text #: apt.ent:297 @@@ -682,6 -926,11 +926,11 @@@ msgid " " Configuration Item: Dir::Etc::Main.\n" " \n" msgstr "" + "/etc/apt/apt.conf\n" + " Fichero de configuración de APT.\n" + " Opción de configuración: Dir::Etc::Main.\n" + " \n" #. type: Plain text #: apt.ent:303 @@@ -693,6 -942,11 +942,11 @@@ msgid " " \n" "\">\n" msgstr "" + " /etc/apt/apt.conf.d/\n" + " Fragmentos del fichero de configuración de APT.\n" + " Opción de configuración: Dir::Etc::Parts.\n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:309 @@@ -704,21 -958,31 +958,31 @@@ msgid " " Configuration Item: Dir::Cache::Archives.\n" " \n" msgstr "" + "&cachedir;/archives/\n" + " Área de almacenamiento para los ficheros de paquetes descargados.\n" + " Opción de configuración: Dir::Cache::Archives.\n" + " \n" #. type: Plain text #: apt.ent:315 - #, fuzzy, no-wrap + #, no-wrap msgid "" " &cachedir;/archives/partial/\n" " Storage area for package files in transit.\n" " Configuration Item: Dir::Cache::Archives (implicit partial). \n" " \n" "\">\n" - msgstr "Directorio donde se guardan los ficheros en tránsito. Opción de Configuración: Dir::Cache::Archives (Implica partial)." + msgstr "" + " &cachedir;/archives/partial/\n" + " Área de almacenamiento para los ficheros de paquete en tránsito.\n" + " Opción de configuración: Dir::Cache::Archives (parcialmente implícito). \n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:325 - #, fuzzy, no-wrap + #, no-wrap msgid "" "/etc/apt/preferences\n" @@@ -729,7 -993,15 +993,15 @@@ " or from a different version of a distribution.\n" " Configuration Item: Dir::Etc::Preferences.\n" " \n" - msgstr "Fichero de configuración que contiene preferencias sobre versiones de paquetes, por ejemplo, puede especificar que un cierto paquete se descargue de un sitio diferente, o de una distribución con una versión diferente. Opción de Configuración: Dir::Etc::Preferences." + msgstr "" + "/etc/apt/preferences\n" + " Ficheros de preferencias de versión.\n" + " Aquí puede especificar el anclaje ("pinning"),\n" + " una preferencia para conseguir ciertos paquetes a partir de\n" + " una fuente diferente o de una versión diferente de una distribución.\n" + " Opción de configuración: Dir::Etc::Preferences.\n" + " \n" #. type: Plain text #: apt.ent:331 @@@ -741,6 -1013,11 +1013,11 @@@ msgid " " \n" "\">\n" msgstr "" + " /etc/apt/preferences.d/\n" + " Fragmentos de fichero para las preferencias de la versión.\n" + " Opción de configuración: Dir::Etc::PreferencesParts.\n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:337 @@@ -752,6 -1029,11 +1029,11 @@@ msgid " " Configuration Item: Dir::Etc::SourceList.\n" " \n" msgstr "" + "/etc/apt/sources.list\n" + " Ubicaciones de dónde conseguir los paquetes.\n" + " Opción de configuración: Dir::Etc::SourceList.\n" + " \n" #. type: Plain text #: apt.ent:343 @@@ -763,10 -1045,15 +1045,15 @@@ msgid " " \n" "\">\n" msgstr "" + " /etc/apt/sources.list.d/\n" + " Fragmentos de fichero para las ubicaciones de dónde descargar los paquetes.\n" + " Opción de configuración: Dir::Etc::SourceParts.\n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:350 - #, fuzzy, no-wrap + #, no-wrap msgid "" "&statedir;/lists/\n" @@@ -775,22 -1062,16 +1062,16 @@@ " Configuration Item: Dir::State::Lists.\n" " \n" msgstr "" - "#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" - "Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" - "Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" - "Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" - "Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" - "Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" - "Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists." + "&statedir;/lists/\n" + " Área de almacenamiento para la información del estado\n" + " de cada fuente de paquetes especificado en &sources-list;\n" + " Opción de configuración: Dir::State::Lists.\n" + " \n" #. type: Plain text #: apt.ent:356 - #, fuzzy, no-wrap + #, no-wrap msgid "" " &statedir;/lists/partial/\n" " Storage area for state information in transit.\n" @@@ -798,22 -1079,21 +1079,21 @@@ " \n" "\">\n" msgstr "" - "#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial)." + " &statedir;/lists/partial/\n" + " Área de almacenamiento para la información del estado en tránsito.\n" + " Opción de configuración: Dir::State::Lists (parcialmente implícito).\n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:362 #, fuzzy, no-wrap + #| msgid "" + #| "/etc/apt/sources.list\n" + #| " Locations to fetch packages from.\n" + #| " Configuration Item: Dir::Etc::SourceList.\n" + #| " \n" msgid "" "/etc/apt/trusted.gpg\n" @@@ -821,22 -1101,21 +1101,21 @@@ " Configuration Item: Dir::Etc::Trusted.\n" " \n" msgstr "" - "#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" - "Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" - "Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" - "Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" - "Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" - "Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" - "Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists." + "/etc/apt/sources.list\n" + " Ubicaciones de dónde conseguir los paquetes.\n" + " Opción de configuración: Dir::Etc::SourceList.\n" + " \n" #. type: Plain text #: apt.ent:369 #, fuzzy, no-wrap + #| msgid "" + #| " /etc/apt/sources.list.d/\n" + #| " File fragments for locations to fetch packages from.\n" + #| " Configuration Item: Dir::Etc::SourceParts.\n" + #| " \n" + #| "\">\n" msgid "" " /etc/apt/trusted.gpg.d/\n" " File fragments for the trusted keys, additional keyrings can\n" @@@ -845,18 -1124,11 +1124,11 @@@ " \n" "\">\n" msgstr "" - "#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" - "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" - "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial)." + " /etc/apt/sources.list.d/\n" + " Fragmentos de fichero para las ubicaciones de dónde descargar los paquetes.\n" + " Opción de configuración: Dir::Etc::SourceParts.\n" + " \n" + "\">\n" #. type: Plain text #: apt.ent:371 @@@ -865,7 -1137,7 +1137,7 @@@ msgstr " #. type: Plain text #: apt.ent:380 - #, fuzzy, no-wrap + #, no-wrap msgid "" "