merge with debian-sid to get new pl-manpage

diff --cc debian/changelog
index cd5f2ae1bfd721566b949ab03c0e484e0a7fa0ab,24bea801d6a199d3338fe6aa68bbe9324e269c83..d08bfb20c6d0016c3664af53767633f64845c119
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,51 -3,11 +3,55 @@@ apt (0.7.26) UNRELEASED; urgency=lo
    [ Christian Perrier ]
    * German translation update. Closes: #571037
    * Spanish manpages translation update. Closes: #573293
+   * Dutch translation update. Closes: #573946
+   * Polish manpages translation update. Closes: #574558
+   * Add "manpages-pl (<< 20060617-3~)" to avoid file conflicts with
+     that package that was providing some manpages for APT utilities.
  
 +  [ David Kalnischkies ]
 +  * [BREAK] merge MultiArch-ABI. We don't support MultiArch,
 +    but we support the usage of the new ABI so libapt users
 +    can start to prepare for MultiArch (Closes: #536029)
 +  * Ignore :qualifiers after package name in build dependencies
 +    in the library by default, but try to honour them in apt-get
 +    as we have some sort of MultiArch support ready (Closes: #558103)
 +  * add translation of the manpages to PT (portuguese)
 +    Thanks to Américo Monteiro!
 +  * Switch to dpkg-source 3.0 (native) format
 +  * apt-pkg/depcache.cc:
 +    - remove Auto-Installed information from extended_states
 +      together with the package itself (Closes: #572364)
 +  * cmdline/apt-mark:
 +    - don't crash if no arguments are given (Closes: #570962)
 +  * debian/control:
 +    - remove some years old and obsolete Replaces
 +    - add automake/conf build-depends/conflicts as recommend by
 +      the autotools-dev README (Closes: #572615)
 +  * 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)
 +  * doc/makefile, doc/*:
 +    - generate subdirectories for building the manpages in on the fly
 +      depending on the po files we have.
 +  * apt-pkg/pkgcachegen.cc:
 +    - merge versions correctly even if multiple different versions
 +      with the same version number are available.
 +      Thanks to Magnus Holmgren for the patch! (Closes: #351056)
 +
    [ Julian Andres Klode ]
    * cmdline/apt-mark:
      - Use the new python-apt API (and conflict with python-apt << 0.7.93.2).

diff --cc debian/control
index b7c3e57122277d74edd0f59676a7839f649f228f,9cd3888b1be89aa7499947bf4769f7c62a86e572..5843820d7f6cf8f0ad74cbd690f03ce8781fe6a1
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,6 -12,7 +13,7 @@@ 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), manpages-pl (<< 20060617-3~)
++Replaces: manpages-pl (<< 20060617-3~)
  Provides: ${libapt-pkg:provides}
  Conflicts: python-apt (<< 0.7.93.2~)
  Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt

diff --cc doc/po/pl.po
index 54b4a507d0b6f68b36e7c280b61b1388c6159e76,c0cfc3d6057aa40e4b7a656c4def3d90b18c605e..07869250a6762e55791465ebf39a25960c2e573e
--- 1/doc/po/pl.po
--- 2/doc/po/pl.po
+++ b/doc/po/pl.po
@@@ -4,14 -5,14 +5,14 @@@
  #
  # Translators:
  # Krzysztof Fiertek <akfedux@megapolis.pl>, 2004
+ # Robert Luberda <robert@debian.org> 2000-2004, 2010
  #
- #, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: apt\n"
+ "Project-Id-Version: apt 0.7.25.3\n"
 -"POT-Creation-Date: 2010-02-18 20:53+0100\n"
 +"POT-Creation-Date: 2010-03-14 16:41+0100\n"
- "PO-Revision-Date: 2004-02-12 15:06+0100\n"
- "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n"
+ "PO-Revision-Date: 2010-03-18 22:00+0100\n"
+ "Last-Translator: Robert Luberda <robert@debian.org>\n"
  "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
@@@ -1453,16 -2047,16 +2047,16 @@@ 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 ""
+ 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 ""
+ msgstr "Pliki"
  
  #. type: Content of: <refentry><refsect1><variablelist>
  #: apt-cache.8.xml:363
@@@ -1471,13 -2065,14 +2065,14 @@@ 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 ""
+ msgstr "Zobacz także"
  
+ #
  #. type: Content of: <refentry><refsect1><para>
  #: apt-cache.8.xml:369
  msgid "&apt-conf;, &sources-list;, &apt-get;"
@@@ -1485,11 -2080,12 +2080,12 @@@ 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 ""
+ msgstr "Diagnostyka"
  
+ #
  #. type: Content of: <refentry><refsect1><para>
  #: apt-cache.8.xml:374
  msgid ""
@@@ -1846,11 -2552,16 +2552,16 @@@ msgid "
  "literal>)  directory, with filenames of the form <filename>package.template."
  "XXXX</filename> and <filename>package.config.XXXX</filename>"
  msgstr ""
+ "plik-template i skrypt-config są zapisywane w katalogu tymczasowym podanym "
+ "jako argument opcji <option>-t</option> lub <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>). Nazwy tych plików są w "
+ "postaci <filename>pakiet.template.XXXX</filename> oraz <filename>pakiet."
+ "config.XXXX</filename>."
  
  #. 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 ""
+ msgstr "<option>-t</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-extracttemplates.1.xml:60
@@@ -2793,10 -3596,10 +3596,10 @@@ msgid "
  msgstr ""
  
  #. 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 ""
+ msgstr "Przykłady"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
  #: apt-ftparchive.1.xml:587
@@@ -3429,25 -4512,12 +4512,39 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-get.8.xml:447
- msgstr ""
++#, 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 ""
++"Nie aktualizuje pakietów. Użyte w połączeniu z <literal>install</literal>, "
++"<literal>no-upgrade</literal> spowoduje, że pakiety, które są już "
++"zainstalowane, nie zostaną zaktualizowane.  Pozycja w pliku konfiguracyjnym: "
++"<literal>APT::Get::Upgrade</literal>."
 +
 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 +#: apt-get.8.xml:454
  msgid "<option>--force-yes</option>"
- msgstr ""
+ 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 "
@@@ -3455,14 -4525,21 +4552,21 @@@
  "literal> can potentially destroy your system! Configuration Item: "
  "<literal>APT::Get::force-yes</literal>."
  msgstr ""
+ "Wymuszenie. Jest to niebezpieczna opcja, która powoduje, że apt-get "
+ "kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
+ "jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem "
+ "bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może "
+ "zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <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 ""
+ 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 "
@@@ -3473,40 -4550,59 +4577,59 @@@
  "to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
  "Print-URIs</literal>."
  msgstr ""
+ "Nie ściąga pakietów do zainstalowania, tylko wypisuje ich URI. Każdy URI "
+ "składa się z lokalizacji, nazwy pliku przeznaczenia, rozmiaru oraz "
+ "oczekiwanej sumy kontrolnej md5. Należy zauważyć, że nazwa pliku "
+ "przeznaczenia nie musi być taka sama jak nazwa zdalnego pliku! Działa to "
+ "także z poleceniami <literal>source</literal> i <literal>update</literal>. "
+ "Używane z poleceniem <literal>update</literal>, nie wypisuje sum MD5 i "
+ "rozmiaru, a także w gestii użytkownika leży wtedy rozpakowywanie spakowanych "
+ "plików. Pozycja w pliku konfiguracyjnym: <literal>APT::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 ""
+ msgstr "<option>--purge</option>"
  
+ #
  #. 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 purged. "
  "<option>remove --purge</option> is equivalent to the <option>purge</option> "
  "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
  msgstr ""
+ "Używa polecenia purge (wyczyść), zamiast remove (usuń) dla wszystkiego, co "
+ "miałoby zostać usunięte. Obok pakietów, które są przeznaczone do "
+ "wyczyszczenia, wyświetlana jest gwiazdka (\"*\"). <option>remove --purge</"
+ "option> jest odpowiednikiem polecenia <option>purge</option>. Pozycja w "
+ "pliku konfiguracyjnym: <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 ""
+ 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>."
  msgstr ""
+ "Ponownie instaluje pakiety, których najnowsza wersja już jest zainstalowana "
+ "Pozycja w pliku konfiguracyjnym: <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 ""
+ 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 "
@@@ -3515,19 -4611,26 +4638,26 @@@
  "change your source list.  Configuration Item: <literal>APT::Get::List-"
  "Cleanup</literal>."
  msgstr ""
+ "Ta opcja jest domyślnie włączona, można ją wyłączyć używając <literal>--no-"
+ "list-cleanup</literal>. Jeżeli jest włączona, <command>apt-get</command> "
+ "będzie automatycznie zarządzał zawartością <filename>&statedir;/lists</"
+ "filename>,tak aby przestarzałe pliki były usuwane. Jedynym powodem dla jej "
+ "wyłączenia mogłyby być częste zmiany w sources.list.  Pozycja w pliku "
+ "konfiguracyjnym: <literal>APT::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 ""
+ 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 ""
+ 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 "
@@@ -3539,54 -4642,79 +4669,79 @@@
  "option>.  Configuration Item: <literal>APT::Default-Release</literal>; see "
  "also the &apt-preferences; manual page."
  msgstr ""
+ "Ta opcja tworzy domyślny pin o priorytecie 990, używając podanego łańcucha "
+ "znaków oznaczającego wersję dystrybucji. Nadpisuje to ogólne ustawienia z "
+ "pliku <filename>/etc/apt/preferences</filename>. Opcja nie zmienia pinu "
+ "pakietów, które mają własne (szczegółowe) ustawienia w powyższym pliku "
+ "preferencji. W skrócie - ta opcja pozwala pozwala na prostą kontrolę, z "
+ "których dystrybucji będą pobierane pakiety. Przykłady: <option>-t '2.1*'</"
+ "option>, <option>-t unstable</option> lub <option>-t sid</option>  Pozycja w "
+ "pliku konfiguracyjnym: <literal>APT::Default-Release</literal>; zobacz także "
+ "stronę podręcznika &apt-preferences;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:504
 +#: apt-get.8.xml:511
  msgid "<option>--trivial-only</option>"
- msgstr ""
+ 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</"
  "option> will answer yes to any prompt, <option>--trivial-only</option> will "
  "answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
  msgstr ""
+ "Wykonuje tylko \"banalne\" (ang. \"trivial\") operacje. Tę opcję można "
+ "porównać z <option>--assume-yes</option>, ale tam gdzie <option>--assume-"
+ "yes</option> odpowiedziałoby \"tak\" na pytanie, <option>--trivial-only</"
+ "option> odpowie \"nie\".  Pozycja w pliku konfiguracyjnym: <literal>APT::"
+ "Get::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 ""
+ 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>."
  msgstr ""
+ "Jeżeli jakikolwiek pakiet miałby zostać usunięty, apt-get natychmiast kończy "
+ "działanie.  Pozycja w pliku konfiguracyjnym: <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 ""
+ 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> "
  "command, removing the unused dependency packages. Configuration Item: "
  "<literal>APT::Get::AutomaticRemove</literal>."
  msgstr ""
+ "Jeżeli polecenie to albo <literal>install</literal>, albo <literal>remove</"
+ "literal>, to ta opcja działa tak, jak uruchomienie polecenia "
+ "<literal>autoremove</literal> i usuwa pakiety mające nieużywane już "
+ "zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
+ "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 ""
+ 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 "
@@@ -3596,96 -4724,124 +4751,124 @@@
  "corresponding source package.  Configuration Item: <literal>APT::Get::Only-"
  "Source</literal>."
  msgstr ""
+ "Ma znaczenie tylko dla poleceń <literal>source</literal> i <literal>build-"
+ "dep</literal>. Wskazuje na to, że podane nazwy pakietów źródłowych nie "
+ "powinny być mapowane w tabeli pakietów binarnych. Oznacza to, że gdy podano "
+ "tę opcję, to powyższe polecenia zaakceptują tylko nazwy pakietów źródłowych."
+ "Nie będą akceptować nazw pakietów binarnych ani wyszukiwać odpowiadających "
+ "im pakietów źródłowych. Pozycja w pliku konfiguracyjnym: <literal>APT::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 ""
+ 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 ""
+ 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 ""
+ 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</"
  "literal>, and <literal>APT::Get::Tar-Only</literal>."
  msgstr ""
+ "Ściągnij tylko plik diff, dsc albo tar pakietu źródłowego.  Pozycje w pliku "
+ "konfiguracyjnym:  <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
+ "Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</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 ""
+ 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>."
  msgstr ""
+ "Przetwarza tylko te pakiety z zależnościami wymaganymi do zbudowania pakietu "
+ "ze źródeł (build-dependencies), które są zależnie od architektury "
+ "komputera.  Pozycja w pliku konfiguracyjnym: <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 ""
+ 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::"
  "AllowUnauthenticated</literal>."
  msgstr ""
+ "Ignorowanie sytuacji, w których nie powiedzie się autentykacja pakietów i "
+ "nieostrzeganie o tym. Jest to użyteczne dla programów typu pbuilder. Pozycja "
+ "w pliku konfiguracyjnym: <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;"
  msgstr ""
+ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+ "&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-"
  "preferences;, the APT Howto."
  msgstr ""
+ "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+ "&apt-config;, &apt-secure;, Przewodnik APT dla użytkowników w &guidesdir;, "
+ "&apt-preferences;, 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."
  msgstr ""
+ "<command>apt-get</command> zwraca zero, gdy zakończyło się pomyślnie, 100 - "
+ "w przypadku błędu."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-get.8.xml:579
 +#: apt-get.8.xml:586
  msgid "ORIGINAL AUTHORS"
- msgstr ""
+ msgstr "AUTORZY ORYGINAŁU"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:580
 +#: apt-get.8.xml:587
  msgid "&apt-author.jgunthorpe;"
- msgstr ""
+ msgstr "&apt-author.jgunthorpe;"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-get.8.xml:583
 +#: apt-get.8.xml:590
  msgid "CURRENT AUTHORS"
- msgstr ""
+ msgstr "OBECNI AUTORZY"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:585
 +#: apt-get.8.xml:592
  msgid "&apt-author.team;"
- msgstr ""
+ msgstr "&apt-author.team;"
  
  #. type: Content of: <refentry><refnamediv><refname>
  #: apt-key.8.xml:14 apt-key.8.xml:21
@@@ -5951,19 -7222,19 +7252,19 @@@ msgid "APT's Default Priority Assignmen
  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 <replaceable>some-package</replaceable></command>\n"
- msgstr ""
+ msgstr "<command>apt-get install -t testing <replaceable>jakiś-pakiet</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 ""
+ 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 "
@@@ -5979,34 -7250,34 +7280,34 @@@
  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 ""
+ msgstr "priorytet 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 ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:103
 +#: apt_preferences.5.xml:106
  msgid "priority 500"
- msgstr ""
+ msgstr "priorytet 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."
  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 ""
+ msgstr "priorytet 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 ""
@@@ -6127,9 -7398,12 +7428,12 @@@ msgid "
  "Pin: version 5.8*\n"
  "Pin-Priority: 1001\n"
  msgstr ""
+ "Package: perl\n"
+ "Pin: version 5.8*\n"
+ "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 "
@@@ -6154,9 -7428,12 +7458,12 @@@ msgid "
  "Pin: origin \"\"\n"
  "Pin-Priority: 999\n"
  msgstr ""
+ "Package: *\n"
+ "Pin: origin \"\"\n"
+ "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 "
@@@ -6181,9 -7458,12 +7488,12 @@@ msgid "
  "Pin: release a=unstable\n"
  "Pin-Priority: 50\n"
  msgstr ""
+ "Package: *\n"
+ "Pin: release a=unstable\n"
+ "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>"
@@@ -6198,9 -7478,12 +7508,12 @@@ msgid "
  "Pin: release n=squeeze\n"
  "Pin-Priority: 900\n"
  msgstr ""
+ "Package: *\n"
+ "Pin: release n=squeeze\n"
+ "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>\" "
@@@ -6215,79 -7498,96 +7528,96 @@@ msgid "
  "Pin: release a=stable, v=3.0\n"
  "Pin-Priority: 500\n"
  msgstr ""
+ "Package: *\n"
+ "Pin: release a=stable, v=3.0\n"
+ "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 ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:243
 +#: apt_preferences.5.xml:246
  msgid "P &gt; 1000"
- msgstr ""
+ msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:244
 +#: apt_preferences.5.xml:247
+ #, fuzzy
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
  msgstr ""
+ "powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja "
+ "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:248
 +#: apt_preferences.5.xml:251
  msgid "990 &lt; P &lt;=1000"
- msgstr ""
+ msgstr "990 &lt; P &lt;=1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:249
 +#: apt_preferences.5.xml:252
+ #, fuzzy
  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 ""
+ "powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja "
+ "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:254
 +#: apt_preferences.5.xml:257
  msgid "500 &lt; P &lt;=990"
- msgstr ""
+ msgstr "500 &lt; P &lt;=990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:255
 +#: apt_preferences.5.xml:258
+ #, fuzzy
  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 ""
+ "powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja "
+ "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:260
 +#: apt_preferences.5.xml:263
  msgid "100 &lt; P &lt;=500"
- msgstr ""
+ msgstr "100 &lt; P &lt;=500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:261
 +#: apt_preferences.5.xml:264
+ #, fuzzy
  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 ""
+ "powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja "
+ "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:266
 +#: apt_preferences.5.xml:269
  msgid "0 &lt; P &lt;=100"
- msgstr ""
+ msgstr "0 &lt; P &lt;=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"
  msgstr ""
+ "powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja "
+ "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:271
 +#: apt_preferences.5.xml:274
  msgid "P &lt; 0"
- msgstr ""
+ msgstr "P &lt; 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 ""
  
@@@ -6331,14 -7631,25 +7661,25 @@@ msgid "
  "Pin: release unstable\n"
  "Pin-Priority: 50\n"
  msgstr ""
+ "Package: perl\n"
+ "Pin: version 5.8*\n"
+ "Pin-Priority: 1001\n"
+ "\n"
+ "Package: *\n"
+ "Pin: origin \"\"\n"
+ "Pin-Priority: 999\n"
+ "\n"
+ "Package: *\n"
+ "Pin: release unstable\n"
+ "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:300
 +#: apt_preferences.5.xml:303
  msgid "Then:"
- msgstr ""
+ msgstr "Wtedy:"
  
  #. 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 "
@@@ -6378,27 -7689,27 +7719,27 @@@ msgid "
  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 ""
+ msgstr "linia <literal>Package:</literal>"
  
  #. 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 ""
+ msgstr "podaje nazwę pakietu"
  
  #. 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 ""
+ msgstr "linia <literal>Version:</literal>"
  
  #. 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 ""
+ msgstr "podaje numer wersji danego pakietu"
  
  #. 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>/"
@@@ -6411,12 -7722,12 +7752,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 ""
+ msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
  
  #. 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 "
@@@ -6427,18 -7738,18 +7768,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 ""
+ 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 ""
+ msgstr "linia <literal>Codename:</literal>"
  
  #. 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 "
@@@ -6448,13 -7759,13 +7789,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 ""
+ 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 "
@@@ -6471,14 -7782,17 +7812,17 @@@ msgid "
  "Pin: release a=stable, v=3.0\n"
  "Pin: release 3.0\n"
  msgstr ""
+ "Pin: release v=3.0\n"
+ "Pin: release a=stable, v=3.0\n"
+ "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 ""
+ msgstr "linia <literal>Component:</literal>"
  
  #. 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 "
@@@ -6489,18 -7803,18 +7833,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 ""
+ 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 ""
+ msgstr "linia <literal>Origin:</literal>"
  
  #. 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</"
@@@ -6509,18 -7823,18 +7853,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 ""
+ 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 ""
+ msgstr "linia <literal>Label:</literal>"
  
  #. 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</"
@@@ -6529,13 -7843,13 +7873,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 ""
+ 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 "
@@@ -6590,8 -7904,8 +7934,8 @@@ msgid "Tracking Stable
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:487
 +#: apt_preferences.5.xml:490
- #, no-wrap
+ #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
  "Explanation: package versions other than those in the stable distro\n"
@@@ -6603,9 -7917,18 +7947,18 @@@
  "Pin: release o=Debian\n"
  "Pin-Priority: -10\n"
  msgstr ""
+ "Explanation: Uninstall or do not install any Debian-originated\n"
+ "Explanation: package versions other than those in the stable distro\n"
+ "Package: *\n"
+ "Pin: release a=stable\n"
+ "Pin-Priority: 900\n"
+ "\n"
+ "Package: *\n"
+ "Pin: release o=Debian\n"
+ "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 "
@@@ -6623,9 -7946,12 +7976,12 @@@ msgid "
  "apt-get upgrade\n"
  "apt-get dist-upgrade\n"
  msgstr ""
+ "apt-get install <replaceable>nazwa-pakietu</replaceable>\n"
+ "apt-get upgrade\n"
+ "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 "
@@@ -6634,13 -7960,13 +7990,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 ""
+ msgstr "apt-get install <replaceable>pakiet</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 "
@@@ -6669,9 -7995,20 +8025,20 @@@ msgid "
  "Pin: release o=Debian\n"
  "Pin-Priority: -10\n"
  msgstr ""
+ "Package: *\n"
+ "Pin: release a=testing\n"
+ "Pin-Priority: 900\n"
+ "\n"
+ "Package: *\n"
+ "Pin: release a=unstable\n"
+ "Pin-Priority: 800\n"
+ "\n"
+ "Package: *\n"
+ "Pin: release o=Debian\n"
+ "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 "
@@@ -6691,13 -8028,13 +8058,13 @@@ msgid "
  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 ""
+ msgstr "apt-get install <replaceable>pakiet</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.  "
@@@ -6714,8 -8051,8 +8081,8 @@@ msgid "Tracking the evolution of a code
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:586
 +#: apt_preferences.5.xml:589
- #, no-wrap
+ #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
  "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
@@@ -6732,9 -8069,23 +8099,23 @@@
  "Pin: release o=Debian\n"
  "Pin-Priority: -10\n"
  msgstr ""
+ "Explanation: Uninstall or do not install any Debian-originated package versions\n"
+ "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+ "Package: *\n"
+ "Pin: release n=squeeze\n"
+ "Pin-Priority: 900\n"
+ "\n"
+ "Explanation: Debian unstable is always codenamed with sid\n"
+ "Package: *\n"
+ "Pin: release a=sid\n"
+ "Pin-Priority: 800\n"
+ "\n"
+ "Package: *\n"
+ "Pin: release o=Debian\n"
+ "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 "
@@@ -6758,13 -8109,13 +8139,13 @@@ msgid "
  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 ""
+ msgstr "apt-get install <replaceable>pakiet</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, "
@@@ -6776,14 -8127,14 +8157,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt_preferences.5.xml:632
 +#: apt_preferences.5.xml:635
  msgid "&file-preferences;"
- msgstr ""
+ 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 ""
+ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
  #. type: Content of: <refentry><refnamediv><refname>
  #: sources.list.5.xml:22 sources.list.5.xml:29