merged lp:~mvo/apt/add-library-pkgs

21 files changed, 3284 insertions, 4861 deletions

diff --git a/configure.in b/configure.in
index b2880c99c..3dde2fe47 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.8.2")
+AC_DEFINE_UNQUOTED(VERSION,"0.8.15")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
diff --git a/debian/apt-utils.install b/debian/apt-utils.install
index d947f26d4..8b1378917 100644
--- a/debian/apt-utils.install
+++ b/debian/apt-utils.install
@@ -1 +1 @@
-bin/libapt-inst*.so.* usr/lib/
+
diff --git a/debian/apt.install b/debian/apt.install
index 979e04ce2..ba57f7efa 100644
--- a/debian/apt.install
+++ b/debian/apt.install
@@ -1,5 +1,4 @@
 bin/apt-* usr/bin/
-bin/libapt-pkg*.so.* usr/lib/
 bin/methods/* usr/lib/apt/methods/
 scripts/dselect/* usr/lib/dpkg/methods/apt/
 locale usr/share/
diff --git a/debian/changelog b/debian/changelog
index bb072a15b..0b81acb01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.15) UNRELEASED; urgency=low
+apt (0.8.15~exp1) UNRELEASED; urgency=low
 
   [ Julian Andres Klode ]
   * apt-pkg/depcache.cc:
@@ -75,6 +75,15 @@ apt (0.8.15) UNRELEASED; urgency=low
     - ensure for Multi-Arch:same packages that they are unpacked in
       lock step even in immediate configuration (Closes: #618288)
 
+  [ Michael Vogt ]
+  * methods/mirror.cc:
+    - ignore lines starting with "#" in the mirror file
+    - ignore non http urls in the mirrors
+    - append the dist (e.g. sid, wheezy) as a query string when
+      asking for a suitable mirror 
+  * debian/control:
+    - add libapt-pkg4.10 and libapt-inst1.2 library packages
+
  -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
 
 apt (0.8.14.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6d0f16b70..9aefcde8d 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Architecture: any
 Pre-Depends: ${shlibs:Depends}
 Depends: debian-archive-keyring, ${misc:Depends}, gnupg
 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
 Description: Advanced front-end for dpkg
@@ -27,6 +26,20 @@ Description: Advanced front-end for dpkg
  APT features complete installation ordering, multiple source capability
  and several other unique features, see the Users Guide in apt-doc.
 
+Package: libapt-pkg4.10
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: apt (<< 0.8.15)
+Description: Library for apt
+ This package contains the library used by apt.
+
+Package: libapt-inst1.2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: apt-utils (<< 0.8.15)
+Description: Install library for apt
+ This package contains the inst library used by apt.
+
 Package: apt-doc
 Architecture: all
 Priority: optional
@@ -39,7 +52,7 @@ Description: Documentation for APT
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional
-Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev
+Depends: libapt-pkg4.10 (= ${binary:Version}), libapt-inst1.2 (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev
 Section: libdevel
 Description: Development files for APT's libapt-pkg and libapt-inst
  This package contains the header files and libraries for
@@ -61,7 +74,6 @@ Description: Documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ${libapt-inst:provides}
 Description: APT utility programs
  This package contains some APT utility programs such as apt-ftparchive,
  apt-sortpkgs and apt-extracttemplates.
diff --git a/debian/libapt-inst1.2.install b/debian/libapt-inst1.2.install
new file mode 100644
index 000000000..575199b53
--- /dev/null
+++ b/debian/libapt-inst1.2.install
@@ -0,0 +1 @@
+bin/libapt-inst*.so.* usr/lib/
\ No newline at end of file
diff --git a/debian/apt-utils.symbols b/debian/libapt-inst1.2.symbols
index 9ba283a51..73e6c8928 100644
--- a/debian/apt-utils.symbols
+++ b/debian/libapt-inst1.2.symbols
@@ -1,5 +1,4 @@
 libapt-inst.so.1.2 libapt-inst1.2
-| apt-utils #MINVER#
 * Build-Depends-Package: libapt-pkg-dev
  (c++)"ExtractTar::Done(bool)@Base" 0.8.0
  (c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0
diff --git a/debian/libapt-pkg4.10.install b/debian/libapt-pkg4.10.install
new file mode 100644
index 000000000..571dc8478
--- /dev/null
+++ b/debian/libapt-pkg4.10.install
@@ -0,0 +1 @@
+bin/libapt-pkg*.so.* usr/lib/
\ No newline at end of file
diff --git a/debian/apt.symbols b/debian/libapt-pkg4.10.symbols
index bb60c22be..039535cf9 100644
--- a/debian/apt.symbols
+++ b/debian/libapt-pkg4.10.symbols
@@ -1,5 +1,4 @@
 libapt-pkg.so.4.10 libapt-pkg4.10
-| apt #MINVER#
 * Build-Depends-Package: libapt-pkg-dev
  TFRewritePackageOrder@Base 0.8.0
  TFRewriteSourceOrder@Base 0.8.0
diff --git a/debian/rules b/debian/rules
index 0544b2b8e..fd894b73b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,9 +70,9 @@ APT_UTILS=ftparchive sortpkgs extracttemplates
 # Find the libapt-pkg major version for use in other control files
 include buildlib/libversion.mak
 
-# Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR)
+# Determine which library package names to use
+LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR)
+LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
 
 # do not fail as we are just experimenting with symbol files for now
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
@@ -137,7 +137,7 @@ libapt-pkg-doc: build-doc
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
@@ -165,7 +165,7 @@ apt-doc: build-doc
 
 # Build architecture-dependent files here.
 
-binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
+binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
 apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
 apt: build build-doc
 	dh_testdir -p$@
@@ -205,10 +205,9 @@ apt: build build-doc
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
-	dh_makeshlibs -p$@
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
-	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+	dh_shlibdeps -p$@
+	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
@@ -227,7 +226,7 @@ libapt-pkg-dev: build
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
@@ -253,8 +252,46 @@ apt-utils: build
 	dh_fixperms -p$@
 	dh_makeshlibs -p$@
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
-	dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+	dh_shlibdeps -p$@
+	dh_gencontrol -p$@
+	dh_md5sums -p$@
+	dh_builddeb -p$@
+
+$(LIBAPT_PKG): build
+	dh_testdir -p$@
+	dh_testroot -p$@
+	dh_prep -p$@
+	dh_installdirs -p$@
+
+	dh_install -p$@ --sourcedir=$(BLD)
+	dh_installdocs -p$@
+	dh_installchangelogs -p$@
+	dh_strip -p$@
+	dh_compress -p$@
+	dh_fixperms -p$@
+	dh_makeshlibs -p$@
+	dh_installdeb -p$@
+	dh_shlibdeps -p$@ 
+	dh_gencontrol -p$@
+	dh_md5sums -p$@
+	dh_builddeb -p$@
+
+$(LIBAPT_INST): build
+	dh_testdir -p$@
+	dh_testroot -p$@
+	dh_prep -p$@
+	dh_installdirs -p$@
+
+	dh_install -p$@ --sourcedir=$(BLD)
+	dh_installdocs -p$@
+	dh_installchangelogs -p$@
+	dh_strip -p$@
+	dh_compress -p$@
+	dh_fixperms -p$@
+	dh_makeshlibs -p$@
+	dh_installdeb -p$@
+	dh_shlibdeps -p$@ 
+	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
@@ -276,7 +313,7 @@ apt-transport-https: build libapt-pkg-dev
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
+	dh_shlibdeps -p$@ 
 	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 159f86e6a..cc60e5497 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -566,7 +566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
+#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
 msgid "Description"
 msgstr ""
 
@@ -944,7 +944,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
 msgid "options"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr ""
 
@@ -987,12 +987,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1091,7 +1091,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
 msgid "<option>-a</option>"
 msgstr ""
 
@@ -1187,12 +1187,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:649
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 apt.conf.5.xml:1093 apt_preferences.5.xml:697
 msgid "Files"
 msgstr ""
 
@@ -1202,7 +1202,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 sources.list.5.xml:234
+#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234
 msgid "See Also"
 msgstr ""
 
@@ -1212,7 +1212,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr ""
 
@@ -1311,12 +1311,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:158
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1519,7 +1519,7 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr ""
 
@@ -2432,31 +2432,37 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
+msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
 msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: "
+"<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and "
+"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> "
+"where <literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, "
+"<literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2465,12 +2471,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2479,12 +2485,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2494,12 +2500,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -2507,24 +2513,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
 msgid ""
 "Make the caching databases read only.  Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2533,12 +2539,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2552,12 +2558,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2567,12 +2573,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 sources.list.5.xml:198
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -2581,14 +2587,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3610,20 +3616,34 @@ msgid ""
 "from the keyring the archive keys which are no longer valid."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:140
+msgid "net-update"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
+msgid ""
+"Update the local keyring with the keys of a key server and removes from the "
+"keyring the archive keys which are no longer valid. This requires an "
+"installed wget and an APT build configured to have a server to fetch "
+"from. APT in Debian does not support this command, but Ubuntu's APT does."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:159
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:161
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:162
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -3634,42 +3654,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:175
 msgid "&file-trustedgpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:177
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:178
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:181
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:182
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:185
 msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
+#: apt-key.8.xml:186
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:195
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
@@ -3677,8 +3697,8 @@ msgstr ""
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
@@ -3697,21 +3717,21 @@ msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
 "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
 "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-"choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> "
+"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
 "</group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> <arg "
-"choice=\"plain\">showauto</arg> </group>"
+"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3721,104 +3741,128 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+msgid "auto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
-msgid "showauto"
+#: apt-mark.8.xml:85
+msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:86
 msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg "
+"--set-selections</command> and the state is therefore maintained by &dpkg; "
+"and not effected by the <option>--filename</option> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:96
-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
-msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#: apt-mark.8.xml:101
+msgid "showauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:102
 msgid ""
-"Read/Write package stats from "
-"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
-"default location, which is <filename>extended_status</filename> in the "
-"directory defined by the Configuration Item: <literal>Dir::State</literal>."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
+#: apt-mark.8.xml:109
+msgid "showmanual"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
+#: apt-mark.8.xml:116
+msgid "showhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
+#: apt-mark.8.xml:117
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
+#: apt-mark.8.xml:130
+msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
+#: apt-mark.8.xml:131
+msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
+#: apt-mark.8.xml:134
+msgid ""
+"Read/Write package stats from "
+"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
+"default location, which is <filename>extended_status</filename> in the "
+"directory defined by the Configuration Item: <literal>Dir::State</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
 msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5874,39 +5918,44 @@ msgstr ""
 #: apt_preferences.5.xml:107
 msgid ""
 "to the versions coming from archives which in their "
-"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" like "
-"the debian experimental archive."
+"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but "
+"<emphasis>not</emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:113
-msgid "to the version that is already installed (if any)."
+#: apt_preferences.5.xml:114
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:127
 msgid "to the versions that are not installed and belong to the target release."
 msgstr ""
 
@@ -5919,24 +5968,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:132
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions, expect versions coming from archives which in "
+"uninstalled package versions, except versions coming from archives which in "
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
-"- these versions get the priority 1."
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5946,19 +5996,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the "
@@ -5966,7 +6016,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:153
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5977,7 +6027,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5987,7 +6037,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5999,12 +6049,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:174
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -6013,7 +6063,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -6023,7 +6073,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6032,7 +6082,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -6042,7 +6092,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -6050,7 +6100,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6059,7 +6109,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:216
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -6068,7 +6118,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:220
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6077,7 +6127,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:224
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -6087,7 +6137,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is "
@@ -6095,7 +6145,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6104,7 +6154,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:238
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is "
@@ -6112,7 +6162,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6121,7 +6171,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:242
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6129,7 +6179,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6138,82 +6188,133 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a "
+"glob()-like expression or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Those, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:314
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:315
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:319
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:320
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:325
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:278
+#: apt_preferences.5.xml:326
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:331
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:284
+#: apt_preferences.5.xml:332
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:337
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:338
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:342
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:343
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:309
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -6221,7 +6322,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:348
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6230,14 +6331,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:354
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:358
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6254,12 +6355,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:373
 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 "
@@ -6269,7 +6370,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:378
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6277,7 +6378,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:382
 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 "
@@ -6286,12 +6387,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:344
+#: apt_preferences.5.xml:392
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:394
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6299,27 +6400,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:406
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:407
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:411
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:398
 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>: "
@@ -6331,12 +6432,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:427
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:380
+#: apt_preferences.5.xml:428
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6347,18 +6448,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:438
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:396
+#: apt_preferences.5.xml:444
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:445
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6369,13 +6470,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:454
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:461
 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 "
@@ -6386,7 +6487,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:470
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6395,12 +6496,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:479
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:432
+#: apt_preferences.5.xml:480
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6412,18 +6513,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:489
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:495
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:496
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6432,18 +6533,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:502
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:460
+#: apt_preferences.5.xml:508
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:509
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6452,13 +6553,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:515
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:416
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6472,7 +6573,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:522
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6487,12 +6588,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:535
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:537
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6500,12 +6601,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:546
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:554
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6520,7 +6621,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:500
+#: apt_preferences.5.xml:548
 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 "
@@ -6530,7 +6631,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 apt_preferences.5.xml:627
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6539,7 +6640,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:566
 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 "
@@ -6548,13 +6649,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:583
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:529
+#: apt_preferences.5.xml:577
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6563,12 +6664,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:589
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:598
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6585,7 +6686,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:591
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6596,7 +6697,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:612
 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 "
@@ -6605,13 +6706,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:584
+#: apt_preferences.5.xml:632
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:623
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6623,12 +6724,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:605
+#: apt_preferences.5.xml:653
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package "
@@ -6650,7 +6751,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:641
 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 "
@@ -6665,7 +6766,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:622
+#: apt_preferences.5.xml:670
 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 "
@@ -6674,13 +6775,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:690
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:633
+#: apt_preferences.5.xml:681
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6692,12 +6793,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:651
+#: apt_preferences.5.xml:699
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:657
+#: apt_preferences.5.xml:705
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
diff --git a/doc/po/es.po b/doc/po/es.po
index 63e0e8a6e..635133ed3 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 "PO-Revision-Date: 2010-08-25 03:25+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -810,7 +810,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
@@ -1327,7 +1327,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
 msgid "options"
 msgstr "Opciones"
@@ -1354,7 +1354,7 @@ msgstr ""
 "configuración: <literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1380,12 +1380,12 @@ msgstr ""
 "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1500,7 +1500,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1617,14 +1617,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Ficheros"
 
@@ -1635,9 +1635,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
 msgid "See Also"
 msgstr "Véase también"
@@ -1649,8 +1649,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
@@ -1779,12 +1779,12 @@ msgstr ""
 "option>. <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:158
 msgid "Options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2041,7 +2041,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Sólo muestra el contenido del espacio de configuración."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3192,28 +3192,49 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
-msgstr "<option>--md5</option>"
+msgid ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
-msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
+msgid ""
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
 msgstr ""
-"Genera una suma de control MD5. Está activado de forma predeterminada, "
-"cuando se desactiva los ficheros de índices generados no tendrán los campos "
-"MD5Sum cuando sea posible. Opción de configuración: <literal>APT::"
-"FTPArchive::MD5</literal>"
+"Los valores para los campos de metadatos adicionales en el fichero «Release» "
+"se toman de las variables correspondientes en <literal>APT::FTPArchive::"
+"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</"
+"literal>. Los campos permitidos son: <literal>Origin</literal>, "
+"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</"
+"literal>, <literal>Codename</literal>, <literal>Date</literal>, "
+"<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal> y <literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3222,7 +3243,7 @@ msgstr ""
 "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3236,12 +3257,12 @@ msgstr ""
 "configuración. Opción de configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3254,12 +3275,12 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3276,12 +3297,12 @@ msgstr ""
 "Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3292,12 +3313,12 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3306,12 +3327,12 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3325,12 +3346,12 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3354,12 +3375,12 @@ msgstr ""
 "comprobaciones adicionales son innecesarias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3375,19 +3396,19 @@ msgstr ""
 "con la orden «generate»."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3396,7 +3417,7 @@ msgstr ""
 "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4750,8 +4771,24 @@ msgstr ""
 "Actualiza el registro de claves local con el registro de claves del archivo "
 "Debian, y elimina del registro las claves del archivo que ya no son válidas."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:140
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
+msgid ""
+"Update the local keyring with the keys of a key server and removes from the "
+"keyring the archive keys which are no longer valid. This requires an "
+"installed wget and an APT build configured to have a server to fetch from. "
+"APT in Debian does not support this command, but Ubuntu's APT does."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:159
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4760,12 +4797,12 @@ msgstr ""
 "descritas en el sección anterior."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:161
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:162
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4782,53 +4819,57 @@ msgstr ""
 "esto es, por ejemplo, que las claves nuevas se añaden a este fichero."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:175
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:177
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:178
 msgid "Local trust database of archive keys."
 msgstr "Base de datos local de las claves de confianza de archivos Debian"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:181
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:182
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Registro de las claves de confianza del archivo de Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:185
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
+#: apt-key.8.xml:186
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:195
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 de "
 "Agosto de 2009</date>"
@@ -4845,13 +4886,22 @@ msgstr "Marca o desmarca un paquete como instalado automáticamente"
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
 msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
 "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
 msgstr ""
 " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>nombre-de-fichero</replaceable></option></arg> <group choice="
@@ -4861,7 +4911,7 @@ msgstr ""
 "arg> <arg choice=\"plain\">showauto</arg> </group>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4870,7 +4920,7 @@ msgstr ""
 "o no."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4886,14 +4936,21 @@ msgstr ""
 "eliminará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
 msgstr "markauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
@@ -4902,14 +4959,19 @@ msgstr ""
 "paquete instalado manualmente dependa de este paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
@@ -4918,21 +4980,95 @@ msgstr ""
 "ningún otro depende de él."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
+"instalados automáticamente, un paquete por línea."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 "<literal>showauto</literal> se usa para mostrar una lista de paquetes "
 "instalados automáticamente, un paquete por línea."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
+"instalados automáticamente, un paquete por línea."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
@@ -4940,7 +5076,7 @@ msgstr ""
 "filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -4949,7 +5085,7 @@ msgstr ""
 "filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -4962,48 +5098,18 @@ msgstr ""
 "en el directorio definido en la opción de configuración: <literal>Dir::"
 "State</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Muestra un breve resumen de uso."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Muestra la versión del programa."
-
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -7892,32 +7998,50 @@ msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:107
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
-"filename> files are marked as \"NotAutomatic: yes\" like the debian "
-"experimental archive."
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
 msgstr ""
 "para las versiones procedentes de archivos que en sus ficheros "
 "<filename>Release</filename> están marcados como «NotAutomatic:yes», como en "
 "el archivo «experimental» de Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr "prioridad 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:113
-msgid "to the version that is already installed (if any)."
-msgstr "a la versión instalada (de existir)."
+#: apt_preferences.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
+msgstr ""
+"para las versiones procedentes de archivos que en sus ficheros "
+"<filename>Release</filename> están marcados como «NotAutomatic:yes», como en "
+"el archivo «experimental» de Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr "prioridad 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -7926,12 +8050,12 @@ msgstr ""
 "objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr "prioridad 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:127
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -7950,13 +8074,21 @@ msgstr ""
 "Asignar: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:132
+#, fuzzy
+#| msgid ""
+#| "If the target release has not been specified then APT simply assigns "
+#| "priority 100 to all installed package versions and priority 500 to all "
+#| "uninstalled package versions, expect versions coming from archives which "
+#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
+#| "yes\" - these versions get the priority 1."
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions, expect versions coming from archives which in "
+"uninstalled package versions, except versions coming from archives which in "
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
-"- these versions get the priority 1."
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 "Si no se especifica ninguna distribución objetivo APT asigna prioridad 100 a "
 "todas las versiones de los paquetes instalados y 500 a las versiones no "
@@ -7965,7 +8097,7 @@ msgstr ""
 "- estas versiones reciben la prioridad 1."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -7974,7 +8106,7 @@ msgstr ""
 "determinar qué versión del paquete debe instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7991,12 +8123,12 @@ msgstr ""
 "ser peligroso)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr "Instala la versión de mayor prioridad."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -8005,7 +8137,7 @@ msgstr ""
 "(esto es, la que tiene un número de versión mayor)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8016,7 +8148,7 @@ msgstr ""
 "<literal>--reinstall</literal>, se instalará la que no está instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:153
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -8031,7 +8163,7 @@ msgstr ""
 "command> o <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8045,7 +8177,7 @@ msgstr ""
 "upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8064,12 +8196,12 @@ msgstr ""
 "versión instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:174
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr "El efecto de las preferencias sobre APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8082,7 +8214,7 @@ msgstr ""
 "registros pueden tener una de estos dos formatos: el específico o el general."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8098,7 +8230,7 @@ msgstr ""
 "separados por espacios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8110,7 +8242,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8125,7 +8257,7 @@ msgstr ""
 "identificado por su nombre de dominio."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8136,7 +8268,7 @@ msgstr ""
 "prioridad alta a todas las versiones disponibles desde un sitio local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8148,7 +8280,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:216
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8162,7 +8294,7 @@ msgstr ""
 "debian.org»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:220
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8174,7 +8306,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:224
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -8189,7 +8321,7 @@ msgstr ""
 "sino el autor o el nombre del proveedor, tales como «Debian» o «Ximian»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8200,7 +8332,7 @@ msgstr ""
 "archivo de paquetes «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8212,7 +8344,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:238
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -8223,7 +8355,7 @@ msgstr ""
 "«<literal>&testing-codename;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8235,7 +8367,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:242
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8247,7 +8379,7 @@ msgstr ""
 "«<literal>3.0</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8259,17 +8391,84 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Those, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+#, fuzzy
+#| msgid "Packages"
+msgid "Package"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
 msgid "How APT Interprets Priorities"
 msgstr "¿Cómo interpreta APT las prioridades?"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:314
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:315
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8278,12 +8477,12 @@ msgstr ""
 "el sistema."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:319
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:320
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8292,12 +8491,12 @@ msgstr ""
 "que la versión instalada sea más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:325
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:278
+#: apt_preferences.5.xml:326
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8307,12 +8506,12 @@ msgstr ""
 "más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:331
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:284
+#: apt_preferences.5.xml:332
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8321,12 +8520,12 @@ msgstr ""
 "perteneciente a otra distribución, o si la versión instalada es más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:337
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:338
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8334,17 +8533,17 @@ msgstr ""
 "La versión sólo se instala si no hay ninguna versión del paquete instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:342
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:343
 msgid "prevents the version from being installed"
 msgstr "Evita la instalación de la versión."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:309
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8355,7 +8554,7 @@ msgstr ""
 "siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:348
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8369,7 +8568,7 @@ msgstr ""
 "versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:354
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8378,7 +8577,7 @@ msgstr ""
 "registros antes mencionados:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:358
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8406,12 +8605,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr "Por ello:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:373
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8426,7 +8625,7 @@ msgstr ""
 "la versión 5.8*, desactualizando el paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:378
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8437,7 +8636,7 @@ msgstr ""
 "versiones, incluso sobre los pertenecientes a la distribución objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:382
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8450,12 +8649,12 @@ msgstr ""
 "hay ninguna versión del paquete ya instalado."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:344
+#: apt_preferences.5.xml:392
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinar la versión del paquete y las propiedades de la distribución"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:394
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8466,27 +8665,27 @@ msgstr ""
 "describen los paquetes disponibles en cada uno de los sitios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:406
 msgid "the <literal>Package:</literal> line"
 msgstr "La línea <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:407
 msgid "gives the package name"
 msgstr "indica el nombre del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 msgid "the <literal>Version:</literal> line"
 msgstr "La línea <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:411
 msgid "gives the version number for the named package"
 msgstr "indica el número de versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:398
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8507,12 +8706,12 @@ msgstr ""
 "de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:427
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:380
+#: apt_preferences.5.xml:428
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8530,18 +8729,18 @@ msgstr ""
 "línea en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:438
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:396
+#: apt_preferences.5.xml:444
 msgid "the <literal>Codename:</literal> line"
 msgstr "La línea <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:445
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8560,13 +8759,13 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:454
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:461
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8582,7 +8781,7 @@ msgstr ""
 "siguientes línea en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:470
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8594,12 +8793,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:479
 msgid "the <literal>Component:</literal> line"
 msgstr "La línea <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:432
+#: apt_preferences.5.xml:480
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8618,18 +8817,18 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:489
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:495
 msgid "the <literal>Origin:</literal> line"
 msgstr "La línea <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:496
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8642,18 +8841,18 @@ msgstr ""
 "mediante la siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:502
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:460
+#: apt_preferences.5.xml:508
 msgid "the <literal>Label:</literal> line"
 msgstr "La línea <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:509
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8666,13 +8865,13 @@ msgstr ""
 "siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:515
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:416
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8695,7 +8894,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:522
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8720,12 +8919,12 @@ msgstr ""
 "la distribución «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:535
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Líneas opcionales en el registro de preferencias de APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:537
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8736,12 +8935,12 @@ msgstr ""
 "Útil para comentarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:546
 msgid "Tracking Stable"
 msgstr "Seguir la distribución «stable» (estable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:554
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8765,7 +8964,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:500
+#: apt_preferences.5.xml:548
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8780,8 +8979,8 @@ msgstr ""
 "<literal>Debian</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -8793,7 +8992,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:566
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -8807,13 +9006,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:583
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:529
+#: apt_preferences.5.xml:577
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8826,12 +9025,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:589
 msgid "Tracking Testing or Unstable"
 msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:598
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8859,7 +9058,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:591
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -8876,7 +9075,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:612
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -8889,13 +9088,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:584
+#: apt_preferences.5.xml:632
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:623
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -8914,12 +9113,12 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr "Seguir la evolución de una publicación por el nombre"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:605
+#: apt_preferences.5.xml:653
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8953,7 +9152,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:641
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8980,7 +9179,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:622
+#: apt_preferences.5.xml:670
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -8994,13 +9193,13 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:690
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:633
+#: apt_preferences.5.xml:681
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -9019,12 +9218,12 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:651
+#: apt_preferences.5.xml:699
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:657
+#: apt_preferences.5.xml:705
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -11048,6 +11247,43 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Ésto usará los archivos del disco previamente obtenidos."
 
+#~ msgid "<option>--md5</option>"
+#~ msgstr "<option>--md5</option>"
+
+#~ msgid ""
+#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
+#~ "index files will not have MD5Sum fields where possible.  Configuration "
+#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
+#~ msgstr ""
+#~ "Genera una suma de control MD5. Está activado de forma predeterminada, "
+#~ "cuando se desactiva los ficheros de índices generados no tendrán los "
+#~ "campos MD5Sum cuando sea posible. Opción de configuración: <literal>APT::"
+#~ "FTPArchive::MD5</literal>"
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#~ msgid "Show a short usage summary."
+#~ msgstr "Muestra un breve resumen de uso."
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#~ msgid "Show the program version."
+#~ msgstr "Muestra la versión del programa."
+
+#~ msgid "to the version that is already installed (if any)."
+#~ msgstr "a la versión instalada (de existir)."
+
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr ""
 #~ "Herramienta para la gestión de paquetes APT -- manipulador de la caché"
@@ -11107,8 +11343,12 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ "Usa HTTP para acceder al archivo de Debian en «nonus.debian.org», bajo el "
 #~ "directorio debian-non-US."
 
-#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
+#~ msgid ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
+#~ msgstr ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
 
 #~ msgid "OPTIONS"
 #~ msgstr "OPCIONES"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 33a118036..71cc73b45 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 "PO-Revision-Date: 2011-02-17 07:50+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -731,7 +731,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
@@ -1250,7 +1250,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
 msgid "options"
 msgstr "options"
@@ -1277,7 +1277,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1304,12 +1304,12 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1425,7 +1425,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1545,14 +1545,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Fichiers"
 
@@ -1563,9 +1563,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
 msgid "See Also"
 msgstr "Voir aussi"
@@ -1577,8 +1577,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
@@ -1707,12 +1707,12 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:158
 msgid "Options"
 msgstr "Options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -1969,7 +1969,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Affiche seulement le contenu de l'espace de configuration."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3120,28 +3120,49 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
-msgstr "<option>--md5</option>"
+msgid ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
-msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
+msgid ""
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
 msgstr ""
-"Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand "
-"elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où "
-"c'est possible. Élément de configuration : <literal>APT::FTPArchive::MD5</"
-"literal>."
+"La valeur des autres champs de métadonnées du fichier Release sont tirées de "
+"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, "
+"p. ex. <literal>APT::FTPArchive::Release::Origin</literal>.  Les champs "
+"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, "
+"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3151,7 +3172,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3166,12 +3187,12 @@ msgstr ""
 "configuration : <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3185,12 +3206,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3206,12 +3227,12 @@ msgstr ""
 "de configuration : <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3222,12 +3243,12 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3236,12 +3257,12 @@ msgstr ""
 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3255,12 +3276,12 @@ msgstr ""
 "<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3283,12 +3304,12 @@ msgstr ""
 "survenir et l'ensemble de ces contrôles devient inutile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3304,19 +3325,19 @@ msgstr ""
 "generate."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3325,7 +3346,7 @@ msgstr ""
 "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4688,8 +4709,24 @@ msgstr ""
 "Mettre à jour le trousseau de clés local avec le trousseau de clés de "
 "l'archive Debian et supprimer les clés qui y sont périmées."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:140
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
+msgid ""
+"Update the local keyring with the keys of a key server and removes from the "
+"keyring the archive keys which are no longer valid. This requires an "
+"installed wget and an APT build configured to have a server to fetch from. "
+"APT in Debian does not support this command, but Ubuntu's APT does."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:159
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4698,12 +4735,12 @@ msgstr ""
 "décrites dans la section suivante."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:161
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr "--keyring <replaceable>fichier</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:162
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4720,53 +4757,57 @@ msgstr ""
 "les nouvelles clés y seront ajoutées."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:175
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:177
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:178
 msgid "Local trust database of archive keys."
 msgstr "Base de données locale de fiabilité des clés de l'archive."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:181
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:182
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Trousseau des clés fiables de l'archive Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:185
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
+#: apt-key.8.xml:186
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:195
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
 "août 2009</date>"
@@ -4783,13 +4824,22 @@ msgstr "Indiquer si un paquet a été installé automatiquement ou non"
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
 msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
 "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
 msgstr ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain\"> "
@@ -4799,7 +4849,7 @@ msgstr ""
 "arg> <arg choice=\"plain\">showauto</arg> </group>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4808,7 +4858,7 @@ msgstr ""
 "a été automatiquement installé ou pas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4824,14 +4874,21 @@ msgstr ""
 "command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
 msgstr "markauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
@@ -4840,14 +4897,19 @@ msgstr ""
 "que plus aucun paquet installé manuellement ne dépend de lui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
@@ -4856,28 +4918,102 @@ msgstr ""
 "aucun autre paquet n'en dépend."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
+"un paquet par ligne."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 "<literal>showauto</literal>, affiche les paquets installés automatiquement, "
 "un paquet par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
+"un paquet par ligne."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -4886,7 +5022,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -4898,48 +5034,18 @@ msgstr ""
 "par défaut (<filename>extended_status</filename> dans le répertoire défini "
 "par l'élément de configuration <literal>Dir::State</literal>)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Affiche un résumé de l'aide"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Affiche la version du programme."
-
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -7818,32 +7924,50 @@ msgstr "priorité 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:107
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
-"filename> files are marked as \"NotAutomatic: yes\" like the debian "
-"experimental archive."
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
 msgstr ""
 "pour les versions issues d'archives dont le fichier <filename>Release</"
 "filename> comporte la mention « NotAutomatic: yes » comme, par exemple, "
 "l'archive « experimental » de Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr "une priorité égale à 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:113
-msgid "to the version that is already installed (if any)."
-msgstr "est affectée à la version déjà installée (si elle existe)."
+#: apt_preferences.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
+msgstr ""
+"pour les versions issues d'archives dont le fichier <filename>Release</"
+"filename> comporte la mention « NotAutomatic: yes » comme, par exemple, "
+"l'archive « experimental » de Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr "une priorité égale à 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -7852,12 +7976,12 @@ msgstr ""
 "pas à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr "une priorité égale à 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:127
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -7876,13 +8000,21 @@ msgstr ""
 "type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:132
+#, fuzzy
+#| msgid ""
+#| "If the target release has not been specified then APT simply assigns "
+#| "priority 100 to all installed package versions and priority 500 to all "
+#| "uninstalled package versions, expect versions coming from archives which "
+#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
+#| "yes\" - these versions get the priority 1."
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions, expect versions coming from archives which in "
+"uninstalled package versions, except versions coming from archives which in "
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
-"- these versions get the priority 1."
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 "Quand aucune distribution par défaut n'a été indiquée, APT affecte "
 "simplement une priorité égale à 100 à toute version installée d'un paquet et "
@@ -7892,7 +8024,7 @@ msgstr ""
 "priorité égale à 1."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -7901,7 +8033,7 @@ msgstr ""
 "qu'il faut installer (par ordre de priorité) :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7917,12 +8049,12 @@ msgstr ""
 "arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr "Installer la version qui possède la priorité la plus haute."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -7931,7 +8063,7 @@ msgstr ""
 "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7943,7 +8075,7 @@ msgstr ""
 "qui n'est pas installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:153
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -7958,7 +8090,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get dist-upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -7971,7 +8103,7 @@ msgstr ""
 "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -7990,12 +8122,12 @@ msgstr ""
 "priorité que celle de la version installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:174
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr "Conséquences des préférences"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8008,7 +8140,7 @@ msgstr ""
 "formes, une forme particulière et une forme générale."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8023,7 +8155,7 @@ msgstr ""
 "dont le numéro de version commence par <literal>5.8</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8035,7 +8167,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8050,7 +8182,7 @@ msgstr ""
 "un nom complètement qualifié."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8061,7 +8193,7 @@ msgstr ""
 "priorité haute à toutes les versions disponibles dans le site local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8073,7 +8205,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:216
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8086,7 +8218,7 @@ msgstr ""
 "serveur identifié par l' nom d'hôte « ftp.de.debian.org »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:220
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8098,7 +8230,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:224
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -8113,7 +8245,7 @@ msgstr ""
 "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8124,7 +8256,7 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8136,7 +8268,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:238
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -8147,7 +8279,7 @@ msgstr ""
 "<literal>&testing-codename;</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8159,7 +8291,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:242
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8171,7 +8303,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8183,17 +8315,84 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Those, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+#, fuzzy
+#| msgid "Packages"
+msgid "Package"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
 msgid "How APT Interprets Priorities"
 msgstr "Méthode d'interprétation des priorités par APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:314
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:315
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8202,12 +8401,12 @@ msgstr ""
 "retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:319
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:320
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8217,12 +8416,12 @@ msgstr ""
 "plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:325
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:278
+#: apt_preferences.5.xml:326
 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"
@@ -8231,12 +8430,12 @@ msgstr ""
 "distribution par défaut ou si la version installée est plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:331
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:284
+#: apt_preferences.5.xml:332
 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"
@@ -8245,29 +8444,29 @@ msgstr ""
 "autre distribution ou si la version installée est plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:337
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:338
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr "la version sera installée si aucune version du paquet n'est installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:342
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:343
 msgid "prevents the version from being installed"
 msgstr "cette priorité empêche l'installation de la version."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:309
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8278,7 +8477,7 @@ msgstr ""
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:348
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8292,7 +8491,7 @@ msgstr ""
 "trouvée détermine la priorité."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:354
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8301,7 +8500,7 @@ msgstr ""
 "entrées décrites ci-dessous :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:358
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8329,12 +8528,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr "Alors :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:373
 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 "
@@ -8348,7 +8547,7 @@ msgstr ""
 "installée est une version 5.9*, il y aura un retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:378
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8359,7 +8558,7 @@ msgstr ""
 "appartenant à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:382
 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</"
@@ -8372,13 +8571,13 @@ msgstr ""
 "paquet n'est déjà installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:344
+#: apt_preferences.5.xml:392
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 "Détermination de la version des paquets et des propriétés des distributions"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:394
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8389,27 +8588,27 @@ msgstr ""
 "décrivent les paquets disponibles à cet endroit."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:406
 msgid "the <literal>Package:</literal> line"
 msgstr "la ligne <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:407
 msgid "gives the package name"
 msgstr "donne le nom du paquet"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 msgid "the <literal>Version:</literal> line"
 msgstr "la ligne <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:411
 msgid "gives the version number for the named package"
 msgstr "donne le numéro de version du paquet"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:398
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8430,12 +8629,12 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:427
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:380
+#: apt_preferences.5.xml:428
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8452,18 +8651,18 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:438
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:396
+#: apt_preferences.5.xml:444
 msgid "the <literal>Codename:</literal> line"
 msgstr "la ligne <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:445
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8481,13 +8680,13 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:454
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:461
 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 "
@@ -8503,7 +8702,7 @@ msgstr ""
 "préférences demanderait ces lignes :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:470
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8515,12 +8714,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:479
 msgid "the <literal>Component:</literal> line"
 msgstr "La ligne <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:432
+#: apt_preferences.5.xml:480
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8538,18 +8737,18 @@ msgstr ""
 "fichier des préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:489
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:495
 msgid "the <literal>Origin:</literal> line"
 msgstr "La ligne <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:496
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8562,18 +8761,18 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:502
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:460
+#: apt_preferences.5.xml:508
 msgid "the <literal>Label:</literal> line"
 msgstr "La ligne <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:509
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8586,13 +8785,13 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:515
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:416
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8616,7 +8815,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:522
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8641,12 +8840,12 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:535
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Lignes facultatives dans le fichier des préférences"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:537
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8657,12 +8856,12 @@ msgstr ""
 "commentaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:546
 msgid "Tracking Stable"
 msgstr "Méthode pour suivre Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:554
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8686,7 +8885,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:500
+#: apt_preferences.5.xml:548
 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 "
@@ -8701,8 +8900,8 @@ msgstr ""
 "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -8714,7 +8913,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:566
 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 "
@@ -8727,13 +8926,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:583
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:529
+#: apt_preferences.5.xml:577
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8746,12 +8945,12 @@ msgstr ""
 "de relancer la commande.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:589
 msgid "Tracking Testing or Unstable"
 msgstr "Méthode pour suivre Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:598
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8779,7 +8978,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:591
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -8796,7 +8995,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:612
 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 "
@@ -8809,13 +9008,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:584
+#: apt_preferences.5.xml:632
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:623
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -8834,12 +9033,12 @@ msgstr ""
 "installée.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr "Suivre l'évolution d'une version par son nom de code"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:605
+#: apt_preferences.5.xml:653
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8873,7 +9072,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:641
 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 "
@@ -8897,7 +9096,7 @@ msgstr ""
 "exemples précédents.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:622
+#: apt_preferences.5.xml:670
 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 "
@@ -8910,13 +9109,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:690
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:633
+#: apt_preferences.5.xml:681
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -8935,12 +9134,12 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:651
+#: apt_preferences.5.xml:699
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:657
+#: apt_preferences.5.xml:705
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -10986,6 +11185,43 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
+#~ msgid "<option>--md5</option>"
+#~ msgstr "<option>--md5</option>"
+
+#~ msgid ""
+#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
+#~ "index files will not have MD5Sum fields where possible.  Configuration "
+#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
+#~ msgstr ""
+#~ "Créer la somme de contrôle MD5. Cette option est activée par défaut. "
+#~ "Quand elle est désactivée, les fichiers d'index n'ont pas les champs "
+#~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::"
+#~ "FTPArchive::MD5</literal>."
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#~ msgid "Show a short usage summary."
+#~ msgstr "Affiche un résumé de l'aide"
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#~ msgid "Show the program version."
+#~ msgstr "Affiche la version du programme."
+
+#~ msgid "to the version that is already installed (if any)."
+#~ msgstr "est affectée à la version déjà installée (si elle existe)."
+
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "Gestionnaire de paquets APT - manipulation du cache"
 
diff --git a/doc/po/it.po b/doc/po/it.po
index 94cc9bb76..f109d98f9 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -532,7 +532,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
@@ -910,7 +910,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
 msgid "options"
 msgstr ""
@@ -934,7 +934,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr ""
@@ -955,12 +955,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1059,7 +1059,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
 msgid "<option>-a</option>"
 msgstr ""
 
@@ -1155,14 +1155,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
 msgid "Files"
 msgstr ""
 
@@ -1173,9 +1173,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
 msgid "See Also"
 msgstr ""
@@ -1187,8 +1187,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr ""
 
@@ -1287,12 +1287,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:158
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1496,7 +1496,7 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr ""
@@ -2407,31 +2407,38 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
+msgid ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
 msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2440,12 +2447,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2454,12 +2461,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2469,12 +2476,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2482,24 +2489,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2508,12 +2515,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2527,12 +2534,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2542,26 +2549,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3579,20 +3586,35 @@ msgid ""
 "from the keyring the archive keys which are no longer valid."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:140
+#, fuzzy
+msgid "net-update"
+msgstr "upgrade"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
+msgid ""
+"Update the local keyring with the keys of a key server and removes from the "
+"keyring the archive keys which are no longer valid. This requires an "
+"installed wget and an APT build configured to have a server to fetch from. "
+"APT in Debian does not support this command, but Ubuntu's APT does."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:159
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:161
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:162
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -3603,43 +3625,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:175
 msgid "&file-trustedgpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:177
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:178
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:181
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:182
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:185
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
+#: apt-key.8.xml:186
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:195
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
@@ -3647,8 +3669,8 @@ msgstr ""
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
@@ -3667,20 +3689,21 @@ msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
 "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3690,107 +3713,131 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+msgid "auto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
-msgid "showauto"
+#: apt-mark.8.xml:85
+msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:86
 msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:96
 msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+#: apt-mark.8.xml:101
+msgid "showauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:102
 msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
+#: apt-mark.8.xml:109
+msgid "showmanual"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
+#: apt-mark.8.xml:116
+msgid "showhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
+#: apt-mark.8.xml:117
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
+#: apt-mark.8.xml:130
+msgid ""
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
+#: apt-mark.8.xml:131
+msgid ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
+#: apt-mark.8.xml:134
+msgid ""
+"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
+"filename> instead of the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
 msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5833,39 +5880,44 @@ msgstr ""
 #: apt_preferences.5.xml:107
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
-"filename> files are marked as \"NotAutomatic: yes\" like the debian "
-"experimental archive."
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:113
-msgid "to the version that is already installed (if any)."
+#: apt_preferences.5.xml:114
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:127
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -5879,24 +5931,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:132
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions, expect versions coming from archives which in "
+"uninstalled package versions, except versions coming from archives which in "
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
-"- these versions get the priority 1."
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5906,19 +5959,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5926,7 +5979,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:153
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5936,7 +5989,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5945,7 +5998,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5957,12 +6010,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:174
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5971,7 +6024,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -5981,7 +6034,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5990,7 +6043,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -6000,7 +6053,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -6008,7 +6061,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6017,7 +6070,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:216
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -6026,7 +6079,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:220
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6035,7 +6088,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:224
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -6045,7 +6098,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -6053,7 +6106,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6062,7 +6115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:238
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -6070,7 +6123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6079,7 +6132,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:242
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6087,7 +6140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6096,82 +6149,133 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Those, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:314
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:315
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:319
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:320
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:325
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:278
+#: apt_preferences.5.xml:326
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:331
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:284
+#: apt_preferences.5.xml:332
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:337
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:338
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:342
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:343
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:309
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -6179,7 +6283,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:348
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6188,14 +6292,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:354
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:358
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6212,12 +6316,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:373
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6227,7 +6331,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:378
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6235,7 +6339,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:382
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6244,12 +6348,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:344
+#: apt_preferences.5.xml:392
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:394
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6257,27 +6361,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:406
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:407
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:411
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:398
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6290,12 +6394,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:427
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:380
+#: apt_preferences.5.xml:428
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6306,18 +6410,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:438
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:396
+#: apt_preferences.5.xml:444
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:445
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6328,13 +6432,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:454
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:461
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -6344,7 +6448,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:470
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6353,12 +6457,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:479
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:432
+#: apt_preferences.5.xml:480
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6369,18 +6473,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:489
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:495
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:496
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6389,18 +6493,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:502
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:460
+#: apt_preferences.5.xml:508
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:509
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6409,13 +6513,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:515
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:416
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6429,7 +6533,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:522
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6444,12 +6548,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:535
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:537
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6457,12 +6561,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:546
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:554
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6477,7 +6581,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:500
+#: apt_preferences.5.xml:548
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6487,8 +6591,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6497,7 +6601,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:566
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6506,13 +6610,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:583
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:529
+#: apt_preferences.5.xml:577
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6521,12 +6625,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:589
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:598
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6543,7 +6647,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:591
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6554,7 +6658,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:612
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6563,13 +6667,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:584
+#: apt_preferences.5.xml:632
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:623
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6581,12 +6685,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:605
+#: apt_preferences.5.xml:653
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6606,7 +6710,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:641
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6621,7 +6725,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:622
+#: apt_preferences.5.xml:670
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6630,13 +6734,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:690
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:633
+#: apt_preferences.5.xml:681
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6648,12 +6752,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:651
+#: apt_preferences.5.xml:699
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:657
+#: apt_preferences.5.xml:705
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 3a0db1bbf..839242cc8 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -792,7 +792,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
@@ -1329,7 +1329,7 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
 msgid "options"
 msgstr "オプション"
@@ -1357,7 +1357,7 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1384,12 +1384,12 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1505,7 +1505,7 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1627,15 +1627,15 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "ファイル"
 
@@ -1647,9 +1647,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
 msgid "See Also"
 msgstr "関連項目"
@@ -1663,8 +1663,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "診断メッセージ"
 
@@ -1800,12 +1800,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:158
 msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2075,7 +2075,7 @@ msgstr "設定箇所�内容を表示�る����。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3286,29 +3286,49 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
-msgstr "<option>--md5</option>"
+msgid ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
+msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
-msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
+msgid ""
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
 msgstr ""
-"MD5 sum を生����。デフォルト� on �����り�off ��る�生���イン"
-"デックスファイル� MD5Sum フィールド��り��ん。設定項目 - <literal>APT::"
-"FTPArchive::MD5</literal>"
+"Release ファイル�追加メタデータフィールド�値��<literal>APT::FTPArchive::"
+"Release</literal> 以下�相当�る値 (例: <literal>APT::FTPArchive::Release::"
+"Origin</literal>) を�り��。サ�ート�るフィールド��<literal>Origin</"
+"literal>, <literal>Label</literal>, <literal>Suite</literal>, "
+"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
+"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal>, <literal>Description</literal> ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3318,7 +3338,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3331,13 +3351,13 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3350,13 +3370,13 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3371,13 +3391,13 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3387,13 +3407,13 @@ msgstr ""
 "�択���。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3402,13 +3422,13 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
 #, fuzzy
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
@@ -3422,12 +3442,12 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3441,12 +3461,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
 #, fuzzy
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
@@ -3462,14 +3482,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para><programlisting>
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
@@ -3478,7 +3498,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3488,7 +3508,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4864,8 +4884,24 @@ msgstr ""
 "Debian アーカイブキー��ローカルキーリングを更新��も�有効���キーをキー"
 "リング�ら削除���。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:140
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
+msgid ""
+"Update the local keyring with the keys of a key server and removes from the "
+"keyring the archive keys which are no longer valid. This requires an "
+"installed wget and an APT build configured to have a server to fetch from. "
+"APT in Debian does not support this command, but Ubuntu's APT does."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:159
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4875,12 +4911,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:161
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr "--keyring <replaceable>filename</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:162
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4896,35 +4932,35 @@ msgstr ""
 "加�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:175
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:177
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:178
 msgid "Local trust database of archive keys."
 msgstr "アーカイブキー�ローカル信頼データベース��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:181
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:182
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Debian アーカイブ信頼キー�キーリング��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:185
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
@@ -4932,22 +4968,26 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
+#: apt-key.8.xml:186
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "削除�れ� Debian アーカイブ信頼キー�キーリング��。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:195
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
 "August 2009</date>"
@@ -4967,13 +5007,22 @@ msgstr "パッケージ�自動的�インストール�れ������
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
 msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
 "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
 msgstr ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -4984,7 +5033,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4994,7 +5043,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5009,15 +5058,22 @@ msgstr ""
 "command> や <command>aptitude</command> �より削除�れ��。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
 msgstr "markauto"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
@@ -5026,15 +5082,20 @@ msgstr ""
 "���る����パッケージを削除���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
@@ -5043,29 +5104,105 @@ msgstr ""
 "ケージを自動的�削除�る�を防���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> ��自動的�インストール�れ�パッケージを�パッ"
+"ケージ���改行��表示���。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
 msgid "showauto"
 msgstr "showauto"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 "<literal>showauto</literal> ��自動的�インストール�れ�パッケージを�パッ"
 "ケージ���改行��表示���。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> ��自動的�インストール�れ�パッケージを�パッ"
+"ケージ���改行��表示���。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -5075,7 +5212,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -5086,52 +5223,20 @@ msgstr ""
 "トリ� <filename>extended_status</filename>) �代���<filename>FILENAME</"
 "filename> �らパッケージ�統計を読�書����。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "短�使用方法を表示���。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "プログラム��ージョン情報を表示���"
-
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -7854,31 +7959,35 @@ msgstr "priority 1"
 #: apt_preferences.5.xml:107
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
-"filename> files are marked as \"NotAutomatic: yes\" like the debian "
-"experimental archive."
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
 msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr "priority 100"
 
-# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:113
-msgid "to the version that is already installed (if any)."
-msgstr "(�る�ら�) 既�インストール�れ��る�ージョン。"
+#: apt_preferences.5.xml:114
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
+msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr "priority 500"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -7886,13 +7995,13 @@ msgstr "インストール�れ��ら��ターゲットリリース��
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr "priority 990"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:127
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr "インストール�れ��ら��ターゲットリリース���れる�ージョン。"
@@ -7911,14 +8020,15 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:132
 #, fuzzy
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions, expect versions coming from archives which in "
+"uninstalled package versions, except versions coming from archives which in "
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
-"- these versions get the priority 1."
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 "ターゲットリリース�指定�れ����れ��APT ��純�インストール���る"
 "パッケージ��ージョン�� 100 を�インストール�����パッケージ��ージョ"
@@ -7926,7 +8036,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -7936,7 +8046,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7952,13 +8062,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr "最も高�優先度��ージョンをインストール���。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -7968,7 +8078,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7980,7 +8090,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:153
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -7996,7 +8106,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8010,7 +8120,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8030,13 +8140,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:174
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr "APT 設定�効果"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8049,7 +8159,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8064,7 +8174,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8078,7 +8188,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8093,7 +8203,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8105,7 +8215,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8118,7 +8228,7 @@ msgstr ""
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:216
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8128,7 +8238,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:220
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8141,7 +8251,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:224
 #, fuzzy
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
@@ -8158,7 +8268,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8169,7 +8279,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8183,7 +8293,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:238
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
@@ -8195,7 +8305,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8208,7 +8318,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:242
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8220,7 +8330,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8232,20 +8342,92 @@ msgstr ""
 "Pin-Priority: 500\n"
 "\n"
 
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+"\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Those, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+"\n"
+
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+#, fuzzy
+#| msgid "Packages"
+msgid "Package"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:306
 msgid "How APT Interprets Priorities"
 msgstr "APT �優先度�割り込む方法"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:314
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:315
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8253,13 +8435,13 @@ msgstr ""
 "パッケージ�ダウングレード��も����ージョン�パッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:319
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:320
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8268,13 +8450,13 @@ msgstr ""
 "��れ���も����ージョン�パッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:325
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:278
+#: apt_preferences.5.xml:326
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8283,13 +8465,13 @@ msgstr ""
 "ジョン�方�新������れ�����ージョン�パッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:331
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:284
+#: apt_preferences.5.xml:332
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8299,13 +8481,13 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:337
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:338
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8314,19 +8496,19 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:342
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:343
 msgid "prevents the version from being installed"
 msgstr "���ージョン�インストール�止"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:309
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8338,7 +8520,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:348
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8352,7 +8534,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:354
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8362,7 +8544,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:358
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8392,13 +8574,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr "�る��以下�よ��動作���。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:373
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8413,7 +8595,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:378
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8425,7 +8607,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:382
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8439,13 +8621,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:344
+#: apt_preferences.5.xml:392
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "パッケージ��ージョン�ディストリビューションプロパティ�決定"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:394
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8456,30 +8638,30 @@ msgstr ""
 "filename> ファイルを�供���。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:406
 msgid "the <literal>Package:</literal> line"
 msgstr "<literal>Package:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:407
 msgid "gives the package name"
 msgstr "パッケージ�"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 msgid "the <literal>Version:</literal> line"
 msgstr "<literal>Version:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:411
 msgid "gives the version number for the named package"
 msgstr "�����パッケージ��ージョン番�"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:398
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8499,13 +8681,13 @@ msgstr ""
 "type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:427
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:380
+#: apt_preferences.5.xml:428
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8522,19 +8704,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:438
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:396
+#: apt_preferences.5.xml:444
 msgid "the <literal>Codename:</literal> line"
 msgstr "<literal>Codename:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:445
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
@@ -8552,14 +8734,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:454
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:461
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8575,7 +8757,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:470
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8588,13 +8770,13 @@ msgstr ""
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:479
 msgid "the <literal>Component:</literal> line"
 msgstr "<literal>Component:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:432
+#: apt_preferences.5.xml:480
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8612,19 +8794,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:489
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:495
 msgid "the <literal>Origin:</literal> line"
 msgstr "<literal>Origin:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:496
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8637,7 +8819,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:502
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
@@ -8645,13 +8827,13 @@ msgstr ""
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:460
+#: apt_preferences.5.xml:508
 msgid "the <literal>Label:</literal> line"
 msgstr "<literal>Label:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:509
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8664,7 +8846,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:515
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
@@ -8673,7 +8855,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:416
 #, fuzzy
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
@@ -8697,7 +8879,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:522
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8723,13 +8905,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:535
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "APT 設定レコード�オプション行"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:537
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8740,13 +8922,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:546
 msgid "Tracking Stable"
 msgstr "安定版�追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:554
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8772,7 +8954,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:500
+#: apt_preferences.5.xml:548
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8788,8 +8970,8 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -8802,7 +8984,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:566
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -8815,14 +8997,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:583
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:529
+#: apt_preferences.5.xml:577
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8836,13 +9018,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:589
 msgid "Tracking Testing or Unstable"
 msgstr "テスト版や�安定版�追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:598
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8871,7 +9053,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:591
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -8889,7 +9071,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:612
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -8902,14 +9084,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:584
+#: apt_preferences.5.xml:632
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:623
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -8928,13 +9110,13 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr "コード�リリース�進化�追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:605
+#: apt_preferences.5.xml:653
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8968,7 +9150,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:641
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8992,7 +9174,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:622
+#: apt_preferences.5.xml:670
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9005,14 +9187,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:690
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:633
+#: apt_preferences.5.xml:681
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -9032,13 +9214,13 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:651
+#: apt_preferences.5.xml:699
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:657
+#: apt_preferences.5.xml:705
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -10742,6 +10924,46 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "�れ��disc ��る�得済��アーカイブを使用�るよ���り��。"
 
+#~ msgid "<option>--md5</option>"
+#~ msgstr "<option>--md5</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
+#~ "index files will not have MD5Sum fields where possible.  Configuration "
+#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
+#~ msgstr ""
+#~ "MD5 sum を生����。デフォルト� on �����り�off ��る�生���イ"
+#~ "ンデックスファイル� MD5Sum フィールド��り��ん。設定項目 - "
+#~ "<literal>APT::FTPArchive::MD5</literal>"
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Show a short usage summary."
+#~ msgstr "短�使用方法を表示���。"
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Show the program version."
+#~ msgstr "プログラム��ージョン情報を表示���"
+
+# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#~ msgid "to the version that is already installed (if any)."
+#~ msgstr "(�る�ら�) 既�インストール�れ��る�ージョン。"
+
 # type: Content of: <refentry><refnamediv><refpurpose>
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "APT パッケージ�作ユーティリティ -- キャッシュ�作ツール"
@@ -10803,8 +11025,12 @@ msgstr "ã�“ã‚Œã�§ã€�disc ã�«ã�‚ã‚‹å�–得済ã�¿ã�®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–を使用ã�™ã‚‹ã
 #~ "nonus.debian.org �アーカイブ� HTTP アクセス��debian-non-US ディレクト"
 #~ "リ以下を使用���。"
 
-#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
+#~ msgid ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
+#~ msgstr ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
 
 # type: SH
 #~ msgid "OPTIONS"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 7c98ac229..eae5c89c3 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 "PO-Revision-Date: 2010-03-18 22:00+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -788,7 +788,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
 msgid "options"
 msgstr "opcje"
@@ -1363,7 +1363,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1391,12 +1391,12 @@ msgstr ""
 "Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1534,7 +1534,7 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1660,14 +1660,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Pliki"
 
@@ -1678,9 +1678,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
 msgid "See Also"
 msgstr "Zobacz także"
@@ -1693,8 +1693,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnostyka"
 
@@ -1837,12 +1837,12 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:158
 msgid "Options"
 msgstr "Opcje"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2105,7 +2105,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Wyświetla zawartość przestrzeni konfiguracji."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3094,25 +3094,32 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
-msgstr "<option>--md5</option>"
+msgid ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
 msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
 #, fuzzy
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
@@ -3123,7 +3130,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3137,13 +3144,13 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
 #, fuzzy
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -3157,12 +3164,12 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3172,13 +3179,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
 #, fuzzy
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
@@ -3190,13 +3197,13 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
 #, fuzzy
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
@@ -3206,14 +3213,14 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
 #, fuzzy
 #| msgid "<option>-a</option>"
 msgid "<option>--arch</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3233,13 +3240,13 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
 #, fuzzy
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3253,13 +3260,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
 #, fuzzy
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3269,19 +3276,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3289,7 +3296,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4746,8 +4753,24 @@ msgstr ""
 "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum "
 "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów Debiana."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:140
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
+msgid ""
+"Update the local keyring with the keys of a key server and removes from the "
+"keyring the archive keys which are no longer valid. This requires an "
+"installed wget and an APT build configured to have a server to fetch from. "
+"APT in Debian does not support this command, but Ubuntu's APT does."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:159
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4756,12 +4779,12 @@ msgstr ""
 "opisanymi w poprzednim rozdziale."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:161
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:162
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4777,53 +4800,57 @@ msgstr ""
 "kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:175
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:177
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:178
 msgid "Local trust database of archive keys."
 msgstr "Lokalna składnica zaufanych kluczy archiwum."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:181
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:182
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Składnica zaufanych kluczy archiwum Debiana."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:185
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
+#: apt-key.8.xml:186
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:195
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;        "
 "<date>9 sierpnia 2009</date>"
@@ -4840,13 +4867,22 @@ msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
 msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
 "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
 msgstr ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> <group choice=\"plain"
@@ -4856,7 +4892,7 @@ msgstr ""
 "arg> <arg choice=\"plain\">showauto</arg> </group>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4865,7 +4901,7 @@ msgstr ""
 "zainstalowany automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4881,14 +4917,21 @@ msgstr ""
 "get</command> lub <command>aptitude</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
 msgstr "markauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
@@ -4897,14 +4940,19 @@ msgstr ""
 "żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
@@ -4913,22 +4961,98 @@ msgstr ""
 "sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> jest używane do wypisania listy wszystkich "
+"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
+"osobnej linii."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 "<literal>showauto</literal> jest używane do wypisania listy wszystkich "
 "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
 "osobnej linii."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> jest używane do wypisania listy wszystkich "
+"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
+"osobnej linii."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
@@ -4936,7 +5060,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -4945,7 +5069,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -4957,51 +5081,19 @@ msgstr ""
 "domyślny plik <filename>extended_status</filename> znajdujący się w katalogu "
 "określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Wyświetla krótkie informacje na temat użytkowania."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Wyświetla wersję programu."
-
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
 msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -7100,39 +7192,44 @@ msgstr "priorytet 100"
 #: apt_preferences.5.xml:107
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
-"filename> files are marked as \"NotAutomatic: yes\" like the debian "
-"experimental archive."
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr "priorytet 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:113
-msgid "to the version that is already installed (if any)."
+#: apt_preferences.5.xml:114
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr "priorytet 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr "priorytet 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:127
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -7146,24 +7243,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:132
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions, expect versions coming from archives which in "
+"uninstalled package versions, except versions coming from archives which in "
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
-"- these versions get the priority 1."
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7173,19 +7271,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7193,7 +7291,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:153
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -7203,7 +7301,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -7212,7 +7310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -7224,12 +7322,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:174
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -7238,7 +7336,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -7248,7 +7346,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -7260,7 +7358,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -7270,7 +7368,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -7278,7 +7376,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -7290,7 +7388,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:216
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -7299,7 +7397,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:220
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
@@ -7315,7 +7413,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:224
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -7325,7 +7423,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -7333,7 +7431,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -7345,7 +7443,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:238
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -7353,7 +7451,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:242
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
@@ -7369,7 +7467,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:242
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -7377,7 +7475,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -7389,17 +7487,82 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Those, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:314
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:315
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -7409,12 +7572,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:319
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:320
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -7424,12 +7587,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:325
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:278
+#: apt_preferences.5.xml:326
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -7439,12 +7602,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:331
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:284
+#: apt_preferences.5.xml:332
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -7454,12 +7617,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:337
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:338
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -7468,17 +7631,17 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:342
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:343
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:309
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -7486,7 +7649,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:348
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -7495,14 +7658,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:354
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:358
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -7530,12 +7693,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr "Wtedy:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:373
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -7545,7 +7708,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:378
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -7553,7 +7716,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:382
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -7562,12 +7725,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:344
+#: apt_preferences.5.xml:392
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:394
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -7575,27 +7738,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:406
 msgid "the <literal>Package:</literal> line"
 msgstr "linia <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:407
 msgid "gives the package name"
 msgstr "podaje nazwÄ™ pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 msgid "the <literal>Version:</literal> line"
 msgstr "linia <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:411
 msgid "gives the version number for the named package"
 msgstr "podaje numer wersji danego pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:398
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -7608,12 +7771,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:427
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:380
+#: apt_preferences.5.xml:428
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -7624,18 +7787,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:438
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:396
+#: apt_preferences.5.xml:444
 msgid "the <literal>Codename:</literal> line"
 msgstr "linia <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:445
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -7646,14 +7809,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:454
 #, fuzzy, no-wrap
 #| msgid "Pin: release a=stable\n"
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:461
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -7663,7 +7826,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:470
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -7675,12 +7838,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:479
 msgid "the <literal>Component:</literal> line"
 msgstr "linia <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:432
+#: apt_preferences.5.xml:480
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -7691,18 +7854,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:489
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:495
 msgid "the <literal>Origin:</literal> line"
 msgstr "linia <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:496
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -7711,18 +7874,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:502
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:460
+#: apt_preferences.5.xml:508
 msgid "the <literal>Label:</literal> line"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:509
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -7731,13 +7894,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:515
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:416
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -7751,7 +7914,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:522
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -7766,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:535
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:537
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -7779,12 +7942,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:546
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:554
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7808,7 +7971,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:500
+#: apt_preferences.5.xml:548
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -7818,8 +7981,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -7831,7 +7994,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:566
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -7840,13 +8003,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:583
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:529
+#: apt_preferences.5.xml:577
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -7855,12 +8018,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:589
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:598
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -7888,7 +8051,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:591
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -7899,7 +8062,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:612
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -7908,13 +8071,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:584
+#: apt_preferences.5.xml:632
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:623
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -7926,12 +8089,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:605
+#: apt_preferences.5.xml:653
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7965,7 +8128,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:641
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -7980,7 +8143,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:622
+#: apt_preferences.5.xml:670
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -7989,13 +8152,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:690
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:633
+#: apt_preferences.5.xml:681
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -8007,12 +8170,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:651
+#: apt_preferences.5.xml:699
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:657
+#: apt_preferences.5.xml:705
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -10054,6 +10217,32 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#~ msgid "<option>--md5</option>"
+#~ msgstr "<option>--md5</option>"
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#
+#~ msgid "Show a short usage summary."
+#~ msgstr "Wyświetla krótkie informacje na temat użytkowania."
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#
+#~ msgid "Show the program version."
+#~ msgstr "Wyświetla wersję programu."
+
 #
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
@@ -10085,8 +10274,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "Użycie HTTP do uzyskania dostępu do archiwum na komputerze  nonus.debian."
 #~ "org, w katalogu debian-non-US."
 
-#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
+#~ msgid ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
+#~ msgstr ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
 
 #~ msgid "OPTIONS"
 #~ msgstr "OPCJE"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index ca1252475..69a19afa1 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 "PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -763,7 +763,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
@@ -1279,7 +1279,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
 msgid "options"
 msgstr "opções"
@@ -1306,7 +1306,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1332,12 +1332,12 @@ msgstr ""
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 "<literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1568,14 +1568,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Ficheiros"
 
@@ -1586,9 +1586,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
 msgid "See Also"
 msgstr "Veja também"
@@ -1600,8 +1600,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnóstico"
 
@@ -1730,12 +1730,12 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:158
 msgid "Options"
 msgstr "Opções"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -1988,7 +1988,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Apenas mostra o conteúdo do espaço de configuração."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3131,27 +3131,49 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
-msgstr "<option>--md5</option>"
+msgid ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
-msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
+msgid ""
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
 msgstr ""
-"Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros "
-"índice gerados não terão campos MD5Sum onde possíveis. Item de Configuração: "
-"<literal>APT::FTPArchive::MD5</literal>"
+"Valores para os campos de metadados adicionais no ficheiro Release são "
+"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
+"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>.  "
+"Os campos suportados são: <literal>Origin</literal>, <literal>Label</"
+"literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+"<literal>Codename</literal>, <literal>Date</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3160,7 +3182,7 @@ msgstr ""
 "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3174,12 +3196,12 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3192,12 +3214,12 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3213,12 +3235,12 @@ msgstr ""
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3229,12 +3251,12 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3243,12 +3265,12 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3262,12 +3284,12 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3291,12 +3313,12 @@ msgstr ""
 "as verificações extras serão desnecessárias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3311,19 +3333,19 @@ msgstr ""
 "<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Examples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3332,7 +3354,7 @@ msgstr ""
 "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4672,8 +4694,24 @@ msgstr ""
 "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
 "remove do chaveiro as chaves de arquivo que já não são válidas."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:140
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
+msgid ""
+"Update the local keyring with the keys of a key server and removes from the "
+"keyring the archive keys which are no longer valid. This requires an "
+"installed wget and an APT build configured to have a server to fetch from. "
+"APT in Debian does not support this command, but Ubuntu's APT does."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:159
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4682,12 +4720,12 @@ msgstr ""
 "secção prévia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:161
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:162
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4704,53 +4742,57 @@ msgstr ""
 "chaves são adicionadas a este."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:175
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:177
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:178
 msgid "Local trust database of archive keys."
 msgstr "Base de dados local de confiança de chaves de arquivos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:181
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:182
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:185
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
+#: apt-key.8.xml:186
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:195
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
 "Agosto 2009</date>"
@@ -4767,13 +4809,22 @@ msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
 msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
 "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
 msgstr ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice="
@@ -4783,7 +4834,7 @@ msgstr ""
 "arg> <arg choice=\"plain\">showauto</arg> </group>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4792,7 +4843,7 @@ msgstr ""
 "sendo instalado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4808,14 +4859,21 @@ msgstr ""
 "command> ou <command>aptitude</command> (exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
 msgstr "markauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
@@ -4824,14 +4882,19 @@ msgstr ""
 "nenhum pacote instalado manualmente depender deste pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
@@ -4840,21 +4903,95 @@ msgstr ""
 "automaticamente se nenhum outro pacote depender dele."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
+"instalados automaticamente com cada pacote numa linha nova."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
 "instalados automaticamente com cada pacote numa linha nova."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
+"instalados automaticamente com cada pacote numa linha nova."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
@@ -4862,7 +4999,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -4871,7 +5008,7 @@ msgstr ""
 "filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -4883,48 +5020,18 @@ msgstr ""
 "localização predefinida, a qual é <filename>extended_status</filename> no "
 "directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Mostra um curto sumário de utilização."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Mostra a versão do programa."
-
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -7787,32 +7894,50 @@ msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:107
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
-"filename> files are marked as \"NotAutomatic: yes\" like the debian "
-"experimental archive."
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
 msgstr ""
 "para as versões vindas de arquivos cujos ficheiros <filename>Release</"
 "filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
 "experimental da debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr "priority 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:113
-msgid "to the version that is already installed (if any)."
-msgstr "para a versão que já está instalada (se alguma)."
+#: apt_preferences.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
+msgstr ""
+"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
+"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
+"experimental da debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr "priority 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -7821,12 +7946,12 @@ msgstr ""
 "destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr "priority 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:127
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -7844,13 +7969,21 @@ msgstr ""
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:132
+#, fuzzy
+#| msgid ""
+#| "If the target release has not been specified then APT simply assigns "
+#| "priority 100 to all installed package versions and priority 500 to all "
+#| "uninstalled package versions, expect versions coming from archives which "
+#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
+#| "yes\" - these versions get the priority 1."
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions, expect versions coming from archives which in "
+"uninstalled package versions, except versions coming from archives which in "
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
-"- these versions get the priority 1."
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 "Se o lançamento de destino não foi especificado, então o APT simplesmente "
 "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade "
@@ -7859,7 +7992,7 @@ msgstr ""
 "marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -7868,7 +8001,7 @@ msgstr ""
 "para determinar qual versão de um pacote deve instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7884,12 +8017,12 @@ msgstr ""
 "arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr "Instala a versão de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -7898,7 +8031,7 @@ msgstr ""
 "(isto é, aquela com o número de versão mais alto)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7909,7 +8042,7 @@ msgstr ""
 "reinstall</literal> é fornecida, instala a que foi desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:153
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -7924,7 +8057,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -7938,7 +8071,7 @@ msgstr ""
 "get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -7957,12 +8090,12 @@ msgstr ""
 "prioridade mais alta que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:174
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -7975,7 +8108,7 @@ msgstr ""
 "um ou dois formatos, um formato específico e um formato geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -7991,7 +8124,7 @@ msgstr ""
 "espaços."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8003,7 +8136,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8018,7 +8151,7 @@ msgstr ""
 "nome de domínio totalmente qualificado do site."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8030,7 +8163,7 @@ msgstr ""
 "local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8042,7 +8175,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:216
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8055,7 +8188,7 @@ msgstr ""
 "servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:220
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8067,7 +8200,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:224
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -8082,7 +8215,7 @@ msgstr ""
 "como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8093,7 +8226,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8105,7 +8238,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:238
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -8116,7 +8249,7 @@ msgstr ""
 "\"<literal>&testing-codename;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8128,7 +8261,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:242
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8140,7 +8273,7 @@ msgstr ""
 "\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8152,17 +8285,84 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Those, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+#, fuzzy
+#| msgid "Packages"
+msgid "Package"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta as Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:314
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:315
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8171,12 +8371,12 @@ msgstr ""
 "na versão do pacote (downgrade)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:319
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:320
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8185,12 +8385,12 @@ msgstr ""
 "destino, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:325
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:278
+#: apt_preferences.5.xml:326
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8200,12 +8400,12 @@ msgstr ""
 "mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:331
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:284
+#: apt_preferences.5.xml:332
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8215,12 +8415,12 @@ msgstr ""
 "recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:337
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:338
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8229,17 +8429,17 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:342
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:343
 msgid "prevents the version from being installed"
 msgstr "previne a instalação da versão"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:309
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8250,7 +8450,7 @@ msgstr ""
 "(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:348
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8264,7 +8464,7 @@ msgstr ""
 "determina a prioridade da versão de pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:354
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8273,7 +8473,7 @@ msgstr ""
 "registos apresentados atrás:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:358
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8301,12 +8501,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr "Então:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:373
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8321,7 +8521,7 @@ msgstr ""
 "downgrade ao <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:378
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8332,7 +8532,7 @@ msgstr ""
 "versões, mesmo versões que pertencem ao lançamento de destino."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:382
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8345,12 +8545,12 @@ msgstr ""
 "instalação e se nenhuma versão do pacote já estiver instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:344
+#: apt_preferences.5.xml:392
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:394
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8361,27 +8561,27 @@ msgstr ""
 "descrever os pacotes disponíveis nessa localização."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:406
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:407
 msgid "gives the package name"
 msgstr "fornece o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:411
 msgid "gives the version number for the named package"
 msgstr "fornece o número de versão do pacote nomeado"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:398
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8402,12 +8602,12 @@ msgstr ""
 "definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:427
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:380
+#: apt_preferences.5.xml:428
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8424,18 +8624,18 @@ msgstr ""
 "requerer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:438
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:396
+#: apt_preferences.5.xml:444
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:445
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8452,13 +8652,13 @@ msgstr ""
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:454
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:461
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8474,7 +8674,7 @@ msgstr ""
 "seguintes linhas:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:470
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8486,12 +8686,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:479
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:432
+#: apt_preferences.5.xml:480
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8509,18 +8709,18 @@ msgstr ""
 "a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:489
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:495
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:496
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8533,18 +8733,18 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:502
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:460
+#: apt_preferences.5.xml:508
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:509
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8557,13 +8757,13 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:515
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:416
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8586,7 +8786,7 @@ msgstr ""
 "APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:522
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8611,12 +8811,12 @@ msgstr ""
 "literal> da distribuição <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:535
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais num Registo de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:537
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8627,12 +8827,12 @@ msgstr ""
 "literal>. Isto disponibiliza um espaço para comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:546
 msgid "Tracking Stable"
 msgstr "Acompanhando Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:554
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8656,7 +8856,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:500
+#: apt_preferences.5.xml:548
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8672,8 +8872,8 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -8685,7 +8885,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:566
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -8698,13 +8898,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:583
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:529
+#: apt_preferences.5.xml:577
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8717,12 +8917,12 @@ msgstr ""
 "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:589
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:598
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8750,7 +8950,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:591
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -8767,7 +8967,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:612
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -8780,13 +8980,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:584
+#: apt_preferences.5.xml:632
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:623
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -8805,12 +9005,12 @@ msgstr ""
 "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr "Acompanhando a evolução de um nome de código de lançamento"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:605
+#: apt_preferences.5.xml:653
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8844,7 +9044,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:641
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8870,7 +9070,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:622
+#: apt_preferences.5.xml:670
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -8883,13 +9083,13 @@ msgstr ""
 "codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:690
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:633
+#: apt_preferences.5.xml:681
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -8908,12 +9108,12 @@ msgstr ""
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:651
+#: apt_preferences.5.xml:699
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:657
+#: apt_preferences.5.xml:705
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -10930,6 +11130,42 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid "<option>--md5</option>"
+#~ msgstr "<option>--md5</option>"
+
+#~ msgid ""
+#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
+#~ "index files will not have MD5Sum fields where possible.  Configuration "
+#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
+#~ msgstr ""
+#~ "Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros "
+#~ "índice gerados não terão campos MD5Sum onde possíveis. Item de "
+#~ "Configuração: <literal>APT::FTPArchive::MD5</literal>"
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#~ msgid "Show a short usage summary."
+#~ msgstr "Mostra um curto sumário de utilização."
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#~ msgid "Show the program version."
+#~ msgstr "Mostra a versão do programa."
+
+#~ msgid "to the version that is already installed (if any)."
+#~ msgstr "para a versão que já está instalada (se alguma)."
+
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr ""
 #~ "Utilitário de manuseamento de pacotes do APT -- manipulador de cache"
@@ -10989,8 +11225,12 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório "
 #~ "debian-non-US."
 
-#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
+#~ msgid ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
+#~ msgstr ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
 
 #~ msgid "OPTIONS"
 #~ msgstr "OPÇÕES"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 0b98064b9..43ae0ca42 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -578,7 +578,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 #, fuzzy
@@ -960,7 +960,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
 msgid "options"
 msgstr ""
@@ -984,7 +984,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr ""
@@ -1005,12 +1005,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1109,7 +1109,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
 msgid "<option>-a</option>"
 msgstr ""
 
@@ -1205,14 +1205,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
 msgid "Files"
 msgstr ""
 
@@ -1223,9 +1223,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
 #, fuzzy
 msgid "See Also"
@@ -1238,8 +1238,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr ""
 
@@ -1338,12 +1338,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:158
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1548,7 +1548,7 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
 #: apt-sortpkgs.1.xml:73
 #, fuzzy
 msgid "&apt-conf;"
@@ -2466,31 +2466,38 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
+msgid ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
 msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2499,12 +2506,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2513,12 +2520,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2528,12 +2535,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2541,24 +2548,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2567,12 +2574,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2586,12 +2593,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2601,27 +2608,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 #: sources.list.5.xml:198
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3632,15 +3639,29 @@ msgid ""
 "from the keyring the archive keys which are no longer valid."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:140
+msgid "net-update"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:144
+msgid ""
+"Update the local keyring with the keys of a key server and removes from the "
+"keyring the archive keys which are no longer valid. This requires an "
+"installed wget and an APT build configured to have a server to fetch from. "
+"APT in Debian does not support this command, but Ubuntu's APT does."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:159
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:161
 #, fuzzy
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr ""
@@ -3648,7 +3669,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:162
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -3659,44 +3680,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:175
 msgid "&file-trustedgpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:177
 #, fuzzy
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt.conf</>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:178
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:181
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:182
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:185
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
+#: apt-key.8.xml:186
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:195
 #, fuzzy
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -3705,8 +3726,8 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
@@ -3725,20 +3746,21 @@ msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
 "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3748,108 +3770,132 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+msgid "auto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
-msgid "showauto"
+#: apt-mark.8.xml:85
+msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:86
 msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:96
 msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+#: apt-mark.8.xml:101
+msgid "showauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:102
 msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
+#: apt-mark.8.xml:109
+msgid "showmanual"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
+#: apt-mark.8.xml:116
+msgid "showhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
+#: apt-mark.8.xml:117
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
+#: apt-mark.8.xml:130
+msgid ""
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
+#: apt-mark.8.xml:131
+msgid ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
+#: apt-mark.8.xml:134
+msgid ""
+"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
+"filename> instead of the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
 msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
 #, fuzzy
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5950,30 +5996,34 @@ msgstr "prioridade 100"
 #: apt_preferences.5.xml:107
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
-"filename> files are marked as \"NotAutomatic: yes\" like the debian "
-"experimental archive."
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:113
 #, fuzzy
 msgid "priority 100"
 msgstr "prioridade 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:113
-#, fuzzy
-msgid "to the version that is already installed (if any)."
-msgstr "para a instância que já esteja instalada (caso exista)."
+#: apt_preferences.5.xml:114
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:121
 #, fuzzy
 msgid "priority 500"
 msgstr "prioridade 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:122
 #, fuzzy
 msgid ""
 "to the versions that are not installed and do not belong to the target "
@@ -5982,13 +6032,13 @@ msgstr ""
 "para as instâncias que não estã instaladas e que não pertencem a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:126
 #, fuzzy
 msgid "priority 990"
 msgstr "prioridade 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:127
 #, fuzzy
 msgid ""
 "to the versions that are not installed and belong to the target release."
@@ -6008,21 +6058,22 @@ msgstr ""
 "Atribuirá :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:132
 #, fuzzy
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions, expect versions coming from archives which in "
+"uninstalled package versions, except versions coming from archives which in "
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
-"- these versions get the priority 1."
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 "Caso nenhuma versão alvo tenha sido especificada, o APT simplesmente irá "
 "atribuir a prioridade 100 para todas as instâncias de pacotes instaladas e a "
 "prioridade 500 para todas as instâncias de pacotes não instaladas."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:139
 #, fuzzy
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
@@ -6032,7 +6083,7 @@ msgstr ""
 "determinar qual instância de um pacote instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:142
 #, fuzzy
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
@@ -6049,13 +6100,13 @@ msgstr ""
 "\"downgrade\" pode ser arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:148
 #, fuzzy
 msgid "Install the highest priority version."
 msgstr "Instala a instância de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:149
 #, fuzzy
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
@@ -6065,7 +6116,7 @@ msgstr ""
 "mais recente (ou seja, aquela com o maior número de versão)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:152
 #, fuzzy
 msgid ""
 "If two or more versions have the same priority and version number but either "
@@ -6077,7 +6128,7 @@ msgstr ""
 "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:153
+#: apt_preferences.5.xml:158
 #, fuzzy
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
@@ -6094,7 +6145,7 @@ msgstr ""
 "forem executados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:165
 #, fuzzy
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -6109,7 +6160,7 @@ msgstr ""
 "upgrade</command> forem executados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:170
 #, fuzzy
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
@@ -6129,13 +6180,13 @@ msgstr ""
 "disponíveis possuir uma prioridade maior do que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:174
+#: apt_preferences.5.xml:179
 #, fuzzy
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:181
 #, fuzzy
 msgid ""
 "The APT preferences file allows the system administrator to control the "
@@ -6149,7 +6200,7 @@ msgstr ""
 "das duas formas, uma forma específica e uma forma geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:187
 #, fuzzy
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -6165,7 +6216,7 @@ msgstr ""
 "com \"<literal>5.8</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:194
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6178,7 +6229,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:200
 #, fuzzy
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
@@ -6194,7 +6245,7 @@ msgstr ""
 "identificado pelo nome de domínio totalmente qualificado do site Internet."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:206
 #, fuzzy
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
@@ -6207,7 +6258,7 @@ msgstr ""
 "no site local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:211
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6220,7 +6271,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:216
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -6229,7 +6280,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:220
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6242,7 +6293,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:224
 #, fuzzy
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
@@ -6259,7 +6310,7 @@ msgstr ""
 "como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:229
 #, fuzzy
 msgid ""
 "The following record assigns a low priority to all package versions "
@@ -6271,7 +6322,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:233
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6284,7 +6335,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:238
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
@@ -6296,7 +6347,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:242
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6309,7 +6360,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:242
+#: apt_preferences.5.xml:247
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
@@ -6322,7 +6373,7 @@ msgstr ""
 "literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:252
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6335,19 +6386,78 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"<programlisting>\n"
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Those, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"<programlisting>\n"
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
 #, fuzzy
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:314
 #, fuzzy
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:315
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -6357,13 +6467,13 @@ msgstr ""
 "dowgrade do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:319
 #, fuzzy
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:320
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -6373,13 +6483,13 @@ msgstr ""
 "versão alvo, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:325
 #, fuzzy
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:278
+#: apt_preferences.5.xml:326
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -6389,13 +6499,13 @@ msgstr ""
 "disponível pertencente a versão alvo ou a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:331
 #, fuzzy
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:284
+#: apt_preferences.5.xml:332
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -6406,13 +6516,13 @@ msgstr ""
 "seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:337
 #, fuzzy
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt;= P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:338
 #, fuzzy
 msgid ""
 "causes a version to be installed only if there is no installed version of "
@@ -6422,19 +6532,19 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:342
 #, fuzzy
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:343
 #, fuzzy
 msgid "prevents the version from being installed"
 msgstr "impede a versão de ser instalada"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:309
 #, fuzzy
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6446,7 +6556,7 @@ msgstr ""
 "seguir (a grosso modo):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:348
 #, fuzzy
 msgid ""
 "If any specific-form records match an available package version then the "
@@ -6462,7 +6572,7 @@ msgstr ""
 "determinará a prioridade da versão do pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:354
 #, fuzzy
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
@@ -6472,7 +6582,7 @@ msgstr ""
 "registros apresentados anteriormente :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:358
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6501,12 +6611,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:373
 #, fuzzy
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
@@ -6522,7 +6632,7 @@ msgstr ""
 "será feito um downgrade do <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:378
 #, fuzzy
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
@@ -6534,7 +6644,7 @@ msgstr ""
 "mesmo versões pertencentes a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:382
 #, fuzzy
 msgid ""
 "A version of a package whose origin is not the local system but some other "
@@ -6549,13 +6659,13 @@ msgstr ""
 "instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:344
+#: apt_preferences.5.xml:392
 #, fuzzy
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:394
 #, fuzzy
 msgid ""
 "The locations listed in the &sources-list; file should provide "
@@ -6567,31 +6677,31 @@ msgstr ""
 "os pacotes disponíveis nessas localidades."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:406
 #, fuzzy
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:407
 #, fuzzy
 msgid "gives the package name"
 msgstr "informa o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 #, fuzzy
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:411
 #, fuzzy
 msgid "gives the version number for the named package"
 msgstr "informa o número de versão do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:398
 #, fuzzy
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
@@ -6613,13 +6723,13 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:427
 #, fuzzy
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:380
+#: apt_preferences.5.xml:428
 #, fuzzy
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
@@ -6637,7 +6747,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:438
 #, fuzzy, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
@@ -6645,13 +6755,13 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:396
+#: apt_preferences.5.xml:444
 #, fuzzy
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:445
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
@@ -6669,7 +6779,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:454
 #, fuzzy, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
@@ -6677,7 +6787,7 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:461
 #, fuzzy
 msgid ""
 "names the release version.  For example, the packages in the tree might "
@@ -6694,7 +6804,7 @@ msgstr ""
 "das linhas a seguir."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:470
 #, fuzzy, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6707,13 +6817,13 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:479
 #, fuzzy
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:432
+#: apt_preferences.5.xml:480
 #, fuzzy
 msgid ""
 "names the licensing component associated with the packages in the directory "
@@ -6732,7 +6842,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:489
 #, fuzzy, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
@@ -6740,13 +6850,13 @@ msgstr ""
 "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:495
 #, fuzzy
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:496
 #, fuzzy
 msgid ""
 "names the originator of the packages in the directory tree of the "
@@ -6760,7 +6870,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:502
 #, fuzzy, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
@@ -6768,13 +6878,13 @@ msgstr ""
 "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:460
+#: apt_preferences.5.xml:508
 #, fuzzy
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:509
 #, fuzzy
 msgid ""
 "names the label of the packages in the directory tree of the "
@@ -6787,7 +6897,7 @@ msgstr ""
 "arquivo de preferências do APT iria requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:515
 #, fuzzy, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
@@ -6795,7 +6905,7 @@ msgstr ""
 "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:416
 #, fuzzy
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
@@ -6819,7 +6929,7 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:522
 #, fuzzy
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6845,13 +6955,13 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:535
 #, fuzzy
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais em um Registro de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:537
 #, fuzzy
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
@@ -6863,13 +6973,13 @@ msgstr ""
 "</literal>. Isto oferece um local para inserir comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:546
 #, fuzzy
 msgid "Tracking Stable"
 msgstr "Acompanhando a Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:554
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6894,7 +7004,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:500
+#: apt_preferences.5.xml:548
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
@@ -6910,8 +7020,8 @@ msgstr ""
 "outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
 #, fuzzy, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6924,7 +7034,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:566
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -6937,7 +7047,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:583
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
@@ -6945,7 +7055,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:529
+#: apt_preferences.5.xml:577
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -6958,13 +7068,13 @@ msgstr ""
 "atualizado novamente a menos que esse comando seja executado novamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:589
 #, fuzzy
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando a Testing"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:598
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6993,7 +7103,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:591
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
@@ -7010,7 +7120,7 @@ msgstr ""
 "versões de pacotes de outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:612
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7023,7 +7133,7 @@ msgstr ""
 "(s) última(s) versão(ões) <literal>testing</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:584
+#: apt_preferences.5.xml:632
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
@@ -7031,7 +7141,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:623
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7051,12 +7161,12 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:605
+#: apt_preferences.5.xml:653
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7086,7 +7196,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:641
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -7101,7 +7211,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:622
+#: apt_preferences.5.xml:670
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7114,7 +7224,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:690
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
@@ -7122,7 +7232,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:633
+#: apt_preferences.5.xml:681
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7142,13 +7252,13 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:651
+#: apt_preferences.5.xml:699
 #, fuzzy
 msgid "&file-preferences;"
 msgstr "apt_preferences"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:657
+#: apt_preferences.5.xml:705
 #, fuzzy
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -8563,6 +8673,10 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
 #, fuzzy
+#~ msgid "to the version that is already installed (if any)."
+#~ msgstr "para a instância que já esteja instalada (caso exista)."
+
+#, fuzzy
 #~ msgid ""
 #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
 #~ "is optional.  If omitted, APT assigns a priority of 1 less than the last "
diff --git a/methods/mirror.cc b/methods/mirror.cc
index 2cf5c9ce1..713dc211a 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -134,6 +134,10 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 
+   // append the dist as a query string
+   if (Dist != "")
+      fetch += "?dist=" + Dist;
+
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
            << " to " << MirrorFile << endl;
@@ -274,8 +278,18 @@ bool MirrorMethod::InitMirrors()
    while (!in.eof()) 
    {
       getline(in, s);
-      if (s.size() > 0)
-	 AllMirrors.push_back(s);
+
+      // ignore lines that start with #
+      if (s.find("#") == 0)
+         continue;
+      // ignore empty lines
+      if (s.size() == 0)
+         continue;
+      // ignore non http lines
+      if (s.find("http://") != 0)
+         continue;
+
+      AllMirrors.push_back(s);
    }
    Mirror = AllMirrors[0];
    UsedMirror = Mirror;
@@ -329,6 +343,7 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str)
 	 if(Debug)
 	    std::cerr << "found BaseURI: " << uristr << std::endl;
 	 BaseUri = uristr.substr(0,uristr.size()-1);
+         Dist = (*I)->GetDist();
       }
    }
    // get new file
diff --git a/methods/mirror.h b/methods/mirror.h
index bd807e122..97d18144a 100644
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -29,6 +29,7 @@ class MirrorMethod : public HttpMethod
    vector<string> AllMirrors; // all available mirrors
    string MirrorFile; // the file that contains the list of mirrors
    bool DownloadedMirrorFile; // already downloaded this session
+   string Dist;       // the target distrubtion (e.g. sid, oneiric)
 
    bool Debug;
 
diff --git a/po/apt-all.pot b/po/apt-all.pot
deleted file mode 100644
index 73ed82195..000000000
--- a/po/apt-all.pot
+++ /dev/null
@@ -1,3104 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-12 17:42+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: cmdline/apt-cache.cc:156
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc:284
-msgid "Total package names: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:286
-msgid "Total package structures: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:326
-msgid "  Normal packages: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:327
-msgid "  Pure virtual packages: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:328
-msgid "  Single virtual packages: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:329
-msgid "  Mixed virtual packages: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:330
-msgid "  Missing: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:332
-msgid "Total distinct versions: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:334
-msgid "Total distinct descriptions: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:336
-msgid "Total dependencies: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:339
-msgid "Total ver/file relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:341
-msgid "Total Desc/File relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:343
-msgid "Total Provides mappings: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:355
-msgid "Total globbed strings: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:369
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:374
-msgid "Total slack space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:382
-msgid "Total space accounted for: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
-#, c-format
-msgid "Package file %s is out of sync."
-msgstr ""
-
-#: cmdline/apt-cache.cc:1273
-msgid "You must give at least one search pattern"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
-#: cmdline/apt-cache.cc:1508
-msgid "No packages found"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
-#, c-format
-msgid "Unable to locate package %s"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1533
-msgid "Package files:"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1554
-msgid "Pinned packages:"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
-msgid "(not found)"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1575
-msgid "  Installed: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:1576
-msgid "  Candidate: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
-msgid "(none)"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1615
-msgid "  Package pin: "
-msgstr ""
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc:1624
-msgid "  Version table:"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1745
-msgid ""
-"Usage: apt-cache [options] command\n"
-"       apt-cache [options] add file1 [file2 ...]\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
-"\n"
-"Commands:\n"
-"   add - Add a package file to the source cache\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   showauto - Display a list of automatically installed packages\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -p=? The package cache.\n"
-"  -s=? The source cache.\n"
-"  -q   Disable progress indicator.\n"
-"  -i   Show only important deps for the unmet command.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:77
-msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:92
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:127
-#, c-format
-msgid "Failed to mount '%s' to '%s'"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:162
-msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
-
-#: cmdline/apt-config.cc:41
-msgid "Arguments not in pairs"
-msgstr ""
-
-#: cmdline/apt-config.cc:76
-msgid ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:232
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
-#, c-format
-msgid "Unable to write to %s"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:309
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
-msgid "Package extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
-#, c-format
-msgid "Error processing directory %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:260
-msgid "Source extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:377
-msgid "Error writing header to contents file"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:407
-#, c-format
-msgid "Error processing contents %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:595
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:801
-msgid "No selections matched"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:879
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr ""
-
-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr ""
-
-#: ftparchive/cachedb.cc:61
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:72
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:77
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:242
-msgid "Archive has no control record"
-msgstr ""
-
-#: ftparchive/cachedb.cc:448
-msgid "Unable to get a cursor"
-msgstr ""
-
-#: ftparchive/writer.cc:73
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:78
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:134
-msgid "E: "
-msgstr ""
-
-#: ftparchive/writer.cc:136
-msgid "W: "
-msgstr ""
-
-#: ftparchive/writer.cc:143
-msgid "E: Errors apply to file "
-msgstr ""
-
-#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
-#, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:174
-msgid "Tree walking failed"
-msgstr ""
-
-#: ftparchive/writer.cc:201
-#, c-format
-msgid "Failed to open %s"
-msgstr ""
-
-#: ftparchive/writer.cc:260
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr ""
-
-#: ftparchive/writer.cc:268
-#, c-format
-msgid "Failed to readlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:272
-#, c-format
-msgid "Failed to unlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:279
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr ""
-
-#: ftparchive/writer.cc:289
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:393
-msgid "Archive had no package field"
-msgstr ""
-
-#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:698
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:321
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr ""
-
-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
-msgid "realloc - Failed to allocate memory"
-msgstr ""
-
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr ""
-
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr ""
-
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr ""
-
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr ""
-
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:72
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr ""
-
-#: ftparchive/multicompress.cc:102
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-
-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr ""
-
-#: ftparchive/multicompress.cc:195
-msgid "Failed to create FILE*"
-msgstr ""
-
-#: ftparchive/multicompress.cc:198
-msgid "Failed to fork"
-msgstr ""
-
-#: ftparchive/multicompress.cc:212
-msgid "Compress child"
-msgstr ""
-
-#: ftparchive/multicompress.cc:235
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:286
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:321
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:360
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:403
-msgid "IO to subprocess/file failed"
-msgstr ""
-
-#: ftparchive/multicompress.cc:455
-msgid "Failed to read while computing MD5"
-msgstr ""
-
-#: ftparchive/multicompress.cc:472
-#, c-format
-msgid "Problem unlinking %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:135
-msgid "Y"
-msgstr ""
-
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:252
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: cmdline/apt-get.cc:342
-#, c-format
-msgid "but %s is installed"
-msgstr ""
-
-#: cmdline/apt-get.cc:344
-#, c-format
-msgid "but %s is to be installed"
-msgstr ""
-
-#: cmdline/apt-get.cc:351
-msgid "but it is not installable"
-msgstr ""
-
-#: cmdline/apt-get.cc:353
-msgid "but it is a virtual package"
-msgstr ""
-
-#: cmdline/apt-get.cc:356
-msgid "but it is not installed"
-msgstr ""
-
-#: cmdline/apt-get.cc:356
-msgid "but it is not going to be installed"
-msgstr ""
-
-#: cmdline/apt-get.cc:361
-msgid " or"
-msgstr ""
-
-#: cmdline/apt-get.cc:392
-msgid "The following NEW packages will be installed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:420
-msgid "The following packages will be REMOVED:"
-msgstr ""
-
-#: cmdline/apt-get.cc:442
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: cmdline/apt-get.cc:465
-msgid "The following packages will be upgraded:"
-msgstr ""
-
-#: cmdline/apt-get.cc:488
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: cmdline/apt-get.cc:508
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:563
-#, c-format
-msgid "%s (due to %s) "
-msgstr ""
-
-#: cmdline/apt-get.cc:571
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: cmdline/apt-get.cc:605
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: cmdline/apt-get.cc:609
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: cmdline/apt-get.cc:611
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: cmdline/apt-get.cc:613
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:617
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:639
-#, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:645
-#, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:662
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:673
-msgid " [Installed]"
-msgstr ""
-
-#: cmdline/apt-get.cc:682
-msgid " [Not candidate version]"
-msgstr ""
-
-#: cmdline/apt-get.cc:684
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:687
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:705
-msgid "However the following packages replace it:"
-msgstr ""
-
-#: cmdline/apt-get.cc:717
-#, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:728
-#, c-format
-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:759
-#, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:789
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:793
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:803
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:808
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:853
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:858
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:898
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:973
-msgid "Correcting dependencies..."
-msgstr ""
-
-#: cmdline/apt-get.cc:976
-msgid " failed."
-msgstr ""
-
-#: cmdline/apt-get.cc:979
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc:982
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: cmdline/apt-get.cc:984
-msgid " Done"
-msgstr ""
-
-#: cmdline/apt-get.cc:988
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: cmdline/apt-get.cc:991
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: cmdline/apt-get.cc:1016
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-
-#: cmdline/apt-get.cc:1020
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1027
-msgid "Install these packages without verification [y/N]? "
-msgstr ""
-
-#: cmdline/apt-get.cc:1029
-msgid "Some packages could not be authenticated"
-msgstr ""
-
-#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: cmdline/apt-get.cc:1079
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: cmdline/apt-get.cc:1088
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: cmdline/apt-get.cc:1099
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: cmdline/apt-get.cc:1137
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1144
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1149
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1156
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1161
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
-#: cmdline/apt-get.cc:2370
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:1189
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
-
-#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#: cmdline/apt-get.cc:1207
-msgid "Yes, do as I say!"
-msgstr ""
-
-#: cmdline/apt-get.cc:1209
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
-msgid "Abort."
-msgstr ""
-
-#: cmdline/apt-get.cc:1230
-msgid "Do you want to continue [Y/n]? "
-msgstr ""
-
-#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1320
-msgid "Some files failed to download"
-msgstr ""
-
-#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
-msgid "Download complete and in download only mode"
-msgstr ""
-
-#: cmdline/apt-get.cc:1327
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: cmdline/apt-get.cc:1331
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: cmdline/apt-get.cc:1336
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: cmdline/apt-get.cc:1337
-msgid "Aborting install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1365
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1369
-msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
-
-#: cmdline/apt-get.cc:1499
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1531
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
-
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1569
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1585
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: cmdline/apt-get.cc:1647
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: cmdline/apt-get.cc:1699
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#.
-#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1706
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1713
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1717
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1719
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1738
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1828
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1831
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: cmdline/apt-get.cc:1843
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: cmdline/apt-get.cc:1861
-msgid "Broken packages"
-msgstr ""
-
-#: cmdline/apt-get.cc:1889
-msgid "The following extra packages will be installed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1979
-msgid "Suggested packages:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1980
-msgid "Recommended packages:"
-msgstr ""
-
-#: cmdline/apt-get.cc:2022
-#, c-format
-msgid "Couldn't find package %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2029
-#, c-format
-msgid "%s set to automatically installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2050
-msgid "Calculating upgrade... "
-msgstr ""
-
-#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
-msgid "Failed"
-msgstr ""
-
-#: cmdline/apt-get.cc:2058
-msgid "Done"
-msgstr ""
-
-#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
-msgid "Internal error, problem resolver broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:2233
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-
-#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2289
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2294
-#, c-format
-msgid ""
-"Please use:\n"
-"bzr get %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2345
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2380
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2388
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr ""
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2393
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2399
-#, c-format
-msgid "Fetch source %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2432
-msgid "Failed to fetch some archives."
-msgstr ""
-
-#: cmdline/apt-get.cc:2462
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2474
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2475
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2492
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2512
-msgid "Child process failed"
-msgstr ""
-
-#: cmdline/apt-get.cc:2528
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-
-#: cmdline/apt-get.cc:2559
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2579
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2630
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: cmdline/apt-get.cc:2683
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
-msgstr ""
-
-#: cmdline/apt-get.cc:2719
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: cmdline/apt-get.cc:2746
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2762
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc:2767
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc:2798
-msgid "Supported modules:"
-msgstr ""
-
-#: cmdline/apt-get.cc:2839
-msgid ""
-"Usage: apt-get [options] command\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   markauto - Mark the given packages as automatically installed\n"
-"   unmarkauto - Mark the given packages as manually installed\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -d  Download only - do NOT install or unpack archives\n"
-"  -s  No-act. Perform ordering simulation\n"
-"  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to correct a system with broken dependencies in place\n"
-"  -m  Attempt to continue if archives are unlocatable\n"
-"  -u  Show a list of upgraded packages as well\n"
-"  -b  Build the source package after fetching it\n"
-"  -V  Show verbose version numbers\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-"                       This APT has Super Cow Powers.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2995
-msgid ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
-msgstr ""
-
-#: cmdline/acqprogress.cc:57
-msgid "Hit "
-msgstr ""
-
-#: cmdline/acqprogress.cc:81
-msgid "Get:"
-msgstr ""
-
-#: cmdline/acqprogress.cc:112
-msgid "Ign "
-msgstr ""
-
-#: cmdline/acqprogress.cc:116
-msgid "Err "
-msgstr ""
-
-#: cmdline/acqprogress.cc:137
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: cmdline/acqprogress.cc:227
-#, c-format
-msgid " [Working]"
-msgstr ""
-
-#: cmdline/acqprogress.cc:283
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:150
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr ""
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
-msgid "Press enter to continue."
-msgstr ""
-
-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
-
-#: dselect/install:101
-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
-
-#: dselect/install:102
-msgid "will be configured. This may result in duplicate errors"
-msgstr ""
-
-#: dselect/install:103
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-
-#: dselect/install:104
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-
-#: dselect/update:30
-msgid "Merging available information"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
-msgid "Corrupted archive"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:296
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:90
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr ""
-
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr ""
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr ""
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr ""
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr ""
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr ""
-
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
-#, c-format
-msgid "Failed to write file %s"
-msgstr ""
-
-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
-#, c-format
-msgid "Failed to close file %s"
-msgstr ""
-
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, c-format
-msgid "The path %s is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr ""
-
-#: apt-inst/extract.cc:134
-#, c-format
-msgid "The directory %s is diverted"
-msgstr ""
-
-#: apt-inst/extract.cc:144
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
-
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:240
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-
-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
-
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:414
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr ""
-
-#: apt-inst/extract.cc:431
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
-
-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
-#: methods/mirror.cc:87
-#, c-format
-msgid "Unable to read %s"
-msgstr ""
-
-#: apt-inst/extract.cc:491
-#, c-format
-msgid "Unable to stat %s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
-#, c-format
-msgid "Failed to remove %s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
-#, c-format
-msgid "Unable to create %s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:114
-#, c-format
-msgid "Failed to stat %sinfo"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
-#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
-#: apt-pkg/pkgcachegen.cc:1326
-msgid "Reading package lists"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:176
-#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:262
-msgid "Internal error getting a node"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:358
-msgid "Internal error adding a diversion"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:439
-#, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:461
-#, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:466
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:50
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:110
-#, c-format
-msgid "Couldn't change to %s"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:140
-msgid "Internal error, could not locate member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:173
-msgid "Failed to locate a valid control file"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:258
-msgid "Unparsable control file"
-msgstr ""
-
-#: methods/bzip2.cc:65
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr ""
-
-#: methods/bzip2.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
-#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
-#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
-#: methods/rred.cc:495
-msgid "Failed to stat"
-msgstr ""
-
-#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
-#: methods/rred.cc:492
-msgid "Failed to set modification time"
-msgstr ""
-
-#: methods/cdrom.cc:199
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr ""
-
-#: methods/cdrom.cc:208
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-
-#: methods/cdrom.cc:218
-msgid "Wrong CD-ROM"
-msgstr ""
-
-#: methods/cdrom.cc:245
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-
-#: methods/cdrom.cc:250
-msgid "Disk not found."
-msgstr ""
-
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
-msgstr ""
-
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr ""
-
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
-msgid "Logging in"
-msgstr ""
-
-#: methods/ftp.cc:174
-msgid "Unable to determine the peer name"
-msgstr ""
-
-#: methods/ftp.cc:179
-msgid "Unable to determine the local name"
-msgstr ""
-
-#: methods/ftp.cc:210 methods/ftp.cc:238
-#, c-format
-msgid "The server refused the connection and said: %s"
-msgstr ""
-
-#: methods/ftp.cc:216
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:223
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:243
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-
-#: methods/ftp.cc:271
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:297
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr ""
-
-#: methods/ftp.cc:341
-msgid "Server closed the connection"
-msgstr ""
-
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
-msgid "Read error"
-msgstr ""
-
-#: methods/ftp.cc:351 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr ""
-
-#: methods/ftp.cc:368 methods/ftp.cc:380
-msgid "Protocol corruption"
-msgstr ""
-
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
-msgid "Write error"
-msgstr ""
-
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
-msgid "Could not create a socket"
-msgstr ""
-
-#: methods/ftp.cc:703
-msgid "Could not connect data socket, connection timed out"
-msgstr ""
-
-#: methods/ftp.cc:709
-msgid "Could not connect passive socket."
-msgstr ""
-
-#: methods/ftp.cc:727
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr ""
-
-#: methods/ftp.cc:741
-msgid "Could not bind a socket"
-msgstr ""
-
-#: methods/ftp.cc:745
-msgid "Could not listen on the socket"
-msgstr ""
-
-#: methods/ftp.cc:752
-msgid "Could not determine the socket's name"
-msgstr ""
-
-#: methods/ftp.cc:784
-msgid "Unable to send PORT command"
-msgstr ""
-
-#: methods/ftp.cc:794
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr ""
-
-#: methods/ftp.cc:803
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:823
-msgid "Data socket connect timed out"
-msgstr ""
-
-#: methods/ftp.cc:830
-msgid "Unable to accept connection"
-msgstr ""
-
-#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
-msgid "Problem hashing file"
-msgstr ""
-
-#: methods/ftp.cc:882
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr ""
-
-#: methods/ftp.cc:897 methods/rsh.cc:321
-msgid "Data socket timed out"
-msgstr ""
-
-#: methods/ftp.cc:927
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr ""
-
-#. Get the files information
-#: methods/ftp.cc:1004
-msgid "Query"
-msgstr ""
-
-#: methods/ftp.cc:1116
-msgid "Unable to invoke "
-msgstr ""
-
-#: methods/connect.cc:71
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr ""
-
-#: methods/connect.cc:82
-#, c-format
-msgid "[IP: %s %s]"
-msgstr ""
-
-#: methods/connect.cc:89
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
-
-#: methods/connect.cc:95
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr ""
-
-#: methods/connect.cc:103
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-
-#: methods/connect.cc:121
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr ""
-
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:424
-#, c-format
-msgid "Connecting to %s"
-msgstr ""
-
-#: methods/connect.cc:168 methods/connect.cc:187
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr ""
-
-#: methods/connect.cc:193
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr ""
-
-#: methods/connect.cc:196
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
-
-#: methods/connect.cc:243
-#, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:71
-#, c-format
-msgid "No keyring installed in %s."
-msgstr ""
-
-#: methods/gpgv.cc:163
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-
-#: methods/gpgv.cc:168
-msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#: methods/gpgv.cc:172
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
-
-#: methods/gpgv.cc:177
-msgid "Unknown error executing gpgv"
-msgstr ""
-
-#: methods/gpgv.cc:211 methods/gpgv.cc:218
-msgid "The following signatures were invalid:\n"
-msgstr ""
-
-#: methods/gpgv.cc:225
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-
-#: methods/http.cc:385
-msgid "Waiting for headers"
-msgstr ""
-
-#: methods/http.cc:531
-#, c-format
-msgid "Got a single header line over %u chars"
-msgstr ""
-
-#: methods/http.cc:539
-msgid "Bad header line"
-msgstr ""
-
-#: methods/http.cc:564 methods/http.cc:571
-msgid "The HTTP server sent an invalid reply header"
-msgstr ""
-
-#: methods/http.cc:600
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
-
-#: methods/http.cc:615
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
-
-#: methods/http.cc:617
-msgid "This HTTP server has broken range support"
-msgstr ""
-
-#: methods/http.cc:641
-msgid "Unknown date format"
-msgstr ""
-
-#: methods/http.cc:799
-msgid "Select failed"
-msgstr ""
-
-#: methods/http.cc:804
-msgid "Connection timed out"
-msgstr ""
-
-#: methods/http.cc:827
-msgid "Error writing to output file"
-msgstr ""
-
-#: methods/http.cc:858
-msgid "Error writing to file"
-msgstr ""
-
-#: methods/http.cc:886
-msgid "Error writing to the file"
-msgstr ""
-
-#: methods/http.cc:900
-msgid "Error reading from server. Remote end closed connection"
-msgstr ""
-
-#: methods/http.cc:902
-msgid "Error reading from server"
-msgstr ""
-
-#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
-msgid "Failed to truncate file"
-msgstr ""
-
-#: methods/http.cc:1160
-msgid "Bad header data"
-msgstr ""
-
-#: methods/http.cc:1177 methods/http.cc:1232
-msgid "Connection failed"
-msgstr ""
-
-#: methods/http.cc:1324
-msgid "Internal error"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:77
-msgid "Can't mmap an empty file"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:89
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:124
-msgid "Unable to close mmap"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-msgid "Unable to synchronize mmap"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:300
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:399
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:402
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1119
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:452
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:510
-#, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:678
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:697
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:714
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:754
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:761
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:774
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:777
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:827
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:153
-#, c-format
-msgid "%c%s... Error!"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:155
-#, c-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:77
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
-#, c-format
-msgid "Option %s requires an argument."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:236
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:267
-#, c-format
-msgid "Option '%s' is too long"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:300
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:350
-#, c-format
-msgid "Invalid operation %s"
-msgstr ""
-
-#: apt-pkg/contrib/cdromutl.cc:52
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr ""
-
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:93
-#, c-format
-msgid "Unable to change to %s"
-msgstr ""
-
-#: apt-pkg/contrib/cdromutl.cc:217
-msgid "Failed to stat the cdrom"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:154
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:159
-#, c-format
-msgid "Could not open lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:177
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:181
-#, c-format
-msgid "Could not get lock %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:321
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:661
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:673
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:675
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:679
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:681
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:746
-#, c-format
-msgid "Could not open file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:763
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:823
-#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:856
-#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:985
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:988
-#, c-format
-msgid "Problem closing the file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:993
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1004
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1017
-msgid "Problem syncing the file"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:145
-msgid "Empty package cache"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:151
-msgid "The package cache file is corrupted"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:156
-msgid "The package cache file is an incompatible version"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:161
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache was built for a different architecture"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:293
-msgid "Depends"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:293
-msgid "PreDepends"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:293
-msgid "Suggests"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:294
-msgid "Recommends"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:294
-msgid "Conflicts"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:294
-msgid "Replaces"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:295
-msgid "Obsoletes"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:295
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:295
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:306
-msgid "important"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:306
-msgid "required"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:306
-msgid "standard"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:307
-msgid "optional"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:307
-msgid "extra"
-msgstr ""
-
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
-msgid "Building dependency tree"
-msgstr ""
-
-#: apt-pkg/depcache.cc:126
-msgid "Candidate versions"
-msgstr ""
-
-#: apt-pkg/depcache.cc:155
-msgid "Dependency generation"
-msgstr ""
-
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
-msgid "Reading state information"
-msgstr ""
-
-#: apt-pkg/depcache.cc:237
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr ""
-
-#: apt-pkg/depcache.cc:243
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr ""
-
-#: apt-pkg/depcache.cc:922
-#, c-format
-msgid "Internal error, group '%s' has no installable pseudo package"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:102
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:189
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:95
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:106
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:112
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:115
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:128
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:130
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:133
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:139
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:146
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:244
-#, c-format
-msgid "Opening %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:281
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:285
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:452
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:495
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-
-#: apt-pkg/pkgrecords.cc:32
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/algorithms.cc:292
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1218
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1220
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/acquire.cc:79
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr ""
-
-#: apt-pkg/acquire.cc:83
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr ""
-
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr ""
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:857
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
-
-#: apt-pkg/acquire.cc:859
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:110
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:159
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:413
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-
-#: apt-pkg/init.cc:143
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
-
-#: apt-pkg/clean.cc:56
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-
-#: apt-pkg/cachefile.cc:84
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-
-#: apt-pkg/cachefile.cc:88
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-
-#: apt-pkg/cachefile.cc:106
-msgid "The list of sources could not be read."
-msgstr ""
-
-#: apt-pkg/policy.cc:344
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-
-#: apt-pkg/policy.cc:366
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:374
-msgid "No priority (or zero) specified for pin"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:80
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:198
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:215
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:253
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:285
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:289
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:324
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:320
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:353
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:360
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:363
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:366
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:369
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:398
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:412
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:418
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:982
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1087
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:136
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:484
-msgid "MD5Sum mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
-#: apt-pkg/acquire-item.cc:1717
-msgid "Hash Sum mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1244
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-
-#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
-#. the time since then the file is invalid - formated in the same way as in
-#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1281
-#, c-format
-msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1302
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1328
-#, c-format
-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1337
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1365
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1424
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1479
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1566
-msgid "Size mismatch"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:53
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:60
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:94
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:107
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:122
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:66
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:518
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
-msgid "Identifying.. "
-msgstr ""
-
-#: apt-pkg/cdrom.cc:552
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
-msgid "Unmounting CD-ROM...\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:578
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:596
-msgid "Unmounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:600
-msgid "Waiting for disc...\n"
-msgstr ""
-
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:608
-msgid "Mounting CD-ROM...\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:626
-msgid "Scanning disc for index files..\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:666
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:677
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:703
-#, c-format
-msgid "Found label '%s'\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:732
-msgid "That is not a valid name, try again.\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:748
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:752
-msgid "Copying package lists..."
-msgstr ""
-
-#: apt-pkg/cdrom.cc:778
-msgid "Writing new source list\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:787
-msgid "Source list entries for this disc are:\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:537
-#, c-format
-msgid "Skipping nonexistent file %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:543
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:549
-#, c-format
-msgid "Hash mismatch for: %s"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:337
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:340
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:447
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:454
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:467
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:491
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:499
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:507
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:52
-#, c-format
-msgid "Installing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
-#, c-format
-msgid "Configuring %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
-#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:55
-#, c-format
-msgid "Completely removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:56
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:57
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:646
-#, c-format
-msgid "Directory '%s' missing"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675
-#, c-format
-msgid "Could not open file '%s'"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:816
-#, c-format
-msgid "Preparing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:817
-#, c-format
-msgid "Unpacking %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:822
-#, c-format
-msgid "Preparing to configure %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:824
-#, c-format
-msgid "Installed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:829
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:831
-#, c-format
-msgid "Removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:836
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:837
-#, c-format
-msgid "Completely removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1043
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1074
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1277
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1282
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1284
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1290
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1296
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1303
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:69
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:72
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:106
-msgid "Not locked"
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:200
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#: methods/mirror.cc:343
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rsh.cc:329
-msgid "Connection closed prematurely"
-msgstr ""