summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.bzrignore9
-rw-r--r--apt-pkg/aptconfiguration.cc1
-rw-r--r--apt-pkg/cdrom.cc3
-rw-r--r--apt-pkg/contrib/cmndline.cc42
-rw-r--r--apt-pkg/contrib/cmndline.h1
-rw-r--r--apt-pkg/contrib/mmap.cc70
-rw-r--r--apt-pkg/contrib/mmap.h5
-rw-r--r--apt-pkg/deb/debversion.cc18
-rw-r--r--apt-pkg/deb/dpkgpm.cc18
-rw-r--r--cmdline/apt-get.cc20
-rwxr-xr-xcmdline/apt-mark4
-rw-r--r--debian/changelog28
-rw-r--r--debian/control3
-rw-r--r--debian/source/format1
-rw-r--r--doc/apt-get.8.xml7
-rw-r--r--doc/apt_preferences.5.xml3
-rw-r--r--doc/po/apt-doc.pot315
-rw-r--r--doc/po/de.po334
-rw-r--r--doc/po/es.po342
-rw-r--r--doc/po/fr.po333
-rw-r--r--doc/po/it.po321
-rw-r--r--doc/po/ja.po333
-rw-r--r--doc/po/pl.po321
-rw-r--r--doc/po/pt_BR.po321
-rw-r--r--po/apt-all.pot367
-rw-r--r--test/libapt/commandlineasstring_test.cc39
-rw-r--r--test/libapt/compareversion_test.cc123
-rw-r--r--test/libapt/makefile12
-rw-r--r--test/makefile7
-rw-r--r--test/versions.lst64
-rw-r--r--test/versiontest.cc233
31 files changed, 2042 insertions, 1656 deletions
diff --git a/.bzrignore b/.bzrignore
index ac276b3fb..c4cd052a7 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -11,6 +11,15 @@ configure
buildlib/config.sub
buildlib/config.guess
+# abichecker related files/dir
+abicheck/apt_build.xml
+abicheck/apt_installed.xml
+abicheck/compat_reports/
+abicheck/descriptors_storage/
+abicheck/header_compile_errors/
+abicheck/test_results/
+abicheck/tests/
+
# generated files in the progress to build all
# apt man pages and other documentation
doc/*.1
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 10613f11d..f3f94dce3 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -152,6 +152,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
builtin.push_back(c);
}
}
+ closedir(D);
// get the environment language codes: LC_MESSAGES (and later LANGUAGE)
// we extract both, a long and a short code and then we will
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 96d4e9c91..783ffc430 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -289,7 +289,8 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
List[J] = string();
}
}
-
+ delete[] Inodes;
+
// Wipe erased entries
for (unsigned int I = 0; I < List.size();)
{
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index bfd53695e..0b16bf51a 100644
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -135,7 +135,9 @@ bool CommandLine::Parse(int argc,const char **argv)
for (; I != argc; I++)
*Files++ = argv[I];
*Files = 0;
-
+
+ SaveInConfig(argc, argv);
+
return true;
}
/*}}}*/
@@ -351,3 +353,41 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch)
return false;
}
/*}}}*/
+// CommandLine::SaveInConfig - for output later in a logfile or so /*{{{*/
+// ---------------------------------------------------------------------
+/* We save the commandline here to have it around later for e.g. logging.
+ It feels a bit like a hack here and isn't bulletproof, but it is better
+ than nothing after all. */
+void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv)
+{
+ char cmdline[300];
+ unsigned int length = 0;
+ bool lastWasOption = false;
+ bool closeQuote = false;
+ for (unsigned int i = 0; i < argc; ++i, ++length)
+ {
+ for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length)
+ {
+ cmdline[length] = argv[i][j];
+ if (lastWasOption == true && argv[i][j] == '=')
+ {
+ // That is possibly an option: Quote it if it includes spaces,
+ // the benefit is that this will eliminate also most false positives
+ const char* c = &argv[i][j+1];
+ for (; *c != '\0' && *c != ' '; ++c);
+ if (*c == '\0') continue;
+ cmdline[++length] = '"';
+ closeQuote = true;
+ }
+ }
+ if (closeQuote == true)
+ cmdline[length++] = '"';
+ // Problem: detects also --hello
+ if (cmdline[length-1] == 'o')
+ lastWasOption = true;
+ cmdline[length] = ' ';
+ }
+ cmdline[--length] = '\0';
+ _config->Set("CommandLine::AsString", cmdline);
+}
+ /*}}}*/
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index e28071e81..7c0c71aa7 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -60,6 +60,7 @@ class CommandLine
Configuration *Conf;
bool HandleOpt(int &I,int argc,const char *argv[],
const char *&Opt,Args *A,bool PreceedeMatch = false);
+ void static SaveInConfig(unsigned int const &argc, char const * const * const argv);
public:
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index f440f9489..b3f29032c 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <stdlib.h>
+#include <errno.h>
#include <cstring>
/*}}}*/
@@ -35,7 +36,7 @@
// ---------------------------------------------------------------------
/* */
MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
- Base(0)
+ Base(0), SyncToFd(NULL)
{
if ((Flags & NoImmMap) != NoImmMap)
Map(F);
@@ -45,7 +46,7 @@ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
// ---------------------------------------------------------------------
/* */
MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0),
- Base(0)
+ Base(0), SyncToFd(NULL)
{
}
/*}}}*/
@@ -78,7 +79,24 @@ bool MMap::Map(FileFd &Fd)
// Map it.
Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0);
if (Base == (void *)-1)
- return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize);
+ {
+ if (errno == ENODEV || errno == EINVAL)
+ {
+ // The filesystem doesn't support this particular kind of mmap.
+ // So we allocate a buffer and read the whole file into it.
+ int const dupped_fd = dup(Fd.Fd());
+ if (dupped_fd == -1)
+ return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd());
+
+ Base = new unsigned char[iSize];
+ SyncToFd = new FileFd (dupped_fd);
+ if (!SyncToFd->Seek(0L) || !SyncToFd->Read(Base, iSize))
+ return false;
+ }
+ else
+ return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),
+ iSize);
+ }
return true;
}
@@ -93,10 +111,19 @@ bool MMap::Close(bool DoSync)
if (DoSync == true)
Sync();
-
- if (munmap((char *)Base,iSize) != 0)
- _error->Warning("Unable to munmap");
-
+
+ if (SyncToFd != NULL)
+ {
+ delete[] (char *)Base;
+ delete SyncToFd;
+ SyncToFd = NULL;
+ }
+ else
+ {
+ if (munmap((char *)Base, iSize) != 0)
+ _error->WarningE("mmap", _("Unable to close mmap"));
+ }
+
iSize = 0;
Base = 0;
return true;
@@ -113,8 +140,18 @@ bool MMap::Sync()
#ifdef _POSIX_SYNCHRONIZED_IO
if ((Flags & ReadOnly) != ReadOnly)
- if (msync((char *)Base,iSize,MS_SYNC) < 0)
- return _error->Errno("msync","Unable to write mmap");
+ {
+ if (SyncToFd != NULL)
+ {
+ if (!SyncToFd->Seek(0) || !SyncToFd->Write(Base, iSize))
+ return false;
+ }
+ else
+ {
+ if (msync((char *)Base, iSize, MS_SYNC) < 0)
+ return _error->Errno("msync", _("Unable to synchronize mmap"));
+ }
+ }
#endif
return true;
}
@@ -130,8 +167,19 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
#ifdef _POSIX_SYNCHRONIZED_IO
unsigned long PSize = sysconf(_SC_PAGESIZE);
if ((Flags & ReadOnly) != ReadOnly)
- if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
- return _error->Errno("msync","Unable to write mmap");
+ {
+ if (SyncToFd != 0)
+ {
+ if (!SyncToFd->Seek(0) ||
+ !SyncToFd->Write (((char *)Base)+Start, Stop-Start))
+ return false;
+ }
+ else
+ {
+ if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
+ return _error->Errno("msync", _("Unable to synchronize mmap"));
+ }
+ }
#endif
return true;
}
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index cd2b15ba2..5ca951204 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -44,6 +44,11 @@ class MMap
unsigned long iSize;
void *Base;
+ // In case mmap can not be used, we keep a dup of the file
+ // descriptor that should have been mmaped so that we can write to
+ // the file in Sync().
+ FileFd *SyncToFd;
+
bool Map(FileFd &Fd);
bool Close(bool DoSync = true);
diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index ad45e9a44..755ffbe96 100644
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -190,8 +190,22 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd,
dlhs++;
if (drhs != rhs)
drhs++;
-
- return CmpFragment(dlhs,AEnd,drhs,BEnd);
+
+ // no debian revision need to be treated like -0
+ if (*(dlhs-1) == '-' && *(drhs-1) == '-')
+ return CmpFragment(dlhs,AEnd,drhs,BEnd);
+ else if (*(dlhs-1) == '-')
+ {
+ const char* null = "0";
+ return CmpFragment(dlhs,AEnd,null, null+1);
+ }
+ else if (*(drhs-1) == '-')
+ {
+ const char* null = "0";
+ return CmpFragment(null, null+1, drhs, BEnd);
+ }
+ else
+ return 0;
}
/*}}}*/
// debVS::CheckDep - Check a single dependency /*{{{*/
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index fb6054f79..9ba60060c 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -564,35 +564,37 @@ void pkgDPkgPM::WriteHistoryTag(string tag, string value)
// DPkgPM::OpenLog /*{{{*/
bool pkgDPkgPM::OpenLog()
{
- string logdir = _config->FindDir("Dir::Log");
+ string const logdir = _config->FindDir("Dir::Log");
if(not FileExists(logdir))
return _error->Error(_("Directory '%s' missing"), logdir.c_str());
// get current time
char timestr[200];
- time_t t = time(NULL);
- struct tm *tmp = localtime(&t);
+ time_t const t = time(NULL);
+ struct tm const * const tmp = localtime(&t);
strftime(timestr, sizeof(timestr), "%F %T", tmp);
// open terminal log
- string logfile_name = flCombine(logdir,
+ string const logfile_name = flCombine(logdir,
_config->Find("Dir::Log::Terminal"));
if (!logfile_name.empty())
{
term_out = fopen(logfile_name.c_str(),"a");
if (term_out == NULL)
- return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str());
+ return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
chmod(logfile_name.c_str(), 0600);
fprintf(term_out, "\nLog started: %s\n", timestr);
}
- // write
- string history_name = flCombine(logdir,
+ // write your history
+ string const history_name = flCombine(logdir,
_config->Find("Dir::Log::History"));
if (!history_name.empty())
{
history_out = fopen(history_name.c_str(),"a");
+ if (history_out == NULL)
+ return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
chmod(history_name.c_str(), 0644);
fprintf(history_out, "\nStart-Date: %s\n", timestr);
string remove, purge, install, upgrade, downgrade;
@@ -612,6 +614,8 @@ bool pkgDPkgPM::OpenLog()
remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");
}
}
+ if (_config->Exists("Commandline::AsString") == true)
+ WriteHistoryTag("Commandline", _config->Find("Commandline::AsString"));
WriteHistoryTag("Install", install);
WriteHistoryTag("Upgrade", upgrade);
WriteHistoryTag("Downgrade",downgrade);
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 5a814e255..849401b0c 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1098,7 +1098,17 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
Pkg.Name());
return true;
}
-
+
+ // Ignore request for install if package would be new
+ if (_config->FindB("APT::Get::Only-Upgrade", false) == true &&
+ Pkg->CurrentVer == 0)
+ {
+ if (AllowFail == true)
+ ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"),
+ Pkg.Name());
+ return true;
+ }
+
// Check if there is something at all to install
pkgDepCache::StateCache &State = Cache[Pkg];
if (Remove == true && Pkg->CurrentVer == 0)
@@ -1779,6 +1789,7 @@ bool DoInstall(CommandLine &CmdL)
Cache[Pkg].Install() == false &&
(Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
_config->FindB("APT::Get::ReInstall",false) == false &&
+ _config->FindB("APT::Get::Only-Upgrade",false) == false &&
_config->FindB("APT::Get::Download-Only",false) == false)
{
ioprintf(c1out,_("%s set to manually installed.\n"),
@@ -2288,6 +2299,7 @@ bool DoSource(CommandLine &CmdL)
{
for (unsigned I = 0; I != J; I++)
ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());
+ delete[] Dsc;
return true;
}
@@ -2298,6 +2310,7 @@ bool DoSource(CommandLine &CmdL)
for (; I != Fetcher.UriEnd(); I++)
cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
+ delete[] Dsc;
return true;
}
@@ -2323,6 +2336,7 @@ bool DoSource(CommandLine &CmdL)
if (_config->FindB("APT::Get::Download-only",false) == true)
{
c1out << _("Download complete and in download only mode") << endl;
+ delete[] Dsc;
return true;
}
@@ -2384,7 +2398,8 @@ bool DoSource(CommandLine &CmdL)
_exit(0);
}
-
+ delete[] Dsc;
+
// Wait for the subprocess
int Status = 0;
while (waitpid(Process,&Status,0) != Process)
@@ -2821,6 +2836,7 @@ int main(int argc,const char *argv[]) /*{{{*/
{0,"fix-missing","APT::Get::Fix-Missing",0},
{0,"ignore-hold","APT::Ignore-Hold",0},
{0,"upgrade","APT::Get::upgrade",0},
+ {0,"only-upgrade","APT::Get::Only-Upgrade",0},
{0,"force-yes","APT::Get::force-yes",0},
{0,"print-uris","APT::Get::Print-URIs",0},
{0,"diff-only","APT::Get::Diff-Only",0},
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index 0e73dda78..18552177c 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -76,6 +76,10 @@ if __name__ == "__main__":
help="print verbose status messages to stdout")
(options, args) = parser.parse_args()
+ if not args:
+ parser.print_help()
+ sys.exit(1)
+
# get the state-file
if not options.filename:
STATE_FILE = apt_pkg.config.find_dir("Dir::State") + "extended_states"
diff --git a/debian/changelog b/debian/changelog
index 8411d3541..3b564b3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,33 @@
-apt (0.7.26~exp3) UNRELEASED; urgency=low
+apt (0.7.26) UNRELEASED; urgency=low
[ Christian Perrier ]
* German translation update. Closes: #571037
* Spanish manpages translation update. Closes: #573293
+ [ David Kalnischkies ]
+ * Switch to dpkg-source 3.0 (native) format
+ * cmdline/apt-mark:
+ - don't crash if no arguments are given (Closes: #570962)
+ * debian/control:
+ - remove some years old and obsolete Replaces
+ * apt-pkg/contrib/mmap.{h,cc}:
+ - add char[] fallback for filesystems without shared writable
+ mmap() like JFFS2. Thanks to Marius Vollmer for writing
+ and to Loïc Minier for pointing to the patch! (Closes: #314334)
+ * doc/apt_preferences.5.xml:
+ - fix two typos and be more verbose in the novice warning.
+ Thanks to Osamu Aoki for pointing it out! (Closes: #567669)
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix error message construction in OpenLog()
+ - if available store the Commandline in the history
+ * cmdline/apt-get.cc:
+ - add a --only-upgrade flag to install command (Closes: #572259)
+ - fix memory leaks in error conditions in DoSource()
+ * apt-pkg/contrib/cmndline.cc:
+ - save Commandline in Commandline::AsString for logging
+ * apt-pkg/deb/debversion.cc:
+ - consider absent of debian revision equivalent to 0 (Closes: #573592)
+
[ Julian Andres Klode ]
* cmdline/apt-mark:
- Use the new python-apt API (and conflict with python-apt << 0.7.93.2).
@@ -13,7 +37,7 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low
- Fix the libraries name to be e.g. libapt-pkg4.9 instead of
libapt-pkg-4.9.
- -- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:13:50 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com> Sun, 14 Mar 2010 16:47:07 +0100
apt (0.7.26~exp2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index c2b6c17a5..0cf092c25 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
Package: apt
Architecture: any
Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}
-Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
Conflicts: python-apt (<< 0.7.93.2~)
Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
@@ -28,7 +27,6 @@ Package: apt-doc
Architecture: all
Priority: optional
Depends: ${misc:Depends}
-Replaces: apt (<< 0.5.4.9)
Section: doc
Description: Documentation for APT
This package contains the user guide and offline guide, for APT, an
@@ -57,7 +55,6 @@ Package: apt-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: ${libapt-inst:provides}
-Replaces: apt (<< 0.5.9)
Description: APT utility programs
This package contains some APT utility programs such as apt-ftparchive,
apt-sortpkgs and apt-extracttemplates.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 3d22f262c..4f8c80169 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -444,6 +444,13 @@
Configuration Item: <literal>APT::Get::Upgrade</literal>.</para></listitem>
</varlistentry>
+ <varlistentry><term><option>--only-upgrade</option></term>
+ <listitem><para>Do not install new packages; When used in conjunction with <literal>install</literal>,
+ <literal>only-upgrade</literal> will prevent packages on the command line
+ from being upgraded if they are not already installed.
+ Configuration Item: <literal>APT::Get::Only-Upgrade</literal>.</para></listitem>
+ </varlistentry>
+
<varlistentry><term><option>--force-yes</option></term>
<listitem><para>Force yes; This is a dangerous option that will cause apt to continue
without prompting if it is doing something potentially harmful. It
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 3d7896226..e773ad144 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -59,6 +59,9 @@ APT will not questioning the preferences so wrong settings will therefore
lead to uninstallable packages or wrong decisions while upgrading packages.
Even more problems will arise if multiply distribution releases are mixed
without a good understanding of the following paragraphs.
+Packages included in a specific release aren't tested in and
+therefore doesn't always work as expected in older or newer releases or
+together with other packages from different releases.
You have been warned.</para>
<para>Note that the files in the <filename>/etc/apt/preferences.d</filename>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index f3b50640c..ea6f2c6fb 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: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-03-14 16:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1477,12 +1477,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:630
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:633
msgid "Files"
msgstr ""
@@ -1492,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 sources.list.5.xml:233
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1502,7 +1502,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1862,7 +1862,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
msgid "<option>-t</option>"
msgstr ""
@@ -2806,7 +2806,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 sources.list.5.xml:193
msgid "Examples"
msgstr ""
@@ -3450,12 +3450,26 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:447
-msgid "<option>--force-yes</option>"
+msgid "<option>--only-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:448
msgid ""
+"Do not install new packages; When used in conjunction with "
+"<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
+"packages on the command line from being upgraded if they are not already "
+"installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:454
+msgid "<option>--force-yes</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:455
+msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using "
@@ -3464,12 +3478,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:462
msgid "<option>--print-uris</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:463
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -3482,12 +3496,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:473
msgid "<option>--purge</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:474
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be "
@@ -3497,24 +3511,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:481
msgid "<option>--reinstall</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:482
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:486
msgid "<option>--list-cleanup</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:487
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3525,17 +3539,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:496
msgid "<option>--target-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:497
msgid "<option>--default-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:498
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -3550,12 +3564,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:511
msgid "<option>--trivial-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:513
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where "
@@ -3565,24 +3579,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:519
msgid "<option>--no-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:520
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:525
msgid "<option>--auto-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:526
msgid ""
"If the command is either <literal>install</literal> or "
"<literal>remove</literal>, then this option acts like running "
@@ -3591,12 +3605,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:532
msgid "<option>--only-source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:533
msgid ""
"Only has meaning for the <literal>source</literal> and "
"<literal>build-dep</literal> commands. Indicates that the given source "
@@ -3608,22 +3622,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--diff-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--dsc-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--tar-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:544
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -3632,24 +3646,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:549
msgid "<option>--arch-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:550
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:554
msgid "<option>--allow-unauthenticated</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:555
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: "
@@ -3657,14 +3671,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:568
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:577
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -3672,29 +3686,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:583
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:586
msgid "ORIGINAL AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:587
msgid "&apt-author.jgunthorpe;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:590
msgid "CURRENT AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:592
msgid "&apt-author.team;"
msgstr ""
@@ -5943,11 +5957,14 @@ msgid ""
"not questioning the preferences so wrong settings will therefore lead to "
"uninstallable packages or wrong decisions while upgrading packages. Even "
"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. You have been warned."
+"a good understanding of the following paragraphs. Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:64
+#: apt_preferences.5.xml:67
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5958,12 +5975,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:74
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:89
#, no-wrap
msgid ""
"<command>apt-get install -t testing "
@@ -5971,13 +5988,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:92
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:73
+#: apt_preferences.5.xml:76
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5994,39 +6011,39 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:98
+#: apt_preferences.5.xml:101
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:102
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:106
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:107
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:111
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:112
msgid "to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:96
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -6034,7 +6051,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:117
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -6042,14 +6059,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:121
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:124
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6059,19 +6076,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:130
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:134
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the "
@@ -6079,7 +6096,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:140
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -6090,7 +6107,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -6100,7 +6117,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:152
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -6112,12 +6129,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:161
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:163
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -6126,7 +6143,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -6136,7 +6153,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173
+#: apt_preferences.5.xml:176
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6145,7 +6162,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:179
+#: apt_preferences.5.xml:182
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -6155,7 +6172,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:185
+#: apt_preferences.5.xml:188
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -6163,7 +6180,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: *\n"
@@ -6172,7 +6189,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:198
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -6182,7 +6199,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is "
@@ -6190,7 +6207,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:205
+#: apt_preferences.5.xml:208
#, no-wrap
msgid ""
"Package: *\n"
@@ -6199,7 +6216,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:210
+#: apt_preferences.5.xml:213
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is "
@@ -6207,7 +6224,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:214
+#: apt_preferences.5.xml:217
#, no-wrap
msgid ""
"Package: *\n"
@@ -6216,7 +6233,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:222
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6224,7 +6241,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:227
#, no-wrap
msgid ""
"Package: *\n"
@@ -6233,82 +6250,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:238
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:257
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:255
+#: apt_preferences.5.xml:258
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:263
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:264
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:269
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:270
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:274
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:275
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6316,7 +6333,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:280
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6325,14 +6342,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:286
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:290
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6349,12 +6366,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:303
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:302
+#: apt_preferences.5.xml:305
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6364,7 +6381,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:307
+#: apt_preferences.5.xml:310
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6372,7 +6389,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:314
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an "
@@ -6381,12 +6398,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:324
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:326
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6394,27 +6411,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:338
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:336
+#: apt_preferences.5.xml:339
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
+#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:343
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -6426,12 +6443,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:359
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:360
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6442,18 +6459,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:370
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:376
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:377
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6464,13 +6481,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:386
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:393
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6481,7 +6498,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:402
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6490,12 +6507,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:411
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:412
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6507,18 +6524,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:421
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:427
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:428
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6527,18 +6544,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:434
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:440
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:441
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6547,13 +6564,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:447
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:348
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6567,7 +6584,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:454
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6582,12 +6599,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:467
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:469
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6595,7 +6612,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:473
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6604,12 +6621,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:482
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:490
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6624,7 +6641,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:481
+#: apt_preferences.5.xml:484
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6634,7 +6651,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 apt_preferences.5.xml:608
+#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 apt_preferences.5.xml:611
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6643,7 +6660,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:502
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6652,13 +6669,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:519
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:510
+#: apt_preferences.5.xml:513
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6667,12 +6684,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:525
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:531
+#: apt_preferences.5.xml:534
#, no-wrap
msgid ""
"Package: *\n"
@@ -6689,7 +6706,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:524
+#: apt_preferences.5.xml:527
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6700,7 +6717,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:548
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6709,13 +6726,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:565
+#: apt_preferences.5.xml:568
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:556
+#: apt_preferences.5.xml:559
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6727,12 +6744,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:572
+#: apt_preferences.5.xml:575
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:589
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6754,7 +6771,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:577
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6769,7 +6786,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:603
+#: apt_preferences.5.xml:606
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6778,13 +6795,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:626
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:617
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6796,12 +6813,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:635
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:641
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 99d56bed3..19026bf3e 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.7.24\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-03-14 16:41+0100\n"
"PO-Revision-Date: 2009-12-31 17:41+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1987,14 +1987,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
msgid "Files"
msgstr "Dateien"
@@ -2005,9 +2005,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Siehe auch"
@@ -2019,7 +2019,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnose"
@@ -2484,7 +2484,7 @@ msgstr ""
"angegeben wurde"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -3717,7 +3717,7 @@ msgstr ""
"Dateien mit <command>apt-ftparchive</command> zu erstellen."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Beispiele"
@@ -4622,11 +4622,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:447
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--only-upgrade</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:448
+#, fuzzy
+#| msgid ""
+#| "Do not upgrade packages; When used in conjunction with <literal>install</"
+#| "literal>, <literal>no-upgrade</literal> will prevent packages on the "
+#| "command line from being upgraded if they are already installed. "
+#| "Configuration Item: <literal>APT::Get::Upgrade</literal>."
+msgid ""
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will prevent packages on the "
+"command line from being upgraded if they are not already installed. "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+"Kein Upgrade von Paketen durchführen; Wenn es zusammen mit <literal>install</"
+"literal> benutzt wird, wird <literal>no-upgrade</literal> auf der "
+"Befehlszeile ein Upgrade von Paketen verhindern, wenn sie bereits "
+"installiert sind. Konfigurationselement: <literal>APT::Get::Upgrade</"
+"literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:454
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:455
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4641,12 +4668,12 @@ msgstr ""
"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:462
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:463
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4668,12 +4695,12 @@ msgstr ""
"Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:473
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:474
#, fuzzy
#| msgid ""
#| "Use purge instead of remove for anything that would be removed. An "
@@ -4693,12 +4720,12 @@ msgstr ""
"option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:481
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:482
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4707,12 +4734,12 @@ msgstr ""
"Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:486
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:487
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4730,17 +4757,17 @@ msgstr ""
"Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:496
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:497
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:498
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4765,12 +4792,12 @@ msgstr ""
"auch die &apt-preferences;-Handbuchseite."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:511
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:513
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4784,12 +4811,12 @@ msgstr ""
"Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:519
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:520
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4798,12 +4825,12 @@ msgstr ""
"Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:525
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:526
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4817,12 +4844,12 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:532
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:533
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4841,22 +4868,22 @@ msgstr ""
"Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:544
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4868,12 +4895,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:549
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:550
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4882,12 +4909,12 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:554
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:555
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4898,7 +4925,7 @@ msgstr ""
"<literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:568
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4907,7 +4934,7 @@ msgstr ""
"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:577
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4918,7 +4945,7 @@ msgstr ""
"preferences;, das APT-Howto."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:583
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4927,22 +4954,22 @@ msgstr ""
"100 bei Fehlern."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:586
msgid "ORIGINAL AUTHORS"
msgstr "ORIGINALAUTOREN"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:587
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:590
msgid "CURRENT AUTHORS"
msgstr "AKTUELLE AUTOREN"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:592
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -8061,11 +8088,14 @@ msgid ""
"not questioning the preferences so wrong settings will therefore lead to "
"uninstallable packages or wrong decisions while upgrading packages. Even "
"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. You have been warned."
+"a good understanding of the following paragraphs. Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:64
+#: apt_preferences.5.xml:67
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -8076,24 +8106,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:74
msgid "APT's Default Priority Assignments"
msgstr "APTs Standardprioritätszuweisungen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:92
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:73
+#: apt_preferences.5.xml:76
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -8121,22 +8151,22 @@ msgstr ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:98
+#: apt_preferences.5.xml:101
msgid "priority 100"
msgstr "Priorität 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:102
msgid "to the version that is already installed (if any)."
msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:106
msgid "priority 500"
msgstr "Priorität 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:107
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -8145,19 +8175,19 @@ msgstr ""
"gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:111
msgid "priority 990"
msgstr "Priorität 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:112
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
"zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:96
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -8168,7 +8198,7 @@ msgstr ""
"Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:117
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8179,7 +8209,7 @@ msgstr ""
"installierten Paketversionen eine Priorität von 500 zu."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:121
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -8189,7 +8219,7 @@ msgstr ""
"ist."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:124
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8205,12 +8235,12 @@ msgstr ""
"Downgrading eines Paketes riskant sein kann.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:130
msgid "Install the highest priority version."
msgstr "Die Version mit der höchsten Priorität installieren."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -8219,7 +8249,7 @@ msgstr ""
"aktuellste installiert (das ist die mit der höheren Versionsnummer)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:134
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8231,7 +8261,7 @@ msgstr ""
"installierte installiert."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:140
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8247,7 +8277,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8261,7 +8291,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:152
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8281,12 +8311,12 @@ msgstr ""
"hat."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:161
msgid "The Effect of APT Preferences"
msgstr "Die Auswirkungen von APT-Einstellungen"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:163
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8300,7 +8330,7 @@ msgstr ""
"allgemeine Gestalt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8316,7 +8346,7 @@ msgstr ""
"können durch Leerzeichen getrennt werden."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173
+#: apt_preferences.5.xml:176
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8328,7 +8358,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:179
+#: apt_preferences.5.xml:182
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8343,7 +8373,7 @@ msgstr ""
"ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:185
+#: apt_preferences.5.xml:188
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8354,7 +8384,7 @@ msgstr ""
"Paketversionen eine hohe Priorität zu, die lokal liegen."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: *\n"
@@ -8366,7 +8396,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:198
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8382,7 +8412,7 @@ msgstr ""
"wie »Debian« oder »Ximian«."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8393,7 +8423,7 @@ msgstr ""
"Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:205
+#: apt_preferences.5.xml:208
#, no-wrap
msgid ""
"Package: *\n"
@@ -8405,7 +8435,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:210
+#: apt_preferences.5.xml:213
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8416,7 +8446,7 @@ msgstr ""
"zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:214
+#: apt_preferences.5.xml:217
#, no-wrap
msgid ""
"Package: *\n"
@@ -8428,7 +8458,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:222
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8439,7 +8469,7 @@ msgstr ""
"Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:227
#, no-wrap
msgid ""
"Package: *\n"
@@ -8451,17 +8481,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:238
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8470,12 +8500,12 @@ msgstr ""
"des Pakets durchführt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
msgid "990 &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:249
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8484,12 +8514,12 @@ msgstr ""
"Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:257
msgid "500 &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:255
+#: apt_preferences.5.xml:258
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8499,12 +8529,12 @@ msgstr ""
"neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:263
msgid "100 &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:261
+#: apt_preferences.5.xml:264
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8514,12 +8544,12 @@ msgstr ""
"installierte Version neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:269
msgid "0 &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:267
+#: apt_preferences.5.xml:270
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8528,17 +8558,17 @@ msgstr ""
"installierte Version des Pakets gibt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:274
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:275
msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8549,7 +8579,7 @@ msgstr ""
"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:280
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8563,7 +8593,7 @@ msgstr ""
"erste dieser Datensätze die Priorität der Paketversion fest."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:286
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8572,7 +8602,7 @@ msgstr ""
"bereits gezeigten Datensätze:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:290
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8600,12 +8630,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:303
msgid "Then:"
msgstr "Dann:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:302
+#: apt_preferences.5.xml:305
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8620,7 +8650,7 @@ msgstr ""
"dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:307
+#: apt_preferences.5.xml:310
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8631,7 +8661,7 @@ msgstr ""
"sogar wenn diese Versionen zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:314
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8645,12 +8675,12 @@ msgstr ""
"Pakets installiert ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:324
msgid "Determination of Package Version and Distribution Properties"
msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:326
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8661,27 +8691,27 @@ msgstr ""
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:338
msgid "the <literal>Package:</literal> line"
msgstr "die <literal>Package:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:336
+#: apt_preferences.5.xml:339
msgid "gives the package name"
msgstr "gibt den Paketnamen an"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
+#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
msgid "the <literal>Version:</literal> line"
msgstr "die <literal>Version:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:343
msgid "gives the version number for the named package"
msgstr "gibt die Versionsnummer für das genannte Paket an"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8702,12 +8732,12 @@ msgstr ""
"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:359
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:360
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8724,18 +8754,18 @@ msgstr ""
"folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:370
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:376
msgid "the <literal>Codename:</literal> line"
msgstr "die <literal>Codename:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:377
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8751,13 +8781,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:386
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:393
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8773,7 +8803,7 @@ msgstr ""
"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:402
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8785,12 +8815,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:411
msgid "the <literal>Component:</literal> line"
msgstr "die <literal>Component:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:412
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8808,18 +8838,18 @@ msgstr ""
"Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:421
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:427
msgid "the <literal>Origin:</literal> line"
msgstr "die <literal>Origin:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:428
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8831,18 +8861,18 @@ msgstr ""
"in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:434
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:440
msgid "the <literal>Label:</literal> line"
msgstr "die <literal>Label:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:441
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8855,13 +8885,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:447
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:348
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8883,7 +8913,7 @@ msgstr ""
"relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:454
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8909,12 +8939,12 @@ msgstr ""
"Distribution heruntergeladen wurde."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:467
msgid "Optional Lines in an APT Preferences Record"
msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:469
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8925,7 +8955,7 @@ msgstr ""
"anfangen. Dieses stellt einen Platz für Kommentare bereit."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:473
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -8939,12 +8969,12 @@ msgstr ""
"anfängt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:482
msgid "Tracking Stable"
msgstr "Stable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:490
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8968,7 +8998,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:481
+#: apt_preferences.5.xml:484
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8983,8 +9013,8 @@ msgstr ""
"Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
+#: apt_preferences.5.xml:611
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8996,7 +9026,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:502
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9009,13 +9039,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:519
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:510
+#: apt_preferences.5.xml:513
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -9029,12 +9059,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:525
msgid "Tracking Testing or Unstable"
msgstr "Testing oder Unstable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:531
+#: apt_preferences.5.xml:534
#, no-wrap
msgid ""
"Package: *\n"
@@ -9062,7 +9092,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:524
+#: apt_preferences.5.xml:527
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9079,7 +9109,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:548
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9092,13 +9122,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:565
+#: apt_preferences.5.xml:568
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:556
+#: apt_preferences.5.xml:559
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9118,12 +9148,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:572
+#: apt_preferences.5.xml:575
msgid "Tracking the evolution of a codename release"
msgstr "Die Entwicklung eines Codename-Releases verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:589
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9157,7 +9187,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:577
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9183,7 +9213,7 @@ msgstr ""
"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:603
+#: apt_preferences.5.xml:606
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9196,13 +9226,13 @@ msgstr ""
"durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:626
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:617
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9222,12 +9252,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:635
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:641
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po/es.po b/doc/po/es.po
index 837b60f2c..fe7a1c9be 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: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-03-14 16:41+0100\n"
"PO-Revision-Date: 2010-03-02 18:43+0200\n"
"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
"Language-Team: Debian Spanish l10n <debian-l10n-spanish@lists.debian.org>\n"
@@ -615,7 +615,7 @@ msgstr ""
" </author>\n"
" <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
" <date>28 de Octubre de 2008</date>\n"
-" <productname>Linux</poductname>\n"
+" <productname>Linux</productname>\n"
#. type: Plain text
#: apt.ent:171
@@ -2012,14 +2012,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
msgid "Files"
msgstr "Ficheros"
@@ -2030,9 +2030,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Véase también"
@@ -2044,7 +2044,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnósticos"
@@ -2510,7 +2510,7 @@ msgstr ""
"<filename>paquete.config.XXXX</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -3746,7 +3746,7 @@ msgstr ""
"command>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Ejemplos"
@@ -4642,11 +4642,37 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:447
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--only-upgrade</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:448
+#, fuzzy
+#| msgid ""
+#| "Do not upgrade packages; When used in conjunction with <literal>install</"
+#| "literal>, <literal>no-upgrade</literal> will prevent packages on the "
+#| "command line from being upgraded if they are already installed. "
+#| "Configuration Item: <literal>APT::Get::Upgrade</literal>."
+msgid ""
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will prevent packages on the "
+"command line from being upgraded if they are not already installed. "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+"No actualiza los paquetes. Cuando se usa junto a <literal>install</literal>, "
+"<literal>no-upgrade</literal> evita que se actualicen los paquetes listados "
+"en la línea de órdenes si ya están instalados. Opción de configuración: "
+"<literal>APT::Get::Upgrade</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:454
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:455
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4662,12 +4688,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:462
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:463
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4689,12 +4715,12 @@ msgstr ""
"<literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:473
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:474
#, fuzzy
#| msgid ""
#| "Use purge instead of remove for anything that would be removed. An "
@@ -4715,12 +4741,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:481
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:482
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4730,12 +4756,12 @@ msgstr ""
"ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:486
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:487
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4753,17 +4779,17 @@ msgstr ""
"<literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:496
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:497
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:498
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4787,12 +4813,12 @@ msgstr ""
"también la página del manual de &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:511
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:513
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4806,12 +4832,12 @@ msgstr ""
"<literal>APT::Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:519
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:520
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4820,12 +4846,12 @@ msgstr ""
"preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:525
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:526
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4838,12 +4864,12 @@ msgstr ""
"configuración: <literal>APT::Get::AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:532
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:533
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4863,22 +4889,22 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:544
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4889,12 +4915,12 @@ msgstr ""
"Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:549
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:550
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4903,12 +4929,12 @@ msgstr ""
"arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:554
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:555
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4919,7 +4945,7 @@ msgstr ""
"configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:568
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4928,7 +4954,7 @@ msgstr ""
"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:577
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4939,7 +4965,7 @@ msgstr ""
"preferences;, el Cómo de APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:583
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4948,24 +4974,24 @@ msgstr ""
"100 en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:586
msgid "ORIGINAL AUTHORS"
msgstr "AUTORES ORIGINALES"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:587
msgid "&apt-author.jgunthorpe;"
-msgstr "&apt-author.jgunthorpe"
+msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:590
msgid "CURRENT AUTHORS"
msgstr "AUTORES ACTUALES"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:592
msgid "&apt-author.team;"
-msgstr "&apt-author.team"
+msgstr "&apt-author.team;"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-key.8.xml:14 apt-key.8.xml:21
@@ -8034,11 +8060,14 @@ msgid ""
"not questioning the preferences so wrong settings will therefore lead to "
"uninstallable packages or wrong decisions while upgrading packages. Even "
"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. You have been warned."
+"a good understanding of the following paragraphs. Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:64
+#: apt_preferences.5.xml:67
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -8049,24 +8078,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:74
msgid "APT's Default Priority Assignments"
msgstr "¿Cómo asigna APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:92
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:73
+#: apt_preferences.5.xml:76
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -8094,22 +8123,22 @@ msgstr ""
"\"0\"/><placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:98
+#: apt_preferences.5.xml:101
msgid "priority 100"
msgstr "prioridad 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:102
msgid "to the version that is already installed (if any)."
msgstr "a la versión instalada (de existir)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:106
msgid "priority 500"
msgstr "prioridad 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:107
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -8118,12 +8147,12 @@ msgstr ""
"objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:111
msgid "priority 990"
msgstr "prioridad 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:112
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
@@ -8131,7 +8160,7 @@ msgstr ""
"objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:96
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -8142,7 +8171,7 @@ msgstr ""
"Asignar: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:117
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8153,7 +8182,7 @@ msgstr ""
"instaladas de paquetes."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:121
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -8162,7 +8191,7 @@ msgstr ""
"determinar qué versión del paquete debe instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:124
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8179,12 +8208,12 @@ msgstr ""
"ser peligroso)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:130
msgid "Install the highest priority version."
msgstr "Instala la versión de mayor prioridad."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -8193,7 +8222,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:131
+#: apt_preferences.5.xml:134
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8204,7 +8233,7 @@ msgstr ""
"<literal>--reinstall</literal>, se instalará la que no está instalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:140
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8219,7 +8248,7 @@ msgstr ""
"command> o <command>apt-get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8233,7 +8262,7 @@ msgstr ""
"upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:152
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8252,12 +8281,12 @@ msgstr ""
"versión instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:161
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:160
+#: apt_preferences.5.xml:163
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8270,7 +8299,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:166
+#: apt_preferences.5.xml:169
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8286,7 +8315,7 @@ msgstr ""
"separados por espacios."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173
+#: apt_preferences.5.xml:176
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8298,7 +8327,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:179
+#: apt_preferences.5.xml:182
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8313,7 +8342,7 @@ msgstr ""
"identificado por su nombre de dominio."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:185
+#: apt_preferences.5.xml:188
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8324,7 +8353,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:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: *\n"
@@ -8336,7 +8365,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:198
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8352,7 +8381,7 @@ msgstr ""
"tales como «Debian» o «Ximian»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8363,7 +8392,7 @@ msgstr ""
"archivo de paquetes «<literal>unstable</literal>» (inestable)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:205
+#: apt_preferences.5.xml:208
#, no-wrap
msgid ""
"Package: *\n"
@@ -8375,7 +8404,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:210
+#: apt_preferences.5.xml:213
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8386,7 +8415,7 @@ msgstr ""
"«<literal>squeeze</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:214
+#: apt_preferences.5.xml:217
#, no-wrap
msgid ""
"Package: *\n"
@@ -8398,7 +8427,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:222
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8410,7 +8439,7 @@ msgstr ""
"«<literal>3.0</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:227
#, no-wrap
msgid ""
"Package: *\n"
@@ -8422,17 +8451,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:238
msgid "How APT Interprets Priorities"
msgstr "¿Cómo interpreta APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8441,12 +8470,12 @@ msgstr ""
"el sistema."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8455,12 +8484,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:254
+#: apt_preferences.5.xml:257
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:255
+#: apt_preferences.5.xml:258
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8470,12 +8499,12 @@ msgstr ""
"más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:263
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:264
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"
@@ -8484,12 +8513,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:266
+#: apt_preferences.5.xml:269
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:267
+#: apt_preferences.5.xml:270
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8497,17 +8526,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:271
+#: apt_preferences.5.xml:274
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:275
msgid "prevents the version from being installed"
msgstr "Evita la instalación de la versión."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8518,7 +8547,7 @@ msgstr ""
"siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:280
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8532,7 +8561,7 @@ msgstr ""
"versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:286
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8541,7 +8570,7 @@ msgstr ""
"registros antes mencionados:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:290
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8569,12 +8598,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:303
msgid "Then:"
msgstr "Por ello:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:302
+#: apt_preferences.5.xml:305
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8589,7 +8618,7 @@ msgstr ""
"la versión 5.8*, desactualizando el paquete."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:307
+#: apt_preferences.5.xml:310
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8600,7 +8629,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:311
+#: apt_preferences.5.xml:314
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8613,12 +8642,12 @@ msgstr ""
"hay ninguna versión del paquete ya instalado."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:324
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinar la versión del paquete y las propiedades de la distribución"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:326
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8629,27 +8658,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:335
+#: apt_preferences.5.xml:338
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:336
+#: apt_preferences.5.xml:339
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:339 apt_preferences.5.xml:389
+#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
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:340
+#: apt_preferences.5.xml:343
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:327
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8670,12 +8699,12 @@ msgstr ""
"de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:359
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "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:357
+#: apt_preferences.5.xml:360
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8693,18 +8722,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:367
+#: apt_preferences.5.xml:370
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:376
msgid "the <literal>Codename:</literal> line"
msgstr "La línea <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:377
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8721,13 +8750,13 @@ msgstr ""
"siguientes líneas en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:386
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:393
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8743,7 +8772,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:399
+#: apt_preferences.5.xml:402
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8755,12 +8784,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:411
msgid "the <literal>Component:</literal> line"
msgstr "La línea <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:412
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8779,18 +8808,18 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:421
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:427
msgid "the <literal>Origin:</literal> line"
msgstr "La línea <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:428
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8803,18 +8832,18 @@ msgstr ""
"mediante la siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:434
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:440
msgid "the <literal>Label:</literal> line"
msgstr "La línea <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:441
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8827,13 +8856,13 @@ msgstr ""
"siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:447
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:348
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8851,10 +8880,11 @@ msgstr ""
"que se aplican a <emphasis>todos</emphasis> los paquetes por debajo del "
"directorio padre. Al contrario que el fichero <filename>Packages</filename>, "
"casi todas las líneas del fichero <filename>Release</filename> son "
-"relevantes para las prioridades de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
+"relevantes para las prioridades de APT: <placeholder type=\"variablelist\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:454
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8879,12 +8909,12 @@ msgstr ""
"la distribución «<literal>unstable</literal>» (inestable)."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:467
msgid "Optional Lines in an APT Preferences Record"
msgstr "Líneas opcionales en el registro de preferencias de APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:469
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8895,7 +8925,7 @@ msgstr ""
"Útil para comentarios."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:473
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -8907,12 +8937,12 @@ msgstr ""
"en una línea que empiece con <literal>Pin-Priority: release ...</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:482
msgid "Tracking Stable"
msgstr "Seguir la distribución «stable» (estable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:490
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8936,7 +8966,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:481
+#: apt_preferences.5.xml:484
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8951,8 +8981,8 @@ msgstr ""
"<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
+#: apt_preferences.5.xml:611
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8964,7 +8994,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:502
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8978,13 +9008,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:519
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:510
+#: apt_preferences.5.xml:513
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8997,12 +9027,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:525
msgid "Tracking Testing or Unstable"
msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:531
+#: apt_preferences.5.xml:534
#, no-wrap
msgid ""
"Package: *\n"
@@ -9030,7 +9060,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:524
+#: apt_preferences.5.xml:527
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9047,7 +9077,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:548
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9060,13 +9090,13 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:565
+#: apt_preferences.5.xml:568
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:556
+#: apt_preferences.5.xml:559
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9085,12 +9115,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:572
+#: apt_preferences.5.xml:575
msgid "Tracking the evolution of a codename release"
msgstr "Seguir la evolución de una publicación por el nombre"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:589
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9124,7 +9154,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:577
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9151,7 +9181,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:603
+#: apt_preferences.5.xml:606
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9164,13 +9194,13 @@ msgstr ""
"<literal>squeeze</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:626
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:617
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9189,12 +9219,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:635
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:641
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index de84a2ffe..9cbfd48b2 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-03-14 16:41+0100\n"
"PO-Revision-Date: 2010-01-29 19:58+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1992,14 +1992,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
msgid "Files"
msgstr "Fichiers"
@@ -2010,9 +2010,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Voir aussi"
@@ -2024,7 +2024,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -2490,7 +2490,7 @@ msgstr ""
"<filename>package.config.XXXX</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -3709,7 +3709,7 @@ msgstr ""
"pas possible de créer ces fichiers avec <command>apt-ftparchive</command>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Exemples"
@@ -4608,11 +4608,37 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:447
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--only-upgrade</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:448
+#, fuzzy
+#| msgid ""
+#| "Do not upgrade packages; When used in conjunction with <literal>install</"
+#| "literal>, <literal>no-upgrade</literal> will prevent packages on the "
+#| "command line from being upgraded if they are already installed. "
+#| "Configuration Item: <literal>APT::Get::Upgrade</literal>."
+msgid ""
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will prevent packages on the "
+"command line from being upgraded if they are not already installed. "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+"Aucune mise à niveau ; quand elle est utilisée avec <literal>install</"
+"literal>, cette commande empêche les paquets mentionnés sur la ligne de "
+"commande d'être mis à niveau. Élément de configuration : <literal>APT::Get::"
+"Upgrade</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:454
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:455
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4628,12 +4654,12 @@ msgstr ""
"yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:462
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:463
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4655,12 +4681,12 @@ msgstr ""
"<literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:473
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:474
#, fuzzy
#| msgid ""
#| "Use purge instead of remove for anything that would be removed. An "
@@ -4679,12 +4705,12 @@ msgstr ""
"être purgés. Élément de configuration : <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:481
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:482
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4693,12 +4719,12 @@ msgstr ""
"Élément de configuration : <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:486
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:487
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4716,17 +4742,17 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:496
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:497
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:498
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4748,12 +4774,12 @@ msgstr ""
"Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:511
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:513
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4767,12 +4793,12 @@ msgstr ""
"Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:519
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:520
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4782,12 +4808,12 @@ msgstr ""
"Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:525
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:526
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4800,12 +4826,12 @@ msgstr ""
"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:532
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:533
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4825,22 +4851,22 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:544
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4852,12 +4878,12 @@ msgstr ""
"literal>, "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:549
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:550
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4867,12 +4893,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:554
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:555
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4884,7 +4910,7 @@ msgstr ""
"AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:568
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4893,7 +4919,7 @@ msgstr ""
"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:577
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4904,7 +4930,7 @@ msgstr ""
"« HOWTO » d'APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:583
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4913,22 +4939,22 @@ msgstr ""
"décimal 100 en cas d'erreur."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:586
msgid "ORIGINAL AUTHORS"
msgstr "AUTEURS D'ORIGINE"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:587
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:590
msgid "CURRENT AUTHORS"
msgstr "AUTEURS ACTUELS"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:592
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -8032,11 +8058,14 @@ msgid ""
"not questioning the preferences so wrong settings will therefore lead to "
"uninstallable packages or wrong decisions while upgrading packages. Even "
"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. You have been warned."
+"a good understanding of the following paragraphs. Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:64
+#: apt_preferences.5.xml:67
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -8047,24 +8076,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:74
msgid "APT's Default Priority Assignments"
msgstr "Priorités affectées par défaut"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:92
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:73
+#: apt_preferences.5.xml:76
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -8089,22 +8118,22 @@ msgstr ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:98
+#: apt_preferences.5.xml:101
msgid "priority 100"
msgstr "une priorité égale à 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:102
msgid "to the version that is already installed (if any)."
msgstr "est affectée à la version déjà installée (si elle existe)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:106
msgid "priority 500"
msgstr "une priorité égale à 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:107
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -8113,12 +8142,12 @@ msgstr ""
"pas à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:111
msgid "priority 990"
msgstr "une priorité égale à 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:112
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
@@ -8126,7 +8155,7 @@ msgstr ""
"la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:96
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -8137,7 +8166,7 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:117
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8148,7 +8177,7 @@ msgstr ""
"une priorité égale à 500 à tout version non installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:121
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -8157,7 +8186,7 @@ msgstr ""
"qu'il faut installer (par ordre de priorité) :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:124
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8173,12 +8202,12 @@ msgstr ""
"arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:130
msgid "Install the highest priority version."
msgstr "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:128
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -8187,7 +8216,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:131
+#: apt_preferences.5.xml:134
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8199,7 +8228,7 @@ msgstr ""
"qui n'est pas installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:140
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8214,7 +8243,7 @@ msgstr ""
"replaceable></command> ou <command>apt-get dist-upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8227,7 +8256,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:149
+#: apt_preferences.5.xml:152
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8246,12 +8275,12 @@ msgstr ""
"priorité que celle de la version installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:161
msgid "The Effect of APT Preferences"
msgstr "Conséquences des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:163
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8264,7 +8293,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:166
+#: apt_preferences.5.xml:169
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8279,7 +8308,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:173
+#: apt_preferences.5.xml:176
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8291,7 +8320,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:179
+#: apt_preferences.5.xml:182
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8306,7 +8335,7 @@ msgstr ""
"un nom complètement qualifié."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:185
+#: apt_preferences.5.xml:188
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8317,7 +8346,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:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: *\n"
@@ -8329,7 +8358,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:198
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8344,7 +8373,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:201
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8355,7 +8384,7 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:205
+#: apt_preferences.5.xml:208
#, no-wrap
msgid ""
"Package: *\n"
@@ -8367,7 +8396,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:210
+#: apt_preferences.5.xml:213
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8378,7 +8407,7 @@ msgstr ""
"<literal>squeeze</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:214
+#: apt_preferences.5.xml:217
#, no-wrap
msgid ""
"Package: *\n"
@@ -8390,7 +8419,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:222
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8402,7 +8431,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:227
#, no-wrap
msgid ""
"Package: *\n"
@@ -8414,17 +8443,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:238
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8433,12 +8462,12 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8448,12 +8477,12 @@ msgstr ""
"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:257
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:255
+#: apt_preferences.5.xml:258
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"
@@ -8462,12 +8491,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:260
+#: apt_preferences.5.xml:263
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:261
+#: apt_preferences.5.xml:264
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8476,29 +8505,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:266
+#: apt_preferences.5.xml:269
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:267
+#: apt_preferences.5.xml:270
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:271
+#: apt_preferences.5.xml:274
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:275
msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8509,7 +8538,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:280
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8523,7 +8552,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:286
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8532,7 +8561,7 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:290
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8560,12 +8589,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:303
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:302
+#: apt_preferences.5.xml:305
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8579,7 +8608,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:307
+#: apt_preferences.5.xml:310
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8590,7 +8619,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:314
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8603,13 +8632,13 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:324
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
"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:323
+#: apt_preferences.5.xml:326
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8620,27 +8649,27 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:338
msgid "the <literal>Package:</literal> line"
msgstr "la ligne <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:336
+#: apt_preferences.5.xml:339
msgid "gives the package name"
msgstr "donne le nom du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
+#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
msgid "the <literal>Version:</literal> line"
msgstr "la ligne <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:343
msgid "gives the version number for the named package"
msgstr "donne le numéro de version du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8661,12 +8690,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:359
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:360
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8683,18 +8712,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:370
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:376
msgid "the <literal>Codename:</literal> line"
msgstr "la ligne <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:377
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8710,13 +8739,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:386
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:393
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8732,7 +8761,7 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:402
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8744,12 +8773,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:411
msgid "the <literal>Component:</literal> line"
msgstr "La ligne <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:412
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8767,18 +8796,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:418
+#: apt_preferences.5.xml:421
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:427
msgid "the <literal>Origin:</literal> line"
msgstr "La ligne <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:428
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8791,18 +8820,18 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:434
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:440
msgid "the <literal>Label:</literal> line"
msgstr "La ligne <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:441
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8815,13 +8844,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:447
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:348
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8843,7 +8872,7 @@ msgstr ""
"déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:454
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8868,12 +8897,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:467
msgid "Optional Lines in an APT Preferences Record"
msgstr "Lignes facultatives dans le fichier des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:469
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8884,7 +8913,7 @@ msgstr ""
"commentaires."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:473
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -8897,12 +8926,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:482
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:490
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8926,7 +8955,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:481
+#: apt_preferences.5.xml:484
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8941,8 +8970,8 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
+#: apt_preferences.5.xml:611
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8954,7 +8983,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:502
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8967,13 +8996,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:519
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:510
+#: apt_preferences.5.xml:513
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8986,12 +9015,12 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:525
msgid "Tracking Testing or Unstable"
msgstr "Méthode pour suivre Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:531
+#: apt_preferences.5.xml:534
#, no-wrap
msgid ""
"Package: *\n"
@@ -9019,7 +9048,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:524
+#: apt_preferences.5.xml:527
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9036,7 +9065,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:548
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9049,13 +9078,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:565
+#: apt_preferences.5.xml:568
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:556
+#: apt_preferences.5.xml:559
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9074,12 +9103,12 @@ msgstr ""
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:572
+#: apt_preferences.5.xml:575
msgid "Tracking the evolution of a codename release"
msgstr "Suivre l'évolution d'une version par son nom de code"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:589
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9113,7 +9142,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:577
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9137,7 +9166,7 @@ msgstr ""
"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:603
+#: apt_preferences.5.xml:606
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9150,13 +9179,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:626
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:617
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9175,12 +9204,12 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:635
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:641
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po/it.po b/doc/po/it.po
index 917e7712f..e4db82c4e 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-03-14 16:41+0100\n"
"PO-Revision-Date: 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"
@@ -1452,14 +1452,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
msgid "Files"
msgstr ""
@@ -1470,9 +1470,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1484,7 +1484,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1845,7 +1845,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
msgid "<option>-t</option>"
msgstr ""
@@ -2787,7 +2787,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
@@ -3429,12 +3429,26 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:447
-msgid "<option>--force-yes</option>"
+msgid "<option>--only-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:448
msgid ""
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will prevent packages on the "
+"command line from being upgraded if they are not already installed. "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:454
+msgid "<option>--force-yes</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:455
+msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
@@ -3443,12 +3457,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:462
msgid "<option>--print-uris</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:463
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -3461,12 +3475,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:473
msgid "<option>--purge</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:474
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3475,24 +3489,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:481
msgid "<option>--reinstall</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:482
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:486
msgid "<option>--list-cleanup</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:487
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3503,17 +3517,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:496
msgid "<option>--target-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:497
msgid "<option>--default-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:498
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -3527,12 +3541,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:511
msgid "<option>--trivial-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:513
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3541,24 +3555,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:519
msgid "<option>--no-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:520
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:525
msgid "<option>--auto-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:526
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3567,12 +3581,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:532
msgid "<option>--only-source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:533
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3584,22 +3598,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--diff-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--dsc-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--tar-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:544
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3607,24 +3621,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:549
msgid "<option>--arch-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:550
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:554
msgid "<option>--allow-unauthenticated</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:555
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3632,14 +3646,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:568
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:577
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3647,29 +3661,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:583
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:586
msgid "ORIGINAL AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:587
msgid "&apt-author.jgunthorpe;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:590
msgid "CURRENT AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:592
msgid "&apt-author.team;"
msgstr ""
@@ -5913,11 +5927,14 @@ msgid ""
"not questioning the preferences so wrong settings will therefore lead to "
"uninstallable packages or wrong decisions while upgrading packages. Even "
"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. You have been warned."
+"a good understanding of the following paragraphs. Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:64
+#: apt_preferences.5.xml:67
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5928,24 +5945,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:74
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:92
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:73
+#: apt_preferences.5.xml:76
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5961,40 +5978,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:98
+#: apt_preferences.5.xml:101
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:102
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:106
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:107
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:111
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:112
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:96
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -6002,7 +6019,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:117
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -6010,14 +6027,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:121
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:124
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6027,19 +6044,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:130
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:134
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -6047,7 +6064,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:140
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -6057,7 +6074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -6066,7 +6083,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:152
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -6078,12 +6095,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:161
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:163
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -6092,7 +6109,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -6102,7 +6119,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173
+#: apt_preferences.5.xml:176
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6111,7 +6128,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:179
+#: apt_preferences.5.xml:182
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -6121,7 +6138,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:185
+#: apt_preferences.5.xml:188
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -6129,7 +6146,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: *\n"
@@ -6138,7 +6155,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:198
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -6148,7 +6165,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -6156,7 +6173,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:205
+#: apt_preferences.5.xml:208
#, no-wrap
msgid ""
"Package: *\n"
@@ -6165,7 +6182,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:210
+#: apt_preferences.5.xml:213
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -6173,7 +6190,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:214
+#: apt_preferences.5.xml:217
#, no-wrap
msgid ""
"Package: *\n"
@@ -6182,7 +6199,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:222
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6190,7 +6207,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:227
#, no-wrap
msgid ""
"Package: *\n"
@@ -6199,82 +6216,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:238
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:257
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:255
+#: apt_preferences.5.xml:258
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:263
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:264
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:269
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:270
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:274
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:275
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6282,7 +6299,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:280
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6291,14 +6308,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:286
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:290
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6315,12 +6332,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:303
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:302
+#: apt_preferences.5.xml:305
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6330,7 +6347,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:307
+#: apt_preferences.5.xml:310
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6338,7 +6355,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:314
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6347,12 +6364,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:324
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:326
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6360,27 +6377,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:338
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:336
+#: apt_preferences.5.xml:339
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
+#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:343
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6393,12 +6410,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:359
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:360
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6409,18 +6426,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:370
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:376
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:377
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6430,13 +6447,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:386
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:393
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6446,7 +6463,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:402
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6455,12 +6472,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:411
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:412
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6471,18 +6488,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:421
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:427
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:428
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6491,18 +6508,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:434
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:440
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:441
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6511,13 +6528,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:447
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:348
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6530,7 +6547,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:454
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6545,12 +6562,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:467
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:469
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6558,7 +6575,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:473
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6567,12 +6584,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:482
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:490
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6587,7 +6604,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:481
+#: apt_preferences.5.xml:484
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6597,8 +6614,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
+#: apt_preferences.5.xml:611
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6607,7 +6624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:502
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6616,13 +6633,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:519
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:510
+#: apt_preferences.5.xml:513
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6631,12 +6648,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:525
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:531
+#: apt_preferences.5.xml:534
#, no-wrap
msgid ""
"Package: *\n"
@@ -6653,7 +6670,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:524
+#: apt_preferences.5.xml:527
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6664,7 +6681,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:548
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6673,13 +6690,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:565
+#: apt_preferences.5.xml:568
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:556
+#: apt_preferences.5.xml:559
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6691,12 +6708,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:572
+#: apt_preferences.5.xml:575
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:589
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6716,7 +6733,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:577
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6731,7 +6748,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:603
+#: apt_preferences.5.xml:606
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6740,13 +6757,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:626
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:617
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6758,12 +6775,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:635
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:641
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 80ff82081..58012cfb6 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-03-14 16:41+0100\n"
"PO-Revision-Date: 2009-07-30 22:55+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2029,15 +2029,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
msgid "Files"
msgstr "ファイル"
@@ -2049,9 +2049,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
#: sources.list.5.xml:233
msgid "See Also"
msgstr "関連項目"
@@ -2065,7 +2065,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -2557,7 +2557,7 @@ msgstr ""
"<filename>package.config.XXXX</filename> と言った形になります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -3871,7 +3871,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
#: sources.list.5.xml:193
msgid "Examples"
msgstr "サンプル"
@@ -4803,12 +4803,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:447
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--only-upgrade</option>"
+msgstr "<option>--no-upgrade</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:448
+#, fuzzy
+#| msgid ""
+#| "Do not upgrade packages; When used in conjunction with <literal>install</"
+#| "literal>, <literal>no-upgrade</literal> will prevent packages on the "
+#| "command line from being upgraded if they are already installed. "
+#| "Configuration Item: <literal>APT::Get::Upgrade</literal>."
+msgid ""
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will prevent packages on the "
+"command line from being upgraded if they are not already installed. "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+"パッケージ更新なし - <literal>install</literal> と同時に使用すると、"
+"<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
+"ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:454
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:455
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4822,13 +4848,13 @@ msgstr ""
"ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:462
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:463
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4849,13 +4875,13 @@ msgstr ""
"Print-URIs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:473
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:474
#, fuzzy
#| msgid ""
#| "Use purge instead of remove for anything that would be removed. An "
@@ -4875,13 +4901,13 @@ msgstr ""
"<literal>APT::Get::Purge</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:481
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:482
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4890,13 +4916,13 @@ msgstr ""
"定項目 - <literal>APT::Get::ReInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:486
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:487
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4912,18 +4938,18 @@ msgstr ""
"する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:496
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:497
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:498
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4945,13 +4971,13 @@ msgstr ""
"Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:511
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:513
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4964,13 +4990,13 @@ msgstr ""
"目 - <literal>APT::Get::Trivial-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:519
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:520
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4979,13 +5005,13 @@ msgstr ""
"項目 - <literal>APT::Get::Remove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:525
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:526
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4998,13 +5024,13 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:532
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:533
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -5022,23 +5048,23 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:544
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -5049,13 +5075,13 @@ msgstr ""
"Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:549
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:550
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -5064,13 +5090,13 @@ msgstr ""
"<literal>APT::Get::Arch-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:554
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:555
#, fuzzy
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
@@ -5082,7 +5108,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:568
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -5090,7 +5116,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:577
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -5101,7 +5127,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:583
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -5110,22 +5136,22 @@ msgstr ""
"100 を返します。"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:586
msgid "ORIGINAL AUTHORS"
msgstr "原著者"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:587
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:590
msgid "CURRENT AUTHORS"
msgstr "現著者"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:592
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -8068,11 +8094,14 @@ msgid ""
"not questioning the preferences so wrong settings will therefore lead to "
"uninstallable packages or wrong decisions while upgrading packages. Even "
"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. You have been warned."
+"a good understanding of the following paragraphs. Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:64
+#: apt_preferences.5.xml:67
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -8084,27 +8113,27 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:74
msgid "APT's Default Priority Assignments"
msgstr "APT のデフォルト優先度の割り当て"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:92
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:73
+#: apt_preferences.5.xml:76
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -8129,25 +8158,25 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:98
+#: apt_preferences.5.xml:101
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:99
+#: apt_preferences.5.xml:102
msgid "to the version that is already installed (if any)."
msgstr "(あるならば) 既にインストールされているバージョン。"
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:106
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:104
+#: apt_preferences.5.xml:107
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -8155,20 +8184,20 @@ msgstr "インストールされておらず、ターゲットリリースに含
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:111
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:109
+#: apt_preferences.5.xml:112
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:96
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -8180,7 +8209,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:117
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8192,7 +8221,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:121
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -8202,7 +8231,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:121
+#: apt_preferences.5.xml:124
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8218,13 +8247,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:127
+#: apt_preferences.5.xml:130
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:128
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -8234,7 +8263,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:131
+#: apt_preferences.5.xml:134
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8246,7 +8275,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:140
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8262,7 +8291,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8276,7 +8305,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:152
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8296,13 +8325,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:161
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:160
+#: apt_preferences.5.xml:163
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8315,7 +8344,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:166
+#: apt_preferences.5.xml:169
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8330,7 +8359,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:173
+#: apt_preferences.5.xml:176
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8343,7 +8372,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:179
+#: apt_preferences.5.xml:182
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8358,7 +8387,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:185
+#: apt_preferences.5.xml:188
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8370,7 +8399,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:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: *\n"
@@ -8383,7 +8412,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:198
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8399,7 +8428,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:204
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8410,7 +8439,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:205
+#: apt_preferences.5.xml:208
#, no-wrap
msgid ""
"Package: *\n"
@@ -8423,7 +8452,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:210
+#: apt_preferences.5.xml:213
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8434,7 +8463,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:214
+#: apt_preferences.5.xml:217
#, no-wrap
msgid ""
"Package: *\n"
@@ -8447,7 +8476,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:222
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8459,7 +8488,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:224
+#: apt_preferences.5.xml:227
#, no-wrap
msgid ""
"Package: *\n"
@@ -8472,18 +8501,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:238
msgid "How APT Interprets Priorities"
msgstr "APT が優先度に割り込む方法"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid "P &gt; 1000"
msgstr "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:244
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8491,13 +8520,13 @@ msgstr ""
"パッケージがダウングレードしても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
msgid "990 &lt; P &lt;=1000"
msgstr "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:249
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8506,13 +8535,13 @@ msgstr ""
"含まれなくても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:257
msgid "500 &lt; P &lt;=990"
msgstr "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:255
+#: apt_preferences.5.xml:258
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8521,13 +8550,13 @@ msgstr ""
"ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:263
msgid "100 &lt; P &lt;=500"
msgstr "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:261
+#: apt_preferences.5.xml:264
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8537,13 +8566,13 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:269
msgid "0 &lt; P &lt;=100"
msgstr "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:267
+#: apt_preferences.5.xml:270
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8552,19 +8581,19 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:274
msgid "P &lt; 0"
msgstr "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:272
+#: apt_preferences.5.xml:275
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:238
+#: apt_preferences.5.xml:241
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8576,7 +8605,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:280
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8590,7 +8619,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:286
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8600,7 +8629,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:290
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8629,13 +8658,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:303
msgid "Then:"
msgstr "すると、以下のように動作します。"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:302
+#: apt_preferences.5.xml:305
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8650,7 +8679,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:307
+#: apt_preferences.5.xml:310
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8662,7 +8691,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:311
+#: apt_preferences.5.xml:314
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8676,13 +8705,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:324
msgid "Determination of Package Version and Distribution Properties"
msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:326
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8693,30 +8722,30 @@ msgstr ""
"filename> ファイルを提供します。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:338
msgid "the <literal>Package:</literal> line"
msgstr "<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:336
+#: apt_preferences.5.xml:339
msgid "gives the package name"
msgstr "パッケージ名"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
+#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
msgid "the <literal>Version:</literal> line"
msgstr "<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:340
+#: apt_preferences.5.xml:343
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:327
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8736,13 +8765,13 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:359
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "<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:357
+#: apt_preferences.5.xml:360
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -8760,19 +8789,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:367
+#: apt_preferences.5.xml:370
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:376
msgid "the <literal>Codename:</literal> line"
msgstr "<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:374
+#: apt_preferences.5.xml:377
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -8789,14 +8818,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:383
+#: apt_preferences.5.xml:386
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:393
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8812,7 +8841,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:399
+#: apt_preferences.5.xml:402
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8824,13 +8853,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:411
msgid "the <literal>Component:</literal> line"
msgstr "<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:409
+#: apt_preferences.5.xml:412
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8848,19 +8877,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:418
+#: apt_preferences.5.xml:421
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:427
msgid "the <literal>Origin:</literal> line"
msgstr "<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:425
+#: apt_preferences.5.xml:428
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8873,19 +8902,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:431
+#: apt_preferences.5.xml:434
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:440
msgid "the <literal>Label:</literal> line"
msgstr "<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:438
+#: apt_preferences.5.xml:441
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8898,14 +8927,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:444
+#: apt_preferences.5.xml:447
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:348
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -8927,7 +8956,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:454
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8953,13 +8982,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:467
msgid "Optional Lines in an APT Preferences Record"
msgstr "APT 設定レコードのオプション行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:469
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8970,7 +8999,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -8984,13 +9013,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:482
msgid "Tracking Stable"
msgstr "安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:490
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9015,7 +9044,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:481
+#: apt_preferences.5.xml:484
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -9031,8 +9060,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
+#: apt_preferences.5.xml:611
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -9045,7 +9074,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:502
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9058,14 +9087,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:519
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:510
+#: apt_preferences.5.xml:513
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9079,13 +9108,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:525
msgid "Tracking Testing or Unstable"
msgstr "テスト版や不安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:531
+#: apt_preferences.5.xml:534
#, no-wrap
msgid ""
"Package: *\n"
@@ -9114,7 +9143,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:524
+#: apt_preferences.5.xml:527
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -9132,7 +9161,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9145,14 +9174,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:565
+#: apt_preferences.5.xml:568
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:556
+#: apt_preferences.5.xml:559
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9171,13 +9200,13 @@ msgstr ""
"の最新版にアップグレードします。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:572
+#: apt_preferences.5.xml:575
msgid "Tracking the evolution of a codename release"
msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:589
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9211,7 +9240,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:577
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9227,7 +9256,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:603
+#: apt_preferences.5.xml:606
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9240,14 +9269,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:626
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:617
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9267,7 +9296,7 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:635
#, fuzzy
#| msgid "apt_preferences"
msgid "&file-preferences;"
@@ -9275,7 +9304,7 @@ msgstr "apt_preferences"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:641
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index bb70ccfd9..54b4a507d 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-03-14 16:41+0100\n"
"PO-Revision-Date: 2004-02-12 15:06+0100\n"
"Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -1453,14 +1453,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
msgid "Files"
msgstr ""
@@ -1471,9 +1471,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1485,7 +1485,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1848,7 +1848,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
msgid "<option>-t</option>"
msgstr ""
@@ -2793,7 +2793,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
@@ -3429,12 +3429,26 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:447
-msgid "<option>--force-yes</option>"
+msgid "<option>--only-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:448
msgid ""
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will prevent packages on the "
+"command line from being upgraded if they are not already installed. "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:454
+msgid "<option>--force-yes</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:455
+msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
@@ -3443,12 +3457,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:462
msgid "<option>--print-uris</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:463
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -3461,12 +3475,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:473
msgid "<option>--purge</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:474
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3475,24 +3489,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:481
msgid "<option>--reinstall</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:482
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:486
msgid "<option>--list-cleanup</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:487
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3503,17 +3517,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:496
msgid "<option>--target-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:497
msgid "<option>--default-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:498
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -3527,12 +3541,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:511
msgid "<option>--trivial-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:513
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3541,24 +3555,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:519
msgid "<option>--no-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:520
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:525
msgid "<option>--auto-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:526
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3567,12 +3581,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:532
msgid "<option>--only-source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:533
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3584,22 +3598,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--diff-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--dsc-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--tar-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:544
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3607,24 +3621,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:549
msgid "<option>--arch-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:550
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:554
msgid "<option>--allow-unauthenticated</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:555
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3632,14 +3646,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:568
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:577
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3647,29 +3661,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:583
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:586
msgid "ORIGINAL AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:587
msgid "&apt-author.jgunthorpe;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:590
msgid "CURRENT AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:592
msgid "&apt-author.team;"
msgstr ""
@@ -5914,11 +5928,14 @@ msgid ""
"not questioning the preferences so wrong settings will therefore lead to "
"uninstallable packages or wrong decisions while upgrading packages. Even "
"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. You have been warned."
+"a good understanding of the following paragraphs. Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:64
+#: apt_preferences.5.xml:67
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5929,24 +5946,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:74
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:89
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:92
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:73
+#: apt_preferences.5.xml:76
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5962,40 +5979,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:98
+#: apt_preferences.5.xml:101
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:102
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:106
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:107
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:111
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:112
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:96
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -6003,7 +6020,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:117
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -6011,14 +6028,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:121
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:124
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6028,19 +6045,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:130
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:131
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:134
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -6048,7 +6065,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:140
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -6058,7 +6075,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -6067,7 +6084,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:152
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -6079,12 +6096,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:161
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:163
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -6093,7 +6110,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -6103,7 +6120,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173
+#: apt_preferences.5.xml:176
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6112,7 +6129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:179
+#: apt_preferences.5.xml:182
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -6122,7 +6139,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:185
+#: apt_preferences.5.xml:188
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -6130,7 +6147,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: *\n"
@@ -6139,7 +6156,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:198
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -6149,7 +6166,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -6157,7 +6174,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:205
+#: apt_preferences.5.xml:208
#, no-wrap
msgid ""
"Package: *\n"
@@ -6166,7 +6183,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:210
+#: apt_preferences.5.xml:213
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -6174,7 +6191,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:214
+#: apt_preferences.5.xml:217
#, no-wrap
msgid ""
"Package: *\n"
@@ -6183,7 +6200,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:222
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6191,7 +6208,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:227
#, no-wrap
msgid ""
"Package: *\n"
@@ -6200,82 +6217,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:238
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:257
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:255
+#: apt_preferences.5.xml:258
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:263
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:261
+#: apt_preferences.5.xml:264
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:269
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:267
+#: apt_preferences.5.xml:270
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:274
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:275
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6283,7 +6300,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:280
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6292,14 +6309,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:286
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:290
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6316,12 +6333,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:303
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:302
+#: apt_preferences.5.xml:305
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6331,7 +6348,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:307
+#: apt_preferences.5.xml:310
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6339,7 +6356,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:314
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6348,12 +6365,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:324
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:326
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6361,27 +6378,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:338
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:336
+#: apt_preferences.5.xml:339
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339 apt_preferences.5.xml:389
+#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:343
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6394,12 +6411,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:359
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:360
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6410,18 +6427,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:370
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:376
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:377
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6431,13 +6448,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:386
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:393
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6447,7 +6464,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:402
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6456,12 +6473,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:411
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:412
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6472,18 +6489,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:421
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:427
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:428
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6492,18 +6509,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:434
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:440
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:441
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6512,13 +6529,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:447
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:348
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6531,7 +6548,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:454
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6546,12 +6563,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:467
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:469
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6559,7 +6576,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:473
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6568,12 +6585,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:482
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:490
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6588,7 +6605,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:481
+#: apt_preferences.5.xml:484
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6598,8 +6615,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
+#: apt_preferences.5.xml:611
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6608,7 +6625,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:502
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6617,13 +6634,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:519
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:510
+#: apt_preferences.5.xml:513
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6632,12 +6649,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:525
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:531
+#: apt_preferences.5.xml:534
#, no-wrap
msgid ""
"Package: *\n"
@@ -6654,7 +6671,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:524
+#: apt_preferences.5.xml:527
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6665,7 +6682,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:548
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6674,13 +6691,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:565
+#: apt_preferences.5.xml:568
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:556
+#: apt_preferences.5.xml:559
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6692,12 +6709,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:572
+#: apt_preferences.5.xml:575
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:589
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6717,7 +6734,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:577
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6732,7 +6749,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:603
+#: apt_preferences.5.xml:606
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6741,13 +6758,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:626
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:617
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6759,12 +6776,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:635
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:641
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 4e1eeb33a..c97eff77b 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: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-03-14 16:41+0100\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"
@@ -1503,14 +1503,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:630
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
msgid "Files"
msgstr ""
@@ -1521,9 +1521,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -1536,7 +1536,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1902,7 +1902,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
msgid "<option>-t</option>"
msgstr ""
@@ -2845,7 +2845,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
@@ -3482,12 +3482,26 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:447
-msgid "<option>--force-yes</option>"
+msgid "<option>--only-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:448
msgid ""
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will prevent packages on the "
+"command line from being upgraded if they are not already installed. "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:454
+msgid "<option>--force-yes</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:455
+msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
@@ -3496,12 +3510,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:462
msgid "<option>--print-uris</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:463
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -3514,12 +3528,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:473
msgid "<option>--purge</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:474
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3528,24 +3542,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:481
msgid "<option>--reinstall</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:482
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:486
msgid "<option>--list-cleanup</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:487
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3556,17 +3570,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:496
msgid "<option>--target-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:497
msgid "<option>--default-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:498
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -3580,12 +3594,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:511
msgid "<option>--trivial-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:513
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3594,24 +3608,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:519
msgid "<option>--no-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:520
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:525
msgid "<option>--auto-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:526
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3620,12 +3634,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:532
msgid "<option>--only-source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:533
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3637,22 +3651,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--diff-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--dsc-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:543
msgid "<option>--tar-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:544
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3660,24 +3674,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:549
msgid "<option>--arch-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:550
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:554
msgid "<option>--allow-unauthenticated</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:555
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3685,14 +3699,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:568
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:577
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3700,29 +3714,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:583
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:586
msgid "ORIGINAL AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:587
msgid "&apt-author.jgunthorpe;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:590
msgid "CURRENT AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:592
msgid "&apt-author.team;"
msgstr ""
@@ -6014,11 +6028,14 @@ msgid ""
"not questioning the preferences so wrong settings will therefore lead to "
"uninstallable packages or wrong decisions while upgrading packages. Even "
"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs. You have been warned."
+"a good understanding of the following paragraphs. Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases. You have been warned."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:64
+#: apt_preferences.5.xml:67
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -6029,13 +6046,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:74
#, fuzzy
msgid "APT's Default Priority Assignments"
msgstr "Atribuições de Prioridade Padrão do APT"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:89
#, fuzzy, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
@@ -6043,7 +6060,7 @@ msgstr ""
"<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:92
#, fuzzy, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
@@ -6051,7 +6068,7 @@ msgstr ""
"APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:73
+#: apt_preferences.5.xml:76
#, fuzzy
msgid ""
"If there is no preferences file or if there is no entry in the file that "
@@ -6076,25 +6093,25 @@ msgstr ""
"etc/apt/apt.conf</filename>. Por exemplo,"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:98
+#: apt_preferences.5.xml:101
#, fuzzy
msgid "priority 100"
msgstr "prioridade 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:102
#, fuzzy
msgid "to the version that is already installed (if any)."
msgstr "para a instância que já esteja instalada (caso exista)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:106
#, fuzzy
msgid "priority 500"
msgstr "prioridade 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:107
#, fuzzy
msgid ""
"to the versions that are not installed and do not belong to the target "
@@ -6103,13 +6120,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:108
+#: apt_preferences.5.xml:111
#, fuzzy
msgid "priority 990"
msgstr "prioridade 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:112
#, fuzzy
msgid ""
"to the versions that are not installed and belong to the target release."
@@ -6117,7 +6134,7 @@ msgstr ""
"para as instâncias que não estejam instaladas e pertençam a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:96
#, fuzzy
msgid ""
"If the target release has been specified then APT uses the following "
@@ -6129,7 +6146,7 @@ msgstr ""
"Atribuirá :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:117
#, fuzzy
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -6141,7 +6158,7 @@ msgstr ""
"prioridade 500 para todas as instâncias de pacotes não instaladas."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:118
+#: apt_preferences.5.xml:121
#, fuzzy
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
@@ -6151,7 +6168,7 @@ msgstr ""
"determinar qual instância de um pacote instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:124
#, fuzzy
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
@@ -6168,13 +6185,13 @@ msgstr ""
"\"downgrade\" pode ser arriscado.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:130
#, 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:128
+#: apt_preferences.5.xml:131
#, fuzzy
msgid ""
"If two or more versions have the same priority, install the most recent one "
@@ -6184,7 +6201,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:131
+#: apt_preferences.5.xml:134
#, fuzzy
msgid ""
"If two or more versions have the same priority and version number but either "
@@ -6196,7 +6213,7 @@ msgstr ""
"<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:137
+#: apt_preferences.5.xml:140
#, fuzzy
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
@@ -6213,7 +6230,7 @@ msgstr ""
"forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
#, fuzzy
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -6228,7 +6245,7 @@ msgstr ""
"upgrade</command> forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:152
#, fuzzy
msgid ""
"Sometimes the installed version of a package is more recent than the version "
@@ -6248,13 +6265,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:158
+#: apt_preferences.5.xml:161
#, 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:160
+#: apt_preferences.5.xml:163
#, fuzzy
msgid ""
"The APT preferences file allows the system administrator to control the "
@@ -6268,7 +6285,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:166
+#: apt_preferences.5.xml:169
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -6284,7 +6301,7 @@ msgstr ""
"com \"<literal>5.8</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173
+#: apt_preferences.5.xml:176
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6297,7 +6314,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:179
+#: apt_preferences.5.xml:182
#, fuzzy
msgid ""
"The general form assigns a priority to all of the package versions in a "
@@ -6313,7 +6330,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:185
+#: apt_preferences.5.xml:188
#, fuzzy
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
@@ -6326,7 +6343,7 @@ msgstr ""
"no site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6339,7 +6356,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:198
#, fuzzy
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
@@ -6356,7 +6373,7 @@ msgstr ""
"como \"Debian\" ou \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:201
+#: apt_preferences.5.xml:204
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -6368,7 +6385,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:205
+#: apt_preferences.5.xml:208
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6381,7 +6398,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:210
+#: apt_preferences.5.xml:213
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6393,7 +6410,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:214
+#: apt_preferences.5.xml:217
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6406,7 +6423,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:219
+#: apt_preferences.5.xml:222
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6419,7 +6436,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:227
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6432,19 +6449,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:238
#, 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:243
+#: apt_preferences.5.xml:246
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:247
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -6454,13 +6471,13 @@ msgstr ""
"dowgrade do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, 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:249
+#: apt_preferences.5.xml:252
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -6470,13 +6487,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:254
+#: apt_preferences.5.xml:257
#, 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:255
+#: apt_preferences.5.xml:258
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6486,13 +6503,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:260
+#: apt_preferences.5.xml:263
#, 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:261
+#: apt_preferences.5.xml:264
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6503,13 +6520,13 @@ msgstr ""
"seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:269
#, 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:267
+#: apt_preferences.5.xml:270
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -6519,19 +6536,19 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:274
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:275
#, 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:238
+#: apt_preferences.5.xml:241
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6543,7 +6560,7 @@ msgstr ""
"seguir (a grosso modo):"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:280
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -6559,7 +6576,7 @@ msgstr ""
"determinará a prioridade da versão do pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:286
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -6569,7 +6586,7 @@ msgstr ""
"registros apresentados anteriormente :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:290
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6598,12 +6615,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:303
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:302
+#: apt_preferences.5.xml:305
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -6619,7 +6636,7 @@ msgstr ""
"será feito um downgrade do <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:307
+#: apt_preferences.5.xml:310
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -6631,7 +6648,7 @@ msgstr ""
"mesmo versões pertencentes a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:314
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -6646,13 +6663,13 @@ msgstr ""
"instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:324
#, 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:323
+#: apt_preferences.5.xml:326
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -6664,31 +6681,31 @@ msgstr ""
"os pacotes disponíveis nessas localidades."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:338
#, 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:336
+#: apt_preferences.5.xml:339
#, 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:339 apt_preferences.5.xml:389
+#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
#, 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:340
+#: apt_preferences.5.xml:343
#, 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:327
+#: apt_preferences.5.xml:330
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -6710,13 +6727,13 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:359
#, 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:357
+#: apt_preferences.5.xml:360
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -6734,7 +6751,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:370
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -6742,13 +6759,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:376
#, 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:374
+#: apt_preferences.5.xml:377
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -6765,13 +6782,13 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:386
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:390
+#: apt_preferences.5.xml:393
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -6788,7 +6805,7 @@ msgstr ""
"das linhas a seguir."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:402
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6801,13 +6818,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:411
#, 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:409
+#: apt_preferences.5.xml:412
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -6826,7 +6843,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:421
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -6834,13 +6851,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:427
#, 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:425
+#: apt_preferences.5.xml:428
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -6854,7 +6871,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:434
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -6862,13 +6879,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:440
#, 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:438
+#: apt_preferences.5.xml:441
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -6881,7 +6898,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:444
+#: apt_preferences.5.xml:447
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -6889,7 +6906,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:348
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -6912,7 +6929,7 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:454
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6938,13 +6955,13 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:467
#, 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:466
+#: apt_preferences.5.xml:469
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -6956,7 +6973,7 @@ msgstr ""
"</literal>. Isto oferece um local para inserir comentários."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -6970,13 +6987,13 @@ msgstr ""
"release ...</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:482
#, fuzzy
msgid "Tracking Stable"
msgstr "Acompanhando a Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:490
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7001,7 +7018,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:481
+#: apt_preferences.5.xml:484
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -7017,8 +7034,8 @@ msgstr ""
"outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:504 apt_preferences.5.xml:550
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
+#: apt_preferences.5.xml:611
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -7031,7 +7048,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:502
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7044,7 +7061,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:519
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
@@ -7052,7 +7069,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:510
+#: apt_preferences.5.xml:513
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7065,13 +7082,13 @@ msgstr ""
"atualizado novamente a menos que esse comando seja executado novamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:525
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando a Testing"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:531
+#: apt_preferences.5.xml:534
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7100,7 +7117,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:524
+#: apt_preferences.5.xml:527
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -7117,7 +7134,7 @@ msgstr ""
"versões de pacotes de outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7130,7 +7147,7 @@ msgstr ""
"(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:565
+#: apt_preferences.5.xml:568
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
@@ -7138,7 +7155,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:556
+#: apt_preferences.5.xml:559
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7158,12 +7175,12 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:572
+#: apt_preferences.5.xml:575
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:589
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7193,7 +7210,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:577
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7208,7 +7225,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:603
+#: apt_preferences.5.xml:606
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7221,7 +7238,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:626
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
@@ -7229,7 +7246,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:617
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7249,13 +7266,13 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:635
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:641
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/po/apt-all.pot b/po/apt-all.pot
index d849c7cca..ae0a7c375 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,13 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-11 15:17+0100\n"
+"POT-Creation-Date: 2010-03-14 16:30+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"
"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:141
#, c-format
@@ -144,9 +145,9 @@ msgstr ""
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2693 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -198,7 +199,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-#: cmdline/apt-cdrom.cc:114
+#: 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 ""
@@ -360,87 +366,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:76
+#: ftparchive/writer.cc:72
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:81
+#: ftparchive/writer.cc:77
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:132
+#: ftparchive/writer.cc:133
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:135
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:142
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: ftparchive/writer.cc:160 ftparchive/writer.cc:192
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:170
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:195
+#: ftparchive/writer.cc:200
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:259
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:262
+#: ftparchive/writer.cc:267
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:266
+#: ftparchive/writer.cc:271
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:278
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:283
+#: ftparchive/writer.cc:288
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:389
+#: ftparchive/writer.cc:392
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
+#: ftparchive/writer.cc:400 ftparchive/writer.cc:636
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
+#: ftparchive/writer.cc:461 ftparchive/writer.cc:741
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:638
+#: ftparchive/writer.cc:646
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:642
+#: ftparchive/writer.cc:650
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -544,7 +550,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1752
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -703,11 +709,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2129
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2177 cmdline/apt-get.cc:2434
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -736,8 +742,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -771,7 +777,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2329 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -780,7 +786,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2338
msgid "Download complete and in download only mode"
msgstr ""
@@ -812,25 +818,30 @@ msgstr ""
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1115
+#: cmdline/apt-get.cc:1107
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1125
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1126
+#: cmdline/apt-get.cc:1136
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1148
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1143
+#: cmdline/apt-get.cc:1153
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:1158
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -838,84 +849,90 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1177
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1180
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1200
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1208
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1227
+#: cmdline/apt-get.cc:1237
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1239
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1245
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1331
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1352
+#: cmdline/apt-get.cc:1362
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1399
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1415
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1428
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1474
+#: cmdline/apt-get.cc:1484
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1532
msgid ""
+"The following package is automatically installed and is no longer required:"
+msgid_plural ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: cmdline/apt-get.cc:1525
+#: cmdline/apt-get.cc:1536
#, c-format
-msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr ""
+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:1526
+#: cmdline/apt-get.cc:1538
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1531
+#: cmdline/apt-get.cc:1543
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -931,49 +948,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
+#: cmdline/apt-get.cc:1546 cmdline/apt-get.cc:1838
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1550
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1569
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1612
+#: cmdline/apt-get.cc:1624
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1739 cmdline/apt-get.cc:1775
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1750
+#: cmdline/apt-get.cc:1762
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1781
+#: cmdline/apt-get.cc:1795
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1794
+#: cmdline/apt-get.cc:1808
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1797
+#: cmdline/apt-get.cc:1811
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1809
+#: cmdline/apt-get.cc:1823
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"
@@ -981,152 +998,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1827
+#: cmdline/apt-get.cc:1841
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1870
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:1959
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1946
+#: cmdline/apt-get.cc:1960
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1989
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:1992 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1983
+#: cmdline/apt-get.cc:1997
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
+#: cmdline/apt-get.cc:2064 cmdline/apt-get.cc:2072
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2172
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
+#: cmdline/apt-get.cc:2202 cmdline/apt-get.cc:2452
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2251
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2278
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2281
+#: cmdline/apt-get.cc:2295
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2287
+#: cmdline/apt-get.cc:2301
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2334
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2346
+#: cmdline/apt-get.cc:2363
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2358
+#: cmdline/apt-get.cc:2375
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2393
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2395
+#: cmdline/apt-get.cc:2413
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2429
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2439
+#: cmdline/apt-get.cc:2457
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2459
+#: cmdline/apt-get.cc:2477
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2511
+#: cmdline/apt-get.cc:2529
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2564
+#: cmdline/apt-get.cc:2582
#, 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:2600
+#: cmdline/apt-get.cc:2618
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2627
+#: cmdline/apt-get.cc:2645
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2643
+#: cmdline/apt-get.cc:2661
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2648
+#: cmdline/apt-get.cc:2666
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2680
+#: cmdline/apt-get.cc:2698
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2721
+#: cmdline/apt-get.cc:2739
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1170,7 +1187,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2908
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1400,10 +1417,10 @@ 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:157
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
-#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
-#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:92
+#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1535,18 +1552,18 @@ msgstr ""
msgid "Unparsable control file"
msgstr ""
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:199
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr ""
-#: methods/cdrom.cc:209
+#: 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:219
+#: methods/cdrom.cc:218
msgid "Wrong CD-ROM"
msgstr ""
@@ -1694,7 +1711,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1863,67 +1880,80 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:791
+#: methods/http.cc:793
msgid "Select failed"
msgstr ""
-#: methods/http.cc:796
+#: methods/http.cc:798
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:819
+#: methods/http.cc:821
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:850
+#: methods/http.cc:852
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:878
+#: methods/http.cc:880
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:892
+#: methods/http.cc:894
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:894
+#: methods/http.cc:896
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
msgid "Failed to truncate file"
msgstr ""
-#: methods/http.cc:1150
+#: methods/http.cc:1156
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1167 methods/http.cc:1222
+#: methods/http.cc:1173 methods/http.cc:1228
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1314
+#: methods/http.cc:1320
msgid "Internal error"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc:77
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: 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:252
+#: 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:347
+#: apt-pkg/contrib/mmap.cc:395
#, c-format
msgid ""
"The size of a MMap has already reached the defined limit of %lu bytes,abort "
@@ -1931,30 +1961,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:346
+#: apt-pkg/contrib/strutl.cc:363
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:353
+#: apt-pkg/contrib/strutl.cc:370
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:360
+#: apt-pkg/contrib/strutl.cc:377
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:365
+#: apt-pkg/contrib/strutl.cc:382
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1040
+#: apt-pkg/contrib/strutl.cc:1075
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2035,32 +2065,32 @@ msgstr ""
msgid "Command line option %s is not boolean"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: 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:198 apt-pkg/contrib/cmndline.cc:204
+#: 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:234
+#: apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc:267
#, c-format
msgid "Option '%s' is too long"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc:300
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc:350
#, c-format
msgid "Invalid operation %s"
msgstr ""
@@ -2070,13 +2100,13 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
#, c-format
msgid "Unable to change to %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:204
msgid "Failed to stat the cdrom"
msgstr ""
@@ -2241,7 +2271,7 @@ msgstr ""
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:198
msgid "Reading state information"
msgstr ""
@@ -2295,7 +2325,7 @@ msgstr ""
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:446
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
@@ -2401,12 +2431,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:133
+#: apt-pkg/init.cc:135
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:149
+#: apt-pkg/init.cc:151
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2595,86 +2625,86 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:526
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:535 apt-pkg/cdrom.cc:623
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:560
#, c-format
msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:567 apt-pkg/cdrom.cc:835
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:586
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:604
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:608
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:616
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:634
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:674
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
"zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:685
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:711
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:740
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:756
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:760
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:786
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:795
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2718,12 +2748,12 @@ msgstr ""
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:724
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:731
#, c-format
msgid "Removing %s"
msgstr ""
@@ -2738,56 +2768,61 @@ msgstr ""
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:558
+#: apt-pkg/deb/dpkgpm.cc:569
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:584 apt-pkg/deb/dpkgpm.cc:597
+#, c-format
+msgid "Could not open file '%s'"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:717
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:718
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:723
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:662
+#: apt-pkg/deb/dpkgpm.cc:725
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:730
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:669
+#: apt-pkg/deb/dpkgpm.cc:732
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:737
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:675
+#: apt-pkg/deb/dpkgpm.cc:738
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/deb/dpkgpm.cc:942
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:909
+#: apt-pkg/deb/dpkgpm.cc:972
msgid "Running dpkg"
msgstr ""
diff --git a/test/libapt/commandlineasstring_test.cc b/test/libapt/commandlineasstring_test.cc
new file mode 100644
index 000000000..a38957d7e
--- /dev/null
+++ b/test/libapt/commandlineasstring_test.cc
@@ -0,0 +1,39 @@
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+
+#include <string>
+
+#include "assert.h"
+
+class CLT: public CommandLine {
+
+ public:
+ std::string static AsString(const char * const * const argv,
+ unsigned int const argc) {
+ std::string const static conf = "Commandline::AsString";
+ _config->Clear(conf);
+ SaveInConfig(argc, argv);
+ return _config->Find(conf);
+ }
+};
+
+#define CMD(y,z) equals(CLT::AsString(argv, y), z);
+
+int main() {
+ {
+ const char* const argv[] = {"apt-get", "install", "-sf"};
+ CMD(3, "apt-get install -sf");
+ }
+ {
+ const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Test"};
+ CMD(5, "apt-cache -s apt -so Debug::test=Test");
+ }
+ {
+ const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Das ist ein Test"};
+ CMD(5, "apt-cache -s apt -so Debug::test=\"Das ist ein Test\"");
+ }
+ {
+ const char* const argv[] = {"apt-cache", "-s", "apt", "--hallo", "test=1.0"};
+ CMD(5, "apt-cache -s apt --hallo test=1.0");
+ }
+}
diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc
new file mode 100644
index 000000000..b6213e84c
--- /dev/null
+++ b/test/libapt/compareversion_test.cc
@@ -0,0 +1,123 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+/* ######################################################################
+
+ Version Test - Simple program to run through a file and comare versions.
+
+ Each version is compared and the result is checked against an expected
+ result in the file. The format of the file is
+ a b Res
+ Where Res is -1, 1, 0. dpkg -D=1 --compare-versions a "<" b can be
+ used to determine what Res should be. # at the start of the line
+ is a comment and blank lines are skipped
+
+ The runner will also call dpkg --compare-versions to check if APT and
+ dpkg have (still) the same idea.
+
+ ##################################################################### */
+ /*}}}*/
+#include <apt-pkg/macros.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/debversion.h>
+#include <apt-pkg/fileutl.h>
+#include <iostream>
+#include <fstream>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+using namespace std;
+
+bool callDPkg(const char *val, const char *ref, const char &op) {
+ pid_t Process = ExecFork();
+ if (Process == 0)
+ {
+ const char * args[6];
+ args[0] = "/usr/bin/dpkg";
+ args[1] = "--compare-versions";
+ args[2] = val;
+ args[3] = (op == 1) ? ">>" : ( (op == 0) ? "=" : "<<");
+ args[4] = ref;
+ args[5] = 0;
+ execv(args[0], (char**) args);
+ exit(1);
+ }
+ int Ret;
+ waitpid(Process, &Ret, 0);
+ return WIFEXITED(Ret) == true && WEXITSTATUS(Ret) == 0;
+}
+
+void assertVersion(int const &CurLine, string const &A, string const &B, int const &Expected) {
+ int Res = debVS.CmpVersion(A.c_str(), B.c_str());
+ bool const dpkg = callDPkg(A.c_str(),B.c_str(), Expected);
+ Res = (Res < 0) ? -1 : ( (Res > 0) ? 1 : Res);
+
+ if (Res != Expected)
+ _error->Error("Comparison failed on line %u. '%s' '%s' '%s' %i != %i",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")) ,B.c_str(),Res,Expected);
+ if (dpkg == false)
+ _error->Error("DPkg differ with line: %u. '%s' '%s' '%s' == false",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")),B.c_str());
+}
+
+bool RunTest(const char *File)
+{
+ ifstream F(File,ios::in);
+ if (!F != 0)
+ return false;
+
+ char Buffer[300];
+ int CurLine = 0;
+
+ while (1)
+ {
+ F.getline(Buffer,sizeof(Buffer));
+ CurLine++;
+ if (F.eof() != 0)
+ return true;
+ if (!F != 0)
+ return _error->Error("Line %u in %s is too long",CurLine,File);
+
+ // Comment
+ if (Buffer[0] == '#' || Buffer[0] == 0)
+ continue;
+
+ // First version
+ char *I;
+ char *Start = Buffer;
+ for (I = Buffer; *I != 0 && *I != ' '; I++);
+ string A(Start, I - Start);
+
+ if (*I == 0)
+ return _error->Error("Invalid line %u",CurLine);
+
+ // Second version
+ I++;
+ Start = I;
+ for (I = Start; *I != 0 && *I != ' '; I++);
+ string B(Start,I - Start);
+
+ if (*I == 0 || I[1] == 0)
+ return _error->Error("Invalid line %u",CurLine);
+
+ // Result
+ I++;
+ int const Expected = atoi(I);
+ assertVersion(CurLine, A, B, Expected);
+ // Check the reverse as well
+ assertVersion(CurLine, B, A, Expected*-1);
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ if (argc <= 1)
+ RunTest("../versions.lst");
+ else
+ RunTest(argv[1]);
+
+ // Print any errors or warnings found
+ _error->DumpErrors();
+ return 0;
+}
diff --git a/test/libapt/makefile b/test/libapt/makefile
index 08f581e6d..98bdb3348 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -23,3 +23,15 @@ PROGRAM = GetListOfFilesInDir${BASENAME}
SLIBS = -lapt-pkg
SOURCE = getlistoffilesindir_test.cc
include $(PROGRAM_H)
+
+# Program for testing CommandLine reconstruction
+PROGRAM = commandlineasstring${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = commandlineasstring_test.cc
+include $(PROGRAM_H)
+
+# Program for testing debians version comparing
+PROGRAM = compareversion${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = compareversion_test.cc
+include $(PROGRAM_H)
diff --git a/test/makefile b/test/makefile
index fb9123d0a..b8c104eae 100644
--- a/test/makefile
+++ b/test/makefile
@@ -25,13 +25,6 @@ SOURCE = scratch.cc
include $(PROGRAM_H)
# Version compare tester
-PROGRAM=versiontest
-SLIBS = -lapt-pkg
-LIB_MAKES = apt-pkg/makefile
-SOURCE = versiontest.cc
-include $(PROGRAM_H)
-
-# Version compare tester
PROGRAM=testextract
SLIBS = -lapt-pkg -lapt-inst
LIB_MAKES = apt-pkg/makefile apt-inst/makefile
diff --git a/test/versions.lst b/test/versions.lst
index efc19c4f0..517214151 100644
--- a/test/versions.lst
+++ b/test/versions.lst
@@ -10,10 +10,11 @@
1.3 1.2.2 1
# Important attributes
-- . -1
-p - -1
-a - -1
-z - -1
+# disabled as dpkg --compare-versions doesn't like them…
+#- . -1
+#p - -1
+#a - -1
+#z - -1
a . -1
z . -1
@@ -22,6 +23,10 @@ z . -1
1:1.25-4 1:1.25-8 -1
0:1.18.36 1.18.36 0
+# native version
+1.18.36 1.18.35 1
+0:1.18.36 1.18.35 1
+
# Funky, but allowed, characters in upstream version
9:1.18.36:5.4-20 10:0.5.1-22 -1
9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1
@@ -49,3 +54,54 @@ III-alpha9.8 III-alpha9.8-1.5 -1
# #205960
3.0~rc1-1 3.0-1 -1
+
+# #573592 - debian policy 5.6.12
+1.0 1.0-0 0
+0.2 1.0-0 -1
+1.0 1.0-0+b1 -1
+1.0 1.0-0~ 1
+
+# if a version includes a dash
+# it should be the debrev dash - policy says so…
+0:0-0-0 0-0 1
+
+# do we like strange versions? Yes we like strange versions…
+0 0 0
+0 00 0
+
+# "steal" the testcases from cupt
+1.2.3 1.2.3 0 # identical
+4.4.3-2 4.4.3-2 0 # identical
+1:2ab:5 1:2ab:5 0 # this is correct...
+7:1-a:b-5 7:1-a:b-5 0 # and this
+57:1.2.3abYZ+~-4-5 57:1.2.3abYZ+~-4-5 0 # and those too
+1.2.3 0:1.2.3 0 # zero epoch
+1.2.3 1.2.3-0 0 # zero revision
+009 9 0 # zeroes...
+009ab5 9ab5 0 # there as well
+1.2.3 1.2.3-1 -1 # added non-zero revision
+1.2.3 1.2.4 -1 # just bigger
+1.2.4 1.2.3 1 # order doesn't matter
+1.2.24 1.2.3 1 # bigger, eh?
+0.10.0 0.8.7 1 # bigger, eh?
+3.2 2.3 1 # major number rocks
+1.3.2a 1.3.2 1 # letters rock
+0.5.0~git 0.5.0~git2 -1 # numbers rock
+2a 21 -1 # but not in all places
+1.3.2a 1.3.2b -1 # but there is another letter
+1:1.2.3 1.2.4 1 # epoch rocks
+1:1.2.3 1:1.2.4 -1 # bigger anyway
+1.2a+~bCd3 1.2a++ -1 # tilde doesn't rock
+1.2a+~bCd3 1.2a+~ 1 # but first is longer!
+5:2 304-2 1 # epoch rocks
+5:2 304:2 -1 # so big epoch?
+25:2 3:2 1 # 25 > 3, obviously
+1:2:123 1:12:3 -1 # 12 > 2
+1.2-5 1.2-3-5 -1 # 1.2 < 1.2-3
+5.10.0 5.005 1 # preceding zeroes don't matters
+3a9.8 3.10.2 -1 # letters are before all letter symbols
+3a9.8 3~10 1 # but after the tilde
+1.4+OOo3.0.0~ 1.4+OOo3.0.0-4 -1 # another tilde check
+2.4.7-1 2.4.7-z -1 # revision comparing
+1.002-1+b2 1.00 1 # whatever...
+2.2.4-47978_Debian_lenny 2.2.4-47978_Debian_lenny 0 # and underscore...
diff --git a/test/versiontest.cc b/test/versiontest.cc
deleted file mode 100644
index 4ede4b280..000000000
--- a/test/versiontest.cc
+++ /dev/null
@@ -1,233 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description /*{{{*/
-// $Id: versiontest.cc,v 1.5 2003/08/18 15:55:19 mdz Exp $
-/* ######################################################################
-
- Version Test - Simple program to run through a file and comare versions.
-
- Each version is compared and the result is checked against an expected
- result in the file. The format of the file is
- a b Res
- Where Res is -1, 1, 0. dpkg -D=1 --compare-versions a "<" b can be
- used to determine what Res should be. # at the start of the line
- is a comment and blank lines are skipped
-
- ##################################################################### */
- /*}}}*/
-#include <apt-pkg/macros.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/debversion.h>
-#include <iostream>
-#include <fstream>
-
-using namespace std;
-
- static int verrevcmp(const char *val, const char *ref)
-{
- int vc, rc;
- long vl, rl;
- const char *vp, *rp;
-
- if (!val)
- val = "";
- if (!ref)
- ref = "";
- for (;;)
- {
- vp = val;
- while (*vp && !isdigit(*vp))
- vp++;
- rp = ref;
- while (*rp && !isdigit(*rp))
- rp++;
- for (;;)
- {
- vc= val == vp ? 0 : *val++;
- rc= ref == rp ? 0 : *ref++;
- if (!rc && !vc)
- break;
- if (vc && !isalpha(vc))
- vc += 256; /* assumes ASCII character set */
- if (rc && !isalpha(rc))
- rc += 256;
- if (vc != rc)
- return vc - rc;
- }
- val = vp;
- ref = rp;
- vl = 0;
- if (isdigit(*vp))
- vl = strtol(val,(char**)&val,10);
- rl = 0;
- if (isdigit(*rp))
- rl = strtol(ref,(char**)&ref,10);
- if (vl != rl)
- return vl - rl;
- if (!*val && !*ref)
- return 0;
- if (!*val)
- return -1;
- if (!*ref)
- return +1;
- }
-}
-
-#if 0
-static int verrevcmp(const char *val, const char *ref)
-{
- int vc, rc;
- long vl, rl;
- const char *vp, *rp;
-
- if (!val) val= "";
- if (!ref) ref= "";
- for (;;)
- {
- vp= val; while (*vp && !isdigit(*vp) && *vp != '~') vp++;
- rp= ref; while (*rp && !isdigit(*rp) && *rp != '~') rp++;
- for (;;)
- {
- vc= val == vp ? 0 : *val++;
- rc= ref == rp ? 0 : *ref++;
- if (!rc && !vc) break;
- if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */
- if (rc && !isalpha(rc)) rc += 256;
- if (vc != rc) return vc - rc;
- }
-
- val= vp;
- ref= rp;
- if (*vp == '~') val++;
- if (*rp == '~') ref++;
- vl=0; if (isdigit(*val)) vl= strtol(val,(char**)&val,10);
- rl=0; if (isdigit(*ref)) rl= strtol(ref,(char**)&ref,10);
- if (vl == 0 && rl == 0)
- {
- if (*vp == '~' && *rp != '~') return -1;
- if (*vp != '~' && *rp == '~') return +1;
- }
- if (*vp == '~')
- vl *= -1;
- if (*rp == '~')
- rl *= -1;
- if (vl != rl) return vl - rl;
- if (!*val && !*ref) return 0;
- if (!*val)
- {
- if (*ref == '~')
- return +1;
- else
- return -1;
- }
-
- if (!*ref)
- {
- if (*val == '~')
- return -1;
- else
- return +1;
- }
- }
-}
-#endif
-
-bool RunTest(const char *File)
-{
- ifstream F(File,ios::in);
- if (!F != 0)
- return false;
-
- char Buffer[300];
- int CurLine = 0;
-
- while (1)
- {
- F.getline(Buffer,sizeof(Buffer));
- CurLine++;
- if (F.eof() != 0)
- return true;
- if (!F != 0)
- return _error->Error("Line %u in %s is too long",CurLine,File);
-
- // Comment
- if (Buffer[0] == '#' || Buffer[0] == 0)
- continue;
-
- // First version
- char *I;
- char *Start = Buffer;
- for (I = Buffer; *I != 0 && *I != ' '; I++);
- string A(Start, I - Start);
-
- if (*I == 0)
- return _error->Error("Invalid line %u",CurLine);
-
- // Second version
- I++;
- Start = I;
- for (I = Start; *I != 0 && *I != ' '; I++);
- string B(Start,I - Start);
-
- if (*I == 0 || I[1] == 0)
- return _error->Error("Invalid line %u",CurLine);
-
- // Result
- I++;
- int Expected = atoi(I);
- int Res = debVS.CmpVersion(A.c_str(), B.c_str());
- int Res2 = verrevcmp(A.c_str(),B.c_str());
- cout << "'" << A << "' ? '" << B << "' = " << Res << " (= " << Expected << ") " << Res2 << endl;
-
- if (Res < 0)
- Res = -1;
- else if (Res > 0)
- Res = 1;
-
- if (Res != Expected)
- _error->Error("Comparison failed on line %u. '%s' ? '%s' %i != %i",CurLine,A.c_str(),B.c_str(),Res,Expected);
-
- // Check the reverse as well
- Expected = -1*Expected;
- Res = debVS.CmpVersion(B.c_str(), A.c_str());
- Res2 = verrevcmp(B.c_str(),A.c_str());
-
- cout << "'" << B << "' ? '" << A << "' = " << Res << " (= " << Expected << ") " << Res2 << endl;
-
- if (Res < 0)
- Res = -1;
- else if (Res > 0)
- Res = 1;
-
- if (Res != Expected)
- _error->Error("Comparison failed on line %u. '%s' ? '%s' %i != %i",CurLine,B.c_str(),A.c_str(),Res,Expected);
- }
-}
-
-int main(int argc, char *argv[])
-{
- if (argc <= 1)
- {
- cerr << "You must specify a test file" << endl;
- return 0;
- }
-
- RunTest(argv[1]);
-
- // Print any errors or warnings found
- if (_error->empty() == false)
- {
- string Err;
- while (_error->empty() == false)
- {
-
- bool Type = _error->PopMessage(Err);
- if (Type == true)
- cout << "E: " << Err << endl;
- else
- cout << "W: " << Err << endl;
- }
-
- return 0;
- }
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 21:56:13 +0000